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 revision 263053.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1683 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-04-30 17:14:40 +00:00
parent 95b76b30b5
commit 7f16f5fbd2
36 changed files with 123 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patch/patch.cfg
View File

@@ -87,18 +87,6 @@ patches = [
'name': 'prefs_webkit_1161',
'path': '../webkit/',
},
{
# Pass RenderFrameHost to WebContentsDelegate::HandleContextMenu.
# https://codereview.chromium.org/148843003/
'name': 'web_contents_304341',
'path': '../content/',
},
{
# Pass RenderFrameHost to WebContentsDelegate::HandleContextMenu.
# https://codereview.chromium.org/148843003/
'name': 'views_webview_304341',
'path': '../ui/views/controls/webview/',
},
{
# Disable scollbar bounce and overlay on OS X.
# http://code.google.com/p/chromiumembedded/issues/detail?id=364

4
patch/patches/build.patch
View File

@@ -1,6 +1,6 @@
Index: common.gypi
===================================================================
--- common.gypi (revision 261035)
--- common.gypi (revision 263053)
+++ 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 263053)
+++ mac/strip_save_dsym (working copy)
@@ -48,7 +48,7 @@
"bundle"]

10
patch/patches/content_nav_1129.patch
View File

@@ -1,6 +1,6 @@
Index: public/renderer/content_renderer_client.cc
===================================================================
--- public/renderer/content_renderer_client.cc (revision 261035)
--- public/renderer/content_renderer_client.cc (revision 263053)
+++ 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 261035)
--- public/renderer/content_renderer_client.h (revision 263053)
+++ public/renderer/content_renderer_client.h (working copy)
@@ -175,7 +175,6 @@
// Returns true if a popup window should be allowed.
@@ -40,9 +40,9 @@ 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 261035)
--- renderer/render_frame_impl.cc (revision 263053)
+++ renderer/render_frame_impl.cc (working copy)
@@ -2661,7 +2661,6 @@
@@ -2870,7 +2870,6 @@
WebNavigationType type,
WebNavigationPolicy default_policy,
bool is_redirect) {
@@ -50,7 +50,7 @@ Index: renderer/render_frame_impl.cc
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (request.url() != GURL(kSwappedOutURL) &&
@@ -2676,7 +2675,6 @@
@@ -2885,7 +2884,6 @@
is_redirect)) {
return blink::WebNavigationPolicyIgnore;
}

2
patch/patches/gritsettings.patch
View File

@@ -1,6 +1,6 @@
Index: resource_ids
===================================================================
--- resource_ids (revision 149431)
--- resource_ids (revision 263053)
+++ resource_ids (working copy)
@@ -16,6 +16,12 @@
{

2
patch/patches/gyp_331.patch
View File

@@ -1,6 +1,6 @@
Index: gyp/generator/ninja.py
===================================================================
--- gyp/generator/ninja.py (revision 1880)
--- gyp/generator/ninja.py (revision 1892)
+++ gyp/generator/ninja.py (working copy)
@@ -738,7 +738,16 @@
for path in copy['files']:

2
patch/patches/message_loop_443.patch
View File

@@ -1,6 +1,6 @@
Index: message_loop.cc
===================================================================
--- message_loop.cc (revision 261035)
--- message_loop.cc (revision 263053)
+++ message_loop.cc (working copy)
@@ -144,7 +144,7 @@
MessageLoop::~MessageLoop() {

18
patch/patches/prefs_content_1161.patch
View File

@@ -1,8 +1,8 @@
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 263053)
+++ public/common/common_param_traits_macros.h (working copy)
@@ -182,6 +182,7 @@
@@ -181,6 +181,7 @@
IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
IPC_STRUCT_TRAITS_MEMBER(compositor_touch_hit_testing)
@@ -12,14 +12,14 @@ 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 263053)
+++ renderer/web_preferences.cc (working copy)
@@ -163,6 +163,8 @@
settings->setCookieEnabled(prefs.cookie_enabled);
settings->setNavigateOnDragDrop(prefs.navigate_on_drag_drop);
@@ -171,6 +171,8 @@
settings->setJavaEnabled(prefs.java_enabled);
+ web_view->setBaseBackgroundColor(prefs.base_background_color);
+
// This setting affects the behavior of links in an editable region:
// clicking the link should select it rather than navigate to it.
// Safari uses the same default. It is unlikley an embedder would want to
// By default, allow_universal_access_from_file_urls is set to false and thus
// we mitigate attacks from local HTML files by not granting file:// URLs
// universal access. Only test shell will enable this.

