| Index: content/common/resource_dispatcher.cc
|
| diff --git a/content/common/resource_dispatcher.cc b/content/common/resource_dispatcher.cc
|
| index d6c21c9f78ef77c88c09a307811d44f55495a1f2..754255197fd5f2f60b76c487c1e85fae7ce5a622 100644
|
| --- a/content/common/resource_dispatcher.cc
|
| +++ b/content/common/resource_dispatcher.cc
|
| @@ -36,9 +36,7 @@ namespace webkit_glue {
|
| class IPCResourceLoaderBridge : public ResourceLoaderBridge {
|
| public:
|
| IPCResourceLoaderBridge(ResourceDispatcher* dispatcher,
|
| - const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info,
|
| - int host_renderer_id,
|
| - int host_render_view_id);
|
| + const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info);
|
| virtual ~IPCResourceLoaderBridge();
|
|
|
| // ResourceLoaderBridge
|
| @@ -71,28 +69,15 @@ class IPCResourceLoaderBridge : public ResourceLoaderBridge {
|
|
|
| // The routing id used when sending IPC messages.
|
| int routing_id_;
|
| -
|
| - // The following two members are specified if the request is initiated by
|
| - // a plugin like Gears.
|
| -
|
| - // Contains the id of the host renderer.
|
| - int host_renderer_id_;
|
| -
|
| - // Contains the id of the host render view.
|
| - int host_render_view_id_;
|
| };
|
|
|
| IPCResourceLoaderBridge::IPCResourceLoaderBridge(
|
| ResourceDispatcher* dispatcher,
|
| - const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info,
|
| - int host_renderer_id,
|
| - int host_render_view_id)
|
| + const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info)
|
| : peer_(NULL),
|
| dispatcher_(dispatcher),
|
| request_id_(-1),
|
| - routing_id_(request_info.routing_id),
|
| - host_renderer_id_(host_renderer_id),
|
| - host_render_view_id_(host_render_view_id) {
|
| + routing_id_(request_info.routing_id) {
|
| DCHECK(dispatcher_) << "no resource dispatcher";
|
| request_.method = request_info.method;
|
| request_.url = request_info.url;
|
| @@ -106,8 +91,6 @@ 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_.host_renderer_id = host_renderer_id_;
|
| - request_.host_render_view_id = host_render_view_id_;
|
| }
|
|
|
| IPCResourceLoaderBridge::~IPCResourceLoaderBridge() {
|
| @@ -554,12 +537,8 @@ void ResourceDispatcher::FlushDeferredMessages(int request_id) {
|
| }
|
|
|
| webkit_glue::ResourceLoaderBridge* ResourceDispatcher::CreateBridge(
|
| - const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info,
|
| - int host_renderer_id,
|
| - int host_render_view_id) {
|
| - return new webkit_glue::IPCResourceLoaderBridge(this, request_info,
|
| - host_renderer_id,
|
| - host_render_view_id);
|
| + const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
|
| + return new webkit_glue::IPCResourceLoaderBridge(this, request_info);
|
| }
|
|
|
| bool ResourceDispatcher::IsResourceDispatcherMessage(
|
|
|