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

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

Issue 1250993002: Revert of Enable Surfaces on Android (try #4) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | no next file » | 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 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 *base::CommandLine::ForCurrentProcess(); 298 *base::CommandLine::ForCurrentProcess();
299 299
300 if (!IsImplSidePaintingEnabled()) 300 if (!IsImplSidePaintingEnabled())
301 return false; 301 return false;
302 302
303 return command_line.HasSwitch(switches::kForceGpuRasterization); 303 return command_line.HasSwitch(switches::kForceGpuRasterization);
304 } 304 }
305 305
306 bool UseSurfacesEnabled() { 306 bool UseSurfacesEnabled() {
307 #if defined(OS_ANDROID) 307 #if defined(OS_ANDROID)
308 return true; 308 return false;
309 #endif 309 #endif
310 bool enabled = false; 310 bool enabled = false;
311 #if defined(USE_AURA) || defined(OS_MACOSX) 311 #if defined(USE_AURA) || defined(OS_MACOSX)
312 enabled = true; 312 enabled = true;
313 #endif 313 #endif
314 314
315 const base::CommandLine& command_line = 315 const base::CommandLine& command_line =
316 *base::CommandLine::ForCurrentProcess(); 316 *base::CommandLine::ForCurrentProcess();
317 317
318 // Flags override. 318 // Flags override.
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 } 442 }
443 } 443 }
444 return problem_list; 444 return problem_list;
445 } 445 }
446 446
447 std::vector<std::string> GetDriverBugWorkarounds() { 447 std::vector<std::string> GetDriverBugWorkarounds() {
448 return GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds(); 448 return GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds();
449 } 449 }
450 450
451 } // namespace content 451 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698