bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 41.0.2272.43

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/2272@2022 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2015-02-06 21:31:42 +00:00
parent 824d06bb40
commit 9c296998cc
7 changed files with 27 additions and 9 deletions
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.16', 'chromium_checkout': 'refs/tags/41.0.2272.43',
} }

6
patch/patch.cfg
View File

@@ -120,6 +120,12 @@ patches = [
'name': 'render_process_host_1429', 'name': 'render_process_host_1429',
'path': '../content/browser/renderer_host/', 'path': '../content/browser/renderer_host/',
}, },
{
# Fix multiple definition of 'AtomicOps_Internalx86CPUFeatures' on Linux.
# https://code.google.com/p/chromium/issues/detail?id=455263
'name': 'base_atomicops_455263',
'path': '../base/allocator/',
},
{ {
# 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

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

@@ -0,0 +1,12 @@
diff --git allocator.gyp allocator.gyp
index c20325d..0e34390 100644
--- allocator.gyp
+++ allocator.gyp
@@ -238,6 +238,7 @@
'<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h',
'<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h',
'<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h',
+ '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc',
'<(tcmalloc_dir)/src/base/atomicops-internals-x86.h',
'<(tcmalloc_dir)/src/base/atomicops.h',
'<(tcmalloc_dir)/src/base/basictypes.h',

2
patch/patches/build.patch
View File

@@ -1,5 +1,5 @@
diff --git common.gypi common.gypi diff --git common.gypi common.gypi
index f7d7d3b..b188037 100644 index f984984..46b131b 100644
--- common.gypi --- common.gypi
+++ common.gypi +++ common.gypi
@@ -9,6 +9,9 @@ @@ -9,6 +9,9 @@

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 7258dbb..8dba5f3 100644 index d9b5807e3..fb739da 100644
--- renderer/render_frame_impl.cc --- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc +++ renderer/render_frame_impl.cc
@@ -3811,7 +3811,6 @@ void RenderFrameImpl::OnCommitNavigation( @@ -3833,7 +3833,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 7258dbb..8dba5f3 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) &&
@@ -3826,7 +3825,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( @@ -3848,7 +3847,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
info.isRedirect)) { info.isRedirect)) {
return blink::WebNavigationPolicyIgnore; return blink::WebNavigationPolicyIgnore;
} }

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 9b2004d..b9a73c7 100644 index 0573ed2..0ee72a2 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)

6
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 f59cc5f..70add24 100644 index 304ffd6..24dfc21 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,7 +12,7 @@ index f59cc5f..70add24 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 8b7320a..75c2644 100644 index 2dc201a..d1cc85e 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) @@ -379,6 +379,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
@@ -23,7 +23,7 @@ index 8b7320a..75c2644 100644
, m_doingDragAndDrop(false) , m_doingDragAndDrop(false)
, m_ignoreInputEvents(false) , m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0) , m_compositorDeviceScaleFactorOverride(0)
@@ -3971,9 +3972,14 @@ void WebViewImpl::deviceOrPageScaleFactorChanged() @@ -3973,9 +3974,14 @@ void WebViewImpl::deviceOrPageScaleFactorChanged()
m_page->inspectorController().deviceOrPageScaleFactorChanged(); m_page->inspectorController().deviceOrPageScaleFactorChanged();
} }