Changeset 176466 in webkit

Timestamp:

Nov 21, 2014, 12:44:22 PM (12 years ago)

Author:

andersca@apple.com

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp (modified) (2 diffs)
• platform/graphics/ca/win/LegacyCACFLayerTreeHost.h (modified) (1 diff)
• platform/mock/GeolocationClientMock.cpp (modified) (3 diffs)
• platform/mock/GeolocationClientMock.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-21  Anders Carlsson  <andersca@apple.com>
+
+        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  <akling@apple.com>
 

trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp

@@ -99 +99 @@
 
 LegacyCACFLayerTreeHost::LegacyCACFLayerTreeHost()
-    : m_renderTimer(this, &LegacyCACFLayerTreeHost::renderTimerFired)
+    : m_renderTimer(*this, &LegacyCACFLayerTreeHost::renderTimerFired)
     , m_context(wkCACFContextCreate())
     , m_mightBeAbleToCreateDeviceLater(true)
@@ -225 +225 @@
 }
 
-void LegacyCACFLayerTreeHost::renderTimerFired(Timer*)
+void LegacyCACFLayerTreeHost::renderTimerFired()
 {
     paint();

trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.h

@@ -51 +51 @@
 
     void renderSoon();
-    void renderTimerFired(Timer*);
+    void renderTimerFired();
 
     virtual void initializeContext(void* userData, PlatformCALayer*);

trunk/Source/WebCore/platform/mock/GeolocationClientMock.cpp

@@ -44 +44 @@
     : 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)
@@ -110 +110 @@
 }
 
-void GeolocationClientMock::permissionTimerFired(WebCore::Timer* timer)
+void GeolocationClientMock::permissionTimerFired()
 {
-    ASSERT_UNUSED(timer, timer == &m_permissionTimer);
     ASSERT(m_permissionState != PermissionStateUnset);
     bool allowed = m_permissionState == PermissionStateAllowed;
@@ -170 +169 @@
 }
 
-void GeolocationClientMock::controllerTimerFired(Timer* timer)
+void GeolocationClientMock::controllerTimerFired()
 {
-    ASSERT_UNUSED(timer, timer == &m_controllerTimer);
     ASSERT(m_controller);
 

trunk/Source/WebCore/platform/mock/GeolocationClientMock.h

@@ -71 +71 @@
 private:
     void asyncUpdateController();
-    void controllerTimerFired(Timer*);
+    void controllerTimerFired();
 
     void asyncUpdatePermission();
-    void permissionTimerFired(Timer*);
+    void permissionTimerFired();
 
     void clearError();