mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 261035.
- The CefSettings.release_dcheck_enabled option has been removed. This functionality can be enabled by setting the dcheck_always_on=1 gyp variable before building CEF/Chromium. See http://crbug.com/350462 for details. - The UR_FLAG_ALLOW_COOKIES option has been removed and the functionality has been merged into UR_FLAG_ALLOW_CACHED_CREDENTIALS. - Mac: [NSApplication sharedApplication] should no longer be called in the renderer process. See http://crbug.com/306348 for details. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1641 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
@ -1,6 +1,6 @@
|
||||
Index: common.gypi
|
||||
===================================================================
|
||||
--- common.gypi (revision 251746)
|
||||
--- common.gypi (revision 261035)
|
||||
+++ 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
|
||||
@@ -85,9 +88,9 @@
|
||||
@@ -101,9 +104,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 251746)
|
||||
--- mac/strip_save_dsym (revision 261035)
|
||||
+++ mac/strip_save_dsym (working copy)
|
||||
@@ -48,7 +48,7 @@
|
||||
"bundle"]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Index: public/renderer/content_renderer_client.cc
|
||||
===================================================================
|
||||
--- public/renderer/content_renderer_client.cc (revision 251746)
|
||||
--- public/renderer/content_renderer_client.cc (revision 261035)
|
||||
+++ 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 251746)
|
||||
--- public/renderer/content_renderer_client.h (revision 261035)
|
||||
+++ public/renderer/content_renderer_client.h (working copy)
|
||||
@@ -175,7 +175,6 @@
|
||||
// Returns true if a popup window should be allowed.
|
||||
@ -38,23 +38,23 @@ Index: public/renderer/content_renderer_client.h
|
||||
|
||||
// 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
|
||||
Index: renderer/render_view_impl.cc
|
||||
Index: renderer/render_frame_impl.cc
|
||||
===================================================================
|
||||
--- renderer/render_view_impl.cc (revision 251746)
|
||||
+++ renderer/render_view_impl.cc (working copy)
|
||||
@@ -2628,7 +2628,6 @@
|
||||
WebDataSource::ExtraData* extraData, const WebURLRequest& request,
|
||||
WebNavigationType type, WebNavigationPolicy default_policy,
|
||||
--- renderer/render_frame_impl.cc (revision 261035)
|
||||
+++ renderer/render_frame_impl.cc (working copy)
|
||||
@@ -2661,7 +2661,6 @@
|
||||
WebNavigationType type,
|
||||
WebNavigationPolicy default_policy,
|
||||
bool is_redirect) {
|
||||
-#ifdef OS_ANDROID
|
||||
// The handlenavigation API is deprecated and will be removed once
|
||||
// crbug.com/325351 is resolved.
|
||||
if (request.url() != GURL(kSwappedOutURL) &&
|
||||
@@ -2643,7 +2642,6 @@
|
||||
@@ -2676,7 +2675,6 @@
|
||||
is_redirect)) {
|
||||
return blink::WebNavigationPolicyIgnore;
|
||||
}
|
||||
-#endif
|
||||
|
||||
Referrer referrer(GetReferrerFromRequest(frame, request));
|
||||
Referrer referrer(RenderViewImpl::GetReferrerFromRequest(frame, request));
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Index: gyp/generator/ninja.py
|
||||
===================================================================
|
||||
--- gyp/generator/ninja.py (revision 1852)
|
||||
--- gyp/generator/ninja.py (revision 1880)
|
||||
+++ gyp/generator/ninja.py (working copy)
|
||||
@@ -726,7 +726,16 @@
|
||||
@@ -738,7 +738,16 @@
|
||||
for path in copy['files']:
|
||||
# Normalize the path so trailing slashes don't confuse us.
|
||||
path = os.path.normpath(path)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Index: message_loop.cc
|
||||
===================================================================
|
||||
--- message_loop.cc (revision 248478)
|
||||
--- message_loop.cc (revision 261035)
|
||||
+++ message_loop.cc (working copy)
|
||||
@@ -142,7 +142,7 @@
|
||||
@@ -144,7 +144,7 @@
|
||||
MessageLoop::~MessageLoop() {
|
||||
DCHECK_EQ(this, current());
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Index: compositing_iosurface_layer_mac.mm
|
||||
===================================================================
|
||||
--- compositing_iosurface_layer_mac.mm (revision 251746)
|
||||
--- compositing_iosurface_layer_mac.mm (revision 261035)
|
||||
+++ compositing_iosurface_layer_mac.mm (working copy)
|
||||
@@ -119,7 +119,7 @@
|
||||
@@ -120,7 +120,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 251746)
|
||||
--- compositing_iosurface_mac.mm (revision 261035)
|
||||
+++ compositing_iosurface_mac.mm (working copy)
|
||||
@@ -360,7 +360,7 @@
|
||||
@@ -362,7 +362,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 251746)
|
||||
--- compositing_iosurface_shader_programs_mac.cc (revision 261035)
|
||||
+++ 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 251746)
|
||||
--- compositing_iosurface_shader_programs_mac.h (revision 261035)
|
||||
+++ compositing_iosurface_shader_programs_mac.h (working copy)
|
||||
@@ -48,6 +48,8 @@
|
||||
return rgb_to_yv12_output_format_;
|
||||
@ -91,18 +91,18 @@ Index: compositing_iosurface_shader_programs_mac.h
|
||||
TransformsRGBToYV12);
|
||||
Index: render_widget_host_view_mac.mm
|
||||
===================================================================
|
||||
--- render_widget_host_view_mac.mm (revision 251746)
|
||||
--- render_widget_host_view_mac.mm (revision 261035)
|
||||
+++ render_widget_host_view_mac.mm (working copy)
|
||||
@@ -483,7 +483,7 @@
|
||||
software_layer_.reset([[CALayer alloc] init]);
|
||||
if (!software_layer_)
|
||||
LOG(ERROR) << "Failed to create CALayer for software rendering";
|
||||
- [software_layer_ setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
|
||||
+ [software_layer_ setBackgroundColor:CGColorGetConstantColor(kCGColorClear)];
|
||||
[software_layer_ setDelegate:cocoa_view_];
|
||||
[software_layer_ setContentsGravity:kCAGravityTopLeft];
|
||||
[software_layer_ setFrame:NSRectToCGRect([cocoa_view_ bounds])];
|
||||
@@ -2856,7 +2856,7 @@
|
||||
@@ -434,7 +434,7 @@
|
||||
use_core_animation_ = true;
|
||||
background_layer_.reset([[CALayer alloc] init]);
|
||||
[background_layer_
|
||||
- setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
|
||||
+ setBackgroundColor:CGColorGetConstantColor(kCGColorClear)];
|
||||
[cocoa_view_ setLayer:background_layer_];
|
||||
[cocoa_view_ setWantsLayer:YES];
|
||||
}
|
||||
@@ -3087,7 +3087,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()) {
|
||||
@@ -2878,7 +2878,7 @@
|
||||
@@ -3109,7 +3109,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));
|
||||
}
|
||||
}
|
||||
@@ -3037,7 +3037,7 @@
|
||||
@@ -3259,7 +3259,7 @@
|
||||
}
|
||||
} else {
|
||||
CGContextSetFillColorWithColor(context,
|
||||
@ -129,12 +129,21 @@ Index: render_widget_host_view_mac.mm
|
||||
CGContextFillRect(context, dirtyRect);
|
||||
if (renderWidgetHostView_->whiteout_start_time_.is_null())
|
||||
renderWidgetHostView_->whiteout_start_time_ = base::TimeTicks::Now();
|
||||
@@ -4045,7 +4045,7 @@
|
||||
if (!renderWidgetHostView_->render_widget_host_ ||
|
||||
renderWidgetHostView_->render_widget_host_->is_hidden()) {
|
||||
@@ -4282,7 +4282,7 @@
|
||||
if (self = [super init]) {
|
||||
renderWidgetHostView_ = r;
|
||||
|
||||
- [self setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
|
||||
+ [self setBackgroundColor:CGColorGetConstantColor(kCGColorClear)];
|
||||
[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 @@
|
||||
inContext:context];
|
||||
} else {
|
||||
CGContextSetFillColorWithColor(context,
|
||||
- CGColorGetConstantColor(kCGColorWhite));
|
||||
+ CGColorGetConstantColor(kCGColorClear));
|
||||
CGContextFillRect(context, clipRect);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Index: core/frame/FrameView.cpp
|
||||
===================================================================
|
||||
--- core/frame/FrameView.cpp (revision 167304)
|
||||
--- core/frame/FrameView.cpp (revision 170525)
|
||||
+++ core/frame/FrameView.cpp (working copy)
|
||||
@@ -141,8 +141,10 @@
|
||||
@@ -165,8 +165,10 @@
|
||||
if (!isMainFrame())
|
||||
return;
|
||||
|
||||
@ -12,12 +12,12 @@ Index: core/frame/FrameView.cpp
|
||||
+#endif
|
||||
}
|
||||
|
||||
PassRefPtr<FrameView> FrameView::create(Frame* frame)
|
||||
PassRefPtr<FrameView> FrameView::create(LocalFrame* frame)
|
||||
Index: platform/scroll/ScrollbarThemeMacCommon.mm
|
||||
===================================================================
|
||||
--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 167304)
|
||||
--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 170525)
|
||||
+++ platform/scroll/ScrollbarThemeMacCommon.mm (working copy)
|
||||
@@ -369,10 +369,14 @@
|
||||
@@ -358,10 +358,14 @@
|
||||
// static
|
||||
bool ScrollbarThemeMacCommon::isOverlayAPIAvailable()
|
||||
{
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Index: web_dialog_view.cc
|
||||
===================================================================
|
||||
--- web_dialog_view.cc (revision 248478)
|
||||
--- web_dialog_view.cc (revision 261035)
|
||||
+++ web_dialog_view.cc (working copy)
|
||||
@@ -261,13 +261,6 @@
|
||||
@@ -257,13 +257,6 @@
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@ Index: web_dialog_view.cc
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// content::WebContentsDelegate implementation:
|
||||
|
||||
@@ -347,6 +340,16 @@
|
||||
@@ -337,6 +330,15 @@
|
||||
*proceed_to_fire_unload = proceed;
|
||||
}
|
||||
|
||||
@ -26,16 +26,15 @@ Index: web_dialog_view.cc
|
||||
+ if (delegate_)
|
||||
+ return delegate_->HandleContextMenu(params);
|
||||
+ return WebDialogWebContentsDelegate::HandleContextMenu(render_frame_host,
|
||||
+ params);
|
||||
+ params);
|
||||
+}
|
||||
+
|
||||
+
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// WebDialogView, private:
|
||||
|
||||
Index: web_dialog_view.h
|
||||
===================================================================
|
||||
--- web_dialog_view.h (revision 248478)
|
||||
--- web_dialog_view.h (revision 261035)
|
||||
+++ web_dialog_view.h (working copy)
|
||||
@@ -74,6 +74,7 @@
|
||||
virtual const views::Widget* GetWidget() const OVERRIDE;
|
||||
@ -54,7 +53,7 @@ Index: web_dialog_view.h
|
||||
|
||||
// Overridden from content::WebContentsDelegate:
|
||||
virtual void MoveContents(content::WebContents* source,
|
||||
@@ -114,6 +113,9 @@
|
||||
@@ -115,6 +114,9 @@
|
||||
virtual void BeforeUnloadFired(content::WebContents* tab,
|
||||
bool proceed,
|
||||
bool* proceed_to_fire_unload) OVERRIDE;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Index: desktop_aura/desktop_screen_win.cc
|
||||
===================================================================
|
||||
--- desktop_aura/desktop_screen_win.cc (revision 251746)
|
||||
--- desktop_aura/desktop_screen_win.cc (revision 261035)
|
||||
+++ desktop_aura/desktop_screen_win.cc (working copy)
|
||||
@@ -54,6 +54,8 @@
|
||||
}
|
||||
@ -8,29 +8,29 @@ Index: desktop_aura/desktop_screen_win.cc
|
||||
HWND DesktopScreenWin::GetHWNDFromNativeView(gfx::NativeView window) const {
|
||||
+ if (!window)
|
||||
+ return NULL;
|
||||
aura::WindowEventDispatcher* dispatcher = window->GetDispatcher();
|
||||
return dispatcher ? dispatcher->host()->GetAcceleratedWidget() : NULL;
|
||||
aura::WindowTreeHost* host = window->GetHost();
|
||||
return host ? 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 (revision 261035)
|
||||
+++ desktop_aura/desktop_window_tree_host_win.cc (working copy)
|
||||
@@ -133,7 +133,9 @@
|
||||
@@ -130,7 +130,9 @@
|
||||
native_widget_delegate_);
|
||||
|
||||
HWND parent_hwnd = NULL;
|
||||
- if (params.parent && params.parent->GetDispatcher()) {
|
||||
+ if (params.parent_widget) {
|
||||
- if (params.parent && params.parent->GetHost())
|
||||
+ if (params.parent_widget)
|
||||
+ parent_hwnd = params.parent_widget;
|
||||
+ } else if (params.parent && params.parent->GetDispatcher()) {
|
||||
parent_hwnd =
|
||||
params.parent->GetDispatcher()->host()->GetAcceleratedWidget();
|
||||
}
|
||||
+ else if (params.parent && params.parent->GetHost())
|
||||
parent_hwnd = params.parent->GetHost()->GetAcceleratedWidget();
|
||||
|
||||
message_handler_->set_remove_standard_frame(params.remove_standard_frame);
|
||||
Index: widget.cc
|
||||
===================================================================
|
||||
--- widget.cc (revision 251746)
|
||||
--- widget.cc (revision 261035)
|
||||
+++ widget.cc (working copy)
|
||||
@@ -124,6 +124,7 @@
|
||||
@@ -122,6 +122,7 @@
|
||||
show_state(ui::SHOW_STATE_DEFAULT),
|
||||
double_buffer(false),
|
||||
parent(NULL),
|
||||
@ -38,7 +38,7 @@ Index: widget.cc
|
||||
native_widget(NULL),
|
||||
desktop_window_tree_host(NULL),
|
||||
top_level(false),
|
||||
@@ -149,6 +150,7 @@
|
||||
@@ -148,6 +149,7 @@
|
||||
show_state(ui::SHOW_STATE_DEFAULT),
|
||||
double_buffer(false),
|
||||
parent(NULL),
|
||||
@ -46,7 +46,7 @@ Index: widget.cc
|
||||
native_widget(NULL),
|
||||
desktop_window_tree_host(NULL),
|
||||
top_level(false),
|
||||
@@ -389,7 +391,12 @@
|
||||
@@ -386,7 +388,12 @@
|
||||
Minimize();
|
||||
} else if (params.delegate) {
|
||||
SetContentsView(params.delegate->GetContentsView());
|
||||
@ -62,9 +62,9 @@ Index: widget.cc
|
||||
}
|
||||
Index: widget.h
|
||||
===================================================================
|
||||
--- widget.h (revision 251746)
|
||||
--- widget.h (revision 261035)
|
||||
+++ widget.h (working copy)
|
||||
@@ -197,6 +197,7 @@
|
||||
@@ -200,6 +200,7 @@
|
||||
// Should the widget be double buffered? Default is false.
|
||||
bool double_buffer;
|
||||
gfx::NativeView parent;
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Index: browser/browser_plugin/browser_plugin_guest.cc
|
||||
===================================================================
|
||||
--- browser/browser_plugin/browser_plugin_guest.cc (revision 251746)
|
||||
--- browser/browser_plugin/browser_plugin_guest.cc (revision 261035)
|
||||
+++ browser/browser_plugin/browser_plugin_guest.cc (working copy)
|
||||
@@ -789,7 +789,8 @@
|
||||
@@ -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 251746)
|
||||
--- 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;
|
||||
@ -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 251746)
|
||||
--- browser/web_contents/web_contents_impl.cc (revision 261035)
|
||||
+++ browser/web_contents/web_contents_impl.cc (working copy)
|
||||
@@ -2727,7 +2727,7 @@
|
||||
@@ -2831,7 +2831,7 @@
|
||||
void WebContentsImpl::ShowContextMenu(RenderFrameHost* render_frame_host,
|
||||
const ContextMenuParams& params) {
|
||||
// Allow WebContentsDelegates to handle the context menu operation first.
|
||||
@ -41,9 +41,9 @@ 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 251746)
|
||||
--- browser/web_contents/web_contents_view_mac.mm (revision 261035)
|
||||
+++ browser/web_contents/web_contents_view_mac.mm (working copy)
|
||||
@@ -233,12 +233,6 @@
|
||||
@@ -227,12 +227,6 @@
|
||||
void WebContentsViewMac::ShowContextMenu(
|
||||
content::RenderFrameHost* render_frame_host,
|
||||
const ContextMenuParams& params) {
|
||||
@ -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 251746)
|
||||
--- public/browser/web_contents_delegate.cc (revision 261035)
|
||||
+++ 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 251746)
|
||||
--- public/browser/web_contents_delegate.h (revision 261035)
|
||||
+++ public/browser/web_contents_delegate.h (working copy)
|
||||
@@ -35,6 +35,7 @@
|
||||
class DownloadItem;
|
||||
@ -80,7 +80,7 @@ Index: public/browser/web_contents_delegate.h
|
||||
class RenderViewHost;
|
||||
class SessionStorageNamespace;
|
||||
class WebContents;
|
||||
@@ -228,7 +229,8 @@
|
||||
@@ -231,7 +232,8 @@
|
||||
virtual int GetExtraRenderViewHeight() const;
|
||||
|
||||
// Returns true if the context menu operation was handled by the delegate.
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Index: WebNode.cpp
|
||||
===================================================================
|
||||
--- WebNode.cpp (revision 166298)
|
||||
--- WebNode.cpp (revision 170525)
|
||||
+++ WebNode.cpp (working copy)
|
||||
@@ -171,7 +171,7 @@
|
||||
@@ -172,7 +172,7 @@
|
||||
void WebNode::addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture)
|
||||
{
|
||||
// Please do not add more eventTypes to this list without an API review.
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Index: public/web/WebView.h
|
||||
===================================================================
|
||||
--- public/web/WebView.h (revision 167304)
|
||||
--- public/web/WebView.h (revision 170525)
|
||||
+++ public/web/WebView.h (working copy)
|
||||
@@ -424,6 +424,7 @@
|
||||
@@ -416,6 +416,7 @@
|
||||
|
||||
// Sets whether select popup menus should be rendered by the browser.
|
||||
BLINK_EXPORT static void setUseExternalPopupMenus(bool);
|
||||
@ -12,11 +12,11 @@ Index: public/web/WebView.h
|
||||
virtual void hidePopups() = 0;
|
||||
Index: Source/web/ChromeClientImpl.cpp
|
||||
===================================================================
|
||||
--- Source/web/ChromeClientImpl.cpp (revision 167304)
|
||||
--- Source/web/ChromeClientImpl.cpp (revision 170525)
|
||||
+++ Source/web/ChromeClientImpl.cpp (working copy)
|
||||
@@ -751,7 +751,7 @@
|
||||
@@ -755,7 +755,7 @@
|
||||
|
||||
PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
|
||||
PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(LocalFrame& frame, PopupMenuClient* client) const
|
||||
{
|
||||
- if (WebViewImpl::useExternalPopupMenus())
|
||||
+ if (m_webView->useExternalPopupMenus())
|
||||
@ -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 167304)
|
||||
--- Source/web/WebViewImpl.cpp (revision 170525)
|
||||
+++ Source/web/WebViewImpl.cpp (working copy)
|
||||
@@ -343,6 +343,7 @@
|
||||
@@ -339,6 +339,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)
|
||||
@@ -3521,9 +3522,14 @@
|
||||
@@ -3488,9 +3489,14 @@
|
||||
updateLayerTreeViewport();
|
||||
}
|
||||
|
||||
@ -50,12 +50,12 @@ Index: Source/web/WebViewImpl.cpp
|
||||
+ return m_shouldUseExternalPopupMenus;
|
||||
}
|
||||
|
||||
void WebViewImpl::startDragging(Frame* frame,
|
||||
void WebViewImpl::startDragging(LocalFrame* frame,
|
||||
Index: Source/web/WebViewImpl.h
|
||||
===================================================================
|
||||
--- Source/web/WebViewImpl.h (revision 167304)
|
||||
--- Source/web/WebViewImpl.h (revision 170525)
|
||||
+++ Source/web/WebViewImpl.h (working copy)
|
||||
@@ -401,7 +401,8 @@
|
||||
@@ -390,7 +390,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
|
||||
{
|
||||
@@ -685,6 +686,8 @@
|
||||
@@ -668,6 +669,8 @@
|
||||
|
||||
bool m_contextMenuAllowed;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user