diff options
| author | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 02:48:21 +0000 |
|---|---|---|
| committer | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 02:48:21 +0000 |
| commit | dff763ef96dd5f2537adc92293c5e2018edc78b9 (patch) | |
| tree | c2f6a128fde7aa5d95dc89ea1744e9c2e0fc6012 /webkit | |
| parent | 3443659f16b0737d2a6dd53e12733a8b2707ea54 (diff) | |
| download | chromium_src-dff763ef96dd5f2537adc92293c5e2018edc78b9.zip chromium_src-dff763ef96dd5f2537adc92293c5e2018edc78b9.tar.gz chromium_src-dff763ef96dd5f2537adc92293c5e2018edc78b9.tar.bz2 | |
Remove CHECK and NOTREACHED for mouse lock, fix full screen transition.
BUG=http://code.google.com/p/nativeclient/issues/detail?id=2937
TEST=From Dust, ppapi tests
Review URL: https://chromiumcodereview.appspot.com/10824156
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/ppapi/ppapi_plugin_instance.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index ecc4369..3aef548 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -1633,12 +1633,10 @@ bool PluginInstance::IsProcessingUserGesture() { } void PluginInstance::OnLockMouseACK(bool succeeded) { - if (!TrackedCallback::IsPending(lock_mouse_callback_)) { - NOTREACHED(); - return; + if (TrackedCallback::IsPending(lock_mouse_callback_)) { + TrackedCallback::ClearAndRun(&lock_mouse_callback_, + succeeded ? PP_OK : PP_ERROR_FAILED); } - TrackedCallback::ClearAndRun(&lock_mouse_callback_, - succeeded ? PP_OK : PP_ERROR_FAILED); } void PluginInstance::OnMouseLockLost() { |