Move WebFrameListenerProxy to WebFramePolicyListenerProxy, its only subclass

https://bugs.webkit.org/show_bug.cgi?id=187825

Reviewed by Brady Eidson.

* CMakeLists.txt:
* UIProcess/API/C/WKPage.cpp:
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
* UIProcess/Automation/WebAutomationSession.cpp:
* UIProcess/Cocoa/WebViewImpl.mm:
* UIProcess/RemoteWebInspectorProxy.cpp:
* UIProcess/WebFormSubmissionListenerProxy.h:
(WebKit::WebFormSubmissionListenerProxy::create):
(WebKit::WebFormSubmissionListenerProxy::WebFormSubmissionListenerProxy):
* UIProcess/WebFrameListenerProxy.cpp: Removed.
* UIProcess/WebFrameListenerProxy.h: Removed.
* UIProcess/WebFramePolicyListenerProxy.cpp:
(WebKit::WebFramePolicyListenerProxy::WebFramePolicyListenerProxy):
(WebKit::WebFramePolicyListenerProxy::receivedPolicyDecision):
(WebKit::WebFramePolicyListenerProxy::changeWebsiteDataStore):
(WebKit::WebFramePolicyListenerProxy::invalidate):
(WebKit::WebFramePolicyListenerProxy::isMainFrame const):
(WebKit::WebFramePolicyListenerProxy::setNavigation):
* UIProcess/WebFramePolicyListenerProxy.h:
(WebKit::WebFramePolicyListenerProxy::listenerID const):
(WebKit::WebFramePolicyListenerProxy::operator new): Deleted.
* UIProcess/WebFrameProxy.cpp:
(WebKit::WebFrameProxy::activePolicyListenerProxy):
* UIProcess/WebFrameProxy.h:
* UIProcess/WebInspectorProxy.cpp:
* UIProcess/WebProcessPool.cpp:
* UIProcess/ios/ViewGestureControllerIOS.mm:
* UIProcess/mac/ViewGestureControllerMac.mm:
* UIProcess/mac/WKInspectorViewController.mm:
* WebKit.xcodeproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234009 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
index 6cab2d7..6ab24e2 100644 (file)
--- a/Source/WebKit/CMakeLists.txt
+++ b/Source/WebKit/CMakeLists.txt
@@ -335,7 +335,6 @@ set(WebKit_SOURCES
     UIProcess/WebEditCommandProxy.cpp
     UIProcess/WebFormClient.cpp
     UIProcess/WebFormSubmissionListenerProxy.cpp
-    UIProcess/WebFrameListenerProxy.cpp
     UIProcess/WebFramePolicyListenerProxy.cpp
     UIProcess/WebFrameProxy.cpp
     UIProcess/WebFullScreenManagerProxy.cpp

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 2d8e508..dbeb3ce 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,41 @@
+2018-07-19  Alex Christensen  <achristensen@webkit.org>
+
+        Move WebFrameListenerProxy to WebFramePolicyListenerProxy, its only subclass
+        https://bugs.webkit.org/show_bug.cgi?id=187825
+
+        Reviewed by Brady Eidson.
+
+        * CMakeLists.txt:
+        * UIProcess/API/C/WKPage.cpp:
+        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+        * UIProcess/Automation/WebAutomationSession.cpp:
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        * UIProcess/RemoteWebInspectorProxy.cpp:
+        * UIProcess/WebFormSubmissionListenerProxy.h:
+        (WebKit::WebFormSubmissionListenerProxy::create):
+        (WebKit::WebFormSubmissionListenerProxy::WebFormSubmissionListenerProxy):
+        * UIProcess/WebFrameListenerProxy.cpp: Removed.
+        * UIProcess/WebFrameListenerProxy.h: Removed.
+        * UIProcess/WebFramePolicyListenerProxy.cpp:
+        (WebKit::WebFramePolicyListenerProxy::WebFramePolicyListenerProxy):
+        (WebKit::WebFramePolicyListenerProxy::receivedPolicyDecision):
+        (WebKit::WebFramePolicyListenerProxy::changeWebsiteDataStore):
+        (WebKit::WebFramePolicyListenerProxy::invalidate):
+        (WebKit::WebFramePolicyListenerProxy::isMainFrame const):
+        (WebKit::WebFramePolicyListenerProxy::setNavigation):
+        * UIProcess/WebFramePolicyListenerProxy.h:
+        (WebKit::WebFramePolicyListenerProxy::listenerID const):
+        (WebKit::WebFramePolicyListenerProxy::operator new): Deleted.
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::activePolicyListenerProxy):
+        * UIProcess/WebFrameProxy.h:
+        * UIProcess/WebInspectorProxy.cpp:
+        * UIProcess/WebProcessPool.cpp:
+        * UIProcess/ios/ViewGestureControllerIOS.mm:
+        * UIProcess/mac/ViewGestureControllerMac.mm:
+        * UIProcess/mac/WKInspectorViewController.mm:
+        * WebKit.xcodeproj/project.pbxproj:
+
 2018-07-19  Jon Lee  <jonlee@apple.com>
 
         Update iOS fullscreen alert text again

diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp
index fd03b02..227e2df 100644 (file)
--- a/Source/WebKit/UIProcess/API/C/WKPage.cpp
+++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp
@@ -38,6 +38,7 @@
 #include "APIGeometry.h"
 #include "APIHitTestResult.h"
 #include "APILoaderClient.h"
+#include "APINavigation.h"
 #include "APINavigationAction.h"
 #include "APINavigationClient.h"
 #include "APINavigationResponse.h"

diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm b/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm
index 10d0115..8dd8409 100644 (file)
--- a/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm
+++ b/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm
@@ -29,6 +29,7 @@
 #if WK_API_ENABLED
 
 #import "APIData.h"
+#import "APINavigation.h"
 #import "ObjCObjectGraph.h"
 #import "PageLoadStateObserver.h"
 #import "RemoteObjectRegistry.h"

diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
index dd8cd91..37cdfa2 100644 (file)
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
@@ -24,6 +24,7 @@
 #include "WebKitWebView.h"
 
 #include "APIData.h"
+#include "APINavigation.h"
 #include "APISerializedScriptValue.h"
 #include "ImageOptions.h"
 #include "WebCertificateInfo.h"

diff --git a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
index e4e4451..77878aa 100644 (file)
--- a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
+++ b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
@@ -29,6 +29,7 @@
 
 #include "APIArray.h"
 #include "APIAutomationSessionClient.h"
+#include "APINavigation.h"
 #include "APIOpenPanelParameters.h"
 #include "AutomationProtocolObjects.h"
 #include "CoordinateSystem.h"

diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
index 566ff59..db6d523 100644 (file)
--- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
+++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
@@ -29,6 +29,7 @@
 #if PLATFORM(MAC)
 
 #import "APILegacyContextHistoryClient.h"
+#import "APINavigation.h"
 #import "AttributedString.h"
 #import "ColorSpaceData.h"
 #import "FullscreenClient.h"

diff --git a/Source/WebKit/UIProcess/RemoteWebInspectorProxy.cpp b/Source/WebKit/UIProcess/RemoteWebInspectorProxy.cpp
index 2f1e711..4256f95 100644 (file)
--- a/Source/WebKit/UIProcess/RemoteWebInspectorProxy.cpp
+++ b/Source/WebKit/UIProcess/RemoteWebInspectorProxy.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "RemoteWebInspectorProxy.h"
 
+#include "APINavigation.h"
 #include "RemoteWebInspectorProxyMessages.h"
 #include "RemoteWebInspectorUIMessages.h"
 #include "WebInspectorProxy.h"

diff --git a/Source/WebKit/UIProcess/WebFormSubmissionListenerProxy.h b/Source/WebKit/UIProcess/WebFormSubmissionListenerProxy.h
index 2a7fa4b..958810d 100644 (file)
--- a/Source/WebKit/UIProcess/WebFormSubmissionListenerProxy.h
+++ b/Source/WebKit/UIProcess/WebFormSubmissionListenerProxy.h
@@ -25,13 +25,14 @@
 
 #pragma once
 
