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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 !command_line.HasSwitch(switches::kDisableSiteSpecificQuirks); | 367 !command_line.HasSwitch(switches::kDisableSiteSpecificQuirks); |
368 prefs.allow_file_access_from_file_urls = | 368 prefs.allow_file_access_from_file_urls = |
369 command_line.HasSwitch(switches::kAllowFileAccessFromFiles); | 369 command_line.HasSwitch(switches::kAllowFileAccessFromFiles); |
370 | 370 |
371 prefs.accelerated_compositing_for_overflow_scroll_enabled = false; | 371 prefs.accelerated_compositing_for_overflow_scroll_enabled = false; |
372 if (command_line.HasSwitch(switches::kEnableAcceleratedOverflowScroll)) | 372 if (command_line.HasSwitch(switches::kEnableAcceleratedOverflowScroll)) |
373 prefs.accelerated_compositing_for_overflow_scroll_enabled = true; | 373 prefs.accelerated_compositing_for_overflow_scroll_enabled = true; |
374 if (command_line.HasSwitch(switches::kDisableAcceleratedOverflowScroll)) | 374 if (command_line.HasSwitch(switches::kDisableAcceleratedOverflowScroll)) |
375 prefs.accelerated_compositing_for_overflow_scroll_enabled = false; | 375 prefs.accelerated_compositing_for_overflow_scroll_enabled = false; |
376 | 376 |
| 377 prefs.layer_squashing_enabled = false; |
| 378 if (command_line.HasSwitch(switches::kEnableLayerSquashing)) |
| 379 prefs.layer_squashing_enabled = true; |
| 380 if (command_line.HasSwitch(switches::kDisableLayerSquashing)) |
| 381 prefs.layer_squashing_enabled = false; |
| 382 |
377 prefs.accelerated_compositing_for_scrollable_frames_enabled = false; | 383 prefs.accelerated_compositing_for_scrollable_frames_enabled = false; |
378 if (command_line.HasSwitch(switches::kEnableAcceleratedScrollableFrames)) | 384 if (command_line.HasSwitch(switches::kEnableAcceleratedScrollableFrames)) |
379 prefs.accelerated_compositing_for_scrollable_frames_enabled = true; | 385 prefs.accelerated_compositing_for_scrollable_frames_enabled = true; |
380 if (command_line.HasSwitch(switches::kDisableAcceleratedScrollableFrames)) | 386 if (command_line.HasSwitch(switches::kDisableAcceleratedScrollableFrames)) |
381 prefs.accelerated_compositing_for_scrollable_frames_enabled = false; | 387 prefs.accelerated_compositing_for_scrollable_frames_enabled = false; |
382 | 388 |
383 prefs.composited_scrolling_for_frames_enabled = false; | 389 prefs.composited_scrolling_for_frames_enabled = false; |
384 if (command_line.HasSwitch(switches::kEnableCompositedScrollingForFrames)) | 390 if (command_line.HasSwitch(switches::kEnableCompositedScrollingForFrames)) |
385 prefs.composited_scrolling_for_frames_enabled = true; | 391 prefs.composited_scrolling_for_frames_enabled = true; |
386 if (command_line.HasSwitch(switches::kDisableCompositedScrollingForFrames)) | 392 if (command_line.HasSwitch(switches::kDisableCompositedScrollingForFrames)) |
(...skipping 1891 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2278 void RenderViewHostImpl::AttachToFrameTree() { | 2284 void RenderViewHostImpl::AttachToFrameTree() { |
2279 FrameTree* frame_tree = delegate_->GetFrameTree(); | 2285 FrameTree* frame_tree = delegate_->GetFrameTree(); |
2280 | 2286 |
2281 frame_tree->SwapMainFrame(main_render_frame_host_.get()); | 2287 frame_tree->SwapMainFrame(main_render_frame_host_.get()); |
2282 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { | 2288 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { |
2283 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); | 2289 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); |
2284 } | 2290 } |
2285 } | 2291 } |
2286 | 2292 |
2287 } // namespace content | 2293 } // namespace content |
OLD | NEW |