Enable by default threaded compositing on windows and FCM on mac

chrome/test/gpu/gpu_feature_browsertest.cc

 // Copyright (c) 2012 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.
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/test/trace_event_analyzer.h"
@@ skipping 19 matching lines @@
 #endif
 
 using content::GpuDataManager;
 using content::GpuFeatureType;
 using trace_analyzer::Query;
 using trace_analyzer::TraceAnalyzer;
 using trace_analyzer::TraceEventVector;
 
 namespace {
 
-typedef uint32 GpuResultFlags;
-#define EXPECT_NO_GPU_SWAP_BUFFERS    GpuResultFlags(1<<0)
-// Expect a SwapBuffers to occur (see gles2_cmd_decoder.cc).
-#define EXPECT_GPU_SWAP_BUFFERS       GpuResultFlags(1<<1)
+#define SWAP_BUFFERS_EVENT                 "SwapBuffers"

[Alexei Svitkine (slow), 2012/09/17 20:23:47]

Nit: Declare these per the Chromium style convention as:

const char kSwapBuffersEvent[] = "SwapBuffers";

[Vangelis Kokkevis, 2012/09/17 21:47:54]

Done.

+#define ACCELERATED_CANVAS_CREATION_EVENT  "Canvas2DLayerBridgeCreation"
+#define WEBGL_CREATION_EVENT               "DrawingBufferCreation"
 
 class GpuFeatureTest : public InProcessBrowserTest {
  public:
   GpuFeatureTest() : trace_categories_("test_gpu"), gpu_enabled_(false) {}
 
   virtual void SetUpInProcessBrowserTestFixture() {
     FilePath test_dir;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
     gpu_test_dir_ = test_dir.AppendASCII("gpu");
   }
@@ skipping 45 matching lines @@
           browser(), net::FilePathToFileURL(test_path));
     }
 
     std::string result;
     // Wait for message indicating the test has finished running.
     ASSERT_TRUE(message_queue.WaitForMessage(&result));
     if (expected_reply)
       EXPECT_STREQ(expected_reply, result.c_str());
   }
 
-  void RunTest(const FilePath& url, GpuResultFlags expectations) {
+  // Open the URL and check the trace stream for the given event.
+  void RunEventTest(const FilePath& url,
+                    const char* event_name = NULL,
+                    bool event_expected = false) {
 #if defined(OS_LINUX) && !defined(NDEBUG)
     // Bypass tests on GPU Linux Debug bots.
     if (gpu_enabled_)
       return;
 #endif
 #if defined(OS_MACOSX)
     // Bypass tests on Mac OSX 10.5 bots (IOSurfaceSupport is now required).
     if (!IOSurfaceSupport::Initialize())
       return;
 #endif
 
     ASSERT_TRUE(tracing::BeginTracing(trace_categories_));
 
     // Have to use a new tab for the blacklist to work.
     RunTest(url, NULL, true);
 
     ASSERT_TRUE(tracing::EndTracing(&trace_events_json_));
 
     analyzer_.reset(TraceAnalyzer::Create(trace_events_json_));
     analyzer_->AssociateBeginEndEvents();
     TraceEventVector events;
 
-    if (expectations & EXPECT_NO_GPU_SWAP_BUFFERS) {
-      EXPECT_EQ(analyzer_->FindEvents(Query::EventNameIs("SwapBuffers"),
-                                      &events), size_t(0));
-    }
+    if (!event_name)
+      return;
 
-    // Check for swap buffers if expected:
-    if (expectations & EXPECT_GPU_SWAP_BUFFERS) {
-      EXPECT_GT(analyzer_->FindEvents(Query::EventNameIs("SwapBuffers"),
-                                      &events), size_t(0));
-    }
+    size_t event_count =
+        analyzer_->FindEvents(Query::EventNameIs(event_name), &events);
+
+    if (event_expected)
+      EXPECT_GT(event_count, size_t(0));

[Alexei Svitkine (slow), 2012/09/17 20:23:47]

Nit: Instead of size_t(0), use 0U.

[Vangelis Kokkevis, 2012/09/17 21:47:54]

Done.

+    else
+      EXPECT_EQ(event_count, size_t(0));
   }
 
   // Trigger a resize of the chrome window, and use tracing to wait for the
   // given |wait_event|.
   bool ResizeAndWait(const gfx::Rect& new_bounds,
                      const char* trace_categories,
                      const char* wait_category,
                      const char* wait_event) {
     if (!tracing::BeginTracingWithWatch(trace_categories, wait_category,
                                         wait_event, 1))
@@ skipping 15 matching lines @@
   std::string trace_events_json_;
   bool gpu_enabled_;
 };
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, AcceleratedCompositingAllowed) {
   GpuFeatureType type =
       GpuDataManager::GetInstance()->GetBlacklistedFeatures();
   EXPECT_EQ(type, 0);
 
   const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
-  RunTest(url, EXPECT_GPU_SWAP_BUFFERS);
+  RunEventTest(url, SWAP_BUFFERS_EVENT, true);
 }
 
