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

Unified Diff: ash/mus/non_client_frame_controller_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 | « no previous file | content/browser/renderer_host/browser_compositor_view_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/non_client_frame_controller_unittest.cc
diff --git a/ash/mus/non_client_frame_controller_unittest.cc b/ash/mus/non_client_frame_controller_unittest.cc
index 938f2342e663fe2a34425b8d1c5dad796e3099cf..8357e3f9c261fc595519b23ee293a663e46a5983 100644
--- a/ash/mus/non_client_frame_controller_unittest.cc
+++ b/ash/mus/non_client_frame_controller_unittest.cc
@@ -120,7 +120,7 @@ TEST_F(NonClientFrameControllerTest, ContentRegionNotDrawnForClient) {
// Without the window visible, there should be a tile for the wallpaper at
// (tile_x, tile_y) of size |tile_size|.
compositor->ScheduleDraw();
- ui::DrawWaiterForTest::WaitForCompositingStarted(compositor);
+ ui::DrawWaiterForTest::WaitForCompositingEnded(compositor);
{
const cc::CompositorFrame& frame = GetLastCompositorFrame();
ASSERT_EQ(1u, frame.render_pass_list.size());
@@ -133,7 +133,7 @@ TEST_F(NonClientFrameControllerTest, ContentRegionNotDrawnForClient) {
widget->SetBounds(widget_bound);
widget->Show();
compositor->ScheduleDraw();
- ui::DrawWaiterForTest::WaitForCompositingStarted(compositor);
+ ui::DrawWaiterForTest::WaitForCompositingEnded(compositor);
{
// This time, that tile for the wallpaper will not be drawn.
const cc::CompositorFrame& frame = GetLastCompositorFrame();
« no previous file with comments | « no previous file | content/browser/renderer_host/browser_compositor_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698