Changeset 56851 in webkit


Ignore:
Timestamp:
Mar 31, 2010 10:47:34 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-03-31 Marcus Bulach <​bulach@chromium.org>

Reviewed by Jeremy Orlow.

Implements cancelGeolocationPermissionRequestForFrame.
Similar to requestGeolocationPermissionForFrame(), passes Geolocation* to cancelGeolocationPermissionRequestForFrame(),
so that the embedder can identify which Geolocation object is cancelling the pending permission request.
Calls cancelGeolocationPermissionRequestForFrame() before stopUpdating() so it better matches the startUpdating() / requestPermission() flow.
​https://bugs.webkit.org/show_bug.cgi?id=35031

  • loader/EmptyClients.h: (WebCore::EmptyChromeClient::cancelGeolocationPermissionRequestForFrame):
  • page/Chrome.cpp: (WebCore::Chrome::cancelGeolocationPermissionRequestForFrame):
  • page/Chrome.h:
  • page/ChromeClient.h:
  • page/Geolocation.cpp: (WebCore::Geolocation::disconnectFrame):

2010-03-31 Marcus Bulach <​bulach@chromium.org>

Reviewed by Jeremy Orlow.

Implements cancelGeolocationPermissionRequestForFrame.
​https://bugs.webkit.org/show_bug.cgi?id=35031

  • public/WebGeolocationService.h: (WebKit::WebGeolocationService::cancelPermissionRequestForFrame):
  • src/ChromeClientImpl.cpp: (WebKit::ChromeClientImpl::cancelGeolocationPermissionRequestForFrame):
  • src/ChromeClientImpl.h:

2010-03-31 Marcus Bulach <​bulach@chromium.org>

Reviewed by Jeremy Orlow.

Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
​https://bugs.webkit.org/show_bug.cgi?id=35031

  • WebCoreSupport/ChromeClientGtk.cpp: (WebKit::ChromeClient::cancelGeolocationPermissionRequestForFrame):
  • WebCoreSupport/ChromeClientGtk.h:

2010-03-31 Marcus Bulach <​bulach@chromium.org>

Reviewed by Jeremy Orlow.

Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
​https://bugs.webkit.org/show_bug.cgi?id=35031

  • WebCoreSupport/ChromeClientHaiku.h: (WebCore::ChromeClientHaiku::cancelGeolocationPermissionRequestForFrame):

2010-03-31 Marcus Bulach <​bulach@chromium.org>

Reviewed by Jeremy Orlow.

Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
​https://bugs.webkit.org/show_bug.cgi?id=35031

  • WebCoreSupport/WebChromeClient.h: (WebChromeClient::cancelGeolocationPermissionRequestForFrame):

2010-03-31 Marcus Bulach <​bulach@chromium.org>

Reviewed by Jeremy Orlow.

Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
​https://bugs.webkit.org/show_bug.cgi?id=35031

  • WebCoreSupport/ChromeClientQt.h: (WebCore::ChromeClientQt::cancelGeolocationPermissionRequestForFrame):

2010-03-31 Marcus Bulach <​bulach@chromium.org>

Reviewed by Jeremy Orlow.

Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
​https://bugs.webkit.org/show_bug.cgi?id=35031

  • WebCoreSupport/WebChromeClient.h: (WebChromeClient::cancelGeolocationPermissionRequestForFrame):

2010-03-31 Marcus Bulach <​bulach@chromium.org>

