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/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
560 GpuProcessHost::gpu_enabled() && | 560 GpuProcessHost::gpu_enabled() && |
561 !command_line.HasSwitch(switches::kDisableAcceleratedCompositing); | 561 !command_line.HasSwitch(switches::kDisableAcceleratedCompositing); |
562 prefs.force_compositing_mode = | 562 prefs.force_compositing_mode = |
563 content::IsForceCompositingModeEnabled() && | 563 content::IsForceCompositingModeEnabled() && |
564 !command_line.HasSwitch(switches::kDisableForceCompositingMode); | 564 !command_line.HasSwitch(switches::kDisableForceCompositingMode); |
565 prefs.accelerated_2d_canvas_enabled = | 565 prefs.accelerated_2d_canvas_enabled = |
566 GpuProcessHost::gpu_enabled() && | 566 GpuProcessHost::gpu_enabled() && |
567 !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas); | 567 !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas); |
568 prefs.antialiased_2d_canvas_disabled = | 568 prefs.antialiased_2d_canvas_disabled = |
569 command_line.HasSwitch(switches::kDisable2dCanvasAntialiasing); | 569 command_line.HasSwitch(switches::kDisable2dCanvasAntialiasing); |
| 570 prefs.accelerated_2d_canvas_msaa_sample_count = |
| 571 atoi(command_line.GetSwitchValueASCII( |
| 572 switches::kAcceleratedCanvas2dMSAASampleCount).c_str()); |
570 prefs.accelerated_filters_enabled = | 573 prefs.accelerated_filters_enabled = |
571 GpuProcessHost::gpu_enabled() && | 574 GpuProcessHost::gpu_enabled() && |
572 command_line.HasSwitch(switches::kEnableAcceleratedFilters); | 575 command_line.HasSwitch(switches::kEnableAcceleratedFilters); |
573 prefs.accelerated_compositing_for_3d_transforms_enabled = | 576 prefs.accelerated_compositing_for_3d_transforms_enabled = |
574 prefs.accelerated_compositing_for_animation_enabled = | 577 prefs.accelerated_compositing_for_animation_enabled = |
575 !command_line.HasSwitch(switches::kDisableAcceleratedLayers); | 578 !command_line.HasSwitch(switches::kDisableAcceleratedLayers); |
576 prefs.accelerated_compositing_for_plugins_enabled = | 579 prefs.accelerated_compositing_for_plugins_enabled = |
577 !command_line.HasSwitch(switches::kDisableAcceleratedPlugins); | 580 !command_line.HasSwitch(switches::kDisableAcceleratedPlugins); |
578 prefs.accelerated_compositing_for_video_enabled = | 581 prefs.accelerated_compositing_for_video_enabled = |
579 !command_line.HasSwitch(switches::kDisableAcceleratedVideo); | 582 !command_line.HasSwitch(switches::kDisableAcceleratedVideo); |
(...skipping 3278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3858 } | 3861 } |
3859 | 3862 |
3860 void WebContentsImpl::OnFrameRemoved( | 3863 void WebContentsImpl::OnFrameRemoved( |
3861 RenderViewHostImpl* render_view_host, | 3864 RenderViewHostImpl* render_view_host, |
3862 int64 frame_id) { | 3865 int64 frame_id) { |
3863 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 3866 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
3864 FrameDetached(render_view_host, frame_id)); | 3867 FrameDetached(render_view_host, frame_id)); |
3865 } | 3868 } |
3866 | 3869 |
3867 } // namespace content | 3870 } // namespace content |
OLD | NEW |