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 251746.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1628 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-02-19 16:27:54 +00:00
parent 4b75a68f9b
commit 5b6086ffb3
26 changed files with 105 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patch/patches/build.patch
View File

@@ -1,6 +1,6 @@
Index: common.gypi
===================================================================
--- common.gypi (revision 248478)
--- common.gypi (revision 251746)
+++ common.gypi (working copy)
@@ -9,6 +9,9 @@
# Variables expected to be overriden on the GYP command line (-D) or by
@@ -12,7 +12,7 @@ Index: common.gypi
# Putting a variables dict inside another variables dict looks kind of
# weird. This is done so that 'host_arch', 'chromeos', etc are defined as
# variables within the outer variables dict here. This is necessary
@@ -88,9 +91,9 @@
@@ -85,9 +88,9 @@
#
# TODO(erg): Merge this into the previous block once compiling with
# aura safely implies including ash capabilities.
@@ -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 248478)
--- mac/strip_save_dsym (revision 251746)
+++ 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 248478)
--- public/renderer/content_renderer_client.cc (revision 251746)
+++ 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 248478)
--- public/renderer/content_renderer_client.h (revision 251746)
+++ 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_view_impl.cc
===================================================================
--- renderer/render_view_impl.cc (revision 248478)
--- renderer/render_view_impl.cc (revision 251746)
+++ renderer/render_view_impl.cc (working copy)
@@ -3071,7 +3071,6 @@
@@ -2628,7 +2628,6 @@
WebDataSource::ExtraData* extraData, const WebURLRequest& request,
WebNavigationType type, WebNavigationPolicy default_policy,
bool is_redirect) {
@@ -50,7 +50,7 @@ Index: renderer/render_view_impl.cc
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (request.url() != GURL(kSwappedOutURL) &&
@@ -3086,7 +3085,6 @@
@@ -2643,7 +2642,6 @@
is_redirect)) {
return blink::WebNavigationPolicyIgnore;
}

4
patch/patches/gyp_331.patch
View File

@@ -1,8 +1,8 @@
Index: gyp/generator/ninja.py
===================================================================
--- gyp/generator/ninja.py (revision 1769)
--- gyp/generator/ninja.py (revision 1852)
+++ gyp/generator/ninja.py (working copy)
@@ -723,7 +723,16 @@
@@ -726,7 +726,16 @@
for path in copy['files']:
# Normalize the path so trailing slashes don't confuse us.
path = os.path.normpath(path)

26
patch/patches/renderer_host_1161.patch
View File

