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

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

Issue 497183003: Fix DisownOpener and related tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 1334 matching lines...) Expand 10 before | Expand all | Expand 10 after
1345 } 1345 }
1346 1346
1347 WebPreferences RenderViewHostImpl::GetWebkitPreferences() { 1347 WebPreferences RenderViewHostImpl::GetWebkitPreferences() {
1348 if (!web_preferences_.get()) { 1348 if (!web_preferences_.get()) {
1349 OnWebkitPreferencesChanged(); 1349 OnWebkitPreferencesChanged();
1350 } 1350 }
1351 return *web_preferences_; 1351 return *web_preferences_;
1352 } 1352 }
1353 1353
1354 void RenderViewHostImpl::DisownOpener() { 1354 void RenderViewHostImpl::DisownOpener() {
1355 // This should only be called when swapped out.
1356 DCHECK(IsSwappedOut());
Charlie Reis 2014/08/22 19:41:23 Bug 3: This can happen on pending or recently comm
1357
1358 Send(new ViewMsg_DisownOpener(GetRoutingID())); 1355 Send(new ViewMsg_DisownOpener(GetRoutingID()));
1359 } 1356 }
1360 1357
1361 void RenderViewHostImpl::UpdateWebkitPreferences(const WebPreferences& prefs) { 1358 void RenderViewHostImpl::UpdateWebkitPreferences(const WebPreferences& prefs) {
1362 web_preferences_.reset(new WebPreferences(prefs)); 1359 web_preferences_.reset(new WebPreferences(prefs));
1363 Send(new ViewMsg_UpdateWebPreferences(GetRoutingID(), prefs)); 1360 Send(new ViewMsg_UpdateWebPreferences(GetRoutingID(), prefs));
1364 } 1361 }
1365 1362
1366 void RenderViewHostImpl::OnWebkitPreferencesChanged() { 1363 void RenderViewHostImpl::OnWebkitPreferencesChanged() {
1367 // This is defensive code to avoid infinite loops due to code run inside 1364 // This is defensive code to avoid infinite loops due to code run inside
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1524 FrameTree* frame_tree = delegate_->GetFrameTree(); 1521 FrameTree* frame_tree = delegate_->GetFrameTree();
1525 1522
1526 frame_tree->ResetForMainFrameSwap(); 1523 frame_tree->ResetForMainFrameSwap();
1527 } 1524 }
1528 1525
1529 void RenderViewHostImpl::SelectWordAroundCaret() { 1526 void RenderViewHostImpl::SelectWordAroundCaret() {
1530 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); 1527 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
1531 } 1528 }
1532 1529
1533 } // namespace content 1530 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698