| 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 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 430 GpuProcessHost::gpu_enabled() && | 430 GpuProcessHost::gpu_enabled() && |
| 431 !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas); | 431 !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas); |
| 432 prefs.antialiased_2d_canvas_disabled = | 432 prefs.antialiased_2d_canvas_disabled = |
| 433 command_line.HasSwitch(switches::kDisable2dCanvasAntialiasing); | 433 command_line.HasSwitch(switches::kDisable2dCanvasAntialiasing); |
| 434 prefs.accelerated_2d_canvas_msaa_sample_count = | 434 prefs.accelerated_2d_canvas_msaa_sample_count = |
| 435 atoi(command_line.GetSwitchValueASCII( | 435 atoi(command_line.GetSwitchValueASCII( |
| 436 switches::kAcceleratedCanvas2dMSAASampleCount).c_str()); | 436 switches::kAcceleratedCanvas2dMSAASampleCount).c_str()); |
| 437 prefs.accelerated_filters_enabled = | 437 prefs.accelerated_filters_enabled = |
| 438 GpuProcessHost::gpu_enabled() && | 438 GpuProcessHost::gpu_enabled() && |
| 439 command_line.HasSwitch(switches::kEnableAcceleratedFilters); | 439 command_line.HasSwitch(switches::kEnableAcceleratedFilters); |
| 440 prefs.deferred_filters_enabled = |
| 441 command_line.HasSwitch(switches::kEnableDeferredFilters); |
| 440 prefs.accelerated_compositing_for_3d_transforms_enabled = | 442 prefs.accelerated_compositing_for_3d_transforms_enabled = |
| 441 prefs.accelerated_compositing_for_animation_enabled = | 443 prefs.accelerated_compositing_for_animation_enabled = |
| 442 !command_line.HasSwitch(switches::kDisableAcceleratedLayers); | 444 !command_line.HasSwitch(switches::kDisableAcceleratedLayers); |
| 443 prefs.accelerated_compositing_for_plugins_enabled = | 445 prefs.accelerated_compositing_for_plugins_enabled = |
| 444 !command_line.HasSwitch(switches::kDisableAcceleratedPlugins); | 446 !command_line.HasSwitch(switches::kDisableAcceleratedPlugins); |
| 445 prefs.accelerated_compositing_for_video_enabled = | 447 prefs.accelerated_compositing_for_video_enabled = |
| 446 !command_line.HasSwitch(switches::kDisableAcceleratedVideo); | 448 !command_line.HasSwitch(switches::kDisableAcceleratedVideo); |
| 447 prefs.fullscreen_enabled = | 449 prefs.fullscreen_enabled = |
| 448 !command_line.HasSwitch(switches::kDisableFullScreen); | 450 !command_line.HasSwitch(switches::kDisableFullScreen); |
| 449 prefs.lazy_layout_enabled = | 451 prefs.lazy_layout_enabled = |
| (...skipping 1812 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2262 void RenderViewHostImpl::AttachToFrameTree() { | 2264 void RenderViewHostImpl::AttachToFrameTree() { |
| 2263 FrameTree* frame_tree = delegate_->GetFrameTree(); | 2265 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 2264 | 2266 |
| 2265 frame_tree->ResetForMainFrameSwap(); | 2267 frame_tree->ResetForMainFrameSwap(); |
| 2266 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { | 2268 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { |
| 2267 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); | 2269 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); |
| 2268 } | 2270 } |
| 2269 } | 2271 } |
| 2270 | 2272 |
| 2271 } // namespace content | 2273 } // namespace content |
| OLD | NEW |