summaryrefslogtreecommitdiffstats
path: root/ppapi/thunk/enter.cc
diff options
context:
space:
mode:
authoryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-09 19:09:15 +0000
committeryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-09 19:09:15 +0000
commitf1b5af9484c4e16962a60a00fc5d66bb29cfdc50 (patch)
tree0f16f0ba657b4794c66a696d26f516334d592ae1 /ppapi/thunk/enter.cc
parent393e5ec622b15decc5d0ba29fe0ebe45b2b9ca71 (diff)
downloadchromium_src-f1b5af9484c4e16962a60a00fc5d66bb29cfdc50.zip
chromium_src-f1b5af9484c4e16962a60a00fc5d66bb29cfdc50.tar.gz
chromium_src-f1b5af9484c4e16962a60a00fc5d66bb29cfdc50.tar.bz2
Fix PPB_MouseLock.LockMouse crash and add tests.
Because mouse lock tests require focus, the new tests are put in interactive_ui_tests. In this CL, ppapi_uitest is split into three parts: 1) ppapi_test: contains PPAPITestBase and its subclasses. 2) ppapi_browsertest: used by browser_tests. 3) ppapi_interactive_browsertest: used by interactive_ui_tests. Besides, they are moved into a new folder, chrome/test/ppapi. (1) and (2) are less interesting since they are mostly copied from ppapi_uitest. BUG=135206 TEST= Review URL: https://chromiumcodereview.appspot.com/10699045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/thunk/enter.cc')
-rw-r--r--ppapi/thunk/enter.cc17
1 files changed, 14 insertions, 3 deletions
diff --git a/ppapi/thunk/enter.cc b/ppapi/thunk/enter.cc
index dcfe2aa..d5d822b 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() {
}