Changeset 161971 in webkit

Timestamp:

Jan 14, 2014 8:29:51 AM (10 years ago)

Author:

akling@apple.com

Message:

Remove deprecated DeferrableOneShotTimer constructor.
<​https://webkit.org/b/126984>

Source/WebCore:

Remove the deprecated constructor for callback functions that take
the timer by pointer instead of by reference.

This shrinks DeferrableOneShotTimer by 8 bytes.

Reviewed by Anders Carlsson.

• platform/Timer.h:

(WebCore::DeferrableOneShotTimer::DeferrableOneShotTimer):

Source/WebKit2:

Reviewed by Anders Carlsson.

• WebProcess/Plugins/PluginView.h:
• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::pluginSnapshotTimerFired):

Take the timer by reference so we can use the new constructor.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/Timer.h (modified) (3 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PluginView.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-14  Andreas Kling  <akling@apple.com>
+
+        Remove deprecated DeferrableOneShotTimer constructor.
+        <https://webkit.org/b/126984>
+
+        Remove the deprecated constructor for callback functions that take
+        the timer by pointer instead of by reference.
+
+        This shrinks DeferrableOneShotTimer by 8 bytes.
+
+        Reviewed by Anders Carlsson.
+
+        * platform/Timer.h:
+        (WebCore::DeferrableOneShotTimer::DeferrableOneShotTimer):
+
 2014-01-14  Dirk Schulze  <krit@webkit.org>
 

trunk/Source/WebCore/platform/Timer.h

@@ -154 +154 @@
 public:
     typedef void (TimerFiredClass::*TimerFiredFunction)(DeferrableOneShotTimer&);
-    typedef void (TimerFiredClass::*DeprecatedTimerFiredFunction)(DeferrableOneShotTimer*);
 
     DeferrableOneShotTimer(TimerFiredClass* object, TimerFiredFunction function, double delay)
         : m_object(object)
         , m_function(function)
-        , m_deprecatedFunction(nullptr)
-        , m_delay(delay)
-        , m_shouldRestartWhenTimerFires(false)
-    {
-    }
-
-    DeferrableOneShotTimer(TimerFiredClass* object, DeprecatedTimerFiredFunction function, double delay)
-        : m_object(object)
-        , m_function(nullptr)
-        , m_deprecatedFunction(function)
         , m_delay(delay)
         , m_shouldRestartWhenTimerFires(false)
@@ -204 +193 @@
         }
 
-        if (m_deprecatedFunction) {
-            (m_object->*m_deprecatedFunction)(this);
-            return;
-        }
-
         (m_object->*m_function)(*this);
     }
@@ -214 +198 @@
     TimerFiredClass* m_object;
     TimerFiredFunction m_function;
-    DeprecatedTimerFiredFunction m_deprecatedFunction;
 
     double m_delay;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-14  Andreas Kling  <akling@apple.com>
+
+        Remove deprecated DeferrableOneShotTimer constructor.
+        <https://webkit.org/b/126984>
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/Plugins/PluginView.h:
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::pluginSnapshotTimerFired):
+
+            Take the timer by reference so we can use the new constructor.
+
 2014-01-13  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -1674 +1674 @@
 #endif
 
-void PluginView::pluginSnapshotTimerFired(DeferrableOneShotTimer<PluginView>*)
+void PluginView::pluginSnapshotTimerFired(DeferrableOneShotTimer<PluginView>&)
 {
     ASSERT(m_plugin);

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h

@@ -137 +137 @@
     void redeliverManualStream();
 
-    void pluginSnapshotTimerFired(WebCore::DeferrableOneShotTimer<PluginView>*);
+    void pluginSnapshotTimerFired(WebCore::DeferrableOneShotTimer<PluginView>&);
     void pluginDidReceiveUserInteraction();