Allow CopyFromBackingStore to fallback to copying from the renderer side if the accelerated surface…

chrome/browser/thumbnails/thumbnail_tab_helper.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/thumbnails/thumbnail_tab_helper.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h"
 #include "chrome/browser/thumbnails/thumbnail_service.h"
@@ skipping 55 matching lines @@
                            ThumbnailingAlgorithm* algorithm,
                            bool succeeded,
                            const SkBitmap& bitmap) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (!succeeded)
     return;
 
   algorithm->ProcessBitmap(context, base::Bind(&UpdateThumbnail), bitmap);
 }
 
+void GotSnapshotFromRenderer(base::Callback<void(const SkBitmap&)> callback,
+                             bool success,
+                             const SkBitmap& bitmap) {
+  if (success)
+    callback.Run(bitmap);
+}
+
 void AsyncProcessThumbnail(content::WebContents* web_contents,
                            scoped_refptr<ThumbnailingContext> context,
                            scoped_refptr<ThumbnailingAlgorithm> algorithm) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   RenderWidgetHost* render_widget_host = web_contents->GetRenderViewHost();
   content::RenderWidgetHostView* view = render_widget_host->GetView();
   if (!view)
     return;
   if (!view->IsSurfaceAvailableForCopy()) {
-#if defined(OS_WIN)
-    // On Windows XP, neither the backing store nor the compositing surface is
-    // available in the browser when accelerated compositing is active, so ask
-    // the renderer to send a snapshot for creating the thumbnail.
-    if (base::win::GetVersion() < base::win::VERSION_VISTA) {
-      gfx::Size view_size =
-          render_widget_host->GetView()->GetViewBounds().size();
-      g_browser_process->GetRenderWidgetSnapshotTaker()->AskForSnapshot(
-          render_widget_host,
-          base::Bind(&ThumbnailingAlgorithm::ProcessBitmap,
-                     algorithm, context, base::Bind(&UpdateThumbnail)),
-          view_size,
-          view_size);
-    }
-#endif
+    // On Windows XP and possibly due to driver issues, neither the backing
+    // store nor the compositing surface is available in the browser when
+    // accelerated compositing is active, so ask the renderer to send a snapshot
+    // for creating the thumbnail.
+    render_widget_host->GetSnapshotFromRenderer(
+      gfx::Rect(),
+      base::Bind(GotSnapshotFromRenderer, base::Bind(
+          &ThumbnailingAlgorithm::ProcessBitmap,
+          algorithm, context, base::Bind(&UpdateThumbnail))));
     return;
   }
 
   gfx::Rect copy_rect = gfx::Rect(view->GetViewBounds().size());
   // Clip the pixels that will commonly hold a scrollbar, which looks bad in
   // thumbnails.
   int scrollbar_size = gfx::scrollbar_size();
   gfx::Size copy_size;
   copy_rect.Inset(0, 0, scrollbar_size, scrollbar_size);
 
@@ skipping 126 matching lines @@
         content::Source<RenderWidgetHost>(renderer));
   }
 }
 
 void ThumbnailTabHelper::WidgetHidden(RenderWidgetHost* widget) {
   if (!enabled_)
     return;
   UpdateThumbnailIfNecessary(web_contents());
 }