Changeset 231940 in webkit

Timestamp:

May 17, 2018 8:29:19 PM (6 years ago)

Author:

ddkilzer@apple.com

Message:

Lazily create WebCore::Timer for WebCore::Image
<​https://webkit.org/b/185752>

Reviewed by Simon Fraser.

Not every image is an animated image, so lazily creating
m_animationStartTimer saves 64 bytes per instance of
WebCore::Image.

• platform/graphics/Image.cpp:

(WebCore::Image::Image): Remove default initializer for
m_animationStartTimer.
(WebCore::Image::startAnimationAsynchronously): Initialize
m_animationStartTimer if it's not already created.

• platform/graphics/Image.h:

(WebCore::Image::animationPending const): Update to check if
m_animationStartTimer has been set before dereferencing it.
(WebCore::Image::m_animationStartTimer): Change type to
std::unique_ptr<Timer>.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-17  David Kilzer  <ddkilzer@apple.com>
+
+        Lazily create WebCore::Timer for WebCore::Image
+        <https://webkit.org/b/185752>
+
+        Reviewed by Simon Fraser.
+
+        Not every image is an animated image, so lazily creating
+        m_animationStartTimer saves 64 bytes per instance of
+        WebCore::Image.
+
+        * platform/graphics/Image.cpp:
+        (WebCore::Image::Image): Remove default initializer for
+        m_animationStartTimer.
+        (WebCore::Image::startAnimationAsynchronously): Initialize
+        m_animationStartTimer if it's not already created.
+        * platform/graphics/Image.h:
+        (WebCore::Image::animationPending const): Update to check if
+        m_animationStartTimer has been set before dereferencing it.
+        (WebCore::Image::m_animationStartTimer): Change type to
+        std::unique_ptr<Timer>.
+
 2018-05-17  Nan Wang  <n_wang@apple.com>
 

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

@@ -51 +51 @@
 Image::Image(ImageObserver* observer)
     : m_imageObserver(observer)
-    , m_animationStartTimer(*this, &Image::startAnimation)
 {
 }
@@ -350 +349 @@
 void Image::startAnimationAsynchronously()
 {
-    if (m_animationStartTimer.isActive())
+    if (!m_animationStartTimer)
+        m_animationStartTimer = std::make_unique<Timer>(*this, &Image::startAnimation);
+    if (m_animationStartTimer->isActive())
         return;
-    m_animationStartTimer.startOneShot(0_s);
+    m_animationStartTimer->startOneShot(0_s);
 }
 

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

@@ -139 +139 @@
     virtual void resetAnimation() {}
     virtual bool isAnimating() const { return false; }
-    bool animationPending() const { return m_animationStartTimer.isActive(); }
+    bool animationPending() const { return m_animationStartTimer && m_animationStartTimer->isActive(); }
 
     // Typically the CachedImage that owns us.
@@ -201 +201 @@
     RefPtr<SharedBuffer> m_encodedImageData;
     ImageObserver* m_imageObserver;
-    Timer m_animationStartTimer;
+    std::unique_ptr<Timer> m_animationStartTimer;
 };