Convert callers to use the new TrackedCallback.

webkit/plugins/ppapi/ppb_graphics_2d_impl.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_GRAPHICS_2D_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_GRAPHICS_2D_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/ppb_graphics_2d.h"
 #include "ppapi/shared_impl/resource.h"
+#include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/ppb_graphics_2d_api.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace webkit {
 namespace ppapi {
 
@@ skipping 51 matching lines @@
 
   bool Init(int width, int height, bool is_always_opaque);
 
   // Tracks a call to flush that requires a callback.
   class FlushCallbackData {
    public:
     FlushCallbackData() {
       Clear();
     }
 
-    explicit FlushCallbackData(const PP_CompletionCallback& callback) {
+    explicit FlushCallbackData(
+        scoped_refptr< ::ppapi::TrackedCallback> callback) {
       Set(callback);
     }
 
-    bool is_null() const { return !callback_.func; }
+    bool is_null() const {
+      return !::ppapi::TrackedCallback::IsPending(callback_);
+    }
 
-    void Set(const PP_CompletionCallback& callback) {
+    void Set(scoped_refptr< ::ppapi::TrackedCallback> callback) {
       callback_ = callback;
     }
 
     void Clear() {
-      callback_ = PP_MakeCompletionCallback(NULL, 0);
+      callback_ = NULL;
     }
 
     void Execute(int32_t result) {
-      PP_RunAndClearCompletionCallback(&callback_, result);
+      ::ppapi::TrackedCallback::ClearAndRun(&callback_, result);
     }
 
    private:
-    PP_CompletionCallback callback_;
+    scoped_refptr< ::ppapi::TrackedCallback> callback_;
   };
 
   // Called internally to execute the different queued commands. The
   // parameters to these functions will have already been validated. The last
   // rect argument will be filled by each function with the area affected by
   // the update that requires invalidation. If there were no pixels changed,
   // this rect can be untouched.
   void ExecutePaintImageData(PPB_ImageData_Impl* image,
                              int x, int y,
                              const gfx::Rect& src_rect,
@@ skipping 58 matching lines @@
 
   base::WeakPtrFactory<PPB_Graphics2D_Impl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_Graphics2D_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_GRAPHICS_2D_IMPL_H_