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

Unified Diff: ui/compositor/layer_unittest.cc

Issue 10454107: Revert 139494 - ash: Improved window maximize/restore animations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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/layer_animation_observer.h ('k') | ui/gfx/transform.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer_unittest.cc
===================================================================
--- ui/compositor/layer_unittest.cc (revision 139956)
+++ ui/compositor/layer_unittest.cc (working copy)
@@ -309,15 +309,13 @@
// Remembers if it has been notified.
class TestCompositorObserver : public CompositorObserver {
public:
- TestCompositorObserver() : started_(false), ended_(false), aborted_(false) {}
+ TestCompositorObserver() : started_(false), ended_(false) {}
bool notified() const { return started_ && ended_; }
- bool aborted() const { return aborted_; }
void Reset() {
started_ = false;
ended_ = false;
- aborted_ = false;
}
private:
@@ -329,13 +327,8 @@
ended_ = true;
}
- virtual void OnCompositingAborted(Compositor* compositor) OVERRIDE {
- aborted_ = true;
- }
-
bool started_;
bool ended_;
- bool aborted_;
DISALLOW_COPY_AND_ASSIGN(TestCompositorObserver);
};
@@ -893,15 +886,6 @@
RunPendingMessages();
EXPECT_TRUE(observer.notified());
- // A change resulting in an aborted swap buffer should alert the observer
- // and also signal an abort.
- observer.Reset();
- l2->SetOpacity(0.1f);
- GetCompositor()->OnSwapBuffersAborted();
- RunPendingMessages();
- EXPECT_TRUE(observer.notified());
- EXPECT_TRUE(observer.aborted());
-
GetCompositor()->RemoveObserver(&observer);
// Opacity changes should no longer alert the removed observer.
« no previous file with comments | « ui/compositor/layer_animation_observer.h ('k') | ui/gfx/transform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698