Revert 189969 "Add RenderWidgetHost::GetSnapshotFromRenderer met..."

chrome/browser/extensions/api/tabs/tabs_api.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 "chrome/browser/extensions/api/tabs/tabs_api.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 27 matching lines @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
+#include "chrome/browser/ui/snapshot_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/window_sizer/window_sizer.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
 #include "chrome/common/extensions/api/tabs.h"
 #include "chrome/common/extensions/api/windows.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ skipping 1686 matching lines @@
     bool succeeded,
     const SkBitmap& bitmap) {
   if (succeeded) {
     VLOG(1) << "captureVisibleTab() got image from backing store.";
     SendResultFromBitmap(bitmap);
     return;
   }
 
   WebContents* web_contents = NULL;
   if (!GetTabToCapture(&web_contents)) {
-    SendInternalError();
+    error_ = keys::kInternalVisibleTabCaptureError;
+    SendResponse(false);
     return;
   }
 
   // Ask the renderer for a snapshot of the tab.
-  content::RenderWidgetHost* render_widget_host =
-      web_contents->GetRenderViewHost();
-  if (!render_widget_host) {
-    SendInternalError();
-    return;
-  }
-
-  render_widget_host->GetSnapshotFromRenderer(
-      gfx::Rect(),
-      base::Bind(
-          &TabsCaptureVisibleTabFunction::GetSnapshotFromRendererComplete,
-          this));
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_TAB_SNAPSHOT_TAKEN,
+                 content::Source<WebContents>(web_contents));
+  AddRef();  // Balanced in TabsCaptureVisibleTabFunction::Observe().
+  SnapshotTabHelper::FromWebContents(web_contents)->CaptureSnapshot();
 }
 
 // If a backing store was not available in
 // TabsCaptureVisibleTabFunction::RunImpl, than the renderer was asked for a
-// snapshot.
-void TabsCaptureVisibleTabFunction::GetSnapshotFromRendererComplete(
-    bool succeeded,
-    const SkBitmap& bitmap) {
-  if (!succeeded) {
-    SendInternalError();
+// snapshot.  Listen for a notification that the snapshot is available.
+void TabsCaptureVisibleTabFunction::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  DCHECK(type == chrome::NOTIFICATION_TAB_SNAPSHOT_TAKEN);
+
+  const SkBitmap *screen_capture =
+      content::Details<const SkBitmap>(details).ptr();
+  const bool error = screen_capture->empty();
+
+  if (error) {
+    error_ = keys::kInternalVisibleTabCaptureError;
+    SendResponse(false);
   } else {
     VLOG(1) << "captureVisibleTab() got image from renderer.";
-    SendResultFromBitmap(bitmap);
+    SendResultFromBitmap(*screen_capture);
   }
-}
 
-void TabsCaptureVisibleTabFunction::SendInternalError() {
-  error_ = keys::kInternalVisibleTabCaptureError;
-  SendResponse(false);
+  Release();  // Balanced in TabsCaptureVisibleTabFunction::RunImpl().
 }
 
 // Turn a bitmap of the screen into an image, set that image as the result,
 // and call SendResponse().
 void TabsCaptureVisibleTabFunction::SendResultFromBitmap(
     const SkBitmap& screen_capture) {
   std::vector<unsigned char> data;
   SkAutoLockPixels screen_capture_lock(screen_capture);
   bool encoded = false;
   std::string mime_type;
@@ skipping 354 matching lines @@
           extension->id(),
           script_type,
           code_string,
           frame_scope,
           run_at,
           ScriptExecutor::ISOLATED_WORLD,
           false /* is_web_view */,
           base::Bind(&ExecuteCodeInTabFunction::OnExecuteCodeFinished, this));
   return true;
 }