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

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: #include <map> 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 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 RenderViewHostImpl::FromID(GetProcess()->GetID(), run_modal_opener_id_); 1032 RenderViewHostImpl::FromID(GetProcess()->GetID(), run_modal_opener_id_);
1033 if (opener) { 1033 if (opener) {
1034 opener->StartHangMonitorTimeout(TimeDelta::FromMilliseconds( 1034 opener->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(
1035 hung_renderer_delay_ms_)); 1035 hung_renderer_delay_ms_));
1036 // Balance out the decrement when we got created. 1036 // Balance out the decrement when we got created.
1037 opener->increment_in_flight_event_count(); 1037 opener->increment_in_flight_event_count();
1038 } 1038 }
1039 run_modal_opener_id_ = MSG_ROUTING_NONE; 1039 run_modal_opener_id_ = MSG_ROUTING_NONE;
1040 } 1040 }
1041 1041
1042 // We can't release the SessionStorageNamespace until our peer
1043 // in the renderer has wound down.
1044 if (GetProcess()->HasConnection()) {
1045 RenderProcessHostImpl::ReleaseOnCloseACK(
1046 GetProcess(),
1047 delegate_->GetSessionStorageNamespaceMap(),
1048 GetRoutingID());
1049 }
1050
1042 RenderWidgetHostImpl::Shutdown(); 1051 RenderWidgetHostImpl::Shutdown();
1043 } 1052 }
1044 1053
1045 bool RenderViewHostImpl::IsRenderView() const { 1054 bool RenderViewHostImpl::IsRenderView() const {
1046 return true; 1055 return true;
1047 } 1056 }
1048 1057
1049 void RenderViewHostImpl::CreateNewWindow( 1058 void RenderViewHostImpl::CreateNewWindow(
1050 int route_id, 1059 int route_id,
1051 int main_frame_route_id, 1060 int main_frame_route_id,
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
1671 FrameTree* frame_tree = delegate_->GetFrameTree(); 1680 FrameTree* frame_tree = delegate_->GetFrameTree();
1672 1681
1673 frame_tree->ResetForMainFrameSwap(); 1682 frame_tree->ResetForMainFrameSwap();
1674 } 1683 }
1675 1684
1676 void RenderViewHostImpl::SelectWordAroundCaret() { 1685 void RenderViewHostImpl::SelectWordAroundCaret() {
1677 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); 1686 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
1678 } 1687 }
1679 1688
1680 } // namespace content 1689 } // 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