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

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: change in response to Dave's suggestions. Created 8 years, 6 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: ppapi/thunk/enter.cc
diff --git a/ppapi/thunk/enter.cc b/ppapi/thunk/enter.cc
index dcfe2aa7f0545e1c2675864557a34efa3cb8c52e..d5d822b5ae76ce3f7464d82a0efbebf6c4c88e95 100644
--- a/ppapi/thunk/enter.cc
+++ b/ppapi/thunk/enter.cc
@@ -221,9 +221,9 @@ EnterInstance::EnterInstance(PP_Instance instance)
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 @@ EnterInstanceNoLock::EnterInstanceNoLock(PP_Instance instance)
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() {
}

Powered by Google App Engine
This is Rietveld 408576698