diff options
Diffstat (limited to 'chrome/renderer')
-rw-r--r-- | chrome/renderer/render_view.cc | 29 | ||||
-rw-r--r-- | chrome/renderer/render_view.h | 8 |
2 files changed, 0 insertions, 37 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 5c2b948..bf010f3 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -188,7 +188,6 @@ RenderView::RenderView(RenderThreadBase* render_thread) disable_popup_blocking_(false), has_unload_listener_(false), decrement_shared_popup_at_destruction_(false), - waiting_for_create_window_ack_(false), form_field_autofill_request_id_(0), popup_notification_visible_(false), delay_seconds_for_form_state_sync_(kDefaultDelaySecondsForFormStateSync) { @@ -343,18 +342,6 @@ void RenderView::OnMessageReceived(const IPC::Message& message) { main_frame ? main_frame->GetURL() : GURL()); #endif - // If the current RenderView instance represents a popup, then we - // need to wait for ViewMsg_CreatingNew_ACK to be sent by the browser. - // As part of this ack we also receive the browser window handle, which - // parents any plugins instantiated in this RenderView instance. - // Plugins can be instantiated only when we receive the parent window - // handle as they are child windows. - if (waiting_for_create_window_ack_ && - resource_dispatcher_->IsResourceMessage(message)) { - queued_resource_messages_.push(new IPC::Message(message)); - return; - } - // Let the resource dispatcher intercept resource messages first. if (resource_dispatcher_->OnMessageReceived(message)) return; @@ -364,7 +351,6 @@ void RenderView::OnMessageReceived(const IPC::Message& message) { return; IPC_BEGIN_MESSAGE_MAP(RenderView, message) - IPC_MESSAGE_HANDLER(ViewMsg_CreatingNew_ACK, OnCreatingNewAck) IPC_MESSAGE_HANDLER(ViewMsg_CaptureThumbnail, SendThumbnail) IPC_MESSAGE_HANDLER(ViewMsg_PrintPages, OnPrintPages) IPC_MESSAGE_HANDLER(ViewMsg_Navigate, OnNavigate) @@ -451,20 +437,6 @@ void RenderView::OnMessageReceived(const IPC::Message& message) { IPC_END_MESSAGE_MAP() } -// Got a response from the browser after the renderer decided to create a new -// view. -void RenderView::OnCreatingNewAck(gfx::NativeViewId parent) { - CompleteInit(parent); - waiting_for_create_window_ack_ = false; - - while (!queued_resource_messages_.empty()) { - IPC::Message* queued_msg = queued_resource_messages_.front(); - queued_resource_messages_.pop(); - resource_dispatcher_->OnMessageReceived(*queued_msg); - delete queued_msg; - } -} - void RenderView::SendThumbnail() { WebFrame* main_frame = webview()->GetMainFrame(); if (!main_frame) @@ -1888,7 +1860,6 @@ WebView* RenderView::CreateWebView(WebView* webview, bool user_gesture) { prefs, shared_popup_counter_, routing_id); view->set_opened_by_user_gesture(user_gesture); - view->set_waiting_for_create_window_ack(true); // Copy over the alternate error page URL so we can have alt error pages in // the new render view (we don't need the browser to send the URL back down). diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 17f4cd1..9a0ec22 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -442,7 +442,6 @@ class RenderView : public RenderWidget, void GoToEntryAtOffset(int offset); // RenderView IPC message handlers - void OnCreatingNewAck(gfx::NativeViewId parent); void SendThumbnail(); void OnPrintPages(); void OnNavigate(const ViewMsg_Navigate_Params& params); @@ -620,10 +619,6 @@ class RenderView : public RenderWidget, // A helper method used by WasOpenedByUserGesture. bool WasOpenedByUserGestureHelper() const; - void set_waiting_for_create_window_ack(bool wait) { - waiting_for_create_window_ack_ = wait; - } - // Handles resource loads for this view. scoped_refptr<ResourceDispatcher> resource_dispatcher_; @@ -785,9 +780,6 @@ class RenderView : public RenderWidget, // to wait for an ACK from the browser before proceeding. std::queue<IPC::Message*> queued_resource_messages_; - // Set if we are waiting for an ack for ViewHostMsg_CreateWindow - bool waiting_for_create_window_ack_; - // The id of the last request sent for form field autofill. Used to ignore // out of date responses. int form_field_autofill_request_id_; |