Index: chrome/test/gpu/gpu_feature_browsertest.cc |
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc |
index 892facb246eb578ff09b065fa856944665b1f894..91cd6816ca74dac654075a1241b2908836cbd1ad 100644 |
--- a/chrome/test/gpu/gpu_feature_browsertest.cc |
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc |
@@ -44,6 +44,7 @@ namespace { |
const char kSwapBuffersEvent[] = "SwapBuffers"; |
const char kAcceleratedCanvasCreationEvent[] = "Canvas2DLayerBridgeCreation"; |
const char kWebGLCreationEvent[] = "DrawingBufferCreation"; |
+const char kThreadedCompositingEvent[] = "ThreadedCompositingInitialization"; |
class GpuFeatureTest : public InProcessBrowserTest { |
public: |
@@ -226,6 +227,30 @@ IN_PROC_BROWSER_TEST_F(AcceleratedCompositingBlockedTest, |
RunEventTest(url, kSwapBuffersEvent, false); |
} |
+IN_PROC_BROWSER_TEST_F(GpuFeatureTest, ThreadedCompositingTextureSharing) { |
+ const std::string json_blacklist = |
+ "{\n" |
+ " \"name\": \"gpu blacklist\",\n" |
+ " \"version\": \"1.0\",\n" |
+ " \"entries\": [\n" |
+ " {\n" |
+ " \"id\": 1,\n" |
+ " \"blacklist\": [\n" |
+ " \"texture_sharing\"\n" |
+ " ]\n" |
+ " }\n" |
+ " ]\n" |
+ "}"; |
+ SetupBlacklist(json_blacklist); |
+ GpuFeatureType type = |
+ GpuDataManager::GetInstance()->GetBlacklistedFeatures(); |
+ type = IgnoreGpuFeatures(type); |
+ EXPECT_EQ(type, content::GPU_FEATURE_TYPE_TEXTURE_SHARING); |
+ |
+ const FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); |
+ RunEventTest(url, kThreadedCompositingEvent, false); |
+} |
+ |
class AcceleratedCompositingTest : public GpuFeatureTest { |
public: |
virtual void SetUpCommandLine(CommandLine* command_line) { |