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

Unified Diff: ppapi/thunk/enter.cc

Issue 10699045: Fix PPB_MouseLock.LockMouse crash and add tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
« no previous file with comments | « ppapi/tests/test_mouse_lock.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/thunk/enter.cc
===================================================================
--- ppapi/thunk/enter.cc (revision 145683)
+++ ppapi/thunk/enter.cc (working copy)
@@ -221,9 +221,9 @@
EnterInstance::EnterInstance(PP_Instance instance,
const PP_CompletionCallback& callback)
: EnterBase(0 /* resource */, callback),
- // TODO(dmichael): This means that the callback_ we get is not associated
- // even with the instance, but we should handle that for
- // MouseLock (maybe others?).
+ // TODO(dmichael): This means that the callback_ we get is not associated
+ // even with the instance, but we should handle that for
+ // MouseLock (maybe others?).
functions_(PpapiGlobals::Get()->GetInstanceAPI(instance)) {
SetStateForFunctionError(instance, functions_, true);
}
@@ -237,6 +237,17 @@
SetStateForFunctionError(instance, functions_, true);
}
+EnterInstanceNoLock::EnterInstanceNoLock(
+ PP_Instance instance,
+ const PP_CompletionCallback& callback)
+ : EnterBase(0 /* resource */, callback),
+ // TODO(dmichael): This means that the callback_ we get is not associated
+ // even with the instance, but we should handle that for
+ // MouseLock (maybe others?).
+ functions_(PpapiGlobals::Get()->GetInstanceAPI(instance)) {
+ SetStateForFunctionError(instance, functions_, true);
+}
+
EnterInstanceNoLock::~EnterInstanceNoLock() {
}
« no previous file with comments | « ppapi/tests/test_mouse_lock.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698