Changeset 221102 in webkit
- Timestamp:
- Aug 23, 2017 2:08:28 PM (7 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r221099 r221102 1 2017-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 1 22 2017-08-23 Alex Christensen <achristensen@webkit.org> 2 23 -
trunk/Source/WebKit/UIProcess/API/APIUIClient.h
r219871 r221102 97 97 #endif // ENABLE(NETSCAPE_PLUGIN_API) 98 98 99 virtual bool implementsDidNotHandleKeyEvent() const { return false; }100 99 virtual void didNotHandleKeyEvent(WebKit::WebPageProxy*, const WebKit::NativeWebKeyboardEvent&) { } 101 102 virtual bool implementsDidNotHandleWheelEvent() const { return false; }103 100 virtual void didNotHandleWheelEvent(WebKit::WebPageProxy*, const WebKit::NativeWebWheelEvent&) { } 104 101 -
trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp
r219871 r221102 1613 1613 } 1614 1614 1615 void showPage(WebPageProxy* page) override1615 void showPage(WebPageProxy* page) final 1616 1616 { 1617 1617 if (!m_client.showPage) … … 1621 1621 } 1622 1622 1623 void fullscreenMayReturnToInline(WebPageProxy* page) override1623 void fullscreenMayReturnToInline(WebPageProxy* page) final 1624 1624 { 1625 1625 if (!m_client.fullscreenMayReturnToInline) … … 1629 1629 } 1630 1630 1631 void hasVideoInPictureInPictureDidChange(WebPageProxy* page, bool hasVideoInPictureInPicture) override1631 void hasVideoInPictureInPictureDidChange(WebPageProxy* page, bool hasVideoInPictureInPicture) final 1632 1632 { 1633 1633 if (!m_client.hasVideoInPictureInPictureDidChange) … … 1637 1637 } 1638 1638 1639 void didExceedBackgroundResourceLimitWhileInForeground(WebPageProxy& page, WKResourceLimit limit) override1639 void didExceedBackgroundResourceLimitWhileInForeground(WebPageProxy& page, WKResourceLimit limit) final 1640 1640 { 1641 1641 if (!m_client.didExceedBackgroundResourceLimitWhileInForeground) … … 1645 1645 } 1646 1646 1647 void close(WebPageProxy* page) override1647 void close(WebPageProxy* page) final 1648 1648 { 1649 1649 if (!m_client.close) … … 1653 1653 } 1654 1654 1655 void takeFocus(WebPageProxy* page, WKFocusDirection direction) override1655 void takeFocus(WebPageProxy* page, WKFocusDirection direction) final 1656 1656 { 1657 1657 if (!m_client.takeFocus) … … 1661 1661 } 1662 1662 1663 void focus(WebPageProxy* page) override1663 void focus(WebPageProxy* page) final 1664 1664 { 1665 1665 if (!m_client.focus) … … 1669 1669 } 1670 1670 1671 void unfocus(WebPageProxy* page) override1671 void unfocus(WebPageProxy* page) final 1672 1672 { 1673 1673 if (!m_client.unfocus) … … 1677 1677 } 1678 1678 1679 void runJavaScriptAlert(WebPageProxy* page, const String& message, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, Function<void ()>&& completionHandler) override1679 void runJavaScriptAlert(WebPageProxy* page, const String& message, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, Function<void()>&& completionHandler) final 1680 1680 { 1681 1681 if (m_client.runJavaScriptAlert) { … … 1703 1703 } 1704 1704 1705 void runJavaScriptConfirm(WebPageProxy* page, const String& message, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, Function<void (bool)>&& completionHandler) override1705 void runJavaScriptConfirm(WebPageProxy* page, const String& message, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, Function<void(bool)>&& completionHandler) final 1706 1706 { 1707 1707 if (m_client.runJavaScriptConfirm) { … … 1730 1730 } 1731 1731 1732 void runJavaScriptPrompt(WebPageProxy* page, const String& message, const String& defaultValue, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, Function<void (const String&)>&& completionHandler) override1732 void runJavaScriptPrompt(WebPageProxy* page, const String& message, const String& defaultValue, WebFrameProxy* frame, const SecurityOriginData& securityOriginData, Function<void(const String&)>&& completionHandler) final 1733 1733 { 1734 1734 if (m_client.runJavaScriptPrompt) { … … 1763 1763 } 1764 1764 1765 void setStatusText(WebPageProxy* page, const String& text) override1765 void setStatusText(WebPageProxy* page, const String& text) final 1766 1766 { 1767 1767 if (!m_client.setStatusText) … … 1771 1771 } 1772 1772 1773 void mouseDidMoveOverElement(WebPageProxy* page, const WebHitTestResultData& data, WebKit::WebEvent::Modifiers modifiers, API::Object* userData) override1773 void mouseDidMoveOverElement(WebPageProxy* page, const WebHitTestResultData& data, WebKit::WebEvent::Modifiers modifiers, API::Object* userData) final 1774 1774 { 1775 1775 if (!m_client.mouseDidMoveOverElement && !m_client.mouseDidMoveOverElement_deprecatedForUseWithV0) … … 1789 1789 1790 1790 #if ENABLE(NETSCAPE_PLUGIN_API) 1791 void unavailablePluginButtonClicked(WebPageProxy* page, WKPluginUnavailabilityReason pluginUnavailabilityReason, API::Dictionary* pluginInformation) override1791 void unavailablePluginButtonClicked(WebPageProxy* page, WKPluginUnavailabilityReason pluginUnavailabilityReason, API::Dictionary* pluginInformation) final 1792 1792 { 1793 1793 if (pluginUnavailabilityReason == kWKPluginUnavailabilityReasonPluginMissing) { … … 1819 1819 #endif // ENABLE(NETSCAPE_PLUGIN_API) 1820 1820 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 1827 1822 { 1828 1823 if (!m_client.didNotHandleKeyEvent) … … 1831 1826 } 1832 1827 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 1839 1829 { 1840 1830 if (!m_client.didNotHandleWheelEvent) … … 1843 1833 } 1844 1834 1845 bool toolbarsAreVisible(WebPageProxy* page) override1835 bool toolbarsAreVisible(WebPageProxy* page) final 1846 1836 { 1847 1837 if (!m_client.toolbarsAreVisible) … … 1850 1840 } 1851 1841 1852 void setToolbarsAreVisible(WebPageProxy* page, bool visible) override1842 void setToolbarsAreVisible(WebPageProxy* page, bool visible) final 1853 1843 { 1854 1844 if (!m_client.setToolbarsAreVisible) … … 1857 1847 } 1858 1848 1859 bool menuBarIsVisible(WebPageProxy* page) override1849 bool menuBarIsVisible(WebPageProxy* page) final 1860 1850 { 1861 1851 if (!m_client.menuBarIsVisible) … … 1864 1854 } 1865 1855 1866 void setMenuBarIsVisible(WebPageProxy* page, bool visible) override1856 void setMenuBarIsVisible(WebPageProxy* page, bool visible) final 1867 1857 { 1868 1858 if (!m_client.setMenuBarIsVisible) … … 1871 1861 } 1872 1862 1873 bool statusBarIsVisible(WebPageProxy* page) override1863 bool statusBarIsVisible(WebPageProxy* page) final 1874 1864 { 1875 1865 if (!m_client.statusBarIsVisible) … … 1878 1868 } 1879 1869 1880 void setStatusBarIsVisible(WebPageProxy* page, bool visible) override1870 void setStatusBarIsVisible(WebPageProxy* page, bool visible) final 1881 1871 { 1882 1872 if (!m_client.setStatusBarIsVisible) … … 1885 1875 } 1886 1876 1887 bool isResizable(WebPageProxy* page) override1877 bool isResizable(WebPageProxy* page) final 1888 1878 { 1889 1879 if (!m_client.isResizable) … … 1892 1882 } 1893 1883 1894 void setIsResizable(WebPageProxy* page, bool resizable) override1884 void setIsResizable(WebPageProxy* page, bool resizable) final 1895 1885 { 1896 1886 if (!m_client.setIsResizable) … … 1899 1889 } 1900 1890 1901 void setWindowFrame(WebPageProxy* page, const FloatRect& frame) override1891 void setWindowFrame(WebPageProxy* page, const FloatRect& frame) final 1902 1892 { 1903 1893 if (!m_client.setWindowFrame) … … 1907 1897 } 1908 1898 1909 FloatRect windowFrame(WebPageProxy* page) override1899 FloatRect windowFrame(WebPageProxy* page) final 1910 1900 { 1911 1901 if (!m_client.getWindowFrame) … … 1915 1905 } 1916 1906 1917 bool canRunBeforeUnloadConfirmPanel() const override1907 bool canRunBeforeUnloadConfirmPanel() const final 1918 1908 { 1919 1909 return m_client.runBeforeUnloadConfirmPanel_deprecatedForUseWithV6 || m_client.runBeforeUnloadConfirmPanel; 1920 1910 } 1921 1911 1922 void runBeforeUnloadConfirmPanel(WebKit::WebPageProxy* page, const WTF::String& message, WebKit::WebFrameProxy* frame, const SecurityOriginData&, Function<void (bool)>&& completionHandler) override1912 void runBeforeUnloadConfirmPanel(WebKit::WebPageProxy* page, const WTF::String& message, WebKit::WebFrameProxy* frame, const SecurityOriginData&, Function<void(bool)>&& completionHandler) final 1923 1913 { 1924 1914 if (m_client.runBeforeUnloadConfirmPanel) { … … 1937 1927 } 1938 1928 1939 void pageDidScroll(WebPageProxy* page) override1929 void pageDidScroll(WebPageProxy* page) final 1940 1930 { 1941 1931 if (!m_client.pageDidScroll) … … 1945 1935 } 1946 1936 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) override1937 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 1948 1938 { 1949 1939 if (!m_client.exceededDatabaseQuota) { … … 1955 1945 } 1956 1946 1957 bool runOpenPanel(WebPageProxy* page, WebFrameProxy* frame, const WebCore::SecurityOriginData&, API::OpenPanelParameters* parameters, WebOpenPanelResultListenerProxy* listener) override1947 bool runOpenPanel(WebPageProxy* page, WebFrameProxy* frame, const WebCore::SecurityOriginData&, API::OpenPanelParameters* parameters, WebOpenPanelResultListenerProxy* listener) final 1958 1948 { 1959 1949 if (!m_client.runOpenPanel) … … 1964 1954 } 1965 1955 1966 bool decidePolicyForGeolocationPermissionRequest(WebPageProxy* page, WebFrameProxy* frame, API::SecurityOrigin* origin, GeolocationPermissionRequestProxy* permissionRequest) override1956 bool decidePolicyForGeolocationPermissionRequest(WebPageProxy* page, WebFrameProxy* frame, API::SecurityOrigin* origin, GeolocationPermissionRequestProxy* permissionRequest) final 1967 1957 { 1968 1958 if (!m_client.decidePolicyForGeolocationPermissionRequest) … … 1973 1963 } 1974 1964 1975 bool decidePolicyForUserMediaPermissionRequest(WebPageProxy& page, WebFrameProxy& frame, API::SecurityOrigin& userMediaDocumentOrigin, API::SecurityOrigin& topLevelDocumentOrigin, UserMediaPermissionRequestProxy& permissionRequest) override1965 bool decidePolicyForUserMediaPermissionRequest(WebPageProxy& page, WebFrameProxy& frame, API::SecurityOrigin& userMediaDocumentOrigin, API::SecurityOrigin& topLevelDocumentOrigin, UserMediaPermissionRequestProxy& permissionRequest) final 1976 1966 { 1977 1967 if (!m_client.decidePolicyForUserMediaPermissionRequest) … … 1982 1972 } 1983 1973 1984 bool checkUserMediaPermissionForOrigin(WebPageProxy& page, WebFrameProxy& frame, API::SecurityOrigin& userMediaDocumentOrigin, API::SecurityOrigin& topLevelDocumentOrigin, UserMediaPermissionCheckProxy& request) override1974 bool checkUserMediaPermissionForOrigin(WebPageProxy& page, WebFrameProxy& frame, API::SecurityOrigin& userMediaDocumentOrigin, API::SecurityOrigin& topLevelDocumentOrigin, UserMediaPermissionCheckProxy& request) final 1985 1975 { 1986 1976 if (!m_client.checkUserMediaPermissionForOrigin) … … 1991 1981 } 1992 1982 1993 bool decidePolicyForNotificationPermissionRequest(WebPageProxy* page, API::SecurityOrigin* origin, NotificationPermissionRequest* permissionRequest) override1983 bool decidePolicyForNotificationPermissionRequest(WebPageProxy* page, API::SecurityOrigin* origin, NotificationPermissionRequest* permissionRequest) final 1994 1984 { 1995 1985 if (!m_client.decidePolicyForNotificationPermissionRequest) … … 2001 1991 2002 1992 // Printing. 2003 float headerHeight(WebPageProxy* page, WebFrameProxy* frame) override1993 float headerHeight(WebPageProxy* page, WebFrameProxy* frame) final 2004 1994 { 2005 1995 if (!m_client.headerHeight) … … 2009 1999 } 2010 2000 2011 float footerHeight(WebPageProxy* page, WebFrameProxy* frame) override2001 float footerHeight(WebPageProxy* page, WebFrameProxy* frame) final 2012 2002 { 2013 2003 if (!m_client.footerHeight) … … 2017 2007 } 2018 2008 2019 void drawHeader(WebPageProxy* page, WebFrameProxy* frame, const WebCore::FloatRect& rect) override2009 void drawHeader(WebPageProxy* page, WebFrameProxy* frame, const WebCore::FloatRect& rect) final 2020 2010 { 2021 2011 if (!m_client.drawHeader) … … 2025 2015 } 2026 2016 2027 void drawFooter(WebPageProxy* page, WebFrameProxy* frame, const WebCore::FloatRect& rect) override2017 void drawFooter(WebPageProxy* page, WebFrameProxy* frame, const WebCore::FloatRect& rect) final 2028 2018 { 2029 2019 if (!m_client.drawFooter) … … 2033 2023 } 2034 2024 2035 void printFrame(WebPageProxy* page, WebFrameProxy* frame) override2025 void printFrame(WebPageProxy* page, WebFrameProxy* frame) final 2036 2026 { 2037 2027 if (!m_client.printFrame) … … 2041 2031 } 2042 2032 2043 bool canRunModal() const override2033 bool canRunModal() const final 2044 2034 { 2045 2035 return m_client.runModal; 2046 2036 } 2047 2037 2048 void runModal(WebPageProxy* page) override2038 void runModal(WebPageProxy* page) final 2049 2039 { 2050 2040 if (!m_client.runModal) … … 2054 2044 } 2055 2045 2056 void saveDataToFileInDownloadsFolder(WebPageProxy* page, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data* data) override2046 void saveDataToFileInDownloadsFolder(WebPageProxy* page, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data* data) final 2057 2047 { 2058 2048 if (!m_client.saveDataToFileInDownloadsFolder) … … 2062 2052 } 2063 2053 2064 void pinnedStateDidChange(WebPageProxy& page) override2054 void pinnedStateDidChange(WebPageProxy& page) final 2065 2055 { 2066 2056 if (!m_client.pinnedStateDidChange) … … 2070 2060 } 2071 2061 2072 void isPlayingAudioDidChange(WebPageProxy& page) override2062 void isPlayingAudioDidChange(WebPageProxy& page) final 2073 2063 { 2074 2064 if (!m_client.isPlayingAudioDidChange) … … 2078 2068 } 2079 2069 2080 void didClickAutoFillButton(WebPageProxy& page, API::Object* userInfo) override2070 void didClickAutoFillButton(WebPageProxy& page, API::Object* userInfo) final 2081 2071 { 2082 2072 if (!m_client.didClickAutoFillButton) … … 2087 2077 2088 2078 #if ENABLE(MEDIA_SESSION) 2089 void mediaSessionMetadataDidChange(WebPageProxy& page, WebMediaSessionMetadata* metadata) override2079 void mediaSessionMetadataDidChange(WebPageProxy& page, WebMediaSessionMetadata* metadata) final 2090 2080 { 2091 2081 if (!m_client.mediaSessionMetadataDidChange) … … 2096 2086 #endif 2097 2087 #if ENABLE(POINTER_LOCK) 2098 void requestPointerLock(WebPageProxy* page) override2088 void requestPointerLock(WebPageProxy* page) final 2099 2089 { 2100 2090 if (!m_client.requestPointerLock) … … 2104 2094 } 2105 2095 2106 void didLosePointerLock(WebPageProxy* page) override2096 void didLosePointerLock(WebPageProxy* page) final 2107 2097 { 2108 2098 if (!m_client.didLosePointerLock) … … 2138 2128 } 2139 2129 2140 void handleAutoplayEvent(WebPageProxy& page, WebCore::AutoplayEvent event, OptionSet<WebCore::AutoplayEventFlags> flags) override2130 void handleAutoplayEvent(WebPageProxy& page, WebCore::AutoplayEvent event, OptionSet<WebCore::AutoplayEventFlags> flags) final 2141 2131 { 2142 2132 if (!m_client.handleAutoplayEvent) -
trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
r221099 r221102 67 67 private: 68 68 // API::ContextMenuClient 69 RetainPtr<NSMenu> menuFromProposedMenu(Web Kit::WebPageProxy&, NSMenu *, const WebKit::WebHitTestResultData&, API::Object*) override;69 RetainPtr<NSMenu> menuFromProposedMenu(WebPageProxy&, NSMenu *, const WebHitTestResultData&, API::Object*) override; 70 70 71 71 UIDelegate& m_uiDelegate; … … 85 85 RefPtr<WebPageProxy> createNewPageCommon(WebPageProxy*, API::FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, NavigationActionData&&, WTF::Function<void(RefPtr<WebPageProxy>&&)>&& completionHandler); 86 86 87 void close(Web Kit::WebPageProxy*) override;88 void fullscreenMayReturnToInline(Web Kit::WebPageProxy*) override;89 void didEnterFullscreen(Web Kit::WebPageProxy*) override;90 void didExitFullscreen(Web Kit::WebPageProxy*) override;91 void runJavaScriptAlert(Web Kit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, Function<void ()>&& completionHandler) override;92 void runJavaScriptConfirm(Web Kit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, Function<void (bool)>&& completionHandler) override;93 void runJavaScriptPrompt(Web Kit::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; 94 94 bool canRunBeforeUnloadConfirmPanel() const final; 95 void runBeforeUnloadConfirmPanel(Web Kit::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; 98 98 #if PLATFORM(MAC) 99 99 void showPage(WebPageProxy*) final; 100 void takeFocus(Web Kit::WebPageProxy*, WKFocusDirection) final;101 void focus(Web Kit::WebPageProxy*) final;102 void unfocus(Web Kit::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; 104 104 #endif 105 bool decidePolicyForUserMediaPermissionRequest(Web Kit::WebPageProxy&, WebKit::WebFrameProxy&, API::SecurityOrigin&, API::SecurityOrigin&, WebKit::UserMediaPermissionRequestProxy&) override;106 bool checkUserMediaPermissionForOrigin(Web Kit::WebPageProxy&, WebKit::WebFrameProxy&, API::SecurityOrigin&, API::SecurityOrigin&, WebKit::UserMediaPermissionCheckProxy&) override;107 void mediaCaptureStateDidChange(WebCore::MediaProducer::MediaStateFlags) override;108 void printFrame(Web Kit::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; 109 109 #if PLATFORM(IOS) 110 110 #if HAVE(APP_LINKS) 111 bool shouldIncludeAppLinkActionsForElement(_WKActivatedElementInfo *) override;111 bool shouldIncludeAppLinkActionsForElement(_WKActivatedElementInfo *) final; 112 112 #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; 116 116 #endif // PLATFORM(IOS) 117 117 118 NSDictionary *dataDetectionContext() override;118 NSDictionary *dataDetectionContext() final; 119 119 120 120 #if ENABLE(POINTER_LOCK) 121 void requestPointerLock(Web Kit::WebPageProxy*) override;122 void didLosePointerLock(Web Kit::WebPageProxy*) override;121 void requestPointerLock(WebPageProxy*) final; 122 void didLosePointerLock(WebPageProxy*) final; 123 123 #endif 124 124 125 void hasVideoInPictureInPictureDidChange(Web Kit::WebPageProxy*, bool) override;125 void hasVideoInPictureInPictureDidChange(WebPageProxy*, bool) final; 126 126 127 void imageOrMediaDocumentSizeChanged(const WebCore::IntSize&) override;127 void imageOrMediaDocumentSizeChanged(const WebCore::IntSize&) final; 128 128 129 129 UIDelegate& m_uiDelegate; -
trunk/Source/WebKit/UIProcess/WebPageProxy.cpp
r221065 r221102 4990 4990 // FIXME: Dispatch additional events to the didNotHandleWheelEvent client function. 4991 4991 if (!handled) { 4992 if (m_uiClient->implementsDidNotHandleWheelEvent()) 4993 m_uiClient->didNotHandleWheelEvent(this, oldestCoalescedEvent->last()); 4992 m_uiClient->didNotHandleWheelEvent(this, oldestCoalescedEvent->last()); 4994 4993 m_pageClient.wheelEventWasNotHandledByWebCore(oldestCoalescedEvent->last()); 4995 4994 } … … 5027 5026 break; 5028 5027 5029 if (m_uiClient->implementsDidNotHandleKeyEvent()) 5030 m_uiClient->didNotHandleKeyEvent(this, event); 5028 m_uiClient->didNotHandleKeyEvent(this, event); 5031 5029 break; 5032 5030 }
Note: See TracChangeset
for help on using the changeset viewer.