diff options
author | tfarina <tfarina@chromium.org> | 2014-09-04 22:47:50 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-05 05:49:27 +0000 |
commit | b6a43eaf7a26a7e6a7a552e2f143855329e93c18 (patch) | |
tree | 5893f45af2921fd6109591812081df9eebe574fb /webkit | |
parent | d0de2976070eb55123d5a8228d76cf70cfffac04 (diff) | |
download | chromium_src-b6a43eaf7a26a7e6a7a552e2f143855329e93c18.zip chromium_src-b6a43eaf7a26a7e6a7a552e2f143855329e93c18.tar.gz chromium_src-b6a43eaf7a26a7e6a7a552e2f143855329e93c18.tar.bz2 |
Move resource_loader_bridge.* from webkit/child to content/child.
This is an intermediate step, the real fix is to get rid of
ResourceLoaderBridge.
BUG=338338
TEST=None, no functional changes
R=avi@chromium.org
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/519333002
Cr-Commit-Position: refs/heads/master@{#293456}
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/child/BUILD.gn | 19 | ||||
-rw-r--r-- | webkit/child/DEPS | 5 | ||||
-rw-r--r-- | webkit/child/resource_loader_bridge.cc | 13 | ||||
-rw-r--r-- | webkit/child/resource_loader_bridge.h | 95 | ||||
-rw-r--r-- | webkit/child/webkit_child.gyp | 27 | ||||
-rw-r--r-- | webkit/child/webkit_child_export.h | 29 |
6 files changed, 0 insertions, 188 deletions
diff --git a/webkit/child/BUILD.gn b/webkit/child/BUILD.gn deleted file mode 100644 index 6ac5c23..0000000 --- a/webkit/child/BUILD.gn +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2014 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. - -component("child") { - output_name = "webkit_child" - sources = [ - "resource_loader_bridge.cc", - "resource_loader_bridge.h", - "webkit_child_export.h", - ] - - defines = [ "WEBKIT_CHILD_IMPLEMENTATION" ] - - deps = [ - "//base", - "//net", - ] -} diff --git a/webkit/child/DEPS b/webkit/child/DEPS deleted file mode 100644 index 29c1fad..0000000 --- a/webkit/child/DEPS +++ /dev/null @@ -1,5 +0,0 @@ -include_rules = [ - "+jni", # Needed for Android's java-generated bindings. - "+ui/base", - "+ui/native_theme", -] diff --git a/webkit/child/resource_loader_bridge.cc b/webkit/child/resource_loader_bridge.cc deleted file mode 100644 index 3303c4d..0000000 --- a/webkit/child/resource_loader_bridge.cc +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2014 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. - -#include "webkit/child/resource_loader_bridge.h" - -namespace webkit_glue { - -ResourceLoaderBridge::ResourceLoaderBridge() {} - -ResourceLoaderBridge::~ResourceLoaderBridge() {} - -} // namespace webkit_glue diff --git a/webkit/child/resource_loader_bridge.h b/webkit/child/resource_loader_bridge.h deleted file mode 100644 index 1907758..0000000 --- a/webkit/child/resource_loader_bridge.h +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright 2014 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. -// -// The intent of this file is to provide a type-neutral abstraction between -// Chrome and WebKit for resource loading. This pure-virtual interface is -// implemented by the embedder. -// -// One of these objects will be created by WebKit for each request. WebKit -// will own the pointer to the bridge, and will delete it when the request is -// no longer needed. -// -// In turn, the bridge's owner on the WebKit end will implement the -// RequestPeer interface, which we will use to communicate notifications -// back. - -#ifndef WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_ -#define WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_ - -#include "base/macros.h" -#include "net/base/request_priority.h" -#include "webkit/child/webkit_child_export.h" - -namespace blink { -class WebThreadedDataReceiver; -} - -// TODO(pilgrim) remove this once resource loader is moved to content -// http://crbug.com/338338 -namespace content { -class RequestPeer; -class ResourceRequestBody; -struct SyncLoadResponse; -} - -namespace webkit_glue { - -class ResourceLoaderBridge { - public: - // use WebKitPlatformSupportImpl::CreateResourceLoader() for construction, but - // anybody can delete at any time, INCLUDING during processing of callbacks. - WEBKIT_CHILD_EXPORT virtual ~ResourceLoaderBridge(); - - // Call this method before calling Start() to set the request body. - // May only be used with HTTP(S) POST requests. - virtual void SetRequestBody(content::ResourceRequestBody* request_body) = 0; - - // Call this method to initiate the request. If this method succeeds, then - // the peer's methods will be called asynchronously to report various events. - virtual bool Start(content::RequestPeer* peer) = 0; - - // Call this method to cancel a request that is in progress. This method - // causes the request to immediately transition into the 'done' state. The - // OnCompletedRequest method will be called asynchronously; this assumes - // the peer is still valid. - virtual void Cancel() = 0; - - // Call this method to suspend or resume a load that is in progress. This - // method may only be called after a successful call to the Start method. - virtual void SetDefersLoading(bool value) = 0; - - // Call this method when the priority of the requested resource changes after - // Start() has been called. This method may only be called after a successful - // call to the Start method. - virtual void DidChangePriority(net::RequestPriority new_priority, - int intra_priority_value) = 0; - - // Call this method to attach a data receiver which will receive resource data - // on its own thread. - virtual bool AttachThreadedDataReceiver( - blink::WebThreadedDataReceiver* threaded_data_receiver) = 0; - - // Call this method to load the resource synchronously (i.e., in one shot). - // This is an alternative to the Start method. Be warned that this method - // will block the calling thread until the resource is fully downloaded or an - // error occurs. It could block the calling thread for a long time, so only - // use this if you really need it! There is also no way for the caller to - // interrupt this method. Errors are reported via the status field of the - // response parameter. - virtual void SyncLoad(content::SyncLoadResponse* response) = 0; - - protected: - // Construction must go through - // WebKitPlatformSupportImpl::CreateResourceLoader() - // For HTTP(S) POST requests, the AppendDataToUpload and AppendFileToUpload - // methods may be called to construct the body of the request. - WEBKIT_CHILD_EXPORT ResourceLoaderBridge(); - - private: - DISALLOW_COPY_AND_ASSIGN(ResourceLoaderBridge); -}; - -} // namespace webkit_glue - -#endif // WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_ diff --git a/webkit/child/webkit_child.gyp b/webkit/child/webkit_child.gyp deleted file mode 100644 index 388809d..0000000 --- a/webkit/child/webkit_child.gyp +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2013 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. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - 'target_name': 'webkit_child', - 'type': '<(component)', - 'defines': [ - 'WEBKIT_CHILD_IMPLEMENTATION', - ], - 'dependencies': [ - '../../base/base.gyp:base', - '../../net/net.gyp:net', - ], - 'sources': [ - 'resource_loader_bridge.cc', - 'resource_loader_bridge.h', - 'webkit_child_export.h', - ], - }, - ], -} diff --git a/webkit/child/webkit_child_export.h b/webkit/child/webkit_child_export.h deleted file mode 100644 index 41ab504..0000000 --- a/webkit/child/webkit_child_export.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2013 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_CHILD_WEBKIT_CHILD_EXPORT_H_ -#define WEBKIT_CHILD_WEBKIT_CHILD_EXPORT_H_ - -#if defined(COMPONENT_BUILD) -#if defined(WIN32) - -#if defined(WEBKIT_CHILD_IMPLEMENTATION) -#define WEBKIT_CHILD_EXPORT __declspec(dllexport) -#else -#define WEBKIT_CHILD_EXPORT __declspec(dllimport) -#endif // defined(WEBKIT_CHILD_IMPLEMENTATION) - -#else // defined(WIN32) -#if defined(WEBKIT_CHILD_IMPLEMENTATION) -#define WEBKIT_CHILD_EXPORT __attribute__((visibility("default"))) -#else -#define WEBKIT_CHILD_EXPORT -#endif -#endif - -#else // defined(COMPONENT_BUILD) -#define WEBKIT_CHILD_EXPORT -#endif - -#endif // WEBKIT_CHILD_WEBKIT_CHILD_EXPORT_H_ |