mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 173683.
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@981 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
Index: browser/web_contents/web_contents_impl.cc
|
||||
===================================================================
|
||||
--- browser/web_contents/web_contents_impl.cc (revision 170167)
|
||||
--- browser/web_contents/web_contents_impl.cc (revision 173683)
|
||||
+++ browser/web_contents/web_contents_impl.cc (working copy)
|
||||
@@ -1402,8 +1402,10 @@
|
||||
@@ -1397,8 +1397,10 @@
|
||||
new RenderWidgetHostImpl(this, process, route_id);
|
||||
created_widgets_.insert(widget_host);
|
||||
|
||||
@ -17,15 +17,15 @@ Index: browser/web_contents/web_contents_impl.cc
|
||||
widget_view->SetPopupType(popup_type);
|
||||
Index: public/browser/web_contents_view.h
|
||||
===================================================================
|
||||
--- public/browser/web_contents_view.h (revision 170167)
|
||||
--- public/browser/web_contents_view.h (revision 173683)
|
||||
+++ public/browser/web_contents_view.h (working copy)
|
||||
@@ -37,6 +37,9 @@
|
||||
@@ -38,6 +38,9 @@
|
||||
virtual RenderWidgetHostView* CreateViewForWidget(
|
||||
RenderWidgetHost* render_widget_host) = 0;
|
||||
|
||||
+ virtual RenderWidgetHostView* CreateViewForPopupWidget(
|
||||
+ RenderWidgetHost* render_widget_host) { return NULL; }
|
||||
+
|
||||
// This is required because some WebContentsView cache the
|
||||
// RenderWidgetHostView created by the above method. In that case, when the
|
||||
// view created by the above method is destroyed, the old one needs to be set
|
||||
// Returns the native widget that contains the contents of the tab.
|
||||
virtual gfx::NativeView GetNativeView() const = 0;
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
Index: page/FrameView.cpp
|
||||
===================================================================
|
||||
--- page/FrameView.cpp (revision 134630)
|
||||
--- page/FrameView.cpp (revision 137939)
|
||||
+++ page/FrameView.cpp (working copy)
|
||||
@@ -206,10 +206,12 @@
|
||||
@@ -209,10 +209,12 @@
|
||||
if (!page)
|
||||
return;
|
||||
|
||||
@ -17,7 +17,7 @@ Index: page/FrameView.cpp
|
||||
PassRefPtr<FrameView> FrameView::create(Frame* frame)
|
||||
Index: platform/mac/NSScrollerImpDetails.mm
|
||||
===================================================================
|
||||
--- platform/mac/NSScrollerImpDetails.mm (revision 134630)
|
||||
--- platform/mac/NSScrollerImpDetails.mm (revision 137939)
|
||||
+++ platform/mac/NSScrollerImpDetails.mm (working copy)
|
||||
@@ -34,6 +34,7 @@
|
||||
#if PLATFORM(CHROMIUM)
|
||||
|
Reference in New Issue
Block a user