Changeset 221055 in webkit


Ignore:
Timestamp:
Aug 22, 2017, 4:15:05 PM (8 years ago)
Author:
achristensen@apple.com
Message:

Add UIDelegatePrivate SPI corresponding to WKPageUIClient.showPage
​https://bugs.webkit.org/show_bug.cgi?id=175797
<rdar://problem/29270035>

Reviewed by Geoffrey Garen.

Source/WebKit:

  • UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
  • UIProcess/Cocoa/UIDelegate.h:
  • UIProcess/Cocoa/UIDelegate.mm:

(WebKit::UIDelegate::setDelegate):
(WebKit::UIDelegate::UIClient::showPage):

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::registerURLSchemeHandler):
window.open, createWebViewWithConfiguration, and WKURLSchemeHandlers all used together
make it so that URLSchemeHandlers are added to WebPages that already have them. The
assertions are no longer valid.

Tools:

  • TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
  • TestWebKitAPI/Tests/WebKit2Cocoa/UIDelegate.mm: Added.

(-[UITestDelegate webView:createWebViewWithConfiguration:forNavigationAction:windowFeatures:]):
(-[UITestDelegate _showPage:]):
(-[UITestDelegate webView:startURLSchemeTask:]):
(-[UITestDelegate webView:stopURLSchemeTask:]):
(TEST):

