diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index cc36e6b3a..8e62476b3 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://code.google.com/p/chromiumembedded/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/41.0.2272.16', + 'chromium_checkout': 'refs/tags/41.0.2272.43', } diff --git a/patch/patch.cfg b/patch/patch.cfg index 301725ee9..7a8e6acee 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -120,6 +120,12 @@ patches = [ 'name': 'render_process_host_1429', '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. # http://code.google.com/p/chromiumembedded/issues/detail?id=364 diff --git a/patch/patches/base_atomicops_455263.patch b/patch/patches/base_atomicops_455263.patch new file mode 100644 index 000000000..ea4fd8b9d --- /dev/null +++ b/patch/patches/base_atomicops_455263.patch @@ -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', diff --git a/patch/patches/build.patch b/patch/patches/build.patch index adea475b1..a37bd7c7f 100644 --- a/patch/patches/build.patch +++ b/patch/patches/build.patch @@ -1,5 +1,5 @@ diff --git common.gypi common.gypi -index f7d7d3b..b188037 100644 +index f984984..46b131b 100644 --- common.gypi +++ common.gypi @@ -9,6 +9,9 @@ diff --git a/patch/patches/content_nav_1129.patch b/patch/patches/content_nav_1129.patch index 10f7b5b7b..2b5bae3da 100644 --- a/patch/patches/content_nav_1129.patch +++ b/patch/patches/content_nav_1129.patch @@ -39,10 +39,10 @@ index bd43c62..1d6e189 100644 // 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 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 -@@ -3811,7 +3811,6 @@ void RenderFrameImpl::OnCommitNavigation( +@@ -3833,7 +3833,6 @@ void RenderFrameImpl::OnCommitNavigation( WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( RenderFrame* render_frame, const NavigationPolicyInfo& info) { @@ -50,7 +50,7 @@ index 7258dbb..8dba5f3 100644 // The handlenavigation API is deprecated and will be removed once // crbug.com/325351 is resolved. if (info.urlRequest.url() != GURL(kSwappedOutURL) && -@@ -3826,7 +3825,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( +@@ -3848,7 +3847,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( info.isRedirect)) { return blink::WebNavigationPolicyIgnore; } diff --git a/patch/patches/spi_webcore_364.patch b/patch/patches/spi_webcore_364.patch index 09dcc88cb..947df754c 100644 --- a/patch/patches/spi_webcore_364.patch +++ b/patch/patches/spi_webcore_364.patch @@ -1,5 +1,5 @@ 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 @@ -144,8 +144,10 @@ FrameView::FrameView(LocalFrame* frame) diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index a931ece62..f9c4457a3 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -1,5 +1,5 @@ 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 @@ -741,7 +741,7 @@ bool ChromeClientImpl::hasOpenedPopup() const @@ -12,7 +12,7 @@ index f59cc5f..70add24 100644 return adoptRefWillBeNoop(new PopupMenuChromium(frame, client)); 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 @@ -379,6 +379,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client) @@ -23,7 +23,7 @@ index 8b7320a..75c2644 100644 , m_doingDragAndDrop(false) , m_ignoreInputEvents(false) , m_compositorDeviceScaleFactorOverride(0) -@@ -3971,9 +3972,14 @@ void WebViewImpl::deviceOrPageScaleFactorChanged() +@@ -3973,9 +3974,14 @@ void WebViewImpl::deviceOrPageScaleFactorChanged() m_page->inspectorController().deviceOrPageScaleFactorChanged(); }