Changeset 56726 in webkit

Timestamp:

Mar 29, 2010 9:56:02 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-29 Marcus Bulach <​bulach@chromium.org>

Reviewed by Jeremy Orlow.

​https://bugs.webkit.org/show_bug.cgi?id=36315

Remove obsolete Geolocation::m_currentPosition
(follow up on ​https://bugs.webkit.org/show_bug.cgi?id=30676)

• page/Geolocation.cpp: (WebCore::Geolocation::positionChanged): (WebCore::Geolocation::makeSuccessCallbacks):
• page/Geolocation.h:
• platform/chromium/GeolocationServiceChromium.cpp: (WebCore::GeolocationServiceChromium::GeolocationServiceChromium):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Geolocation.cpp (modified) (3 diffs)
• page/Geolocation.h (modified) (1 diff)
• platform/chromium/GeolocationServiceChromium.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-29  Marcus Bulach  <bulach@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36315
+
+        Remove obsolete Geolocation::m_currentPosition
+        (follow up on https://bugs.webkit.org/show_bug.cgi?id=30676)
+
+        * page/Geolocation.cpp:
+        (WebCore::Geolocation::positionChanged):
+        (WebCore::Geolocation::makeSuccessCallbacks):
+        * page/Geolocation.h:
+        * platform/chromium/GeolocationServiceChromium.cpp:
+        (WebCore::GeolocationServiceChromium::GeolocationServiceChromium):
+
 2010-03-29  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

trunk/WebCore/page/Geolocation.cpp

@@ -522 +522 @@
 void Geolocation::positionChanged(PassRefPtr<Geoposition> newPosition)
 {
-    m_currentPosition = newPosition;
-
-    m_positionCache->setCachedPosition(m_currentPosition.get());
+    m_positionCache->setCachedPosition(newPosition.get());
 
     // Stop all currently running timers.
@@ -543 +541 @@
 void Geolocation::makeSuccessCallbacks()
 {
-    ASSERT(m_currentPosition);
+    ASSERT(lastPosition());
     ASSERT(isAllowed());
     
@@ -557 +555 @@
     m_oneShots.clear();
 
-    sendPosition(oneShotsCopy, m_currentPosition.get());
-    sendPosition(watchersCopy, m_currentPosition.get());
+    sendPosition(oneShotsCopy, lastPosition());
+    sendPosition(watchersCopy, lastPosition());
 
     if (!hasListeners())

trunk/WebCore/page/Geolocation.h

@@ -163 +163 @@
 #endif
     RefPtr<Geoposition> m_lastPosition;
-    RefPtr<Geoposition> m_currentPosition;
 
     enum {

trunk/WebCore/platform/chromium/GeolocationServiceChromium.cpp

@@ -40 +40 @@
           m_geolocation(reinterpret_cast<Geolocation*>(c)),
           m_geolocationServiceBridge(ChromiumBridge::createGeolocationServiceBridge(this)),
-          m_lastPosition(Geoposition::create(Coordinates::create(0.0, 0.0, false, 0.0, 0.0, false, 0.0, false, 0.0, false, 0.0), 0)),
           m_lastError(PositionError::create(PositionError::POSITION_UNAVAILABLE, ""))
 {