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/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 1483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1494 /////////////////////////////////////////////////////////////////////////////// | 1494 /////////////////////////////////////////////////////////////////////////////// |
1495 | 1495 |
1496 void RenderViewImpl::SendUpdateState() { | 1496 void RenderViewImpl::SendUpdateState() { |
1497 // We don't use this path in OOPIF-enabled modes. | 1497 // We don't use this path in OOPIF-enabled modes. |
1498 DCHECK(!SiteIsolationPolicy::UseSubframeNavigationEntries()); | 1498 DCHECK(!SiteIsolationPolicy::UseSubframeNavigationEntries()); |
1499 | 1499 |
1500 HistoryEntry* entry = history_controller_->GetCurrentEntry(); | 1500 HistoryEntry* entry = history_controller_->GetCurrentEntry(); |
1501 if (!entry) | 1501 if (!entry) |
1502 return; | 1502 return; |
1503 | 1503 |
1504 // Don't send state updates for kSwappedOutURL. | |
1505 if (entry->root().urlString() == kSwappedOutURL) | |
1506 return; | |
1507 | |
1508 Send(new ViewHostMsg_UpdateState(GetRoutingID(), page_id_, | 1504 Send(new ViewHostMsg_UpdateState(GetRoutingID(), page_id_, |
1509 HistoryEntryToPageState(entry))); | 1505 HistoryEntryToPageState(entry))); |
1510 } | 1506 } |
1511 | 1507 |
1512 void RenderViewImpl::SendFrameStateUpdates() { | 1508 void RenderViewImpl::SendFrameStateUpdates() { |
1513 // We only use this path in OOPIF-enabled modes. | 1509 // We only use this path in OOPIF-enabled modes. |
1514 DCHECK(SiteIsolationPolicy::UseSubframeNavigationEntries()); | 1510 DCHECK(SiteIsolationPolicy::UseSubframeNavigationEntries()); |
1515 | 1511 |
1516 // Tell each frame with pending state to send its UpdateState message. | 1512 // Tell each frame with pending state to send its UpdateState message. |
1517 for (int render_frame_routing_id : frames_with_pending_state_) { | 1513 for (int render_frame_routing_id : frames_with_pending_state_) { |
(...skipping 1925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3443 if (IsUseZoomForDSFEnabled()) { | 3439 if (IsUseZoomForDSFEnabled()) { |
3444 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); | 3440 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); |
3445 } else { | 3441 } else { |
3446 webview()->setDeviceScaleFactor(device_scale_factor_); | 3442 webview()->setDeviceScaleFactor(device_scale_factor_); |
3447 } | 3443 } |
3448 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 3444 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
3449 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 3445 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
3450 } | 3446 } |
3451 | 3447 |
3452 } // namespace content | 3448 } // namespace content |
OLD | NEW |