-IN_PROC_BROWSER_TEST_F(GpuFeatureTest, AcceleratedCompositingBlocked) {
-  const std::string json_blacklist =
+class AcceleratedCompositingBlockedTest : public GpuFeatureTest {
+ public:
+  virtual void SetUpInProcessBrowserTestFixture() {

[Alexei Svitkine (slow), 2012/09/17 20:23:47]

Nit: OVERRIDE.

[Vangelis Kokkevis, 2012/09/17 21:47:54]

Done.

+    GpuFeatureTest::SetUpInProcessBrowserTestFixture();
+    const std::string json_blacklist =
       "{\n"
       "  \"name\": \"gpu blacklist\",\n"
       "  \"version\": \"1.0\",\n"
       "  \"entries\": [\n"
       "    {\n"
       "      \"id\": 1,\n"
       "      \"blacklist\": [\n"
       "        \"accelerated_compositing\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
-  SetupBlacklist(json_blacklist);
+    SetupBlacklist(json_blacklist);
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(AcceleratedCompositingBlockedTest,
+    AcceleratedCompositingBlocked) {
   GpuFeatureType type =
-      GpuDataManager::GetInstance()->GetBlacklistedFeatures();
+    GpuDataManager::GetInstance()->GetBlacklistedFeatures();
   EXPECT_EQ(type, content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING);
 
   const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
-  RunTest(url, EXPECT_NO_GPU_SWAP_BUFFERS);
+  RunEventTest(url, SWAP_BUFFERS_EVENT, false);
 }
 
 class AcceleratedCompositingTest : public GpuFeatureTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) {
     GpuFeatureTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(AcceleratedCompositingTest,
                        AcceleratedCompositingDisabled) {
   const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
-  RunTest(url, EXPECT_NO_GPU_SWAP_BUFFERS);
+  RunEventTest(url, SWAP_BUFFERS_EVENT, false);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLAllowed) {
   GpuFeatureType type =
       GpuDataManager::GetInstance()->GetBlacklistedFeatures();
   EXPECT_EQ(type, 0);
 
   const FilePath url(FILE_PATH_LITERAL("feature_webgl.html"));
-  RunTest(url, EXPECT_GPU_SWAP_BUFFERS);
+  RunEventTest(url, WEBGL_CREATION_EVENT, true);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) {
   const std::string json_blacklist =
       "{\n"
       "  \"name\": \"gpu blacklist\",\n"
       "  \"version\": \"1.0\",\n"
       "  \"entries\": [\n"
       "    {\n"
       "      \"id\": 1,\n"
       "      \"blacklist\": [\n"
       "        \"webgl\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   SetupBlacklist(json_blacklist);
   GpuFeatureType type =
       GpuDataManager::GetInstance()->GetBlacklistedFeatures();
   EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
 
   const FilePath url(FILE_PATH_LITERAL("feature_webgl.html"));
-  RunTest(url, EXPECT_NO_GPU_SWAP_BUFFERS);
+  RunEventTest(url, WEBGL_CREATION_EVENT, false);
 }
 
 class WebGLTest : public GpuFeatureTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) {
     GpuFeatureTest::SetUpCommandLine(command_line);
 #if !defined(OS_ANDROID)
     // On Android, WebGL is disabled by default
     command_line->AppendSwitch(switches::kDisableExperimentalWebGL);
 #endif
   }
 };
 
 IN_PROC_BROWSER_TEST_F(WebGLTest, WebGLDisabled) {
   const FilePath url(FILE_PATH_LITERAL("feature_webgl.html"));
-  RunTest(url, EXPECT_NO_GPU_SWAP_BUFFERS);
+  RunEventTest(url, WEBGL_CREATION_EVENT, false);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MultisamplingAllowed) {
   GpuFeatureType type =
       GpuDataManager::GetInstance()->GetBlacklistedFeatures();
   EXPECT_EQ(type, 0);
 
   // Multisampling is not supported if running on top of osmesa.
   std::string use_gl = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
       switches::kUseGL);
@@ skipping 59 matching lines @@
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) {
   // Accelerated canvas 2D is not supported on XP.
   if (GPUTestBotConfig::CurrentConfigMatches("XP"))
     return;
 
   GpuFeatureType type =
       GpuDataManager::GetInstance()->GetBlacklistedFeatures();
   EXPECT_EQ(type, 0);
 
   const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
-  RunTest(url, EXPECT_GPU_SWAP_BUFFERS);
+  RunEventTest(url, ACCELERATED_CANVAS_CREATION_EVENT, true);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DBlocked) {
   const std::string json_blacklist =
       "{\n"
       "  \"name\": \"gpu blacklist\",\n"
       "  \"version\": \"1.0\",\n"
       "  \"entries\": [\n"
       "    {\n"
       "      \"id\": 1,\n"
       "      \"blacklist\": [\n"
       "        \"accelerated_2d_canvas\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   SetupBlacklist(json_blacklist);
   GpuFeatureType type =
       GpuDataManager::GetInstance()->GetBlacklistedFeatures();
   EXPECT_EQ(type, content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS);
 
   const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
-  RunTest(url, EXPECT_NO_GPU_SWAP_BUFFERS);
+  RunEventTest(url, ACCELERATED_CANVAS_CREATION_EVENT, false);
 }
 
 class Canvas2DDisabledTest : public GpuFeatureTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) {
     GpuFeatureTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(Canvas2DDisabledTest, Canvas2DDisabled) {
   const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
-  RunTest(url, EXPECT_NO_GPU_SWAP_BUFFERS);
+  RunEventTest(url, ACCELERATED_CANVAS_CREATION_EVENT, false);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest,
                        CanOpenPopupAndRenderWithWebGLCanvas) {
   const FilePath url(FILE_PATH_LITERAL("webgl_popup.html"));
   RunTest(url, "\"SUCCESS\"", false);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, CanOpenPopupAndRenderWith2DCanvas) {
   const FilePath url(FILE_PATH_LITERAL("canvas_popup.html"));
   RunTest(url, "\"SUCCESS\"", false);
 }
 
 class ThreadedCompositorTest : public GpuFeatureTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) {
     GpuFeatureTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableThreadedCompositing);
   }
 };
 
 // disabled in http://crbug.com/123503
 IN_PROC_BROWSER_TEST_F(ThreadedCompositorTest, ThreadedCompositor) {
   const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
-  RunTest(url, EXPECT_GPU_SWAP_BUFFERS);
+  RunEventTest(url, SWAP_BUFFERS_EVENT, true);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, RafNoDamage) {
   trace_categories_ = "-test_*";
   const FilePath url(FILE_PATH_LITERAL("feature_raf_no_damage.html"));
-  RunTest(url, GpuResultFlags(0));
+  RunEventTest(url);
 
   if (!analyzer_.get())
     return;
 
   // Search for matching name on begin event or async_begin event (any begin).
   Query query_raf =
       (Query::EventPhaseIs(TRACE_EVENT_PHASE_BEGIN) ||
        Query::EventPhaseIs(TRACE_EVENT_PHASE_ASYNC_BEGIN)) &&
       Query::EventNameIs("___RafWithNoDamage___");
   TraceEventVector events;
@@ skipping 85 matching lines @@
           base::StringPrintf(
               "%d (resize offset %d): IOSurface width %d -> %d; Creates %d "
               "Expected %d", offset_i, offsets[offset_i],
               old_width, new_width, num_creates, expected_creates);
     }
   }
 }
 #endif
 
 }  // namespace anonymous