Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(393)

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 305103003: Fix for 'Simple Adblock' extension crashes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: RenderProcessHost can be a mock in unittests Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after
1035 RenderViewHostImpl::FromID(GetProcess()->GetID(), run_modal_opener_id_); 1035 RenderViewHostImpl::FromID(GetProcess()->GetID(), run_modal_opener_id_);
1036 if (opener) { 1036 if (opener) {
1037 opener->StartHangMonitorTimeout(TimeDelta::FromMilliseconds( 1037 opener->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(
1038 hung_renderer_delay_ms_)); 1038 hung_renderer_delay_ms_));
1039 // Balance out the decrement when we got created. 1039 // Balance out the decrement when we got created.
1040 opener->increment_in_flight_event_count(); 1040 opener->increment_in_flight_event_count();
1041 } 1041 }
1042 run_modal_opener_id_ = MSG_ROUTING_NONE; 1042 run_modal_opener_id_ = MSG_ROUTING_NONE;
1043 } 1043 }
1044 1044
1045 // We can't release the SessionStorageNamespace until our peer
1046 // in the renderer has wound down.
1047 if (GetProcess()->HasConnection()) {
1048 SessionStorageNamespaceMap map =
1049 delegate_->GetSessionStorageNamespaceMap();
1050 if (!map.empty()) {
1051 // Note: in unittests, process is a MockRenderProcessHost so this
1052 // cast doesn't work there.
michaeln 2014/06/02 20:13:39 i'll have to do something better about this, just
1053 static_cast<RenderProcessHostImpl*>(GetProcess())->
1054 ReleaseOnCloseAck(map, GetRoutingID());
1055 }
1056 }
1057
1045 RenderWidgetHostImpl::Shutdown(); 1058 RenderWidgetHostImpl::Shutdown();
1046 } 1059 }
1047 1060
1048 bool RenderViewHostImpl::IsRenderView() const { 1061 bool RenderViewHostImpl::IsRenderView() const {
1049 return true; 1062 return true;
1050 } 1063 }
1051 1064
1052 void RenderViewHostImpl::CreateNewWindow( 1065 void RenderViewHostImpl::CreateNewWindow(
1053 int route_id, 1066 int route_id,
1054 int main_frame_route_id, 1067 int main_frame_route_id,
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
1680 FrameTree* frame_tree = delegate_->GetFrameTree(); 1693 FrameTree* frame_tree = delegate_->GetFrameTree();
1681 1694
1682 frame_tree->ResetForMainFrameSwap(); 1695 frame_tree->ResetForMainFrameSwap();
1683 } 1696 }
1684 1697
1685 void RenderViewHostImpl::SelectWordAroundCaret() { 1698 void RenderViewHostImpl::SelectWordAroundCaret() {
1686 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); 1699 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
1687 } 1700 }
1688 1701
1689 } // namespace content 1702 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_delegate.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698