Fix Mac builds by backing out r44093
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 May 2009 16:15:16 +0000 (16:15 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 May 2009 16:15:16 +0000 (16:15 +0000)
        * bindings/js/JSCustomPositionCallback.cpp:
        * bindings/js/JSCustomPositionCallback.h:
        * bindings/js/JSCustomPositionErrorCallback.cpp:
        * bindings/js/JSCustomPositionErrorCallback.h:
        * bindings/js/JSGeolocationCustom.cpp:
        * page/Geolocation.cpp:
        * page/Geolocation.idl:
        * page/Geoposition.cpp:
        * page/Geoposition.h:
        * page/Geoposition.idl:
        * page/Navigator.cpp:
        (WebCore::Navigator::disconnectFrame):
        (WebCore::Navigator::geolocation):
        * page/PositionError.idl:
        * platform/GeolocationService.cpp:
        (WebCore::GeolocationService::create):

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

14 files changed:
WebCore/ChangeLog
WebCore/bindings/js/JSCustomPositionCallback.cpp
WebCore/bindings/js/JSCustomPositionCallback.h
WebCore/bindings/js/JSCustomPositionErrorCallback.cpp
WebCore/bindings/js/JSCustomPositionErrorCallback.h
WebCore/bindings/js/JSGeolocationCustom.cpp
WebCore/page/Geolocation.cpp
WebCore/page/Geolocation.idl
WebCore/page/Geoposition.cpp
WebCore/page/Geoposition.h
WebCore/page/Geoposition.idl
WebCore/page/Navigator.cpp
WebCore/page/PositionError.idl
WebCore/platform/GeolocationService.cpp

index b24c7ee..25fc87c 100644 (file)
@@ -1,3 +1,24 @@
+2009-05-23  David Kilzer  <ddkilzer@apple.com>
+
+        Fix Mac builds by backing out r44093
+
+        * bindings/js/JSCustomPositionCallback.cpp:
+        * bindings/js/JSCustomPositionCallback.h:
+        * bindings/js/JSCustomPositionErrorCallback.cpp:
+        * bindings/js/JSCustomPositionErrorCallback.h:
+        * bindings/js/JSGeolocationCustom.cpp:
+        * page/Geolocation.cpp:
+        * page/Geolocation.idl:
+        * page/Geoposition.cpp:
+        * page/Geoposition.h:
+        * page/Geoposition.idl:
+        * page/Navigator.cpp:
+        (WebCore::Navigator::disconnectFrame):
+        (WebCore::Navigator::geolocation):
+        * page/PositionError.idl:
+        * platform/GeolocationService.cpp:
+        (WebCore::GeolocationService::create):
+
 2009-05-23  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 
         Reviewed by Eric Seidel.
index 6306ec0..6f9efd9 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "JSCustomPositionCallback.h"
 
-#if ENABLE(GEOLOCATION)
-
 #include "Frame.h"
 #include "JSGeoposition.h"
 #include "ScriptController.h"
@@ -86,5 +84,3 @@ void JSCustomPositionCallback::handleEvent(Geoposition* geoposition, bool& raise
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(GEOLOCATION)
index 57a4231..6c0d306 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef JSCustomPositionCallback_h
 #define JSCustomPositionCallback_h
 
-#if ENABLE(GEOLOCATION)
-
 #include "PositionCallback.h"
 #include <runtime/JSObject.h>
 #include <runtime/Protect.h>
@@ -57,6 +55,4 @@ private:
     
 } // namespace WebCore
 
-#endif // ENABLE(GEOLOCATION)
-
 #endif // JSCustomPositionCallback_h
index 86e78a2..cc6cd55 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "JSCustomPositionErrorCallback.h"
 
-#if ENABLE(GEOLOCATION)
-
 #include "Frame.h"
 #include "JSPositionError.h"
 #include "ScriptController.h"
@@ -84,5 +82,3 @@ void JSCustomPositionErrorCallback::handleEvent(PositionError* positionError)
 }
     
 } // namespace WebCore
-
-#endif // ENABLE(GEOLOCATION)
index 5452356..9f143a2 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef JSCustomPositionErrorCallback_h
 #define JSCustomPositionErrorCallback_h
 
