Changeset 65611 in webkit
- Timestamp:
- Aug 18, 2010 9:09:12 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r65610 r65611 1 2010-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 1 13 2010-08-18 Ryuan Choi <ryuan.choi@samsung.com> 2 14 -
trunk/WebCore/WebCore.pro
r65608 r65611 2797 2797 2798 2798 contains(DEFINES, ENABLE_GEOLOCATION=1) { 2799 DEFINES += WTF_USE_PREEMPT_GEOLOCATION_PERMISSION2800 2799 HEADERS += \ 2801 2800 platform/qt/GeolocationServiceQt.h -
trunk/WebCore/page/Geolocation.cpp
r65603 r65611 679 679 void Geolocation::handlePendingPermissionNotifiers() 680 680 { 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 681 689 // While we iterate through the list, we need not worry about list being modified as the permission 682 690 // is already set to Yes/No and no new listeners will be added to the pending list … … 688 696 // start all pending notification requests as permission granted. 689 697 // 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 694 704 } else 695 705 notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage));
Note: See TracChangeset
for help on using the changeset viewer.