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

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

Issue 740813004: Use StopChildProcess instead of base::KillProcess to kill a renderer process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typos Created 6 years 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
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 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 const std::string& value) { 743 const std::string& value) {
744 // This is a sanity check before telling the renderer to enable the property. 744 // This is a sanity check before telling the renderer to enable the property.
745 // It could lie and send the corresponding IPC messages anyway, but we will 745 // It could lie and send the corresponding IPC messages anyway, but we will
746 // not act on them if enabled_bindings_ doesn't agree. If we get here without 746 // not act on them if enabled_bindings_ doesn't agree. If we get here without
747 // WebUI bindings, kill the renderer process. 747 // WebUI bindings, kill the renderer process.
748 if (enabled_bindings_ & BINDINGS_POLICY_WEB_UI) { 748 if (enabled_bindings_ & BINDINGS_POLICY_WEB_UI) {
749 Send(new ViewMsg_SetWebUIProperty(GetRoutingID(), name, value)); 749 Send(new ViewMsg_SetWebUIProperty(GetRoutingID(), name, value));
750 } else { 750 } else {
751 RecordAction( 751 RecordAction(
752 base::UserMetricsAction("BindingsMismatchTerminate_RVH_WebUI")); 752 base::UserMetricsAction("BindingsMismatchTerminate_RVH_WebUI"));
753 base::KillProcess( 753 GetProcess()->FastShutdown(content::RESULT_CODE_KILLED, false);
754 GetProcess()->GetHandle(), content::RESULT_CODE_KILLED, false);
755 } 754 }
756 } 755 }
757 756
758 void RenderViewHostImpl::GotFocus() { 757 void RenderViewHostImpl::GotFocus() {
759 RenderWidgetHostImpl::GotFocus(); // Notifies the renderer it got focus. 758 RenderWidgetHostImpl::GotFocus(); // Notifies the renderer it got focus.
760 759
761 RenderViewHostDelegateView* view = delegate_->GetDelegateView(); 760 RenderViewHostDelegateView* view = delegate_->GetDelegateView();
762 if (view) 761 if (view)
763 view->GotFocus(); 762 view->GotFocus();
764 } 763 }
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after
1468 FrameTree* frame_tree = delegate_->GetFrameTree(); 1467 FrameTree* frame_tree = delegate_->GetFrameTree();
1469 1468
1470 frame_tree->ResetForMainFrameSwap(); 1469 frame_tree->ResetForMainFrameSwap();
1471 } 1470 }
1472 1471
1473 void RenderViewHostImpl::SelectWordAroundCaret() { 1472 void RenderViewHostImpl::SelectWordAroundCaret() {
1474 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); 1473 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
1475 } 1474 }
1476 1475
1477 } // namespace content 1476 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698