| OLD | NEW |
| 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 1333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1344 OnToggleFullscreen(false); | 1344 OnToggleFullscreen(false); |
| 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() { | |
| 1355 // This should only be called when swapped out. | |
| 1356 DCHECK(IsSwappedOut()); | |
| 1357 | |
| 1358 Send(new ViewMsg_DisownOpener(GetRoutingID())); | |
| 1359 } | |
| 1360 | |
| 1361 void RenderViewHostImpl::UpdateWebkitPreferences(const WebPreferences& prefs) { | 1354 void RenderViewHostImpl::UpdateWebkitPreferences(const WebPreferences& prefs) { |
| 1362 web_preferences_.reset(new WebPreferences(prefs)); | 1355 web_preferences_.reset(new WebPreferences(prefs)); |
| 1363 Send(new ViewMsg_UpdateWebPreferences(GetRoutingID(), prefs)); | 1356 Send(new ViewMsg_UpdateWebPreferences(GetRoutingID(), prefs)); |
| 1364 } | 1357 } |
| 1365 | 1358 |
| 1366 void RenderViewHostImpl::OnWebkitPreferencesChanged() { | 1359 void RenderViewHostImpl::OnWebkitPreferencesChanged() { |
| 1367 // This is defensive code to avoid infinite loops due to code run inside | 1360 // This is defensive code to avoid infinite loops due to code run inside |
| 1368 // UpdateWebkitPreferences() accidentally updating more preferences and thus | 1361 // UpdateWebkitPreferences() accidentally updating more preferences and thus |
| 1369 // calling back into this code. See crbug.com/398751 for one past example. | 1362 // calling back into this code. See crbug.com/398751 for one past example. |
| 1370 if (updating_web_preferences_) | 1363 if (updating_web_preferences_) |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1524 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1517 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 1525 | 1518 |
| 1526 frame_tree->ResetForMainFrameSwap(); | 1519 frame_tree->ResetForMainFrameSwap(); |
| 1527 } | 1520 } |
| 1528 | 1521 |
| 1529 void RenderViewHostImpl::SelectWordAroundCaret() { | 1522 void RenderViewHostImpl::SelectWordAroundCaret() { |
| 1530 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1523 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
| 1531 } | 1524 } |
| 1532 | 1525 |
| 1533 } // namespace content | 1526 } // namespace content |
| OLD | NEW |