Support error handling for Surface readbacks

athena/content/content_proxy.cc

 // Copyright 2014 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 "athena/content/content_proxy.h"
 
 #include "base/bind.h"
 #include "base/threading/worker_pool.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ skipping 139 matching lines @@
   gfx::Size source = host->GetView()->GetViewBounds().size();
   gfx::Size target = gfx::Size(source.width() / 2, source.height() / 2);
   host->CopyFromBackingStore(
       gfx::Rect(),
       target,
       base::Bind(&ContentProxy::OnContentImageRead,
                  proxy_content_to_image_factory_.GetWeakPtr()),
       kAlpha_8_SkColorType);
 }
 
-void ContentProxy::OnContentImageRead(bool success, const SkBitmap& bitmap) {
+void ContentProxy::OnContentImageRead(
+    const SkBitmap& bitmap,
+    const content::ReadbackResponse& response) {
   // Now we can hide the content. Note that after hiding we are freeing memory
   // and if something goes wrong we will end up with an empty page.
   HideOriginalContent();
 
-  if (!success || bitmap.empty() || bitmap.isNull())
+  if ((response != content::READBACK_SUCCESS) || bitmap.empty() ||

[oshima, 2014/11/10 19:36:01]

nit: nuke extra ()

[sivag, 2014/11/11 04:32:57]

Done.

+      bitmap.isNull())
     return;
 
   // While we are encoding the image, we keep the current image as reference
   // to have something for the overview mode to grab. Once we have the encoded
   // PNG, we will get rid of this.
   raw_image_ = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
 
   scoped_refptr<ProxyImageData> png_image = new ProxyImageData();
   png_image->EncodeImage(
       bitmap,
       base::Bind(&ContentProxy::OnContentImageEncodeComplete,
                  proxy_content_to_image_factory_.GetWeakPtr(),
                  png_image));
 }
 
 void ContentProxy::OnContentImageEncodeComplete(
     scoped_refptr<ProxyImageData> image) {
   png_data_ = image->data();
 
   // From now on we decode the image as needed to save memory.
   raw_image_ = gfx::ImageSkia();
 }
 
 }  // namespace athena