diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 22:32:07 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 22:32:07 +0000 |
| commit | 010882ff6f4a6a624d1e6eb822f4baf2856a8752 (patch) | |
| tree | 5e35a4adf9e559f8a9dc43f8a08d7a9094ef457e /content/browser/renderer_host/render_widget_host.cc | |
| parent | e6cce5cc9c5a18c5ba03e9b02eeed517f9cecda9 (diff) | |
| download | chromium_src-010882ff6f4a6a624d1e6eb822f4baf2856a8752.zip chromium_src-010882ff6f4a6a624d1e6eb822f4baf2856a8752.tar.gz chromium_src-010882ff6f4a6a624d1e6eb822f4baf2856a8752.tar.bz2 | |
Completes the GetWindowRect/GetRootWindowRect/GetScreenInfo changes I thought I had finished with my last CL.
. Disable a check in BrowserMessageFilter that these messages are not handled on the UI thread, for Aura. In Aura, these messages need to be handled on the UI thread (since aura::Windows are not threadsafe). We do not have the NPAPI plugin constraints regular windows has, so this check is not important.
. Properly handle these messages in RWH, by sprinkling in some more defined(USE_AURA) to go with the defined(OS_POSIX).
. Properly define RenderWidgetHostView::GetDefaultScreenInfo() (it was being done as an override to a static?.. oops).
. Get rid of the USE_AURA NOTIMPLEMENTED() definition of the above in render_widget_host_view.cc, replacing with an impl in rwhva.cc. Also moves the _mac and _touch variants to their own .mm/.cc files.
. Gets rid of WillWmDestroy for Aura. It's normal-windows-only.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8566011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_widget_host.cc')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc index cfe43a4..d440d66 100644 --- a/content/browser/renderer_host/render_widget_host.cc +++ b/content/browser/renderer_host/render_widget_host.cc @@ -209,7 +209,7 @@ bool RenderWidgetHost::OnMessageReceived(const IPC::Message &msg) { OnMsgDidActivateAcceleratedCompositing) IPC_MESSAGE_HANDLER(ViewHostMsg_LockMouse, OnMsgLockMouse) IPC_MESSAGE_HANDLER(ViewHostMsg_UnlockMouse, OnMsgUnlockMouse) -#if defined(OS_POSIX) +#if defined(OS_POSIX) || defined(USE_AURA) IPC_MESSAGE_HANDLER(ViewHostMsg_GetScreenInfo, OnMsgGetScreenInfo) IPC_MESSAGE_HANDLER(ViewHostMsg_GetWindowRect, OnMsgGetWindowRect) IPC_MESSAGE_HANDLER(ViewHostMsg_GetRootWindowRect, OnMsgGetRootWindowRect) @@ -1222,7 +1222,7 @@ void RenderWidgetHost::OnMsgUnlockMouse() { RejectMouseLockOrUnlockIfNecessary(); } -#if defined(OS_POSIX) +#if defined(OS_POSIX) || defined(USE_AURA) void RenderWidgetHost::OnMsgGetScreenInfo(gfx::NativeViewId window_id, WebKit::WebScreenInfo* results) { if (view_) |