mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 176706.
- See crbug.com/167209 for a description of why NSPrincipalClass needs to be specified in helper-Info.plist. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@987 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -1,31 +0,0 @@
|
||||
Index: browser/web_contents/web_contents_impl.cc
|
||||
===================================================================
|
||||
--- browser/web_contents/web_contents_impl.cc (revision 173683)
|
||||
+++ browser/web_contents/web_contents_impl.cc (working copy)
|
||||
@@ -1397,8 +1397,10 @@
|
||||
new RenderWidgetHostImpl(this, process, route_id);
|
||||
created_widgets_.insert(widget_host);
|
||||
|
||||
- RenderWidgetHostViewPort* widget_view =
|
||||
- RenderWidgetHostViewPort::CreateViewForWidget(widget_host);
|
||||
+ RenderWidgetHostViewPort* widget_view = RenderWidgetHostViewPort::FromRWHV(
|
||||
+ view_->CreateViewForPopupWidget(widget_host));
|
||||
+ if (!widget_view)
|
||||
+ widget_view = RenderWidgetHostViewPort::CreateViewForWidget(widget_host);
|
||||
if (!is_fullscreen) {
|
||||
// Popups should not get activated.
|
||||
widget_view->SetPopupType(popup_type);
|
||||
Index: public/browser/web_contents_view.h
|
||||
===================================================================
|
||||
--- public/browser/web_contents_view.h (revision 173683)
|
||||
+++ public/browser/web_contents_view.h (working copy)
|
||||
@@ -38,6 +38,9 @@
|
||||
virtual RenderWidgetHostView* CreateViewForWidget(
|
||||
RenderWidgetHost* render_widget_host) = 0;
|
||||
|
||||
+ virtual RenderWidgetHostView* CreateViewForPopupWidget(
|
||||
+ RenderWidgetHost* render_widget_host) { return NULL; }
|
||||
+
|
||||
// Returns the native widget that contains the contents of the tab.
|
||||
virtual gfx::NativeView GetNativeView() const = 0;
|
||||
|
@@ -1,14 +1,14 @@
|
||||
Index: pylib/gyp/input.py
|
||||
===================================================================
|
||||
--- pylib/gyp/input.py (revision 1527)
|
||||
--- pylib/gyp/input.py (revision 1556)
|
||||
+++ pylib/gyp/input.py (working copy)
|
||||
@@ -851,7 +851,8 @@
|
||||
@@ -857,7 +857,8 @@
|
||||
# that don't load quickly, this can be faster than
|
||||
# <!(python modulename param eters). Do this in |build_file_dir|.
|
||||
oldwd = os.getcwd() # Python doesn't like os.open('.'): no fchdir.
|
||||
- os.chdir(build_file_dir)
|
||||
+ if not build_file_dir is None:
|
||||
+ os.chdir(build_file_dir)
|
||||
try:
|
||||
|
||||
parsed_contents = shlex.split(contents)
|
||||
py_module = __import__(parsed_contents[0])
|
||||
parsed_contents = shlex.split(contents)
|
||||
|
@@ -1,6 +1,6 @@
|
||||
Index: contrib/minizip/unzip.c
|
||||
===================================================================
|
||||
--- contrib/minizip/unzip.c (revision 153668)
|
||||
--- contrib/minizip/unzip.c (revision 176706)
|
||||
+++ contrib/minizip/unzip.c (working copy)
|
||||
@@ -69,7 +69,7 @@
|
||||
#include <string.h>
|
||||
@@ -10,4 +10,4 @@ Index: contrib/minizip/unzip.c
|
||||
+// #define NOUNCRYPT
|
||||
#endif
|
||||
|
||||
#if defined(USE_SYSTEM_ZLIB)
|
||||
#include "third_party/zlib/zlib.h"
|
||||
|
Reference in New Issue
Block a user