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

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

Issue 164225: Switch to WebFrame from the WebKit API.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 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
« no previous file with comments | « webkit/glue/resource_fetcher.h ('k') | webkit/glue/resource_fetcher_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "webkit/glue/resource_fetcher.h" 5 #include "webkit/glue/resource_fetcher.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "webkit/api/public/WebFrame.h"
8 #include "webkit/api/public/WebKit.h" 9 #include "webkit/api/public/WebKit.h"
9 #include "webkit/api/public/WebKitClient.h" 10 #include "webkit/api/public/WebKitClient.h"
10 #include "webkit/api/public/WebURLError.h" 11 #include "webkit/api/public/WebURLError.h"
11 #include "webkit/api/public/WebURLLoader.h" 12 #include "webkit/api/public/WebURLLoader.h"
12 #include "webkit/api/public/WebURLRequest.h" 13 #include "webkit/api/public/WebURLRequest.h"
13 #include "webkit/api/public/WebURL.h" 14 #include "webkit/api/public/WebURL.h"
14 #include "webkit/glue/webframe.h"
15 15
16 using base::TimeDelta; 16 using base::TimeDelta;
17 using WebKit::WebFrame;
17 using WebKit::WebURLError; 18 using WebKit::WebURLError;
18 using WebKit::WebURLLoader; 19 using WebKit::WebURLLoader;
19 using WebKit::WebURLRequest; 20 using WebKit::WebURLRequest;
20 using WebKit::WebURLResponse; 21 using WebKit::WebURLResponse;
21 22
22 namespace webkit_glue { 23 namespace webkit_glue {
23 24
24 ResourceFetcher::ResourceFetcher(const GURL& url, WebFrame* frame, 25 ResourceFetcher::ResourceFetcher(const GURL& url, WebFrame* frame,
25 Callback* c) 26 Callback* c)
26 : url_(url), 27 : url_(url),
(...skipping 12 matching lines...) Expand all
39 40
40 void ResourceFetcher::Cancel() { 41 void ResourceFetcher::Cancel() {
41 if (!completed_) { 42 if (!completed_) {
42 loader_->cancel(); 43 loader_->cancel();
43 completed_ = true; 44 completed_ = true;
44 } 45 }
45 } 46 }
46 47
47 void ResourceFetcher::Start(WebFrame* frame) { 48 void ResourceFetcher::Start(WebFrame* frame) {
48 WebURLRequest request(url_); 49 WebURLRequest request(url_);
49 frame->DispatchWillSendRequest(&request); 50 frame->dispatchWillSendRequest(request);
50 51
51 loader_.reset(WebKit::webKitClient()->createURLLoader()); 52 loader_.reset(WebKit::webKitClient()->createURLLoader());
52 loader_->loadAsynchronously(request, this); 53 loader_->loadAsynchronously(request, this);
53 } 54 }
54 55
55 ///////////////////////////////////////////////////////////////////////////// 56 /////////////////////////////////////////////////////////////////////////////
56 // WebURLLoaderClient methods 57 // WebURLLoaderClient methods
57 58
58 void ResourceFetcher::willSendRequest( 59 void ResourceFetcher::willSendRequest(
59 WebURLLoader* loader, WebURLRequest& new_request, 60 WebURLLoader* loader, WebURLRequest& new_request,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 } 113 }
113 114
114 void ResourceFetcherWithTimeout::TimeoutFired() { 115 void ResourceFetcherWithTimeout::TimeoutFired() {
115 if (!completed_) { 116 if (!completed_) {
116 loader_->cancel(); 117 loader_->cancel();
117 didFail(NULL, WebURLError()); 118 didFail(NULL, WebURLError());
118 } 119 }
119 } 120 }
120 121
121 } // namespace webkit_glue 122 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/resource_fetcher.h ('k') | webkit/glue/resource_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698