Changeset 220515 in webkit
- Timestamp:
- Aug 9, 2017 10:58:26 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 5 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r220498 r220515 1 2017-08-09 Michael Catanzaro <mcatanzaro@igalia.com> 2 3 [GTK] Remove support for geoclue1 4 https://bugs.webkit.org/show_bug.cgi?id=164205 5 6 Reviewed by Carlos Garcia Campos. 7 8 * Source/cmake/FindGeoClue.cmake: Removed. 9 * Source/cmake/OptionsGTK.cmake: 10 1 11 2017-08-09 Michael Catanzaro <mcatanzaro@igalia.com> 2 12 -
trunk/Source/WebCore/ChangeLog
r220506 r220515 1 2017-08-09 Michael Catanzaro <mcatanzaro@igalia.com> 2 3 [GTK] Remove support for geoclue1 4 https://bugs.webkit.org/show_bug.cgi?id=164205 5 6 Reviewed by Carlos Garcia Campos. 7 8 * PlatformGTK.cmake: 9 * platform/geoclue/GeolocationProviderGeoclue.h: 10 * platform/geoclue/GeolocationProviderGeoclue1.cpp: Removed. 11 * platform/geoclue/GeolocationProviderGeoclue2.cpp: Removed. 12 1 13 2017-08-09 Yoshiaki Jitsukawa <Yoshiaki.Jitsukawa@sony.com> 2 14 -
trunk/Source/WebCore/PlatformGTK.cmake
r220403 r220515 72 72 platform/gamepad/glib/GamepadsGlib.cpp 73 73 74 platform/geoclue/GeolocationProviderGeoclue1.cpp 75 platform/geoclue/GeolocationProviderGeoclue2.cpp 74 platform/geoclue/GeolocationProviderGeoclue.cpp 76 75 77 76 platform/glib/EventLoopGlib.cpp … … 182 181 ) 183 182 184 if ( USE_GEOCLUE2)183 if (ENABLE_GEOLOCATION) 185 184 list(APPEND WebCore_DERIVED_SOURCES 186 185 ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c -
trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp
r220507 r220515 27 27 #include "GeolocationProviderGeoclue.h" 28 28 29 #if ENABLE(GEOLOCATION) && USE(GEOCLUE2)29 #if ENABLE(GEOLOCATION) 30 30 31 31 #include <wtf/glib/GLibUtilities.h> … … 205 205 } 206 206 207 #endif // ENABLE(GEOLOCATION) && USE(GEOCLUE2)207 #endif // ENABLE(GEOLOCATION) -
trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.h
r185502 r220515 27 27 #include <wtf/glib/GRefPtr.h> 28 28 29 #if USE(GEOCLUE2)30 29 #include "Geoclue2Interface.h" 31 #else32 #include <geoclue/geoclue-master.h>33 #include <geoclue/geoclue-position.h>34 #endif35 30 36 31 namespace WebCore { … … 46 41 47 42 private: 48 #if USE(GEOCLUE2)49 43 static void createGeoclueManagerProxyCallback(GObject*, GAsyncResult*, GeolocationProviderGeoclue*); 50 44 static void getGeoclueClientCallback(GObject*, GAsyncResult*, GeolocationProviderGeoclue*); … … 56 50 void startGeoclueClient(); 57 51 void updateLocation(GeoclueLocation*); 58 #else59 static void getPositionCallback(GeocluePosition*, GeocluePositionFields, int, double, double, double, GeoclueAccuracy*, GError*, GeolocationProviderGeoclue*);60 static void positionChangedCallback(GeocluePosition*, GeocluePositionFields, int, double, double, double, GeoclueAccuracy*, GeolocationProviderGeoclue*);61 static void createGeocluePositionCallback(GeoclueMasterClient*, GeocluePosition*, GError*, GeolocationProviderGeoclue*);62 static void geoclueClientSetRequirementsCallback(GeoclueMasterClient*, GError*, GeolocationProviderGeoclue*);63 static void createGeoclueClientCallback(GeoclueMaster*, GeoclueMasterClient*, char*, GError*, GeolocationProviderGeoclue*);64 65 void initializeGeoclueClient(GeoclueMasterClient*);66 void initializeGeocluePosition(GeocluePosition*);67 void positionChanged(GeocluePosition*, GeocluePositionFields, int, double, double, double, GeoclueAccuracy*);68 #endif69 52 70 53 void errorOccurred(const char*); … … 73 56 GeolocationProviderGeoclueClient* m_client; 74 57 75 #if USE(GEOCLUE2)76 58 GRefPtr<GeoclueManager> m_managerProxy; 77 59 GRefPtr<GeoclueClient> m_clientProxy; 78 #else79 GRefPtr<GeoclueMasterClient> m_geoclueClient;80 GRefPtr<GeocluePosition> m_geocluePosition;81 #endif82 60 83 61 double m_latitude; -
trunk/Source/cmake/OptionsGTK.cmake
r220445 r220515 244 244 if (ENABLE_GEOLOCATION) 245 245 find_package(GeoClue2 2.1.5) 246 if (GEOCLUE2_FOUND) 247 SET_AND_EXPOSE_TO_BUILD(USE_GEOCLUE2 ${GEOCLUE2_FOUND}) 248 else () 249 find_package(GeoClue) 250 if (NOT GEOCLUE_FOUND) 251 message(FATAL_ERROR "Geoclue is needed for ENABLE_GEOLOCATION.") 252 endif () 246 if (NOT GEOCLUE2_FOUND) 247 message(FATAL_ERROR "Geoclue is needed for ENABLE_GEOLOCATION.") 253 248 endif () 254 249 endif ()
Note: See TracChangeset
for help on using the changeset viewer.