Chromium Code Reviews| 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 721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 732 UpdateWebViewWithDeviceScaleFactor(); | 732 UpdateWebViewWithDeviceScaleFactor(); |
| 733 webview()->setDisplayMode(display_mode_); | 733 webview()->setDisplayMode(display_mode_); |
| 734 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 734 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
| 735 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 735 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
| 736 webview()->settings()->setThreadedScrollingEnabled( | 736 webview()->settings()->setThreadedScrollingEnabled( |
| 737 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); | 737 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); |
| 738 webview()->settings()->setRootLayerScrolls( | 738 webview()->settings()->setRootLayerScrolls( |
| 739 command_line.HasSwitch(switches::kRootLayerScrolls)); | 739 command_line.HasSwitch(switches::kRootLayerScrolls)); |
| 740 webview()->setShowFPSCounter( | 740 webview()->setShowFPSCounter( |
| 741 command_line.HasSwitch(cc::switches::kShowFPSCounter)); | 741 command_line.HasSwitch(cc::switches::kShowFPSCounter)); |
| 742 webview()->setDeviceColorProfile(params.image_decode_color_profile); | |
|
ccameron
2016/03/15 06:02:24
We should not consider this to be the permanent ho
| |
| 742 | 743 |
| 743 ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_); | 744 ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_); |
| 744 | 745 |
| 745 if (switches::IsTouchDragDropEnabled()) | 746 if (switches::IsTouchDragDropEnabled()) |
| 746 webview()->settings()->setTouchDragDropEnabled(true); | 747 webview()->settings()->setTouchDragDropEnabled(true); |
| 747 | 748 |
| 748 WebSettings::SelectionStrategyType selection_strategy = | 749 WebSettings::SelectionStrategyType selection_strategy = |
| 749 WebSettings::SelectionStrategyType::Character; | 750 WebSettings::SelectionStrategyType::Character; |
| 750 const std::string selection_strategy_str = | 751 const std::string selection_strategy_str = |
| 751 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 752 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
| (...skipping 2779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3531 if (IsUseZoomForDSFEnabled()) { | 3532 if (IsUseZoomForDSFEnabled()) { |
| 3532 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); | 3533 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); |
| 3533 } else { | 3534 } else { |
| 3534 webview()->setDeviceScaleFactor(device_scale_factor_); | 3535 webview()->setDeviceScaleFactor(device_scale_factor_); |
| 3535 } | 3536 } |
| 3536 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 3537 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
| 3537 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 3538 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
| 3538 } | 3539 } |
| 3539 | 3540 |
| 3540 } // namespace content | 3541 } // namespace content |
| OLD | NEW |