Windows build fixes.
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Nov 2014 20:37:21 +0000 (20:37 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Nov 2014 20:37:21 +0000 (20:37 +0000)
* 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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@176464 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/plugins/PluginPackage.cpp
Source/WebCore/plugins/PluginPackage.h
Source/WebCore/plugins/PluginStream.cpp
Source/WebCore/plugins/PluginStream.h
Source/WebCore/plugins/PluginView.cpp
Source/WebCore/plugins/PluginView.h
Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp
Source/WebCore/plugins/win/PluginMessageThrottlerWin.h

index ddd7b89..4719eda 100644 (file)
@@ -1,3 +1,32 @@
+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>
 
         REGRESSION (r176351): Parts of apple.com/contact aren't Lookup-able
index 48decaf..20a234f 100644 (file)
@@ -63,7 +63,7 @@ void PluginPackage::freeLibrarySoon()
     m_freeLibraryTimer.startOneShot(0);
 }
 
-void PluginPackage::freeLibraryTimerFired(Timer*)
+void PluginPackage::freeLibraryTimerFired()
 {
     ASSERT(m_module);
     // Do nothing if the module got loaded again meanwhile
@@ -107,7 +107,7 @@ PluginPackage::PluginPackage(const String& path, const time_t& lastModified)
     , m_moduleVersion(0)
     , 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)
 #endif
index aefbb1f..2834057 100644 (file)
@@ -120,7 +120,7 @@ namespace WebCore {
 #endif
 
         void freeLibrarySoon();
-        void freeLibraryTimerFired(Timer*);
+        void freeLibraryTimerFired();
         Timer m_freeLibraryTimer;
 
         PluginQuirkSet m_quirks;
index c5b4251..a5a9120 100644 (file)
@@ -64,7 +64,7 @@ PluginStream::PluginStream(PluginStreamClient* client, Frame* frame, const Resou
     , m_sendNotification(sendNotification)
     , m_streamState(StreamBeforeStarted)
     , m_loadManually(false)
-    , m_delayDeliveryTimer(this, &PluginStream::delayDeliveryTimerFired)
+    , m_delayDeliveryTimer(*this, &PluginStream::delayDeliveryTimerFired)
     , m_tempFileHandle(invalidPlatformFileHandle)
     , m_pluginFuncs(pluginFuncs)
     , m_instance(instance)
@@ -321,10 +321,8 @@ void PluginStream::destroyStream()
         deleteFile(m_path);
 }
 
-void PluginStream::delayDeliveryTimerFired(Timer* timer)
+void PluginStream::delayDeliveryTimerFired()
 {
-    ASSERT_UNUSED(timer, timer == &m_delayDeliveryTimer);
-
     deliverData();
 }
 
index ca15003..7187273 100644 (file)
@@ -101,7 +101,7 @@ namespace WebCore {
         bool m_loadManually;
 
         Timer m_delayDeliveryTimer;
-        void delayDeliveryTimerFired(Timer*);
+        void delayDeliveryTimerFired();
 
         OwnPtr< Vector<char> > m_deliveryData;
 
index 6e13721..8eb225c 100644 (file)
@@ -115,7 +115,7 @@ static String scriptStringIfJavaScriptURL(const URL& url)
 
 PluginView* PluginView::s_currentPluginView = 0;
 
-void PluginView::popPopupsStateTimerFired(Timer*)
+void PluginView::popPopupsStateTimerFired()
 {
     popPopupsEnabledState();
 }
@@ -479,9 +479,8 @@ void PluginView::performRequest(PluginRequest* request)
     }
 }
 
-void PluginView::requestTimerFired(Timer* timer)
+void PluginView::requestTimerFired()
 {
-    ASSERT_UNUSED(timer, timer == &m_requestTimer);
     ASSERT(!m_requests.isEmpty());
     ASSERT(!m_isJavaScriptPaused);
 
@@ -664,10 +663,8 @@ NPError PluginView::setValue(NPPVariable variable, void* value)
     }
 }
 
-void PluginView::invalidateTimerFired(Timer* timer)
+void PluginView::invalidateTimerFired()
 {
-    ASSERT_UNUSED(timer, timer == &m_invalidateTimer);
-
     for (unsigned i = 0; i < m_invalidRects.size(); i++)
         invalidateRect(m_invalidRects[i]);
     m_invalidRects.clear();
@@ -799,10 +796,10 @@ PluginView::PluginView(Frame* parentFrame, const IntSize& size, PluginPackage* p
     , m_isStarted(false)
     , 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)
     , m_paramValues(0)
@@ -1264,7 +1261,7 @@ const char* PluginView::userAgentStatic()
 #endif
 
 
-void PluginView::lifeSupportTimerFired(Timer*)
+void PluginView::lifeSupportTimerFired()
 {
     deref();
 }
index b297634..e86bb9d 100644 (file)
@@ -288,15 +288,15 @@ namespace WebCore {
 
         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;
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
index e56e39e..a53c315 100644 (file)
@@ -48,7 +48,7 @@ PluginMessageThrottlerWin::PluginMessageThrottlerWin(PluginView* pluginView)
     : m_pluginView(pluginView)
     , m_back(0)
     , m_front(0)
-    , m_messageThrottleTimer(this, &PluginMessageThrottlerWin::messageThrottleTimerFired)
+    , m_messageThrottleTimer(*this, &PluginMessageThrottlerWin::messageThrottleTimerFired)
     , m_lastMessageTime(0)
 {
     // Initialize the free list with our inline messages
@@ -113,7 +113,7 @@ void PluginMessageThrottlerWin::processQueuedMessage()
     freeMessage(message);
 }
 
-void PluginMessageThrottlerWin::messageThrottleTimerFired(Timer*)
+void PluginMessageThrottlerWin::messageThrottleTimerFired()
 {
     processQueuedMessage();
 
index 8fdd17c..7c51030 100644 (file)
@@ -52,7 +52,7 @@ namespace WebCore {
 
     private:
         void processQueuedMessage();
-        void messageThrottleTimerFired(Timer*);
+        void messageThrottleTimerFired();
         PluginMessage* allocateMessage();
         bool isInlineMessage(PluginMessage* message);
         void freeMessage(PluginMessage* message);