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

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

Issue 963963002: cc: Add kDisableGpuRasterization to content_shell for layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge - update version # again Created 5 years, 7 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 | « no previous file | gpu/config/software_rendering_list_json.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/compositor_util.h" 5 #include "content/browser/gpu/compositor_util.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 278
279 if (command_line.HasSwitch(switches::kDisableGpuRasterization)) 279 if (command_line.HasSwitch(switches::kDisableGpuRasterization))
280 return false; 280 return false;
281 else if (command_line.HasSwitch(switches::kEnableGpuRasterization)) 281 else if (command_line.HasSwitch(switches::kEnableGpuRasterization))
282 return true; 282 return true;
283 283
284 if (IsGpuRasterizationBlacklisted()) { 284 if (IsGpuRasterizationBlacklisted()) {
285 return false; 285 return false;
286 } 286 }
287 287
288 #if defined(OS_ANDROID)
288 return true; 289 return true;
290 #endif
291
292 // explicitly disable GPU rasterization on all non-android devices until we
293 // have full test coverage.
294 return false;
289 } 295 }
290 296
291 bool IsForceGpuRasterizationEnabled() { 297 bool IsForceGpuRasterizationEnabled() {
292 const base::CommandLine& command_line = 298 const base::CommandLine& command_line =
293 *base::CommandLine::ForCurrentProcess(); 299 *base::CommandLine::ForCurrentProcess();
294 300
295 if (!IsImplSidePaintingEnabled()) 301 if (!IsImplSidePaintingEnabled())
296 return false; 302 return false;
297 303
298 return command_line.HasSwitch(switches::kForceGpuRasterization); 304 return command_line.HasSwitch(switches::kForceGpuRasterization);
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 } 437 }
432 } 438 }
433 return problem_list; 439 return problem_list;
434 } 440 }
435 441
436 std::vector<std::string> GetDriverBugWorkarounds() { 442 std::vector<std::string> GetDriverBugWorkarounds() {
437 return GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds(); 443 return GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds();
438 } 444 }
439 445
440 } // namespace content 446 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | gpu/config/software_rendering_list_json.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698