Plugs in the new thumbnailing algorithm to ThumbnailTabHelper.

chrome/browser/thumbnails/content_analysis.cc

 // Copyright (c) 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 "chrome/browser/thumbnails/content_analysis.h"
 
 #include <algorithm>
 #include <cmath>
 #include <deque>
 #include <functional>
@@ skipping 54 matching lines @@
 }
 
 }  // namespace
 
 namespace thumbnailing_utils {
 
 void ApplyGaussianGradientMagnitudeFilter(SkBitmap* input_bitmap,
                                           float kernel_sigma) {
   // The purpose of this function is to highlight salient
   // (attention-attracting?) features of the image for use in image
-  // retargetting.
+  // retargeting.
   SkAutoLockPixels source_lock(*input_bitmap);
   DCHECK(input_bitmap);
   DCHECK(input_bitmap->getPixels());
   DCHECK_EQ(SkBitmap::kA8_Config, input_bitmap->config());
 
   // To perform computations we will need one intermediate buffer. It can
   // very well be just another bitmap.
   const SkISize image_size = SkISize::Make(input_bitmap->width(),
                                            input_bitmap->height());
   SkBitmap intermediate;
@@ skipping 331 matching lines @@
       memcpy(insertion_target,
              src_row + left_copy_pixel * bitmap.bytesPerPixel(),
              bytes_to_copy);
     }
     target_row++;
   }
 
   return target;
 }
 
-SkBitmap CreateRetargettedThumbnailImage(
+SkBitmap CreateRetargetedThumbnailImage(
     const SkBitmap& source_bitmap,
     const gfx::Size& target_size,
     float kernel_sigma) {
   // First thing we need for this method is to color-reduce the source_bitmap.
   SkBitmap reduced_color;
   reduced_color.setConfig(
       SkBitmap::kA8_Config, source_bitmap.width(), source_bitmap.height());
   reduced_color.allocPixels();
 
   if (!color_utils::ComputePrincipalComponentImage(source_bitmap,
                                                    &reduced_color)) {
     // CCIR601 luminance conversion vector.
     gfx::Vector3dF transform(0.299f, 0.587f, 0.114f);
     if (!color_utils::ApplyColorReduction(
             source_bitmap, transform, true, &reduced_color)) {
       DLOG(WARNING) << "Failed to compute luminance image from a screenshot. "
-                    << "Cannot compute retargetted thumbnail.";
+                    << "Cannot compute retargeted thumbnail.";
       return SkBitmap();
     }
     DLOG(WARNING) << "Could not compute principal color image for a thumbnail. "
                   << "Using luminance instead.";
   }
 
   // Turn 'color-reduced' image into the 'energy' image.
   ApplyGaussianGradientMagnitudeFilter(&reduced_color, kernel_sigma);
 
   // Extract vertical and horizontal projection of image features.
@@ skipping 21 matching lines @@
                  column_profile.end(),
                  included_columns.begin(),
                  std::bind2nd(std::greater<float>(), threshold_columns));
 
   // Use the original image and computed inclusion vectors to create a resized
   // image.
   return ComputeDecimatedImage(source_bitmap, included_rows, included_columns);
 }
 
 }  // thumbnailing_utils