@@ -1,10 +1,10 @@
Index: compositing_iosurface_layer_mac.mm
===================================================================
--- compositing_iosurface_layer_mac.mm (revision 248478)
--- compositing_iosurface_layer_mac.mm (revision 251746)
+++ compositing_iosurface_layer_mac.mm (working copy)
@@ -119,7 +119,7 @@
if (!context_.get() || !renderWidgetHostView_ ||
(context_ && context_->cgl_context() != glContext) ||
!renderWidgetHostView_ ||
!renderWidgetHostView_->compositing_iosurface_) {
- glClearColor(1, 1, 1, 1);
+ glClearColor(0, 0, 0, 0);
@@ -13,9 +13,9 @@ Index: compositing_iosurface_layer_mac.mm
}
Index: compositing_iosurface_mac.mm
===================================================================
--- compositing_iosurface_mac.mm (revision 248478)
--- compositing_iosurface_mac.mm (revision 251746)
+++ compositing_iosurface_mac.mm (working copy)
@@ -424,7 +424,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 248478)
--- compositing_iosurface_shader_programs_mac.cc (revision 251746)
+++ 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 248478)
--- compositing_iosurface_shader_programs_mac.h (revision 251746)
+++ 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_mac.mm
===================================================================
--- render_widget_host_view_mac.mm (revision 248478)
--- render_widget_host_view_mac.mm (revision 251746)
+++ render_widget_host_view_mac.mm (working copy)
@@ -494,7 +494,7 @@
@@ -483,7 +483,7 @@
software_layer_.reset([[CALayer alloc] init]);
if (!software_layer_)
LOG(ERROR) << "Failed to create CALayer for software rendering";
@@ -102,7 +102,7 @@ Index: render_widget_host_view_mac.mm
[software_layer_ setDelegate:cocoa_view_];
[software_layer_ setContentsGravity:kCAGravityTopLeft];
[software_layer_ setFrame:NSRectToCGRect([cocoa_view_ bounds])];
@@ -2846,7 +2846,7 @@
@@ -2856,7 +2856,7 @@
NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)];
CGContextSetFillColorWithColor(context,
@@ -111,7 +111,7 @@ Index: render_widget_host_view_mac.mm
CGContextFillRect(context, NSRectToCGRect(r));
}
if (damagedRect.bottom() > rect.bottom()) {
@@ -2868,7 +2868,7 @@
@@ -2878,7 +2878,7 @@
NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)];
CGContextSetFillColorWithColor(context,
@@ -120,7 +120,7 @@ Index: render_widget_host_view_mac.mm
CGContextFillRect(context, NSRectToCGRect(r));
}
}
@@ -3029,7 +3029,7 @@
@@ -3037,7 +3037,7 @@
}
} else {
CGContextSetFillColorWithColor(context,
@@ -129,7 +129,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();
@@ -4037,7 +4037,7 @@
@@ -4045,7 +4045,7 @@
if (!renderWidgetHostView_->render_widget_host_ ||
renderWidgetHostView_->render_widget_host_->is_hidden()) {
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 166298)
--- core/frame/FrameView.cpp (revision 167304)
+++ core/frame/FrameView.cpp (working copy)
@@ -168,8 +168,10 @@
@@ -141,8 +141,10 @@
if (!isMainFrame())
return;
@@ -15,7 +15,7 @@ Index: core/frame/FrameView.cpp
PassRefPtr<FrameView> FrameView::create(Frame* frame)
Index: platform/scroll/ScrollbarThemeMacCommon.mm
===================================================================
--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 166298)
--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 167304)
+++ platform/scroll/ScrollbarThemeMacCommon.mm (working copy)
@@ -369,10 +369,14 @@
// static

49
patch/patches/views_widget_180.patch
View File

