OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/renderer/fetchers/multi_resolution_image_resource_fetcher.h" | 5 #include "content/renderer/fetchers/multi_resolution_image_resource_fetcher.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "content/child/image_decoder.h" | 9 #include "content/child/image_decoder.h" |
10 #include "content/public/renderer/resource_fetcher.h" | 10 #include "content/public/renderer/resource_fetcher.h" |
11 #include "third_party/WebKit/public/platform/WebURLResponse.h" | 11 #include "third_party/WebKit/public/platform/WebURLResponse.h" |
12 #include "third_party/WebKit/public/web/WebFrame.h" | 12 #include "third_party/WebKit/public/web/WebFrame.h" |
13 #include "third_party/WebKit/public/web/WebURLLoaderOptions.h" | 13 #include "third_party/WebKit/public/web/WebURLLoaderOptions.h" |
14 #include "third_party/skia/include/core/SkBitmap.h" | 14 #include "third_party/skia/include/core/SkBitmap.h" |
15 #include "ui/gfx/geometry/size.h" | 15 #include "ui/gfx/geometry/size.h" |
16 | 16 |
17 using blink::WebFrame; | 17 using blink::WebFrame; |
18 using blink::WebURLLoaderOptions; | 18 using blink::WebURLLoaderOptions; |
19 using blink::WebURLRequest; | 19 using blink::WebURLRequest; |
20 using blink::WebURLResponse; | 20 using blink::WebURLResponse; |
21 | 21 |
22 namespace content { | 22 namespace content { |
23 | 23 |
24 MultiResolutionImageResourceFetcher::MultiResolutionImageResourceFetcher( | 24 MultiResolutionImageResourceFetcher::MultiResolutionImageResourceFetcher( |
25 const GURL& image_url, | 25 const GURL& image_url, |
26 WebFrame* frame, | 26 WebFrame* frame, |
27 int id, | 27 int id, |
28 WebURLRequest::RequestContext request_context, | 28 WebURLRequest::RequestContext request_context, |
| 29 blink::WebURLRequest::CachePolicy cache_policy, |
29 const Callback& callback) | 30 const Callback& callback) |
30 : callback_(callback), | 31 : callback_(callback), |
31 id_(id), | 32 id_(id), |
32 http_status_code_(0), | 33 http_status_code_(0), |
33 image_url_(image_url) { | 34 image_url_(image_url) { |
34 fetcher_.reset(ResourceFetcher::Create(image_url)); | 35 fetcher_.reset(ResourceFetcher::Create(image_url)); |
35 | 36 |
36 WebURLLoaderOptions options; | 37 WebURLLoaderOptions options; |
37 options.allowCredentials = true; | 38 options.allowCredentials = true; |
38 options.crossOriginRequestPolicy = | 39 options.crossOriginRequestPolicy = |
39 WebURLLoaderOptions::CrossOriginRequestPolicyAllow; | 40 WebURLLoaderOptions::CrossOriginRequestPolicyAllow; |
40 fetcher_->SetLoaderOptions(options); | 41 fetcher_->SetLoaderOptions(options); |
41 | 42 |
42 // To prevent cache tainting, the favicon requests have to by-pass the service | 43 // To prevent cache tainting, the favicon requests have to by-pass the service |
43 // workers. This should ideally not happen or at least not all the time. | 44 // workers. This should ideally not happen or at least not all the time. |
44 // See https://crbug.com/448427 | 45 // See https://crbug.com/448427 |
45 if (request_context == WebURLRequest::RequestContextFavicon) | 46 if (request_context == WebURLRequest::RequestContextFavicon) |
46 fetcher_->SetSkipServiceWorker(true); | 47 fetcher_->SetSkipServiceWorker(true); |
47 | 48 |
| 49 fetcher_->SetCachePolicy(cache_policy); |
| 50 |
48 fetcher_->Start( | 51 fetcher_->Start( |
49 frame, | 52 frame, |
50 request_context, | 53 request_context, |
51 WebURLRequest::FrameTypeNone, | 54 WebURLRequest::FrameTypeNone, |
52 ResourceFetcher::FRAME_ASSOCIATED_LOADER, | 55 ResourceFetcher::FRAME_ASSOCIATED_LOADER, |
53 base::Bind(&MultiResolutionImageResourceFetcher::OnURLFetchComplete, | 56 base::Bind(&MultiResolutionImageResourceFetcher::OnURLFetchComplete, |
54 base::Unretained(this))); | 57 base::Unretained(this))); |
55 } | 58 } |
56 | 59 |
57 MultiResolutionImageResourceFetcher::~MultiResolutionImageResourceFetcher() { | 60 MultiResolutionImageResourceFetcher::~MultiResolutionImageResourceFetcher() { |
(...skipping 15 matching lines...) Expand all Loading... |
73 // If we get here, it means no image from server or couldn't decode the | 76 // If we get here, it means no image from server or couldn't decode the |
74 // response as an image. The delegate will see an empty vector. | 77 // response as an image. The delegate will see an empty vector. |
75 | 78 |
76 // Take a reference to the callback as running the callback may lead to our | 79 // Take a reference to the callback as running the callback may lead to our |
77 // destruction. | 80 // destruction. |
78 Callback callback = callback_; | 81 Callback callback = callback_; |
79 callback.Run(this, bitmaps); | 82 callback.Run(this, bitmaps); |
80 } | 83 } |
81 | 84 |
82 } // namespace content | 85 } // namespace content |
OLD | NEW |