Changeset 221743 in webkit


Ignore:
Timestamp:
Sep 7, 2017 12:01:45 PM (7 years ago)
Author:
achristensen@apple.com
Message:

Modernize Geolocation code
​https://bugs.webkit.org/show_bug.cgi?id=176496

Reviewed by Andy Estes.

Source/WebCore:

No change in behavior. Just more references instead of pointers.

  • Modules/geolocation/Geolocation.cpp:

(WebCore::createPositionError):
(WebCore::Geolocation::resetAllGeolocationPermission):
(WebCore::Geolocation::stop):
(WebCore::Geolocation::requestPermission):
(WebCore::Geolocation::setError):
(WebCore::Geolocation::startUpdating):
(WebCore::Geolocation::stopUpdating):

  • Modules/geolocation/Geolocation.h:
  • Modules/geolocation/GeolocationClient.h:
  • Modules/geolocation/GeolocationController.cpp:

(WebCore::GeolocationController::addObserver):
(WebCore::GeolocationController::removeObserver):
(WebCore::GeolocationController::requestPermission):
(WebCore::GeolocationController::cancelPermissionRequest):
(WebCore::GeolocationController::positionChanged):
(WebCore::GeolocationController::errorOccurred):
(WebCore::GeolocationController::activityStateDidChange):
(WebCore::provideGeolocationTo):

  • Modules/geolocation/GeolocationController.h:

Source/WebKit:

Making the GeolocationPermissionRequestManager take a reference instead of a pointer
spilled into making the other supplement constructors do the same.

  • NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp:

(WebKit::LegacyCustomProtocolManager::LegacyCustomProtocolManager):
(WebKit::LegacyCustomProtocolManager::startLoading):
(WebKit::LegacyCustomProtocolManager::stopLoading):

  • NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.h:
  • NetworkProcess/NetworkProcess.h:

(WebKit::NetworkProcess::addSupplement):

  • Shared/Authentication/AuthenticationManager.cpp:

(WebKit::AuthenticationManager::AuthenticationManager):
(WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):

  • Shared/Authentication/AuthenticationManager.h:
  • UIProcess/API/APIUIClient.h:

(API::UIClient::decidePolicyForGeolocationPermissionRequest):

  • UIProcess/API/C/WKPage.cpp:

(WKPageSetPageUIClient):

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::requestGeolocationPermissionForFrame):

  • WebProcess/Cookies/WebCookieManager.cpp:

(WebKit::WebCookieManager::WebCookieManager):
(WebKit::WebCookieManager::getHostnamesWithCookies):
(WebKit::WebCookieManager::deleteCookie):
(WebKit::WebCookieManager::deleteAllCookiesModifiedSince):
(WebKit::WebCookieManager::getAllCookies):
(WebKit::WebCookieManager::getCookies):
(WebKit::WebCookieManager::setCookie):
(WebKit::WebCookieManager::setCookies):
(WebKit::WebCookieManager::notifyCookiesDidChange):
(WebKit::WebCookieManager::setHTTPCookieAcceptPolicy):
(WebKit::WebCookieManager::getHTTPCookieAcceptPolicy):

  • WebProcess/Cookies/WebCookieManager.h:
  • WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp:

(WebKit::GeolocationPermissionRequestManager::GeolocationPermissionRequestManager):
(WebKit::GeolocationPermissionRequestManager::startRequestForGeolocation):
(WebKit::GeolocationPermissionRequestManager::cancelRequestForGeolocation):

  • WebProcess/Geolocation/GeolocationPermissionRequestManager.h:
  • WebProcess/Geolocation/WebGeolocationManager.cpp:

(WebKit::WebGeolocationManager::WebGeolocationManager):
(WebKit::WebGeolocationManager::registerWebPage):
(WebKit::WebGeolocationManager::unregisterWebPage):
(WebKit::WebGeolocationManager::setEnableHighAccuracyForPage):
(WebKit::WebGeolocationManager::didChangePosition):
(WebKit::WebGeolocationManager::didFailToDeterminePosition):
(WebKit::WebGeolocationManager::resetPermissions):

  • WebProcess/Geolocation/WebGeolocationManager.h:
  • WebProcess/MediaCache/WebMediaKeyStorageManager.h:

(WebKit::WebMediaKeyStorageManager::WebMediaKeyStorageManager):

  • WebProcess/Notifications/WebNotificationManager.cpp:

(WebKit::WebNotificationManager::WebNotificationManager):
(WebKit::WebNotificationManager::show):
(WebKit::WebNotificationManager::cancel):
(WebKit::WebNotificationManager::clearNotifications):
(WebKit::WebNotificationManager::didDestroyNotification):

  • WebProcess/Notifications/WebNotificationManager.h:
  • WebProcess/WebCoreSupport/WebGeolocationClient.cpp:

(WebKit::WebGeolocationClient::requestPermission):
(WebKit::WebGeolocationClient::cancelPermissionRequest):

  • WebProcess/WebCoreSupport/WebGeolocationClient.h:

(WebKit::WebGeolocationClient::WebGeolocationClient):

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::m_cpuLimit):

  • WebProcess/WebProcess.h:

(WebKit::WebProcess::addSupplement):

  • WebProcess/cocoa/UserMediaCaptureManager.cpp:

(WebKit::UserMediaCaptureManager::UserMediaCaptureManager):

  • WebProcess/cocoa/UserMediaCaptureManager.h:

Source/WebKitLegacy/mac:

  • WebCoreSupport/WebGeolocationClient.h:
  • WebCoreSupport/WebGeolocationClient.mm:

(WebGeolocationClient::requestPermission):
(-[WebGeolocationPolicyListener initWithGeolocation:]):
(-[WebGeolocationPolicyListener initWithGeolocation:forWebView:]):
(-[WebGeolocationProviderInitializationListener initWithGeolocation:]):

  • WebView/WebView.mm:

(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView _geolocationDidFailWithMessage:]):

Source/WebKitLegacy/win:

  • WebCoreSupport/WebGeolocationClient.cpp:

(WebGeolocationClient::requestPermission):

  • WebCoreSupport/WebGeolocationClient.h:

(WebGeolocationClient::setEnableHighAccuracy): Deleted.
(WebGeolocationClient::cancelPermissionRequest): Deleted.

  • WebGeolocationPolicyListener.h:
  • WebView.cpp:

(WebView::initWithFrame):
(WebView::geolocationDidFailWithError):

