| 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 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 739 base::debug::SetCrashKeyValue("rvinit_proxy_id", | 739 base::debug::SetCrashKeyValue("rvinit_proxy_id", |
| 740 base::IntToString(params.proxy_routing_id)); | 740 base::IntToString(params.proxy_routing_id)); |
| 741 base::debug::SetCrashKeyValue( | 741 base::debug::SetCrashKeyValue( |
| 742 "rvinit_main_frame_id", base::IntToString(params.main_frame_routing_id)); | 742 "rvinit_main_frame_id", base::IntToString(params.main_frame_routing_id)); |
| 743 | 743 |
| 744 webview()->setDisplayMode(display_mode_); | 744 webview()->setDisplayMode(display_mode_); |
| 745 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 745 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
| 746 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 746 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
| 747 webview()->settings()->setThreadedScrollingEnabled( | 747 webview()->settings()->setThreadedScrollingEnabled( |
| 748 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); | 748 !command_line.HasSwitch(switches::kDisableThreadedScrolling)); |
| 749 webview()->settings()->setRootLayerScrolls( | |
| 750 command_line.HasSwitch(switches::kRootLayerScrolls)); | |
| 751 webview()->setShowFPSCounter( | 749 webview()->setShowFPSCounter( |
| 752 command_line.HasSwitch(cc::switches::kShowFPSCounter)); | 750 command_line.HasSwitch(cc::switches::kShowFPSCounter)); |
| 753 webview()->setDeviceColorProfile(params.image_decode_color_space.GetData()); | 751 webview()->setDeviceColorProfile(params.image_decode_color_space.GetData()); |
| 754 | 752 |
| 755 ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_); | 753 ApplyWebPreferencesInternal(webkit_preferences_, webview(), compositor_deps_); |
| 756 | 754 |
| 757 if (switches::IsTouchDragDropEnabled()) | 755 if (switches::IsTouchDragDropEnabled()) |
| 758 webview()->settings()->setTouchDragDropEnabled(true); | 756 webview()->settings()->setTouchDragDropEnabled(true); |
| 759 | 757 |
| 760 webview()->settings()->setBrowserSideNavigationEnabled( | 758 webview()->settings()->setBrowserSideNavigationEnabled( |
| (...skipping 2321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3082 return render_frame->focused_pepper_plugin(); | 3080 return render_frame->focused_pepper_plugin(); |
| 3083 } | 3081 } |
| 3084 frame = frame->traverseNext(false); | 3082 frame = frame->traverseNext(false); |
| 3085 } | 3083 } |
| 3086 | 3084 |
| 3087 return nullptr; | 3085 return nullptr; |
| 3088 } | 3086 } |
| 3089 #endif | 3087 #endif |
| 3090 | 3088 |
| 3091 } // namespace content | 3089 } // namespace content |
| OLD | NEW |