| Index: cc/trees/layer_tree_host_unittest_delegated.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc
|
| index 2b13cf50cdc6e0c2913bc96b88491e3adecd097a..6823bc89d9d569116e32ad03eabc028b8e7fbd3c 100644
|
| --- a/cc/trees/layer_tree_host_unittest_delegated.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_delegated.cc
|
| @@ -539,7 +539,9 @@ class LayerTreeHostDelegatedTestReturnUnusedResources
|
| virtual void AfterTest() OVERRIDE {}
|
| };
|
|
|
| -SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestReturnUnusedResources);
|
| +// Enable this for delegating renderer. crbug.com/239290
|
| +SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
|
| + LayerTreeHostDelegatedTestReturnUnusedResources);
|
|
|
| class LayerTreeHostDelegatedTestReusedResources
|
| : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
|
| @@ -598,7 +600,9 @@ class LayerTreeHostDelegatedTestReusedResources
|
| virtual void AfterTest() OVERRIDE {}
|
| };
|
|
|
| -SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestReusedResources);
|
| +// Enable this for delegating renderer. crbug.com/239290
|
| +SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
|
| + LayerTreeHostDelegatedTestReusedResources);
|
|
|
| class LayerTreeHostDelegatedTestFrameBeforeAck
|
| : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
|
| @@ -695,7 +699,9 @@ class LayerTreeHostDelegatedTestFrameBeforeAck
|
| virtual void AfterTest() OVERRIDE {}
|
| };
|
|
|
| -SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestFrameBeforeAck);
|
| +// Enable this for delegating renderer. crbug.com/239290
|
| +SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
|
| + LayerTreeHostDelegatedTestFrameBeforeAck);
|
|
|
| class LayerTreeHostDelegatedTestFrameBeforeTakeResources
|
| : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
|
| @@ -799,7 +805,8 @@ class LayerTreeHostDelegatedTestFrameBeforeTakeResources
|
| virtual void AfterTest() OVERRIDE {}
|
| };
|
|
|
| -SINGLE_AND_MULTI_THREAD_TEST_F(
|
| +// Enable this for delegating renderer. crbug.com/239290
|
| +SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
|
| LayerTreeHostDelegatedTestFrameBeforeTakeResources);
|
|
|
| class LayerTreeHostDelegatedTestBadFrame
|
| @@ -942,7 +949,9 @@ class LayerTreeHostDelegatedTestBadFrame
|
| virtual void AfterTest() OVERRIDE {}
|
| };
|
|
|
| -SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestBadFrame);
|
| +// Enable this for delegating renderer. crbug.com/239290
|
| +SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
|
| + LayerTreeHostDelegatedTestBadFrame);
|
|
|
| class LayerTreeHostDelegatedTestUnnamedResource
|
| : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
|
|
|