OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 | 8 |
9 MSVC_PUSH_WARNING_LEVEL(0); | 9 MSVC_PUSH_WARNING_LEVEL(0); |
10 #include "ImageSourceSkia.h" | 10 #include "ImageSourceSkia.h" |
11 MSVC_POP_WARNING(); | 11 MSVC_POP_WARNING(); |
12 #undef LOG | 12 #undef LOG |
13 | 13 |
14 #include "webkit/glue/image_resource_fetcher.h" | 14 #include "webkit/glue/image_resource_fetcher.h" |
15 | 15 |
16 #include "base/gfx/size.h" | 16 #include "base/gfx/size.h" |
17 #include "webkit/glue/image_decoder.h" | 17 #include "webkit/glue/image_decoder.h" |
18 #include "webkit/glue/webview_impl.h" | 18 #include "webkit/glue/webview_impl.h" |
19 #include "skia/include/SkBitmap.h" | 19 #include "third_party/skia/include/core/SkBitmap.h" |
20 | 20 |
21 ImageResourceFetcher::ImageResourceFetcher( | 21 ImageResourceFetcher::ImageResourceFetcher( |
22 WebViewImpl* web_view, | 22 WebViewImpl* web_view, |
23 int id, | 23 int id, |
24 const GURL& image_url, | 24 const GURL& image_url, |
25 int image_size) | 25 int image_size) |
26 : web_view_(web_view), | 26 : web_view_(web_view), |
27 id_(id), | 27 id_(id), |
28 image_url_(image_url), | 28 image_url_(image_url), |
29 image_size_(image_size) { | 29 image_size_(image_size) { |
(...skipping 19 matching lines...) Expand all Loading... |
49 webkit_glue::ImageDecoder decoder(gfx::Size(image_size_, image_size_)); | 49 webkit_glue::ImageDecoder decoder(gfx::Size(image_size_, image_size_)); |
50 image = decoder.Decode( | 50 image = decoder.Decode( |
51 reinterpret_cast<const unsigned char*>(data.data()), data.size()); | 51 reinterpret_cast<const unsigned char*>(data.data()), data.size()); |
52 } // else case: | 52 } // else case: |
53 // If we get here, it means no image from server or couldn't decode the | 53 // If we get here, it means no image from server or couldn't decode the |
54 // response as an image. Need to notify the webview though, otherwise the | 54 // response as an image. Need to notify the webview though, otherwise the |
55 // browser will keep trying to download favicon (when this is used to | 55 // browser will keep trying to download favicon (when this is used to |
56 // download the favicon). | 56 // download the favicon). |
57 web_view_->ImageResourceDownloadDone(this, errored, image); | 57 web_view_->ImageResourceDownloadDone(this, errored, image); |
58 } | 58 } |
OLD | NEW |