-#include "WebFrameListenerProxy.h"
+#include "APIObject.h"
+#include <wtf/CompletionHandler.h>
 
 namespace WebKit {
 
 class WebFormSubmissionListenerProxy : public API::ObjectImpl<API::Object::Type::FormSubmissionListener> {
 public:
-    static Ref<WebFormSubmissionListenerProxy> create(WTF::Function<void(void)>&& completionHandler)
+    static Ref<WebFormSubmissionListenerProxy> create(CompletionHandler<void(void)>&& completionHandler)
     {
         return adoptRef(*new WebFormSubmissionListenerProxy(WTFMove(completionHandler)));
     }
@@ -39,10 +40,10 @@ public:
     void continueSubmission();
 
 private:
-    WebFormSubmissionListenerProxy(WTF::Function<void(void)>&& completionHandler)
+    WebFormSubmissionListenerProxy(CompletionHandler<void(void)>&& completionHandler)
         : m_completionHandler(WTFMove(completionHandler))
     { }
-    WTF::Function<void(void)> m_completionHandler;
+    CompletionHandler<void(void)> m_completionHandler;
 };
 
 } // namespace WebKit

diff --git a/Source/WebKit/UIProcess/WebFrameListenerProxy.cpp b/Source/WebKit/UIProcess/WebFrameListenerProxy.cpp
deleted file mode 100644 (file)
index f9e9905..0000000
--- a/Source/WebKit/UIProcess/WebFrameListenerProxy.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebFrameListenerProxy.h"
-
-#include "WebFrameProxy.h"
-#include "WebsiteDataStore.h"
-#include "WebsitePoliciesData.h"
-
-namespace WebKit {
-
-WebFrameListenerProxy::WebFrameListenerProxy(WebFrameProxy* frame, uint64_t listenerID)
-    : m_frame(frame)
-    , m_listenerID(listenerID)
-{
-}
-
-WebFrameListenerProxy::~WebFrameListenerProxy()
-{
-}
-
-void WebFrameListenerProxy::invalidate()
-{
-    m_frame = nullptr;
-}
-
-void WebFrameListenerProxy::receivedPolicyDecision(WebCore::PolicyAction action, std::optional<WebsitePoliciesData>&& data)
-{
-    if (!m_frame)
-        return;
-
-    m_frame->receivedPolicyDecision(action, m_listenerID, m_navigation.get(), WTFMove(data));
-    m_frame = nullptr;
-}
-
-void WebFrameListenerProxy::changeWebsiteDataStore(WebsiteDataStore& websiteDataStore)
-{
-    if (!m_frame)
-        return;
-
-    m_frame->changeWebsiteDataStore(websiteDataStore);
-}
-
-bool WebFrameListenerProxy::isMainFrame() const
-{
-    if (!m_frame)
-        return false;
-
-    return m_frame->isMainFrame();
-}
-
-} // namespace WebKit

