Changeset 176464 in webkit

Timestamp:

Nov 21, 2014, 12:37:21 PM (12 years ago)

Author:

andersca@apple.com

Message:

Windows build fixes.

• plugins/PluginPackage.cpp:

(WebCore::PluginPackage::freeLibraryTimerFired):
(WebCore::PluginPackage::PluginPackage):

• plugins/PluginPackage.h:
• plugins/PluginStream.cpp:

(WebCore::PluginStream::PluginStream):
(WebCore::PluginStream::delayDeliveryTimerFired):
(WebCore::PluginStream::deliverData): Deleted.

• plugins/PluginStream.h:
• plugins/PluginView.cpp:

(WebCore::PluginView::popPopupsStateTimerFired):
(WebCore::PluginView::requestTimerFired):
(WebCore::PluginView::invalidateTimerFired):
(WebCore::PluginView::PluginView):
(WebCore::PluginView::lifeSupportTimerFired):
(WebCore::PluginView::performRequest): Deleted.
(WebCore::PluginView::setValue): Deleted.
(WebCore::PluginView::setParameters): Deleted.
(WebCore::PluginView::userAgent): Deleted.

• plugins/PluginView.h:
• plugins/win/PluginMessageThrottlerWin.cpp:

(WebCore::PluginMessageThrottlerWin::PluginMessageThrottlerWin):
(WebCore::PluginMessageThrottlerWin::messageThrottleTimerFired):

• plugins/win/PluginMessageThrottlerWin.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/PluginPackage.cpp (modified) (2 diffs)
• plugins/PluginPackage.h (modified) (1 diff)
• plugins/PluginStream.cpp (modified) (2 diffs)
• plugins/PluginStream.h (modified) (1 diff)
• plugins/PluginView.cpp (modified) (5 diffs)
• plugins/PluginView.h (modified) (1 diff)
• plugins/win/PluginMessageThrottlerWin.cpp (modified) (2 diffs)
• plugins/win/PluginMessageThrottlerWin.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-21  Anders Carlsson  <andersca@apple.com>
+
+        Windows build fixes.
+
+        * plugins/PluginPackage.cpp:
+        (WebCore::PluginPackage::freeLibraryTimerFired):
+        (WebCore::PluginPackage::PluginPackage):
+        * plugins/PluginPackage.h:
+        * plugins/PluginStream.cpp:
+        (WebCore::PluginStream::PluginStream):
+        (WebCore::PluginStream::delayDeliveryTimerFired):
+        (WebCore::PluginStream::deliverData): Deleted.
+        * plugins/PluginStream.h:
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::popPopupsStateTimerFired):
+        (WebCore::PluginView::requestTimerFired):
+        (WebCore::PluginView::invalidateTimerFired):
+        (WebCore::PluginView::PluginView):
+        (WebCore::PluginView::lifeSupportTimerFired):
+        (WebCore::PluginView::performRequest): Deleted.
+        (WebCore::PluginView::setValue): Deleted.
+        (WebCore::PluginView::setParameters): Deleted.
+        (WebCore::PluginView::userAgent): Deleted.
+        * plugins/PluginView.h:
+        * plugins/win/PluginMessageThrottlerWin.cpp:
+        (WebCore::PluginMessageThrottlerWin::PluginMessageThrottlerWin):
+        (WebCore::PluginMessageThrottlerWin::messageThrottleTimerFired):
+        * plugins/win/PluginMessageThrottlerWin.h:
+
 2014-11-21  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/plugins/PluginPackage.cpp

@@ -64 +64 @@
 }
 
-void PluginPackage::freeLibraryTimerFired(Timer*)
+void PluginPackage::freeLibraryTimerFired()
 {
     ASSERT(m_module);
@@ -108 +108 @@
     , m_module(0)
     , m_lastModified(lastModified)
-    , m_freeLibraryTimer(this, &PluginPackage::freeLibraryTimerFired)
+    , m_freeLibraryTimer(*this, &PluginPackage::freeLibraryTimerFired)
 #if ENABLE(NETSCAPE_PLUGIN_METADATA_CACHE)
     , m_infoIsFromCache(true)

trunk/Source/WebCore/plugins/PluginPackage.h

@@ -121 +121 @@
 
         void freeLibrarySoon();
-        void freeLibraryTimerFired(Timer*);
+        void freeLibraryTimerFired();
         Timer m_freeLibraryTimer;
 

trunk/Source/WebCore/plugins/PluginStream.cpp

@@ -65 +65 @@
     , m_streamState(StreamBeforeStarted)
     , m_loadManually(false)
-    , m_delayDeliveryTimer(this, &PluginStream::delayDeliveryTimerFired)
+    , m_delayDeliveryTimer(*this, &PluginStream::delayDeliveryTimerFired)
     , m_tempFileHandle(invalidPlatformFileHandle)
     , m_pluginFuncs(pluginFuncs)
@@ -322 +322 @@
 }
 
