Remove some dead code in ThumbnailGenerator.

chrome/browser/tab_contents/thumbnail_generator.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/tab_contents/thumbnail_generator.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 19 matching lines @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 // Overview
 // --------
 // 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
 // by StartThumbnailing(). The current algorithm of the service is as
 // simple as follows:
 //
 //    When a renderer is about to be hidden (this usually occurs when the
 //    current tab is closed or another tab is clicked), update the
 //    thumbnail for the tab rendered by the renderer, if needed. The
 //    heuristics to judge whether or not to update the thumbnail is
@@ skipping 93 matching lines @@
         bmp.height() == result.height())
       bmp.copyTo(&result, SkBitmap::kARGB_8888_Config);
 #endif
   }
 
   HISTOGRAM_TIMES(kThumbnailHistogramName,
                   base::TimeTicks::Now() - begin_compute_thumbnail);
   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 {
   ThumbnailReadyCallback callback;
   scoped_ptr<TransportDIB> thumbnail_dib;
   RenderWidgetHost* renderer;  // Not owned.
 };
 
 ThumbnailGenerator::ThumbnailGenerator()
     : enabled_(true),
@@ skipping 50 matching lines @@
           renderer_source);
       registrar_.Remove(
           this,
           content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED,
           renderer_source);
     }
   }
 }
 
 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;
   sequence_num++;
   scoped_ptr<TransportDIB> thumbnail_dib(TransportDIB::Create(
       desired_size.width() * desired_size.height() * 4, sequence_num));
 
 #if defined(USE_X11)
   // TODO: IPC a handle to the renderer like Windows.
   // http://code.google.com/p/chromium/issues/detail?id=89777
@@ skipping 29 matching lines @@
     NOTREACHED() << "Callback already registered?";
     return;
   }
 
   renderer->PaintAtSize(
       renderer_dib_handle, sequence_num, page_size, desired_size);
 
 #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,
     const gfx::Size& size) {
   // Lookup the callback, run it, and erase it.
   ThumbnailCallbackMap::iterator item = callback_map_.find(sequence_num);
   if (item != callback_map_.end()) {
     TransportDIB* dib = item->second->thumbnail_dib.get();
     DCHECK(dib);
     if (!dib || !dib->Map()) {
@@ skipping 267 matching lines @@
 
 void ThumbnailGenerator::DidStartLoading() {
   load_interrupted_ = false;
 }
 
 void ThumbnailGenerator::StopNavigation() {
   // This function gets called when the page loading is interrupted by the
   // stop button.
   load_interrupted_ = true;
 }