Changeset 207871 in webkit

Timestamp:

Oct 26, 2016 1:08:11 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Make CachedResourceLoader originsMatch check more efficient
​https://bugs.webkit.org/show_bug.cgi?id=163938

Patch by Youenn Fablet <​youenn@apple.com> on 2016-10-26
Reviewed by Darin Adler.

No change of behavior.

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::shouldUpdateCachedResourceWithCurrentRequest):
(WebCore::originsMatch): Moved to SecurityOrigin.cpp.

• page/SecurityOrigin.cpp:

(WebCore::areOriginsMatching): Helper routine to check whether origins are matching.
(WebCore::originsMatch): Ensuring string comparison provides the same result as this function.

• page/SecurityOrigin.h:

(WebCore::SecurityOrigin::protocol):
(WebCore::SecurityOrigin::host):
(WebCore::SecurityOrigin::domain):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedResourceLoader.cpp (modified) (2 diffs)
• page/SecurityOrigin.cpp (modified) (2 diffs)
• page/SecurityOrigin.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-26  Youenn Fablet  <youenn@apple.com>
+
+        Make CachedResourceLoader originsMatch check more efficient
+        https://bugs.webkit.org/show_bug.cgi?id=163938
+
+        Reviewed by Darin Adler.
+
+        No change of behavior.
+
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::shouldUpdateCachedResourceWithCurrentRequest):
+        (WebCore::originsMatch): Moved to SecurityOrigin.cpp.
+        * page/SecurityOrigin.cpp:
+        (WebCore::areOriginsMatching): Helper routine to check whether origins are matching.
+        (WebCore::originsMatch): Ensuring string comparison provides the same result as this function.
+        * page/SecurityOrigin.h:
+        (WebCore::SecurityOrigin::protocol):
+        (WebCore::SecurityOrigin::host):
+        (WebCore::SecurityOrigin::domain):
+
 2016-10-25  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -552 +552 @@
 }
 
-static inline bool originsMatch(const CachedResourceRequest& request, const CachedResource& resource)
-{
-    if (request.origin() == resource.origin())
-        return true;
-    if (!request.origin() || !resource.origin())
-        return false;
-    // We use string comparison as this is how they are serialized as HTTP Origin header value.
-    // This is in particular useful for unique origins that are serialized as "null"
-    return request.origin()->toString() == resource.origin()->toString();
-}
-
 bool CachedResourceLoader::shouldUpdateCachedResourceWithCurrentRequest(const CachedResource& resource, const CachedResourceRequest& request)
 {
@@ -596 +585 @@
     }
 
-    if (resource.options().mode != request.options().mode || !originsMatch(request, resource))
+    if (resource.options().mode != request.options().mode || !originsMatch(request.origin(), resource.origin()))
         return true;
 

trunk/Source/WebCore/page/SecurityOrigin.cpp

@@ -463 +463 @@
 }
 
+static inline bool areOriginsMatching(const SecurityOrigin& origin1, const SecurityOrigin& origin2)
+{
+    if (origin1.isUnique() || origin2.isUnique())
+        return origin1.isUnique() == origin2.isUnique();
+
+    if (origin1.protocol() != origin2.protocol())
+        return false;
+
+    if (origin1.protocol() == "file")
+        return true;
+
+    if (origin1.host() != origin2.host())
+        return false;
+
+    return origin1.port() == origin2.port();
+}
+
+// This function mimics the result of string comparison of serialized origins
+bool originsMatch(const SecurityOrigin& origin1, const SecurityOrigin& origin2)
+{
+    if (&origin1 == &origin2)
+        return true;
+
+    bool result = areOriginsMatching(origin1, origin2);
+    ASSERT(result == (origin1.toString() == origin2.toString()));
+    return result;
+}
+
+bool originsMatch(const SecurityOrigin* origin1, const SecurityOrigin* origin2)
+{
+    if (!origin1 || !origin2)
+        return origin1 == origin2;
+
+    return originsMatch(*origin1, *origin2);
+}
+
 Ref<SecurityOrigin> SecurityOrigin::createFromString(const String& originString)
 {
@@ -471 +507 @@
 
 RefPtr<SecurityOrigin> SecurityOrigin::maybeCreateFromDatabaseIdentifier(const String& databaseIdentifier)
-{ 
+{
     // Make sure there's a first separator
     size_t separator1 = databaseIdentifier.find(separatorCharacter);
     if (separator1 == notFound)
         return nullptr;
-        
+
     // Make sure there's a second separator
     size_t separator2 = databaseIdentifier.reverseFind(separatorCharacter);

trunk/Source/WebCore/page/SecurityOrigin.h

@@ -85 +85 @@
     bool domainWasSetInDOM() const { return m_domainWasSetInDOM; }
 
-    String protocol() const { return m_protocol; }
-    String host() const { return m_host; }
-    String domain() const { return m_domain; }
+    const String& protocol() const { return m_protocol; }
+    const String& host() const { return m_host; }
+    const String& domain() const { return m_domain; }
     Optional<uint16_t> port() const { return m_port; }
 
@@ -236 +236 @@
 };
 
+// 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*);
+
 } // namespace WebCore