@@ -1,30 +1,6 @@
Index: desktop_aura/desktop_root_window_host_win.cc
===================================================================
--- desktop_aura/desktop_root_window_host_win.cc (revision 248478)
+++ desktop_aura/desktop_root_window_host_win.cc (working copy)
@@ -132,7 +132,9 @@
native_widget_delegate_);
HWND parent_hwnd = NULL;
- if (params.parent && params.parent->GetDispatcher()) {
+ if (params.parent_widget) {
+ parent_hwnd = params.parent_widget;
+ } else if (params.parent && params.parent->GetDispatcher()) {
parent_hwnd =
params.parent->GetDispatcher()->host()->GetAcceleratedWidget();
}
@@ -771,7 +773,7 @@
void DesktopWindowTreeHostWin::HandleCreate() {
// TODO(beng): moar
- NOTIMPLEMENTED();
+ // NOTIMPLEMENTED();
native_widget_delegate_->OnNativeWidgetCreated(true);
Index: desktop_aura/desktop_screen_win.cc
===================================================================
--- desktop_aura/desktop_screen_win.cc (revision 248478)
--- desktop_aura/desktop_screen_win.cc (revision 251746)
+++ desktop_aura/desktop_screen_win.cc (working copy)
@@ -54,6 +54,8 @@
}
@@ -35,9 +11,24 @@ Index: desktop_aura/desktop_screen_win.cc
aura::WindowEventDispatcher* dispatcher = window->GetDispatcher();
return dispatcher ? dispatcher->host()->GetAcceleratedWidget() : NULL;
}
Index: desktop_aura/desktop_window_tree_host_win.cc
===================================================================
--- desktop_aura/desktop_window_tree_host_win.cc (revision 251746)
+++ desktop_aura/desktop_window_tree_host_win.cc (working copy)
@@ -133,7 +133,9 @@
native_widget_delegate_);
HWND parent_hwnd = NULL;
- if (params.parent && params.parent->GetDispatcher()) {
+ if (params.parent_widget) {
+ parent_hwnd = params.parent_widget;
+ } else if (params.parent && params.parent->GetDispatcher()) {
parent_hwnd =
params.parent->GetDispatcher()->host()->GetAcceleratedWidget();
}
Index: widget.cc
===================================================================
--- widget.cc (revision 248478)
--- widget.cc (revision 251746)
+++ widget.cc (working copy)
@@ -124,6 +124,7 @@
show_state(ui::SHOW_STATE_DEFAULT),
@@ -45,7 +36,7 @@ Index: widget.cc
parent(NULL),
+ parent_widget(NULL),
native_widget(NULL),
desktop_root_window_host(NULL),
desktop_window_tree_host(NULL),
top_level(false),
@@ -149,6 +150,7 @@
show_state(ui::SHOW_STATE_DEFAULT),
@@ -53,11 +44,11 @@ Index: widget.cc
parent(NULL),
+ parent_widget(NULL),
native_widget(NULL),
desktop_root_window_host(NULL),
desktop_window_tree_host(NULL),
top_level(false),
Index: widget.h
===================================================================
--- widget.h (revision 248478)
--- widget.h (revision 251746)
+++ widget.h (working copy)
@@ -197,6 +197,7 @@
// Should the widget be double buffered? Default is false.

18
patch/patches/web_contents_304341.patch
View File

@@ -1,8 +1,8 @@
Index: browser/browser_plugin/browser_plugin_guest.cc
===================================================================
--- browser/browser_plugin/browser_plugin_guest.cc (revision 248478)
--- browser/browser_plugin/browser_plugin_guest.cc (revision 251746)
+++ browser/browser_plugin/browser_plugin_guest.cc (working copy)
@@ -785,7 +785,8 @@
@@ -789,7 +789,8 @@
return this;
}
@@ -14,9 +14,9 @@ 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 248478)
--- browser/browser_plugin/browser_plugin_guest.h (revision 251746)
+++ browser/browser_plugin/browser_plugin_guest.h (working copy)
@@ -200,7 +200,8 @@
@@ -204,7 +204,8 @@
double progress) OVERRIDE;
virtual void CloseContents(WebContents* source) OVERRIDE;
virtual JavaScriptDialogManager* GetJavaScriptDialogManager() 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 248478)
--- browser/web_contents/web_contents_impl.cc (revision 251746)
+++ browser/web_contents/web_contents_impl.cc (working copy)
@@ -2687,7 +2687,7 @@
@@ -2727,7 +2727,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 248478)
--- browser/web_contents/web_contents_view_mac.mm (revision 251746)
+++ browser/web_contents/web_contents_view_mac.mm (working copy)
@@ -233,12 +233,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 248478)
--- public/browser/web_contents_delegate.cc (revision 251746)
+++ 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 248478)
--- public/browser/web_contents_delegate.h (revision 251746)
+++ public/browser/web_contents_delegate.h (working copy)
@@ -35,6 +35,7 @@
class DownloadItem;

20
patch/patches/webkit_popups.patch
View File

@@ -1,8 +1,8 @@
Index: public/web/WebView.h
===================================================================
--- public/web/WebView.h (revision 166298)
--- public/web/WebView.h (revision 167304)
+++ public/web/WebView.h (working copy)
@@ -417,6 +417,7 @@
@@ -424,6 +424,7 @@
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void setUseExternalPopupMenus(bool);
@@ -12,9 +12,9 @@ Index: public/web/WebView.h
virtual void hidePopups() = 0;
Index: Source/web/ChromeClientImpl.cpp
===================================================================
--- Source/web/ChromeClientImpl.cpp (revision 166298)
--- Source/web/ChromeClientImpl.cpp (revision 167304)
+++ Source/web/ChromeClientImpl.cpp (working copy)
@@ -828,7 +828,7 @@
@@ -751,7 +751,7 @@
PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
{
@@ -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 166298)
--- Source/web/WebViewImpl.cpp (revision 167304)
+++ Source/web/WebViewImpl.cpp (working copy)
@@ -340,6 +340,7 @@
@@ -343,6 +343,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)
@@ -3517,9 +3518,14 @@
@@ -3521,9 +3522,14 @@
updateLayerTreeViewport();
}
@@ -53,9 +53,9 @@ Index: Source/web/WebViewImpl.cpp
void WebViewImpl::startDragging(Frame* frame,
Index: Source/web/WebViewImpl.h
===================================================================
--- Source/web/WebViewImpl.h (revision 166298)
--- Source/web/WebViewImpl.h (revision 167304)
+++ Source/web/WebViewImpl.h (working copy)
@@ -397,7 +397,8 @@
@@ -401,7 +401,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
{
@@ -683,6 +684,8 @@
@@ -685,6 +686,8 @@
bool m_contextMenuAllowed;