Diff
Modified: trunk/Source/WebCore/ChangeLog (176465 => 176466)
--- trunk/Source/WebCore/ChangeLog 2014-11-21 20:42:14 UTC (rev 176465)
+++ trunk/Source/WebCore/ChangeLog 2014-11-21 20:44:22 UTC (rev 176466)
@@ -1,3 +1,17 @@
+2014-11-21 Anders Carlsson <[email protected]>
+
+ More Windows build fixes.
+
+ * platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp:
+ (WebCore::LegacyCACFLayerTreeHost::LegacyCACFLayerTreeHost):
+ (WebCore::LegacyCACFLayerTreeHost::renderTimerFired):
+ * platform/graphics/ca/win/LegacyCACFLayerTreeHost.h:
+ * platform/mock/GeolocationClientMock.cpp:
+ (WebCore::GeolocationClientMock::GeolocationClientMock):
+ (WebCore::GeolocationClientMock::permissionTimerFired):
+ (WebCore::GeolocationClientMock::controllerTimerFired):
+ * platform/mock/GeolocationClientMock.h:
+
2014-11-21 Andreas Kling <[email protected]>
RenderMathMLScripts isPrescript() helper should take a reference.
Modified: trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp (176465 => 176466)
--- trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp 2014-11-21 20:42:14 UTC (rev 176465)
+++ trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp 2014-11-21 20:44:22 UTC (rev 176466)
@@ -98,7 +98,7 @@
}
LegacyCACFLayerTreeHost::LegacyCACFLayerTreeHost()
- : m_renderTimer(this, &LegacyCACFLayerTreeHost::renderTimerFired)
+ : m_renderTimer(*this, &LegacyCACFLayerTreeHost::renderTimerFired)
, m_context(wkCACFContextCreate())
, m_mightBeAbleToCreateDeviceLater(true)
, m_mustResetLostDeviceBeforeRendering(false)
@@ -224,7 +224,7 @@
}
}
-void LegacyCACFLayerTreeHost::renderTimerFired(Timer*)
+void LegacyCACFLayerTreeHost::renderTimerFired()
{
paint();
}
Modified: trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.h (176465 => 176466)
--- trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.h 2014-11-21 20:42:14 UTC (rev 176465)
+++ trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.h 2014-11-21 20:44:22 UTC (rev 176466)
@@ -50,7 +50,7 @@
bool resetDevice(ResetReason);
void renderSoon();
- void renderTimerFired(Timer*);
+ void renderTimerFired();
virtual void initializeContext(void* userData, PlatformCALayer*);
virtual void resize();
Modified: trunk/Source/WebCore/platform/mock/GeolocationClientMock.cpp (176465 => 176466)
--- trunk/Source/WebCore/platform/mock/GeolocationClientMock.cpp 2014-11-21 20:42:14 UTC (rev 176465)
+++ trunk/Source/WebCore/platform/mock/GeolocationClientMock.cpp 2014-11-21 20:44:22 UTC (rev 176466)
@@ -43,8 +43,8 @@
GeolocationClientMock::GeolocationClientMock()
: m_controller(0)
, m_hasError(false)
- , m_controllerTimer(this, &GeolocationClientMock::controllerTimerFired)
- , m_permissionTimer(this, &GeolocationClientMock::permissionTimerFired)
+ , m_controllerTimer(*this, &GeolocationClientMock::controllerTimerFired)
+ , m_permissionTimer(*this, &GeolocationClientMock::permissionTimerFired)
, m_isActive(false)
, m_permissionState(PermissionStateUnset)
{
@@ -109,9 +109,8 @@
m_permissionTimer.startOneShot(0);
}
-void GeolocationClientMock::permissionTimerFired(WebCore::Timer* timer)
+void GeolocationClientMock::permissionTimerFired()
{
- ASSERT_UNUSED(timer, timer == &m_permissionTimer);
ASSERT(m_permissionState != PermissionStateUnset);
bool allowed = m_permissionState == PermissionStateAllowed;
GeolocationSet::iterator end = m_pendingPermission.end();
@@ -169,9 +168,8 @@
m_controllerTimer.startOneShot(0);
}
-void GeolocationClientMock::controllerTimerFired(Timer* timer)
+void GeolocationClientMock::controllerTimerFired()
{
- ASSERT_UNUSED(timer, timer == &m_controllerTimer);
ASSERT(m_controller);
if (m_lastPosition.get()) {
Modified: trunk/Source/WebCore/platform/mock/GeolocationClientMock.h (176465 => 176466)
--- trunk/Source/WebCore/platform/mock/GeolocationClientMock.h 2014-11-21 20:42:14 UTC (rev 176465)
+++ trunk/Source/WebCore/platform/mock/GeolocationClientMock.h 2014-11-21 20:44:22 UTC (rev 176466)
@@ -70,10 +70,10 @@
private:
void asyncUpdateController();
- void controllerTimerFired(Timer*);
+ void controllerTimerFired();
void asyncUpdatePermission();
- void permissionTimerFired(Timer*);
+ void permissionTimerFired();
void clearError();
