Changeset 63745 in webkit


Ignore:
Timestamp:
Jul 20, 2010 8:09:49 AM (14 years ago)
Author:
abecsi@webkit.org
Message:

2010-07-20 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r63742.
​http://trac.webkit.org/changeset/63742
​https://bugs.webkit.org/show_bug.cgi?id=42641

Broke Leopard Intel build. (Requested by bbandix on #webkit).

  • wtf/Platform.h:

2010-07-20 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r63742.
​http://trac.webkit.org/changeset/63742
​https://bugs.webkit.org/show_bug.cgi?id=42641

Broke Leopard Intel build. (Requested by bbandix on #webkit).

  • WebCore.pro:
  • page/Geolocation.cpp: (WebCore::Geolocation::startRequest): (WebCore::Geolocation::setIsAllowed): (WebCore::Geolocation::startUpdating):
  • page/Geolocation.h:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r63742 r63745  
     12010-07-20  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r63742.
     4        http://trac.webkit.org/changeset/63742
     5        https://bugs.webkit.org/show_bug.cgi?id=42641
     6
     7        Broke Leopard Intel build. (Requested by bbandix on #webkit).
     8
     9        * wtf/Platform.h:
     10
    1112010-07-20  Mahesh Kulkarni  <mahesh.kulkarni@nokia.com>
    212

  • trunk/JavaScriptCore/wtf/Platform.h

    r63742 r63745  
    11171117#endif
    11181118
    1119 /* Geolocation request policy. pre-emptive policy is to acquire user permission before acquiring location.
    1120    Client based implementations will have option to choose between pre-emptive and nonpre-emptive permission policy.
    1121    pre-emptive permission policy is enabled by default for all client-based implementations. */
    1122 #if ENABLE(CLIENT_BASED_GEOLOCATION)
    1123 #define WTF_USE_PREEMPT_GEOLOCATION_PERMISSION
    1124 #endif
    1125 
    11261119#endif /* WTF_Platform_h */

  • trunk/WebCore/ChangeLog

    r63743 r63745  
     12010-07-20  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r63742.
     4        http://trac.webkit.org/changeset/63742
     5        https://bugs.webkit.org/show_bug.cgi?id=42641
     6
     7        Broke Leopard Intel build. (Requested by bbandix on #webkit).
     8
     9        * WebCore.pro:
     10        * page/Geolocation.cpp:
     11        (WebCore::Geolocation::startRequest):
     12        (WebCore::Geolocation::setIsAllowed):
     13        (WebCore::Geolocation::startUpdating):
     14        * page/Geolocation.h:
     15
    1162010-07-20  Adam Roben  <aroben@apple.com>
    217

  • trunk/WebCore/WebCore.pro

    r63742 r63745  
    27082708
    27092709contains(DEFINES, ENABLE_GEOLOCATION=1) {
    2710     # if geolocation is enabled, enable pre-request for permission policy
    2711     DEFINES += WTF_USE_PREEMPT_GEOLOCATION_PERMISSION
    2712 
    27132710    HEADERS += \
    27142711        platform/qt/GeolocationServiceQt.h

  • trunk/WebCore/page/Geolocation.cpp

    r63742 r63745  
    280280        notifier->setUseCachedPosition();
    281281    else if (notifier->hasZeroTimeout() || startUpdating(notifier.get())) {
    282 #if USE(PREEMPT_GEOLOCATION_PERMISSION)
     282#if ENABLE(CLIENT_BASED_GEOLOCATION)
    283283        // Only start timer if we're not waiting for user permission.
    284284        if (!m_startRequestPermissionNotifier)
    … …  
    401401    m_allowGeolocation = allowed ? Yes : No;
    402402   
    403 #if USE(PREEMPT_GEOLOCATION_PERMISSION)
     403#if ENABLE(CLIENT_BASED_GEOLOCATION)
    404404    if (m_startRequestPermissionNotifier) {
    405405        if (isAllowed()) {
    … …  
    407407            m_startRequestPermissionNotifier->startTimerIfNeeded();
    408408            m_startRequestPermissionNotifier = 0;
    409 #if ENABLE(CLIENT_BASED_GEOLOCATION)
    410409            if (!m_frame)
    411410                return;
    … …  
    414413                return;
    415414            page->geolocationController()->addObserver(this);
    416 #else
    417             // TODO: Handle startUpdate() for non-client based implementations using pre-emptive policy
    418 #endif
    419415        } else {
    420416            m_startRequestPermissionNotifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage));
    … …  
    617613bool Geolocation::startUpdating(GeoNotifier* notifier)
    618614{
    619 #if USE(PREEMPT_GEOLOCATION_PERMISSION)
     615#if ENABLE(CLIENT_BASED_GEOLOCATION)
     616    // FIXME: Pass options to client.
     617
    620618    if (!isAllowed()) {
    621619        m_startRequestPermissionNotifier = notifier;
    … …  
    623621        return true;
    624622    }
    625 #endif
    626 
    627 #if ENABLE(CLIENT_BASED_GEOLOCATION)
     623   
    628624    if (!m_frame)
    629625        return false;
    … …  
    633629        return false;
    634630
    635     // FIXME: Pass options to client.
    636631    page->geolocationController()->addObserver(this);
    637632    return true;

  • trunk/WebCore/page/Geolocation.h

    r63742 r63745  
    166166#if !ENABLE(CLIENT_BASED_GEOLOCATION)
    167167    OwnPtr<GeolocationService> m_service;
    168 #endif
    169 #if USE(PREEMPT_GEOLOCATION_PERMISSION)
     168#else
    170169    RefPtr<GeoNotifier> m_startRequestPermissionNotifier;
    171170#endif
Note: See TracChangeset for help on using the changeset viewer.