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(params.image_decode_color_profile); | 728 webview()->setDeviceColorProfile( |
| 729 params.image_decode_color_space.GetICCProfile()); |
729 | 730 |
730 ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_); | 731 ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_); |
731 | 732 |
732 if (switches::IsTouchDragDropEnabled()) | 733 if (switches::IsTouchDragDropEnabled()) |
733 webview()->settings()->setTouchDragDropEnabled(true); | 734 webview()->settings()->setTouchDragDropEnabled(true); |
734 | 735 |
735 WebSettings::SelectionStrategyType selection_strategy = | 736 WebSettings::SelectionStrategyType selection_strategy = |
736 WebSettings::SelectionStrategyType::Character; | 737 WebSettings::SelectionStrategyType::Character; |
737 const std::string selection_strategy_str = | 738 const std::string selection_strategy_str = |
738 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 739 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
(...skipping 2501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3240 return render_frame->focused_pepper_plugin(); | 3241 return render_frame->focused_pepper_plugin(); |
3241 } | 3242 } |
3242 frame = frame->traverseNext(false); | 3243 frame = frame->traverseNext(false); |
3243 } | 3244 } |
3244 | 3245 |
3245 return nullptr; | 3246 return nullptr; |
3246 } | 3247 } |
3247 #endif | 3248 #endif |
3248 | 3249 |
3249 } // namespace content | 3250 } // namespace content |
OLD | NEW |