Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(203)

Side by Side Diff: content/browser/gpu/gpu_data_manager_impl.cc

Issue 11859023: NOT FOR SUBMITTING: Enable FFmpeg and VDA on Android (just for developing) Base URL: https://chromium.googlesource.com/chromium/src.git@avda-review
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/common.gypi ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/gpu/gpu_data_manager_impl.h" 5 #include "content/browser/gpu/gpu_data_manager_impl.h"
6 6
7 #if defined(OS_MACOSX) 7 #if defined(OS_MACOSX)
8 #include <ApplicationServices/ApplicationServices.h> 8 #include <ApplicationServices/ApplicationServices.h>
9 #endif // OS_MACOSX 9 #endif // OS_MACOSX
10 10
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 } 423 }
424 if ((flags & GPU_FEATURE_TYPE_MULTISAMPLING) && 424 if ((flags & GPU_FEATURE_TYPE_MULTISAMPLING) &&
425 !command_line->HasSwitch(switches::kDisableGLMultisampling)) 425 !command_line->HasSwitch(switches::kDisableGLMultisampling))
426 command_line->AppendSwitch(switches::kDisableGLMultisampling); 426 command_line->AppendSwitch(switches::kDisableGLMultisampling);
427 if ((flags & GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING) && 427 if ((flags & GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING) &&
428 !command_line->HasSwitch(switches::kDisableAcceleratedCompositing)) 428 !command_line->HasSwitch(switches::kDisableAcceleratedCompositing))
429 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); 429 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
430 if ((flags & GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS) && 430 if ((flags & GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS) &&
431 !command_line->HasSwitch(switches::kDisableAccelerated2dCanvas)) 431 !command_line->HasSwitch(switches::kDisableAccelerated2dCanvas))
432 command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas); 432 command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas);
433 /* XXX enable VDA for all platform to delvelop VDA on Android.
433 if ((flags & GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE) && 434 if ((flags & GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE) &&
434 !command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) 435 !command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode))
435 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); 436 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode);
437 */
436 if (ShouldUseSoftwareRendering()) 438 if (ShouldUseSoftwareRendering())
437 command_line->AppendSwitch(switches::kDisableFlashFullscreen3d); 439 command_line->AppendSwitch(switches::kDisableFlashFullscreen3d);
438 } 440 }
439 441
440 void GpuDataManagerImpl::AppendGpuCommandLine( 442 void GpuDataManagerImpl::AppendGpuCommandLine(
441 CommandLine* command_line) const { 443 CommandLine* command_line) const {
442 DCHECK(command_line); 444 DCHECK(command_line);
443 445
444 std::string use_gl = 446 std::string use_gl =
445 CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kUseGL); 447 CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kUseGL);
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 gpu_info.gl_version_string = gl_version; 776 gpu_info.gl_version_string = gl_version;
775 777
776 gpu_info_collector::CollectDriverInfoGL(&gpu_info); 778 gpu_info_collector::CollectDriverInfoGL(&gpu_info);
777 779
778 UpdateGpuInfo(gpu_info); 780 UpdateGpuInfo(gpu_info);
779 UpdateGpuSwitchingManager(gpu_info); 781 UpdateGpuSwitchingManager(gpu_info);
780 UpdatePreliminaryBlacklistedFeatures(); 782 UpdatePreliminaryBlacklistedFeatures();
781 } 783 }
782 784
783 } // namespace content 785 } // namespace content
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698