Chromium side changes to use PP_CompletionCallback as the Flush callback....

webkit/glue/plugins/pepper_device_context_2d.cc

 // Copyright (c) 2010 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/glue/plugins/pepper_device_context_2d.h"
 
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
+#include "third_party/ppapi/c/pp_errors.h"
 #include "third_party/ppapi/c/pp_module.h"
 #include "third_party/ppapi/c/pp_rect.h"
 #include "third_party/ppapi/c/pp_resource.h"
 #include "third_party/ppapi/c/ppb_device_context_2d.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/plugins/pepper_image_data.h"
 #include "webkit/glue/plugins/pepper_plugin_instance.h"
 #include "webkit/glue/plugins/pepper_plugin_module.h"
 #include "webkit/glue/plugins/pepper_resource_tracker.h"
 
@@ skipping 87 matching lines @@
 }
 
 bool ReplaceContents(PP_Resource device_context, PP_Resource image) {
   scoped_refptr<DeviceContext2D> context(
       ResourceTracker::Get()->GetAsDeviceContext2D(device_context));
   if (!context.get())
     return false;
   return context->ReplaceContents(image);
 }
 
-bool Flush(PP_Resource device_context,
-           PPB_DeviceContext2D_FlushCallback callback,
-           void* callback_data) {
+int32_t Flush(PP_Resource device_context,
+              PP_CompletionCallback callback) {
   scoped_refptr<DeviceContext2D> context(
       ResourceTracker::Get()->GetAsDeviceContext2D(device_context));
   if (!context.get())
-    return false;
-  return context->Flush(callback, callback_data);
+    return PP_Error_BadResource;
+  return context->Flush(callback);
 }
 
 const PPB_DeviceContext2D ppb_devicecontext2d = {
   &Create,
   &IsDeviceContext2D,
   &Describe,
   &PaintImageData,
   &Scroll,
   &ReplaceContents,
   &Flush
@@ skipping 24 matching lines @@
   gfx::Rect paint_src_rect;
 
   // Valid when type == SCROLL.
   gfx::Rect scroll_clip_rect;
   int scroll_dx, scroll_dy;
 
   // Valid when type == REPLACE.
   scoped_refptr<ImageData> replace_image;
 };
 
-DeviceContext2D::FlushCallbackData::FlushCallbackData(
-    PPB_DeviceContext2D_FlushCallback c,
-    void* d)
-    : callback_(c),
-      callback_data_(d) {
-}
-
-void DeviceContext2D::FlushCallbackData::Execute(PP_Resource device_context) {
-  callback_(device_context, callback_data_);
-}
-
 DeviceContext2D::DeviceContext2D(PluginModule* module)
     : Resource(module),
       bound_instance_(NULL),
       flushed_any_data_(false),
       offscreen_flush_pending_(false) {
 }
 
 DeviceContext2D::~DeviceContext2D() {
 }
 
@@ skipping 89 matching lines @@
       image_resource->height() != image_data_->height())
     return false;
 
   QueuedOperation operation(QueuedOperation::REPLACE);
   operation.replace_image = image_resource;
   queued_operations_.push_back(operation);
 
   return true;
 }
 
