summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--content/common/request_extra_data.cc (renamed from webkit/glue/request_extra_data.cc)2
-rw-r--r--content/common/request_extra_data.h (renamed from webkit/glue/request_extra_data.h)6
-rw-r--r--content/common/resource_dispatcher.cc12
-rw-r--r--content/common/resource_dispatcher_unittest.cc5
-rw-r--r--content/content_common.gypi2
-rw-r--r--content/renderer/render_view.cc2
-rw-r--r--webkit/glue/resource_loader_bridge.cc3
-rw-r--r--webkit/glue/resource_loader_bridge.h10
-rw-r--r--webkit/glue/webkit_glue.gypi2
-rw-r--r--webkit/glue/weburlloader_impl.cc10
10 files changed, 28 insertions, 26 deletions
diff --git a/webkit/glue/request_extra_data.cc b/content/common/request_extra_data.cc
index 8870fed..0ce6a8d 100644
--- a/webkit/glue/request_extra_data.cc
+++ b/content/common/request_extra_data.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/glue/request_extra_data.h"
+#include "content/common/request_extra_data.h"
RequestExtraData::~RequestExtraData() {}
diff --git a/webkit/glue/request_extra_data.h b/content/common/request_extra_data.h
index 1dd6103..d41b1a4 100644
--- a/webkit/glue/request_extra_data.h
+++ b/content/common/request_extra_data.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef WEBKIT_GLUE_REQUEST_EXTRA_DATA_H_
-#define WEBKIT_GLUE_REQUEST_EXTRA_DATA_H_
+#ifndef CONTENT_COMMON_REQUEST_EXTRA_DATA_H_
+#define CONTENT_COMMON_REQUEST_EXTRA_DATA_H_
#pragma once
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
@@ -26,4 +26,4 @@ class RequestExtraData : public WebKit::WebURLRequest::ExtraData {
DISALLOW_COPY_AND_ASSIGN(RequestExtraData);
};
-#endif // WEBKIT_GLUE_REQUEST_EXTRA_DATA_H_
+#endif // CONTENT_COMMON_REQUEST_EXTRA_DATA_H_
diff --git a/content/common/resource_dispatcher.cc b/content/common/resource_dispatcher.cc
index 2ee2db7..301c3bf 100644
--- a/content/common/resource_dispatcher.cc
+++ b/content/common/resource_dispatcher.cc
@@ -12,6 +12,7 @@
#include "base/message_loop.h"
#include "base/shared_memory.h"
#include "base/string_util.h"
+#include "content/common/request_extra_data.h"
#include "content/common/resource_dispatcher_delegate.h"
#include "content/common/resource_messages.h"
#include "content/common/resource_response.h"
@@ -93,8 +94,15 @@ IPCResourceLoaderBridge::IPCResourceLoaderBridge(
request_.appcache_host_id = request_info.appcache_host_id;
request_.download_to_file = request_info.download_to_file;
request_.has_user_gesture = request_info.has_user_gesture;
- request_.is_main_frame = request_info.is_main_frame;
- request_.frame_id = request_info.frame_id;
+ if (request_info.extra_data) {
+ RequestExtraData* extra_data =
+ static_cast<RequestExtraData*>(request_info.extra_data);
+ request_.is_main_frame = extra_data->is_main_frame();
+ request_.frame_id = extra_data->frame_identifier();
+ } else {
+ request_.is_main_frame = false;
+ request_.frame_id = -1;
+ }
}
IPCResourceLoaderBridge::~IPCResourceLoaderBridge() {
diff --git a/content/common/resource_dispatcher_unittest.cc b/content/common/resource_dispatcher_unittest.cc
index bf50276..228633b 100644
--- a/content/common/resource_dispatcher_unittest.cc
+++ b/content/common/resource_dispatcher_unittest.cc
@@ -9,6 +9,7 @@
#include "base/message_loop.h"
#include "base/process.h"
#include "base/process_util.h"
+#include "content/common/request_extra_data.h"
#include "content/common/resource_dispatcher.h"
#include "content/common/resource_messages.h"
#include "content/common/resource_response.h"
@@ -170,8 +171,8 @@ class ResourceDispatcherTest : public testing::Test,
request_info.request_type = ResourceType::SUB_RESOURCE;
request_info.appcache_host_id = appcache::kNoHostId;
request_info.routing_id = 0;
- request_info.is_main_frame = true;
- request_info.frame_id = 0;
+ RequestExtraData extra_data(true, 0);
+ request_info.extra_data = &extra_data;
return dispatcher_->CreateBridge(request_info);
}
diff --git a/content/content_common.gypi b/content/content_common.gypi
index d97a26a..717c9a7 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -192,6 +192,8 @@
'common/quota_dispatcher.h',
'common/renderer_preferences.cc',
'common/renderer_preferences.h',
+ 'common/request_extra_data.cc',
+ 'common/request_extra_data.h',
'common/resource_dispatcher.cc',
'common/resource_dispatcher.h',
'common/resource_dispatcher_delegate.cc',
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index d112be8..c69bbb4 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -38,6 +38,7 @@
#include "content/common/pepper_plugin_registry.h"
#include "content/common/quota_dispatcher.h"
#include "content/common/renderer_preferences.h"
+#include "content/common/request_extra_data.h"
#include "content/common/url_constants.h"
#include "content/common/view_messages.h"
#include "content/renderer/content_renderer_client.h"
@@ -135,7 +136,6 @@
#include "webkit/glue/glue_serialize.h"
#include "webkit/glue/media/video_renderer_impl.h"
#include "webkit/glue/password_form_dom_manager.h"
-#include "webkit/glue/request_extra_data.h"
#include "webkit/glue/webaccessibility.h"
#include "webkit/glue/webdropdata.h"
#include "webkit/glue/webkit_constants.h"
diff --git a/webkit/glue/resource_loader_bridge.cc b/webkit/glue/resource_loader_bridge.cc
index 4cc012d..9b85c82 100644
--- a/webkit/glue/resource_loader_bridge.cc
+++ b/webkit/glue/resource_loader_bridge.cc
@@ -56,7 +56,8 @@ ResourceLoaderBridge::RequestInfo::RequestInfo()
appcache_host_id(0),
routing_id(0),
download_to_file(false),
- has_user_gesture(false) {
+ has_user_gesture(false),
+ extra_data(NULL) {
}
ResourceLoaderBridge::RequestInfo::~RequestInfo() {
diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h
index a978166..6711039 100644
--- a/webkit/glue/resource_loader_bridge.h
+++ b/webkit/glue/resource_loader_bridge.h
@@ -33,6 +33,7 @@
#include "googleurl/src/gurl.h"
#include "net/base/host_port_pair.h"
#include "net/url_request/url_request_status.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
#include "webkit/glue/resource_type.h"
namespace net {
@@ -247,12 +248,11 @@ class ResourceLoaderBridge {
// True if the request was user initiated.
bool has_user_gesture;
- // True if |frame_id| represents a main frame of a RenderView.
- bool is_main_frame;
+ // Extra data associated with this request. We do not own this pointer.
+ WebKit::WebURLRequest::ExtraData* extra_data;
- // Identifies the frame within the RenderView that sent the request.
- // -1 if unknown / invalid.
- int64 frame_id;
+ private:
+ DISALLOW_COPY_AND_ASSIGN(RequestInfo);
};
// See the SyncLoad method declared below. (The name of this struct is not
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 0d93dd4..b1d76cb 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -387,8 +387,6 @@
'resource_loader_bridge.h',
'resource_type.cc',
'resource_type.h',
- 'request_extra_data.cc',
- 'request_extra_data.h',
'scoped_clipboard_writer_glue.h',
'simple_webmimeregistry_impl.cc',
'simple_webmimeregistry_impl.h',
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index 97ada31..6678954 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -30,7 +30,6 @@
#include "webkit/glue/ftp_directory_listing_response_delegate.h"
#include "webkit/glue/multipart_response_delegate.h"
#include "webkit/glue/resource_loader_bridge.h"
-#include "webkit/glue/request_extra_data.h"
#include "webkit/glue/webkit_glue.h"
using base::Time;
@@ -412,14 +411,7 @@ void WebURLLoaderImpl::Context::Start(
request_info.routing_id = request.requestorID();
request_info.download_to_file = request.downloadToFile();
request_info.has_user_gesture = request.hasUserGesture();
- request_info.frame_id = -1;
- request_info.is_main_frame = false;
- if (request.extraData()) {
- RequestExtraData* extra_data =
- static_cast<RequestExtraData*>(request.extraData());
- request_info.frame_id = extra_data->frame_identifier();
- request_info.is_main_frame = extra_data->is_main_frame();
- }
+ request_info.extra_data = request.extraData();
bridge_.reset(ResourceLoaderBridge::Create(request_info));
if (!request.httpBody().isNull()) {
generated by cgit v1.1 at 2025-03-01 12:41:27 +0000