Changeset 220515 in webkit


Ignore:
Timestamp:
Aug 9, 2017 10:58:26 PM (7 years ago)
Author:
Michael Catanzaro
Message:

[GTK] Remove support for geoclue1
https://bugs.webkit.org/show_bug.cgi?id=164205

Reviewed by Carlos Garcia Campos.

.:

  • Source/cmake/FindGeoClue.cmake: Removed.
  • Source/cmake/OptionsGTK.cmake:

Source/WebCore:

  • PlatformGTK.cmake:
  • platform/geoclue/GeolocationProviderGeoclue.h:
  • platform/geoclue/GeolocationProviderGeoclue1.cpp: Removed.
  • platform/geoclue/GeolocationProviderGeoclue2.cpp: Removed.
Location:
trunk
Files:
2 deleted
5 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r220498 r220515  
     12017-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
    1112017-08-09  Michael Catanzaro  <mcatanzaro@igalia.com>
    212
  • trunk/Source/WebCore/ChangeLog

    r220506 r220515  
     12017-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
    1132017-08-09  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
    214
  • trunk/Source/WebCore/PlatformGTK.cmake

    r220403 r220515  
    7272    platform/gamepad/glib/GamepadsGlib.cpp
    7373
    74     platform/geoclue/GeolocationProviderGeoclue1.cpp
    75     platform/geoclue/GeolocationProviderGeoclue2.cpp
     74    platform/geoclue/GeolocationProviderGeoclue.cpp
    7675
    7776    platform/glib/EventLoopGlib.cpp
     
    182181)
    183182
    184 if (USE_GEOCLUE2)
     183if (ENABLE_GEOLOCATION)
    185184    list(APPEND WebCore_DERIVED_SOURCES
    186185        ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c
  • trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp

    r220507 r220515  
    2727#include "GeolocationProviderGeoclue.h"
    2828
    29 #if ENABLE(GEOLOCATION) && USE(GEOCLUE2)
     29#if ENABLE(GEOLOCATION)
    3030
    3131#include <wtf/glib/GLibUtilities.h>
     
    205205}
    206206
    207 #endif // ENABLE(GEOLOCATION) && USE(GEOCLUE2)
     207#endif // ENABLE(GEOLOCATION)
  • trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.h

    r185502 r220515  
    2727#include <wtf/glib/GRefPtr.h>
    2828
    29 #if USE(GEOCLUE2)
    3029#include "Geoclue2Interface.h"
    31 #else
    32 #include <geoclue/geoclue-master.h>
    33 #include <geoclue/geoclue-position.h>
    34 #endif
    3530
    3631namespace WebCore {
     
    4641
    4742private:
    48 #if USE(GEOCLUE2)
    4943    static void createGeoclueManagerProxyCallback(GObject*, GAsyncResult*, GeolocationProviderGeoclue*);
    5044    static void getGeoclueClientCallback(GObject*, GAsyncResult*, GeolocationProviderGeoclue*);
     
    5650    void startGeoclueClient();
    5751    void updateLocation(GeoclueLocation*);
    58 #else
    59     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 #endif
    6952
    7053    void errorOccurred(const char*);
     
    7356    GeolocationProviderGeoclueClient* m_client;
    7457
    75 #if USE(GEOCLUE2)
    7658    GRefPtr<GeoclueManager> m_managerProxy;
    7759    GRefPtr<GeoclueClient> m_clientProxy;
    78 #else
    79     GRefPtr<GeoclueMasterClient> m_geoclueClient;
    80     GRefPtr<GeocluePosition> m_geocluePosition;
    81 #endif
    8260
    8361    double m_latitude;
  • trunk/Source/cmake/OptionsGTK.cmake

    r220445 r220515  
    244244if (ENABLE_GEOLOCATION)
    245245    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.")
    253248    endif ()
    254249endif ()
Note: See TracChangeset for help on using the changeset viewer.