Diff
Modified: trunk/Source/WebCore/ChangeLog (259751 => 259752)
--- trunk/Source/WebCore/ChangeLog 2020-04-08 20:06:53 UTC (rev 259751)
+++ trunk/Source/WebCore/ChangeLog 2020-04-08 20:14:50 UTC (rev 259752)
@@ -1,3 +1,30 @@
+2020-04-08 Rob Buis <[email protected]>
+
+ Make more use of FrameLoader pageID/frameID getters
+ https://bugs.webkit.org/show_bug.cgi?id=210182
+
+ Reviewed by Chris Dumez.
+
+ Make more use of FrameLoader pageID/frameID getters, before
+ this change they were only used internally in FrameLoader.
+
+ * dom/Document.cpp:
+ (WebCore::Document::pageID const):
+ (WebCore::Document::frameID const):
+ * html/HTMLAnchorElement.cpp:
+ (WebCore::HTMLAnchorElement::handleClick):
+ * loader/CookieJar.cpp:
+ (WebCore::CookieJar::cookies const):
+ (WebCore::CookieJar::cookieRequestHeaderFieldProxy):
+ (WebCore::CookieJar::setCookies):
+ (WebCore::CookieJar::cookieRequestHeaderFieldValue const):
+ (WebCore::CookieJar::getRawCookies const):
+ * loader/NavigationAction.cpp:
+ (WebCore::createGlobalFrameIdentifier):
+ * loader/PolicyChecker.cpp:
+ * testing/Internals.cpp:
+ (WebCore::Internals::frameIdentifier const):
+
2020-04-08 Doug Kelly <[email protected]>
Additional cleanup from "Hit test with clipPath referencing parent element causes infinite recursion"
Modified: trunk/Source/WebCore/dom/Document.cpp (259751 => 259752)
--- trunk/Source/WebCore/dom/Document.cpp 2020-04-08 20:06:53 UTC (rev 259751)
+++ trunk/Source/WebCore/dom/Document.cpp 2020-04-08 20:14:50 UTC (rev 259752)
@@ -7961,12 +7961,12 @@
Optional<PageIdentifier> Document::pageID() const
{
- return m_frame->loader().client().pageID();
+ return m_frame->loader().pageID();
}
Optional<FrameIdentifier> Document::frameID() const
{
- return m_frame->loader().client().frameID();
+ return m_frame->loader().frameID();
}
void Document::registerArticleElement(Element& article)
Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (259751 => 259752)
--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2020-04-08 20:06:53 UTC (rev 259751)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2020-04-08 20:14:50 UTC (rev 259752)
@@ -488,7 +488,7 @@
if (systemPreviewInfo.isPreview) {
systemPreviewInfo.element.elementIdentifier = document().identifierForElement(*this);
systemPreviewInfo.element.documentIdentifier = document().identifier();
- systemPreviewInfo.element.webPageIdentifier = document().frame()->loader().client().pageID().valueOr(PageIdentifier { });
+ systemPreviewInfo.element.webPageIdentifier = document().frame()->loader().pageID().valueOr(PageIdentifier { });
if (auto* child = firstElementChild())
systemPreviewInfo.previewRect = child->boundsInRootViewSpace();
}
Modified: trunk/Source/WebCore/loader/CookieJar.cpp (259751 => 259752)
--- trunk/Source/WebCore/loader/CookieJar.cpp 2020-04-08 20:06:53 UTC (rev 259751)
+++ trunk/Source/WebCore/loader/CookieJar.cpp 2020-04-08 20:14:50 UTC (rev 259752)
@@ -31,7 +31,6 @@
#include "DocumentLoader.h"
#include "Frame.h"
#include "FrameLoader.h"
-#include "FrameLoaderClient.h"
#include "HTTPCookieAcceptPolicy.h"
#include "NetworkStorageSession.h"
#include "NetworkingContext.h"
@@ -75,8 +74,8 @@
Optional<FrameIdentifier> frameID;
Optional<PageIdentifier> pageID;
if (auto* frame = document.frame()) {
- frameID = frame->loader().client().frameID();
- pageID = frame->loader().client().pageID();
+ frameID = frame->loader().frameID();
+ pageID = frame->loader().pageID();
}
std::pair<String, bool> result;
@@ -98,8 +97,8 @@
Optional<FrameIdentifier> frameID;
Optional<PageIdentifier> pageID;
if (auto* frame = document.frame()) {
- frameID = frame->loader().client().frameID();
- pageID = frame->loader().client().pageID();
+ frameID = frame->loader().frameID();
+ pageID = frame->loader().pageID();
}
return { document.firstPartyForCookies(), sameSiteInfo(document), url, frameID, pageID, shouldIncludeSecureCookies(document, url) };
@@ -110,8 +109,8 @@
Optional<FrameIdentifier> frameID;
Optional<PageIdentifier> pageID;
if (auto* frame = document.frame()) {
- frameID = frame->loader().client().frameID();
- pageID = frame->loader().client().pageID();
+ frameID = frame->loader().frameID();
+ pageID = frame->loader().pageID();
}
if (auto* session = m_storageSessionProvider->storageSession())
@@ -145,8 +144,8 @@
Optional<FrameIdentifier> frameID;
Optional<PageIdentifier> pageID;
if (auto* frame = document.frame()) {
- frameID = frame->loader().client().frameID();
- pageID = frame->loader().client().pageID();
+ frameID = frame->loader().frameID();
+ pageID = frame->loader().pageID();
}
auto result = cookieRequestHeaderFieldValue(document.firstPartyForCookies(), sameSiteInfo(document), url, frameID, pageID, shouldIncludeSecureCookies(document, url));
@@ -160,8 +159,8 @@
Optional<FrameIdentifier> frameID;
Optional<PageIdentifier> pageID;
if (auto* frame = document.frame()) {
- frameID = frame->loader().client().frameID();
- pageID = frame->loader().client().pageID();
+ frameID = frame->loader().frameID();
+ pageID = frame->loader().pageID();
}
if (auto* session = m_storageSessionProvider->storageSession())
Modified: trunk/Source/WebCore/loader/NavigationAction.cpp (259751 => 259752)
--- trunk/Source/WebCore/loader/NavigationAction.cpp 2020-04-08 20:06:53 UTC (rev 259751)
+++ trunk/Source/WebCore/loader/NavigationAction.cpp 2020-04-08 20:14:50 UTC (rev 259752)
@@ -32,7 +32,6 @@
#include "Document.h"
#include "Frame.h"
#include "FrameLoader.h"
-#include "FrameLoaderClient.h"
#include "HistoryItem.h"
#include "MouseEvent.h"
@@ -41,7 +40,7 @@
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 { document.frame()->loader().pageID().valueOr(PageIdentifier { }), document.frame()->loader().frameID().valueOr(FrameIdentifier { }) };
return GlobalFrameIdentifier();
}
Modified: trunk/Source/WebCore/loader/PolicyChecker.cpp (259751 => 259752)
--- trunk/Source/WebCore/loader/PolicyChecker.cpp 2020-04-08 20:06:53 UTC (rev 259751)
+++ trunk/Source/WebCore/loader/PolicyChecker.cpp 2020-04-08 20:14:50 UTC (rev 259752)
@@ -54,8 +54,8 @@
#endif
#define IS_ALLOWED (m_frame.page() ? m_frame.page()->sessionID().isAlwaysOnLoggingAllowed() : false)
-#define PAGE_ID (m_frame.loader().client().pageID().valueOr(PageIdentifier()).toUInt64())
-#define FRAME_ID (m_frame.loader().client().frameID().valueOr(FrameIdentifier()).toUInt64())
+#define PAGE_ID (m_frame.loader().pageID().valueOr(PageIdentifier()).toUInt64())
+#define FRAME_ID (m_frame.loader().frameID().valueOr(FrameIdentifier()).toUInt64())
#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(IS_ALLOWED, Loading, "%p - [pageID=%" PRIu64 ", frameID=%" PRIu64 "] PolicyChecker::" fmt, this, PAGE_ID, FRAME_ID, ##__VA_ARGS__)
namespace WebCore {
Modified: trunk/Source/WebCore/testing/Internals.cpp (259751 => 259752)
--- trunk/Source/WebCore/testing/Internals.cpp 2020-04-08 20:06:53 UTC (rev 259751)
+++ trunk/Source/WebCore/testing/Internals.cpp 2020-04-08 20:14:50 UTC (rev 259752)
@@ -80,7 +80,6 @@
#include "FormController.h"
#include "Frame.h"
#include "FrameLoader.h"
-#include "FrameLoaderClient.h"
#include "FrameView.h"
#include "FullscreenManager.h"
#include "GCObservation.h"
@@ -2583,7 +2582,7 @@
uint64_t Internals::frameIdentifier(const Document& document) const
{
if (auto* page = document.page())
- return page->mainFrame().loader().client().frameID().valueOr(FrameIdentifier { }).toUInt64();
+ return page->mainFrame().loader().frameID().valueOr(FrameIdentifier { }).toUInt64();
return 0;
}
Modified: trunk/Source/WebKit/ChangeLog (259751 => 259752)
--- trunk/Source/WebKit/ChangeLog 2020-04-08 20:06:53 UTC (rev 259751)
+++ trunk/Source/WebKit/ChangeLog 2020-04-08 20:14:50 UTC (rev 259752)
@@ -1,3 +1,16 @@
+2020-04-08 Rob Buis <[email protected]>
+
+ Make more use of FrameLoader pageID/frameID getters
+ https://bugs.webkit.org/show_bug.cgi?id=210182
+
+ Reviewed by Chris Dumez.
+
+ Make more use of FrameLoader pageID/frameID getters, before
+ this change they were only used internally in FrameLoader.
+
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::addParametersShared):
+
2020-04-08 David Kilzer <[email protected]>
Follow-up: [iOS] WebPageProxy::didCommitLoadForFrame should not crash with null or empty `mimeType` parameter
Modified: trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (259751 => 259752)
--- trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2020-04-08 20:06:53 UTC (rev 259751)
+++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2020-04-08 20:14:50 UTC (rev 259752)
@@ -273,7 +273,7 @@
if (auto* ownerElement = frame->ownerElement()) {
if (auto* parentFrame = ownerElement->document().frame())
- parameters.parentFrameID = parentFrame->loader().client().frameID();
+ parameters.parentFrameID = parentFrame->loader().frameID();
}
}
