- Revision
- 242804
- Author
- [email protected]
- Date
- 2019-03-12 11:08:17 -0700 (Tue, 12 Mar 2019)
Log Message
Rename originsMatch in originSerializationsMatch
https://bugs.webkit.org/show_bug.cgi?id=195572
Reviewed by Jiewen Tan.
In addition to renaming, make use of SecurityOrigin::isSameOriginAs
where it makes more sense than to compare origin serialization.
The main difference is that isSameOriginAs will return false for two different unique origins
while originsSerializationsMatch will not.
* Modules/credentialmanagement/CredentialsContainer.cpp:
(WebCore::CredentialsContainer::doesHaveSameOriginAsItsAncestors):
* Modules/mediastream/RTCController.cpp:
(WebCore::matchDocumentOrigin):
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::certificatesFromConfiguration):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::shouldOpenExternalURLsPolicyToPropagate const):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::shouldUpdateCachedResourceWithCurrentRequest):
* page/SecurityOrigin.cpp:
(WebCore::serializedOriginsMatch):
(WebCore::originsMatch): Deleted.
* page/SecurityOrigin.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (242803 => 242804)
--- trunk/Source/WebCore/ChangeLog 2019-03-12 17:47:32 UTC (rev 242803)
+++ trunk/Source/WebCore/ChangeLog 2019-03-12 18:08:17 UTC (rev 242804)
@@ -1,3 +1,30 @@
+2019-03-12 Youenn Fablet <[email protected]>
+
+ Rename originsMatch in originSerializationsMatch
+ https://bugs.webkit.org/show_bug.cgi?id=195572
+
+ Reviewed by Jiewen Tan.
+
+ In addition to renaming, make use of SecurityOrigin::isSameOriginAs
+ where it makes more sense than to compare origin serialization.
+ The main difference is that isSameOriginAs will return false for two different unique origins
+ while originsSerializationsMatch will not.
+
+ * Modules/credentialmanagement/CredentialsContainer.cpp:
+ (WebCore::CredentialsContainer::doesHaveSameOriginAsItsAncestors):
+ * Modules/mediastream/RTCController.cpp:
+ (WebCore::matchDocumentOrigin):
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::certificatesFromConfiguration):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::shouldOpenExternalURLsPolicyToPropagate const):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::shouldUpdateCachedResourceWithCurrentRequest):
+ * page/SecurityOrigin.cpp:
+ (WebCore::serializedOriginsMatch):
+ (WebCore::originsMatch): Deleted.
+ * page/SecurityOrigin.h:
+
2019-03-12 Zalan Bujtas <[email protected]>
[Synthetic Click] Dispatch mouseout soon after mouseup
Modified: trunk/Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp (242803 => 242804)
--- trunk/Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp 2019-03-12 17:47:32 UTC (rev 242803)
+++ trunk/Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp 2019-03-12 18:08:17 UTC (rev 242804)
@@ -54,7 +54,7 @@
auto& origin = m_document->securityOrigin();
for (auto* document = m_document->parentDocument(); document; document = document->parentDocument()) {
- if (!originsMatch(document->securityOrigin(), origin))
+ if (!origin.isSameOriginAs(document->securityOrigin()))
return false;
}
return true;
Modified: trunk/Source/WebCore/Modules/mediastream/RTCController.cpp (242803 => 242804)
--- trunk/Source/WebCore/Modules/mediastream/RTCController.cpp 2019-03-12 17:47:32 UTC (rev 242803)
+++ trunk/Source/WebCore/Modules/mediastream/RTCController.cpp 2019-03-12 18:08:17 UTC (rev 242804)
@@ -57,9 +57,9 @@
static inline bool matchDocumentOrigin(Document& document, SecurityOrigin& topOrigin, SecurityOrigin& clientOrigin)
{
- if (originsMatch(topOrigin, document.securityOrigin()))
+ if (topOrigin.isSameOriginAs(document.securityOrigin()))
return true;
- return originsMatch(topOrigin, document.topOrigin()) && originsMatch(clientOrigin, document.securityOrigin());
+ return topOrigin.isSameOriginAs(document.topOrigin()) && clientOrigin.isSameOriginAs(document.securityOrigin());
}
bool RTCController::shouldDisableICECandidateFiltering(Document& document)
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (242803 => 242804)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2019-03-12 17:47:32 UTC (rev 242803)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2019-03-12 18:08:17 UTC (rev 242804)
@@ -311,7 +311,7 @@
Vector<MediaEndpointConfiguration::CertificatePEM> certificates;
certificates.reserveInitialCapacity(configuration.certificates.size());
for (auto& certificate : configuration.certificates) {
- if (!originsMatch(origin, certificate->origin()))
+ if (!origin.isSameOriginAs(certificate->origin()))
return Exception { InvalidAccessError, "Certificate does not have a valid origin" };
if (currentMilliSeconds > certificate->expires())
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (242803 => 242804)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2019-03-12 17:47:32 UTC (rev 242803)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2019-03-12 18:08:17 UTC (rev 242804)
@@ -2083,7 +2083,7 @@
return m_shouldOpenExternalURLsPolicy;
if (auto* currentDocument = document()) {
- if (originsMatch(currentDocument->securityOrigin(), currentDocument->topOrigin()))
+ if (currentDocument->securityOrigin().isSameOriginAs(currentDocument->topOrigin()))
return m_shouldOpenExternalURLsPolicy;
}
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (242803 => 242804)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2019-03-12 17:47:32 UTC (rev 242803)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2019-03-12 18:08:17 UTC (rev 242804)
@@ -638,7 +638,7 @@
break;
}
- if (resource.options().mode != request.options().mode || !originsMatch(request.origin(), resource.origin()))
+ if (resource.options().mode != request.options().mode || !serializedOriginsMatch(request.origin(), resource.origin()))
return true;
if (resource.options().redirect != request.options().redirect && resource.hasRedirections())
Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (242803 => 242804)
--- trunk/Source/WebCore/page/SecurityOrigin.cpp 2019-03-12 17:47:32 UTC (rev 242803)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp 2019-03-12 18:08:17 UTC (rev 242804)
@@ -491,7 +491,7 @@
}
// This function mimics the result of string comparison of serialized origins.
-bool originsMatch(const SecurityOrigin& origin1, const SecurityOrigin& origin2)
+bool serializedOriginsMatch(const SecurityOrigin& origin1, const SecurityOrigin& origin2)
{
if (&origin1 == &origin2)
return true;
@@ -500,12 +500,12 @@
return areOriginsMatching(origin1, origin2);
}
-bool originsMatch(const SecurityOrigin* origin1, const SecurityOrigin* origin2)
+bool serializedOriginsMatch(const SecurityOrigin* origin1, const SecurityOrigin* origin2)
{
if (!origin1 || !origin2)
return origin1 == origin2;
- return originsMatch(*origin1, *origin2);
+ return serializedOriginsMatch(*origin1, *origin2);
}
Ref<SecurityOrigin> SecurityOrigin::createFromString(const String& originString)
Modified: trunk/Source/WebCore/page/SecurityOrigin.h (242803 => 242804)
--- trunk/Source/WebCore/page/SecurityOrigin.h 2019-03-12 17:47:32 UTC (rev 242803)
+++ trunk/Source/WebCore/page/SecurityOrigin.h 2019-03-12 18:08:17 UTC (rev 242804)
@@ -240,8 +240,8 @@
bool shouldTreatAsPotentiallyTrustworthy(const URL&);
// Returns true if the Origin header values serialized from these two origins would be the same.
-bool originsMatch(const SecurityOrigin&, const SecurityOrigin&);
-bool originsMatch(const SecurityOrigin*, const SecurityOrigin*);
+bool serializedOriginsMatch(const SecurityOrigin&, const SecurityOrigin&);
+bool serializedOriginsMatch(const SecurityOrigin*, const SecurityOrigin*);
template<class Encoder> inline void SecurityOrigin::encode(Encoder& encoder) const
{
