Support error handling for Surface readbacks

content/browser/browser_plugin/browser_plugin_guest.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 "content/browser/browser_plugin/browser_plugin_guest.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop.h"
 #include "base/pickle.h"
@@ skipping 270 matching lines @@
   if (!attached())
     return NULL;
   return embedder_web_contents_->GetRenderWidgetHostView();
 }
 
 void BrowserPluginGuest::UpdateVisibility() {
   OnSetVisibility(browser_plugin_instance_id(), visible());
 }
 
 void BrowserPluginGuest::CopyFromCompositingSurface(
-      gfx::Rect src_subrect,
-      gfx::Size dst_size,
-      const base::Callback<void(bool, const SkBitmap&)>& callback) {
+    gfx::Rect src_subrect,
+    gfx::Size dst_size,
+    CopyFromCompositingSurfaceCallback& callback) {
   copy_request_callbacks_.insert(std::make_pair(++copy_request_id_, callback));
   SendMessageToEmbedder(
       new BrowserPluginMsg_CopyFromCompositingSurface(
           browser_plugin_instance_id(),
           copy_request_id_,
           src_subrect,
           dst_size));
 }
 
 BrowserPluginGuestManager*
@@ skipping 423 matching lines @@
   mouse_locked_ = false;
 }
 
 void BrowserPluginGuest::OnCopyFromCompositingSurfaceAck(
     int browser_plugin_instance_id,
     int request_id,
     const SkBitmap& bitmap) {
   CHECK(copy_request_callbacks_.count(request_id));
   if (!copy_request_callbacks_.count(request_id))
     return;
-  const CopyRequestCallback& callback = copy_request_callbacks_[request_id];
-  callback.Run(!bitmap.empty() && !bitmap.isNull(), bitmap);
+  const CopyFromCompositingSurfaceCallback& callback =
+      copy_request_callbacks_[request_id];
+  bool success = !bitmap.empty() && !bitmap.isNull();
+  callback.Run(success,
+               bitmap,
+               success ? content::READBACK_SUCCESS : content::READBACK_FAILED);
   copy_request_callbacks_.erase(request_id);
 }
 
 void BrowserPluginGuest::OnUpdateGeometry(int browser_plugin_instance_id,
                                           const gfx::Rect& view_rect) {
   // The plugin has moved within the embedder without resizing or the
   // embedder/container's view rect changing.
   guest_window_rect_ = view_rect;
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       GetWebContents()->GetRenderViewHost());
@@ skipping 55 matching lines @@
 void BrowserPluginGuest::OnImeCompositionRangeChanged(
       const gfx::Range& range,
       const std::vector<gfx::Rect>& character_bounds) {
   static_cast<RenderWidgetHostViewBase*>(
       web_contents()->GetRenderWidgetHostView())->ImeCompositionRangeChanged(
           range, character_bounds);
 }
 #endif
 
 }  // namespace content