OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/compiler_specific.h" | 6 #include "base/compiler_specific.h" |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 #define MAYBE_Draw DISABLED_Draw | 309 #define MAYBE_Draw DISABLED_Draw |
310 #define MAYBE_DrawTree DISABLED_DrawTree | 310 #define MAYBE_DrawTree DISABLED_DrawTree |
311 #define MAYBE_Hierarchy DISABLED_Hierarchy | 311 #define MAYBE_Hierarchy DISABLED_Hierarchy |
312 #define MAYBE_HierarchyNoTexture DISABLED_HierarchyNoTexture | 312 #define MAYBE_HierarchyNoTexture DISABLED_HierarchyNoTexture |
313 #define MAYBE_DrawPixels DISABLED_DrawPixels | 313 #define MAYBE_DrawPixels DISABLED_DrawPixels |
314 #define MAYBE_SetRootLayer DISABLED_SetRootLayer | 314 #define MAYBE_SetRootLayer DISABLED_SetRootLayer |
315 #define MAYBE_CompositorObservers DISABLED_CompositorObservers | 315 #define MAYBE_CompositorObservers DISABLED_CompositorObservers |
316 #define MAYBE_ModifyHierarchy DISABLED_ModifyHierarchy | 316 #define MAYBE_ModifyHierarchy DISABLED_ModifyHierarchy |
317 #define MAYBE_Opacity DISABLED_Opacity | 317 #define MAYBE_Opacity DISABLED_Opacity |
318 #else | 318 #else |
319 #define MAYBE_Delegate Delegate | 319 #define MAYBE_Delegate DISABLED_Delegate |
320 #define MAYBE_Draw Draw | 320 #define MAYBE_Draw Draw |
321 #define MAYBE_DrawTree DrawTree | 321 #define MAYBE_DrawTree DISABLED_DrawTree |
322 #define MAYBE_Hierarchy Hierarchy | 322 #define MAYBE_Hierarchy Hierarchy |
323 #define MAYBE_HierarchyNoTexture HierarchyNoTexture | 323 #define MAYBE_HierarchyNoTexture DISABLED_HierarchyNoTexture |
324 #define MAYBE_DrawPixels DrawPixels | 324 #define MAYBE_DrawPixels DrawPixels |
325 #define MAYBE_SetRootLayer SetRootLayer | 325 #define MAYBE_SetRootLayer SetRootLayer |
326 #define MAYBE_CompositorObservers CompositorObservers | 326 #define MAYBE_CompositorObservers DISABLED_CompositorObservers |
327 #define MAYBE_ModifyHierarchy ModifyHierarchy | 327 #define MAYBE_ModifyHierarchy ModifyHierarchy |
328 #define MAYBE_Opacity Opacity | 328 #define MAYBE_Opacity Opacity |
329 #endif | 329 #endif |
330 | 330 |
331 TEST_F(LayerWithRealCompositorTest, MAYBE_Draw) { | 331 TEST_F(LayerWithRealCompositorTest, MAYBE_Draw) { |
332 scoped_ptr<Layer> layer(CreateColorLayer(SK_ColorRED, | 332 scoped_ptr<Layer> layer(CreateColorLayer(SK_ColorRED, |
333 gfx::Rect(20, 20, 50, 50))); | 333 gfx::Rect(20, 20, 50, 50))); |
334 DrawTree(layer.get()); | 334 DrawTree(layer.get()); |
335 } | 335 } |
336 | 336 |
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1015 EXPECT_TRUE(schedule_draw_invoked_); | 1015 EXPECT_TRUE(schedule_draw_invoked_); |
1016 // Because SchedulePaint() was invoked from OnPaintLayer() |child| should | 1016 // Because SchedulePaint() was invoked from OnPaintLayer() |child| should |
1017 // still need to be painted. | 1017 // still need to be painted. |
1018 DrawTree(root.get()); | 1018 DrawTree(root.get()); |
1019 EXPECT_EQ(1, child_delegate.GetPaintCountAndClear()); | 1019 EXPECT_EQ(1, child_delegate.GetPaintCountAndClear()); |
1020 EXPECT_TRUE(child_delegate.last_clip_rect().Contains( | 1020 EXPECT_TRUE(child_delegate.last_clip_rect().Contains( |
1021 gfx::Rect(10, 10, 30, 30))); | 1021 gfx::Rect(10, 10, 30, 30))); |
1022 } | 1022 } |
1023 | 1023 |
1024 } // namespace ui | 1024 } // namespace ui |
OLD | NEW |