Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(979)

Unified Diff: ui/compositor/compositor_unittest.cc

Issue 2815073002: Revert of Remove CompositorObserver::OnCompositingEnded() (Closed)
Patch Set: Fix CompositorObservers test Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/compositor/compositor_observer.h ('k') | ui/compositor/layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/compositor_unittest.cc
diff --git a/ui/compositor/compositor_unittest.cc b/ui/compositor/compositor_unittest.cc
index 03e93fbd0e8414741c2f3cc787058a9919958d3e..7115bd43caf66883a5cdc62c7acc543005ccc1ad 100644
--- a/ui/compositor/compositor_unittest.cc
+++ b/ui/compositor/compositor_unittest.cc
@@ -95,6 +95,7 @@ class CompositorObserverForLocks : public CompositorObserver {
void OnCompositingDidCommit(Compositor* compositor) override {}
void OnCompositingStarted(Compositor* compositor,
base::TimeTicks start_time) override {}
+ void OnCompositingEnded(Compositor* compositor) override {}
void OnCompositingLockStateChanged(Compositor* compositor) override {
changed_ = true;
locked_ = compositor->IsLocked();
@@ -330,14 +331,14 @@ TEST_F(CompositorTestWithMessageLoop, MAYBE_CreateAndReleaseOutputSurface) {
compositor()->SetScaleAndSize(1.0f, gfx::Size(10, 10));
DCHECK(compositor()->IsVisible());
compositor()->ScheduleDraw();
- DrawWaiterForTest::WaitForCompositingStarted(compositor());
+ DrawWaiterForTest::WaitForCompositingEnded(compositor());
compositor()->SetVisible(false);
EXPECT_EQ(gfx::kNullAcceleratedWidget,
compositor()->ReleaseAcceleratedWidget());
compositor()->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
compositor()->SetVisible(true);
compositor()->ScheduleDraw();
- DrawWaiterForTest::WaitForCompositingStarted(compositor());
+ DrawWaiterForTest::WaitForCompositingEnded(compositor());
compositor()->SetRootLayer(nullptr);
}
« no previous file with comments | « ui/compositor/compositor_observer.h ('k') | ui/compositor/layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698