mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 272007.
- Remove CefSettings.accelerated_compositing option (see https://crbug.com/363772). - Remove experimental x-webkit-speech support (see https://crbug.com/223198). - Execute CefGeolocationHandler callbacks on the UI thread (see https://crbug.com/304341#c212). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1711 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git desktop_aura/desktop_screen_win.cc desktop_aura/desktop_screen_win.cc
|
||||
index c5edf76..9389662 100644
|
||||
--- desktop_aura/desktop_screen_win.cc
|
||||
+++ desktop_aura/desktop_screen_win.cc
|
||||
@@ -54,6 +54,8 @@ gfx::Display DesktopScreenWin::GetDisplayMatching(
|
||||
Index: desktop_aura/desktop_screen_win.cc
|
||||
===================================================================
|
||||
--- desktop_aura/desktop_screen_win.cc (revision 272007)
|
||||
+++ desktop_aura/desktop_screen_win.cc (working copy)
|
||||
@@ -54,6 +54,8 @@
|
||||
}
|
||||
|
||||
HWND DesktopScreenWin::GetHWNDFromNativeView(gfx::NativeView window) const {
|
||||
@@ -11,11 +11,11 @@ index c5edf76..9389662 100644
|
||||
aura::WindowTreeHost* host = window->GetHost();
|
||||
return host ? host->GetAcceleratedWidget() : NULL;
|
||||
}
|
||||
diff --git desktop_aura/desktop_window_tree_host_win.cc desktop_aura/desktop_window_tree_host_win.cc
|
||||
index 2fc499b..6fa63b5 100644
|
||||
--- desktop_aura/desktop_window_tree_host_win.cc
|
||||
+++ desktop_aura/desktop_window_tree_host_win.cc
|
||||
@@ -130,7 +130,9 @@ void DesktopWindowTreeHostWin::Init(aura::Window* content_window,
|
||||
Index: desktop_aura/desktop_window_tree_host_win.cc
|
||||
===================================================================
|
||||
--- desktop_aura/desktop_window_tree_host_win.cc (revision 272007)
|
||||
+++ desktop_aura/desktop_window_tree_host_win.cc (working copy)
|
||||
@@ -129,7 +129,9 @@
|
||||
native_widget_delegate_);
|
||||
|
||||
HWND parent_hwnd = NULL;
|
||||
@@ -26,33 +26,21 @@ index 2fc499b..6fa63b5 100644
|
||||
parent_hwnd = params.parent->GetHost()->GetAcceleratedWidget();
|
||||
|
||||
message_handler_->set_remove_standard_frame(params.remove_standard_frame);
|
||||
diff --git desktop_aura/desktop_window_tree_host_win.h desktop_aura/desktop_window_tree_host_win.h
|
||||
index dc8a218..84680cf 100644
|
||||
--- desktop_aura/desktop_window_tree_host_win.h
|
||||
+++ desktop_aura/desktop_window_tree_host_win.h
|
||||
@@ -214,6 +214,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
|
||||
LPARAM l_param) OVERRIDE;
|
||||
virtual bool HandleScrollEvent(const ui::ScrollEvent& event) OVERRIDE;
|
||||
|
||||
+ public:
|
||||
Widget* GetWidget();
|
||||
const Widget* GetWidget() const;
|
||||
HWND GetHWND() const;
|
||||
diff --git desktop_aura/desktop_window_tree_host_x11.cc desktop_aura/desktop_window_tree_host_x11.cc
|
||||
index 028b6f5..e8b4bd2 100644
|
||||
--- desktop_aura/desktop_window_tree_host_x11.cc
|
||||
+++ desktop_aura/desktop_window_tree_host_x11.cc
|
||||
@@ -138,7 +138,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
|
||||
content_window_(NULL),
|
||||
Index: desktop_aura/desktop_window_tree_host_x11.cc
|
||||
===================================================================
|
||||
--- desktop_aura/desktop_window_tree_host_x11.cc (revision 272007)
|
||||
+++ desktop_aura/desktop_window_tree_host_x11.cc (working copy)
|
||||
@@ -143,7 +143,8 @@
|
||||
window_parent_(NULL),
|
||||
custom_window_shape_(NULL),
|
||||
window_shape_(NULL),
|
||||
custom_window_shape_(false),
|
||||
- urgency_hint_set_(false) {
|
||||
+ urgency_hint_set_(false),
|
||||
+ xwindow_destroyed_(false) {
|
||||
}
|
||||
|
||||
DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
|
||||
@@ -315,7 +316,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
|
||||
@@ -332,7 +333,8 @@
|
||||
// Actually free our native resources.
|
||||
if (ui::PlatformEventSource::GetInstance())
|
||||
ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
|
||||
@@ -62,9 +50,9 @@ index 028b6f5..e8b4bd2 100644
|
||||
xwindow_ = None;
|
||||
|
||||
desktop_native_widget_aura_->OnHostClosed();
|
||||
@@ -968,9 +970,13 @@ void DesktopWindowTreeHostX11::InitX11Window(
|
||||
if (swa.override_redirect)
|
||||
attribute_mask |= CWOverrideRedirect;
|
||||
@@ -998,9 +1000,13 @@
|
||||
}
|
||||
}
|
||||
|
||||
+ gfx::AcceleratedWidget parent_widget = params.parent_widget;
|
||||
+ if (parent_widget == gfx::kNullAcceleratedWidget)
|
||||
@@ -77,7 +65,7 @@ index 028b6f5..e8b4bd2 100644
|
||||
bounds_.x(), bounds_.y(),
|
||||
bounds_.width(), bounds_.height(),
|
||||
0, // border width
|
||||
@@ -1378,6 +1384,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
|
||||
@@ -1503,6 +1509,10 @@
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -88,11 +76,11 @@ index 028b6f5..e8b4bd2 100644
|
||||
case FocusOut:
|
||||
if (xev->xfocus.mode != NotifyGrab) {
|
||||
ReleaseCapture();
|
||||
diff --git desktop_aura/desktop_window_tree_host_x11.h desktop_aura/desktop_window_tree_host_x11.h
|
||||
index bc20464..63527ae 100644
|
||||
--- desktop_aura/desktop_window_tree_host_x11.h
|
||||
+++ desktop_aura/desktop_window_tree_host_x11.h
|
||||
@@ -299,6 +299,9 @@ private:
|
||||
Index: desktop_aura/desktop_window_tree_host_x11.h
|
||||
===================================================================
|
||||
--- desktop_aura/desktop_window_tree_host_x11.h (revision 272007)
|
||||
+++ desktop_aura/desktop_window_tree_host_x11.h (working copy)
|
||||
@@ -319,6 +319,9 @@
|
||||
// the frame when |xwindow_| gains focus or handles a mouse button event.
|
||||
bool urgency_hint_set_;
|
||||
|
||||
@@ -102,11 +90,11 @@ index bc20464..63527ae 100644
|
||||
DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
|
||||
};
|
||||
|
||||
diff --git widget.cc widget.cc
|
||||
index e05db49..a936235 100644
|
||||
--- widget.cc
|
||||
+++ widget.cc
|
||||
@@ -122,6 +122,7 @@ Widget::InitParams::InitParams()
|
||||
Index: widget.cc
|
||||
===================================================================
|
||||
--- widget.cc (revision 272007)
|
||||
+++ widget.cc (working copy)
|
||||
@@ -116,6 +116,7 @@
|
||||
show_state(ui::SHOW_STATE_DEFAULT),
|
||||
double_buffer(false),
|
||||
parent(NULL),
|
||||
@@ -114,7 +102,7 @@ index e05db49..a936235 100644
|
||||
native_widget(NULL),
|
||||
desktop_window_tree_host(NULL),
|
||||
top_level(false),
|
||||
@@ -148,6 +149,7 @@ Widget::InitParams::InitParams(Type type)
|
||||
@@ -141,6 +142,7 @@
|
||||
show_state(ui::SHOW_STATE_DEFAULT),
|
||||
double_buffer(false),
|
||||
parent(NULL),
|
||||
@@ -122,7 +110,7 @@ index e05db49..a936235 100644
|
||||
native_widget(NULL),
|
||||
desktop_window_tree_host(NULL),
|
||||
top_level(false),
|
||||
@@ -386,7 +388,12 @@ void Widget::Init(const InitParams& in_params) {
|
||||
@@ -398,7 +400,12 @@
|
||||
Minimize();
|
||||
} else if (params.delegate) {
|
||||
SetContentsView(params.delegate->GetContentsView());
|
||||
@@ -136,11 +124,11 @@ index e05db49..a936235 100644
|
||||
}
|
||||
native_widget_initialized_ = true;
|
||||
}
|
||||
diff --git widget.h widget.h
|
||||
index 640b140..43feff7 100644
|
||||
--- widget.h
|
||||
+++ widget.h
|
||||
@@ -200,6 +200,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
||||
Index: widget.h
|
||||
===================================================================
|
||||
--- widget.h (revision 272007)
|
||||
+++ widget.h (working copy)
|
||||
@@ -213,6 +213,7 @@
|
||||
// Should the widget be double buffered? Default is false.
|
||||
bool double_buffer;
|
||||
gfx::NativeView parent;
|
||||
|
Reference in New Issue
Block a user