diff options
Diffstat (limited to 'content/renderer/fetchers')
8 files changed, 53 insertions, 53 deletions
diff --git a/content/renderer/fetchers/alt_error_page_resource_fetcher.cc b/content/renderer/fetchers/alt_error_page_resource_fetcher.cc index cbcab09..56cb6b8 100644 --- a/content/renderer/fetchers/alt_error_page_resource_fetcher.cc +++ b/content/renderer/fetchers/alt_error_page_resource_fetcher.cc @@ -8,10 +8,10 @@ #include "base/bind_helpers.h" #include "content/renderer/fetchers/resource_fetcher.h" -using WebKit::WebFrame; -using WebKit::WebURLError; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; +using blink::WebFrame; +using blink::WebURLError; +using blink::WebURLRequest; +using blink::WebURLResponse; namespace content { diff --git a/content/renderer/fetchers/alt_error_page_resource_fetcher.h b/content/renderer/fetchers/alt_error_page_resource_fetcher.h index 6d82857..7fcf34c 100644 --- a/content/renderer/fetchers/alt_error_page_resource_fetcher.h +++ b/content/renderer/fetchers/alt_error_page_resource_fetcher.h @@ -11,7 +11,7 @@ #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "url/gurl.h" -namespace WebKit { +namespace blink { class WebFrame; class WebURLResponse; } @@ -26,16 +26,16 @@ class AltErrorPageResourceFetcher { // This will be called when the alternative error page has been fetched, // successfully or not. If there is a failure, the third parameter (the // data) will be empty. - typedef base::Callback<void(WebKit::WebFrame*, - const WebKit::WebURLRequest&, - const WebKit::WebURLError&, + typedef base::Callback<void(blink::WebFrame*, + const blink::WebURLRequest&, + const blink::WebURLError&, const std::string&)> Callback; AltErrorPageResourceFetcher( const GURL& url, - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& original_request, - const WebKit::WebURLError& original_error, + blink::WebFrame* frame, + const blink::WebURLRequest& original_request, + const blink::WebURLError& original_error, const Callback& callback); ~AltErrorPageResourceFetcher(); @@ -43,22 +43,22 @@ class AltErrorPageResourceFetcher { void Cancel(); private: - void OnURLFetchComplete(const WebKit::WebURLResponse& response, + void OnURLFetchComplete(const blink::WebURLResponse& response, const std::string& data); // Does the actual fetching. scoped_ptr<ResourceFetcherWithTimeout> fetcher_; - WebKit::WebFrame* frame_; + blink::WebFrame* frame_; Callback callback_; // The original request. If loading the alternate error page fails, it's // needed to generate the error page. - WebKit::WebURLRequest original_request_; + blink::WebURLRequest original_request_; // The error associated with this load. If there's an error talking with the // alt error page server, we need this to complete the original load. - WebKit::WebURLError original_error_; + blink::WebURLError original_error_; DISALLOW_COPY_AND_ASSIGN(AltErrorPageResourceFetcher); }; diff --git a/content/renderer/fetchers/image_resource_fetcher.cc b/content/renderer/fetchers/image_resource_fetcher.cc index 0ce0d4e..fe6d1cd 100644 --- a/content/renderer/fetchers/image_resource_fetcher.cc +++ b/content/renderer/fetchers/image_resource_fetcher.cc @@ -12,9 +12,9 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/size.h" -using WebKit::WebFrame; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; +using blink::WebFrame; +using blink::WebURLRequest; +using blink::WebURLResponse; namespace content { diff --git a/content/renderer/fetchers/image_resource_fetcher.h b/content/renderer/fetchers/image_resource_fetcher.h index 2ddb20d..a7d16c1 100644 --- a/content/renderer/fetchers/image_resource_fetcher.h +++ b/content/renderer/fetchers/image_resource_fetcher.h @@ -22,10 +22,10 @@ class ImageResourceFetcher { ImageResourceFetcher( const GURL& image_url, - WebKit::WebFrame* frame, + blink::WebFrame* frame, int id, int image_size, - WebKit::WebURLRequest::TargetType target_type, + blink::WebURLRequest::TargetType target_type, const Callback& callback); virtual ~ImageResourceFetcher(); @@ -38,7 +38,7 @@ class ImageResourceFetcher { private: // ResourceFetcher::Callback. Decodes the image and invokes callback_. - void OnURLFetchComplete(const WebKit::WebURLResponse& response, + void OnURLFetchComplete(const blink::WebURLResponse& response, const std::string& data); Callback callback_; diff --git a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc index 304abe8..f910406 100644 --- a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc +++ b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc @@ -11,9 +11,9 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/size.h" -using WebKit::WebFrame; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; +using blink::WebFrame; +using blink::WebURLRequest; +using blink::WebURLResponse; namespace content { diff --git a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h index 3e7c326..4377a26 100644 --- a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h +++ b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h @@ -24,9 +24,9 @@ class MultiResolutionImageResourceFetcher{ MultiResolutionImageResourceFetcher( const GURL& image_url, - WebKit::WebFrame* frame, + blink::WebFrame* frame, int id, - WebKit::WebURLRequest::TargetType target_type, + blink::WebURLRequest::TargetType target_type, const Callback& callback); virtual ~MultiResolutionImageResourceFetcher(); @@ -42,7 +42,7 @@ class MultiResolutionImageResourceFetcher{ private: // ResourceFetcher::Callback. Decodes the image and invokes callback_. - void OnURLFetchComplete(const WebKit::WebURLResponse& response, + void OnURLFetchComplete(const blink::WebURLResponse& response, const std::string& data); Callback callback_; diff --git a/content/renderer/fetchers/resource_fetcher.cc b/content/renderer/fetchers/resource_fetcher.cc index 455f59e..ccdda07 100644 --- a/content/renderer/fetchers/resource_fetcher.cc +++ b/content/renderer/fetchers/resource_fetcher.cc @@ -15,11 +15,11 @@ #include "third_party/WebKit/public/web/WebKit.h" using base::TimeDelta; -using WebKit::WebFrame; -using WebKit::WebURLError; -using WebKit::WebURLLoader; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; +using blink::WebFrame; +using blink::WebURLError; +using blink::WebURLLoader; +using blink::WebURLRequest; +using blink::WebURLResponse; namespace content { @@ -54,7 +54,7 @@ void ResourceFetcher::Start(WebFrame* frame) { request.setFirstPartyForCookies(frame->document().firstPartyForCookies()); frame->dispatchWillSendRequest(request); - loader_.reset(WebKit::Platform::current()->createURLLoader()); + loader_.reset(blink::Platform::current()->createURLLoader()); loader_->loadAsynchronously(request, this); } diff --git a/content/renderer/fetchers/resource_fetcher.h b/content/renderer/fetchers/resource_fetcher.h index 5900973..038dc55 100644 --- a/content/renderer/fetchers/resource_fetcher.h +++ b/content/renderer/fetchers/resource_fetcher.h @@ -27,7 +27,7 @@ class GURL; -namespace WebKit { +namespace blink { class WebFrame; class WebURLLoader; struct WebURLError; @@ -36,18 +36,18 @@ struct WebURLError; namespace content { class CONTENT_EXPORT ResourceFetcher - : NON_EXPORTED_BASE(public WebKit::WebURLLoaderClient) { + : NON_EXPORTED_BASE(public blink::WebURLLoaderClient) { public: // This will be called when the URL has been fetched, successfully or not. // If there is a failure, response and data will both be empty. |response| // and |data| are both valid until the URLFetcher instance is destroyed. - typedef base::Callback<void(const WebKit::WebURLResponse&, + typedef base::Callback<void(const blink::WebURLResponse&, const std::string&)> Callback; // We need a frame to make requests. ResourceFetcher( - const GURL& url, WebKit::WebFrame* frame, - WebKit::WebURLRequest::TargetType target_type, + const GURL& url, blink::WebFrame* frame, + blink::WebURLRequest::TargetType target_type, const Callback& callback); virtual ~ResourceFetcher(); @@ -59,43 +59,43 @@ class CONTENT_EXPORT ResourceFetcher protected: // WebURLLoaderClient methods: virtual void willSendRequest( - WebKit::WebURLLoader* loader, WebKit::WebURLRequest& new_request, - const WebKit::WebURLResponse& redirect_response); + blink::WebURLLoader* loader, blink::WebURLRequest& new_request, + const blink::WebURLResponse& redirect_response); virtual void didSendData( - WebKit::WebURLLoader* loader, unsigned long long bytes_sent, + blink::WebURLLoader* loader, unsigned long long bytes_sent, unsigned long long total_bytes_to_be_sent); virtual void didReceiveResponse( - WebKit::WebURLLoader* loader, const WebKit::WebURLResponse& response); + blink::WebURLLoader* loader, const blink::WebURLResponse& response); virtual void didReceiveCachedMetadata( - WebKit::WebURLLoader* loader, const char* data, int data_length); + blink::WebURLLoader* loader, const char* data, int data_length); virtual void didReceiveData( - WebKit::WebURLLoader* loader, const char* data, int data_length, + blink::WebURLLoader* loader, const char* data, int data_length, int encoded_data_length); virtual void didFinishLoading( - WebKit::WebURLLoader* loader, double finishTime); + blink::WebURLLoader* loader, double finishTime); virtual void didFail( - WebKit::WebURLLoader* loader, const WebKit::WebURLError& error); + blink::WebURLLoader* loader, const blink::WebURLError& error); - scoped_ptr<WebKit::WebURLLoader> loader_; + scoped_ptr<blink::WebURLLoader> loader_; // URL we're fetching GURL url_; // Target type - WebKit::WebURLRequest::TargetType target_type_; + blink::WebURLRequest::TargetType target_type_; // A copy of the original resource response - WebKit::WebURLResponse response_; + blink::WebURLResponse response_; // Set to true once the request is compelte. bool completed_; private: // Start the actual download. - void Start(WebKit::WebFrame* frame); + void Start(blink::WebFrame* frame); - void RunCallback(const WebKit::WebURLResponse& response, + void RunCallback(const blink::WebURLResponse& response, const std::string& data); // Callback when we're done @@ -114,8 +114,8 @@ class CONTENT_EXPORT ResourceFetcherWithTimeout : NON_EXPORTED_BASE(public ResourceFetcher) { public: ResourceFetcherWithTimeout(const GURL& url, - WebKit::WebFrame* frame, - WebKit::WebURLRequest::TargetType target_type, + blink::WebFrame* frame, + blink::WebURLRequest::TargetType target_type, int timeout_secs, const Callback& callback); virtual ~ResourceFetcherWithTimeout(); |