| Index: content/renderer/render_view.cc
|
| diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
|
| index 368cc335081dad50c4f5741cabbfc0935738ff69..2b82904d49d488b6f5837253a50de6150837f7e1 100644
|
| --- a/content/renderer/render_view.cc
|
| +++ b/content/renderer/render_view.cc
|
| @@ -35,6 +35,7 @@
|
| #include "content/common/notification_service.h"
|
| #include "content/common/pepper_messages.h"
|
| #include "content/common/pepper_plugin_registry.h"
|
| +#include "content/common/resource_dispatcher.h"
|
| #include "content/common/quota_dispatcher.h"
|
| #include "content/common/renderer_preferences.h"
|
| #include "content/common/url_constants.h"
|
| @@ -2615,9 +2616,15 @@ void RenderView::didUpdateCurrentHistoryItem(WebFrame* frame) {
|
| StartNavStateSyncTimerIfNecessary();
|
| }
|
|
|
| +// Called by WebKit on new or transferred requests to introduce the request
|
| +// to the RenderView. If this RenderView inherited a pending Request from other
|
| +// RenderView (as in the case of reparenting an iframe via adoptNode() JS API),
|
| +// we need to update routing information to point to this RenderView.
|
| void RenderView::assignIdentifierToRequest(
|
| WebFrame* frame, unsigned identifier, const WebURLRequest& request) {
|
| - // Ignore
|
| + if (RenderThread::current()) // Will be NULL during tests.
|
| + RenderThread::current()->resource_dispatcher()->TransferRequestToNewPage(
|
| + identifier, routing_id_);
|
| }
|
|
|
| void RenderView::willSendRequest(
|
| @@ -2657,6 +2664,8 @@ void RenderView::willSendRequest(
|
| state->set_was_prefetcher(true);
|
| }
|
|
|
| + request.setIdentifier(identifier);
|
| +
|
| request.setRequestorID(routing_id_);
|
| request.setHasUserGesture(frame->isProcessingUserGesture());
|
|
|
|
|