Changeset 259629 in webkit

Timestamp:

Apr 7, 2020, 12:55:57 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Use GlobalFrameIdentifier in NavigationAction
​https://bugs.webkit.org/show_bug.cgi?id=210036

Patch by Rob Buis <​rbuis@igalia.com> on 2020-04-07
Reviewed by Darin Adler.

Source/WebCore:

Use GlobalFrameIdentifier in NavigationAction rather than adding
yet another custom data type.

• loader/NavigationAction.cpp:

(WebCore::createGlobalFrameIdentifier):
(WebCore::m_globalFrameIdentifier):

• loader/NavigationAction.h:

(WebCore::NavigationAction::Requester::globalFrameIdentifier const):
(WebCore::NavigationAction::Requester::pageID const): Deleted.
(WebCore::NavigationAction::Requester::frameID const): Deleted.

Source/WebKit:

Adapt to API change.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/NavigationAction.cpp (modified) (1 diff)
• WebCore/loader/NavigationAction.h (modified) (3 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-07  Rob Buis  <rbuis@igalia.com>
+
+        Use GlobalFrameIdentifier in NavigationAction
+        https://bugs.webkit.org/show_bug.cgi?id=210036
+
+        Reviewed by Darin Adler.
+
+        Use GlobalFrameIdentifier in NavigationAction rather than adding
+        yet another custom data type.
+
+        * loader/NavigationAction.cpp:
+        (WebCore::createGlobalFrameIdentifier):
+        (WebCore::m_globalFrameIdentifier):
+        * loader/NavigationAction.h:
+        (WebCore::NavigationAction::Requester::globalFrameIdentifier const):
+        (WebCore::NavigationAction::Requester::pageID const): Deleted.
+        (WebCore::NavigationAction::Requester::frameID const): Deleted.
+
 2020-04-06  Jack Lee  <shihchieh_lee@apple.com>
 

trunk/Source/WebCore/loader/NavigationAction.cpp

@@ -39 +39 @@
 namespace WebCore {
 
+static GlobalFrameIdentifier createGlobalFrameIdentifier(const Document& document)
+{
+    if (document.frame())
+        return { document.frame()->loader().client().pageID().valueOr(PageIdentifier { }), document.frame()->loader().client().frameID().valueOr(FrameIdentifier { }) };
+    return GlobalFrameIdentifier();
+}
+
 NavigationAction::Requester::Requester(const Document& document)
     : m_url { URL { document.url() } }
     , m_origin { makeRefPtr(document.securityOrigin()) }
-    , m_pageIDAndFrameIDPair { document.frame() ? std::make_pair(document.frame()->loader().client().pageID().valueOr(PageIdentifier { }), document.frame()->loader().client().frameID().valueOr(FrameIdentifier { })) : std::make_pair<PageIdentifier, FrameIdentifier>({ }, { }) }
+    , m_globalFrameIdentifier(createGlobalFrameIdentifier(document))
 {
 }

trunk/Source/WebCore/loader/NavigationAction.h

@@ -31 +31 @@
 #include "AdClickAttribution.h"
 #include "BackForwardItemIdentifier.h"
-#include "FrameIdentifier.h"
 #include "FrameLoaderTypes.h"
+#include "GlobalFrameIdentifier.h"
 #include "LayoutPoint.h"
-#include "PageIdentifier.h"
 #include "ResourceRequest.h"
 #include "SecurityOrigin.h"
@@ -66 +65 @@
     NavigationAction& operator=(NavigationAction&&);
 
-    using PageIDAndFrameIDPair = std::pair<PageIdentifier, FrameIdentifier>; // FIXME: Use GlobalFrameIdentifier.
     class Requester {
     public:
@@ -73 +71 @@
         const URL& url() const { return m_url; }
         const SecurityOrigin& securityOrigin() const { return *m_origin; }
-        PageIdentifier pageID() const { return m_pageIDAndFrameIDPair.first; }
-        FrameIdentifier frameID() const { return m_pageIDAndFrameIDPair.second; }
+        const GlobalFrameIdentifier& globalFrameIdentifier() const { return m_globalFrameIdentifier; }
     private:
         URL m_url;
         RefPtr<SecurityOrigin> m_origin;
-        PageIDAndFrameIDPair m_pageIDAndFrameIDPair;
+        GlobalFrameIdentifier m_globalFrameIdentifier;
     };
     const Optional<Requester>& requester() const { return m_requester; }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-07  Rob Buis  <rbuis@igalia.com>
+
+        Use GlobalFrameIdentifier in NavigationAction
+        https://bugs.webkit.org/show_bug.cgi?id=210036
+
+        Reviewed by Darin Adler.
+
+        Adapt to API change.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+
 2020-04-06  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -928 +928 @@
     auto requester = navigationAction.requester().value();
 
-    auto* requestingFrame = requester.frameID() ? WebProcess::singleton().webFrame(requester.frameID()) : nullptr;
+    auto* requestingFrame = requester.globalFrameIdentifier().frameID ? WebProcess::singleton().webFrame(requester.globalFrameIdentifier().frameID) : nullptr;
     Optional<WebCore::FrameIdentifier> originatingFrameID;
     Optional<WebCore::FrameIdentifier> parentFrameID;
@@ -946 +946 @@
 
     Optional<WebPageProxyIdentifier> originatingPageID;
-    if (requester.pageID()) {
-        if (auto* webPage = WebProcess::singleton().webPage(requester.pageID()))
+    if (auto& pageID = requester.globalFrameIdentifier().pageID) {
+        if (auto* webPage = WebProcess::singleton().webPage(pageID))
             originatingPageID = webPage->webPageProxyIdentifier();
     }