diff --git a/Source/WebKit/UIProcess/WebFrameListenerProxy.h b/Source/WebKit/UIProcess/WebFrameListenerProxy.h
deleted file mode 100644 (file)
index f0bac5f..0000000
--- a/Source/WebKit/UIProcess/WebFrameListenerProxy.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include "APINavigation.h"
-#include "APIObject.h"
-#include <WebCore/FrameLoaderTypes.h>
-#include <wtf/Ref.h>
-#include <wtf/RefPtr.h>
-
-namespace WebKit {
-
-class WebFrameProxy;
-class WebsiteDataStore;
-struct WebsitePoliciesData;
-
-class WebFrameListenerProxy : public API::Object {
-public:
-    virtual ~WebFrameListenerProxy();
-
-    void invalidate();
-    uint64_t listenerID() const { return m_listenerID; }
-
-    void setNavigation(Ref<API::Navigation>&& navigation) { m_navigation = WTFMove(navigation); }
-
-    void changeWebsiteDataStore(WebsiteDataStore&);
-
-    void setApplyPolicyInNewProcessIfPossible(bool applyPolicyInNewProcessIfPossible) { m_applyPolicyInNewProcessIfPossible = applyPolicyInNewProcessIfPossible; }
-    bool applyPolicyInNewProcessIfPossible() const { return m_applyPolicyInNewProcessIfPossible; }
-
-    bool isMainFrame() const;
-
-protected:
-    WebFrameListenerProxy(WebFrameProxy*, uint64_t listenerID);
-
-    void receivedPolicyDecision(WebCore::PolicyAction, std::optional<WebsitePoliciesData>&&);
-
-private:
-    RefPtr<WebFrameProxy> m_frame;
-    uint64_t m_listenerID;
-    RefPtr<API::Navigation> m_navigation;
-    bool m_applyPolicyInNewProcessIfPossible { false };
-};
-
-} // namespace WebKit

diff --git a/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp b/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp
index a836712..14cc5ad 100644 (file)
--- a/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp
+++ b/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "WebFramePolicyListenerProxy.h"
 
+#include "APINavigation.h"
 #include "WebFrameProxy.h"
 #include "WebsiteDataStore.h"
 #include "WebsitePoliciesData.h"
