diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 17:39:04 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 17:39:04 +0000 |
| commit | 665594887af9746280a3ea281ac1676b2793d3c3 (patch) | |
| tree | e6b25b897b770a92947f53f54893c326247beeac /ui/compositor | |
| parent | ddcb73ca0d440325c7e86a66c60d751a6bf62f3f (diff) | |
| download | chromium_src-665594887af9746280a3ea281ac1676b2793d3c3.zip chromium_src-665594887af9746280a3ea281ac1676b2793d3c3.tar.gz chromium_src-665594887af9746280a3ea281ac1676b2793d3c3.tar.bz2 | |
Fix build on various Linux and CrOS bots.
R=jamesr@chromium.org
BUG=148709
Review URL: https://chromiumcodereview.appspot.com/10919245
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/compositor')
| -rw-r--r-- | ui/compositor/layer_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc index 850d860..dd9b6ea 100644 --- a/ui/compositor/layer_unittest.cc +++ b/ui/compositor/layer_unittest.cc @@ -374,7 +374,6 @@ class TestCompositorObserver : public CompositorObserver { #define MAYBE_DrawTree DISABLED_DrawTree #define MAYBE_Hierarchy DISABLED_Hierarchy #define MAYBE_HierarchyNoTexture DISABLED_HierarchyNoTexture -#define MAYBE_DrawPixels DISABLED_DrawPixels #define MAYBE_SetRootLayer DISABLED_SetRootLayer #define MAYBE_CompositorObservers DISABLED_CompositorObservers #define MAYBE_ModifyHierarchy DISABLED_ModifyHierarchy @@ -388,7 +387,6 @@ class TestCompositorObserver : public CompositorObserver { #define MAYBE_DrawTree DrawTree #define MAYBE_Hierarchy Hierarchy #define MAYBE_HierarchyNoTexture HierarchyNoTexture -#define MAYBE_DrawPixels DrawPixels #define MAYBE_SetRootLayer SetRootLayer #define MAYBE_CompositorObservers CompositorObservers #define MAYBE_ModifyHierarchy ModifyHierarchy @@ -803,7 +801,8 @@ TEST_F(LayerWithNullDelegateTest, SetBoundsSchedulesPaint) { } // Checks that pixels are actually drawn to the screen with a read back. -TEST_F(LayerWithRealCompositorTest, MAYBE_DrawPixels) { +// Currently disabled on all platforms, see http://crbug.com/148709. +TEST_F(LayerWithRealCompositorTest, DISABLED_DrawPixels) { scoped_ptr<Layer> layer(CreateColorLayer(SK_ColorRED, gfx::Rect(0, 0, 500, 500))); scoped_ptr<Layer> layer2(CreateColorLayer(SK_ColorBLUE, |