8
patch/patches/prefs_webkit_1161.patch
View File

@@ -1,8 +1,8 @@
Index: common/webpreferences.cc
===================================================================
--- common/webpreferences.cc (revision 261035)
--- common/webpreferences.cc (revision 263053)
+++ common/webpreferences.cc (working copy)
@@ -121,6 +121,7 @@
@@ -120,6 +120,7 @@
use_solid_color_scrollbars(false),
compositor_touch_hit_testing(true),
navigate_on_drag_drop(true),
@@ -12,9 +12,9 @@ Index: common/webpreferences.cc
#if defined(OS_ANDROID)
Index: common/webpreferences.h
===================================================================
--- common/webpreferences.h (revision 261035)
--- common/webpreferences.h (revision 263053)
+++ common/webpreferences.h (working copy)
@@ -156,6 +156,7 @@
@@ -155,6 +155,7 @@
bool use_solid_color_scrollbars;
bool compositor_touch_hit_testing;
bool navigate_on_drag_drop;

4
patch/patches/public_browser_1161.patch
View File

@@ -1,6 +1,6 @@
Index: content_browser_client.cc
===================================================================
--- content_browser_client.cc (revision 261035)
--- content_browser_client.cc (revision 263053)
+++ 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 263053)
+++ content_browser_client.h (working copy)
@@ -22,6 +22,7 @@
#include "net/base/mime_util.h"

30
patch/patches/renderer_host_1161.patch
View File

@@ -1,8 +1,8 @@
Index: compositing_iosurface_layer_mac.mm
===================================================================
--- compositing_iosurface_layer_mac.mm (revision 261035)
--- compositing_iosurface_layer_mac.mm (revision 263053)
+++ 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,9 +13,9 @@ Index: compositing_iosurface_layer_mac.mm
}
Index: compositing_iosurface_mac.mm
===================================================================
--- compositing_iosurface_mac.mm (revision 261035)
--- compositing_iosurface_mac.mm (revision 263053)
+++ compositing_iosurface_mac.mm (working copy)
@@ -362,7 +362,7 @@
@@ -360,7 +360,7 @@
glUseProgram(0); CHECK_AND_SAVE_GL_ERROR();
} else {
// Should match the clear color of RenderWidgetHostViewMac.
@@ -26,7 +26,7 @@ Index: compositing_iosurface_mac.mm
Index: compositing_iosurface_shader_programs_mac.cc
===================================================================
--- compositing_iosurface_shader_programs_mac.cc (revision 261035)
--- compositing_iosurface_shader_programs_mac.cc (revision 263053)
+++ 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 261035)
--- compositing_iosurface_shader_programs_mac.h (revision 263053)
+++ 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 261035)
--- render_widget_host_view_aura.cc (revision 263053)
+++ render_widget_host_view_aura.cc (working copy)
@@ -2685,8 +2685,10 @@
@@ -2284,8 +2284,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 261035)
--- render_widget_host_view_mac.mm (revision 263053)
+++ render_widget_host_view_mac.mm (working copy)
@@ -434,7 +434,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];
}
@@ -3087,7 +3087,7 @@
@@ -3097,7 +3097,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()) {
@@ -3109,7 +3109,7 @@
@@ -3119,7 +3119,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));
}
}
@@ -3259,7 +3259,7 @@
@@ -3269,7 +3269,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();
@@ -4282,7 +4282,7 @@
@@ -4276,7 +4276,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).
@@ -4311,7 +4311,7 @@
@@ -4305,7 +4305,7 @@
inContext:context];
} else {
CGContextSetFillColorWithColor(context,

6
patch/patches/spi_webcore_364.patch
View File

@@ -1,8 +1,8 @@
Index: core/frame/FrameView.cpp
===================================================================
--- core/frame/FrameView.cpp (revision 170525)
--- core/frame/FrameView.cpp (revision 171269)
+++ core/frame/FrameView.cpp (working copy)
@@ -165,8 +165,10 @@
@@ -162,8 +162,10 @@
if (!isMainFrame())
return;
@@ -15,7 +15,7 @@ Index: core/frame/FrameView.cpp
PassRefPtr<FrameView> FrameView::create(LocalFrame* frame)
Index: platform/scroll/ScrollbarThemeMacCommon.mm
===================================================================
--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 170525)
--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 171269)
+++ platform/scroll/ScrollbarThemeMacCommon.mm (working copy)
@@ -358,10 +358,14 @@
// static

