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

Side by Side Diff: ui/views/controls/scroll_view_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 unified diff | Download patch
« no previous file with comments | « ui/snapshot/snapshot_aura_unittest.cc ('k') | ui/views/view_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ui/views/controls/scroll_view.h" 5 #include "ui/views/controls/scroll_view.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/test/test_timeouts.h" 10 #include "base/test/test_timeouts.h"
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 } 261 }
262 262
263 private: 263 private:
264 // ui::CompositorObserver: 264 // ui::CompositorObserver:
265 void OnCompositingDidCommit(ui::Compositor* compositor) override { 265 void OnCompositingDidCommit(ui::Compositor* compositor) override {
266 quit_closure_.Run(); 266 quit_closure_.Run();
267 quit_closure_.Reset(); 267 quit_closure_.Reset();
268 } 268 }
269 void OnCompositingStarted(ui::Compositor* compositor, 269 void OnCompositingStarted(ui::Compositor* compositor,
270 base::TimeTicks start_time) override {} 270 base::TimeTicks start_time) override {}
271 void OnCompositingEnded(ui::Compositor* compositor) override {}
271 void OnCompositingLockStateChanged(ui::Compositor* compositor) override {} 272 void OnCompositingLockStateChanged(ui::Compositor* compositor) override {}
272 void OnCompositingShuttingDown(ui::Compositor* compositor) override {} 273 void OnCompositingShuttingDown(ui::Compositor* compositor) override {}
273 274
274 Widget* widget_ = nullptr; 275 Widget* widget_ = nullptr;
275 276
276 // Disable scrollbar hiding (i.e. disable overlay scrollbars) by default. 277 // Disable scrollbar hiding (i.e. disable overlay scrollbars) by default.
277 bool use_overlay_scrollers_ = false; 278 bool use_overlay_scrollers_ = false;
278 279
279 base::Closure quit_closure_; 280 base::Closure quit_closure_;
280 281
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 // Scroll via ScrollView API. Should be reflected on the impl side. 1032 // Scroll via ScrollView API. Should be reflected on the impl side.
1032 offset.set_y(kDefaultHeight * 4); 1033 offset.set_y(kDefaultHeight * 4);
1033 scroll_view->contents()->ScrollRectToVisible(offset); 1034 scroll_view->contents()->ScrollRectToVisible(offset);
1034 EXPECT_EQ(gfx::ScrollOffset(0, offset.y()), test_api.CurrentOffset()); 1035 EXPECT_EQ(gfx::ScrollOffset(0, offset.y()), test_api.CurrentOffset());
1035 1036
1036 EXPECT_TRUE(compositor->GetScrollOffsetForLayer(layer_id, &impl_offset)); 1037 EXPECT_TRUE(compositor->GetScrollOffsetForLayer(layer_id, &impl_offset));
1037 EXPECT_EQ(gfx::ScrollOffset(0, offset.y()), impl_offset); 1038 EXPECT_EQ(gfx::ScrollOffset(0, offset.y()), impl_offset);
1038 } 1039 }
1039 1040
1040 } // namespace views 1041 } // namespace views
OLDNEW
« no previous file with comments | « ui/snapshot/snapshot_aura_unittest.cc ('k') | ui/views/view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698