@@ -33,11 +34,47 @@
 namespace WebKit {
 
 WebFramePolicyListenerProxy::WebFramePolicyListenerProxy(WebFrameProxy* frame, uint64_t listenerID, PolicyListenerType policyType)
-    : WebFrameListenerProxy(frame, listenerID)
-    , m_policyType(policyType)
+    : m_policyType(policyType)
+    , m_frame(frame)
+    , m_listenerID(listenerID)
 {
 }
 
+void WebFramePolicyListenerProxy::receivedPolicyDecision(WebCore::PolicyAction action, std::optional<WebsitePoliciesData>&& data)
+{
+    if (!m_frame)
+        return;
+    
+    m_frame->receivedPolicyDecision(action, m_listenerID, m_navigation.get(), WTFMove(data));
+    m_frame = nullptr;
+}
+
+void WebFramePolicyListenerProxy::changeWebsiteDataStore(WebsiteDataStore& websiteDataStore)
+{
+    if (!m_frame)
+        return;
+    
+    m_frame->changeWebsiteDataStore(websiteDataStore);
+}
+
+void WebFramePolicyListenerProxy::invalidate()
+{
+    m_frame = nullptr;
+}
+
+bool WebFramePolicyListenerProxy::isMainFrame() const
+{
+    if (!m_frame)
+        return false;
+    
+    return m_frame->isMainFrame();
+}
+
+void WebFramePolicyListenerProxy::setNavigation(Ref<API::Navigation>&& navigation)
+{
+    m_navigation = WTFMove(navigation);
+}
+    
 void WebFramePolicyListenerProxy::use(std::optional<WebsitePoliciesData>&& data)
 {
     receivedPolicyDecision(WebCore::PolicyAction::Use, WTFMove(data));

diff --git a/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h b/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h
index 8990718..2130186 100644 (file)
--- a/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h
+++ b/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h
@@ -25,25 +25,34 @@
 
 #pragma once
 
-#include "WebFrameListenerProxy.h"
+#include "APIObject.h"
 
 #if PLATFORM(COCOA)
 #include "WKFoundation.h"
 #endif
 
-#define DELEGATE_REF_COUNTING_TO_COCOA (PLATFORM(COCOA) && WK_API_ENABLED)
+namespace API {
+class Navigation;
+}
+
+namespace WebCore {
+enum class PolicyAction;
+}
 
 namespace WebKit {
 
+class WebsiteDataStore;
+class WebFrameProxy;
+struct WebsitePoliciesData;
+
 enum class PolicyListenerType {
     NavigationAction,
     NewWindowAction,
     Response,
 };
 
-class WebFramePolicyListenerProxy : public WebFrameListenerProxy {
+class WebFramePolicyListenerProxy : public API::ObjectImpl<API::Object::Type::FramePolicyListener> {
 public:
-    static const Type APIType = Type::FramePolicyListener;
 
     static Ref<WebFramePolicyListenerProxy> create(WebFrameProxy* frame, uint64_t listenerID, PolicyListenerType policyType)
     {
@@ -56,18 +65,27 @@ public:
 
     PolicyListenerType policyListenerType() const { return m_policyType; }
 
+    uint64_t listenerID() const { return m_listenerID; }
+    
+    void setNavigation(Ref<API::Navigation>&&);
+    void invalidate();
+    
+    void changeWebsiteDataStore(WebsiteDataStore&);
+    bool isMainFrame() const;
+
+    void setApplyPolicyInNewProcessIfPossible(bool applyPolicyInNewProcessIfPossible) { m_applyPolicyInNewProcessIfPossible = applyPolicyInNewProcessIfPossible; }
+    bool applyPolicyInNewProcessIfPossible() const { return m_applyPolicyInNewProcessIfPossible; }
+
 private:
     WebFramePolicyListenerProxy(WebFrameProxy*, uint64_t listenerID, PolicyListenerType);
 
-    Type type() const override { return APIType; }
-
-#if DELEGATE_REF_COUNTING_TO_COCOA
-    void* operator new(size_t size) { return newObject(size, APIType); }
-#endif
+    void receivedPolicyDecision(WebCore::PolicyAction, std::optional<WebsitePoliciesData>&&);
 
     PolicyListenerType m_policyType;
+    RefPtr<WebFrameProxy> m_frame;
+    uint64_t m_listenerID { 0 };
+    RefPtr<API::Navigation> m_navigation;
+    bool m_applyPolicyInNewProcessIfPossible { false };
 };
 
 } // namespace WebKit
-
-#undef DELEGATE_REF_COUNTING_TO_COCOA

diff --git a/Source/WebKit/UIProcess/WebFrameProxy.cpp b/Source/WebKit/UIProcess/WebFrameProxy.cpp
index 6d42aab..4712c6b 100644 (file)
--- a/Source/WebKit/UIProcess/WebFrameProxy.cpp
+++ b/Source/WebKit/UIProcess/WebFrameProxy.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "WebFrameProxy.h"
 
+#include "APINavigation.h"
 #include "WebCertificateInfo.h"
 #include "WebFramePolicyListenerProxy.h"
 #include "WebPageMessages.h"
@@ -197,10 +198,7 @@ WebFramePolicyListenerProxy& WebFrameProxy::setUpPolicyListenerProxy(uint64_t li
 
 WebFramePolicyListenerProxy* WebFrameProxy::activePolicyListenerProxy()
 {
-    if (!m_activeListener || m_activeListener->type() != WebFramePolicyListenerProxy::APIType)
-        return nullptr;
-
-    return static_cast<WebFramePolicyListenerProxy*>(m_activeListener.get());
+    return m_activeListener.get();
 }
 
 void WebFrameProxy::changeWebsiteDataStore(WebsiteDataStore& websiteDataStore)

diff --git a/Source/WebKit/UIProcess/WebFrameProxy.h b/Source/WebKit/UIProcess/WebFrameProxy.h
index 4be3300..1d7d48a 100644 (file)
--- a/Source/WebKit/UIProcess/WebFrameProxy.h
+++ b/Source/WebKit/UIProcess/WebFrameProxy.h
@@ -28,7 +28,7 @@
 #include "APIObject.h"
 #include "FrameLoadState.h"
 #include "GenericCallback.h"
-#include "WebFrameListenerProxy.h"
+#include "WebFramePolicyListenerProxy.h"
 #include <WebCore/FrameLoaderTypes.h>
 #include <wtf/Forward.h>
 #include <wtf/Function.h>
@@ -144,7 +144,7 @@ private:
     bool m_isFrameSet;
     bool m_containsPluginDocument { false };
     RefPtr<WebCertificateInfo> m_certificateInfo;
-    RefPtr<WebFrameListenerProxy> m_activeListener;
+    RefPtr<WebFramePolicyListenerProxy> m_activeListener;
     uint64_t m_frameID;
 #if ENABLE(CONTENT_FILTERING)
     WebCore::ContentFilterUnblockHandler m_contentFilterUnblockHandler;

diff --git a/Source/WebKit/UIProcess/WebInspectorProxy.cpp b/Source/WebKit/UIProcess/WebInspectorProxy.cpp
index a158968..d78951e 100644 (file)
--- a/Source/WebKit/UIProcess/WebInspectorProxy.cpp
+++ b/Source/WebKit/UIProcess/WebInspectorProxy.cpp
@@ -27,6 +27,7 @@
 #include "config.h"
 #include "WebInspectorProxy.h"
 
+#include "APINavigation.h"
 #include "APIProcessPoolConfiguration.h"
 #include "WebAutomationSession.h"
 #include "WebFrameProxy.h"

diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
index b9b1317..fec2c72 100644 (file)
--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
@@ -33,6 +33,7 @@
 #include "APIHTTPCookieStore.h"
 #include "APIInjectedBundleClient.h"
 #include "APILegacyContextHistoryClient.h"
+#include "APINavigation.h"
 #include "APIPageConfiguration.h"
 #include "APIProcessPoolConfiguration.h"
 #include "ChildProcessMessages.h"

diff --git a/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp b/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp
index 25db483..022af6f 100644 (file)
--- a/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp
+++ b/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp
@@ -29,6 +29,7 @@
 #include "config.h"
 #include "WebInspectorProxy.h"
 
+#include "APINavigation.h"
 #include "APINavigationAction.h"
 #include "WKArray.h"
 #include "WKContextMenuItem.h"

diff --git a/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm b/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm
index c2d215f..3132c54 100644 (file)
--- a/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm
+++ b/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm
@@ -28,6 +28,7 @@
 
 #if PLATFORM(IOS)
 
+#import "APINavigation.h"
 #import "DrawingAreaProxy.h"
 #import "UIKitSPI.h"
 #import "ViewGestureControllerMessages.h"

diff --git a/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm b/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm
index 10b8aaa..4b533ab 100644 (file)
--- a/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm
+++ b/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm
@@ -28,6 +28,7 @@
 
 #if PLATFORM(MAC)
 
+#import "APINavigation.h"
 #import "DrawingAreaProxy.h"
 #import "FrameLoadState.h"
 #import "Logging.h"

diff --git a/Source/WebKit/UIProcess/mac/WKInspectorViewController.mm b/Source/WebKit/UIProcess/mac/WKInspectorViewController.mm
index 507f6ba..945214d 100644 (file)
--- a/Source/WebKit/UIProcess/mac/WKInspectorViewController.mm
+++ b/Source/WebKit/UIProcess/mac/WKInspectorViewController.mm
@@ -28,6 +28,7 @@
 
 #if PLATFORM(MAC) && WK_API_ENABLED
 
+#import "APINavigation.h"
 #import "VersionChecks.h"
 #import "WKFrameInfo.h"
 #import "WKInspectorWKWebView.h"

diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
index 464d2e5..6d90df6 100644 (file)
--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -1980,8 +1980,6 @@
                BCE469561214E6CB000B98EB /* WebFormSubmissionListenerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE469521214E6CB000B98EB /* WebFormSubmissionListenerProxy.h */; };
                BCE469591214EDF4000B98EB /* WKFormSubmissionListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE469571214EDF4000B98EB /* WKFormSubmissionListener.cpp */; };
                BCE4695A1214EDF4000B98EB /* WKFormSubmissionListener.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE469581214EDF4000B98EB /* WKFormSubmissionListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BCE469771214F27B000B98EB /* WebFrameListenerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE469761214F27B000B98EB /* WebFrameListenerProxy.h */; };
-               BCE469791214F2B4000B98EB /* WebFrameListenerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE469781214F2B4000B98EB /* WebFrameListenerProxy.cpp */; };
                BCE81D8C1319F7EF00241910 /* FontInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE81D8A1319F7EF00241910 /* FontInfo.cpp */; };
                BCE81D8D1319F7EF00241910 /* FontInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE81D8B1319F7EF00241910 /* FontInfo.h */; };
                BCEE7AD012817988009827DA /* WebProcessProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEE7ACC12817988009827DA /* WebProcessProxyMessageReceiver.cpp */; };