2
patch/patches/underlay_1051.patch
View File

@@ -1,6 +1,6 @@
Index: underlay_opengl_hosting_window.h
===================================================================
--- underlay_opengl_hosting_window.h (revision 248478)
--- underlay_opengl_hosting_window.h (revision 263053)
+++ underlay_opengl_hosting_window.h (working copy)
@@ -12,7 +12,7 @@
// Common base class for windows that host a OpenGL surface that renders under

65
patch/patches/views_webview_304341.patch
View File

@@ -1,65 +0,0 @@
Index: web_dialog_view.cc
===================================================================
--- web_dialog_view.cc (revision 261035)
+++ web_dialog_view.cc (working copy)
@@ -257,13 +257,6 @@
return true;
}
-bool WebDialogView::HandleContextMenu(
- const content::ContextMenuParams& params) {
- if (delegate_)
- return delegate_->HandleContextMenu(params);
- return WebDialogWebContentsDelegate::HandleContextMenu(params);
-}
-
////////////////////////////////////////////////////////////////////////////////
// content::WebContentsDelegate implementation:
@@ -337,6 +330,15 @@
*proceed_to_fire_unload = proceed;
}
+bool WebDialogView::HandleContextMenu(
+ content::RenderFrameHost* render_frame_host,
+ const content::ContextMenuParams& params) {
+ if (delegate_)
+ return delegate_->HandleContextMenu(params);
+ return WebDialogWebContentsDelegate::HandleContextMenu(render_frame_host,
+ params);
+}
+
////////////////////////////////////////////////////////////////////////////////
// WebDialogView, private:
Index: web_dialog_view.h
===================================================================
--- web_dialog_view.h (revision 261035)
+++ web_dialog_view.h (working copy)
@@ -74,6 +74,7 @@
virtual const views::Widget* GetWidget() const OVERRIDE;
// Overridden from ui::WebDialogDelegate:
+ using ui::WebDialogDelegate::HandleContextMenu;
virtual ui::ModalType GetDialogModalType() const OVERRIDE;
virtual base::string16 GetDialogTitle() const OVERRIDE;
virtual GURL GetDialogContentURL() const OVERRIDE;
@@ -91,8 +92,6 @@
virtual void OnCloseContents(content::WebContents* source,
bool* out_close_dialog) OVERRIDE;
virtual bool ShouldShowDialogTitle() const OVERRIDE;
- virtual bool HandleContextMenu(
- const content::ContextMenuParams& params) OVERRIDE;
// Overridden from content::WebContentsDelegate:
virtual void MoveContents(content::WebContents* source,
@@ -115,6 +114,9 @@
virtual void BeforeUnloadFired(content::WebContents* tab,
bool proceed,
bool* proceed_to_fire_unload) OVERRIDE;
+ virtual bool HandleContextMenu(
+ content::RenderFrameHost* render_frame_host,
+ const content::ContextMenuParams& params) OVERRIDE;
private:
FRIEND_TEST_ALL_PREFIXES(WebDialogBrowserTest, WebContentRendered);

10
patch/patches/views_widget_180.patch
View File

@@ -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 263053)
+++ 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 263053)
+++ 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 263053)
+++ 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 263053)
+++ 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 263053)
+++ widget.h (working copy)
@@ -200,6 +200,7 @@
// Should the widget be double buffered? Default is false.

92
patch/patches/web_contents_304341.patch
View File