Reviewed by Jeremy Orlow.

Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
​https://bugs.webkit.org/show_bug.cgi?id=35031

  • WebKitSupport/ChromeClientWx.h: (WebCore::ChromeClientWx::cancelGeolocationPermissionRequestForFrame):
Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r56850 r56851  
     12010-03-31  Marcus Bulach  <bulach@chromium.org>
     2
     3        Reviewed by Jeremy Orlow.
     4
     5        Implements cancelGeolocationPermissionRequestForFrame.
     6        Similar to requestGeolocationPermissionForFrame(), passes Geolocation* to cancelGeolocationPermissionRequestForFrame(),
     7        so that the embedder can identify which Geolocation object is cancelling the pending permission request.
     8        Calls cancelGeolocationPermissionRequestForFrame() before stopUpdating() so it better matches the startUpdating() / requestPermission() flow.
     9        https://bugs.webkit.org/show_bug.cgi?id=35031
     10
     11        * loader/EmptyClients.h:
     12        (WebCore::EmptyChromeClient::cancelGeolocationPermissionRequestForFrame):
     13        * page/Chrome.cpp:
     14        (WebCore::Chrome::cancelGeolocationPermissionRequestForFrame):
     15        * page/Chrome.h:
     16        * page/ChromeClient.h:
     17        * page/Geolocation.cpp:
     18        (WebCore::Geolocation::disconnectFrame):
     19
    1202010-03-31  Yael Aharon  <yael.aharon@nokia.com>
    221

  • trunk/WebCore/loader/EmptyClients.h

    r56650 r56851  
    159159
    160160    virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) {}
    161     virtual void cancelGeolocationPermissionRequestForFrame(Frame*) {}
     161    virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) {}
    162162
    163163#if USE(ACCELERATED_COMPOSITING)

  • trunk/WebCore/page/Chrome.cpp

    r56439 r56851  
    421421}
    422422
    423 void Chrome::cancelGeolocationPermissionRequestForFrame(Frame* frame)
    424 {
    425     m_client->cancelGeolocationPermissionRequestForFrame(frame);
     423void Chrome::cancelGeolocationPermissionRequestForFrame(Frame* frame, Geolocation* geolocation)
     424{
     425    m_client->cancelGeolocationPermissionRequestForFrame(frame, geolocation);
    426426}
    427427

  • trunk/WebCore/page/Chrome.h

    r56439 r56851  
    133133
    134134        void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
    135         void cancelGeolocationPermissionRequestForFrame(Frame*);
     135        void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*);
    136136
    137137        void runOpenPanel(Frame*, PassRefPtr<FileChooser>);

  • trunk/WebCore/page/ChromeClient.h

    r56740 r56851  
    186186        // to use Geolocation.
    187187        virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) = 0;
    188         virtual void cancelGeolocationPermissionRequestForFrame(Frame*) = 0;
     188        virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) = 0;
    189189           
    190190        virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) = 0;

  • trunk/WebCore/page/Geolocation.cpp

    r56781 r56851  
    222222void Geolocation::disconnectFrame()
    223223{
     224    if (m_frame && m_frame->page() && m_allowGeolocation == InProgress)
     225        m_frame->page()->chrome()->cancelGeolocationPermissionRequestForFrame(m_frame, this);
    224226    stopUpdating();
    225     if (m_frame) {
    226         if (m_frame->document())
    227             m_frame->document()->setUsingGeolocation(false);
    228         if (m_frame->page() && m_allowGeolocation == InProgress)
    229             m_frame->page()->chrome()->cancelGeolocationPermissionRequestForFrame(m_frame);
    230     }
     227    if (m_frame && m_frame->document())
     228        m_frame->document()->setUsingGeolocation(false);
    231229    m_frame = 0;
    232230}

  • trunk/WebKit/chromium/ChangeLog

    r56849 r56851  
     12010-03-31  Marcus Bulach  <bulach@chromium.org>
     2
     3        Reviewed by Jeremy Orlow.
     4
     5        Implements cancelGeolocationPermissionRequestForFrame.
     6        https://bugs.webkit.org/show_bug.cgi?id=35031
     7
     8        * public/WebGeolocationService.h:
     9        (WebKit::WebGeolocationService::cancelPermissionRequestForFrame):
     10        * src/ChromeClientImpl.cpp:
     11        (WebKit::ChromeClientImpl::cancelGeolocationPermissionRequestForFrame):
     12        * src/ChromeClientImpl.h:
     13
    1142010-03-31  Pavel Feldman  <pfeldman@chromium.org>
    215

  • trunk/WebKit/chromium/public/WebGeolocationService.h

    r56803 r56851  
    4343public:
    4444    virtual void requestPermissionForFrame(int bridgeId, const WebURL& url) { }
     45    virtual void cancelPermissionRequestForFrame(int bridgeId, const WebURL&) { }
    4546    virtual void startUpdating(int bridgeId, const WebURL& url, bool enableHighAccuracy) { }
    4647    virtual void stopUpdating(int bridgeId) { }

  • trunk/WebKit/chromium/src/ChromeClientImpl.cpp

    r56803 r56851  
    704704void ChromeClientImpl::requestGeolocationPermissionForFrame(Frame* frame, Geolocation* geolocation)
    705705{
    706     GeolocationServiceChromium* geolocationService = reinterpret_cast<GeolocationServiceChromium*>(geolocation->getGeolocationService());
     706    GeolocationServiceChromium* geolocationService = static_cast<GeolocationServiceChromium*>(geolocation->getGeolocationService());
    707707    m_webView->client()->geolocationService()->requestPermissionForFrame(geolocationService->geolocationServiceBridge()->getBridgeId(), frame->document()->url());
     708}
     709
     710void ChromeClientImpl::cancelGeolocationPermissionRequestForFrame(Frame* frame, Geolocation* geolocation)
     711{
     712    GeolocationServiceChromium* geolocationService = static_cast<GeolocationServiceChromium*>(geolocation->getGeolocationService());
     713    m_webView->client()->geolocationService()->cancelPermissionRequestForFrame(geolocationService->geolocationServiceBridge()->getBridgeId(), frame->document()->url());
    708714}
    709715

  • trunk/WebKit/chromium/src/ChromeClientImpl.h

    r56449 r56851  
    123123#endif
    124124    virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
    125     virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*) { }
     125    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*);
    126126    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
    127127    virtual void chooseIconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>);

  • trunk/WebKit/gtk/ChangeLog

    r56825 r56851  
     12010-03-31  Marcus Bulach  <bulach@chromium.org>
     2
     3        Reviewed by Jeremy Orlow.
     4
     5        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
     6        https://bugs.webkit.org/show_bug.cgi?id=35031
     7
     8        * WebCoreSupport/ChromeClientGtk.cpp:
     9        (WebKit::ChromeClient::cancelGeolocationPermissionRequestForFrame):
     10        * WebCoreSupport/ChromeClientGtk.h:
     11
    1122010-03-30  Gavin Barraclough  <barraclough@apple.com>
    213

  • trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

    r56825 r56851  
    584584}
    585585
    586 void ChromeClient::cancelGeolocationPermissionRequestForFrame(WebCore::Frame* frame)
     586void ChromeClient::cancelGeolocationPermissionRequestForFrame(WebCore::Frame* frame, WebCore::Geolocation*)
    587587{
    588588    WebKitWebFrame* webFrame = kit(frame);

  • trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h

    r56439 r56851  
    121121        virtual void scrollRectIntoView(const WebCore::IntRect&, const WebCore::ScrollView*) const {}
    122122        virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
    123         virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*);
     123        virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*);
    124124
    125125    private:

  • trunk/WebKit/haiku/ChangeLog

    r56705 r56851  
     12010-03-31  Marcus Bulach  <bulach@chromium.org>
     2
     3        Reviewed by Jeremy Orlow.
     4
     5        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
     6        https://bugs.webkit.org/show_bug.cgi?id=35031
     7
     8        * WebCoreSupport/ChromeClientHaiku.h:
     9        (WebCore::ChromeClientHaiku::cancelGeolocationPermissionRequestForFrame):
     10
    1112010-03-28  Alexey Proskuryakov  <ap@apple.com>
    212

  • trunk/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h

    r56439 r56851  
    136136        // to use Geolococation.
    137137        void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
    138         void cancelGeolocationPermissionRequestForFrame(Frame*) { }
     138        void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { }
    139139
    140140        void runOpenPanel(Frame*, PassRefPtr<FileChooser>);

  • trunk/WebKit/mac/ChangeLog

    r56825 r56851  
     12010-03-31  Marcus Bulach  <bulach@chromium.org>
     2
     3        Reviewed by Jeremy Orlow.
     4
     5        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
     6        https://bugs.webkit.org/show_bug.cgi?id=35031
     7
     8        * WebCoreSupport/WebChromeClient.h:
     9        (WebChromeClient::cancelGeolocationPermissionRequestForFrame):
     10
    1112010-03-30  Gavin Barraclough  <barraclough@apple.com>
    212

  • trunk/WebKit/mac/WebCoreSupport/WebChromeClient.h

    r56439 r56851  
    164164
    165165    virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
    166     virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*) { }
     166    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*) { }
    167167
    168168private:

  • trunk/WebKit/qt/ChangeLog

    r56837 r56851  
     12010-03-31  Marcus Bulach  <bulach@chromium.org>
     2
     3        Reviewed by Jeremy Orlow.
     4
     5        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
     6        https://bugs.webkit.org/show_bug.cgi?id=35031
     7
     8        * WebCoreSupport/ChromeClientQt.h:
     9        (WebCore::ChromeClientQt::cancelGeolocationPermissionRequestForFrame):
     10
    1112010-03-31  Antti Koivisto  <koivisto@iki.fi>
    212

  • trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.h

    r56740 r56851  
    153153
    154154        virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
    155         virtual void cancelGeolocationPermissionRequestForFrame(Frame*) { }
     155        virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { }
    156156
    157157#if ENABLE(WIDGETS_10_SUPPORT)

  • trunk/WebKit/win/ChangeLog

    r56825 r56851  
     12010-03-31  Marcus Bulach  <bulach@chromium.org>
     2
     3        Reviewed by Jeremy Orlow.
     4
     5        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
     6        https://bugs.webkit.org/show_bug.cgi?id=35031
     7
     8        * WebCoreSupport/WebChromeClient.h:
     9        (WebChromeClient::cancelGeolocationPermissionRequestForFrame):
     10
    1112010-03-30  Gavin Barraclough  <barraclough@apple.com>
    212

  • trunk/WebKit/win/WebCoreSupport/WebChromeClient.h

    r56439 r56851  
    151151
    152152    virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
    153     virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*) { }
     153    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*) { }
    154154
    155155#if ENABLE(VIDEO)

  • trunk/WebKit/wx/ChangeLog

    r56825 r56851  
     12010-03-31  Marcus Bulach  <bulach@chromium.org>
     2
     3        Reviewed by Jeremy Orlow.
     4
     5        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
     6        https://bugs.webkit.org/show_bug.cgi?id=35031
     7
     8        * WebKitSupport/ChromeClientWx.h:
     9        (WebCore::ChromeClientWx::cancelGeolocationPermissionRequestForFrame):
     10
    1112010-03-30  Gavin Barraclough  <barraclough@apple.com>
    212

  • trunk/WebKit/wx/WebKitSupport/ChromeClientWx.h

    r56439 r56851  
    140140
    141141    virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
    142     virtual void cancelGeolocationPermissionRequestForFrame(Frame*) { }
     142    virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { }
    143143
    144144private:
Note: See TracChangeset for help on using the changeset viewer.