@@ -4598,8 +4596,6 @@
                BCE469521214E6CB000B98EB /* WebFormSubmissionListenerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFormSubmissionListenerProxy.h; sourceTree = "<group>"; };
                BCE469571214EDF4000B98EB /* WKFormSubmissionListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKFormSubmissionListener.cpp; sourceTree = "<group>"; };
                BCE469581214EDF4000B98EB /* WKFormSubmissionListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFormSubmissionListener.h; sourceTree = "<group>"; };
-               BCE469761214F27B000B98EB /* WebFrameListenerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameListenerProxy.h; sourceTree = "<group>"; };
-               BCE469781214F2B4000B98EB /* WebFrameListenerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFrameListenerProxy.cpp; sourceTree = "<group>"; };
                BCE81D8A1319F7EF00241910 /* FontInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontInfo.cpp; sourceTree = "<group>"; };
                BCE81D8B1319F7EF00241910 /* FontInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontInfo.h; sourceTree = "<group>"; };
                BCE9C0CF1485965D00E33D61 /* WebConnectionToUIProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebConnectionToUIProcess.cpp; sourceTree = "<group>"; };
@@ -7495,8 +7491,6 @@
                                BCE469501214E6CB000B98EB /* WebFormClient.h */,
                                BCE469511214E6CB000B98EB /* WebFormSubmissionListenerProxy.cpp */,
                                BCE469521214E6CB000B98EB /* WebFormSubmissionListenerProxy.h */,