-bool DeviceContext2D::Flush(PPB_DeviceContext2D_FlushCallback callback,
-                            void* callback_data) {
+int32_t DeviceContext2D::Flush(const PP_CompletionCallback& callback) {
   // Don't allow more than one pending flush at a time.
   if (HasPendingFlush())
-    return false;
+    return PP_Error_InProgress;
 
   // TODO(brettw) check that the current thread is not the main one and
   // implement blocking flushes in this case.
-  if (!callback)
-    return false;
+  if (!callback.func)
+    return PP_Error_BadArgument;
 
   gfx::Rect changed_rect;
   for (size_t i = 0; i < queued_operations_.size(); i++) {
     QueuedOperation& operation = queued_operations_[i];
     gfx::Rect op_rect;
     switch (operation.type) {
       case QueuedOperation::PAINT:
         ExecutePaintImageData(operation.paint_image.get(),
                               operation.paint_x, operation.paint_y,
                               operation.paint_src_rect,
@@ skipping 15 matching lines @@
 
   // We need the rect to be in terms of the current clip rect of the plugin
   // since that's what will actually be painted. If we issue an invalidate
   // for a clipped-out region, WebKit will do nothing and we won't get any
   // ViewInitiatedPaint/ViewFlushedPaint calls, leaving our callback stranded.
   gfx::Rect visible_changed_rect;
   if (bound_instance_ && !changed_rect.IsEmpty())
     visible_changed_rect = bound_instance_->clip().Intersect(changed_rect);
 
   if (bound_instance_ && !visible_changed_rect.IsEmpty()) {
-    unpainted_flush_callback_.reset(new FlushCallbackData(callback,
-                                                          callback_data));
+    unpainted_flush_callback_.Set(callback);
     bound_instance_->InvalidateRect(visible_changed_rect);
   } else {
     // There's nothing visible to invalidate so just schedule the callback to
     // execute in the next round of the message loop.
-    ScheduleOffscreenCallback(
-        FlushCallbackData(callback, callback_data));
+    ScheduleOffscreenCallback(FlushCallbackData(callback));
   }
-  return true;
+  return PP_Error_WouldBlock;
 }
 
 bool DeviceContext2D::ReadImageData(PP_Resource image, int32_t x, int32_t y) {
   // Get and validate the image object to paint into.
   scoped_refptr<ImageData> image_resource(
       ResourceTracker::Get()->GetAsImageData(image));
   if (!image_resource.get())
     return false;
   if (image_resource->format() != PP_IMAGEDATAFORMAT_BGRA_PREMUL)
     return false;  // Must be in the right format.
@@ skipping 32 matching lines @@
 bool DeviceContext2D::BindToInstance(PluginInstance* new_instance) {
   if (bound_instance_ == new_instance)
     return true;  // Rebinding the same device, nothing to do.
   if (bound_instance_ && new_instance)
     return false;  // Can't change a bound device.
 
   if (!new_instance) {
     // When the device is detached, we'll not get any more paint callbacks so
     // we need to clear the list, but we still want to issue any pending
     // callbacks to the plugin.
-    if (unpainted_flush_callback_.get()) {
-      ScheduleOffscreenCallback(*unpainted_flush_callback_.get());
-      unpainted_flush_callback_.reset();
+    if (!unpainted_flush_callback_.is_null()) {
+      ScheduleOffscreenCallback(unpainted_flush_callback_);
+      unpainted_flush_callback_.Clear();
     }
-    if (painted_flush_callback_.get()) {
-      ScheduleOffscreenCallback(*painted_flush_callback_.get());
-      painted_flush_callback_.reset();
+    if (!painted_flush_callback_.is_null()) {
+      ScheduleOffscreenCallback(painted_flush_callback_);
+      painted_flush_callback_.Clear();
     }
   } else if (flushed_any_data_) {
     // Only schedule a paint if this backing store has had any data flushed to
     // it. This is an optimization. A "normal" plugin will first allocated a
     // backing store, bind it, and then execute their normal painting and
     // update loop. If binding a device always invalidated, it would mean we
     // would get one paint for the bind, and one for the first time the plugin
     // actually painted something. By not bothering to schedule an invalidate
     // when an empty device is initially bound, we can save an extra paint for
     // many plugins during the critical page initialization phase.
@@ skipping 44 matching lines @@
   gfx::Point origin(plugin_rect.origin().x(), plugin_rect.origin().y());
   canvas->drawBitmap(backing_bitmap,
                      SkIntToScalar(plugin_rect.origin().x()),
                      SkIntToScalar(plugin_rect.origin().y()));
 #endif
 }
 
 void DeviceContext2D::ViewInitiatedPaint() {
   // Move any "unpainted" callback to the painted state. See
   // |unpainted_flush_callback_| in the header for more.
-  if (unpainted_flush_callback_.get()) {
-    DCHECK(!painted_flush_callback_.get());
-    painted_flush_callback_.swap(unpainted_flush_callback_);
+  if (!unpainted_flush_callback_.is_null()) {
+    DCHECK(painted_flush_callback_.is_null());
+    std::swap(painted_flush_callback_, unpainted_flush_callback_);
   }
 }
 
 void DeviceContext2D::ViewFlushedPaint() {
   // Notify any "painted" callback. See |unpainted_flush_callback_| in the
   // header for more.
-  if (painted_flush_callback_.get()) {
+  if (!painted_flush_callback_.is_null()) {
     // We must clear this variable before issuing the callback. It will be
     // common for the plugin to issue another invalidate in response to a flush
     // callback, and we don't want to think that a callback is already pending.
-    scoped_ptr<FlushCallbackData> callback;
-    callback.swap(painted_flush_callback_);
-    callback->Execute(GetResource());
+    FlushCallbackData callback;
+    std::swap(callback, painted_flush_callback_);
+    callback.Execute(PP_OK);
   }
 }
 
 void DeviceContext2D::ExecutePaintImageData(ImageData* image,
                                             int x, int y,
                                             const gfx::Rect& src_rect,
                                             gfx::Rect* invalidated_rect) {
   // Ensure the source image is mapped to read from it.
   ImageDataAutoMapper auto_mapper(image);
   if (!auto_mapper.is_valid())
@@ skipping 44 matching lines @@
                         callback));
 }
 
 void DeviceContext2D::ExecuteOffscreenCallback(FlushCallbackData data) {
   DCHECK(offscreen_flush_pending_);
 
   // We must clear this flag before issuing the callback. It will be
   // common for the plugin to issue another invalidate in response to a flush
   // callback, and we don't want to think that a callback is already pending.
   offscreen_flush_pending_ = false;
-  data.Execute(GetResource());
+  data.Execute(PP_OK);
 }
 
 bool DeviceContext2D::HasPendingFlush() const {
-  return unpainted_flush_callback_.get() || painted_flush_callback_.get() ||
+  return !unpainted_flush_callback_.is_null() ||
+         !painted_flush_callback_.is_null() ||
          offscreen_flush_pending_;
 }
 
 }  // namespace pepper