Changeset 221102 in webkit


Ignore:
Timestamp:
Aug 23, 2017 2:08:28 PM (7 years ago)
Author:
achristensen@apple.com
Message:

Clean up UIClients
https://bugs.webkit.org/show_bug.cgi?id=175906

Reviewed by Tim Horton.

There were some unnecessary checks to see if the client implements something,
when the default behavior is to do nothing if the client doesn't implement the callback.
Also, make some overrides finals and fix some spacing.

  • UIProcess/API/APIUIClient.h:

(API::UIClient::didNotHandleKeyEvent):
(API::UIClient::implementsDidNotHandleKeyEvent const): Deleted.
(API::UIClient::implementsDidNotHandleWheelEvent const): Deleted.

  • UIProcess/API/C/WKPage.cpp:

(WKPageSetPageUIClient):

  • UIProcess/Cocoa/UIDelegate.h:
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::didReceiveEvent):

Location:
trunk/Source/WebKit
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r221099 r221102  
     12017-08-23  Alex Christensen  <achristensen@webkit.org>
     2
     3        Clean up UIClients
     4        https://bugs.webkit.org/show_bug.cgi?id=175906
     5
     6        Reviewed by Tim Horton.
     7
     8        There were some unnecessary checks to see if the client implements something,
     9        when the default behavior is to do nothing if the client doesn't implement the callback.
     10        Also, make some overrides finals and fix some spacing.
     11
     12        * UIProcess/API/APIUIClient.h:
     13        (API::UIClient::didNotHandleKeyEvent):
     14        (API::UIClient::implementsDidNotHandleKeyEvent const): Deleted.
     15        (API::UIClient::implementsDidNotHandleWheelEvent const): Deleted.
     16        * UIProcess/API/C/WKPage.cpp:
     17        (WKPageSetPageUIClient):
     18        * UIProcess/Cocoa/UIDelegate.h:
     19        * UIProcess/WebPageProxy.cpp:
     20        (WebKit::WebPageProxy::didReceiveEvent):
     21
    1222017-08-23  Alex Christensen  <achristensen@webkit.org>
    223
  • trunk/Source/WebKit/UIProcess/API/APIUIClient.h

    r219871 r221102  
    9797#endif // ENABLE(NETSCAPE_PLUGIN_API)
    9898
    99     virtual bool implementsDidNotHandleKeyEvent() const { return false; }
    10099    virtual void didNotHandleKeyEvent(WebKit::WebPageProxy*, const WebKit::NativeWebKeyboardEvent&) { }
    101 
    102     virtual bool implementsDidNotHandleWheelEvent() const { return false; }
    103100    virtual void didNotHandleWheelEvent(WebKit::WebPageProxy*, const WebKit::NativeWebWheelEvent&) { }
    104101
  • trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp

    r219871 r221102  
    16131613        }
    16141614
    1615         void showPage(WebPageProxy* page) override
     1615        void showPage(WebPageProxy* page) final
    16161616        {
    16171617            if (!m_client.showPage)
     
    16211621        }
    16221622
    1623         void fullscreenMayReturnToInline(WebPageProxy* page) override
     1623        void fullscreenMayReturnToInline(WebPageProxy* page) final
    16241624        {
    16251625            if (!m_client.fullscreenMayReturnToInline)
     
    16291629        }
    16301630       
    1631         void hasVideoInPictureInPictureDidChange(WebPageProxy* page, bool hasVideoInPictureInPicture) override
     1631        void hasVideoInPictureInPictureDidChange(WebPageProxy* page, bool hasVideoInPictureInPicture) final
    16321632        {
    16331633            if (!m_client.hasVideoInPictureInPictureDidChange)
     
    16371637        }
    16381638
    1639         void didExceedBackgroundResourceLimitWhileInForeground(WebPageProxy& page, WKResourceLimit limit) override
     1639        void didExceedBackgroundResourceLimitWhileInForeground(WebPageProxy& page, WKResourceLimit limit) final
    16401640        {
    16411641            if (!m_client.didExceedBackgroundResourceLimitWhileInForeground)
     
    16451645        }
    16461646
    1647         void close(WebPageProxy* page) override
     1647        void close(WebPageProxy* page) final
    16481648        {
    16491649            if (!m_client.close)
     
    16531653        }
    16541654
    1655         void takeFocus(WebPageProxy* page, WKFocusDirection direction) override
     1655        void takeFocus(WebPageProxy* page, WKFocusDirection direction) final
    16561656        {
    16571657            if (!m_client.takeFocus)
     
    16611661        }
    16621662
    1663         void focus(WebPageProxy* page) override
     1663        void focus(WebPageProxy* page) final
    16641664        {
    16651665            if (!m_client.focus)
     
    16691669        }
    16701670
    1671         void unfocus(WebPageProxy* page) override
     1671        void unfocus(WebPageProxy* page) final
    16721672        {
    16731673            if (!m_client.unfocus)
     
    16771677        }
    16781678
    1679         void runJavaScriptAlert(WebPageProxy* page, const String& message, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, Function<void ()>&& completionHandler) override
     1679        void runJavaScriptAlert(WebPageProxy* page, const String& message, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, Function<void()>&& completionHandler) final
    16801680        {
    16811681            if (m_client.runJavaScriptAlert) {
     
    17031703        }
    17041704
    1705         void runJavaScriptConfirm(WebPageProxy* page, const String& message, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, Function<void (bool)>&& completionHandler) override
     1705        void runJavaScriptConfirm(WebPageProxy* page, const String& message, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, Function<void(bool)>&& completionHandler) final
    17061706        {
    17071707            if (m_client.runJavaScriptConfirm) {
     
    17301730        }
    17311731
    1732         void runJavaScriptPrompt(WebPageProxy* page, const String& message, const String& defaultValue, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, Function<void (const String&)>&& completionHandler) override
     1732        void runJavaScriptPrompt(WebPageProxy* page, const String& message, const String& defaultValue, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, Function<void(const String&)>&& completionHandler) final
    17331733        {
    17341734            if (m_client.runJavaScriptPrompt) {
     
    17631763        }
    17641764
    1765         void setStatusText(WebPageProxy* page, const String& text) override
     1765        void setStatusText(WebPageProxy* page, const String& text) final
    17661766        {
    17671767            if (!m_client.setStatusText)
     
    17711771        }
    17721772
    1773         void mouseDidMoveOverElement(WebPageProxy* page, const WebHitTestResultData& data, WebKit::WebEvent::Modifiers modifiers, API::Object* userData) override
     1773        void mouseDidMoveOverElement(WebPageProxy* page, const WebHitTestResultData& data, WebKit::WebEvent::Modifiers modifiers, API::Object* userData) final
    17741774        {
    17751775            if (!m_client.mouseDidMoveOverElement && !m_client.mouseDidMoveOverElement_deprecatedForUseWithV0)
     
    17891789
    17901790#if ENABLE(NETSCAPE_PLUGIN_API)
    1791         void unavailablePluginButtonClicked(WebPageProxy* page, WKPluginUnavailabilityReason pluginUnavailabilityReason, API::Dictionary* pluginInformation) override
     1791        void unavailablePluginButtonClicked(WebPageProxy* page, WKPluginUnavailabilityReason pluginUnavailabilityReason, API::Dictionary* pluginInformation) final
    17921792        {
    17931793            if (pluginUnavailabilityReason == kWKPluginUnavailabilityReasonPluginMissing) {
     
    18191819#endif // ENABLE(NETSCAPE_PLUGIN_API)
    18201820
    1821         bool implementsDidNotHandleKeyEvent() const override
    1822         {
    1823             return m_client.didNotHandleKeyEvent;
    1824         }
    1825 
    1826         void didNotHandleKeyEvent(WebPageProxy* page, const NativeWebKeyboardEvent& event) override
     1821        void didNotHandleKeyEvent(WebPageProxy* page, const NativeWebKeyboardEvent& event) final
    18271822        {
    18281823            if (!m_client.didNotHandleKeyEvent)
     
    18311826        }
    18321827
    1833         bool implementsDidNotHandleWheelEvent() const override
    1834         {
    1835             return m_client.didNotHandleWheelEvent;
    1836         }
    1837 
    1838         void didNotHandleWheelEvent(WebPageProxy* page, const NativeWebWheelEvent& event) override
     1828        void didNotHandleWheelEvent(WebPageProxy* page, const NativeWebWheelEvent& event) final
    18391829        {
    18401830            if (!m_client.didNotHandleWheelEvent)
     
    18431833        }
    18441834
    1845         bool toolbarsAreVisible(WebPageProxy* page) override
     1835        bool toolbarsAreVisible(WebPageProxy* page) final
    18461836        {
    18471837            if (!m_client.toolbarsAreVisible)
     
    18501840        }
    18511841
    1852         void setToolbarsAreVisible(WebPageProxy* page, bool visible) override
     1842        void setToolbarsAreVisible(WebPageProxy* page, bool visible) final
    18531843        {
    18541844            if (!m_client.setToolbarsAreVisible)
     
    18571847        }
    18581848
    1859         bool menuBarIsVisible(WebPageProxy* page) override
     1849        bool menuBarIsVisible(WebPageProxy* page) final
    18601850        {
    18611851            if (!m_client.menuBarIsVisible)
     
    18641854        }
    18651855
    1866         void setMenuBarIsVisible(WebPageProxy* page, bool visible) override
     1856        void setMenuBarIsVisible(WebPageProxy* page, bool visible) final
    18671857        {
    18681858            if (!m_client.setMenuBarIsVisible)
     
    18711861        }
    18721862
    1873         bool statusBarIsVisible(WebPageProxy* page) override
     1863        bool statusBarIsVisible(WebPageProxy* page) final
    18741864        {
    18751865            if (!m_client.statusBarIsVisible)
     
    18781868        }
    18791869
    1880         void setStatusBarIsVisible(WebPageProxy* page, bool visible) override
     1870        void setStatusBarIsVisible(WebPageProxy* page, bool visible) final
    18811871        {
    18821872            if (!m_client.setStatusBarIsVisible)
     
    18851875        }
    18861876
    1887         bool isResizable(WebPageProxy* page) override
     1877        bool isResizable(WebPageProxy* page) final
    18881878        {
    18891879            if (!m_client.isResizable)
     
    18921882        }
    18931883
    1894         void setIsResizable(WebPageProxy* page, bool resizable) override
     1884        void setIsResizable(WebPageProxy* page, bool resizable) final
    18951885        {
    18961886            if (!m_client.setIsResizable)
     
    18991889        }
    19001890
    1901         void setWindowFrame(WebPageProxy* page, const FloatRect& frame) override
     1891        void setWindowFrame(WebPageProxy* page, const FloatRect& frame) final
    19021892        {
    19031893            if (!m_client.setWindowFrame)
     
    19071897        }
    19081898
    1909         FloatRect windowFrame(WebPageProxy* page) override
     1899        FloatRect windowFrame(WebPageProxy* page) final
    19101900        {
    19111901            if (!m_client.getWindowFrame)
     
    19151905        }
    19161906
    1917         bool canRunBeforeUnloadConfirmPanel() const override
     1907        bool canRunBeforeUnloadConfirmPanel() const final
    19181908        {
    19191909            return m_client.runBeforeUnloadConfirmPanel_deprecatedForUseWithV6 || m_client.runBeforeUnloadConfirmPanel;
    19201910        }
    19211911
    1922         void runBeforeUnloadConfirmPanel(WebKit::WebPageProxy* page, const WTF::String& message, WebKit::WebFrameProxy* frame, const SecurityOriginData&, Function<void (bool)>&& completionHandler) override
     1912        void runBeforeUnloadConfirmPanel(WebKit::WebPageProxy* page, const WTF::String& message, WebKit::WebFrameProxy* frame, const SecurityOriginData&, Function<void(bool)>&& completionHandler) final
    19231913        {
    19241914            if (m_client.runBeforeUnloadConfirmPanel) {
     
    19371927        }
    19381928
    1939         void pageDidScroll(WebPageProxy* page) override
     1929        void pageDidScroll(WebPageProxy* page) final
    19401930        {
    19411931            if (!m_client.pageDidScroll)
     
    19451935        }
    19461936
    1947         void exceededDatabaseQuota(WebPageProxy* page, WebFrameProxy* frame, API::SecurityOrigin* origin, const String& databaseName, const String& databaseDisplayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage, Function<void (unsigned long long)>&& completionHandler) override
     1937        void exceededDatabaseQuota(WebPageProxy* page, WebFrameProxy* frame, API::SecurityOrigin* origin, const String& databaseName, const String& databaseDisplayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage, Function<void(unsigned long long)>&& completionHandler) final
    19481938        {
    19491939            if (!m_client.exceededDatabaseQuota) {
     
    19551945        }
    19561946
    1957         bool runOpenPanel(WebPageProxy* page, WebFrameProxy* frame, const WebCore::SecurityOriginData&, API::OpenPanelParameters* parameters, WebOpenPanelResultListenerProxy* listener) override
     1947        bool runOpenPanel(WebPageProxy* page, WebFrameProxy* frame, const WebCore::SecurityOriginData&, API::OpenPanelParameters* parameters, WebOpenPanelResultListenerProxy* listener) final
    19581948        {
    19591949            if (!m_client.runOpenPanel)
     
    19641954        }
    19651955
    1966         bool decidePolicyForGeolocationPermissionRequest(WebPageProxy* page, WebFrameProxy* frame, API::SecurityOrigin* origin, GeolocationPermissionRequestProxy* permissionRequest) override
     1956        bool decidePolicyForGeolocationPermissionRequest(WebPageProxy* page, WebFrameProxy* frame, API::SecurityOrigin* origin, GeolocationPermissionRequestProxy* permissionRequest) final
    19671957        {
    19681958            if (!m_client.decidePolicyForGeolocationPermissionRequest)
     
    19731963        }
    19741964
    1975         bool decidePolicyForUserMediaPermissionRequest(WebPageProxy& page, WebFrameProxy& frame, API::SecurityOrigin& userMediaDocumentOrigin, API::SecurityOrigin& topLevelDocumentOrigin, UserMediaPermissionRequestProxy& permissionRequest) override
     1965        bool decidePolicyForUserMediaPermissionRequest(WebPageProxy& page, WebFrameProxy& frame, API::SecurityOrigin& userMediaDocumentOrigin, API::SecurityOrigin& topLevelDocumentOrigin, UserMediaPermissionRequestProxy& permissionRequest) final
    19761966        {
    19771967            if (!m_client.decidePolicyForUserMediaPermissionRequest)
     
    19821972        }
    19831973
    1984         bool checkUserMediaPermissionForOrigin(WebPageProxy& page, WebFrameProxy& frame, API::SecurityOrigin& userMediaDocumentOrigin, API::SecurityOrigin& topLevelDocumentOrigin, UserMediaPermissionCheckProxy& request) override
     1974        bool checkUserMediaPermissionForOrigin(WebPageProxy& page, WebFrameProxy& frame, API::SecurityOrigin& userMediaDocumentOrigin, API::SecurityOrigin& topLevelDocumentOrigin, UserMediaPermissionCheckProxy& request) final
    19851975        {
    19861976            if (!m_client.checkUserMediaPermissionForOrigin)
     
    19911981        }
    19921982       
    1993         bool decidePolicyForNotificationPermissionRequest(WebPageProxy* page, API::SecurityOrigin* origin, NotificationPermissionRequest* permissionRequest) override
     1983        bool decidePolicyForNotificationPermissionRequest(WebPageProxy* page, API::SecurityOrigin* origin, NotificationPermissionRequest* permissionRequest) final
    19941984        {
    19951985            if (!m_client.decidePolicyForNotificationPermissionRequest)
     
    20011991
    20021992        // Printing.
    2003         float headerHeight(WebPageProxy* page, WebFrameProxy* frame) override
     1993        float headerHeight(WebPageProxy* page, WebFrameProxy* frame) final
    20041994        {
    20051995            if (!m_client.headerHeight)
     
    20091999        }
    20102000
    2011         float footerHeight(WebPageProxy* page, WebFrameProxy* frame) override
     2001        float footerHeight(WebPageProxy* page, WebFrameProxy* frame) final
    20122002        {
    20132003            if (!m_client.footerHeight)
     
    20172007        }
    20182008
    2019         void drawHeader(WebPageProxy* page, WebFrameProxy* frame, const WebCore::FloatRect& rect) override
     2009        void drawHeader(WebPageProxy* page, WebFrameProxy* frame, const WebCore::FloatRect& rect) final
    20202010        {
    20212011            if (!m_client.drawHeader)
     
    20252015        }
    20262016
    2027         void drawFooter(WebPageProxy* page, WebFrameProxy* frame, const WebCore::FloatRect& rect) override
     2017        void drawFooter(WebPageProxy* page, WebFrameProxy* frame, const WebCore::FloatRect& rect) final
    20282018        {
    20292019            if (!m_client.drawFooter)
     
    20332023        }
    20342024
    2035         void printFrame(WebPageProxy* page, WebFrameProxy* frame) override
     2025        void printFrame(WebPageProxy* page, WebFrameProxy* frame) final
    20362026        {
    20372027            if (!m_client.printFrame)
     
    20412031        }
    20422032
    2043         bool canRunModal() const override
     2033        bool canRunModal() const final
    20442034        {
    20452035            return m_client.runModal;
    20462036        }
    20472037
    2048         void runModal(WebPageProxy* page) override
     2038        void runModal(WebPageProxy* page) final
    20492039        {
    20502040            if (!m_client.runModal)
     
    20542044        }
    20552045
    2056         void saveDataToFileInDownloadsFolder(WebPageProxy* page, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data* data) override
     2046        void saveDataToFileInDownloadsFolder(WebPageProxy* page, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data* data) final
    20572047        {
    20582048            if (!m_client.saveDataToFileInDownloadsFolder)
     
    20622052        }
    20632053
    2064         void pinnedStateDidChange(WebPageProxy& page) override
     2054        void pinnedStateDidChange(WebPageProxy& page) final
    20652055        {
    20662056            if (!m_client.pinnedStateDidChange)
     
    20702060        }
    20712061
    2072         void isPlayingAudioDidChange(WebPageProxy& page) override
     2062        void isPlayingAudioDidChange(WebPageProxy& page) final
    20732063        {
    20742064            if (!m_client.isPlayingAudioDidChange)
     
    20782068        }
    20792069
    2080         void didClickAutoFillButton(WebPageProxy& page, API::Object* userInfo) override
     2070        void didClickAutoFillButton(WebPageProxy& page, API::Object* userInfo) final
    20812071        {
    20822072            if (!m_client.didClickAutoFillButton)
     
    20872077
    20882078#if ENABLE(MEDIA_SESSION)
    2089         void mediaSessionMetadataDidChange(WebPageProxy& page, WebMediaSessionMetadata* metadata) override
     2079        void mediaSessionMetadataDidChange(WebPageProxy& page, WebMediaSessionMetadata* metadata) final
    20902080        {
    20912081            if (!m_client.mediaSessionMetadataDidChange)
     
    20962086#endif
    20972087#if ENABLE(POINTER_LOCK)
    2098         void requestPointerLock(WebPageProxy* page) override
     2088        void requestPointerLock(WebPageProxy* page) final
    20992089        {
    21002090            if (!m_client.requestPointerLock)
     
    21042094        }
    21052095
    2106         void didLosePointerLock(WebPageProxy* page) override
     2096        void didLosePointerLock(WebPageProxy* page) final
    21072097        {
    21082098            if (!m_client.didLosePointerLock)
     
    21382128        }
    21392129
    2140         void handleAutoplayEvent(WebPageProxy& page, WebCore::AutoplayEvent event, OptionSet<WebCore::AutoplayEventFlags> flags) override
     2130        void handleAutoplayEvent(WebPageProxy& page, WebCore::AutoplayEvent event, OptionSet<WebCore::AutoplayEventFlags> flags) final
    21412131        {
    21422132            if (!m_client.handleAutoplayEvent)
  • trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h

    r221099 r221102  
    6767    private:
    6868        // API::ContextMenuClient
    69         RetainPtr<NSMenu> menuFromProposedMenu(WebKit::WebPageProxy&, NSMenu *, const WebKit::WebHitTestResultData&, API::Object*) override;
     69        RetainPtr<NSMenu> menuFromProposedMenu(WebPageProxy&, NSMenu *, const WebHitTestResultData&, API::Object*) override;
    7070
    7171        UIDelegate& m_uiDelegate;
     
    8585        RefPtr<WebPageProxy> createNewPageCommon(WebPageProxy*, API::FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, NavigationActionData&&, WTF::Function<void(RefPtr<WebPageProxy>&&)>&& completionHandler);
    8686
    87         void close(WebKit::WebPageProxy*) override;
    88         void fullscreenMayReturnToInline(WebKit::WebPageProxy*) override;
    89         void didEnterFullscreen(WebKit::WebPageProxy*) override;
    90         void didExitFullscreen(WebKit::WebPageProxy*) override;
    91         void runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, Function<void ()>&& completionHandler) override;
    92         void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, Function<void (bool)>&& completionHandler) override;
    93         void runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, Function<void (const WTF::String&)>&& completionHandler) override;
     87        void close(WebPageProxy*) final;
     88        void fullscreenMayReturnToInline(WebPageProxy*) final;
     89        void didEnterFullscreen(WebPageProxy*) final;
     90        void didExitFullscreen(WebPageProxy*) final;
     91        void runJavaScriptAlert(WebPageProxy*, const WTF::String&, WebFrameProxy*, const WebCore::SecurityOriginData&, Function<void()>&& completionHandler) final;
     92        void runJavaScriptConfirm(WebPageProxy*, const WTF::String&, WebFrameProxy*, const WebCore::SecurityOriginData&, Function<void(bool)>&& completionHandler) final;
     93        void runJavaScriptPrompt(WebPageProxy*, const WTF::String&, const WTF::String&, WebFrameProxy*, const WebCore::SecurityOriginData&, Function<void(const WTF::String&)>&& completionHandler) final;
    9494        bool canRunBeforeUnloadConfirmPanel() const final;
    95         void runBeforeUnloadConfirmPanel(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, Function<void (bool)>&& completionHandler) final;
    96         void exceededDatabaseQuota(WebPageProxy*, WebFrameProxy*, API::SecurityOrigin*, const WTF::String& databaseName, const WTF::String& displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentUsage, unsigned long long expectedUsage, Function<void (unsigned long long)>&& completionHandler) override;
    97         void reachedApplicationCacheOriginQuota(WebPageProxy*, const WebCore::SecurityOrigin&, uint64_t currentQuota, uint64_t totalBytesNeeded, Function<void (unsigned long long)>&& completionHandler) override;
     95        void runBeforeUnloadConfirmPanel(WebPageProxy*, const WTF::String&, WebFrameProxy*, const WebCore::SecurityOriginData&, Function<void(bool)>&& completionHandler) final;
     96        void exceededDatabaseQuota(WebPageProxy*, WebFrameProxy*, API::SecurityOrigin*, const WTF::String& databaseName, const WTF::String& displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentUsage, unsigned long long expectedUsage, Function<void(unsigned long long)>&& completionHandler) final;
     97        void reachedApplicationCacheOriginQuota(WebPageProxy*, const WebCore::SecurityOrigin&, uint64_t currentQuota, uint64_t totalBytesNeeded, Function<void(unsigned long long)>&& completionHandler) final;
    9898#if PLATFORM(MAC)
    9999        void showPage(WebPageProxy*) final;
    100         void takeFocus(WebKit::WebPageProxy*, WKFocusDirection) final;
    101         void focus(WebKit::WebPageProxy*) final;
    102         void unfocus(WebKit::WebPageProxy*) final;
    103         bool runOpenPanel(WebPageProxy*, WebFrameProxy*, const WebCore::SecurityOriginData&, API::OpenPanelParameters*, WebOpenPanelResultListenerProxy*) override;
     100        void takeFocus(WebPageProxy*, WKFocusDirection) final;
     101        void focus(WebPageProxy*) final;
     102        void unfocus(WebPageProxy*) final;
     103        bool runOpenPanel(WebPageProxy*, WebFrameProxy*, const WebCore::SecurityOriginData&, API::OpenPanelParameters*, WebOpenPanelResultListenerProxy*) final;
    104104#endif
    105         bool decidePolicyForUserMediaPermissionRequest(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, API::SecurityOrigin&, API::SecurityOrigin&, WebKit::UserMediaPermissionRequestProxy&) override;
    106         bool checkUserMediaPermissionForOrigin(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, API::SecurityOrigin&, API::SecurityOrigin&, WebKit::UserMediaPermissionCheckProxy&) override;
    107         void mediaCaptureStateDidChange(WebCore::MediaProducer::MediaStateFlags) override;
    108         void printFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*) override;
     105        bool decidePolicyForUserMediaPermissionRequest(WebPageProxy&, WebFrameProxy&, API::SecurityOrigin&, API::SecurityOrigin&, UserMediaPermissionRequestProxy&) final;
     106        bool checkUserMediaPermissionForOrigin(WebPageProxy&, WebFrameProxy&, API::SecurityOrigin&, API::SecurityOrigin&, UserMediaPermissionCheckProxy&) final;
     107        void mediaCaptureStateDidChange(WebCore::MediaProducer::MediaStateFlags) final;
     108        void printFrame(WebPageProxy*, WebFrameProxy*) final;
    109109#if PLATFORM(IOS)
    110110#if HAVE(APP_LINKS)
    111         bool shouldIncludeAppLinkActionsForElement(_WKActivatedElementInfo *) override;
     111        bool shouldIncludeAppLinkActionsForElement(_WKActivatedElementInfo *) final;
    112112#endif
    113         RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) override;
    114         void didNotHandleTapAsClick(const WebCore::IntPoint&) override;
    115         UIViewController *presentingViewController() override;
     113        RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) final;
     114        void didNotHandleTapAsClick(const WebCore::IntPoint&) final;
     115        UIViewController *presentingViewController() final;
    116116#endif // PLATFORM(IOS)
    117117
    118         NSDictionary *dataDetectionContext() override;
     118        NSDictionary *dataDetectionContext() final;
    119119
    120120#if ENABLE(POINTER_LOCK)
    121         void requestPointerLock(WebKit::WebPageProxy*) override;
    122         void didLosePointerLock(WebKit::WebPageProxy*) override;
     121        void requestPointerLock(WebPageProxy*) final;
     122        void didLosePointerLock(WebPageProxy*) final;
    123123#endif
    124124       
    125         void hasVideoInPictureInPictureDidChange(WebKit::WebPageProxy*, bool) override;
     125        void hasVideoInPictureInPictureDidChange(WebPageProxy*, bool) final;
    126126
    127         void imageOrMediaDocumentSizeChanged(const WebCore::IntSize&) override;
     127        void imageOrMediaDocumentSizeChanged(const WebCore::IntSize&) final;
    128128
    129129        UIDelegate& m_uiDelegate;
  • trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

    r221065 r221102  
    49904990        // FIXME: Dispatch additional events to the didNotHandleWheelEvent client function.
    49914991        if (!handled) {
    4992             if (m_uiClient->implementsDidNotHandleWheelEvent())
    4993                 m_uiClient->didNotHandleWheelEvent(this, oldestCoalescedEvent->last());
     4992            m_uiClient->didNotHandleWheelEvent(this, oldestCoalescedEvent->last());
    49944993            m_pageClient.wheelEventWasNotHandledByWebCore(oldestCoalescedEvent->last());
    49954994        }
     
    50275026            break;
    50285027
    5029         if (m_uiClient->implementsDidNotHandleKeyEvent())
    5030             m_uiClient->didNotHandleKeyEvent(this, event);
     5028        m_uiClient->didNotHandleKeyEvent(this, event);
    50315029        break;
    50325030    }
Note: See TracChangeset for help on using the changeset viewer.