bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 41.0.2272.76. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/2272@2045 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2015-03-04 18:56:54 +00:00
parent 56fd0d61e4
commit a81c953d39
9 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,5 +7,5 @@
# https://code.google.com/p/chromiumembedded/wiki/BranchesAndBuilding # https://code.google.com/p/chromiumembedded/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/41.0.2272.43', 'chromium_checkout': 'refs/tags/41.0.2272.76',
} }

6
patch/patch.cfg
View File

@ -126,6 +126,12 @@ patches = [
'name': 'base_atomicops_455263', 'name': 'base_atomicops_455263',
'path': '../base/allocator/', 'path': '../base/allocator/',
}, },
{
# Fix a compile error due to an artifact left behind by
# https://code.google.com/p/chromium/issues/detail?id=426520#c20
'name': 'webkit_progresstracker_426510',
'path': '../third_party/WebKit/Source/core/loader/',
},
{ {
# Disable scollbar bounce and overlay on OS X. # Disable scollbar bounce and overlay on OS X.
# http://code.google.com/p/chromiumembedded/issues/detail?id=364 # http://code.google.com/p/chromiumembedded/issues/detail?id=364

10
patch/patches/browser_web_contents_1257.patch
View File

@ -1,8 +1,8 @@
diff --git web_contents_impl.cc web_contents_impl.cc diff --git web_contents_impl.cc web_contents_impl.cc
index f9ba939..5555235 100644 index ac0a7dc..478e468 100644
--- web_contents_impl.cc --- web_contents_impl.cc
+++ web_contents_impl.cc +++ web_contents_impl.cc
@@ -1164,22 +1164,29 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -1175,22 +1175,29 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
params.browser_context, params.site_instance, params.routing_id, params.browser_context, params.site_instance, params.routing_id,
params.main_frame_routing_id); params.main_frame_routing_id);
@ -48,7 +48,7 @@ index f9ba939..5555235 100644
} }
CHECK(render_view_host_delegate_view_); CHECK(render_view_host_delegate_view_);
CHECK(view_.get()); CHECK(view_.get());
@@ -1517,6 +1524,9 @@ void WebContentsImpl::CreateNewWindow( @@ -1528,6 +1535,9 @@ void WebContentsImpl::CreateNewWindow(
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace); static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context)); CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
@ -58,7 +58,7 @@ index f9ba939..5555235 100644
if (delegate_ && if (delegate_ &&
!delegate_->ShouldCreateWebContents(this, !delegate_->ShouldCreateWebContents(this,
route_id, route_id,
@@ -1525,7 +1535,9 @@ void WebContentsImpl::CreateNewWindow( @@ -1536,7 +1546,9 @@ void WebContentsImpl::CreateNewWindow(
params.frame_name, params.frame_name,
params.target_url, params.target_url,
partition_id, partition_id,
@ -69,7 +69,7 @@ index f9ba939..5555235 100644
if (route_id != MSG_ROUTING_NONE && if (route_id != MSG_ROUTING_NONE &&
!RenderViewHost::FromID(render_process_id, route_id)) { !RenderViewHost::FromID(render_process_id, route_id)) {
// If the embedder didn't create a WebContents for this route, we need to // If the embedder didn't create a WebContents for this route, we need to
@@ -1545,6 +1557,8 @@ void WebContentsImpl::CreateNewWindow( @@ -1556,6 +1568,8 @@ void WebContentsImpl::CreateNewWindow(
create_params.main_frame_routing_id = main_frame_route_id; create_params.main_frame_routing_id = main_frame_route_id;
create_params.opener = this; create_params.opener = this;
create_params.opener_suppressed = params.opener_suppressed; create_params.opener_suppressed = params.opener_suppressed;

4
patch/patches/chrome_browser_1257.patch
View File

@ -1,8 +1,8 @@
diff --git ui/browser.cc ui/browser.cc diff --git ui/browser.cc ui/browser.cc
index 6c926b9..a809f0f 100644 index fef353c..9c9aad7 100644
--- ui/browser.cc --- ui/browser.cc
+++ ui/browser.cc +++ ui/browser.cc
@@ -1567,7 +1567,9 @@ bool Browser::ShouldCreateWebContents( @@ -1584,7 +1584,9 @@ bool Browser::ShouldCreateWebContents(
const base::string16& frame_name, const base::string16& frame_name,
const GURL& target_url, const GURL& target_url,
const std::string& partition_id, const std::string& partition_id,

6
patch/patches/content_nav_1129.patch
View File

@ -39,10 +39,10 @@ index bd43c62..1d6e189 100644
// Returns true if we should fork a new process for the given navigation. // Returns true if we should fork a new process for the given navigation.
// If |send_referrer| is set to false (which is the default), no referrer // If |send_referrer| is set to false (which is the default), no referrer
diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
index d9b5807e3..fb739da 100644 index dcda817..d219bbe 100644
--- renderer/render_frame_impl.cc --- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc +++ renderer/render_frame_impl.cc
@@ -3833,7 +3833,6 @@ void RenderFrameImpl::OnCommitNavigation( @@ -3836,7 +3836,6 @@ void RenderFrameImpl::OnCommitNavigation(
WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
RenderFrame* render_frame, RenderFrame* render_frame,
const NavigationPolicyInfo& info) { const NavigationPolicyInfo& info) {
@ -50,7 +50,7 @@ index d9b5807e3..fb739da 100644
// The handlenavigation API is deprecated and will be removed once // The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved. // crbug.com/325351 is resolved.
if (info.urlRequest.url() != GURL(kSwappedOutURL) && if (info.urlRequest.url() != GURL(kSwappedOutURL) &&
@@ -3848,7 +3847,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( @@ -3851,7 +3850,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
info.isRedirect)) { info.isRedirect)) {
return blink::WebNavigationPolicyIgnore; return blink::WebNavigationPolicyIgnore;
} }

2
patch/patches/prefs_content_1161.patch
View File

@ -35,7 +35,7 @@ index 78559f2..028a94e 100644
bool v8_script_streaming_enabled; bool v8_script_streaming_enabled;
V8ScriptStreamingMode v8_script_streaming_mode; V8ScriptStreamingMode v8_script_streaming_mode;
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
index 623cb14..5d21fc5 100644 index 17e27bd..984f286 100644
--- renderer/render_view_impl.cc --- renderer/render_view_impl.cc
+++ renderer/render_view_impl.cc +++ renderer/render_view_impl.cc
@@ -958,6 +958,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, @@ -958,6 +958,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,

2
patch/patches/spi_webcore_364.patch
View File

@ -1,5 +1,5 @@
diff --git core/frame/FrameView.cpp core/frame/FrameView.cpp diff --git core/frame/FrameView.cpp core/frame/FrameView.cpp
index 0573ed2..0ee72a2 100644 index b227b2a..3bc4180 100644
--- core/frame/FrameView.cpp --- core/frame/FrameView.cpp
+++ core/frame/FrameView.cpp +++ core/frame/FrameView.cpp
@@ -144,8 +144,10 @@ FrameView::FrameView(LocalFrame* frame) @@ -144,8 +144,10 @@ FrameView::FrameView(LocalFrame* frame)

8
patch/patches/webkit_popups.patch
View File

@ -1,5 +1,5 @@
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
index 304ffd6..24dfc21 100644 index 91cf3f9..6bd6fd0 100644
--- Source/web/ChromeClientImpl.cpp --- Source/web/ChromeClientImpl.cpp
+++ Source/web/ChromeClientImpl.cpp +++ Source/web/ChromeClientImpl.cpp
@@ -741,7 +741,7 @@ bool ChromeClientImpl::hasOpenedPopup() const @@ -741,7 +741,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
@ -12,10 +12,10 @@ index 304ffd6..24dfc21 100644
return adoptRefWillBeNoop(new PopupMenuChromium(frame, client)); return adoptRefWillBeNoop(new PopupMenuChromium(frame, client));
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index 2dc201a..d1cc85e 100644 index c073bea..1f1cfe2 100644
--- Source/web/WebViewImpl.cpp --- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp +++ Source/web/WebViewImpl.cpp
@@ -379,6 +379,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client) @@ -380,6 +380,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
, m_fakePageScaleAnimationPageScaleFactor(0) , m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false) , m_fakePageScaleAnimationUseAnchor(false)
, m_contextMenuAllowed(false) , m_contextMenuAllowed(false)
@ -23,7 +23,7 @@ index 2dc201a..d1cc85e 100644
, m_doingDragAndDrop(false) , m_doingDragAndDrop(false)
, m_ignoreInputEvents(false) , m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0) , m_compositorDeviceScaleFactorOverride(0)
@@ -3973,9 +3974,14 @@ void WebViewImpl::deviceOrPageScaleFactorChanged() @@ -3975,9 +3976,14 @@ void WebViewImpl::deviceOrPageScaleFactorChanged()
m_page->inspectorController().deviceOrPageScaleFactorChanged(); m_page->inspectorController().deviceOrPageScaleFactorChanged();
} }

12
patch/patches/webkit_progresstracker_426510.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git ProgressTracker.cpp ProgressTracker.cpp
index 321d176..eb6f206 100644
--- ProgressTracker.cpp
+++ ProgressTracker.cpp
@@ -95,7 +95,6 @@ void ProgressTracker::dispose()
{
if (m_inProgress)
progressCompleted();
- ASSERT(!m_frame->isLoading());
}
double ProgressTracker::estimatedProgress() const