| 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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 !command_line.HasSwitch(switches::kDisableAcceleratedLayers); | 428 !command_line.HasSwitch(switches::kDisableAcceleratedLayers); |
| 429 prefs.accelerated_compositing_for_plugins_enabled = true; | 429 prefs.accelerated_compositing_for_plugins_enabled = true; |
| 430 prefs.accelerated_compositing_for_video_enabled = | 430 prefs.accelerated_compositing_for_video_enabled = |
| 431 !command_line.HasSwitch(switches::kDisableAcceleratedVideo); | 431 !command_line.HasSwitch(switches::kDisableAcceleratedVideo); |
| 432 prefs.lazy_layout_enabled = | 432 prefs.lazy_layout_enabled = |
| 433 command_line.HasSwitch(switches::kEnableExperimentalWebPlatformFeatures); | 433 command_line.HasSwitch(switches::kEnableExperimentalWebPlatformFeatures); |
| 434 prefs.region_based_columns_enabled = | 434 prefs.region_based_columns_enabled = |
| 435 command_line.HasSwitch(switches::kEnableRegionBasedColumns); | 435 command_line.HasSwitch(switches::kEnableRegionBasedColumns); |
| 436 prefs.threaded_html_parser = | 436 prefs.threaded_html_parser = |
| 437 !command_line.HasSwitch(switches::kDisableThreadedHTMLParser); | 437 !command_line.HasSwitch(switches::kDisableThreadedHTMLParser); |
| 438 prefs.experimental_websocket_enabled = | |
| 439 command_line.HasSwitch(switches::kEnableExperimentalWebSocket); | |
| 440 if (command_line.HasSwitch(cc::switches::kEnablePinchVirtualViewport)) { | 438 if (command_line.HasSwitch(cc::switches::kEnablePinchVirtualViewport)) { |
| 441 prefs.pinch_virtual_viewport_enabled = true; | 439 prefs.pinch_virtual_viewport_enabled = true; |
| 442 prefs.pinch_overlay_scrollbar_thickness = 10; | 440 prefs.pinch_overlay_scrollbar_thickness = 10; |
| 443 } | 441 } |
| 444 prefs.use_solid_color_scrollbars = ui::IsOverlayScrollbarEnabled(); | 442 prefs.use_solid_color_scrollbars = ui::IsOverlayScrollbarEnabled(); |
| 445 | 443 |
| 446 #if defined(OS_ANDROID) | 444 #if defined(OS_ANDROID) |
| 447 prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch( | 445 prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch( |
| 448 switches::kDisableGestureRequirementForMediaPlayback); | 446 switches::kDisableGestureRequirementForMediaPlayback); |
| 449 #endif | 447 #endif |
| (...skipping 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1879 return true; | 1877 return true; |
| 1880 } | 1878 } |
| 1881 | 1879 |
| 1882 void RenderViewHostImpl::AttachToFrameTree() { | 1880 void RenderViewHostImpl::AttachToFrameTree() { |
| 1883 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1881 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 1884 | 1882 |
| 1885 frame_tree->ResetForMainFrameSwap(); | 1883 frame_tree->ResetForMainFrameSwap(); |
| 1886 } | 1884 } |
| 1887 | 1885 |
| 1888 } // namespace content | 1886 } // namespace content |
| OLD | NEW |