Changeset 221047 in webkit


Ignore:
Timestamp:
Aug 22, 2017 2:10:12 PM (7 years ago)
Author:
Matt Lewis
Message:

Unreviewed, rolling out r221026.

This caused a consistent API failure on iOS Simulator.

Reverted changeset:

"Add UIDelegatePrivate SPI corresponding to
WKPageUIClient.showPage"
https://bugs.webkit.org/show_bug.cgi?id=175797
http://trac.webkit.org/changeset/221026

Location:
trunk
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r221043 r221047  
     12017-08-22  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r221026.
     4
     5        This caused a consistent API failure on iOS Simulator.
     6
     7        Reverted changeset:
     8
     9        "Add UIDelegatePrivate SPI corresponding to
     10        WKPageUIClient.showPage"
     11        https://bugs.webkit.org/show_bug.cgi?id=175797
     12        http://trac.webkit.org/changeset/221026
     13
    1142017-08-22  Ryan Haddad  <ryanhaddad@apple.com>
    215
  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h

    r221026 r221047  
    6262- (void)_webView:(WKWebView *)webView printFrame:(_WKFrameHandle *)frame;
    6363
    64 - (void)_showPage:(WKWebView *)webView WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    6564- (void)_webViewClose:(WKWebView *)webView;
    6665- (void)_webViewFullscreenMayReturnToInline:(WKWebView *)webView;
  • trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h

    r221026 r221047  
    8080    private:
    8181        // API::UIClient
    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;
     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;
    8484        bool canCreateNewPageAsync() final;
    85         void showPage(WebPageProxy*) final;
    86         RefPtr<WebPageProxy> createNewPageCommon(WebPageProxy*, API::FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, NavigationActionData&&, WTF::Function<void(RefPtr<WebPageProxy>&&)>&& completionHandler);
     85        RefPtr<WebKit::WebPageProxy> createNewPageCommon(WebKit::WebPageProxy*, API::FrameInfo&, WebCore::ResourceRequest&&, const WebCore::WindowFeatures&, WebKit::NavigationActionData&&, WTF::Function<void(RefPtr<WebKit::WebPageProxy>&&)>&& completionHandler);
    8786
    8887        void close(WebKit::WebPageProxy*) override;
     
    133132        bool webViewCreateWebViewWithConfigurationForNavigationActionWindowFeatures : 1;
    134133        bool webViewCreateWebViewWithConfigurationForNavigationActionWindowFeaturesAsync : 1;
    135         bool showPage : 1;
    136134        bool webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler : 1;
    137135        bool webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;
  • trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm

    r221026 r221047  
    9595    m_delegateMethods.webViewCreateWebViewWithConfigurationForNavigationActionWindowFeatures = [delegate respondsToSelector:@selector(webView:createWebViewWithConfiguration:forNavigationAction:windowFeatures:)];
    9696    m_delegateMethods.webViewCreateWebViewWithConfigurationForNavigationActionWindowFeaturesAsync = [delegate respondsToSelector:@selector(_webView:createWebViewWithConfiguration:forNavigationAction:windowFeatures:completionHandler:)];
    97     m_delegateMethods.showPage = [delegate respondsToSelector:@selector(_showPage:)];
    9897    m_delegateMethods.webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:)];
    9998    m_delegateMethods.webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:completionHandler:)];
     
    250249
    251250    createNewPageCommon(page, originatingFrameInfo, WTFMove(request), windowFeatures, WTFMove(navigationActionData), WTFMove(completionHandler));
    252 }
    253 
    254 void UIDelegate::UIClient::showPage(WebPageProxy*)
    255 {
    256     if (!m_uiDelegate.m_delegateMethods.showPage)
    257         return;
    258     auto delegate = m_uiDelegate.m_delegate.get();
    259     ASSERT(delegate);
    260     [(id <WKUIDelegatePrivate>)delegate _showPage:m_uiDelegate.m_webView];
    261251}
    262252
  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

    r221026 r221047  
    59335933{
    59345934    auto schemeResult = m_schemeToURLSchemeHandlerProxyMap.add(scheme, WebURLSchemeHandlerProxy::create(*this, handlerIdentifier));
    5935     m_identifierToURLSchemeHandlerProxyMap.add(handlerIdentifier, schemeResult.iterator->value.get());
     5935    ASSERT(schemeResult.isNewEntry);
     5936
     5937    auto identifierResult = m_identifierToURLSchemeHandlerProxyMap.add(handlerIdentifier, schemeResult.iterator->value.get());
     5938    ASSERT_UNUSED(identifierResult, identifierResult.isNewEntry);
    59365939}
    59375940
  • trunk/Tools/ChangeLog

    r221026 r221047  
     12017-08-22  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r221026.
     4
     5        This caused a consistent API failure on iOS Simulator.
     6
     7        Reverted changeset:
     8
     9        "Add UIDelegatePrivate SPI corresponding to
     10        WKPageUIClient.showPage"
     11        https://bugs.webkit.org/show_bug.cgi?id=175797
     12        http://trac.webkit.org/changeset/221026
     13
    1142017-08-22  Alex Christensen  <achristensen@webkit.org>
    215
  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r221026 r221047  
    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 */; };
    236235                5CE354D91E70DA5C00BEFE3B /* WKContentExtensionStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CE354D81E70D9C300BEFE3B /* WKContentExtensionStore.mm */; };
    237236                5E4B1D2E1D404C6100053621 /* WKScrollViewDelegateCrash.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5E4B1D2C1D404C6100053621 /* WKScrollViewDelegateCrash.mm */; };
     
    13051304                5C9E593F1D3EB1DE00E3C62E /* ApplicationCache.db-shm */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ApplicationCache.db-shm"; sourceTree = "<group>"; };
    13061305                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>"; };
    13081306                5CE354D81E70D9C300BEFE3B /* WKContentExtensionStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKContentExtensionStore.mm; sourceTree = "<group>"; };
    13091307                5E4B1D2C1D404C6100053621 /* WKScrollViewDelegateCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKScrollViewDelegateCrash.mm; path = ../ios/WKScrollViewDelegateCrash.mm; sourceTree = "<group>"; };
     
    19441942                                2DFF7B6C1DA487AF00814614 /* SnapshotStore.mm */,
    19451943                                515BE1701D428BD100DD7C68 /* StoreBlobThenDelete.mm */,
    1946                                 5CB40B4D1F4B98BE007DC7B9 /* UIDelegate.mm */,
    19471944                                7CC3E1FA197E234100BE6252 /* UserContentController.mm */,
    19481945                                7C882E031C80C624006BF731 /* UserContentWorld.mm */,
     
    33163313                                7CCE7EDD1A411A9200447C4C /* TimeRanges.cpp in Sources */,
    33173314                                7CCE7ED31A411A7E00447C4C /* TypingStyleCrash.mm in Sources */,
    3318                                 5CB40B4E1F4B98D3007DC7B9 /* UIDelegate.mm in Sources */,
    33193315                                F46849BE1EEF58E400B937FE /* UIPasteboardTests.mm in Sources */,
    33203316                                7CCE7EDE1A411A9200447C4C /* URL.cpp in Sources */,
Note: See TracChangeset for help on using the changeset viewer.