@@ -1,92 +0,0 @@
Index: browser/browser_plugin/browser_plugin_guest.cc
===================================================================
--- browser/browser_plugin/browser_plugin_guest.cc (revision 261035)
+++ browser/browser_plugin/browser_plugin_guest.cc (working copy)
@@ -794,7 +794,8 @@
return this;
}
-bool BrowserPluginGuest::HandleContextMenu(const ContextMenuParams& params) {
+bool BrowserPluginGuest::HandleContextMenu(RenderFrameHost* render_frame_host,
+ const ContextMenuParams& params) {
// TODO(fsamuel): We show the regular page context menu handler for now until
// we implement the Apps Context Menu API for Browser Plugin (see
// http://crbug.com/140315).
Index: browser/browser_plugin/browser_plugin_guest.h
===================================================================
--- browser/browser_plugin/browser_plugin_guest.h (revision 261035)
+++ browser/browser_plugin/browser_plugin_guest.h (working copy)
@@ -204,7 +204,8 @@
double progress) OVERRIDE;
virtual void CloseContents(WebContents* source) OVERRIDE;
virtual JavaScriptDialogManager* GetJavaScriptDialogManager() OVERRIDE;
- virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE;
+ virtual bool HandleContextMenu(RenderFrameHost* render_frame_host,
+ const ContextMenuParams& params) OVERRIDE;
virtual void HandleKeyboardEvent(
WebContents* source,
const NativeWebKeyboardEvent& event) OVERRIDE;
Index: browser/web_contents/web_contents_impl.cc
===================================================================
--- browser/web_contents/web_contents_impl.cc (revision 261035)
+++ browser/web_contents/web_contents_impl.cc (working copy)
@@ -2831,7 +2831,7 @@
void WebContentsImpl::ShowContextMenu(RenderFrameHost* render_frame_host,
const ContextMenuParams& params) {
// Allow WebContentsDelegates to handle the context menu operation first.
- if (delegate_ && delegate_->HandleContextMenu(params))
+ if (delegate_ && delegate_->HandleContextMenu(render_frame_host, params))
return;
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 261035)
+++ browser/web_contents/web_contents_view_mac.mm (working copy)
@@ -227,12 +227,6 @@
void WebContentsViewMac::ShowContextMenu(
content::RenderFrameHost* render_frame_host,
const ContextMenuParams& params) {
- // Allow delegates to handle the context menu operation first.
- if (web_contents_->GetDelegate() &&
- web_contents_->GetDelegate()->HandleContextMenu(params)) {
- return;
- }
-
if (delegate())
delegate()->ShowContextMenu(render_frame_host, params);
else
Index: public/browser/web_contents_delegate.cc
===================================================================
--- public/browser/web_contents_delegate.cc (revision 261035)
+++ public/browser/web_contents_delegate.cc (working copy)
@@ -76,6 +76,7 @@
}
bool WebContentsDelegate::HandleContextMenu(
+ RenderFrameHost* render_frame_host,
const content::ContextMenuParams& params) {
return false;
}
Index: public/browser/web_contents_delegate.h
===================================================================
--- public/browser/web_contents_delegate.h (revision 261035)
+++ public/browser/web_contents_delegate.h (working copy)
@@ -35,6 +35,7 @@
class DownloadItem;
class JavaScriptDialogManager;
class PageState;
+class RenderFrameHost;
class RenderViewHost;
class SessionStorageNamespace;
class WebContents;
@@ -231,7 +232,8 @@
virtual int GetExtraRenderViewHeight() const;
// Returns true if the context menu operation was handled by the delegate.
- virtual bool HandleContextMenu(const content::ContextMenuParams& params);
+ virtual bool HandleContextMenu(RenderFrameHost* render_frame_host,
+ const content::ContextMenuParams& params);
// Opens source view for given WebContents that is navigated to the given
// page url.

2
patch/patches/webkit_933.patch
View File

@@ -1,6 +1,6 @@
Index: WebNode.cpp
===================================================================
--- WebNode.cpp (revision 170525)
--- WebNode.cpp (revision 171269)
+++ WebNode.cpp (working copy)
@@ -172,7 +172,7 @@
void WebNode::addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture)

2
patch/patches/zlib.patch
View File

@@ -1,6 +1,6 @@
Index: contrib/minizip/unzip.c
===================================================================
--- contrib/minizip/unzip.c (revision 176706)
--- contrib/minizip/unzip.c (revision 263053)
+++ contrib/minizip/unzip.c (working copy)
@@ -69,7 +69,7 @@
#include <string.h>