Modify ResourceFetcher to use WebURLLoader instead of ResourceHandle....

webkit/glue/webview_impl.h

 // Copyright (c) 2009 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.
 
 #ifndef WEBKIT_GLUE_WEBVIEW_IMPL_H_
 #define WEBKIT_GLUE_WEBVIEW_IMPL_H_
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "skia/ext/platform_canvas.h"
 #include "webkit/api/public/WebPoint.h"
 #include "webkit/api/public/WebSize.h"
 #include "webkit/glue/back_forward_list_client_impl.h"
+#include "webkit/glue/image_resource_fetcher.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "Page.h"
 #include "RenderTheme.h"
 MSVC_POP_WARNING();
 
 namespace WebCore {
@@ skipping 10 matching lines @@
 class Widget;
 }
 
 namespace WebKit {
 class WebKeyboardEvent;
 class WebMouseEvent;
 class WebMouseWheelEvent;
 }
 
 class AutocompletePopupMenuClient;
-class ImageResourceFetcher;
 class SearchableFormData;
 class WebHistoryItemImpl;
 class WebDevToolsAgent;
 class WebDevToolsAgentImpl;
 class WebViewDelegate;
 
 class WebViewImpl : public WebView, public base::RefCounted<WebViewImpl> {
  public:
   // WebView
   virtual bool ShouldClose();
@@ skipping 147 matching lines @@
   void set_window_open_disposition(WindowOpenDisposition disp) {
     window_open_disposition_ = disp;
   }
   WindowOpenDisposition window_open_disposition() const {
     return window_open_disposition_;
   }
 
   // Start a system drag and drop operation.
   void StartDragging(const WebKit::WebDragData& drag_data);
 
-  // ImageResourceFetcher callback.
-  void ImageResourceDownloadDone(ImageResourceFetcher* fetcher,
-                                 bool errored,
-                                 const SkBitmap& image);
-
   // Hides the autocomplete popup if it is showing.
   void HideAutoCompletePopup();
 
   // Converts |x|, |y| from window coordinates to contents coordinates and gets
   // the underlying Node for them.
   WebCore::Node* GetNodeForWindowPos(int x, int y);
 
  protected:
   friend class WebView;  // So WebView::Create can call our constructor
   friend class base::RefCounted<WebViewImpl>;
 
+  // ImageResourceFetcher::Callback.
+  void OnImageFetchComplete(webkit_glue::ImageResourceFetcher* fetcher,
+                            const SkBitmap& bitmap);
+
   WebViewImpl();
   ~WebViewImpl();
 
   void ModifySelection(uint32 message,
                        WebCore::Frame* frame,
                        const WebCore::PlatformKeyboardEvent& e);
 
   scoped_refptr<WebViewDelegate> delegate_;
   WebKit::WebSize size_;
 
@@ skipping 33 matching lines @@
   // Repaints the autofill popup.  Should be called when the suggestions have
   // changed.  Note that this should only be called when the autofill popup is
   // showing.
   void RefreshAutofillPopup();
 
   // Returns true if the view was scrolled.
   bool ScrollViewWithKeyboard(int key_code);
 
   // Removes fetcher from the set of pending image fetchers and deletes it.
   // This is invoked after the download is completed (or fails).
-  void DeleteImageResourceFetcher(ImageResourceFetcher* fetcher);
+  void DeleteImageResourceFetcher(webkit_glue::ImageResourceFetcher* fetcher);
 
   // Converts |pos| from window coordinates to contents coordinates and gets
   // the HitTestResult for it.
   WebCore::HitTestResult HitTestResultForWindowPos(
       const WebCore::IntPoint& pos);
 
   // ImageResourceFetchers schedule via DownloadImage.
-  std::set<ImageResourceFetcher*> image_fetchers_;
+  std::set<webkit_glue::ImageResourceFetcher*> image_fetchers_;
 
   // The point relative to the client area where the mouse was last pressed
   // down. This is used by the drag client to determine what was under the
   // mouse when the drag was initiated. We need to track this here in
   // WebViewImpl since DragClient::startDrag does not pass the position the
   // mouse was at when the drag was initiated, only the current point, which
   // can be misleading as it is usually not over the element the user actually
   // dragged by the time a drag is initiated.
   WebKit::WebPoint last_mouse_down_point_;
 
@@ skipping 61 matching lines @@
   static const WebKit::WebInputEvent* current_input_event() {
     return g_current_input_event;
   }
 private:
   static const WebKit::WebInputEvent* g_current_input_event;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewImpl);
 };
 
 #endif  // WEBKIT_GLUE_WEBVIEW_IMPL_H_