Consistent CopyFromSurface() API, consolidated to RWHV

content/browser/frame_host/navigation_entry_screenshot_manager.cc

 // Copyright 2013 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 "content/browser/frame_host/navigation_entry_screenshot_manager.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/task_scheduler/post_task.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
@@ skipping 65 matching lines @@
     return;
 
   NavigationEntryImpl* entry = owner_->GetLastCommittedEntry();
   if (!entry)
     return;
 
   if (!owner_->delegate()->CanOverscrollContent())
     return;
 
   RenderViewHost* render_view_host = owner_->delegate()->GetRenderViewHost();
+  DCHECK(render_view_host && render_view_host->GetWidget());
   content::RenderWidgetHostView* view =
       render_view_host->GetWidget()->GetView();
   if (!view)
     return;
 
   // Make sure screenshots aren't taken too frequently.
   base::Time now = base::Time::Now();
   if (now - last_screenshot_time_ <
           base::TimeDelta::FromMilliseconds(min_screenshot_interval_ms_)) {
     return;
   }
 
+  WillTakeScreenshot(render_view_host);
+
   last_screenshot_time_ = now;
 
-  TakeScreenshotImpl(render_view_host, entry);
+  // This screenshot is destined for the UI, so size the result to the actual
+  // on-screen size of the view (and not its device-rendering size).
+  const gfx::Size view_size_on_screen = view->GetViewBounds().size();
+  view->CopyFromSurface(
+      gfx::Rect(), view_size_on_screen,
+      base::Bind(&NavigationEntryScreenshotManager::OnScreenshotTaken,
+                 screenshot_factory_.GetWeakPtr(), entry->GetUniqueID()),
+      kAlpha_8_SkColorType);
 }
 
 // Implemented here and not in NavigationEntry because this manager keeps track
 // of the total number of screen shots across all entries.
 void NavigationEntryScreenshotManager::ClearAllScreenshots() {
   int count = owner_->GetEntryCount();
   for (int i = 0; i < count; ++i) {
     ClearScreenshot(owner_->GetEntryAtIndex(i));
   }
   DCHECK_EQ(GetScreenshotCount(), 0);
 }
 
-void NavigationEntryScreenshotManager::TakeScreenshotImpl(
-    RenderViewHost* host,
-    NavigationEntryImpl* entry) {
-  DCHECK(host && host->GetWidget()->GetView());
-  DCHECK(entry);
-  host->GetWidget()->CopyFromBackingStore(
-      gfx::Rect(), host->GetWidget()->GetView()->GetViewBounds().size(),
-      base::Bind(&NavigationEntryScreenshotManager::OnScreenshotTaken,
-                 screenshot_factory_.GetWeakPtr(), entry->GetUniqueID()),
-      kAlpha_8_SkColorType);
-}
-
 void NavigationEntryScreenshotManager::SetMinScreenshotIntervalMS(
     int interval_ms) {
   DCHECK_GE(interval_ms, 0);
   min_screenshot_interval_ms_ = interval_ms;
 }
 
 void NavigationEntryScreenshotManager::OnScreenshotTaken(
     int unique_id,
     const SkBitmap& bitmap,
     ReadbackResponse response) {
@@ skipping 108 matching lines @@
     NavigationEntryImpl* entry = owner_->GetEntryAtIndex(forward);
     if (ClearScreenshot(entry))
       --screenshot_count;
     ++forward;
   }
   CHECK_GE(screenshot_count, 0);
   CHECK_LE(screenshot_count, kMaxScreenshots);
 }
 
 }  // namespace content