Changeset 44094 in webkit
- Timestamp:
- May 23, 2009 9:15:16 AM (15 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r44093 r44094 1 2009-05-23 David Kilzer <ddkilzer@apple.com> 2 3 Fix Mac builds by backing out r44093 4 5 * bindings/js/JSCustomPositionCallback.cpp: 6 * bindings/js/JSCustomPositionCallback.h: 7 * bindings/js/JSCustomPositionErrorCallback.cpp: 8 * bindings/js/JSCustomPositionErrorCallback.h: 9 * bindings/js/JSGeolocationCustom.cpp: 10 * page/Geolocation.cpp: 11 * page/Geolocation.idl: 12 * page/Geoposition.cpp: 13 * page/Geoposition.h: 14 * page/Geoposition.idl: 15 * page/Navigator.cpp: 16 (WebCore::Navigator::disconnectFrame): 17 (WebCore::Navigator::geolocation): 18 * page/PositionError.idl: 19 * platform/GeolocationService.cpp: 20 (WebCore::GeolocationService::create): 21 1 22 2009-05-23 Laszlo Gombos <laszlo.1.gombos@nokia.com> 2 23 -
trunk/WebCore/bindings/js/JSCustomPositionCallback.cpp
r44093 r44094 26 26 #include "config.h" 27 27 #include "JSCustomPositionCallback.h" 28 29 #if ENABLE(GEOLOCATION)30 28 31 29 #include "Frame.h" … … 87 85 88 86 } // namespace WebCore 89 90 #endif // ENABLE(GEOLOCATION) -
trunk/WebCore/bindings/js/JSCustomPositionCallback.h
r44093 r44094 26 26 #ifndef JSCustomPositionCallback_h 27 27 #define JSCustomPositionCallback_h 28 29 #if ENABLE(GEOLOCATION)30 28 31 29 #include "PositionCallback.h" … … 58 56 } // namespace WebCore 59 57 60 #endif // ENABLE(GEOLOCATION)61 62 58 #endif // JSCustomPositionCallback_h -
trunk/WebCore/bindings/js/JSCustomPositionErrorCallback.cpp
r44093 r44094 26 26 #include "config.h" 27 27 #include "JSCustomPositionErrorCallback.h" 28 29 #if ENABLE(GEOLOCATION)30 28 31 29 #include "Frame.h" … … 85 83 86 84 } // namespace WebCore 87 88 #endif // ENABLE(GEOLOCATION) -
trunk/WebCore/bindings/js/JSCustomPositionErrorCallback.h
r44093 r44094 26 26 #ifndef JSCustomPositionErrorCallback_h 27 27 #define JSCustomPositionErrorCallback_h 28 29 #if ENABLE(GEOLOCATION)30 28 31 29 #include "PositionErrorCallback.h" … … 58 56 } // namespace WebCore 59 57 60 #endif // ENABLE(GEOLOCATION)61 62 58 #endif // JSCustomPositionErrorCallback_h -
trunk/WebCore/bindings/js/JSGeolocationCustom.cpp
r44093 r44094 26 26 #include "config.h" 27 27 #include "JSGeolocation.h" 28 29 #if ENABLE(GEOLOCATION)30 28 31 29 #include "DOMWindow.h" … … 151 149 152 150 } // namespace WebCore 153 154 #endif // ENABLE(GEOLOCATION) -
trunk/WebCore/page/Geolocation.cpp
r44093 r44094 27 27 #include "Geolocation.h" 28 28 29 #if ENABLE(GEOLOCATION)30 31 29 #include "Chrome.h" 32 30 #include "Document.h" … … 298 296 299 297 } // namespace WebCore 300 301 #endif // ENABLE(GEOLOCATION) -
trunk/WebCore/page/Geolocation.idl
r44093 r44094 26 26 module core { 27 27 28 interface [Conditional=GEOLOCATION]Geolocation {28 interface Geolocation { 29 29 readonly attribute Geoposition lastPosition; 30 30 -
trunk/WebCore/page/Geoposition.cpp
r44093 r44094 27 27 #include "Geoposition.h" 28 28 29 #if ENABLE(GEOLOCATION)30 31 29 namespace WebCore { 32 30 … … 37 35 38 36 } // namespace WebCore 39 40 #endif // ENABLE(GEOLOCATION) -
trunk/WebCore/page/Geoposition.h
r44093 r44094 26 26 #ifndef Geoposition_h 27 27 #define Geoposition_h 28 29 #if ENABLE(GEOLOCATION)30 28 31 29 #include "Coordinates.h" … … 60 58 } // namespace WebCore 61 59 62 #endif // ENABLE(GEOLOCATION)63 64 60 #endif // Geoposition_h -
trunk/WebCore/page/Geoposition.idl
r44093 r44094 26 26 module core { 27 27 28 interface [Conditional=GEOLOCATION]Geoposition {28 interface Geoposition { 29 29 readonly attribute Coordinates coords; 30 30 readonly attribute DOMTimeStamp timestamp; -
trunk/WebCore/page/Navigator.cpp
r44093 r44094 60 60 m_mimeTypes = 0; 61 61 } 62 #if ENABLE(GEOLOCATION)63 62 if (m_geolocation) { 64 63 m_geolocation->disconnectFrame(); 65 64 m_geolocation = 0; 66 65 } 67 #endif68 66 m_frame = 0; 69 67 } … … 149 147 Geolocation* Navigator::geolocation() const 150 148 { 151 #if ENABLE(GEOLOCATION)152 149 if (!m_geolocation) 153 150 m_geolocation = Geolocation::create(m_frame); 154 #endif155 151 return m_geolocation.get(); 156 152 } -
trunk/WebCore/page/PositionError.idl
r44093 r44094 27 27 28 28 interface [ 29 GenerateConstructor, 30 Conditional=GEOLOCATION 29 GenerateConstructor 31 30 ] PositionError { 32 31 readonly attribute unsigned short code; -
trunk/WebCore/platform/GeolocationService.cpp
r44093 r44094 27 27 #include "GeolocationService.h" 28 28 29 #if ENABLE(GEOLOCATION)30 31 29 #include <wtf/Assertions.h> 32 30 33 31 namespace WebCore { 32 33 #if !ENABLE(GEOLOCATION) 34 GeolocationService* GeolocationService::create(GeolocationServiceClient*) 35 { 36 return 0; 37 } 38 #endif 34 39 35 40 GeolocationService::GeolocationService(GeolocationServiceClient* client) … … 50 55 51 56 } // namespace WebCore 52 53 #endif // ENABLE(GEOLOCATION)
Note: See TracChangeset
for help on using the changeset viewer.