summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-24 02:34:46 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-24 02:34:46 +0000
commitabfd92e00a85acffcebf9aa307bbdd8ee6f22b85 (patch)
tree5d919083d4f6a69425949b4bb498f272e72d2abd /webkit
parentf66432db0ee32950f0dd04ce8bf3895daae7370e (diff)
downloadchromium_src-abfd92e00a85acffcebf9aa307bbdd8ee6f22b85.zip
chromium_src-abfd92e00a85acffcebf9aa307bbdd8ee6f22b85.tar.gz
chromium_src-abfd92e00a85acffcebf9aa307bbdd8ee6f22b85.tar.bz2
Extract RequestInfo struct from ResourceLoaderBridge.
And move it into content/child/request_info.*. As requested by John in - https://codereview.chromium.org/186193005/diff/1/content/public/child/resource_loader_bridge.h#newcode46 BUG=265753, 338338, 237249 TEST=content_unittests R=jam@chromium.org TBR=darin Review URL: https://codereview.chromium.org/207603003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/child/resource_loader_bridge.cc20
-rw-r--r--webkit/child/resource_loader_bridge.h68
2 files changed, 0 insertions, 88 deletions
diff --git a/webkit/child/resource_loader_bridge.cc b/webkit/child/resource_loader_bridge.cc
index 439a09f..35cf74e 100644
--- a/webkit/child/resource_loader_bridge.cc
+++ b/webkit/child/resource_loader_bridge.cc
@@ -4,28 +4,8 @@
#include "webkit/child/resource_loader_bridge.h"
-#include "net/http/http_response_headers.h"
-#include "webkit/common/appcache/appcache_interfaces.h"
-#include "webkit/common/resource_response_info.h"
-
namespace webkit_glue {
-ResourceLoaderBridge::RequestInfo::RequestInfo()
- : referrer_policy(blink::WebReferrerPolicyDefault),
- load_flags(0),
- requestor_pid(0),
- request_type(ResourceType::MAIN_FRAME),
- priority(net::LOW),
- request_context(0),
- appcache_host_id(0),
- routing_id(0),
- download_to_file(false),
- has_user_gesture(false),
- extra_data(NULL) {
-}
-
-ResourceLoaderBridge::RequestInfo::~RequestInfo() {}
-
ResourceLoaderBridge::SyncLoadResponse::SyncLoadResponse() {}
ResourceLoaderBridge::SyncLoadResponse::~SyncLoadResponse() {}
diff --git a/webkit/child/resource_loader_bridge.h b/webkit/child/resource_loader_bridge.h
index 7532386..efe8b77 100644
--- a/webkit/child/resource_loader_bridge.h
+++ b/webkit/child/resource_loader_bridge.h
@@ -26,12 +26,9 @@
#include "base/platform_file.h"
#include "base/values.h"
#include "net/base/request_priority.h"
-#include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
-#include "third_party/WebKit/public/platform/WebURLRequest.h"
#include "url/gurl.h"
#include "webkit/child/webkit_child_export.h"
#include "webkit/common/resource_response_info.h"
-#include "webkit/common/resource_type.h"
// TODO(pilgrim) remove this once resource loader is moved to content
// http://crbug.com/338338
@@ -43,71 +40,6 @@ namespace webkit_glue {
class ResourceLoaderBridge {
public:
- // Structure used when calling
- // WebKitPlatformSupportImpl::CreateResourceLoader().
- struct WEBKIT_CHILD_EXPORT RequestInfo {
- RequestInfo();
- ~RequestInfo();
-
- // HTTP-style method name (e.g., "GET" or "POST").
- std::string method;
-
- // Absolute URL encoded in ASCII per the rules of RFC-2396.
- GURL url;
-
- // URL of the document in the top-level window, which may be checked by the
- // third-party cookie blocking policy.
- GURL first_party_for_cookies;
-
- // Optional parameter, a URL with similar constraints in how it must be
- // encoded as the url member.
- GURL referrer;
-
- // The referrer policy that applies to the referrer.
- blink::WebReferrerPolicy referrer_policy;
-
- // For HTTP(S) requests, the headers parameter can be a \r\n-delimited and
- // \r\n-terminated list of MIME headers. They should be ASCII-encoded using
- // the standard MIME header encoding rules. The headers parameter can also
- // be null if no extra request headers need to be set.
- std::string headers;
-
- // Composed of the values defined in url_request_load_flags.h.
- int load_flags;
-
- // Process id of the process making the request.
- int requestor_pid;
-
- // Indicates if the current request is the main frame load, a sub-frame
- // load, or a sub objects load.
- ResourceType::Type request_type;
-
- // Indicates the priority of this request, as determined by WebKit.
- net::RequestPriority priority;
-
- // Used for plugin to browser requests.
- uint32 request_context;
-
- // Identifies what appcache host this request is associated with.
- int appcache_host_id;
-
- // Used to associated the bridge with a frame's network context.
- int routing_id;
-
- // If true, then the response body will be downloaded to a file and the
- // path to that file will be provided in ResponseInfo::download_file_path.
- bool download_to_file;
-
- // True if the request was user initiated.
- bool has_user_gesture;
-
- // Extra data associated with this request. We do not own this pointer.
- blink::WebURLRequest::ExtraData* extra_data;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(RequestInfo);
- };
-
// See the SyncLoad method declared below. (The name of this struct is not
// suffixed with "Info" because it also contains the response data.)
struct SyncLoadResponse : ResourceResponseInfo {