Consistent CopyFromSurface() API, consolidated to RWHV

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 "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/thumbnails/thumbnail_service.h"
@@ skipping 132 matching lines @@
 void ThumbnailTabHelper::AsyncProcessThumbnail(
     scoped_refptr<thumbnails::ThumbnailService> thumbnail_service) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   RenderWidgetHost* render_widget_host =
       web_contents()->GetRenderViewHost()->GetWidget();
   content::RenderWidgetHostView* view = render_widget_host->GetView();
   if (!view || !view->IsSurfaceAvailableForCopy()) {
     return;
   }
 
+  // TODO(miu): This is the wrong size. It's the size of the view on-screen, and
+  // not the rendering size of the view. This will be replaced with the view's
+  // actual rendering size in a later change. http://crbug.com/73362
   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();
   copy_rect.Inset(0, 0, scrollbar_size, scrollbar_size);
 
   if (copy_rect.IsEmpty()) {
     return;
   }
 
   scoped_refptr<thumbnails::ThumbnailingAlgorithm> algorithm(
       thumbnail_service->GetThumbnailingAlgorithm());
 
   thumbnailing_context_ = new ThumbnailingContext(web_contents(),
                                                   thumbnail_service.get(),
                                                   load_interrupted_);
 
   ui::ScaleFactor scale_factor =
       ui::GetSupportedScaleFactor(
           ui::GetScaleFactorForNativeView(view->GetNativeView()));
   thumbnailing_context_->clip_result = algorithm->GetCanvasCopyInfo(
       copy_rect.size(),
       scale_factor,
       &copy_rect,
       &thumbnailing_context_->requested_copy_size);
-  render_widget_host->CopyFromBackingStore(
-      copy_rect,
-      thumbnailing_context_->requested_copy_size,
-      base::Bind(&ThumbnailTabHelper::ProcessCapturedBitmap,
-                 weak_factory_.GetWeakPtr(),
-                 algorithm),
-      kN32_SkColorType);
+  view->CopyFromSurface(copy_rect, thumbnailing_context_->requested_copy_size,
+                        base::Bind(&ThumbnailTabHelper::ProcessCapturedBitmap,
+                                   weak_factory_.GetWeakPtr(), algorithm),
+                        kN32_SkColorType);
 }
 
 void ThumbnailTabHelper::ProcessCapturedBitmap(
     scoped_refptr<thumbnails::ThumbnailingAlgorithm> algorithm,
     const SkBitmap& bitmap,
     content::ReadbackResponse response) {
   if (response == content::READBACK_SUCCESS) {
     // On success, we must be on the UI thread.
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     algorithm->ProcessBitmap(thumbnailing_context_,
@@ skipping 39 matching lines @@
       content::Source<RenderWidgetHost>(renderer->GetWidget()));
   if (!registered) {
     registrar_.Add(this, content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED,
                    content::Source<RenderWidgetHost>(renderer->GetWidget()));
   }
 }
 
 void ThumbnailTabHelper::WidgetHidden(RenderWidgetHost* widget) {
   UpdateThumbnailIfNecessary();
 }