Changeset 167356 in webkit

Timestamp:

Apr 16, 2014 10:50:57 AM (10 years ago)

Author:

Simon Fraser

Message:

Convert the boolean param of Image::startAnimation() to an enum
​https://bugs.webkit.org/show_bug.cgi?id=131742

Reviewed by Tim Horton.

Use an enum to make the code more readable.

• platform/graphics/BitmapImage.cpp:

(WebCore::BitmapImage::startAnimation):

• platform/graphics/BitmapImage.h:
• platform/graphics/Image.cpp:

(WebCore::Image::drawTiled):

• platform/graphics/Image.h:

(WebCore::Image::startAnimation):

• svg/graphics/SVGImage.cpp:

(WebCore::SVGImage::startAnimation):

• svg/graphics/SVGImage.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/BitmapImage.cpp (modified) (3 diffs)
• platform/graphics/BitmapImage.h (modified) (1 diff)
• platform/graphics/Image.cpp (modified) (2 diffs)
• platform/graphics/Image.h (modified) (1 diff)
• svg/graphics/SVGImage.cpp (modified) (1 diff)
• svg/graphics/SVGImage.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Convert the boolean param of Image::startAnimation() to an enum
+        https://bugs.webkit.org/show_bug.cgi?id=131742
+
+        Reviewed by Tim Horton.
+
+        Use an enum to make the code more readable.
+
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::startAnimation):
+        * platform/graphics/BitmapImage.h:
+        * platform/graphics/Image.cpp:
+        (WebCore::Image::drawTiled):
+        * platform/graphics/Image.h:
+        (WebCore::Image::startAnimation):
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::startAnimation):
+        * svg/graphics/SVGImage.h:
+
 2014-04-16  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/platform/graphics/BitmapImage.cpp

@@ -540 +540 @@
 }
 
-void BitmapImage::startAnimation(bool catchUpIfNecessary)
+void BitmapImage::startAnimation(CatchUpAnimation catchUpIfNecessary)
 {
     if (m_frameTimer || !shouldAnimate() || frameCount() <= 1)
@@ -594 +594 @@
         m_desiredFrameStartTime = time;
 
-    if (!catchUpIfNecessary || time < m_desiredFrameStartTime) {
+    if (catchUpIfNecessary == DoNotCatchUp || time < m_desiredFrameStartTime) {
         // Haven't yet reached time for next frame to start; delay until then.
         m_frameTimer = std::make_unique<Timer<BitmapImage>>(this, &BitmapImage::advanceAnimation);
@@ -637 +637 @@
             // as possible, so force startAnimation() to set a zero-delay timer
             // and bail out if we're not caught up.
-            startAnimation(false);
+            startAnimation(DoNotCatchUp);
         }
     }

trunk/Source/WebCore/platform/graphics/BitmapImage.h

@@ -273 +273 @@
     int repetitionCount(bool imageKnownToBeComplete);  // |imageKnownToBeComplete| should be set if the caller knows the entire image has been decoded.
     bool shouldAnimate();
-    virtual void startAnimation(bool catchUpIfNecessary = true) override;
+    virtual void startAnimation(CatchUpAnimation = CatchUp) override;
     void advanceAnimation(Timer<BitmapImage>&);
 

trunk/Source/WebCore/platform/graphics/Image.cpp

@@ -186 +186 @@
 
 #if PLATFORM(IOS)
-    startAnimation(false);
+    startAnimation(DoNotCatchUp);
 #else
     startAnimation();
@@ -224 +224 @@
 
 #if PLATFORM(IOS)
-    startAnimation(false);
+    startAnimation(DoNotCatchUp);
 #else
     startAnimation();

trunk/Source/WebCore/platform/graphics/Image.h

@@ -116 +116 @@
     // Animation begins whenever someone draws the image, so startAnimation() is not normally called.
     // It will automatically pause once all observers no longer want to render the image anywhere.
-    virtual void startAnimation(bool /*catchUpIfNecessary*/ = true) { }
+    enum CatchUpAnimation { DoNotCatchUp, CatchUp };
+    virtual void startAnimation(CatchUpAnimation = CatchUp) { }
     virtual void stopAnimation() {}
     virtual void resetAnimation() {}

trunk/Source/WebCore/svg/graphics/SVGImage.cpp

@@ -317 +317 @@
 
 // FIXME: support catchUpIfNecessary.
-void SVGImage::startAnimation(bool /* catchUpIfNecessary */)
+void SVGImage::startAnimation(CatchUpAnimation)
 {
     if (!m_page)

trunk/Source/WebCore/svg/graphics/SVGImage.h

@@ -61 +61 @@
     virtual bool hasRelativeHeight() const override;
 
-    virtual void startAnimation(bool /*catchUpIfNecessary*/ = true) override;
+    virtual void startAnimation(CatchUpAnimation = CatchUp) override;
     virtual void stopAnimation() override;
     virtual void resetAnimation() override;