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 c22115a1e4d53435834b3cf281c938464cf8f592..9bf133ab685f75f58e26a05d3e235986798ca1d7 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -960,13 +960,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));
@@ -1867,15 +1860,17 @@ void ResourceProvider::CopyResource(ResourceId source_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
+    if (source_resource->gpu_memory_buffer->GetHandle().type ==
+        gfx::SHARED_MEMORY_BUFFER)

[dshwang, 2015/08/05 12:33:16]

This quirk was introduced for ARM chrome os. until now, chrome os uses only
gfx::SHARED_MEMORY_BUFFER, so this quirk is possible.
This CL makes chromeos use gfx::OZONE_NATIVE_PIXMAP and
gfx::SHARED_MEMORY_BUFFER. So this quirk is applied to only
gfx::SHARED_MEMORY_BUFFER.

reveman, If https://codereview.chromium.org/1221433002/ is landed, I'll remove
this code change.

[reveman, 2015/08/05 14:11:49]

I'd rather not make this nastier than it already is. Let's try to fix the
polling interval on the service side so this problem goes away. All platforms
will benefit from that.

[dshwang, 2015/08/06 08:30:30]

Ok, I remove this change. We will resolve this issue in
https://codereview.chromium.org/1221433002/

+      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;
@@ -1887,10 +1882,12 @@ void ResourceProvider::CopyResource(ResourceId source_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 {