Always run Flush completion callbacks in Graphics2D.

webkit/plugins/ppapi/ppb_graphics_2d_impl.cc

 // Copyright (c) 2011 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/ppb_graphics_2d_impl.h"
 
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 143 matching lines @@
 
 PPB_Graphics2D_Impl::PPB_Graphics2D_Impl(PP_Instance instance)
     : Resource(instance),
       bound_instance_(NULL),
       offscreen_flush_pending_(false),
       is_always_opaque_(false),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 PPB_Graphics2D_Impl::~PPB_Graphics2D_Impl() {
+  // LastPluginRefWasDeleted should have aborted all pending callbacks.
+  DCHECK(painted_flush_callback_.is_null());
+  DCHECK(unpainted_flush_callback_.is_null());
 }
 
 // static
 PP_Resource PPB_Graphics2D_Impl::Create(PP_Instance instance,
                                         const PP_Size& size,
                                         PP_Bool is_always_opaque) {
   scoped_refptr<PPB_Graphics2D_Impl> graphics_2d(
       new PPB_Graphics2D_Impl(instance));
   if (!graphics_2d->Init(size.width, size.height,
                          PPBoolToBool(is_always_opaque))) {
@@ skipping 13 matching lines @@
   }
   is_always_opaque_ = is_always_opaque;
   return true;
 }
 
 ::ppapi::thunk::PPB_Graphics2D_API*
 PPB_Graphics2D_Impl::AsPPB_Graphics2D_API() {
   return this;
 }
 
-PPB_Graphics2D_Impl* PPB_Graphics2D_Impl::AsPPB_Graphics2D_Impl() {
-  return this;
+void PPB_Graphics2D_Impl::LastPluginRefWasDeleted() {
+  Resource::LastPluginRefWasDeleted();
+
+  // Abort any pending callbacks.
+  if (!unpainted_flush_callback_.is_null())
+    unpainted_flush_callback_.Execute(PP_ERROR_ABORTED);
+  if (!painted_flush_callback_.is_null())
+    painted_flush_callback_.Execute(PP_ERROR_ABORTED);
 }
 
 PP_Bool PPB_Graphics2D_Impl::Describe(PP_Size* size,
                                       PP_Bool* is_always_opaque) {
   size->width = image_data_->width();
   size->height = image_data_->height();
   *is_always_opaque = PP_FromBool(is_always_opaque_);
   return PP_TRUE;
 }
 
@@ skipping 324 matching lines @@
   // |unpainted_flush_callback_| in the header for more.
   if (!unpainted_flush_callback_.is_null()) {
     DCHECK(painted_flush_callback_.is_null());
     std::swap(painted_flush_callback_, unpainted_flush_callback_);
   }
 }
 
 void PPB_Graphics2D_Impl::ViewFlushedPaint() {
   // Notify any "painted" callback. See |unpainted_flush_callback_| in the
   // header for more.
-  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.
-    FlushCallbackData callback;
-    std::swap(callback, painted_flush_callback_);
-    callback.Execute(PP_OK);
-  }
+  if (!painted_flush_callback_.is_null())
+    painted_flush_callback_.Execute(PP_OK);
 }
 
 void PPB_Graphics2D_Impl::ExecutePaintImageData(PPB_ImageData_Impl* 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())
     return;
@@ skipping 79 matching lines @@
 }
 
 bool PPB_Graphics2D_Impl::HasPendingFlush() const {
   return !unpainted_flush_callback_.is_null() ||
          !painted_flush_callback_.is_null() ||
          offscreen_flush_pending_;
 }
 
 }  // namespace ppapi
 }  // namespace webkit