Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2945)

Unified Diff: content/renderer/render_view_impl.h

Issue 8970016: refactoring mouse lock to support pepper and WebKit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated webkit API names. Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 22a555fbff39552d742e64408c51e867736321fa..6a7511b981922c5bac847e419dd111d96c88113e 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -65,6 +65,7 @@ class GURL;
class JavaBridgeDispatcher;
class LoadProgressTracker;
class MediaStreamImpl;
+class MouseLockDispatcher;
class NotificationProvider;
class PepperDeviceTest;
struct PP_NetAddress_Private;
@@ -287,6 +288,10 @@ class RenderViewImpl : public RenderWidget,
webkit::WebPluginInfo* plugin_info,
std::string* actual_mime_type);
+ bool PpapiLockMouse(webkit::ppapi::PluginInstance* pinstance);
yzshen1 2012/01/16 07:50:35 nit: pinstance -> instance.
scheib 2012/01/17 22:05:36 Done. -- changed pinstance to plugin everywhere.
+ void PpapiUnlockMouse(webkit::ppapi::PluginInstance* pinstance);
+ bool PpapiIsMouseLockedTo(webkit::ppapi::PluginInstance* pinstance);
+
// IPC::Channel::Listener implementation -------------------------------------
virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
@@ -300,6 +305,9 @@ class RenderViewImpl : public RenderWidget,
virtual void runModal();
virtual bool enterFullScreen();
virtual void exitFullScreen();
+ virtual bool requestPointerLock();
+ virtual void requestPointerUnlock();
+ virtual bool isPointerLocked();
// WebKit::WebViewClient implementation --------------------------------------
@@ -788,10 +796,8 @@ class RenderViewImpl : public RenderWidget,
const std::vector<GURL>& links,
const std::vector<FilePath>& local_paths,
const FilePath& local_directory_name);
- void OnLockMouseACK(bool succeeded);
void OnMediaPlayerActionAt(const gfx::Point& location,
const WebKit::WebMediaPlayerAction& action);
- void OnMouseLockLost();
void OnMoveOrResizeStarted();
CONTENT_EXPORT void OnNavigate(const ViewMsg_Navigate_Params& params);
void OnPaste();
@@ -1139,6 +1145,9 @@ class RenderViewImpl : public RenderWidget,
// Java Bridge dispatcher attached to this view; lazily initialized.
scoped_ptr<JavaBridgeDispatcher> java_bridge_dispatcher_;
+ // Mouse Lock dispatcher attached to this view.
+ MouseLockDispatcher* mouse_lock_dispatcher_;
+
// Misc ----------------------------------------------------------------------
// The current and pending file chooser completion objects. If the queue is

Powered by Google App Engine
This is Rietveld 408576698