Location:
trunk
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r221047 r221055  
     12017-08-22  Alex Christensen  <achristensen@webkit.org>
     2
     3        Add UIDelegatePrivate SPI corresponding to WKPageUIClient.showPage
     4        https://bugs.webkit.org/show_bug.cgi?id=175797
     5        <rdar://problem/29270035>
     6
     7        Reviewed by Geoffrey Garen.
     8
     9        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
     10        * UIProcess/Cocoa/UIDelegate.h:
     11        * UIProcess/Cocoa/UIDelegate.mm:
     12        (WebKit::UIDelegate::setDelegate):
     13        (WebKit::UIDelegate::UIClient::showPage):
     14        * WebProcess/WebPage/WebPage.cpp:
     15        (WebKit::WebPage::registerURLSchemeHandler):
     16        window.open, createWebViewWithConfiguration, and WKURLSchemeHandlers all used together
     17        make it so that URLSchemeHandlers are added to WebPages that already have them.  The
     18        assertions are no longer valid.
     19
    1202017-08-22  Matt Lewis  <jlewis3@apple.com>
    221

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h

    r221047 r221055  
    120120- (void)_webView:(WKWebView *)webView didChangeSafeAreaShouldAffectObscuredInsets:(BOOL)safeAreaShouldAffectObscuredInsets WK_API_AVAILABLE(ios(WK_IOS_TBA));
    121121#else
     122- (void)_webViewShow:(WKWebView *)webView WK_API_AVAILABLE(macosx(WK_MAC_TBA));
    122123- (NSMenu *)_webView:(WKWebView *)webView contextMenu:(NSMenu *)menu forElement:(_WKContextMenuElementInfo *)element WK_API_AVAILABLE(macosx(10.12));
    123124- (NSMenu *)_webView:(WKWebView *)webView contextMenu:(NSMenu *)menu forElement:(_WKContextMenuElementInfo *)element userInfo:(id <NSSecureCoding>)userInfo WK_API_AVAILABLE(macosx(10.12));

  • trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h

    r221047 r221055  
    8080    private:
    8181        // API::UIClient
    82         RefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, API::FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, WebKit::NavigationActionData&&) override;
    83         void createNewPageAsync(WebKit::WebPageProxy*, API::FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, WebKit::NavigationActionData&&, WTF::Function<void(RefPtr<WebKit::WebPageProxy>&&)>&& completionHandler) final;
     82        RefPtr<WebPageProxy> createNewPage(WebPageProxy*, API::FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, NavigationActionData&&) final;
     83        void createNewPageAsync(WebPageProxy*, API::FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, NavigationActionData&&, WTF::Function<void(RefPtr<WebPageProxy>&&)>&& completionHandler) final;
    8484        bool canCreateNewPageAsync() final;
    85         RefPtr<WebKit::WebPageProxy> createNewPageCommon(WebKit::WebPageProxy*, API::FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, WebKit::NavigationActionData&&, WTF::Function<void(RefPtr<WebKit::WebPageProxy>&&)>&& completionHandler);
     85        RefPtr<WebPageProxy> createNewPageCommon(WebPageProxy*, API::FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, NavigationActionData&&, WTF::Function<void(RefPtr<WebPageProxy>&&)>&& completionHandler);
    8686
    8787        void close(WebKit::WebPageProxy*) override;
    … …  
    9797        void reachedApplicationCacheOriginQuota(WebPageProxy*, const WebCore::SecurityOrigin&, uint64_t currentQuota, uint64_t totalBytesNeeded, Function<void (unsigned long long)>&& completionHandler) override;
    9898#if PLATFORM(MAC)
     99        void showPage(WebPageProxy*) final;
    99100        bool runOpenPanel(WebPageProxy*, WebFrameProxy*, const WebCore::SecurityOriginData&, API::OpenPanelParameters*, WebOpenPanelResultListenerProxy*) override;
    100101#endif
    … …  
    132133        bool webViewCreateWebViewWithConfigurationForNavigationActionWindowFeatures : 1;
    133134        bool webViewCreateWebViewWithConfigurationForNavigationActionWindowFeaturesAsync : 1;
     135        bool webViewShow : 1;
    134136        bool webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler : 1;
    135137        bool webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;

  • trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm

    r221047 r221055  
    101101
    102102#if PLATFORM(MAC)
     103    m_delegateMethods.webViewShow = [delegate respondsToSelector:@selector(_webViewShow:)];
    103104    m_delegateMethods.webViewRunOpenPanelWithParametersInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runOpenPanelWithParameters:initiatedByFrame:completionHandler:)];
    104105#endif
    … …  
    372373
    373374#if PLATFORM(MAC)
     375void UIDelegate::UIClient::showPage(WebPageProxy*)
     376{
     377    if (!m_uiDelegate.m_delegateMethods.webViewShow)
     378        return;
     379
     380    auto delegate = m_uiDelegate.m_delegate.get();
     381    if (!delegate)
     382        return;
     383   
     384    [(id <WKUIDelegatePrivate>)delegate _webViewShow:m_uiDelegate.m_webView];
     385}
     386
    374387bool UIDelegate::UIClient::runOpenPanel(WebPageProxy*, WebFrameProxy* webFrameProxy, const WebCore::SecurityOriginData& securityOriginData, API::OpenPanelParameters* openPanelParameters, WebOpenPanelResultListenerProxy* listener)
    375388{

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

    r221047 r221055  
    59335933{
    59345934    auto schemeResult = m_schemeToURLSchemeHandlerProxyMap.add(scheme, WebURLSchemeHandlerProxy::create(*this, handlerIdentifier));
    5935     ASSERT(schemeResult.isNewEntry);
    5936 
    5937     auto identifierResult = m_identifierToURLSchemeHandlerProxyMap.add(handlerIdentifier, schemeResult.iterator->value.get());
    5938     ASSERT_UNUSED(identifierResult, identifierResult.isNewEntry);
     5935    m_identifierToURLSchemeHandlerProxyMap.add(handlerIdentifier, schemeResult.iterator->value.get());
    59395936}
    59405937

  • trunk/Tools/ChangeLog

    r221049 r221055  
     12017-08-22  Alex Christensen  <achristensen@webkit.org>
     2
     3        Add UIDelegatePrivate SPI corresponding to WKPageUIClient.showPage
     4        https://bugs.webkit.org/show_bug.cgi?id=175797
     5        <rdar://problem/29270035>
     6
     7        Reviewed by Geoffrey Garen.
     8
     9        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
     10        * TestWebKitAPI/Tests/WebKit2Cocoa/UIDelegate.mm: Added.
     11        (-[UITestDelegate webView:createWebViewWithConfiguration:forNavigationAction:windowFeatures:]):
     12        (-[UITestDelegate _showPage:]):
     13        (-[UITestDelegate webView:startURLSchemeTask:]):
     14        (-[UITestDelegate webView:stopURLSchemeTask:]):
     15        (TEST):
     16
    1172017-08-22  Devin Rousso  <webkit@devinrousso.com>
    218

  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r221047 r221055  
    233233                5C9E59421D3EB5AC00E3C62E /* ApplicationCache.db-shm in Copy Resources */ = {isa = PBXBuildFile; fileRef = 5C9E593F1D3EB1DE00E3C62E /* ApplicationCache.db-shm */; };
    234234                5C9E59431D3EB5AC00E3C62E /* ApplicationCache.db-wal in Copy Resources */ = {isa = PBXBuildFile; fileRef = 5C9E59401D3EB1DE00E3C62E /* ApplicationCache.db-wal */; };
     235                5CB40B4E1F4B98D3007DC7B9 /* UIDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CB40B4D1F4B98BE007DC7B9 /* UIDelegate.mm */; };
    235236                5CE354D91E70DA5C00BEFE3B /* WKContentExtensionStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CE354D81E70D9C300BEFE3B /* WKContentExtensionStore.mm */; };
    236237                5E4B1D2E1D404C6100053621 /* WKScrollViewDelegateCrash.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5E4B1D2C1D404C6100053621 /* WKScrollViewDelegateCrash.mm */; };
    … …  
    13041305                5C9E593F1D3EB1DE00E3C62E /* ApplicationCache.db-shm */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ApplicationCache.db-shm"; sourceTree = "<group>"; };
    13051306                5C9E59401D3EB1DE00E3C62E /* ApplicationCache.db-wal */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ApplicationCache.db-wal"; sourceTree = "<group>"; };
     1307                5CB40B4D1F4B98BE007DC7B9 /* UIDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIDelegate.mm; sourceTree = "<group>"; };
    13061308                5CE354D81E70D9C300BEFE3B /* WKContentExtensionStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKContentExtensionStore.mm; sourceTree = "<group>"; };
    13071309                5E4B1D2C1D404C6100053621 /* WKScrollViewDelegateCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKScrollViewDelegateCrash.mm; path = ../ios/WKScrollViewDelegateCrash.mm; sourceTree = "<group>"; };
    … …  
    19421944                                2DFF7B6C1DA487AF00814614 /* SnapshotStore.mm */,
    19431945                                515BE1701D428BD100DD7C68 /* StoreBlobThenDelete.mm */,
     1946                                5CB40B4D1F4B98BE007DC7B9 /* UIDelegate.mm */,
    19441947                                7CC3E1FA197E234100BE6252 /* UserContentController.mm */,
    19451948                                7C882E031C80C624006BF731 /* UserContentWorld.mm */,
    … …  
    32143217                                46C519DA1D355AB200DAA51A /* LocalStorageNullEntries.mm in Sources */,
    32153218                                7A6A2C701DCCFA8C00C0D085 /* LocalStorageQuirkTest.mm in Sources */,
     3219                                076E507F1F4513D6006E9F5A /* Logging.cpp in Sources */,
    32163220                                CDA315981ED53651009F60D3 /* MediaPlaybackSleepAssertion.mm in Sources */,
    32173221                                CDC9442E1EF1FC080059C3C4 /* MediaStreamTrackDetached.mm in Sources */,
    … …  
    32583262                                7CCE7F0C1A411AE600447C4C /* PrivateBrowsingPushStateNoHistoryCallback.cpp in Sources */,
    32593263                                4647B1261EBA3B850041D7EF /* ProcessDidTerminate.cpp in Sources */,
    3260                                 076E507F1F4513D6006E9F5A /* Logging.cpp in Sources */,
    32613264                                7C83E0C11D0A652F00FEBCF3 /* ProvisionalURLNotChange.mm in Sources */,
    32623265                                7CCE7EC81A411A7E00447C4C /* PublicSuffix.mm in Sources */,
    … …  
    33133316                                7CCE7EDD1A411A9200447C4C /* TimeRanges.cpp in Sources */,
    33143317                                7CCE7ED31A411A7E00447C4C /* TypingStyleCrash.mm in Sources */,
     3318                                5CB40B4E1F4B98D3007DC7B9 /* UIDelegate.mm in Sources */,
    33153319                                F46849BE1EEF58E400B937FE /* UIPasteboardTests.mm in Sources */,
    33163320                                7CCE7EDE1A411A9200447C4C /* URL.cpp in Sources */,
Note: See TracChangeset for help on using the changeset viewer.