Support error handling for Surface readbacks

content/browser/android/content_readback_handler.cc

Index: content/browser/android/content_readback_handler.cc
diff --git a/content/browser/android/content_readback_handler.cc b/content/browser/android/content_readback_handler.cc
index 414bf0abe677adda2c262527c0cc477dcc6ef41e..9499c023d23433228348711d5793afc21869feb3 100644
--- a/content/browser/android/content_readback_handler.cc
+++ b/content/browser/android/content_readback_handler.cc
@@ -20,18 +20,16 @@ namespace content {
 
 namespace {
 
-typedef base::Callback<void(bool, const SkBitmap&)> ResultCallback;
-
 void OnFinishCopyOutputRequest(
-    const ResultCallback& result_callback,
+    const ReadbackRequestCallback& result_callback,
     scoped_ptr<cc::CopyOutputResult> copy_output_result) {
   if (!copy_output_result->HasBitmap()) {
-    result_callback.Run(false, SkBitmap());
+    result_callback.Run(SkBitmap(), READBACK_FAILED);
     return;
   }
 
   scoped_ptr<SkBitmap> bitmap = copy_output_result->TakeBitmap();
-  result_callback.Run(true, *bitmap);
+  result_callback.Run(*bitmap, READBACK_SUCCESS);
 }
 
 }  // anonymous namespace
@@ -64,10 +62,9 @@ void ContentReadbackHandler::GetContentBitmap(JNIEnv* env,
       ContentViewCore::GetNativeContentViewCore(env, content_view_core);
   DCHECK(view);
 
-  ResultCallback result_callback =
+  ReadbackRequestCallback result_callback =
       base::Bind(&ContentReadbackHandler::OnFinishReadback,
-                 weak_factory_.GetWeakPtr(),
-                 readback_id);
+                 weak_factory_.GetWeakPtr(), readback_id);
 
   SkColorType sk_color_type = gfx::ConvertToSkiaColorType(color_type);
   view->GetScaledContentBitmap(
@@ -82,10 +79,9 @@ void ContentReadbackHandler::GetCompositorBitmap(JNIEnv* env,
       reinterpret_cast<ui::WindowAndroid*>(native_window_android);
   DCHECK(window_android);
 
-  ResultCallback result_callback =
+  ReadbackRequestCallback result_callback =
       base::Bind(&ContentReadbackHandler::OnFinishReadback,
-                 weak_factory_.GetWeakPtr(),
-                 readback_id);
+                 weak_factory_.GetWeakPtr(), readback_id);
 
   base::Callback<void(scoped_ptr<cc::CopyOutputResult>)> copy_output_callback =
       base::Bind(&OnFinishCopyOutputRequest,
@@ -104,12 +100,13 @@ void ContentReadbackHandler::GetCompositorBitmap(JNIEnv* env,
 
 ContentReadbackHandler::~ContentReadbackHandler() {}
 
-void ContentReadbackHandler::OnFinishReadback(int readback_id,
-                                              bool success,
-                                              const SkBitmap& bitmap) {
+void ContentReadbackHandler::OnFinishReadback(
+    int readback_id,
+    const SkBitmap& bitmap,
+    const ReadbackResponse& response) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> java_bitmap;
-  if (success)
+  if (response == READBACK_SUCCESS)
     java_bitmap = gfx::ConvertToJavaBitmap(&bitmap);
 
   Java_ContentReadbackHandler_notifyGetBitmapFinished(