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 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
734 if (opener_id_ == MSG_ROUTING_NONE) | 734 if (opener_id_ == MSG_ROUTING_NONE) |
735 did_show_ = true; | 735 did_show_ = true; |
736 UpdateWebViewWithDeviceScaleFactor(); | 736 UpdateWebViewWithDeviceScaleFactor(); |
737 webview()->setDisplayMode(display_mode_); | 737 webview()->setDisplayMode(display_mode_); |
738 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 738 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
739 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 739 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
740 webview()->settings()->setThreadedScrollingEnabled( | 740 webview()->settings()->setThreadedScrollingEnabled( |
741 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); | 741 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); |
742 webview()->settings()->setRootLayerScrolls( | 742 webview()->settings()->setRootLayerScrolls( |
743 command_line.HasSwitch(switches::kRootLayerScrolls)); | 743 command_line.HasSwitch(switches::kRootLayerScrolls)); |
744 webview()->settings()->setScrollAnchoringEnabled( | |
745 command_line.HasSwitch(switches::kEnableScrollAnchoring)); | |
746 webview()->setShowFPSCounter( | 744 webview()->setShowFPSCounter( |
747 command_line.HasSwitch(cc::switches::kShowFPSCounter)); | 745 command_line.HasSwitch(cc::switches::kShowFPSCounter)); |
748 | 746 |
749 ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_); | 747 ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_); |
750 | 748 |
751 if (switches::IsTouchDragDropEnabled()) | 749 if (switches::IsTouchDragDropEnabled()) |
752 webview()->settings()->setTouchDragDropEnabled(true); | 750 webview()->settings()->setTouchDragDropEnabled(true); |
753 | 751 |
754 WebSettings::SelectionStrategyType selection_strategy = | 752 WebSettings::SelectionStrategyType selection_strategy = |
755 WebSettings::SelectionStrategyType::Character; | 753 WebSettings::SelectionStrategyType::Character; |
(...skipping 2766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3522 if (IsUseZoomForDSFEnabled()) { | 3520 if (IsUseZoomForDSFEnabled()) { |
3523 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); | 3521 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); |
3524 } else { | 3522 } else { |
3525 webview()->setDeviceScaleFactor(device_scale_factor_); | 3523 webview()->setDeviceScaleFactor(device_scale_factor_); |
3526 } | 3524 } |
3527 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 3525 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
3528 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 3526 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
3529 } | 3527 } |
3530 | 3528 |
3531 } // namespace content | 3529 } // namespace content |
OLD | NEW |