| Index: content/renderer/render_widget_mouse_lock_dispatcher.cc
|
| diff --git a/content/renderer/render_view_mouse_lock_dispatcher.cc b/content/renderer/render_widget_mouse_lock_dispatcher.cc
|
| similarity index 62%
|
| rename from content/renderer/render_view_mouse_lock_dispatcher.cc
|
| rename to content/renderer/render_widget_mouse_lock_dispatcher.cc
|
| index bdd747b044e3346feb8e94549d549d1232671807..970bef08fd6b64c0181ee95dbc5f47003361e3fb 100644
|
| --- a/content/renderer/render_view_mouse_lock_dispatcher.cc
|
| +++ b/content/renderer/render_widget_mouse_lock_dispatcher.cc
|
| @@ -2,10 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/renderer/render_view_mouse_lock_dispatcher.h"
|
| +#include "content/renderer/render_widget_mouse_lock_dispatcher.h"
|
|
|
| #include "content/common/view_messages.h"
|
| #include "content/renderer/render_view_impl.h"
|
| +#include "ipc/ipc_message.h"
|
| #include "third_party/WebKit/public/web/WebFrame.h"
|
| #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
|
| #include "third_party/WebKit/public/web/WebView.h"
|
| @@ -15,31 +16,29 @@ using blink::WebUserGestureIndicator;
|
|
|
| namespace content {
|
|
|
| -RenderViewMouseLockDispatcher::RenderViewMouseLockDispatcher(
|
| - RenderViewImpl* render_view_impl)
|
| - : RenderViewObserver(render_view_impl),
|
| - render_view_impl_(render_view_impl) {
|
| -}
|
| +RenderWidgetMouseLockDispatcher::RenderWidgetMouseLockDispatcher(
|
| + RenderWidget* render_widget)
|
| + : render_widget_(render_widget) {}
|
|
|
| -RenderViewMouseLockDispatcher::~RenderViewMouseLockDispatcher() {
|
| -}
|
| +RenderWidgetMouseLockDispatcher::~RenderWidgetMouseLockDispatcher() {}
|
|
|
| -void RenderViewMouseLockDispatcher::SendLockMouseRequest(
|
| +void RenderWidgetMouseLockDispatcher::SendLockMouseRequest(
|
| bool unlocked_by_target) {
|
| bool user_gesture = WebUserGestureIndicator::isProcessingUserGesture();
|
|
|
| - Send(new ViewHostMsg_LockMouse(routing_id(), user_gesture, unlocked_by_target,
|
| - false));
|
| + render_widget_->Send(new ViewHostMsg_LockMouse(
|
| + render_widget_->routing_id(), user_gesture, unlocked_by_target, false));
|
| }
|
|
|
| -void RenderViewMouseLockDispatcher::SendUnlockMouseRequest() {
|
| - Send(new ViewHostMsg_UnlockMouse(routing_id()));
|
| +void RenderWidgetMouseLockDispatcher::SendUnlockMouseRequest() {
|
| + render_widget_->Send(
|
| + new ViewHostMsg_UnlockMouse(render_widget_->routing_id()));
|
| }
|
|
|
| -bool RenderViewMouseLockDispatcher::OnMessageReceived(
|
| +bool RenderWidgetMouseLockDispatcher::OnMessageReceived(
|
| const IPC::Message& message) {
|
| bool handled = true;
|
| - IPC_BEGIN_MESSAGE_MAP(RenderViewMouseLockDispatcher, message)
|
| + IPC_BEGIN_MESSAGE_MAP(RenderWidgetMouseLockDispatcher, message)
|
| IPC_MESSAGE_HANDLER(ViewMsg_LockMouse_ACK, OnLockMouseACK)
|
| IPC_MESSAGE_FORWARD(ViewMsg_MouseLockLost,
|
| static_cast<MouseLockDispatcher*>(this),
|
| @@ -49,7 +48,7 @@ bool RenderViewMouseLockDispatcher::OnMessageReceived(
|
| return handled;
|
| }
|
|
|
| -void RenderViewMouseLockDispatcher::OnLockMouseACK(bool succeeded) {
|
| +void RenderWidgetMouseLockDispatcher::OnLockMouseACK(bool succeeded) {
|
| // Notify the base class.
|
| MouseLockDispatcher::OnLockMouseACK(succeeded);
|
|
|
| @@ -59,8 +58,8 @@ void RenderViewMouseLockDispatcher::OnLockMouseACK(bool succeeded) {
|
| // Mouse Capture is implicitly given for the duration of a drag event, and
|
| // sends all mouse events to the initial target of the drag.
|
| // If Lock is entered it supercedes any in progress Capture.
|
| - if (succeeded && render_view_impl_->GetWidget()->webwidget())
|
| - render_view_impl_->GetWidget()->webwidget()->mouseCaptureLost();
|
| + if (succeeded && render_widget_->webwidget())
|
| + render_widget_->webwidget()->mouseCaptureLost();
|
| }
|
|
|
| } // namespace content
|
|
|