Restrict salient image size before storing

components/enhanced_bookmarks/bookmark_image_service.cc

Index: components/enhanced_bookmarks/bookmark_image_service.cc
diff --git a/components/enhanced_bookmarks/bookmark_image_service.cc b/components/enhanced_bookmarks/bookmark_image_service.cc
index 683ae6e9314127cf95356e5fd81e2ae74a6c0e5f..fb3d688ea3543342a446bc16072efc4c2e67f5b4 100644
--- a/components/enhanced_bookmarks/bookmark_image_service.cc
+++ b/components/enhanced_bookmarks/bookmark_image_service.cc
@@ -190,8 +190,8 @@ void BookmarkImageService::SalientImageForUrl(const GURL& page_url,
 
 void BookmarkImageService::ProcessNewImage(const GURL& page_url,
                                            bool update_bookmarks,
-                                           const gfx::Image& image,
-                                           const GURL& image_url) {
+                                           const GURL& image_url,
+                                           const gfx::Image& image) {
   DCHECK(CalledOnValidThread());
   PostTaskToStoreImage(image, image_url, page_url);
   if (update_bookmarks && image_url.is_valid()) {
@@ -212,12 +212,13 @@ bool BookmarkImageService::IsPageUrlInProgress(const GURL& page_url) {
   return in_progress_page_urls_.find(page_url) != in_progress_page_urls_.end();
 }
 
-ImageRecord BookmarkImageService::StoreImage(const gfx::Image& image,
-                                             const GURL& image_url,
-                                             const GURL& page_url) {
-  ImageRecord image_info(image, image_url, SK_ColorBLACK);
-  if (!image.IsEmpty()) {
-    image_info.dominant_color = DominantColorForImage(image);
+ImageRecord BookmarkImageService::ResizeAndStoreImage(const gfx::Image& image,
+                                                      const GURL& image_url,
+                                                      const GURL& page_url) {

[Kibeom Kim (inactive), 2015/02/17 21:32:59]

How about putting DCHECK(!CalledOnValidThread()); here?

[Ian Wen, 2015/02/23 18:54:57]

I think the convention here is that if a function does not contain this DCHECK,
it is not supposed to run on UI thread. Adding an opposite DCHECK might be a bit
confusing, I even did not notice the exclamation mark in your comment at first
glance, which confused me for a while...

+  gfx::Image resized_image = ResizeImage(image);
+  ImageRecord image_info(resized_image, image_url, SK_ColorBLACK);
+  if (!resized_image.IsEmpty()) {
+    image_info.dominant_color = DominantColorForImage(resized_image);
     // TODO(lpromero): this should be saved all the time, even when there is an
     // empty image. http://crbug.com/451450
     pool_->PostNamedSequencedWorkerTask(
@@ -234,8 +235,8 @@ void BookmarkImageService::PostTaskToStoreImage(const gfx::Image& image,
   DCHECK(CalledOnValidThread());
 
   base::Callback<ImageRecord(void)> task =
-      base::Bind(&BookmarkImageService::StoreImage, base::Unretained(this),
-                 image, image_url, page_url);
+      base::Bind(&BookmarkImageService::ResizeAndStoreImage,
+                 base::Unretained(this), image, image_url, page_url);
   base::Callback<void(const ImageRecord&)> reply =
       base::Bind(&BookmarkImageService::OnStoreImagePosted,
                  base::Unretained(this), page_url);