ozone: Implement zero/one-copy texture for Ozone GBM.

cc/resources/resource_provider.cc

Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index eb774fe10b3bd8d2ce217aa806d90a7158e3ca11..c396ce296eb5d6545b067a2aec27b54f9cf5fb08 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -1070,13 +1070,6 @@ ResourceProvider::ScopedWriteLockGpuMemoryBuffer::
     GLES2Interface* gl = resource_provider_->ContextGL();
     DCHECK(gl);
 
-#if defined(OS_CHROMEOS)
-    // TODO(reveman): GL_COMMANDS_ISSUED_CHROMIUM is used for synchronization
-    // on ChromeOS to avoid some performance issues. This only works with
-    // shared memory backed buffers. crbug.com/436314
-    DCHECK_EQ(gpu_memory_buffer_->GetHandle().type, gfx::SHARED_MEMORY_BUFFER);
-#endif
-
     resource_->image_id = gl->CreateImageCHROMIUM(
         gpu_memory_buffer_->AsClientBuffer(), size_.width(), size_.height(),
         GLInternalFormat(resource_->format));
@@ -1978,15 +1971,17 @@ void ResourceProvider::CopyResource(ResourceId source_id, ResourceId dest_id) {
     if (!source_resource->gl_read_lock_query_id)
       gl->GenQueriesEXT(1, &source_resource->gl_read_lock_query_id);
 #if defined(OS_CHROMEOS)
-    // TODO(reveman): This avoids a performance problem on some ChromeOS
-    // devices. This needs to be removed to support native GpuMemoryBuffer
-    // implementations. crbug.com/436314
-    gl->BeginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM,
-                      source_resource->gl_read_lock_query_id);
-#else
+    // TODO(reveman): GL_COMMANDS_ISSUED_CHROMIUM is used for synchronization
+    // on ChromeOS to avoid some performance issues. This only works with
+    // shared memory backed buffers. crbug.com/436314

[reveman, 2015/05/14 13:22:03]

GL_COMMANDS_COMPLETED_CHROMIUM has to be used with native buffers. This TODO
needs to be removed before you can land this patch.

+    if (source_resource->gpu_memory_buffer->GetHandle().type ==
+        gfx::SHARED_MEMORY_BUFFER)
+      gl->BeginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM,
+                        source_resource->gl_read_lock_query_id);
+    else
+#endif
     gl->BeginQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM,
                       source_resource->gl_read_lock_query_id);
-#endif
   }
   DCHECK(!dest_resource->image_id);
   dest_resource->allocated = true;
@@ -1996,10 +1991,12 @@ void ResourceProvider::CopyResource(ResourceId source_id, ResourceId dest_id) {
     // End query and create a read lock fence that will prevent access to
 // source resource until CopySubTextureCHROMIUM command has completed.
 #if defined(OS_CHROMEOS)
-    gl->EndQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM);
-#else
-    gl->EndQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM);
+    if (source_resource->gpu_memory_buffer->GetHandle().type ==
+        gfx::SHARED_MEMORY_BUFFER)
+      gl->EndQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM);
+    else
 #endif
+      gl->EndQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM);
     source_resource->read_lock_fence = make_scoped_refptr(
         new CopyTextureFence(gl, source_resource->gl_read_lock_query_id));
   } else {