PPAPI: Get TrackedCallback ready for running on non-main threads.

webkit/plugins/ppapi/ppapi_plugin_instance.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 461 matching lines @@
   // pointer from the NPObject so WebKit can't call into the plugin any more.
   //
   // Swap out the set so we can delete from it (the objects will try to
   // unregister themselves inside the delete call).
   PluginObjectSet plugin_object_copy;
   live_plugin_objects_.swap(plugin_object_copy);
   for (PluginObjectSet::iterator i = plugin_object_copy.begin();
        i != plugin_object_copy.end(); ++i)
     delete *i;
 
-  if (lock_mouse_callback_)
-    TrackedCallback::ClearAndAbort(&lock_mouse_callback_);
+  if (TrackedCallback::IsPending(lock_mouse_callback_))
+    lock_mouse_callback_->Abort();
 
   delegate_->InstanceDeleted(this);
   module_->InstanceDeleted(this);
   // If we switched from the NaCl plugin module, notify it too.
   if (original_module_.get())
     original_module_->InstanceDeleted(this);
 
   HostGlobals::Get()->InstanceDeleted(pp_instance_);
 }
 
@@ skipping 1141 matching lines @@
     }
   }
 }
 
 void PluginInstance::UpdateFlashFullscreenState(bool flash_fullscreen) {
   bool is_mouselock_pending = TrackedCallback::IsPending(lock_mouse_callback_);
 
   if (flash_fullscreen == flash_fullscreen_) {
     // Manually clear callback when fullscreen fails with mouselock pending.
     if (!flash_fullscreen && is_mouselock_pending)
-      TrackedCallback::ClearAndRun(&lock_mouse_callback_, PP_ERROR_FAILED);
+      lock_mouse_callback_->Run(PP_ERROR_FAILED);
     return;
   }
 
   bool old_plugin_focus = PluginHasFocus();
   flash_fullscreen_ = flash_fullscreen;
   if (is_mouselock_pending && !delegate()->IsMouseLocked(this)) {
     if (!delegate()->LockMouse(this))
-      TrackedCallback::ClearAndRun(&lock_mouse_callback_, PP_ERROR_FAILED);
+      lock_mouse_callback_->Run(PP_ERROR_FAILED);
   }
 
   if (PluginHasFocus() != old_plugin_focus)
     SendFocusChangeNotification();
 }
 
 int32_t PluginInstance::Navigate(PPB_URLRequestInfo_Impl* request,
                                  const char* target,
                                  bool from_user_action) {
   if (!container_)
@@ skipping 240 matching lines @@
 bool PluginInstance::IsProcessingUserGesture() {
   PP_TimeTicks now =
       ::ppapi::TimeTicksToPPTimeTicks(base::TimeTicks::Now());
   // Give a lot of slack so tests won't be flaky. Well behaved plugins will
   // close the user gesture.
   const PP_TimeTicks kUserGestureDurationInSeconds = 10.0;
   return (now - pending_user_gesture_ < kUserGestureDurationInSeconds);
 }
 
 void PluginInstance::OnLockMouseACK(bool succeeded) {
-  if (TrackedCallback::IsPending(lock_mouse_callback_)) {
-    TrackedCallback::ClearAndRun(&lock_mouse_callback_,
-                                 succeeded ? PP_OK : PP_ERROR_FAILED);
-  }
+  if (TrackedCallback::IsPending(lock_mouse_callback_))
+    lock_mouse_callback_->Run(succeeded ? PP_OK : PP_ERROR_FAILED);
 }
 
 void PluginInstance::OnMouseLockLost() {
   if (LoadMouseLockInterface())
     plugin_mouse_lock_interface_->MouseLockLost(pp_instance());
 }
 
 void PluginInstance::HandleMouseLockedInputEvent(
     const WebKit::WebMouseEvent& event) {
   // |cursor_info| is ignored since it is hidden when the mouse is locked.
@@ skipping 738 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit