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

Unified Diff: chrome/browser/ui/cocoa/sprite_view_unittest.mm

Issue 1052973004: Stop SpriteView animation when window is miniaturized. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
Index: chrome/browser/ui/cocoa/sprite_view_unittest.mm
diff --git a/chrome/browser/ui/cocoa/sprite_view_unittest.mm b/chrome/browser/ui/cocoa/sprite_view_unittest.mm
index be68f19e80ae71cdfcd4bcd81c057d3cfabe8ee6..b0566f5c6bd58004f4749a74b9055e265019b968 100644
--- a/chrome/browser/ui/cocoa/sprite_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/sprite_view_unittest.mm
@@ -13,6 +13,20 @@
#include "ui/gfx/image/image.h"
#include "ui/resources/grit/ui_resources.h"
+@interface SpriteView (ExposedForTesting)
+
+- (BOOL)isAnimating;
+
+@end
+
+@implementation SpriteView (ExposedForTesting)
+
+- (BOOL)isAnimating {
+ return [imageLayer_ animationForKey:[spriteAnimation_ keyPath]] != nil;
+}
+
+@end
+
namespace {
class SpriteViewTest : public CocoaTest {
@@ -41,4 +55,25 @@ TEST_F(SpriteViewTest, TestViewFrame) {
EXPECT_EQ(imageSize.height, NSHeight(frame));
}
+TEST_F(SpriteViewTest, StopAnimationOnMiniaturize) {
+ EXPECT_TRUE([view_ isAnimating]);
+
+ [test_window() miniaturize:nil];
+ EXPECT_FALSE([view_ isAnimating]);
+
+ [test_window() deminiaturize:nil];
+ EXPECT_TRUE([view_ isAnimating]);
+}
+
+TEST_F(SpriteViewTest,
+ StopAnimationOnRemoveFromSuperview) {
+ EXPECT_TRUE([view_ isAnimating]);
+
+ [view_ removeFromSuperview];
+ EXPECT_FALSE([view_ isAnimating]);
+
+ [[test_window() contentView] addSubview:view_];
+ EXPECT_TRUE([view_ isAnimating]);
+}
+
} // namespace
« chrome/browser/ui/cocoa/sprite_view.mm ('K') | « chrome/browser/ui/cocoa/sprite_view.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698