| 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 600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 611 command_line->AppendSwitch(switches::kDisableGLMultisampling); | 611 command_line->AppendSwitch(switches::kDisableGLMultisampling); |
| 612 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING) && | 612 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING) && |
| 613 !command_line->HasSwitch(switches::kDisableAcceleratedCompositing)) | 613 !command_line->HasSwitch(switches::kDisableAcceleratedCompositing)) |
| 614 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); | 614 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); |
| 615 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS) && | 615 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS) && |
| 616 !command_line->HasSwitch(switches::kDisableAccelerated2dCanvas)) | 616 !command_line->HasSwitch(switches::kDisableAccelerated2dCanvas)) |
| 617 command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas); | 617 command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas); |
| 618 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE) && | 618 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE) && |
| 619 !command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) | 619 !command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) |
| 620 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); | 620 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); |
| 621 if (ShouldUseSwiftShader()) | |
| 622 command_line->AppendSwitch(switches::kDisableFlashFullscreen3d); | |
| 623 } | 621 } |
| 624 | 622 |
| 625 void GpuDataManagerImplPrivate::AppendGpuCommandLine( | 623 void GpuDataManagerImplPrivate::AppendGpuCommandLine( |
| 626 CommandLine* command_line) const { | 624 CommandLine* command_line) const { |
| 627 DCHECK(command_line); | 625 DCHECK(command_line); |
| 628 | 626 |
| 629 std::string use_gl = | 627 std::string use_gl = |
| 630 CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kUseGL); | 628 CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kUseGL); |
| 631 base::FilePath swiftshader_path = | 629 base::FilePath swiftshader_path = |
| 632 CommandLine::ForCurrentProcess()->GetSwitchValuePath( | 630 CommandLine::ForCurrentProcess()->GetSwitchValuePath( |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1151 int render_process_id, | 1149 int render_process_id, |
| 1152 int render_view_id, | 1150 int render_view_id, |
| 1153 ThreeDAPIType requester) { | 1151 ThreeDAPIType requester) { |
| 1154 GpuDataManagerImpl::UnlockedSession session(owner_); | 1152 GpuDataManagerImpl::UnlockedSession session(owner_); |
| 1155 observer_list_->Notify(&GpuDataManagerObserver::DidBlock3DAPIs, | 1153 observer_list_->Notify(&GpuDataManagerObserver::DidBlock3DAPIs, |
| 1156 url, render_process_id, render_view_id, requester); | 1154 url, render_process_id, render_view_id, requester); |
| 1157 } | 1155 } |
| 1158 | 1156 |
| 1159 } // namespace content | 1157 } // namespace content |
| 1160 | 1158 |
| OLD | NEW |