Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 "cc/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/synchronization/lock.h" | 10 #include "base/synchronization/lock.h" |
| (...skipping 5564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5575 context3d->set_support_image(true); | 5575 context3d->set_support_image(true); |
| 5576 context3d->set_support_sync_query(true); | 5576 context3d->set_support_sync_query(true); |
| 5577 | 5577 |
| 5578 if (delegating_renderer()) | 5578 if (delegating_renderer()) |
| 5579 return FakeOutputSurface::CreateDelegating3d(context3d.Pass()); | 5579 return FakeOutputSurface::CreateDelegating3d(context3d.Pass()); |
| 5580 else | 5580 else |
| 5581 return FakeOutputSurface::Create3d(context3d.Pass()); | 5581 return FakeOutputSurface::Create3d(context3d.Pass()); |
| 5582 } | 5582 } |
| 5583 }; | 5583 }; |
| 5584 | 5584 |
| 5585 // TODO(danakj): Disabled for flake: crbug.com/433208 | |
| 5586 #if !defined(OS_LINUX) || defined(NDEBUG) | |
|
danakj
2014/11/17 16:03:06
We could just disable it entirely, the flake is no
| |
| 5585 MULTI_THREAD_TEST_F(LayerTreeHostTestCrispUpAfterPinchEndsWithOneCopy); | 5587 MULTI_THREAD_TEST_F(LayerTreeHostTestCrispUpAfterPinchEndsWithOneCopy); |
| 5588 #endif | |
| 5586 | 5589 |
| 5587 class LayerTreeHostTestContinuousDrawWhenCreatingVisibleTiles | 5590 class LayerTreeHostTestContinuousDrawWhenCreatingVisibleTiles |
| 5588 : public LayerTreeHostTest { | 5591 : public LayerTreeHostTest { |
| 5589 protected: | 5592 protected: |
| 5590 LayerTreeHostTestContinuousDrawWhenCreatingVisibleTiles() | 5593 LayerTreeHostTestContinuousDrawWhenCreatingVisibleTiles() |
| 5591 : playback_allowed_event_(true, true) {} | 5594 : playback_allowed_event_(true, true) {} |
| 5592 | 5595 |
| 5593 void InitializeSettings(LayerTreeSettings* settings) override { | 5596 void InitializeSettings(LayerTreeSettings* settings) override { |
| 5594 settings->impl_side_painting = true; | 5597 settings->impl_side_painting = true; |
| 5595 } | 5598 } |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5730 | 5733 |
| 5731 FakeContentLayerClient client_; | 5734 FakeContentLayerClient client_; |
| 5732 int step_; | 5735 int step_; |
| 5733 int continuous_draws_; | 5736 int continuous_draws_; |
| 5734 base::WaitableEvent playback_allowed_event_; | 5737 base::WaitableEvent playback_allowed_event_; |
| 5735 }; | 5738 }; |
| 5736 | 5739 |
| 5737 MULTI_THREAD_TEST_F(LayerTreeHostTestContinuousDrawWhenCreatingVisibleTiles); | 5740 MULTI_THREAD_TEST_F(LayerTreeHostTestContinuousDrawWhenCreatingVisibleTiles); |
| 5738 | 5741 |
| 5739 } // namespace cc | 5742 } // namespace cc |
| OLD | NEW |