-#if ENABLE(GEOLOCATION)
-
 #include "PositionErrorCallback.h"
 #include <runtime/JSObject.h>
 #include <runtime/Protect.h>
@@ -57,6 +55,4 @@ private:
     
 } // namespace WebCore
 
-#endif // ENABLE(GEOLOCATION)
-
 #endif // JSCustomPositionErrorCallback_h
index ea5cd4b..493166c 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "JSGeolocation.h"
 
-#if ENABLE(GEOLOCATION)
-
 #include "DOMWindow.h"
 #include "ExceptionCode.h"
 #include "Geolocation.h"
@@ -150,5 +148,3 @@ JSValue JSGeolocation::watchPosition(ExecState* exec, const ArgList& args)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(GEOLOCATION)
index f7004b5..8abe8a6 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "Geolocation.h"
 
-#if ENABLE(GEOLOCATION)
-
 #include "Chrome.h"
 #include "Document.h"
 #include "Frame.h"
@@ -297,5 +295,3 @@ void Geolocation::geolocationServiceErrorOccurred(GeolocationService* service)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(GEOLOCATION)
index 2e0c57f..e125118 100644 (file)
@@ -25,7 +25,7 @@
 
 module core {
 
-    interface [Conditional=GEOLOCATION] Geolocation {
+    interface Geolocation {
         readonly attribute Geoposition lastPosition;
 
         [Custom] void getCurrentPosition(in PositionCallback successCallback, in PositionErrorCallback errorCallback, in PositionOptions options);
index 7087c16..8f7a5c8 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "Geoposition.h"
 
-#if ENABLE(GEOLOCATION)
-
 namespace WebCore {
 
 String Geoposition::toString() const
@@ -36,5 +34,3 @@ String Geoposition::toString() const
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(GEOLOCATION)
index 03a1136..505e8b3 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef Geoposition_h
 #define Geoposition_h
 
-#if ENABLE(GEOLOCATION)
-
 #include "Coordinates.h"
 #include "Event.h"
 #include "PlatformString.h"
@@ -59,6 +57,4 @@ private:
     
 } // namespace WebCore
 
-#endif // ENABLE(GEOLOCATION)
-
 #endif // Geoposition_h
index 3356d28..de508fe 100644 (file)
@@ -25,7 +25,7 @@
 
 module core {
 
-    interface [Conditional=GEOLOCATION] Geoposition {
+    interface Geoposition {
         readonly attribute Coordinates coords;
         readonly attribute DOMTimeStamp timestamp;
 
index 3abcc46..3603b86 100644 (file)
@@ -59,12 +59,10 @@ void Navigator::disconnectFrame()
         m_mimeTypes->disconnectFrame();
         m_mimeTypes = 0;
     }
-#if ENABLE(GEOLOCATION)
     if (m_geolocation) {
         m_geolocation->disconnectFrame();
         m_geolocation = 0;
     }
-#endif
     m_frame = 0;
 }
 
@@ -148,10 +146,8 @@ bool Navigator::javaEnabled() const
 
 Geolocation* Navigator::geolocation() const
 {
-#if ENABLE(GEOLOCATION)
     if (!m_geolocation)
         m_geolocation = Geolocation::create(m_frame);
-#endif
     return m_geolocation.get();
 }
     
index c2312e3..cb2ef5e 100644 (file)
@@ -26,8 +26,7 @@
 module core {
 
     interface [
-        GenerateConstructor,
-        Conditional=GEOLOCATION
+        GenerateConstructor
     ] PositionError {
         readonly attribute unsigned short code;
         readonly attribute DOMString message;
index e8b71e9..9b362c8 100644 (file)
 #include "config.h"
 #include "GeolocationService.h"
 
-#if ENABLE(GEOLOCATION)
-
 #include <wtf/Assertions.h>
 
 namespace WebCore {
 
+#if !ENABLE(GEOLOCATION)
+GeolocationService* GeolocationService::create(GeolocationServiceClient*)
+{
+    return 0;
+}
+#endif
+
 GeolocationService::GeolocationService(GeolocationServiceClient* client)
     : m_geolocationServiceClient(client)
 {
@@ -49,5 +54,3 @@ void GeolocationService::errorOccurred()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(GEOLOCATION)