| 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/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 427 prefs.accelerated_compositing_for_3d_transforms_enabled = | 427 prefs.accelerated_compositing_for_3d_transforms_enabled = |
| 428 prefs.accelerated_compositing_for_animation_enabled = | 428 prefs.accelerated_compositing_for_animation_enabled = |
| 429 !command_line.HasSwitch(switches::kDisableAcceleratedLayers); | 429 !command_line.HasSwitch(switches::kDisableAcceleratedLayers); |
| 430 prefs.accelerated_compositing_for_plugins_enabled = true; | 430 prefs.accelerated_compositing_for_plugins_enabled = true; |
| 431 prefs.accelerated_compositing_for_video_enabled = | 431 prefs.accelerated_compositing_for_video_enabled = |
| 432 !command_line.HasSwitch(switches::kDisableAcceleratedVideo); | 432 !command_line.HasSwitch(switches::kDisableAcceleratedVideo); |
| 433 prefs.lazy_layout_enabled = | 433 prefs.lazy_layout_enabled = |
| 434 command_line.HasSwitch(switches::kEnableExperimentalWebPlatformFeatures); | 434 command_line.HasSwitch(switches::kEnableExperimentalWebPlatformFeatures); |
| 435 prefs.region_based_columns_enabled = | 435 prefs.region_based_columns_enabled = |
| 436 command_line.HasSwitch(switches::kEnableRegionBasedColumns); | 436 command_line.HasSwitch(switches::kEnableRegionBasedColumns); |
| 437 prefs.threaded_html_parser = | |
| 438 !command_line.HasSwitch(switches::kDisableThreadedHTMLParser); | |
| 439 if (command_line.HasSwitch(cc::switches::kEnablePinchVirtualViewport)) { | 437 if (command_line.HasSwitch(cc::switches::kEnablePinchVirtualViewport)) { |
| 440 prefs.pinch_virtual_viewport_enabled = true; | 438 prefs.pinch_virtual_viewport_enabled = true; |
| 441 prefs.pinch_overlay_scrollbar_thickness = 10; | 439 prefs.pinch_overlay_scrollbar_thickness = 10; |
| 442 } | 440 } |
| 443 prefs.use_solid_color_scrollbars = ui::IsOverlayScrollbarEnabled(); | 441 prefs.use_solid_color_scrollbars = ui::IsOverlayScrollbarEnabled(); |
| 444 | 442 |
| 445 #if defined(OS_ANDROID) | 443 #if defined(OS_ANDROID) |
| 446 prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch( | 444 prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch( |
| 447 switches::kDisableGestureRequirementForMediaPlayback); | 445 switches::kDisableGestureRequirementForMediaPlayback); |
| 448 #endif | 446 #endif |
| (...skipping 1270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1719 return true; | 1717 return true; |
| 1720 } | 1718 } |
| 1721 | 1719 |
| 1722 void RenderViewHostImpl::AttachToFrameTree() { | 1720 void RenderViewHostImpl::AttachToFrameTree() { |
| 1723 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1721 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 1724 | 1722 |
| 1725 frame_tree->ResetForMainFrameSwap(); | 1723 frame_tree->ResetForMainFrameSwap(); |
| 1726 } | 1724 } |
| 1727 | 1725 |
| 1728 } // namespace content | 1726 } // namespace content |
| OLD | NEW |