Location:
trunk/Source
Files:
42 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r221742 r221743  
     12017-09-07  Alex Christensen  <achristensen@webkit.org>
     2
     3        Modernize Geolocation code
     4        https://bugs.webkit.org/show_bug.cgi?id=176496
     5
     6        Reviewed by Andy Estes.
     7
     8        No change in behavior.  Just more references instead of pointers.
     9
     10        * Modules/geolocation/Geolocation.cpp:
     11        (WebCore::createPositionError):
     12        (WebCore::Geolocation::resetAllGeolocationPermission):
     13        (WebCore::Geolocation::stop):
     14        (WebCore::Geolocation::requestPermission):
     15        (WebCore::Geolocation::setError):
     16        (WebCore::Geolocation::startUpdating):
     17        (WebCore::Geolocation::stopUpdating):
     18        * Modules/geolocation/Geolocation.h:
     19        * Modules/geolocation/GeolocationClient.h:
     20        * Modules/geolocation/GeolocationController.cpp:
     21        (WebCore::GeolocationController::addObserver):
     22        (WebCore::GeolocationController::removeObserver):
     23        (WebCore::GeolocationController::requestPermission):
     24        (WebCore::GeolocationController::cancelPermissionRequest):
     25        (WebCore::GeolocationController::positionChanged):
     26        (WebCore::GeolocationController::errorOccurred):
     27        (WebCore::GeolocationController::activityStateDidChange):
     28        (WebCore::provideGeolocationTo):
     29        * Modules/geolocation/GeolocationController.h:
     30
    1312017-09-07  Adrian Perez de Castro  <aperez@igalia.com>
    232

  • trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp

    r217134 r221743  
    6666}
    6767
    68 static Ref<PositionError> createPositionError(GeolocationError* error)
     68static Ref<PositionError> createPositionError(GeolocationError& error)
    6969{
    7070    PositionError::ErrorCode code = PositionError::POSITION_UNAVAILABLE;
    71     switch (error->code()) {
     71    switch (error.code()) {
    7272    case GeolocationError::PermissionDenied:
    7373        code = PositionError::PERMISSION_DENIED;
    … …  
    7878    }
    7979
    80     return PositionError::create(code, error->message());
     80    return PositionError::create(code, error.message());
    8181}
    8282
    … …  
    248248        Page* page = this->page();
    249249        if (page)
    250             GeolocationController::from(page)->cancelPermissionRequest(this);
     250            GeolocationController::from(page)->cancelPermissionRequest(*this);
    251251
    252252        // This return is not technically correct as GeolocationController::cancelPermissionRequest() should have cleared the active request.
    … …  
    278278    Page* page = this->page();
    279279    if (page && m_allowGeolocation == InProgress)
    280         GeolocationController::from(page)->cancelPermissionRequest(this);
     280        GeolocationController::from(page)->cancelPermissionRequest(*this);
    281281    // The frame may be moving to a new page and we want to get the permissions from the new page's client.
    282282    m_allowGeolocation = Unknown;
    … …  
    647647
    648648    // Ask the embedder: it maintains the geolocation challenge policy itself.
    649     GeolocationController::from(page)->requestPermission(this);
     649    GeolocationController::from(page)->requestPermission(*this);
    650650}
    651651
    … …  
    691691}
    692692
    693 void Geolocation::setError(GeolocationError* error)
     693void Geolocation::setError(GeolocationError& error)
    694694{
    695695    if (m_isSuspended) {
    … …  
    708708        return false;
    709709
    710     GeolocationController::from(page)->addObserver(this, notifier->options().enableHighAccuracy);
     710    GeolocationController::from(page)->addObserver(*this, notifier->options().enableHighAccuracy);
    711711    return true;
    712712}
    … …  
    718718        return;
    719719
    720     GeolocationController::from(page)->removeObserver(this);
     720    GeolocationController::from(page)->removeObserver(*this);
    721721}
    722722

  • trunk/Source/WebCore/Modules/geolocation/Geolocation.h

    r217134 r221743  
    7070
    7171    void positionChanged();
    72     void setError(GeolocationError*);
     72    void setError(GeolocationError&);
    7373    bool shouldBlockGeolocationRequests();
    7474

  • trunk/Source/WebCore/Modules/geolocation/GeolocationClient.h

    r208646 r221743  
    4545    virtual GeolocationPosition* lastPosition() = 0;
    4646
    47     virtual void requestPermission(Geolocation*) = 0;
    48     virtual void cancelPermissionRequest(Geolocation*) = 0;
     47    virtual void requestPermission(Geolocation&) = 0;
     48    virtual void cancelPermissionRequest(Geolocation&) = 0;
    4949
    50     void provideGeolocationTo(Page*, GeolocationClient*);
     50    void provideGeolocationTo(Page*, GeolocationClient&);
    5151
    5252protected:
    … …  
    5454};
    5555
    56 WEBCORE_EXPORT void provideGeolocationTo(Page*, GeolocationClient*);
     56WEBCORE_EXPORT void provideGeolocationTo(Page*, GeolocationClient&);
    5757
    5858} // namespace WebCore

  • trunk/Source/WebCore/Modules/geolocation/GeolocationController.cpp

    r208225 r221743  
    5353}
    5454
    55 void GeolocationController::addObserver(Geolocation* observer, bool enableHighAccuracy)
     55void GeolocationController::addObserver(Geolocation& observer, bool enableHighAccuracy)
    5656{
    5757    // This may be called multiple times with the same observer, though removeObserver()
    … …  
    6868}
    6969
    70 void GeolocationController::removeObserver(Geolocation* observer)
     70void GeolocationController::removeObserver(Geolocation& observer)
    7171{
    7272    if (!m_observers.contains(observer))
    … …  
    8282}
    8383
    84 void GeolocationController::requestPermission(Geolocation* geolocation)
     84void GeolocationController::requestPermission(Geolocation& geolocation)
    8585{
    8686    if (!m_page.isVisible()) {
    87         m_pendedPermissionRequest.add(geolocation);
     87        m_pendingPermissionRequest.add(geolocation);
    8888        return;
    8989    }
    … …  
    9292}
    9393
    94 void GeolocationController::cancelPermissionRequest(Geolocation* geolocation)
     94void GeolocationController::cancelPermissionRequest(Geolocation& geolocation)
    9595{
    96     if (m_pendedPermissionRequest.remove(geolocation))
     96    if (m_pendingPermissionRequest.remove(geolocation))
    9797        return;
    9898
    … …  
    103103{
    104104    m_lastPosition = position;
    105     Vector<RefPtr<Geolocation>> observersVector;
    106     copyToVector(m_observers, observersVector);
     105    Vector<Ref<Geolocation>> observersVector;
     106    observersVector.reserveInitialCapacity(m_observers.size());
     107    for (auto& observer : m_observers)
     108        observersVector.uncheckedAppend(observer.copyRef());
    107109    for (auto& observer : observersVector)
    108110        observer->positionChanged();
    109111}
    110112
    111 void GeolocationController::errorOccurred(GeolocationError* error)
     113void GeolocationController::errorOccurred(GeolocationError& error)
    112114{
    113     Vector<RefPtr<Geolocation>> observersVector;
    114     copyToVector(m_observers, observersVector);
     115    Vector<Ref<Geolocation>> observersVector;
     116    observersVector.reserveInitialCapacity(m_observers.size());
     117    for (auto& observer : m_observers)
     118        observersVector.uncheckedAppend(observer.copyRef());
    115119    for (auto& observer : observersVector)
    116120        observer->setError(error);
    … …  
    139143        return;
    140144
    141     HashSet<RefPtr<Geolocation>> pendedPermissionRequests = WTFMove(m_pendedPermissionRequest);
     145    auto pendedPermissionRequests = WTFMove(m_pendingPermissionRequest);
    142146    for (auto& permissionRequest : pendedPermissionRequests)
    143147        m_client.requestPermission(permissionRequest.get());
    … …  
    149153}
    150154
    151 void provideGeolocationTo(Page* page, GeolocationClient* client)
     155void provideGeolocationTo(Page* page, GeolocationClient& client)
    152156{
    153157    ASSERT(page);
    154     ASSERT(client);
    155     Supplement<Page>::provideTo(page, GeolocationController::supplementName(), std::make_unique<GeolocationController>(*page, *client));
     158    Supplement<Page>::provideTo(page, GeolocationController::supplementName(), std::make_unique<GeolocationController>(*page, client));
    156159}
    157160   

  • trunk/Source/WebCore/Modules/geolocation/GeolocationController.h

    r208646 r221743  
    4848    ~GeolocationController();
    4949
    50     void addObserver(Geolocation*, bool enableHighAccuracy);
    51     void removeObserver(Geolocation*);
     50    void addObserver(Geolocation&, bool enableHighAccuracy);
     51    void removeObserver(Geolocation&);
    5252
    53     void requestPermission(Geolocation*);
    54     void cancelPermissionRequest(Geolocation*);
     53    void requestPermission(Geolocation&);
     54    void cancelPermissionRequest(Geolocation&);
    5555
    5656    WEBCORE_EXPORT void positionChanged(GeolocationPosition*);
    57     WEBCORE_EXPORT void errorOccurred(GeolocationError*);
     57    WEBCORE_EXPORT void errorOccurred(GeolocationError&);
    5858
    5959    GeolocationPosition* lastPosition();
    … …  
    7272    RefPtr<GeolocationPosition> m_lastPosition;
    7373
    74     typedef HashSet<RefPtr<Geolocation>> ObserversSet;
     74    typedef HashSet<Ref<Geolocation>> ObserversSet;
    7575    // All observers; both those requesting high accuracy and those not.
    7676    ObserversSet m_observers;
    … …  
    7878
    7979    // While the page is not visible, we pend permission requests.
    80     HashSet<RefPtr<Geolocation>> m_pendedPermissionRequest;
     80    HashSet<Ref<Geolocation>> m_pendingPermissionRequest;
    8181};
    8282

  • trunk/Source/WebCore/platform/mock/GeolocationClientMock.cpp

    r216724 r221743  
    8888}
    8989
    90 void GeolocationClientMock::requestPermission(Geolocation* geolocation)
     90void GeolocationClientMock::requestPermission(Geolocation& geolocation)
    9191{
    92     m_pendingPermission.add(geolocation);
     92    m_pendingPermission.add(&geolocation);
    9393    if (m_permissionState != PermissionStateUnset)
    9494        asyncUpdatePermission();
    9595}
    9696
    97 void GeolocationClientMock::cancelPermissionRequest(Geolocation* geolocation)
     97void GeolocationClientMock::cancelPermissionRequest(Geolocation& geolocation)
    9898{
    9999    // Called from Geolocation::disconnectFrame() in response to Frame destruction.
    100     m_pendingPermission.remove(geolocation);
     100    m_pendingPermission.remove(&geolocation);
    101101    if (m_pendingPermission.isEmpty() && m_permissionTimer.isActive())
    102102        m_permissionTimer.stop();
    … …  
    177177        m_controller->positionChanged(m_lastPosition.get());
    178178    } else if (m_hasError) {
    179         RefPtr<GeolocationError> geolocatioError = GeolocationError::create(GeolocationError::PositionUnavailable, m_errorMessage);
     179        auto geolocatioError = GeolocationError::create(GeolocationError::PositionUnavailable, m_errorMessage);
    180180        m_controller->errorOccurred(geolocatioError.get());
    181181    }

  • trunk/Source/WebCore/platform/mock/GeolocationClientMock.h

    r216724 r221743  
    3030 */
    3131
    32 #ifndef GeolocationClientMock_h
    33 #define GeolocationClientMock_h
     32#pragma once
    3433
    3534#include "GeolocationClient.h"
    … …  
    6564    void setEnableHighAccuracy(bool) override;
    6665    GeolocationPosition* lastPosition() override;
    67     void requestPermission(Geolocation*) override;
    68     void cancelPermissionRequest(Geolocation*) override;
     66    void requestPermission(Geolocation&) override;
     67    void cancelPermissionRequest(Geolocation&) override;
    6968
    7069private:
    … …  
    9594
    9695}
    97 
    98 #endif

  • trunk/Source/WebKit/ChangeLog

    r221714 r221743  
     12017-09-07  Alex Christensen  <achristensen@webkit.org>
     2
     3        Modernize Geolocation code
     4        https://bugs.webkit.org/show_bug.cgi?id=176496
     5
     6        Reviewed by Andy Estes.
     7
     8        Making the GeolocationPermissionRequestManager take a reference instead of a pointer
     9        spilled into making the other supplement constructors do the same.
     10
     11        * NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp:
     12        (WebKit::LegacyCustomProtocolManager::LegacyCustomProtocolManager):
     13        (WebKit::LegacyCustomProtocolManager::startLoading):
     14        (WebKit::LegacyCustomProtocolManager::stopLoading):
     15        * NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.h:
     16        * NetworkProcess/NetworkProcess.h:
     17        (WebKit::NetworkProcess::addSupplement):
     18        * Shared/Authentication/AuthenticationManager.cpp:
     19        (WebKit::AuthenticationManager::AuthenticationManager):
     20        (WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):
     21        * Shared/Authentication/AuthenticationManager.h:
     22        * UIProcess/API/APIUIClient.h:
     23        (API::UIClient::decidePolicyForGeolocationPermissionRequest):
     24        * UIProcess/API/C/WKPage.cpp:
     25        (WKPageSetPageUIClient):
     26        * UIProcess/WebPageProxy.cpp:
     27        (WebKit::WebPageProxy::requestGeolocationPermissionForFrame):
     28        * WebProcess/Cookies/WebCookieManager.cpp:
     29        (WebKit::WebCookieManager::WebCookieManager):
     30        (WebKit::WebCookieManager::getHostnamesWithCookies):
     31        (WebKit::WebCookieManager::deleteCookie):
     32        (WebKit::WebCookieManager::deleteAllCookiesModifiedSince):
     33        (WebKit::WebCookieManager::getAllCookies):
     34        (WebKit::WebCookieManager::getCookies):
     35        (WebKit::WebCookieManager::setCookie):
     36        (WebKit::WebCookieManager::setCookies):
     37        (WebKit::WebCookieManager::notifyCookiesDidChange):
     38        (WebKit::WebCookieManager::setHTTPCookieAcceptPolicy):
     39        (WebKit::WebCookieManager::getHTTPCookieAcceptPolicy):
     40        * WebProcess/Cookies/WebCookieManager.h:
     41        * WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp:
     42        (WebKit::GeolocationPermissionRequestManager::GeolocationPermissionRequestManager):
     43        (WebKit::GeolocationPermissionRequestManager::startRequestForGeolocation):
     44        (WebKit::GeolocationPermissionRequestManager::cancelRequestForGeolocation):
     45        * WebProcess/Geolocation/GeolocationPermissionRequestManager.h:
     46        * WebProcess/Geolocation/WebGeolocationManager.cpp:
     47        (WebKit::WebGeolocationManager::WebGeolocationManager):
     48        (WebKit::WebGeolocationManager::registerWebPage):
     49        (WebKit::WebGeolocationManager::unregisterWebPage):
     50        (WebKit::WebGeolocationManager::setEnableHighAccuracyForPage):
     51        (WebKit::WebGeolocationManager::didChangePosition):
     52        (WebKit::WebGeolocationManager::didFailToDeterminePosition):
     53        (WebKit::WebGeolocationManager::resetPermissions):
     54        * WebProcess/Geolocation/WebGeolocationManager.h:
     55        * WebProcess/MediaCache/WebMediaKeyStorageManager.h:
     56        (WebKit::WebMediaKeyStorageManager::WebMediaKeyStorageManager):
     57        * WebProcess/Notifications/WebNotificationManager.cpp:
     58        (WebKit::WebNotificationManager::WebNotificationManager):
     59        (WebKit::WebNotificationManager::show):
     60        (WebKit::WebNotificationManager::cancel):
     61        (WebKit::WebNotificationManager::clearNotifications):
     62        (WebKit::WebNotificationManager::didDestroyNotification):
     63        * WebProcess/Notifications/WebNotificationManager.h:
     64        * WebProcess/WebCoreSupport/WebGeolocationClient.cpp:
     65        (WebKit::WebGeolocationClient::requestPermission):
     66        (WebKit::WebGeolocationClient::cancelPermissionRequest):
     67        * WebProcess/WebCoreSupport/WebGeolocationClient.h:
     68        (WebKit::WebGeolocationClient::WebGeolocationClient):
     69        * WebProcess/WebPage/WebPage.cpp:
     70        (WebKit::m_cpuLimit):
     71        * WebProcess/WebProcess.h:
     72        (WebKit::WebProcess::addSupplement):
     73        * WebProcess/cocoa/UserMediaCaptureManager.cpp:
     74        (WebKit::UserMediaCaptureManager::UserMediaCaptureManager):
     75        * WebProcess/cocoa/UserMediaCaptureManager.h:
     76
    1772017-09-06  Alex Christensen  <achristensen@webkit.org>
    278

  • trunk/Source/WebKit/NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp

    r213441 r221743  
    4848}
    4949
    50 LegacyCustomProtocolManager::LegacyCustomProtocolManager(ChildProcess* childProcess)
     50LegacyCustomProtocolManager::LegacyCustomProtocolManager(ChildProcess& childProcess)
    5151    : m_childProcess(childProcess)
    5252{
    53     m_childProcess->addMessageReceiver(Messages::LegacyCustomProtocolManager::messageReceiverName(), *this);
     53    m_childProcess.addMessageReceiver(Messages::LegacyCustomProtocolManager::messageReceiverName(), *this);
    5454}
    5555
    … …  
    7878void LegacyCustomProtocolManager::startLoading(uint64_t customProtocolID, const WebCore::ResourceRequest& request)
    7979{
    80     m_childProcess->send(Messages::LegacyCustomProtocolManagerProxy::StartLoading(customProtocolID, request));
     80    m_childProcess.send(Messages::LegacyCustomProtocolManagerProxy::StartLoading(customProtocolID, request));
    8181}
    8282
    8383void LegacyCustomProtocolManager::stopLoading(uint64_t customProtocolID)
    8484{
    85     m_childProcess->send(Messages::LegacyCustomProtocolManagerProxy::StopLoading(customProtocolID), 0);
     85    m_childProcess.send(Messages::LegacyCustomProtocolManagerProxy::StopLoading(customProtocolID), 0);
    8686}
    8787

  • trunk/Source/WebKit/NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.h

    r213441 r221743  
    6666    WTF_MAKE_NONCOPYABLE(LegacyCustomProtocolManager);
    6767public:
    68     explicit LegacyCustomProtocolManager(ChildProcess*);
     68    explicit LegacyCustomProtocolManager(ChildProcess&);
    6969
    7070    static const char* supplementName();
    … …  
    114114    void registerProtocolClass();
    115115
    116     ChildProcess* m_childProcess;
     116    ChildProcess& m_childProcess;
    117117
    118118    typedef HashMap<uint64_t, CustomProtocol> CustomProtocolMap;

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

    r221683 r221743  
    8787    void addSupplement()
    8888    {
    89         m_supplements.add(T::supplementName(), std::make_unique<T>(this));
     89        m_supplements.add(T::supplementName(), std::make_unique<T>(*this));
    9090    }
    9191

  • trunk/Source/WebKit/Shared/Authentication/AuthenticationManager.cpp

    r221059 r221743  
    6363}
    6464
    65 AuthenticationManager::AuthenticationManager(ChildProcess* process)
     65AuthenticationManager::AuthenticationManager(ChildProcess& process)
    6666    : m_process(process)
    6767{
    68     m_process->addMessageReceiver(Messages::AuthenticationManager::messageReceiverName(), *this);
     68    m_process.addMessageReceiver(Messages::AuthenticationManager::messageReceiverName(), *this);
    6969}
    7070
    … …  
    127127        return;
    128128   
    129     m_process->send(Messages::WebPageProxy::DidReceiveAuthenticationChallenge(frame->frameID(), authenticationChallenge, challengeID), frame->page()->pageID());
     129    m_process.send(Messages::WebPageProxy::DidReceiveAuthenticationChallenge(frame->frameID(), authenticationChallenge, challengeID), frame->page()->pageID());
    130130}
    131131
    … …  
    142142        return;
    143143   
    144     m_process->send(Messages::NetworkProcessProxy::DidReceiveAuthenticationChallenge(pageID, frameID, authenticationChallenge, challengeID));
     144    m_process.send(Messages::NetworkProcessProxy::DidReceiveAuthenticationChallenge(pageID, frameID, authenticationChallenge, challengeID));
    145145}
    146146
    … …  
    170170        return;
    171171   
    172     m_process->send(Messages::NetworkProcessProxy::DidReceiveAuthenticationChallenge(pageID, frameID, authenticationChallenge, challengeID));
     172    m_process.send(Messages::NetworkProcessProxy::DidReceiveAuthenticationChallenge(pageID, frameID, authenticationChallenge, challengeID));
    173173}
    174174#endif

  • trunk/Source/WebKit/Shared/Authentication/AuthenticationManager.h

    r221059 r221743  
    6060    WTF_MAKE_NONCOPYABLE(AuthenticationManager);
    6161public:
    62     explicit AuthenticationManager(ChildProcess*);
     62    explicit AuthenticationManager(ChildProcess&);
    6363
    6464    static const char* supplementName();
    … …  
    119119    Vector<uint64_t> coalesceChallengesMatching(uint64_t challengeID) const;
    120120
    121     ChildProcess* m_process;
     121    ChildProcess& m_process;
    122122
    123123    HashMap<uint64_t, Challenge> m_challenges;

  • trunk/Source/WebKit/UIProcess/API/APIUIClient.h

    r221658 r221743  
    128128
    129129    virtual bool runOpenPanel(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, OpenPanelParameters*, WebKit::WebOpenPanelResultListenerProxy*) { return false; }
    130     virtual bool decidePolicyForGeolocationPermissionRequest(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, SecurityOrigin*, WebKit::GeolocationPermissionRequestProxy*) { return false; }
     130    virtual bool decidePolicyForGeolocationPermissionRequest(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, SecurityOrigin&, WebKit::GeolocationPermissionRequestProxy&) { return false; }
    131131    virtual bool decidePolicyForUserMediaPermissionRequest(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, SecurityOrigin&, SecurityOrigin&, WebKit::UserMediaPermissionRequestProxy&) { return false; }
    132132    virtual bool checkUserMediaPermissionForOrigin(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, SecurityOrigin&, SecurityOrigin&, WebKit::UserMediaPermissionCheckProxy&) { return false; }

  • trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp

    r221658 r221743  
    19541954        }
    19551955
    1956         bool decidePolicyForGeolocationPermissionRequest(WebPageProxy* page, WebFrameProxy* frame, API::SecurityOrigin* origin, GeolocationPermissionRequestProxy* permissionRequest) final
     1956        bool decidePolicyForGeolocationPermissionRequest(WebPageProxy& page, WebFrameProxy& frame, API::SecurityOrigin& origin, GeolocationPermissionRequestProxy& permissionRequest) final
    19571957        {
    19581958            if (!m_client.decidePolicyForGeolocationPermissionRequest)
    19591959                return false;
    19601960
    1961             m_client.decidePolicyForGeolocationPermissionRequest(toAPI(page), toAPI(frame), toAPI(origin), toAPI(permissionRequest), m_client.base.clientInfo);
     1961            m_client.decidePolicyForGeolocationPermissionRequest(toAPI(&page), toAPI(&frame), toAPI(&origin), toAPI(&permissionRequest), m_client.base.clientInfo);
    19621962            return true;
    19631963        }

  • trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp

    r221658 r221743  
    183183    }
    184184
    185     bool decidePolicyForGeolocationPermissionRequest(WebPageProxy*, WebFrameProxy*, API::SecurityOrigin*, GeolocationPermissionRequestProxy* permissionRequest) override
    186     {
    187         GRefPtr<WebKitGeolocationPermissionRequest> geolocationPermissionRequest = adoptGRef(webkitGeolocationPermissionRequestCreate(permissionRequest));
     185    bool decidePolicyForGeolocationPermissionRequest(WebPageProxy&, WebFrameProxy&, API::SecurityOrigin&, GeolocationPermissionRequestProxy& permissionRequest) final
     186    {
     187        GRefPtr<WebKitGeolocationPermissionRequest> geolocationPermissionRequest = adoptGRef(webkitGeolocationPermissionRequestCreate(&permissionRequest));
    188188        webkitWebViewMakePermissionRequest(m_webView, WEBKIT_PERMISSION_REQUEST(geolocationPermissionRequest.get()));
    189189        return true;

  • trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

    r221707 r221743  
    58105810
    58115811    // FIXME: Geolocation should probably be using toString() as its string representation instead of databaseIdentifier().
    5812     RefPtr<API::SecurityOrigin> origin = API::SecurityOrigin::create(SecurityOriginData::fromDatabaseIdentifier(originIdentifier)->securityOrigin());
    5813     RefPtr<GeolocationPermissionRequestProxy> request = m_geolocationPermissionRequestManager.createRequest(geolocationID);
    5814 
    5815     if (m_uiClient->decidePolicyForGeolocationPermissionRequest(this, frame, origin.get(), request.get()))
    5816         return;
    5817 
    5818     if (m_pageClient.decidePolicyForGeolocationPermissionRequest(*frame, *origin, *request))
     5812    auto origin = API::SecurityOrigin::create(SecurityOriginData::fromDatabaseIdentifier(originIdentifier)->securityOrigin());
     5813    auto request = m_geolocationPermissionRequestManager.createRequest(geolocationID);
     5814
     5815    if (m_uiClient->decidePolicyForGeolocationPermissionRequest(*this, *frame, origin.get(), request.get()))
     5816        return;
     5817
     5818    if (m_pageClient.decidePolicyForGeolocationPermissionRequest(*frame, origin.get(), request.get()))
    58195819        return;
    58205820

  • trunk/Source/WebKit/WebProcess/Cookies/WebCookieManager.cpp

    r220857 r221743  
    4949}
    5050
    51 WebCookieManager::WebCookieManager(ChildProcess* process)
     51WebCookieManager::WebCookieManager(ChildProcess& process)
    5252    : m_process(process)
    5353{
    54     m_process->addMessageReceiver(Messages::WebCookieManager::messageReceiverName(), *this);
     54    m_process.addMessageReceiver(Messages::WebCookieManager::messageReceiverName(), *this);
    5555}
    5656
    … …  
    6464    copyToVector(hostnames, hostnameList);
    6565
    66     m_process->send(Messages::WebCookieManagerProxy::DidGetHostnamesWithCookies(hostnameList, callbackID), 0);
     66    m_process.send(Messages::WebCookieManagerProxy::DidGetHostnamesWithCookies(hostnameList, callbackID), 0);
    6767}
    6868
    … …  
    8585        storageSession->deleteCookie(cookie);
    8686
    87     m_process->send(Messages::WebCookieManagerProxy::DidDeleteCookies(callbackID), 0);
     87    m_process.send(Messages::WebCookieManagerProxy::DidDeleteCookies(callbackID), 0);
    8888}
    8989
    … …  
    9393        WebCore::deleteAllCookiesModifiedSince(*storageSession, time);
    9494
    95     m_process->send(Messages::WebCookieManagerProxy::DidDeleteCookies(callbackID), 0);
     95    m_process.send(Messages::WebCookieManagerProxy::DidDeleteCookies(callbackID), 0);
    9696}
    9797
    … …  
    102102        cookies = storageSession->getAllCookies();
    103103
    104     m_process->send(Messages::WebCookieManagerProxy::DidGetCookies(cookies, callbackID), 0);
     104    m_process.send(Messages::WebCookieManagerProxy::DidGetCookies(cookies, callbackID), 0);
    105105}
    106106
    … …  
    111111        cookies = storageSession->getCookies(url);
    112112
    113     m_process->send(Messages::WebCookieManagerProxy::DidGetCookies(cookies, callbackID), 0);
     113    m_process.send(Messages::WebCookieManagerProxy::DidGetCookies(cookies, callbackID), 0);
    114114}
    115115
    … …  
    119119        storageSession->setCookie(cookie);
    120120
    121     m_process->send(Messages::WebCookieManagerProxy::DidSetCookies(callbackID), 0);
     121    m_process.send(Messages::WebCookieManagerProxy::DidSetCookies(callbackID), 0);
    122122}
    123123
    … …  
    127127        storageSession->setCookies(cookies, url, mainDocumentURL);
    128128
    129     m_process->send(Messages::WebCookieManagerProxy::DidSetCookies(callbackID), 0);
     129    m_process.send(Messages::WebCookieManagerProxy::DidSetCookies(callbackID), 0);
    130130}
    131131
    … …  
    133133{
    134134    ASSERT(RunLoop::isMain());
    135     m_process->send(Messages::WebCookieManagerProxy::CookiesDidChange(sessionID), 0);
     135    m_process.send(Messages::WebCookieManagerProxy::CookiesDidChange(sessionID), 0);
    136136}
    137137
    … …  
    156156
    157157    if (callbackID)
    158         m_process->send(Messages::WebCookieManagerProxy::DidSetHTTPCookieAcceptPolicy(callbackID.callbackID()), 0);
     158        m_process.send(Messages::WebCookieManagerProxy::DidSetHTTPCookieAcceptPolicy(callbackID.callbackID()), 0);
    159159}
    160160
    161161void WebCookieManager::getHTTPCookieAcceptPolicy(CallbackID callbackID)
    162162{
    163     m_process->send(Messages::WebCookieManagerProxy::DidGetHTTPCookieAcceptPolicy(platformGetHTTPCookieAcceptPolicy(), callbackID), 0);
     163    m_process.send(Messages::WebCookieManagerProxy::DidGetHTTPCookieAcceptPolicy(platformGetHTTPCookieAcceptPolicy(), callbackID), 0);
    164164}
    165165

  • trunk/Source/WebKit/WebProcess/Cookies/WebCookieManager.h

    r220887 r221743  
    5555    WTF_MAKE_NONCOPYABLE(WebCookieManager);
    5656public:
    57     WebCookieManager(ChildProcess*);
     57    WebCookieManager(ChildProcess&);
    5858
    5959    static const char* supplementName();
    … …  
    9090    void stopObservingCookieChanges(PAL::SessionID);
    9191
    92     ChildProcess* m_process;
     92    ChildProcess& m_process;
    9393};
    9494

  • trunk/Source/WebKit/WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp

    r210859 r221743  
    5050}
    5151
    52 GeolocationPermissionRequestManager::GeolocationPermissionRequestManager(WebPage* page)
     52GeolocationPermissionRequestManager::GeolocationPermissionRequestManager(WebPage& page)
    5353    : m_page(page)
    5454{
    5555}
    5656
    57 void GeolocationPermissionRequestManager::startRequestForGeolocation(Geolocation* geolocation)
     57void GeolocationPermissionRequestManager::startRequestForGeolocation(Geolocation& geolocation)
    5858{
    59     Frame* frame = geolocation->frame();
     59    Frame* frame = geolocation.frame();
    6060
    6161    ASSERT_WITH_MESSAGE(frame, "It is not well understood in which cases the Geolocation is alive after its frame goes away. If you hit this assertion, please add a test covering this case.");
    6262    if (!frame) {
    63         geolocation->setIsAllowed(false);
     63        geolocation.setIsAllowed(false);
    6464        return;
    6565    }
    … …  
    6767    uint64_t geolocationID = generateGeolocationID();
    6868
    69     m_geolocationToIDMap.set(geolocation, geolocationID);
    70     m_idToGeolocationMap.set(geolocationID, geolocation);
     69    m_geolocationToIDMap.set(&geolocation, geolocationID);
     70    m_idToGeolocationMap.set(geolocationID, &geolocation);
    7171
    7272    WebFrame* webFrame = WebFrame::fromCoreFrame(*frame);
    … …  
    7575    SecurityOrigin& origin = frame->document()->securityOrigin();
    7676
    77     m_page->send(Messages::WebPageProxy::RequestGeolocationPermissionForFrame(geolocationID, webFrame->frameID(), SecurityOriginData::fromSecurityOrigin(origin).databaseIdentifier()));
     77    m_page.send(Messages::WebPageProxy::RequestGeolocationPermissionForFrame(geolocationID, webFrame->frameID(), SecurityOriginData::fromSecurityOrigin(origin).databaseIdentifier()));
    7878}
    7979
    80 void GeolocationPermissionRequestManager::cancelRequestForGeolocation(Geolocation* geolocation)
     80void GeolocationPermissionRequestManager::cancelRequestForGeolocation(Geolocation& geolocation)
    8181{
    82     uint64_t geolocationID = m_geolocationToIDMap.take(geolocation);
     82    uint64_t geolocationID = m_geolocationToIDMap.take(&geolocation);
    8383    if (!geolocationID)
    8484        return;

  • trunk/Source/WebKit/WebProcess/Geolocation/GeolocationPermissionRequestManager.h

    r95901 r221743  
    2424 */
    2525
    26 #ifndef GeolocationPermissionRequestManager_h
    27 #define GeolocationPermissionRequestManager_h
     26#pragma once
    2827
    2928#include <wtf/HashMap.h>
    … …  
    4039class GeolocationPermissionRequestManager {
    4140public:
    42     explicit GeolocationPermissionRequestManager(WebPage*);
     41    explicit GeolocationPermissionRequestManager(WebPage&);
    4342
    44     void startRequestForGeolocation(WebCore::Geolocation*);
    45     void cancelRequestForGeolocation(WebCore::Geolocation*);
     43    void startRequestForGeolocation(WebCore::Geolocation&);
     44    void cancelRequestForGeolocation(WebCore::Geolocation&);
    4645
    4746    void didReceiveGeolocationPermissionDecision(uint64_t geolocationID, bool allowed);
    … …  
    5352    GeolocationToIDMap m_geolocationToIDMap;
    5453
    55     WebPage* m_page;
     54    WebPage& m_page;
    5655};
    5756
    5857} // namespace WebKit
    59 
    60 #endif // GeolocationPermissionRequestManager_h

  • trunk/Source/WebKit/WebProcess/Geolocation/WebGeolocationManager.cpp

    r160464 r221743  
    4646}
    4747
    48 WebGeolocationManager::WebGeolocationManager(WebProcess* process)
     48WebGeolocationManager::WebGeolocationManager(WebProcess& process)
    4949    : m_process(process)
    5050{
    51     m_process->addMessageReceiver(Messages::WebGeolocationManager::messageReceiverName(), *this);
     51    m_process.addMessageReceiver(Messages::WebGeolocationManager::messageReceiverName(), *this);
    5252}
    5353
    54 void WebGeolocationManager::registerWebPage(WebPage* page)
     54void WebGeolocationManager::registerWebPage(WebPage& page)
    5555{
    5656    bool wasUpdating = isUpdating();
    5757
    58     m_pageSet.add(page);
     58    m_pageSet.add(&page);
    5959
    6060    if (!wasUpdating)
    61         m_process->parentProcessConnection()->send(Messages::WebGeolocationManagerProxy::StartUpdating(), 0);
     61        m_process.parentProcessConnection()->send(Messages::WebGeolocationManagerProxy::StartUpdating(), 0);
    6262}
    6363
    64 void WebGeolocationManager::unregisterWebPage(WebPage* page)
     64void WebGeolocationManager::unregisterWebPage(WebPage& page)
    6565{
    6666    bool highAccuracyWasEnabled = isHighAccuracyEnabled();
    6767
    68     m_pageSet.remove(page);
    69     m_highAccuracyPageSet.remove(page);
     68    m_pageSet.remove(&page);
     69    m_highAccuracyPageSet.remove(&page);
    7070
    7171    if (!isUpdating())
    72         m_process->parentProcessConnection()->send(Messages::WebGeolocationManagerProxy::StopUpdating(), 0);
     72        m_process.parentProcessConnection()->send(Messages::WebGeolocationManagerProxy::StopUpdating(), 0);
    7373    else {
    7474        bool highAccuracyShouldBeEnabled = isHighAccuracyEnabled();
    7575        if (highAccuracyWasEnabled != highAccuracyShouldBeEnabled)
    76             m_process->parentProcessConnection()->send(Messages::WebGeolocationManagerProxy::SetEnableHighAccuracy(highAccuracyShouldBeEnabled), 0);
     76            m_process.parentProcessConnection()->send(Messages::WebGeolocationManagerProxy::SetEnableHighAccuracy(highAccuracyShouldBeEnabled), 0);
    7777    }
    7878}
    7979
    80 void WebGeolocationManager::setEnableHighAccuracyForPage(WebPage* page, bool enabled)
     80void WebGeolocationManager::setEnableHighAccuracyForPage(WebPage& page, bool enabled)
    8181{
    8282    bool highAccuracyWasEnabled = isHighAccuracyEnabled();
    8383
    8484    if (enabled)
    85         m_highAccuracyPageSet.add(page);
     85        m_highAccuracyPageSet.add(&page);
    8686    else
    87         m_highAccuracyPageSet.remove(page);
     87        m_highAccuracyPageSet.remove(&page);
    8888
    8989    bool highAccuracyShouldBeEnabled = isHighAccuracyEnabled();
    9090    if (highAccuracyWasEnabled != highAccuracyShouldBeEnabled)
    91         m_process->parentProcessConnection()->send(Messages::WebGeolocationManagerProxy::SetEnableHighAccuracy(highAccuracyShouldBeEnabled), 0);
     91        m_process.parentProcessConnection()->send(Messages::WebGeolocationManagerProxy::SetEnableHighAccuracy(highAccuracyShouldBeEnabled), 0);
    9292}
    9393
    … …  
    9999    Vector<RefPtr<WebPage>> webPageCopy;
    100100    copyToVector(m_pageSet, webPageCopy);
    101     for (size_t i = 0; i < webPageCopy.size(); ++i) {
    102         WebPage* page = webPageCopy[i].get();
     101    for (auto& page : webPageCopy) {
    103102        if (page->corePage())
    104103            GeolocationController::from(page->corePage())->positionChanged(position.get());
    … …  
    113112#if ENABLE(GEOLOCATION)
    114113    // FIXME: Add localized error string.
    115     RefPtr<GeolocationError> error = GeolocationError::create(GeolocationError::PositionUnavailable, errorMessage);
     114    auto error = GeolocationError::create(GeolocationError::PositionUnavailable, errorMessage);
    116115
    117116    Vector<RefPtr<WebPage>> webPageCopy;
    118117    copyToVector(m_pageSet, webPageCopy);
    119     for (size_t i = 0; i < webPageCopy.size(); ++i) {
    120         WebPage* page = webPageCopy[i].get();
     118    for (auto& page : webPageCopy) {
    121119        if (page->corePage())
    122120            GeolocationController::from(page->corePage())->errorOccurred(error.get());
    … …  
    130128void WebGeolocationManager::resetPermissions()
    131129{
    132     m_process->resetAllGeolocationPermissions();
     130    m_process.resetAllGeolocationPermissions();
    133131}
    134132#endif // PLATFORM(IOS)

  • trunk/Source/WebKit/WebProcess/Geolocation/WebGeolocationManager.h

    r204668 r221743  
    2424 */
    2525
    26 #ifndef WebGeolocationManager_h
    27 #define WebGeolocationManager_h
     26#pragma once
    2827
    2928#include "MessageReceiver.h"
    … …  
    4746    WTF_MAKE_NONCOPYABLE(WebGeolocationManager);
    4847public:
    49     explicit WebGeolocationManager(WebProcess*);
     48    explicit WebGeolocationManager(WebProcess&);
    5049
    5150    static const char* supplementName();
    5251
    53     void registerWebPage(WebPage*);
    54     void unregisterWebPage(WebPage*);
    55     void setEnableHighAccuracyForPage(WebPage*, bool);
     52    void registerWebPage(WebPage&);
     53    void unregisterWebPage(WebPage&);
     54    void setEnableHighAccuracyForPage(WebPage&, bool);
    5655
    57     void requestPermission(WebCore::Geolocation*);
     56    void requestPermission(WebCore::Geolocation&);
    5857
    5958private:
    … …  
    7069#endif // PLATFORM(IOS)
    7170
    72     WebProcess* m_process;
     71    WebProcess& m_process;
    7372    HashSet<WebPage*> m_pageSet;
    7473    HashSet<WebPage*> m_highAccuracyPageSet;
    … …  
    7675
    7776} // namespace WebKit
    78 
    79 #endif // WebGeolocationManager_h

  • trunk/Source/WebKit/WebProcess/MediaCache/WebMediaKeyStorageManager.h

    r209871 r221743  
    2424 */
    2525
    26 #ifndef WebMediaKeyStorageManager_h
    27 #define WebMediaKeyStorageManager_h
     26#pragma once
    2827
    2928#include "WebProcessSupplement.h"
    … …  
    4241    WTF_MAKE_NONCOPYABLE(WebMediaKeyStorageManager);
    4342public:
    44     explicit WebMediaKeyStorageManager(WebProcess*) { }
     43    explicit WebMediaKeyStorageManager(WebProcess&) { }
    4544    virtual ~WebMediaKeyStorageManager() { }
    4645
    … …  
    6261
    6362}
    64 
    65 #endif

  • trunk/Source/WebKit/WebProcess/Notifications/WebNotificationManager.cpp

    r217041 r221743  
    6262}
    6363
    64 WebNotificationManager::WebNotificationManager(WebProcess* process)
     64WebNotificationManager::WebNotificationManager(WebProcess& process)
    6565    : m_process(process)
    6666{
    6767#if ENABLE(NOTIFICATIONS)
    68     m_process->addMessageReceiver(Messages::WebNotificationManager::messageReceiverName(), *this);
     68    m_process.addMessageReceiver(Messages::WebNotificationManager::messageReceiverName(), *this);
    6969#endif
    7070}
    … …  
    152152    it->value.append(notificationID);
    153153
    154     m_process->parentProcessConnection()->send(Messages::WebPageProxy::ShowNotification(notification->title(), notification->body(), notification->icon().string(), notification->tag(), notification->lang(), notification->dir(), notification->scriptExecutionContext()->securityOrigin()->toString(), notificationID), page->pageID());
     154    m_process.parentProcessConnection()->send(Messages::WebPageProxy::ShowNotification(notification->title(), notification->body(), notification->icon().string(), notification->tag(), notification->lang(), notification->dir(), notification->scriptExecutionContext()->securityOrigin()->toString(), notificationID), page->pageID());
    155155    return true;
    156156#else
    … …  
    171171        return;
    172172   
    173     m_process->parentProcessConnection()->send(Messages::WebPageProxy::CancelNotification(notificationID), page->pageID());
     173    m_process.parentProcessConnection()->send(Messages::WebPageProxy::CancelNotification(notificationID), page->pageID());
    174174#else
    175175    UNUSED_PARAM(notification);
    … …  
    186186
    187187    Vector<uint64_t>& notificationIDs = it->value;
    188     m_process->parentProcessConnection()->send(Messages::WebPageProxy::ClearNotifications(notificationIDs), page->pageID());
     188    m_process.parentProcessConnection()->send(Messages::WebPageProxy::ClearNotifications(notificationIDs), page->pageID());
    189189    size_t count = notificationIDs.size();
    190190    for (size_t i = 0; i < count; ++i) {
    … …  
    212212    m_notificationIDMap.remove(notificationID);
    213213    removeNotificationFromContextMap(notificationID, notification);
    214     m_process->parentProcessConnection()->send(Messages::WebPageProxy::DidDestroyNotification(notificationID), page->pageID());
     214    m_process.parentProcessConnection()->send(Messages::WebPageProxy::DidDestroyNotification(notificationID), page->pageID());
    215215#else
    216216    UNUSED_PARAM(notification);

  • trunk/Source/WebKit/WebProcess/Notifications/WebNotificationManager.h

    r216641 r221743  
    2424 */
    2525
    26 #ifndef WebNotificationManager_h
    27 #define WebNotificationManager_h
     26#pragma once
    2827
    2928#include "MessageReceiver.h"
    … …  
    4948    WTF_MAKE_NONCOPYABLE(WebNotificationManager);
    5049public:
    51     explicit WebNotificationManager(WebProcess*);
     50    explicit WebNotificationManager(WebProcess&);
    5251    ~WebNotificationManager();
    5352
    … …  
    8584#endif
    8685
    87     WebProcess* m_process;
     86    WebProcess& m_process;
    8887
    8988#if ENABLE(NOTIFICATIONS)
    … …  
    102101
    103102} // namespace WebKit
    104 
    105 #endif

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebGeolocationClient.cpp

    r217041 r221743  
    7171}
    7272
    73 void WebGeolocationClient::requestPermission(Geolocation* geolocation)
     73void WebGeolocationClient::requestPermission(Geolocation& geolocation)
    7474{
    75     m_page->geolocationPermissionRequestManager().startRequestForGeolocation(geolocation);
     75    m_page.geolocationPermissionRequestManager().startRequestForGeolocation(geolocation);
    7676}
    7777
    78 void WebGeolocationClient::cancelPermissionRequest(Geolocation* geolocation)
     78void WebGeolocationClient::cancelPermissionRequest(Geolocation& geolocation)
    7979{
    80     m_page->geolocationPermissionRequestManager().cancelRequestForGeolocation(geolocation);
     80    m_page.geolocationPermissionRequestManager().cancelRequestForGeolocation(geolocation);
    8181}
    8282

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebGeolocationClient.h

    r197563 r221743  
    2424 */
    2525
    26 #ifndef WebGeolocationClient_h
    27 #define WebGeolocationClient_h
     26#pragma once
    2827
    2928#include <WebCore/GeolocationClient.h>
    … …  
    3534class WebGeolocationClient : public WebCore::GeolocationClient {
    3635public:
    37     WebGeolocationClient(WebPage* page)
     36    WebGeolocationClient(WebPage& page)
    3837        : m_page(page)
    3938    {
    … …  
    5150    WebCore::GeolocationPosition* lastPosition() override;
    5251
    53     void requestPermission(WebCore::Geolocation*) override;
    54     void cancelPermissionRequest(WebCore::Geolocation*) override;
     52    void requestPermission(WebCore::Geolocation&) override;
     53    void cancelPermissionRequest(WebCore::Geolocation&) override;
    5554
    56 
    57     WebPage* m_page;
     55    WebPage& m_page;
    5856};
    5957
    6058} // namespace WebKit
    61 
    62 #endif // WebGeolocationClient_h

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

    r221465 r221743  
    335335    , m_userContentController(WebUserContentController::getOrCreate(parameters.userContentControllerID))
    336336#if ENABLE(GEOLOCATION)
    337     , m_geolocationPermissionRequestManager(makeUniqueRef<GeolocationPermissionRequestManager>(this))
     337    , m_geolocationPermissionRequestManager(makeUniqueRef<GeolocationPermissionRequestManager>(*this))
    338338#endif
    339339#if ENABLE(MEDIA_STREAM)
    … …  
    428428
    429429#if ENABLE(GEOLOCATION)
    430     WebCore::provideGeolocationTo(m_page.get(), new WebGeolocationClient(this));
     430    WebCore::provideGeolocationTo(m_page.get(), *new WebGeolocationClient(*this));
    431431#endif
    432432#if ENABLE(NOTIFICATIONS)

  • trunk/Source/WebKit/WebProcess/WebProcess.h

    r220931 r221743  
    114114    void addSupplement()
    115115    {
    116         m_supplements.add(T::supplementName(), std::make_unique<T>(this));
     116        m_supplements.add(T::supplementName(), std::make_unique<T>(*this));
    117117    }
    118118

  • trunk/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp

    r219511 r221743  
    153153};
    154154
    155 UserMediaCaptureManager::UserMediaCaptureManager(WebProcess* process)
    156     : m_process(*process)
     155UserMediaCaptureManager::UserMediaCaptureManager(WebProcess& process)
     156    : m_process(process)
    157157{
    158158    m_process.addMessageReceiver(Messages::UserMediaCaptureManager::messageReceiverName(), *this);

  • trunk/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.h

    r219511 r221743  
    4545class UserMediaCaptureManager : public WebProcessSupplement, public IPC::MessageReceiver, public WebCore::RealtimeMediaSource::AudioCaptureFactory, public WebCore::RealtimeMediaSource::VideoCaptureFactory {
    4646public:
    47     explicit UserMediaCaptureManager(WebProcess*);
     47    explicit UserMediaCaptureManager(WebProcess&);
    4848    ~UserMediaCaptureManager();
    4949

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r221617 r221743  
     12017-09-07  Alex Christensen  <achristensen@webkit.org>
     2
     3        Modernize Geolocation code
     4        https://bugs.webkit.org/show_bug.cgi?id=176496
     5
     6        Reviewed by Andy Estes.
     7
     8        * WebCoreSupport/WebGeolocationClient.h:
     9        * WebCoreSupport/WebGeolocationClient.mm:
     10        (WebGeolocationClient::requestPermission):
     11        (-[WebGeolocationPolicyListener initWithGeolocation:]):
     12        (-[WebGeolocationPolicyListener initWithGeolocation:forWebView:]):
     13        (-[WebGeolocationProviderInitializationListener initWithGeolocation:]):
     14        * WebView/WebView.mm:
     15        (-[WebView _commonInitializationWithFrameName:groupName:]):
     16        (-[WebView _geolocationDidFailWithMessage:]):
     17
    1182017-09-05  Tim Horton  <timothy_horton@apple.com>
    219

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebGeolocationClient.h

    r197563 r221743  
    5050    WebCore::GeolocationPosition* lastPosition() override;
    5151
    52     void requestPermission(WebCore::Geolocation*) override;
    53     void cancelPermissionRequest(WebCore::Geolocation*) override { };
     52    void requestPermission(WebCore::Geolocation&) override;
     53    void cancelPermissionRequest(WebCore::Geolocation&) override { };
    5454
    5555private:

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebGeolocationClient.mm

    r210859 r221743  
    5151    RefPtr<Geolocation> _geolocation;
    5252}
    53 - (id)initWithGeolocation:(Geolocation*)geolocation;
     53- (id)initWithGeolocation:(Geolocation&)geolocation;
    5454@end
    5555#else
    … …  
    6868    RefPtr<Geolocation> m_geolocation;
    6969}
    70 - (id)initWithGeolocation:(Geolocation*)geolocation;
     70- (id)initWithGeolocation:(Geolocation&)geolocation;
    7171@end
    7272#endif
    … …  
    101101#endif
    102102
    103 void WebGeolocationClient::requestPermission(Geolocation* geolocation)
     103void WebGeolocationClient::requestPermission(Geolocation& geolocation)
    104104{
    105105    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    107107    SEL selector = @selector(webView:decidePolicyForGeolocationRequestFromOrigin:frame:listener:);
    108108    if (![[m_webView UIDelegate] respondsToSelector:selector]) {
    109         geolocation->setIsAllowed(false);
     109        geolocation.setIsAllowed(false);
    110110        return;
    111111    }
    112112
    113113#if !PLATFORM(IOS)
    114     Frame *frame = geolocation->frame();
     114    Frame *frame = geolocation.frame();
    115115
    116116    if (!frame) {
    117         geolocation->setIsAllowed(false);
     117        geolocation.setIsAllowed(false);
    118118        return;
    119119    }
    … …  
    141141@implementation WebGeolocationPolicyListener
    142142
    143 - (id)initWithGeolocation:(Geolocation*)geolocation
     143- (id)initWithGeolocation:(Geolocation&)geolocation
    144144{
    145145    if (!(self = [super init]))
    146146        return nil;
    147     _geolocation = geolocation;
     147    _geolocation = &geolocation;
    148148    return self;
    149149}
    … …  
    207207
    208208@implementation WebGeolocationProviderInitializationListener
    209 - (id)initWithGeolocation:(Geolocation*)geolocation
     209- (id)initWithGeolocation:(Geolocation&)geolocation
    210210{
    211211    self = [super init];
    212212    if (self)
    213         m_geolocation = geolocation;
     213        m_geolocation = &geolocation;
    214214    return self;
    215215}

  • trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

    r221473 r221743  
    14551455
    14561456#if ENABLE(GEOLOCATION)
    1457     WebCore::provideGeolocationTo(_private->page, new WebGeolocationClient(self));
     1457    WebCore::provideGeolocationTo(_private->page, *new WebGeolocationClient(self));
    14581458#endif
    14591459#if ENABLE(NOTIFICATIONS)
    … …  
    99859985#if ENABLE(GEOLOCATION)
    99869986    if (_private && _private->page) {
    9987         RefPtr<GeolocationError> geolocatioError = GeolocationError::create(GeolocationError::PositionUnavailable, errorMessage);
     9987        auto geolocatioError = GeolocationError::create(GeolocationError::PositionUnavailable, errorMessage);
    99889988        WebCore::GeolocationController::from(_private->page)->errorOccurred(geolocatioError.get());
    99899989    }

  • trunk/Source/WebKitLegacy/win/ChangeLog

    r221733 r221743  
     12017-09-07  Alex Christensen  <achristensen@webkit.org>
     2
     3        Modernize Geolocation code
     4        https://bugs.webkit.org/show_bug.cgi?id=176496
     5
     6        Reviewed by Andy Estes.
     7
     8        * WebCoreSupport/WebGeolocationClient.cpp:
     9        (WebGeolocationClient::requestPermission):
     10        * WebCoreSupport/WebGeolocationClient.h:
     11        (WebGeolocationClient::setEnableHighAccuracy): Deleted.
     12        (WebGeolocationClient::cancelPermissionRequest): Deleted.
     13        * WebGeolocationPolicyListener.h:
     14        * WebView.cpp:
     15        (WebView::initWithFrame):
     16        (WebView::geolocationDidFailWithError):
     17
    1182017-09-07  Per Arne Vollan  <pvollan@apple.com>
    219

  • trunk/Source/WebKitLegacy/win/WebCoreSupport/WebGeolocationClient.cpp

    r210859 r221743  
    7676}
    7777
    78 void WebGeolocationClient::requestPermission(Geolocation* geolocation)
     78void WebGeolocationClient::requestPermission(Geolocation& geolocation)
    7979{
    8080    COMPtr<IWebUIDelegate> uiDelegate;
    8181    if (FAILED(m_webView->uiDelegate(&uiDelegate))) {
    82         geolocation->setIsAllowed(false);
     82        geolocation.setIsAllowed(false);
    8383        return;
    8484    }
    … …  
    8686    COMPtr<IWebUIDelegatePrivate2> uiDelegatePrivate2(Query, uiDelegate);
    8787    if (!uiDelegatePrivate2) {
    88         geolocation->setIsAllowed(false);
     88        geolocation.setIsAllowed(false);
    8989        return;
    9090    }
    9191
    92     Frame* frame = geolocation->frame();
     92    Frame* frame = geolocation.frame();
    9393    COMPtr<WebSecurityOrigin> origin(AdoptCOM, WebSecurityOrigin::createInstance(&frame->document()->securityOrigin()));
    94     COMPtr<WebGeolocationPolicyListener> listener = WebGeolocationPolicyListener::createInstance(geolocation);
     94    COMPtr<WebGeolocationPolicyListener> listener = WebGeolocationPolicyListener::createInstance(&geolocation);
    9595    HRESULT hr = uiDelegatePrivate2->decidePolicyForGeolocationRequest(m_webView.get(), kit(frame), origin.get(), listener.get());
    9696    if (hr != E_NOTIMPL)
    9797        return;
    9898
    99     geolocation->setIsAllowed(false);
     99    geolocation.setIsAllowed(false);
    100100}

  • trunk/Source/WebKitLegacy/win/WebCoreSupport/WebGeolocationClient.h

    r84146 r221743  
    2424 */
    2525
    26 #ifndef WebGeolocationClient_h
    27 #define WebGeolocationClient_h
     26#pragma once
    2827
    2928#include <WebCore/COMPtr.h>
    … …  
    4140    WebGeolocationClient(WebView*);
    4241
    43     virtual void geolocationDestroyed();
    44     virtual void startUpdating();
    45     virtual void stopUpdating();
    46     virtual void setEnableHighAccuracy(bool) { }
    47     virtual WebCore::GeolocationPosition* lastPosition();
     42    void geolocationDestroyed() final;
     43    void startUpdating() final;
     44    void stopUpdating() final;
     45    void setEnableHighAccuracy(bool) final { }
     46    WebCore::GeolocationPosition* lastPosition() final;
    4847
    49     virtual void requestPermission(WebCore::Geolocation*);
    50     virtual void cancelPermissionRequest(WebCore::Geolocation*) { }
     48    void requestPermission(WebCore::Geolocation&) final;
     49    void cancelPermissionRequest(WebCore::Geolocation&) final { }
    5150
    5251private:
    5352    COMPtr<WebView> m_webView;
    5453};
    55 
    56 #endif // WebGeolocationClient_h

  • trunk/Source/WebKitLegacy/win/WebGeolocationPolicyListener.h

    r216823 r221743  
    2424 */
    2525
    26 #ifndef WebGeolocationPolicyListener_h
    27 #define WebGeolocationPolicyListener_h
     26#pragma once
    2827
    2928#include "WebKit.h"
    … …  
    5554    RefPtr<WebCore::Geolocation> m_geolocation;
    5655};
    57 
    58 #endif WebGeolocationPolicyListener_h

  • trunk/Source/WebKitLegacy/win/WebView.cpp

    r221733 r221743  
    31223122
    31233123    m_page = new Page(WTFMove(configuration));
    3124     provideGeolocationTo(m_page, new WebGeolocationClient(this));
     3124    provideGeolocationTo(m_page, *new WebGeolocationClient(this));
    31253125
    31263126    unsigned layoutMilestones = DidFirstLayout | DidFirstVisuallyNonEmptyLayout;
    … …  
    72507250        return E_FAIL;
    72517251
    7252     RefPtr<GeolocationError> geolocationError = GeolocationError::create(GeolocationError::PositionUnavailable, toString(description));
     7252    auto geolocationError = GeolocationError::create(GeolocationError::PositionUnavailable, toString(description));
    72537253    GeolocationController::from(m_page)->errorOccurred(geolocationError.get());
    72547254    return S_OK;
Note: See TracChangeset for help on using the changeset viewer.