OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/gpu/gpu_data_manager_impl_private.h" | 5 #include "content/browser/gpu/gpu_data_manager_impl_private.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
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 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
630 GpuDataManagerImpl::UnlockedSession session(owner_); | 630 GpuDataManagerImpl::UnlockedSession session(owner_); |
631 observer_list_->Notify(&GpuDataManagerObserver::OnVideoMemoryUsageStatsUpdate, | 631 observer_list_->Notify(&GpuDataManagerObserver::OnVideoMemoryUsageStatsUpdate, |
632 video_memory_usage_stats); | 632 video_memory_usage_stats); |
633 } | 633 } |
634 | 634 |
635 void GpuDataManagerImplPrivate::AppendRendererCommandLine( | 635 void GpuDataManagerImplPrivate::AppendRendererCommandLine( |
636 CommandLine* command_line) const { | 636 CommandLine* command_line) const { |
637 DCHECK(command_line); | 637 DCHECK(command_line); |
638 | 638 |
639 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL)) { | 639 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL)) { |
640 #if !defined(OS_ANDROID) | |
641 if (!command_line->HasSwitch(switches::kDisableExperimentalWebGL)) | 640 if (!command_line->HasSwitch(switches::kDisableExperimentalWebGL)) |
642 command_line->AppendSwitch(switches::kDisableExperimentalWebGL); | 641 command_line->AppendSwitch(switches::kDisableExperimentalWebGL); |
643 #endif | |
644 if (!command_line->HasSwitch(switches::kDisablePepper3d)) | 642 if (!command_line->HasSwitch(switches::kDisablePepper3d)) |
645 command_line->AppendSwitch(switches::kDisablePepper3d); | 643 command_line->AppendSwitch(switches::kDisablePepper3d); |
646 } | 644 } |
647 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_MULTISAMPLING) && | 645 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_MULTISAMPLING) && |
648 !command_line->HasSwitch(switches::kDisableGLMultisampling)) | 646 !command_line->HasSwitch(switches::kDisableGLMultisampling)) |
649 command_line->AppendSwitch(switches::kDisableGLMultisampling); | 647 command_line->AppendSwitch(switches::kDisableGLMultisampling); |
650 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING) && | 648 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING) && |
651 !command_line->HasSwitch(switches::kDisableAcceleratedCompositing)) | 649 !command_line->HasSwitch(switches::kDisableAcceleratedCompositing)) |
652 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); | 650 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); |
653 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS) && | 651 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS) && |
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1234 void GpuDataManagerImplPrivate::OnGpuProcessInitFailure() { | 1232 void GpuDataManagerImplPrivate::OnGpuProcessInitFailure() { |
1235 gpu_process_accessible_ = false; | 1233 gpu_process_accessible_ = false; |
1236 gpu_info_.finalized = true; | 1234 gpu_info_.finalized = true; |
1237 complete_gpu_info_already_requested_ = true; | 1235 complete_gpu_info_already_requested_ = true; |
1238 // Some observers might be waiting. | 1236 // Some observers might be waiting. |
1239 NotifyGpuInfoUpdate(); | 1237 NotifyGpuInfoUpdate(); |
1240 } | 1238 } |
1241 | 1239 |
1242 } // namespace content | 1240 } // namespace content |
1243 | 1241 |
OLD | NEW |