Merge Chromium at r12.0.742.93: Initial merge by git

Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6

1 files changed, 6 insertions, 3 deletions

diff --git a/webkit/glue/image_resource_fetcher.cc b/webkit/glue/image_resource_fetcher.cc
index 65d80bd..6a37a34 100644
--- a/webkit/glue/image_resource_fetcher.cc
+++ b/webkit/glue/image_resource_fetcher.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -11,6 +11,8 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using WebKit::WebFrame;
+using WebKit::WebURLRequest;
+using WebKit::WebURLResponse;
 
 namespace webkit_glue {
 
@@ -19,13 +21,14 @@ ImageResourceFetcher::ImageResourceFetcher(
     WebFrame* frame,
     int id,
     int image_size,
+    WebURLRequest::TargetType target_type,
     Callback* callback)
     : callback_(callback),
       id_(id),
       image_url_(image_url),
       image_size_(image_size) {
   fetcher_.reset(new ResourceFetcher(
-      image_url, frame,
+      image_url, frame, target_type,
       NewCallback(this, &ImageResourceFetcher::OnURLFetchComplete)));
 }
 
@@ -35,7 +38,7 @@ ImageResourceFetcher::~ImageResourceFetcher() {
 }
 
 void ImageResourceFetcher::OnURLFetchComplete(
-    const WebKit::WebURLResponse& response,
+    const WebURLResponse& response,
     const std::string& data) {
   SkBitmap bitmap;
   if (!response.isNull() && response.httpStatusCode() == 200) {