summaryrefslogtreecommitdiffstats
path: root/webkit/plugins/ppapi/mock_plugin_delegate.cc
diff options
context:
space:
mode:
authortzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-26 07:35:15 +0000
committertzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-26 07:35:15 +0000
commit9f064462db5b4a434d5897d524640797c55fb1b1 (patch)
tree3d3901cc25f2b1b73a5b018079a96e9113fda5ab /webkit/plugins/ppapi/mock_plugin_delegate.cc
parenta596e11f92a756e946ee1c4c64e9d9c083d13a2a (diff)
downloadchromium_src-9f064462db5b4a434d5897d524640797c55fb1b1.zip
chromium_src-9f064462db5b4a434d5897d524640797c55fb1b1.tar.gz
chromium_src-9f064462db5b4a434d5897d524640797c55fb1b1.tar.bz2
Revert 119206 - Mouse Lock is currently supported in Pepper, but not yet supported from WebKit.
Move the render thread logic for managing the mouse lock state out of the pepper_plugin_delegate_impl, and into a higher level dispatcher for render_view_impl. Handle mouse lock / pointer lock requests from both pepper and webkit (WebKit API not yet landed, small TODOs left in this code to enable once that lands). BUG=109957 TEST=Pepper examples/mouse_lock and NaCl mouse lock examples still work. Review URL: http://codereview.chromium.org/8970016 TBR=scheib@chromium.org Review URL: https://chromiumcodereview.appspot.com/9293001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi/mock_plugin_delegate.cc')
-rw-r--r--webkit/plugins/ppapi/mock_plugin_delegate.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc
index 780bf4c..da371c54 100644
--- a/webkit/plugins/ppapi/mock_plugin_delegate.cc
+++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc
@@ -348,17 +348,13 @@ base::SharedMemory* MockPluginDelegate::CreateAnonymousSharedMemory(
return ::ppapi::Preferences();
}
-bool MockPluginDelegate::LockMouse(PluginInstance* instance) {
- return false;
+void MockPluginDelegate::LockMouse(PluginInstance* instance) {
+ instance->OnLockMouseACK(PP_ERROR_FAILED);
}
void MockPluginDelegate::UnlockMouse(PluginInstance* instance) {
}
-bool MockPluginDelegate::IsMouseLocked(PluginInstance* instance) {
- return false;
-}
-
void MockPluginDelegate::DidChangeCursor(PluginInstance* instance,
const WebKit::WebCursorInfo& cursor) {
}