Changeset 65611 in webkit


Ignore:
Timestamp:
Aug 18, 2010 9:09:12 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-08-18 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r65603.
http://trac.webkit.org/changeset/65603
https://bugs.webkit.org/show_bug.cgi?id=44179

4 tests crash on Qt bot (Requested by Ossy on #webkit).

  • WebCore.pro:
  • page/Geolocation.cpp: (WebCore::Geolocation::handlePendingPermissionNotifiers):
Location:
trunk/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r65610 r65611  
     12010-08-18  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r65603.
     4        http://trac.webkit.org/changeset/65603
     5        https://bugs.webkit.org/show_bug.cgi?id=44179
     6
     7        4 tests crash on Qt bot (Requested by Ossy on #webkit).
     8
     9        * WebCore.pro:
     10        * page/Geolocation.cpp:
     11        (WebCore::Geolocation::handlePendingPermissionNotifiers):
     12
    1132010-08-18  Ryuan Choi  <ryuan.choi@samsung.com>
    214
  • trunk/WebCore/WebCore.pro

    r65608 r65611  
    27972797
    27982798contains(DEFINES, ENABLE_GEOLOCATION=1) {
    2799     DEFINES += WTF_USE_PREEMPT_GEOLOCATION_PERMISSION
    28002799    HEADERS += \
    28012800        platform/qt/GeolocationServiceQt.h
  • trunk/WebCore/page/Geolocation.cpp

    r65603 r65611  
    679679void Geolocation::handlePendingPermissionNotifiers()
    680680{
     681#if ENABLE(CLIENT_BASED_GEOLOCATION)
     682    if (!m_frame)
     683        return;
     684    Page* page = m_frame->page();
     685    if (!page)
     686        return;
     687#endif
     688
    681689    // While we iterate through the list, we need not worry about list being modified as the permission
    682690    // is already set to Yes/No and no new listeners will be added to the pending list
     
    688696            // start all pending notification requests as permission granted.
    689697            // The notifier is always ref'ed by m_oneShots or m_watchers.
    690             if (startUpdating(notifier))
    691                 notifier->startTimerIfNeeded();
    692             else
    693                 notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, failedToStartServiceErrorMessage));
     698#if ENABLE(CLIENT_BASED_GEOLOCATION)
     699            notifier->startTimerIfNeeded();
     700            page->geolocationController()->addObserver(this, notifier->m_options->enableHighAccuracy());
     701#else
     702            // TODO: Handle startUpdate() for non-client based implementations using pre-emptive policy
     703#endif
    694704        } else
    695705            notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage));
Note: See TracChangeset for help on using the changeset viewer.