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 "chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h" | 5 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h" |
6 | 6 |
7 #include "base/memory/weak_ptr.h" | 7 #include "base/memory/weak_ptr.h" |
8 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" | 8 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "net/base/load_flags.h" | 10 #include "net/base/load_flags.h" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
108 const chrome::BitmapFetcher* fetcher = FindFetcherForUrl(url); | 108 const chrome::BitmapFetcher* fetcher = FindFetcherForUrl(url); |
109 if (fetcher) | 109 if (fetcher) |
110 return fetcher; | 110 return fetcher; |
111 | 111 |
112 chrome::BitmapFetcher* new_fetcher = CreateFetcher(url); | 112 chrome::BitmapFetcher* new_fetcher = CreateFetcher(url); |
113 active_fetchers_.push_back(new_fetcher); | 113 active_fetchers_.push_back(new_fetcher); |
114 return new_fetcher; | 114 return new_fetcher; |
115 } | 115 } |
116 | 116 |
117 void BitmapFetcherService::Prefetch(const GURL& url) { | 117 void BitmapFetcherService::Prefetch(const GURL& url) { |
118 if (!url.is_valid()) | |
119 return; | |
118 (void)EnsureFetcherForUrl(url); | 120 (void)EnsureFetcherForUrl(url); |
Peter Kasting
2014/06/14 01:00:51
Nit: While here, please fix this; we disallow C-st
groby-ooo-7-16
2014/06/17 21:06:35
Fixed in base-cl. Also, inverted logic to kill ear
| |
119 } | 121 } |
120 | 122 |
121 RequestId BitmapFetcherService::RequestImage(const GURL& url, | 123 RequestId BitmapFetcherService::RequestImage(const GURL& url, |
122 BitmapFetcherObserver* observer) { | 124 BitmapFetcherObserver* observer) { |
123 // Create a new request, assigning next available request ID. | 125 // Create a new request, assigning next available request ID. |
124 ++current_request_id_; | 126 ++current_request_id_; |
125 if (current_request_id_ == REQUEST_ID_INVALID) | 127 if (current_request_id_ == REQUEST_ID_INVALID) |
126 ++current_request_id_; | 128 ++current_request_id_; |
127 int request_id = current_request_id_; | 129 int request_id = current_request_id_; |
128 scoped_ptr<BitmapFetcherRequest> request( | 130 scoped_ptr<BitmapFetcherRequest> request( |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
170 } | 172 } |
171 | 173 |
172 if (!bitmap->isNull()) { | 174 if (!bitmap->isNull()) { |
173 CacheEntry* entry = new CacheEntry; | 175 CacheEntry* entry = new CacheEntry; |
174 entry->bitmap.reset(new SkBitmap(*bitmap)); | 176 entry->bitmap.reset(new SkBitmap(*bitmap)); |
175 cache_.Put(fetcher->url(), entry); | 177 cache_.Put(fetcher->url(), entry); |
176 } | 178 } |
177 | 179 |
178 RemoveFetcher(fetcher); | 180 RemoveFetcher(fetcher); |
179 } | 181 } |
OLD | NEW |