Diff
Modified: trunk/Source/WebCore/ChangeLog (176463 => 176464)
--- trunk/Source/WebCore/ChangeLog 2014-11-21 20:28:15 UTC (rev 176463)
+++ trunk/Source/WebCore/ChangeLog 2014-11-21 20:37:21 UTC (rev 176464)
@@ -1,3 +1,32 @@
+2014-11-21 Anders Carlsson <ander...@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_hor...@apple.com>
REGRESSION (r176351): Parts of apple.com/contact aren't Lookup-able
Modified: trunk/Source/WebCore/plugins/PluginPackage.cpp (176463 => 176464)
--- trunk/Source/WebCore/plugins/PluginPackage.cpp 2014-11-21 20:28:15 UTC (rev 176463)
+++ trunk/Source/WebCore/plugins/PluginPackage.cpp 2014-11-21 20:37:21 UTC (rev 176464)
@@ -63,7 +63,7 @@
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 @@
, 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
Modified: trunk/Source/WebCore/plugins/PluginPackage.h (176463 => 176464)
--- trunk/Source/WebCore/plugins/PluginPackage.h 2014-11-21 20:28:15 UTC (rev 176463)
+++ trunk/Source/WebCore/plugins/PluginPackage.h 2014-11-21 20:37:21 UTC (rev 176464)
@@ -120,7 +120,7 @@
#endif
void freeLibrarySoon();
- void freeLibraryTimerFired(Timer*);
+ void freeLibraryTimerFired();
Timer m_freeLibraryTimer;
PluginQuirkSet m_quirks;
Modified: trunk/Source/WebCore/plugins/PluginStream.cpp (176463 => 176464)
--- trunk/Source/WebCore/plugins/PluginStream.cpp 2014-11-21 20:28:15 UTC (rev 176463)
+++ trunk/Source/WebCore/plugins/PluginStream.cpp 2014-11-21 20:37:21 UTC (rev 176464)
@@ -64,7 +64,7 @@
, 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 @@
deleteFile(m_path);
}
-void PluginStream::delayDeliveryTimerFired(Timer* timer)
+void PluginStream::delayDeliveryTimerFired()
{
- ASSERT_UNUSED(timer, timer == &m_delayDeliveryTimer);
-
deliverData();
}
Modified: trunk/Source/WebCore/plugins/PluginStream.h (176463 => 176464)
--- trunk/Source/WebCore/plugins/PluginStream.h 2014-11-21 20:28:15 UTC (rev 176463)
+++ trunk/Source/WebCore/plugins/PluginStream.h 2014-11-21 20:37:21 UTC (rev 176464)
@@ -101,7 +101,7 @@
bool m_loadManually;
Timer m_delayDeliveryTimer;
- void delayDeliveryTimerFired(Timer*);
+ void delayDeliveryTimerFired();
OwnPtr< Vector<char> > m_deliveryData;
Modified: trunk/Source/WebCore/plugins/PluginView.cpp (176463 => 176464)
--- trunk/Source/WebCore/plugins/PluginView.cpp 2014-11-21 20:28:15 UTC (rev 176463)
+++ trunk/Source/WebCore/plugins/PluginView.cpp 2014-11-21 20:37:21 UTC (rev 176464)
@@ -115,7 +115,7 @@
PluginView* PluginView::s_currentPluginView = 0;
-void PluginView::popPopupsStateTimerFired(Timer*)
+void PluginView::popPopupsStateTimerFired()
{
popPopupsEnabledState();
}
@@ -479,9 +479,8 @@
}
}
-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 @@
}
}
-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 @@
, 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 @@
#endif
-void PluginView::lifeSupportTimerFired(Timer*)
+void PluginView::lifeSupportTimerFired()
{
deref();
}
Modified: trunk/Source/WebCore/plugins/PluginView.h (176463 => 176464)
--- trunk/Source/WebCore/plugins/PluginView.h 2014-11-21 20:28:15 UTC (rev 176463)
+++ trunk/Source/WebCore/plugins/PluginView.h 2014-11-21 20:37:21 UTC (rev 176464)
@@ -288,15 +288,15 @@
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)
Modified: trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp (176463 => 176464)
--- trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp 2014-11-21 20:28:15 UTC (rev 176463)
+++ trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp 2014-11-21 20:37:21 UTC (rev 176464)
@@ -48,7 +48,7 @@
: 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 @@
freeMessage(message);
}
-void PluginMessageThrottlerWin::messageThrottleTimerFired(Timer*)
+void PluginMessageThrottlerWin::messageThrottleTimerFired()
{
processQueuedMessage();
Modified: trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.h (176463 => 176464)
--- trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.h 2014-11-21 20:28:15 UTC (rev 176463)
+++ trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.h 2014-11-21 20:37:21 UTC (rev 176464)
@@ -52,7 +52,7 @@
private:
void processQueuedMessage();
- void messageThrottleTimerFired(Timer*);
+ void messageThrottleTimerFired();
PluginMessage* allocateMessage();
bool isInlineMessage(PluginMessage* message);
void freeMessage(PluginMessage* message);