-                               BCE469781214F2B4000B98EB /* WebFrameListenerProxy.cpp */,
-                               BCE469761214F27B000B98EB /* WebFrameListenerProxy.h */,
                                BCB9F69F1123A84B00A137E0 /* WebFramePolicyListenerProxy.cpp */,
                                BCB9F69E1123A84B00A137E0 /* WebFramePolicyListenerProxy.h */,
                                BC111B0A112F5E4F00337BAB /* WebFrameProxy.cpp */,
@@ -9472,7 +9466,6 @@
                                BCE469541214E6CB000B98EB /* WebFormClient.h in Headers */,
                                BCE469561214E6CB000B98EB /* WebFormSubmissionListenerProxy.h in Headers */,
                                BC032D8D10F437A00058C15A /* WebFrame.h in Headers */,
-                               BCE469771214F27B000B98EB /* WebFrameListenerProxy.h in Headers */,
                                BC032D7F10F4378D0058C15A /* WebFrameLoaderClient.h in Headers */,
                                9391F2CB121B67AD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */,
                                BCB9F6A01123A84B00A137E0 /* WebFramePolicyListenerProxy.h in Headers */,
@@ -11285,7 +11278,6 @@
                                BCE469531214E6CB000B98EB /* WebFormClient.cpp in Sources */,
                                BCE469551214E6CB000B98EB /* WebFormSubmissionListenerProxy.cpp in Sources */,
                                BC111ADD112F5B9300337BAB /* WebFrame.cpp in Sources */,
-                               BCE469791214F2B4000B98EB /* WebFrameListenerProxy.cpp in Sources */,
                                BC111A5F112F4FBB00337BAB /* WebFrameLoaderClient.cpp in Sources */,
                                2D28F3E71885CCC1004B9EAE /* WebFrameLoaderClientIOS.mm in Sources */,
                                9391F2CA121B679A00EBF7E8 /* WebFrameNetworkingContext.mm in Sources */,