| Index: cc/raster/one_copy_raster_buffer_provider.cc
|
| diff --git a/cc/raster/one_copy_raster_buffer_provider.cc b/cc/raster/one_copy_raster_buffer_provider.cc
|
| index 08a2cc4221a3c7cd38cd6f9b8895abf27b5d66c6..330832b4744e99be1013c0621d379c2275962fbd 100644
|
| --- a/cc/raster/one_copy_raster_buffer_provider.cc
|
| +++ b/cc/raster/one_copy_raster_buffer_provider.cc
|
| @@ -318,13 +318,7 @@ void OneCopyRasterBufferProvider::CopyOnWorkerThread(
|
| if (!staging_buffer->query_id)
|
| gl->GenQueriesEXT(1, &staging_buffer->query_id);
|
|
|
| -#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
|
| - // TODO(reveman): This avoids a performance problem on ARM ChromeOS
|
| - // devices. crbug.com/580166
|
| - gl->BeginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM, staging_buffer->query_id);
|
| -#else
|
| gl->BeginQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM, staging_buffer->query_id);
|
| -#endif
|
| }
|
|
|
| // Since compressed texture's cannot be pre-allocated we might have an
|
| @@ -362,13 +356,8 @@ void OneCopyRasterBufferProvider::CopyOnWorkerThread(
|
| }
|
| }
|
|
|
| - if (resource_provider_->use_sync_query()) {
|
| -#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
|
| - gl->EndQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM);
|
| -#else
|
| + if (resource_provider_->use_sync_query())
|
| gl->EndQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM);
|
| -#endif
|
| - }
|
|
|
| const uint64_t fence_sync = gl->InsertFenceSyncCHROMIUM();
|
|
|
|
|