OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/json/json_parser.h" | 5 #include "base/json/json_parser.h" |
6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
7 #include "base/values.h" | 7 #include "base/values.h" |
8 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" | 8 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" |
9 #include "chrome/browser/enhanced_bookmarks/android/bookmark_image_service_andro
id.h" | 9 #include "chrome/browser/enhanced_bookmarks/android/bookmark_image_service_andro
id.h" |
10 #include "chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h" | 10 #include "chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h" |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 void BookmarkImageServiceAndroid::RetrieveSalientImage( | 65 void BookmarkImageServiceAndroid::RetrieveSalientImage( |
66 const GURL& page_url, | 66 const GURL& page_url, |
67 const GURL& image_url, | 67 const GURL& image_url, |
68 const std::string& referrer, | 68 const std::string& referrer, |
69 net::URLRequest::ReferrerPolicy referrer_policy, | 69 net::URLRequest::ReferrerPolicy referrer_policy, |
70 bool update_bookmark) { | 70 bool update_bookmark) { |
71 const BookmarkNode* bookmark = | 71 const BookmarkNode* bookmark = |
72 enhanced_bookmark_model_->bookmark_model() | 72 enhanced_bookmark_model_->bookmark_model() |
73 ->GetMostRecentlyAddedUserNodeForURL(page_url); | 73 ->GetMostRecentlyAddedUserNodeForURL(page_url); |
74 if (!bookmark || !image_url.is_valid()) { | 74 if (!bookmark || !image_url.is_valid()) { |
75 ProcessNewImage(page_url, update_bookmark, image_url, gfx::Image()); | 75 ProcessNewImage(page_url, update_bookmark, image_url, |
| 76 scoped_ptr<gfx::Image>(new gfx::Image())); |
76 return; | 77 return; |
77 } | 78 } |
78 | 79 |
79 BitmapFetcherHandler* bitmap_fetcher_handler = | 80 BitmapFetcherHandler* bitmap_fetcher_handler = |
80 new BitmapFetcherHandler(this, image_url); | 81 new BitmapFetcherHandler(this, image_url); |
81 bitmap_fetcher_handler->Start( | 82 bitmap_fetcher_handler->Start( |
82 browser_context_, referrer, referrer_policy, | 83 browser_context_, referrer, referrer_policy, |
83 net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES, | 84 net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES, |
84 update_bookmark, page_url); | 85 update_bookmark, page_url); |
85 } | 86 } |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 referrer_policy = net::URLRequest::NEVER_CLEAR_REFERRER; | 205 referrer_policy = net::URLRequest::NEVER_CLEAR_REFERRER; |
205 break; | 206 break; |
206 default: | 207 default: |
207 NOTREACHED(); | 208 NOTREACHED(); |
208 } | 209 } |
209 } | 210 } |
210 RetrieveSalientImage(page_url, GURL(image_url), referrer.url.spec(), | 211 RetrieveSalientImage(page_url, GURL(image_url), referrer.url.spec(), |
211 referrer_policy, update_bookmark); | 212 referrer_policy, update_bookmark); |
212 } | 213 } |
213 | 214 |
214 gfx::Image BookmarkImageServiceAndroid::ResizeImage(gfx::Image image) { | 215 scoped_ptr<gfx::Image> BookmarkImageServiceAndroid::ResizeImage( |
| 216 const gfx::Image& image) { |
215 DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 217 DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
216 | 218 |
217 gfx::Image resized_image = image; | 219 scoped_ptr<gfx::Image> result(new gfx::Image()); |
| 220 |
218 if (image.Width() > max_size_.width() && | 221 if (image.Width() > max_size_.width() && |
219 image.Height() > max_size_.height()) { | 222 image.Height() > max_size_.height()) { |
220 float resize_ratio = std::min(((float)max_size_.width()) / image.Width(), | 223 float resize_ratio = std::min( |
221 ((float)max_size_.height()) / image.Height()); | 224 ((float)max_size_.width()) / image.Width(), |
| 225 ((float)max_size_.height()) / image.Height()); |
222 // +0.5f is for correct rounding. Without it, it's possible that dest_width | 226 // +0.5f is for correct rounding. Without it, it's possible that dest_width |
223 // is smaller than max_size_.Width() by one. | 227 // is smaller than max_size_.Width() by one. |
224 int dest_width = static_cast<int>(resize_ratio * image.Width() + 0.5f); | 228 int dest_width = static_cast<int>(resize_ratio * image.Width() + 0.5f); |
225 int dest_height = static_cast<int>(resize_ratio * image.Height() + 0.5f); | 229 int dest_height = static_cast<int>( |
| 230 resize_ratio * image.Height() + 0.5f); |
226 | 231 |
227 resized_image = | 232 *result = gfx::Image::CreateFrom1xBitmap( |
228 gfx::Image::CreateFrom1xBitmap(skia::ImageOperations::Resize( | 233 skia::ImageOperations::Resize(image.AsBitmap(), |
229 image.AsBitmap(), skia::ImageOperations::RESIZE_BEST, dest_width, | 234 skia::ImageOperations::RESIZE_BEST, |
230 dest_height)); | 235 dest_width, |
231 resized_image.AsImageSkia().MakeThreadSafe(); | 236 dest_height)); |
| 237 result->AsImageSkia().MakeThreadSafe(); |
| 238 } else { |
| 239 *result = image; |
232 } | 240 } |
233 return resized_image; | 241 |
| 242 return result.Pass(); |
234 } | 243 } |
235 | 244 |
236 void BookmarkImageServiceAndroid::BitmapFetcherHandler::Start( | 245 void BookmarkImageServiceAndroid::BitmapFetcherHandler::Start( |
237 content::BrowserContext* browser_context, | 246 content::BrowserContext* browser_context, |
238 const std::string& referrer, | 247 const std::string& referrer, |
239 net::URLRequest::ReferrerPolicy referrer_policy, | 248 net::URLRequest::ReferrerPolicy referrer_policy, |
240 int load_flags, | 249 int load_flags, |
241 bool update_bookmark, | 250 bool update_bookmark, |
242 const GURL& page_url) { | 251 const GURL& page_url) { |
243 update_bookmark_ = update_bookmark; | 252 update_bookmark_ = update_bookmark; |
244 page_url_ = page_url; | 253 page_url_ = page_url; |
245 | 254 |
246 bitmap_fetcher_.Start(browser_context->GetRequestContext(), referrer, | 255 bitmap_fetcher_.Start(browser_context->GetRequestContext(), referrer, |
247 referrer_policy, load_flags); | 256 referrer_policy, load_flags); |
248 } | 257 } |
249 | 258 |
250 void BookmarkImageServiceAndroid::BitmapFetcherHandler::OnFetchComplete( | 259 void BookmarkImageServiceAndroid::BitmapFetcherHandler::OnFetchComplete( |
251 const GURL& url, | 260 const GURL& url, |
252 const SkBitmap* bitmap) { | 261 const SkBitmap* bitmap) { |
253 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 262 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
254 | 263 |
255 gfx::Image image; | 264 scoped_ptr<gfx::Image> image; |
256 if (bitmap) { | 265 if (bitmap) { |
257 gfx::ImageSkia imageSkia = gfx::ImageSkia::CreateFrom1xBitmap(*bitmap); | 266 gfx::ImageSkia imageSkia = gfx::ImageSkia::CreateFrom1xBitmap(*bitmap); |
258 imageSkia.MakeThreadSafe(); | 267 imageSkia.MakeThreadSafe(); |
259 image = gfx::Image(imageSkia); | 268 image.reset(new gfx::Image(imageSkia)); |
| 269 } else { |
| 270 image.reset(new gfx::Image()); |
260 } | 271 } |
261 service_->ProcessNewImage(page_url_, update_bookmark_, url, image); | 272 service_->ProcessNewImage(page_url_, update_bookmark_, url, image.Pass()); |
262 | 273 |
263 delete this; | 274 delete this; |
264 } | 275 } |
265 | 276 |
266 } // namespace enhanced_bookmarks | 277 } // namespace enhanced_bookmarks |
OLD | NEW |