| 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 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 718 | 718 |
| 719 webview()->setDisplayMode(display_mode_); | 719 webview()->setDisplayMode(display_mode_); |
| 720 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 720 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
| 721 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 721 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
| 722 webview()->settings()->setThreadedScrollingEnabled( | 722 webview()->settings()->setThreadedScrollingEnabled( |
| 723 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); | 723 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); |
| 724 webview()->settings()->setRootLayerScrolls( | 724 webview()->settings()->setRootLayerScrolls( |
| 725 command_line.HasSwitch(switches::kRootLayerScrolls)); | 725 command_line.HasSwitch(switches::kRootLayerScrolls)); |
| 726 webview()->setShowFPSCounter( | 726 webview()->setShowFPSCounter( |
| 727 command_line.HasSwitch(cc::switches::kShowFPSCounter)); | 727 command_line.HasSwitch(cc::switches::kShowFPSCounter)); |
| 728 webview()->setDeviceColorProfile( | 728 webview()->setDeviceColorProfile(params.image_decode_color_space.GetData()); |
| 729 params.image_decode_color_space.GetICCProfile()); | |
| 730 | 729 |
| 731 ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_); | 730 ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_); |
| 732 | 731 |
| 733 if (switches::IsTouchDragDropEnabled()) | 732 if (switches::IsTouchDragDropEnabled()) |
| 734 webview()->settings()->setTouchDragDropEnabled(true); | 733 webview()->settings()->setTouchDragDropEnabled(true); |
| 735 | 734 |
| 736 WebSettings::SelectionStrategyType selection_strategy = | 735 WebSettings::SelectionStrategyType selection_strategy = |
| 737 WebSettings::SelectionStrategyType::Character; | 736 WebSettings::SelectionStrategyType::Character; |
| 738 const std::string selection_strategy_str = | 737 const std::string selection_strategy_str = |
| 739 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 738 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
| (...skipping 2362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3102 return render_frame->focused_pepper_plugin(); | 3101 return render_frame->focused_pepper_plugin(); |
| 3103 } | 3102 } |
| 3104 frame = frame->traverseNext(false); | 3103 frame = frame->traverseNext(false); |
| 3105 } | 3104 } |
| 3106 | 3105 |
| 3107 return nullptr; | 3106 return nullptr; |
| 3108 } | 3107 } |
| 3109 #endif | 3108 #endif |
| 3110 | 3109 |
| 3111 } // namespace content | 3110 } // namespace content |
| OLD | NEW |