-void PluginStream::delayDeliveryTimerFired(Timer* timer)
-{
-    ASSERT_UNUSED(timer, timer == &m_delayDeliveryTimer);
-
+void PluginStream::delayDeliveryTimerFired()
+{
     deliverData();
 }

trunk/Source/WebCore/plugins/PluginStream.h

@@ -102 +102 @@
 
         Timer m_delayDeliveryTimer;
-        void delayDeliveryTimerFired(Timer*);
+        void delayDeliveryTimerFired();
 
         OwnPtr< Vector<char> > m_deliveryData;

trunk/Source/WebCore/plugins/PluginView.cpp

@@ -116 +116 @@
 PluginView* PluginView::s_currentPluginView = 0;
 
-void PluginView::popPopupsStateTimerFired(Timer*)
+void PluginView::popPopupsStateTimerFired()
 {
     popPopupsEnabledState();
@@ -480 +480 @@
 }
 
-void PluginView::requestTimerFired(Timer* timer)
-{
-    ASSERT_UNUSED(timer, timer == &m_requestTimer);
+void PluginView::requestTimerFired()
+{
     ASSERT(!m_requests.isEmpty());
     ASSERT(!m_isJavaScriptPaused);
@@ -665 +664 @@
 }
 
-void PluginView::invalidateTimerFired(Timer* timer)
-{
-    ASSERT_UNUSED(timer, timer == &m_invalidateTimer);
-
+void PluginView::invalidateTimerFired()
+{
     for (unsigned i = 0; i < m_invalidRects.size(); i++)
         invalidateRect(m_invalidRects[i]);
@@ -800 +797 @@
     , m_url(url)
     , m_status(PluginStatusLoadedSuccessfully)
-    , m_requestTimer(this, &PluginView::requestTimerFired)
-    , m_invalidateTimer(this, &PluginView::invalidateTimerFired)
-    , m_popPopupsStateTimer(this, &PluginView::popPopupsStateTimerFired)
-    , m_lifeSupportTimer(this, &PluginView::lifeSupportTimerFired)
+    , m_requestTimer(*this, &PluginView::requestTimerFired)
+    , m_invalidateTimer(*this, &PluginView::invalidateTimerFired)
+    , m_popPopupsStateTimer(*this, &PluginView::popPopupsStateTimerFired)
+    , m_lifeSupportTimer(*this, &PluginView::lifeSupportTimerFired)
     , m_mode(loadManually ? NP_FULL : NP_EMBED)
     , m_paramNames(0)
@@ -1265 +1262 @@
 
 
-void PluginView::lifeSupportTimerFired(Timer*)
+void PluginView::lifeSupportTimerFired()
 {
     deref();

trunk/Source/WebCore/plugins/PluginView.h

@@ -289 +289 @@
         void performRequest(PluginRequest*);
         void scheduleRequest(std::unique_ptr<PluginRequest>);
-        void requestTimerFired(Timer*);
-        void invalidateTimerFired(Timer*);
+        void requestTimerFired();
+        void invalidateTimerFired();
         Timer m_requestTimer;
         Timer m_invalidateTimer;
 
-        void popPopupsStateTimerFired(Timer*);
+        void popPopupsStateTimerFired();
         Timer m_popPopupsStateTimer;
 
-        void lifeSupportTimerFired(Timer*);
+        void lifeSupportTimerFired();
         Timer m_lifeSupportTimer;
 

trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp

@@ -49 +49 @@
     , m_back(0)
     , m_front(0)
-    , m_messageThrottleTimer(this, &PluginMessageThrottlerWin::messageThrottleTimerFired)
+    , m_messageThrottleTimer(*this, &PluginMessageThrottlerWin::messageThrottleTimerFired)
     , m_lastMessageTime(0)
 {
@@ -114 +114 @@
 }
 
-void PluginMessageThrottlerWin::messageThrottleTimerFired(Timer*)
+void PluginMessageThrottlerWin::messageThrottleTimerFired()
 {
     processQueuedMessage();

trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.h

@@ -53 +53 @@
     private:
         void processQueuedMessage();
-        void messageThrottleTimerFired(Timer*);
+        void messageThrottleTimerFired();
         PluginMessage* allocateMessage();
         bool isInlineMessage(PluginMessage* message);