Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(168)

Side by Side Diff: webkit/glue/image_resource_fetcher.cc

Issue 10828127: Use hi-resolution favicon variants if available. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: daringfireball hackfix Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "webkit/glue/image_resource_fetcher.h" 5 #include "webkit/glue/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 "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
10 #include "ui/gfx/size.h" 10 #include "ui/gfx/size.h"
(...skipping 10 matching lines...) Expand all
21 const GURL& image_url, 21 const GURL& image_url,
22 WebFrame* frame, 22 WebFrame* frame,
23 int id, 23 int id,
24 int image_size, 24 int image_size,
25 WebURLRequest::TargetType target_type, 25 WebURLRequest::TargetType target_type,
26 const Callback& callback) 26 const Callback& callback)
27 : callback_(callback), 27 : callback_(callback),
28 id_(id), 28 id_(id),
29 image_url_(image_url), 29 image_url_(image_url),
30 image_size_(image_size) { 30 image_size_(image_size) {
31 fprintf(stderr, " fetching %s %s\n", image_url.host().c_str(), image_url.path(). c_str());
31 fetcher_.reset(new ResourceFetcher( 32 fetcher_.reset(new ResourceFetcher(
32 image_url, frame, target_type, 33 image_url, frame, target_type,
33 base::Bind(&ImageResourceFetcher::OnURLFetchComplete, 34 base::Bind(&ImageResourceFetcher::OnURLFetchComplete,
34 base::Unretained(this)))); 35 base::Unretained(this))));
35 } 36 }
36 37
37 ImageResourceFetcher::~ImageResourceFetcher() { 38 ImageResourceFetcher::~ImageResourceFetcher() {
38 if (!fetcher_->completed()) 39 if (!fetcher_->completed())
39 fetcher_->Cancel(); 40 fetcher_->Cancel();
40 } 41 }
41 42
42 void ImageResourceFetcher::OnURLFetchComplete( 43 void ImageResourceFetcher::OnURLFetchComplete(
43 const WebURLResponse& response, 44 const WebURLResponse& response,
44 const std::string& data) { 45 const std::string& data) {
45 SkBitmap bitmap; 46 SkBitmap bitmap;
46 if (!response.isNull() && response.httpStatusCode() == 200) { 47 if (!response.isNull() && response.httpStatusCode() == 200) {
48 fprintf(stderr, " data %x%x%x%x\n", data.data()[0], data.data()[1], data.data()[ 2], data.data()[3]);
47 // Request succeeded, try to convert it to an image. 49 // Request succeeded, try to convert it to an image.
48 ImageDecoder decoder(gfx::Size(image_size_, image_size_)); 50 ImageDecoder decoder(gfx::Size(image_size_, image_size_));
49 bitmap = decoder.Decode( 51 bitmap = decoder.Decode(
50 reinterpret_cast<const unsigned char*>(data.data()), data.size()); 52 reinterpret_cast<const unsigned char*>(data.data()), data.size());
51 } // else case: 53 } // else case:
52 // If we get here, it means no image from server or couldn't decode the 54 // If we get here, it means no image from server or couldn't decode the
53 // response as an image. The delegate will see a null image, indicating 55 // response as an image. The delegate will see a null image, indicating
54 // that an error occurred. 56 // that an error occurred.
55 57
56 // Take a reference to the callback as running the callback may lead to our 58 // Take a reference to the callback as running the callback may lead to our
57 // destruction. 59 // destruction.
58 Callback callback = callback_; 60 Callback callback = callback_;
59 callback.Run(this, bitmap); 61 callback.Run(this, bitmap);
60 } 62 }
61 63
62 } // namespace webkit_glue 64 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698