diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 0d169a07c..34b258325 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # https://code.google.com/p/chromiumembedded/wiki/BranchesAndBuilding { - 'release_url': 'http://src.chromium.org/svn/releases/37.0.2062.58', - 'chromium_checkout': 'refs/tags/37.0.2062.58', + 'release_url': 'http://src.chromium.org/svn/releases/37.0.2062.94', + 'chromium_checkout': 'refs/tags/37.0.2062.94', } diff --git a/patch/patches/renderer_host_1161.patch b/patch/patches/renderer_host_1161.patch index 92cdbf648..872037fdc 100644 --- a/patch/patches/renderer_host_1161.patch +++ b/patch/patches/renderer_host_1161.patch @@ -1,6 +1,6 @@ Index: compositing_iosurface_layer_mac.mm =================================================================== ---- compositing_iosurface_layer_mac.mm (revision 286351) +--- compositing_iosurface_layer_mac.mm (revision 290621) +++ compositing_iosurface_layer_mac.mm (working copy) @@ -202,7 +202,7 @@ TRACE_EVENT0("browser", "CompositingIOSurfaceLayer::drawInCGLContext"); @@ -13,7 +13,7 @@ Index: compositing_iosurface_layer_mac.mm } Index: compositing_iosurface_mac.mm =================================================================== ---- compositing_iosurface_mac.mm (revision 286351) +--- compositing_iosurface_mac.mm (revision 290621) +++ compositing_iosurface_mac.mm (working copy) @@ -350,7 +350,7 @@ glUseProgram(0); CHECK_AND_SAVE_GL_ERROR(); @@ -26,7 +26,7 @@ Index: compositing_iosurface_mac.mm Index: compositing_iosurface_shader_programs_mac.cc =================================================================== ---- compositing_iosurface_shader_programs_mac.cc (revision 286351) +--- compositing_iosurface_shader_programs_mac.cc (revision 290621) +++ compositing_iosurface_shader_programs_mac.cc (working copy) @@ -11,6 +11,8 @@ #include "base/debug/trace_event.h" @@ -81,7 +81,7 @@ Index: compositing_iosurface_shader_programs_mac.cc shader_programs_[which] = Index: compositing_iosurface_shader_programs_mac.h =================================================================== ---- compositing_iosurface_shader_programs_mac.h (revision 286351) +--- compositing_iosurface_shader_programs_mac.h (revision 290621) +++ compositing_iosurface_shader_programs_mac.h (working copy) @@ -48,6 +48,8 @@ return rgb_to_yv12_output_format_; @@ -94,7 +94,7 @@ Index: compositing_iosurface_shader_programs_mac.h TransformsRGBToYV12); Index: render_widget_host_view_aura.cc =================================================================== ---- render_widget_host_view_aura.cc (revision 286351) +--- render_widget_host_view_aura.cc (revision 290621) +++ render_widget_host_view_aura.cc (working copy) @@ -1654,8 +1654,14 @@ // For non-opaque windows, we don't draw anything, since we depend on the @@ -115,9 +115,9 @@ Index: render_widget_host_view_aura.cc void RenderWidgetHostViewAura::OnDeviceScaleFactorChanged( Index: render_widget_host_view_mac.mm =================================================================== ---- render_widget_host_view_mac.mm (revision 286351) +--- render_widget_host_view_mac.mm (revision 290621) +++ render_widget_host_view_mac.mm (working copy) -@@ -473,7 +473,7 @@ +@@ -471,7 +471,7 @@ background_layer_.reset([[CALayer alloc] init]); [background_layer_ diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index c07ce2946..ef3c68085 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -1,8 +1,8 @@ Index: public/web/WebView.h =================================================================== ---- public/web/WebView.h (revision 179174) +--- public/web/WebView.h (revision 180557) +++ public/web/WebView.h (working copy) -@@ -416,6 +416,7 @@ +@@ -422,6 +422,7 @@ // Sets whether select popup menus should be rendered by the browser. BLINK_EXPORT static void setUseExternalPopupMenus(bool); @@ -12,7 +12,7 @@ Index: public/web/WebView.h virtual void hidePopups() = 0; Index: Source/web/ChromeClientImpl.cpp =================================================================== ---- Source/web/ChromeClientImpl.cpp (revision 179174) +--- Source/web/ChromeClientImpl.cpp (revision 180557) +++ Source/web/ChromeClientImpl.cpp (working copy) @@ -727,7 +727,7 @@ @@ -25,9 +25,9 @@ Index: Source/web/ChromeClientImpl.cpp return adoptRef(new PopupMenuChromium(frame, client)); Index: Source/web/WebViewImpl.cpp =================================================================== ---- Source/web/WebViewImpl.cpp (revision 179174) +--- Source/web/WebViewImpl.cpp (revision 180557) +++ Source/web/WebViewImpl.cpp (working copy) -@@ -368,6 +368,7 @@ +@@ -370,6 +370,7 @@ , m_fakePageScaleAnimationPageScaleFactor(0) , m_fakePageScaleAnimationUseAnchor(false) , m_contextMenuAllowed(false) @@ -35,7 +35,7 @@ Index: Source/web/WebViewImpl.cpp , m_doingDragAndDrop(false) , m_ignoreInputEvents(false) , m_compositorDeviceScaleFactorOverride(0) -@@ -3673,9 +3674,14 @@ +@@ -3709,9 +3710,14 @@ updateLayerTreeViewport(); } @@ -53,9 +53,9 @@ Index: Source/web/WebViewImpl.cpp void WebViewImpl::startDragging(LocalFrame* frame, Index: Source/web/WebViewImpl.h =================================================================== ---- Source/web/WebViewImpl.h (revision 179174) +--- Source/web/WebViewImpl.h (revision 180557) +++ Source/web/WebViewImpl.h (working copy) -@@ -353,7 +353,8 @@ +@@ -356,7 +356,8 @@ // Returns true if popup menus should be rendered by the browser, false if // they should be rendered by WebKit (which is the default). @@ -65,7 +65,7 @@ Index: Source/web/WebViewImpl.h bool contextMenuAllowed() const { -@@ -629,6 +630,8 @@ +@@ -632,6 +633,8 @@ bool m_contextMenuAllowed;