Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Unified Diff: chrome/browser/tab_contents/thumbnail_generator.cc

Issue 10348007: Remove some dead code in ThumbnailGenerator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/tab_contents/thumbnail_generator.h ('k') | chrome/browser/ui/cocoa/tabpose_window.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/thumbnail_generator.cc
diff --git a/chrome/browser/tab_contents/thumbnail_generator.cc b/chrome/browser/tab_contents/thumbnail_generator.cc
index 162094b85936b01bd7cd204243670ba5e27907e1..55aabae490c6f52d1d8f10349d24b94f744d7612 100644
--- a/chrome/browser/tab_contents/thumbnail_generator.cc
+++ b/chrome/browser/tab_contents/thumbnail_generator.cc
@@ -37,7 +37,7 @@
// This class provides current thumbnails for tabs. The simplest operation is
// when a request for a thumbnail comes in, to grab the backing store and make
// a smaller version of that. Clients of the class can send such a request by
-// GetThumbnailForRenderer() and AskForSnapshot().
+// AskForSnapshot().
//
// The class also provides a service for updating thumbnails to be used in
// "Most visited" section of the new tab page. The service can be started
@@ -151,37 +151,6 @@ SkBitmap CreateThumbnail(
return result;
}
-// Creates a downsampled thumbnail for the given RenderWidgetHost's backing
-// store. The returned bitmap will be isNull if there was an error creating it.
-SkBitmap GetBitmapForRenderWidgetHost(
- RenderWidgetHost* render_widget_host,
- int desired_width,
- int desired_height,
- int options,
- ThumbnailGenerator::ClipResult* clip_result) {
- // base::TimeTicks begin_compute_thumbnail = base::TimeTicks::Now();
-
- // Get the bitmap as a Skia object so we can resample it. This is a large
- // allocation and we can tolerate failure here, so give up if the allocation
- // fails.
- skia::PlatformCanvas temp_canvas;
- content::RenderWidgetHostView* view = render_widget_host->GetView();
- if (!view)
- return SkBitmap();
- const gfx::Size copy_size =
- GetCopySizeForThumbnail(view->GetViewBounds().size(),
- gfx::Size(desired_width, desired_height));
- if (!render_widget_host->CopyFromBackingStore(
- gfx::Rect(), copy_size, &temp_canvas))
- return SkBitmap();
-
- return CreateThumbnail(skia::GetTopDevice(temp_canvas)->accessBitmap(false),
- desired_width,
- desired_height,
- options,
- clip_result);
-}
-
} // namespace
struct ThumbnailGenerator::AsyncRequestInfo {
@@ -252,24 +221,9 @@ void ThumbnailGenerator::MonitorRenderer(RenderWidgetHost* renderer,
}
void ThumbnailGenerator::AskForSnapshot(RenderWidgetHost* renderer,
- bool prefer_backing_store,
const ThumbnailReadyCallback& callback,
gfx::Size page_size,
gfx::Size desired_size) {
- if (prefer_backing_store) {
- // We were able to find a non-null backing store for this renderer, so
- // we'll go with it.
- SkBitmap first_try = GetBitmapForRenderWidgetHost(
- renderer, desired_size.width(), desired_size.height(), kNoOptions,
- NULL);
- if (!first_try.isNull()) {
- callback.Run(first_try);
- return;
- }
- // Now, if the backing store didn't exist, we will still try and
- // render asynchronously.
- }
-
// We are going to render the thumbnail asynchronously now, so keep
// this callback for later lookup when the rendering is done.
static int sequence_num = 0;
@@ -319,19 +273,6 @@ void ThumbnailGenerator::AskForSnapshot(RenderWidgetHost* renderer,
#endif // defined(USE_X11)
}
-SkBitmap ThumbnailGenerator::GetThumbnailForRenderer(
- RenderWidgetHost* renderer) const {
- return GetThumbnailForRendererWithOptions(renderer, kNoOptions, NULL);
-}
-
-SkBitmap ThumbnailGenerator::GetThumbnailForRendererWithOptions(
- RenderWidgetHost* renderer,
- int options,
- ClipResult* clip_result) const {
- return GetBitmapForRenderWidgetHost(
- renderer, kThumbnailWidth, kThumbnailHeight, options, clip_result);
-}
-
void ThumbnailGenerator::WidgetDidReceivePaintAtSizeAck(
RenderWidgetHost* widget,
int sequence_num,
« no previous file with comments | « chrome/browser/tab_contents/thumbnail_generator.h ('k') | chrome/browser/ui/cocoa/tabpose_window.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698