diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index de482e102..ea783658e 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/35.0.1916.27', - 'chromium_checkout': 'refs/tags/35.0.1916.27', + 'release_url': 'http://src.chromium.org/svn/releases/35.0.1916.86', + 'chromium_checkout': 'refs/tags/35.0.1916.86', } diff --git a/patch/patches/build.patch b/patch/patches/build.patch index ac1a5b3dc..5610f56d0 100644 --- a/patch/patches/build.patch +++ b/patch/patches/build.patch @@ -1,6 +1,6 @@ Index: common.gypi =================================================================== ---- common.gypi (revision 261035) +--- common.gypi (revision 266998) +++ common.gypi (working copy) @@ -9,6 +9,9 @@ # Variables expected to be overriden on the GYP command line (-D) or by @@ -27,7 +27,7 @@ Index: common.gypi ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and chromeos==0', { Index: mac/strip_save_dsym =================================================================== ---- mac/strip_save_dsym (revision 261035) +--- mac/strip_save_dsym (revision 266998) +++ mac/strip_save_dsym (working copy) @@ -48,7 +48,7 @@ "bundle"] diff --git a/patch/patches/content_nav_1129.patch b/patch/patches/content_nav_1129.patch index 18970a739..2f42cc4b9 100644 --- a/patch/patches/content_nav_1129.patch +++ b/patch/patches/content_nav_1129.patch @@ -1,6 +1,6 @@ Index: public/renderer/content_renderer_client.cc =================================================================== ---- public/renderer/content_renderer_client.cc (revision 262261) +--- public/renderer/content_renderer_client.cc (revision 266998) +++ public/renderer/content_renderer_client.cc (working copy) @@ -92,7 +92,6 @@ return false; @@ -20,7 +20,7 @@ Index: public/renderer/content_renderer_client.cc const GURL& url, Index: public/renderer/content_renderer_client.h =================================================================== ---- public/renderer/content_renderer_client.h (revision 262261) +--- public/renderer/content_renderer_client.h (revision 266998) +++ public/renderer/content_renderer_client.h (working copy) @@ -175,7 +175,6 @@ // Returns true if a popup window should be allowed. @@ -40,7 +40,7 @@ Index: public/renderer/content_renderer_client.h // If |send_referrer| is set to false (which is the default), no referrer Index: renderer/render_frame_impl.cc =================================================================== ---- renderer/render_frame_impl.cc (revision 262261) +--- renderer/render_frame_impl.cc (revision 266998) +++ renderer/render_frame_impl.cc (working copy) @@ -2662,7 +2662,6 @@ WebNavigationType type, diff --git a/patch/patches/gritsettings.patch b/patch/patches/gritsettings.patch index ea71cce84..6e902e312 100644 --- a/patch/patches/gritsettings.patch +++ b/patch/patches/gritsettings.patch @@ -1,6 +1,6 @@ Index: resource_ids =================================================================== ---- resource_ids (revision 149431) +--- resource_ids (revision 266998) +++ resource_ids (working copy) @@ -16,6 +16,12 @@ { diff --git a/patch/patches/message_loop_443.patch b/patch/patches/message_loop_443.patch index dd398edce..f431ba02e 100644 --- a/patch/patches/message_loop_443.patch +++ b/patch/patches/message_loop_443.patch @@ -1,6 +1,6 @@ Index: message_loop.cc =================================================================== ---- message_loop.cc (revision 261035) +--- message_loop.cc (revision 266998) +++ message_loop.cc (working copy) @@ -144,7 +144,7 @@ MessageLoop::~MessageLoop() { diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index f9d6c7c59..e1fb9a3fa 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -1,6 +1,6 @@ Index: public/common/common_param_traits_macros.h =================================================================== ---- public/common/common_param_traits_macros.h (revision 261035) +--- public/common/common_param_traits_macros.h (revision 266998) +++ public/common/common_param_traits_macros.h (working copy) @@ -182,6 +182,7 @@ IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale) @@ -12,7 +12,7 @@ Index: public/common/common_param_traits_macros.h IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled) Index: renderer/web_preferences.cc =================================================================== ---- renderer/web_preferences.cc (revision 261035) +--- renderer/web_preferences.cc (revision 266998) +++ renderer/web_preferences.cc (working copy) @@ -163,6 +163,8 @@ settings->setCookieEnabled(prefs.cookie_enabled); diff --git a/patch/patches/prefs_webkit_1161.patch b/patch/patches/prefs_webkit_1161.patch index b0620597b..7110e989c 100644 --- a/patch/patches/prefs_webkit_1161.patch +++ b/patch/patches/prefs_webkit_1161.patch @@ -1,6 +1,6 @@ Index: common/webpreferences.cc =================================================================== ---- common/webpreferences.cc (revision 261035) +--- common/webpreferences.cc (revision 266998) +++ common/webpreferences.cc (working copy) @@ -121,6 +121,7 @@ use_solid_color_scrollbars(false), @@ -12,7 +12,7 @@ Index: common/webpreferences.cc #if defined(OS_ANDROID) Index: common/webpreferences.h =================================================================== ---- common/webpreferences.h (revision 261035) +--- common/webpreferences.h (revision 266998) +++ common/webpreferences.h (working copy) @@ -156,6 +156,7 @@ bool use_solid_color_scrollbars; diff --git a/patch/patches/public_browser_1161.patch b/patch/patches/public_browser_1161.patch index c151d40e7..e00e5478c 100644 --- a/patch/patches/public_browser_1161.patch +++ b/patch/patches/public_browser_1161.patch @@ -1,6 +1,6 @@ Index: content_browser_client.cc =================================================================== ---- content_browser_client.cc (revision 261035) +--- content_browser_client.cc (revision 266998) +++ content_browser_client.cc (working copy) @@ -255,6 +255,10 @@ return true; @@ -15,7 +15,7 @@ Index: content_browser_client.cc } Index: content_browser_client.h =================================================================== ---- content_browser_client.h (revision 261035) +--- content_browser_client.h (revision 266998) +++ content_browser_client.h (working copy) @@ -22,6 +22,7 @@ #include "net/base/mime_util.h" diff --git a/patch/patches/renderer_host_1161.patch b/patch/patches/renderer_host_1161.patch index a3377f1a0..d7ed81971 100644 --- a/patch/patches/renderer_host_1161.patch +++ b/patch/patches/renderer_host_1161.patch @@ -1,8 +1,8 @@ Index: compositing_iosurface_layer_mac.mm =================================================================== ---- compositing_iosurface_layer_mac.mm (revision 262261) +--- compositing_iosurface_layer_mac.mm (revision 266998) +++ compositing_iosurface_layer_mac.mm (working copy) -@@ -120,7 +120,7 @@ +@@ -117,7 +117,7 @@ (context_ && context_->cgl_context() != glContext) || !renderWidgetHostView_ || !renderWidgetHostView_->compositing_iosurface_) { @@ -13,7 +13,7 @@ Index: compositing_iosurface_layer_mac.mm } Index: compositing_iosurface_mac.mm =================================================================== ---- compositing_iosurface_mac.mm (revision 262261) +--- compositing_iosurface_mac.mm (revision 266998) +++ compositing_iosurface_mac.mm (working copy) @@ -362,7 +362,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 262261) +--- compositing_iosurface_shader_programs_mac.cc (revision 266998) +++ compositing_iosurface_shader_programs_mac.cc (working copy) @@ -11,6 +11,7 @@ #include "base/debug/trace_event.h" @@ -78,7 +78,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 262261) +--- compositing_iosurface_shader_programs_mac.h (revision 266998) +++ compositing_iosurface_shader_programs_mac.h (working copy) @@ -48,6 +48,8 @@ return rgb_to_yv12_output_format_; @@ -91,9 +91,9 @@ Index: compositing_iosurface_shader_programs_mac.h TransformsRGBToYV12); Index: render_widget_host_view_aura.cc =================================================================== ---- render_widget_host_view_aura.cc (revision 262261) +--- render_widget_host_view_aura.cc (revision 266998) +++ render_widget_host_view_aura.cc (working copy) -@@ -2679,8 +2679,10 @@ +@@ -2685,8 +2685,10 @@ // For non-opaque windows, we don't draw anything, since we depend on the // canvas coming from the compositor to already be initialized as // transparent. @@ -108,9 +108,9 @@ Index: render_widget_host_view_aura.cc Index: render_widget_host_view_mac.mm =================================================================== ---- render_widget_host_view_mac.mm (revision 262261) +--- render_widget_host_view_mac.mm (revision 266998) +++ render_widget_host_view_mac.mm (working copy) -@@ -433,7 +433,7 @@ +@@ -440,7 +440,7 @@ use_core_animation_ = true; background_layer_.reset([[CALayer alloc] init]); [background_layer_ @@ -119,7 +119,7 @@ Index: render_widget_host_view_mac.mm [cocoa_view_ setLayer:background_layer_]; [cocoa_view_ setWantsLayer:YES]; } -@@ -3065,7 +3065,7 @@ +@@ -3108,7 +3108,7 @@ NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)]; CGContextSetFillColorWithColor(context, @@ -128,7 +128,7 @@ Index: render_widget_host_view_mac.mm CGContextFillRect(context, NSRectToCGRect(r)); } if (damagedRect.bottom() > rect.bottom()) { -@@ -3087,7 +3087,7 @@ +@@ -3130,7 +3130,7 @@ NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)]; CGContextSetFillColorWithColor(context, @@ -137,7 +137,7 @@ Index: render_widget_host_view_mac.mm CGContextFillRect(context, NSRectToCGRect(r)); } } -@@ -3237,7 +3237,7 @@ +@@ -3280,7 +3280,7 @@ } } else { CGContextSetFillColorWithColor(context, @@ -146,7 +146,7 @@ Index: render_widget_host_view_mac.mm CGContextFillRect(context, dirtyRect); if (renderWidgetHostView_->whiteout_start_time_.is_null()) renderWidgetHostView_->whiteout_start_time_ = base::TimeTicks::Now(); -@@ -4260,7 +4260,7 @@ +@@ -4303,7 +4303,7 @@ if (self = [super init]) { renderWidgetHostView_ = r; @@ -155,7 +155,7 @@ Index: render_widget_host_view_mac.mm [self setAnchorPoint:CGPointMake(0, 0)]; // Setting contents gravity is necessary to prevent the layer from being // scaled during dyanmic resizes (especially with devtools open). -@@ -4289,7 +4289,7 @@ +@@ -4332,7 +4332,7 @@ inContext:context]; } else { CGContextSetFillColorWithColor(context, diff --git a/patch/patches/spi_webcore_364.patch b/patch/patches/spi_webcore_364.patch index d87e5a3b6..d15f5dca0 100644 --- a/patch/patches/spi_webcore_364.patch +++ b/patch/patches/spi_webcore_364.patch @@ -1,6 +1,6 @@ Index: core/frame/FrameView.cpp =================================================================== ---- core/frame/FrameView.cpp (revision 170525) +--- core/frame/FrameView.cpp (revision 172878) +++ core/frame/FrameView.cpp (working copy) @@ -165,8 +165,10 @@ if (!isMainFrame()) @@ -15,7 +15,7 @@ Index: core/frame/FrameView.cpp PassRefPtr FrameView::create(LocalFrame* frame) Index: platform/scroll/ScrollbarThemeMacCommon.mm =================================================================== ---- platform/scroll/ScrollbarThemeMacCommon.mm (revision 170525) +--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 172878) +++ platform/scroll/ScrollbarThemeMacCommon.mm (working copy) @@ -358,10 +358,14 @@ // static diff --git a/patch/patches/underlay_1051.patch b/patch/patches/underlay_1051.patch index 9064c03f9..80d39240d 100644 --- a/patch/patches/underlay_1051.patch +++ b/patch/patches/underlay_1051.patch @@ -1,6 +1,6 @@ Index: underlay_opengl_hosting_window.h =================================================================== ---- underlay_opengl_hosting_window.h (revision 248478) +--- underlay_opengl_hosting_window.h (revision 266998) +++ underlay_opengl_hosting_window.h (working copy) @@ -12,7 +12,7 @@ // Common base class for windows that host a OpenGL surface that renders under diff --git a/patch/patches/views_webview_304341.patch b/patch/patches/views_webview_304341.patch index 494c9a93d..2e3ef48e9 100644 --- a/patch/patches/views_webview_304341.patch +++ b/patch/patches/views_webview_304341.patch @@ -1,6 +1,6 @@ Index: web_dialog_view.cc =================================================================== ---- web_dialog_view.cc (revision 261035) +--- web_dialog_view.cc (revision 266998) +++ web_dialog_view.cc (working copy) @@ -257,13 +257,6 @@ return true; @@ -34,7 +34,7 @@ Index: web_dialog_view.cc Index: web_dialog_view.h =================================================================== ---- web_dialog_view.h (revision 261035) +--- web_dialog_view.h (revision 266998) +++ web_dialog_view.h (working copy) @@ -74,6 +74,7 @@ virtual const views::Widget* GetWidget() const OVERRIDE; diff --git a/patch/patches/views_widget_180.patch b/patch/patches/views_widget_180.patch index 29f6527a7..8d64b8ed0 100644 --- a/patch/patches/views_widget_180.patch +++ b/patch/patches/views_widget_180.patch @@ -1,6 +1,6 @@ Index: desktop_aura/desktop_screen_win.cc =================================================================== ---- desktop_aura/desktop_screen_win.cc (revision 261035) +--- desktop_aura/desktop_screen_win.cc (revision 266998) +++ desktop_aura/desktop_screen_win.cc (working copy) @@ -54,6 +54,8 @@ } @@ -13,7 +13,7 @@ Index: desktop_aura/desktop_screen_win.cc } Index: desktop_aura/desktop_window_tree_host_win.cc =================================================================== ---- desktop_aura/desktop_window_tree_host_win.cc (revision 261035) +--- desktop_aura/desktop_window_tree_host_win.cc (revision 266998) +++ desktop_aura/desktop_window_tree_host_win.cc (working copy) @@ -130,7 +130,9 @@ native_widget_delegate_); @@ -28,7 +28,7 @@ Index: desktop_aura/desktop_window_tree_host_win.cc message_handler_->set_remove_standard_frame(params.remove_standard_frame); Index: desktop_aura/desktop_window_tree_host_win.h =================================================================== ---- desktop_aura/desktop_window_tree_host_win.h (revision 261035) +--- desktop_aura/desktop_window_tree_host_win.h (revision 266998) +++ desktop_aura/desktop_window_tree_host_win.h (working copy) @@ -214,6 +214,7 @@ LPARAM l_param) OVERRIDE; @@ -40,7 +40,7 @@ Index: desktop_aura/desktop_window_tree_host_win.h HWND GetHWND() const; Index: widget.cc =================================================================== ---- widget.cc (revision 261035) +--- widget.cc (revision 266998) +++ widget.cc (working copy) @@ -122,6 +122,7 @@ show_state(ui::SHOW_STATE_DEFAULT), @@ -74,7 +74,7 @@ Index: widget.cc } Index: widget.h =================================================================== ---- widget.h (revision 261035) +--- widget.h (revision 266998) +++ widget.h (working copy) @@ -200,6 +200,7 @@ // Should the widget be double buffered? Default is false. diff --git a/patch/patches/web_contents_304341.patch b/patch/patches/web_contents_304341.patch index 973302223..9dd1ea2a7 100644 --- a/patch/patches/web_contents_304341.patch +++ b/patch/patches/web_contents_304341.patch @@ -1,6 +1,6 @@ Index: browser/browser_plugin/browser_plugin_guest.cc =================================================================== ---- browser/browser_plugin/browser_plugin_guest.cc (revision 262261) +--- browser/browser_plugin/browser_plugin_guest.cc (revision 266998) +++ browser/browser_plugin/browser_plugin_guest.cc (working copy) @@ -794,7 +794,8 @@ return this; @@ -14,7 +14,7 @@ Index: browser/browser_plugin/browser_plugin_guest.cc // http://crbug.com/140315). Index: browser/browser_plugin/browser_plugin_guest.h =================================================================== ---- browser/browser_plugin/browser_plugin_guest.h (revision 262261) +--- browser/browser_plugin/browser_plugin_guest.h (revision 266998) +++ browser/browser_plugin/browser_plugin_guest.h (working copy) @@ -204,7 +204,8 @@ double progress) OVERRIDE; @@ -28,9 +28,9 @@ Index: browser/browser_plugin/browser_plugin_guest.h const NativeWebKeyboardEvent& event) OVERRIDE; Index: browser/web_contents/web_contents_impl.cc =================================================================== ---- browser/web_contents/web_contents_impl.cc (revision 262261) +--- browser/web_contents/web_contents_impl.cc (revision 266998) +++ browser/web_contents/web_contents_impl.cc (working copy) -@@ -2788,7 +2788,7 @@ +@@ -2804,7 +2804,7 @@ void WebContentsImpl::ShowContextMenu(RenderFrameHost* render_frame_host, const ContextMenuParams& params) { // Allow WebContentsDelegates to handle the context menu operation first. @@ -41,7 +41,7 @@ Index: browser/web_contents/web_contents_impl.cc render_view_host_delegate_view_->ShowContextMenu(render_frame_host, params); Index: browser/web_contents/web_contents_view_mac.mm =================================================================== ---- browser/web_contents/web_contents_view_mac.mm (revision 262261) +--- browser/web_contents/web_contents_view_mac.mm (revision 266998) +++ browser/web_contents/web_contents_view_mac.mm (working copy) @@ -227,12 +227,6 @@ void WebContentsViewMac::ShowContextMenu( @@ -58,7 +58,7 @@ Index: browser/web_contents/web_contents_view_mac.mm else Index: public/browser/web_contents_delegate.cc =================================================================== ---- public/browser/web_contents_delegate.cc (revision 262261) +--- public/browser/web_contents_delegate.cc (revision 266998) +++ public/browser/web_contents_delegate.cc (working copy) @@ -76,6 +76,7 @@ } @@ -70,7 +70,7 @@ Index: public/browser/web_contents_delegate.cc } Index: public/browser/web_contents_delegate.h =================================================================== ---- public/browser/web_contents_delegate.h (revision 262261) +--- public/browser/web_contents_delegate.h (revision 266998) +++ public/browser/web_contents_delegate.h (working copy) @@ -35,6 +35,7 @@ class DownloadItem; diff --git a/patch/patches/webkit_933.patch b/patch/patches/webkit_933.patch index 74ebc4c24..3bdf76f62 100644 --- a/patch/patches/webkit_933.patch +++ b/patch/patches/webkit_933.patch @@ -1,6 +1,6 @@ Index: WebNode.cpp =================================================================== ---- WebNode.cpp (revision 170525) +--- WebNode.cpp (revision 172878) +++ WebNode.cpp (working copy) @@ -172,7 +172,7 @@ void WebNode::addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture) diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 34c40d58f..939d0b146 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -1,6 +1,6 @@ Index: public/web/WebView.h =================================================================== ---- public/web/WebView.h (revision 171002) +--- public/web/WebView.h (revision 172878) +++ public/web/WebView.h (working copy) @@ -417,6 +417,7 @@ @@ -12,7 +12,7 @@ Index: public/web/WebView.h virtual void hidePopups() = 0; Index: Source/web/ChromeClientImpl.cpp =================================================================== ---- Source/web/ChromeClientImpl.cpp (revision 171002) +--- Source/web/ChromeClientImpl.cpp (revision 172878) +++ Source/web/ChromeClientImpl.cpp (working copy) @@ -755,7 +755,7 @@ @@ -25,7 +25,7 @@ Index: Source/web/ChromeClientImpl.cpp return adoptRef(new PopupMenuChromium(frame, client)); Index: Source/web/WebViewImpl.cpp =================================================================== ---- Source/web/WebViewImpl.cpp (revision 171002) +--- Source/web/WebViewImpl.cpp (revision 172878) +++ Source/web/WebViewImpl.cpp (working copy) @@ -338,6 +338,7 @@ , m_fakePageScaleAnimationPageScaleFactor(0) @@ -35,7 +35,7 @@ Index: Source/web/WebViewImpl.cpp , m_doingDragAndDrop(false) , m_ignoreInputEvents(false) , m_compositorDeviceScaleFactorOverride(0) -@@ -3472,9 +3473,14 @@ +@@ -3483,9 +3484,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 171002) +--- Source/web/WebViewImpl.h (revision 172878) +++ Source/web/WebViewImpl.h (working copy) -@@ -391,7 +391,8 @@ +@@ -392,7 +392,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 { -@@ -669,6 +670,8 @@ +@@ -670,6 +671,8 @@ bool m_contextMenuAllowed; diff --git a/patch/patches/zlib.patch b/patch/patches/zlib.patch index 0e40c4f0d..d0f18f3af 100644 --- a/patch/patches/zlib.patch +++ b/patch/patches/zlib.patch @@ -1,6 +1,6 @@ Index: contrib/minizip/unzip.c =================================================================== ---- contrib/minizip/unzip.c (revision 176706) +--- contrib/minizip/unzip.c (revision 266998) +++ contrib/minizip/unzip.c (working copy) @@ -69,7 +69,7 @@ #include