| OLD | NEW |
| 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 "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "cc/base/switches.h" | 10 #include "cc/base/switches.h" |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 } | 183 } |
| 184 | 184 |
| 185 bool IsImplSidePaintingEnabled() { | 185 bool IsImplSidePaintingEnabled() { |
| 186 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 186 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 187 | 187 |
| 188 if (command_line.HasSwitch(switches::kDisableImplSidePainting)) | 188 if (command_line.HasSwitch(switches::kDisableImplSidePainting)) |
| 189 return false; | 189 return false; |
| 190 else if (command_line.HasSwitch(switches::kEnableImplSidePainting)) | 190 else if (command_line.HasSwitch(switches::kEnableImplSidePainting)) |
| 191 return true; | 191 return true; |
| 192 | 192 |
| 193 #if defined(OS_ANDROID) | 193 return IsThreadedCompositingEnabled(); |
| 194 return true; | |
| 195 #else | |
| 196 return false; | |
| 197 #endif | |
| 198 } | 194 } |
| 199 | 195 |
| 200 bool IsGpuRasterizationEnabled() { | 196 bool IsGpuRasterizationEnabled() { |
| 201 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 197 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 202 | 198 |
| 203 if (!IsImplSidePaintingEnabled()) | 199 if (!IsImplSidePaintingEnabled()) |
| 204 return false; | 200 return false; |
| 205 | 201 |
| 206 if (command_line.HasSwitch(switches::kDisableGpuRasterization)) | 202 if (command_line.HasSwitch(switches::kDisableGpuRasterization)) |
| 207 return false; | 203 return false; |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 return problem_list; | 316 return problem_list; |
| 321 } | 317 } |
| 322 | 318 |
| 323 base::Value* GetDriverBugWorkarounds() { | 319 base::Value* GetDriverBugWorkarounds() { |
| 324 base::ListValue* workaround_list = new base::ListValue(); | 320 base::ListValue* workaround_list = new base::ListValue(); |
| 325 GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds(workaround_list); | 321 GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds(workaround_list); |
| 326 return workaround_list; | 322 return workaround_list; |
| 327 } | 323 } |
| 328 | 324 |
| 329 } // namespace content | 325 } // namespace content |
| OLD | NEW |