Fixing gpu_ipc_browsertests.cc

content/browser/gpu/gpu_context_tests.h

+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// These tests are run twice:
+// Once in a gpu test with an in-process WebGraphicsContext3D.
+// Once in a browsertest with a gpu-process WebGraphicsContext3D.
+
+#include "base/bind.h"
+#include "base/run_loop.h"
+#include "cc/resources/sync_point_helper.h"
+#include "gpu/GLES2/gl2extchromium.h"
+
+namespace {
+
+class SignalTest : public ContextTestBase {
+ public:
+  static void RunOnlyOnce(base::Closure cb, int *tmp) {
+    CHECK_EQ(*tmp, 0);
+    ++*tmp;
+    cb.Run();
+  }
+
+  // These tests should time out if the callback doesn't get called.
+  void testSignalSyncPoint(unsigned sync_point) {
+    base::RunLoop run_loop;
+    cc::SyncPointHelper::SignalSyncPoint(
+        context_.get(), sync_point, run_loop.QuitClosure());
+    context_->flush();

[piman, 2013/06/26 21:41:03]

nit: why the need for flush here?
The insertSyncPoint should have flushed, and whatever happens afterwards should
have no effect on the signalSyncPoint behavior...

[hubbe, 2013/06/27 20:42:40]

But it does. Without the flush, this test does not finish when running on an
in-process context.

[piman, 2013/06/27 20:51:34]

It sounds like the missing flush would be in the in-process context then. An
explicit flush should never be required for completion.

Still, I don't understand why it's needed.
WebGraphicsContext3DInProcessCommandBufferImpl::signalSyncPoint does a flush
(albeit a shallow one, which means we don't issue a glFlush, but that's fully
orthogonal to sync points).

[hubbe, 2013/06/27 22:52:11]

Fix implemented as per discussion.

+    run_loop.Run();
+  }
+
+  // These tests should time out if the callback doesn't get called.
+  void testSignalQuery(WebKit::WebGLId query) {
+    base::RunLoop run_loop;
+    cc::SyncPointHelper::SignalQuery(
+        context_.get(), query,
+        base::Bind(&RunOnlyOnce, run_loop.QuitClosure(),
+                   base::Owned(new int(0))));
+    run_loop.Run();
+  }
+};
+
+CONTEXT_TEST_F(SignalTest, BasicSignalSyncPointTest) {
+  testSignalSyncPoint(context_->insertSyncPoint());
+};
+
+CONTEXT_TEST_F(SignalTest, InvalidSignalSyncPointTest) {
+  // Signalling something that doesn't exist should run the callback
+  // immediately.
+  testSignalSyncPoint(1297824234);
+};
+
+CONTEXT_TEST_F(SignalTest, BasicSignalQueryTest) {
+  unsigned query = context_->createQueryEXT();
+  context_->beginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM, query);
+  context_->finish();
+  context_->endQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM);
+  testSignalQuery(query);
+  context_->deleteQueryEXT(query);
+};
+
+CONTEXT_TEST_F(SignalTest, SignalQueryUnboundTest) {
+  WebKit::WebGLId query = context_->createQueryEXT();
+  testSignalQuery(query);
+  context_->deleteQueryEXT(query);
+};
+
+CONTEXT_TEST_F(SignalTest, InvalidSignalQueryUnboundTest) {
+  // Signalling something that doesn't exist should run the callback
+  // immediately.
+  testSignalQuery(928729087);
+  testSignalQuery(928729086);
+  testSignalQuery(928729085);
+  testSignalQuery(928729083);
+  testSignalQuery(928729082);
+  testSignalQuery(928729081);
+};
+
+};