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

Unified Diff: webkit/plugins/ppapi/ppapi_plugin_instance.cc

Issue 10824156: Remove CHECK and NOTREACHED for mouse lock, fix full screen transition. (Closed) Base URL: svn://chrome-svn/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/native_client/src/shared/ppapi_proxy/browser_ppb_mouse_lock_rpc_server.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc
===================================================================
--- webkit/plugins/ppapi/ppapi_plugin_instance.cc (revision 149286)
+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc (working copy)
@@ -1633,12 +1633,10 @@
}
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() {
« no previous file with comments | « ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_mouse_lock_rpc_server.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698