Changeset 242729 in webkit

Timestamp:

Mar 11, 2019, 1:00:07 PM (7 years ago)

Author:

youenn@apple.com

Message:

Make IDBDatabaseIdentifier take a ClientOrigin as member
​https://bugs.webkit.org/show_bug.cgi?id=195544

Reviewed by Geoffrey Garen.

Instead of taking a top and a frame origin, make
make IDBDatabaseIdentifier take a ClientOrigin.

This allows reusing some ClientOrigin code
and will ease implementation of storage quota checking in
NetworkProcess, as quota managers are keyed by client origins.

No change of behavior.

• Modules/indexeddb/IDBDatabaseIdentifier.cpp:

(WebCore::IDBDatabaseIdentifier::IDBDatabaseIdentifier):
(WebCore::IDBDatabaseIdentifier::isolatedCopy const):
(WebCore::IDBDatabaseIdentifier::databaseDirectoryRelativeToRoot const):
(WebCore::IDBDatabaseIdentifier::debugString const):

• Modules/indexeddb/IDBDatabaseIdentifier.h:

(WebCore::IDBDatabaseIdentifier::hash const):
(WebCore::IDBDatabaseIdentifier::operator== const):
(WebCore::IDBDatabaseIdentifier::origin const):
(WebCore::IDBDatabaseIdentifier::isRelatedToOrigin const):
(WebCore::IDBDatabaseIdentifier::encode const):
(WebCore::IDBDatabaseIdentifier::decode):

• page/ClientOrigin.h:

(WebCore::ClientOrigin::isRelated const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/IDBDatabaseIdentifier.cpp (modified) (4 diffs)
• Modules/indexeddb/IDBDatabaseIdentifier.h (modified) (7 diffs)
• page/ClientOrigin.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-11  Youenn Fablet  <youenn@apple.com>
+
+        Make IDBDatabaseIdentifier take a ClientOrigin as member
+        https://bugs.webkit.org/show_bug.cgi?id=195544
+
+        Reviewed by Geoffrey Garen.
+
+        Instead of taking a top and a frame origin, make
+        make IDBDatabaseIdentifier take a ClientOrigin.
+
+        This allows reusing some ClientOrigin code
+        and will ease implementation of storage quota checking in
+        NetworkProcess, as quota managers are keyed by client origins.
+
+        No change of behavior.
+
+        * Modules/indexeddb/IDBDatabaseIdentifier.cpp:
+        (WebCore::IDBDatabaseIdentifier::IDBDatabaseIdentifier):
+        (WebCore::IDBDatabaseIdentifier::isolatedCopy const):
+        (WebCore::IDBDatabaseIdentifier::databaseDirectoryRelativeToRoot const):
+        (WebCore::IDBDatabaseIdentifier::debugString const):
+        * Modules/indexeddb/IDBDatabaseIdentifier.h:
+        (WebCore::IDBDatabaseIdentifier::hash const):
+        (WebCore::IDBDatabaseIdentifier::operator== const):
+        (WebCore::IDBDatabaseIdentifier::origin const):
+        (WebCore::IDBDatabaseIdentifier::isRelatedToOrigin const):
+        (WebCore::IDBDatabaseIdentifier::encode const):
+        (WebCore::IDBDatabaseIdentifier::decode):
+        * page/ClientOrigin.h:
+        (WebCore::ClientOrigin::isRelated const):
+
 2019-03-11  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.cpp

@@ -39 +39 @@
     : m_databaseName(databaseName)
     , m_sessionID(sessionID)
-    , m_openingOrigin(WTFMove(openingOrigin))
-    , m_mainFrameOrigin(WTFMove(mainFrameOrigin))
-
+    , m_origin { WTFMove(openingOrigin), WTFMove(mainFrameOrigin) }
 {
     // The empty string is a valid database name, but a null string is not.
@@ -53 +51 @@
     identifier.m_databaseName = m_databaseName.isolatedCopy();
     identifier.m_sessionID = m_sessionID.isolatedCopy();
-    identifier.m_openingOrigin = m_openingOrigin.isolatedCopy();
-    identifier.m_mainFrameOrigin = m_mainFrameOrigin.isolatedCopy();
+    identifier.m_origin = m_origin.isolatedCopy();
 
     return identifier;
@@ -61 +58 @@
 String IDBDatabaseIdentifier::databaseDirectoryRelativeToRoot(const String& rootDirectory) const
 {
-    return databaseDirectoryRelativeToRoot(m_mainFrameOrigin, m_openingOrigin, rootDirectory);
+    return databaseDirectoryRelativeToRoot(m_origin.topOrigin, m_origin.clientOrigin, rootDirectory);
 }
 
@@ -78 +75 @@
 String IDBDatabaseIdentifier::debugString() const
 {
-    return makeString(m_databaseName, "@", m_openingOrigin.debugString(), ":", m_mainFrameOrigin.debugString());
+    return makeString(m_databaseName, "@", m_origin.topOrigin.debugString(), ":", m_origin.clientOrigin.debugString());
 }
 #endif

trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h

@@ -28 +28 @@
 #if ENABLE(INDEXED_DATABASE)
 
+#include "ClientOrigin.h"
 #include "SecurityOriginData.h"
 #include <pal/SessionID.h>
@@ -58 +59 @@
         unsigned nameHash = StringHash::hash(m_databaseName);
         unsigned sessionIDHash = WTF::SessionIDHash::hash(m_sessionID);
-        unsigned openingProtocolHash = StringHash::hash(m_openingOrigin.protocol);
-        unsigned openingHostHash = StringHash::hash(m_openingOrigin.host);
-        unsigned mainFrameProtocolHash = StringHash::hash(m_mainFrameOrigin.protocol);
-        unsigned mainFrameHostHash = StringHash::hash(m_mainFrameOrigin.host);
-        
-        unsigned hashCodes[8] = { nameHash, sessionIDHash, openingProtocolHash, openingHostHash, m_openingOrigin.port.valueOr(0), mainFrameProtocolHash, mainFrameHostHash, m_mainFrameOrigin.port.valueOr(0) };
+        unsigned originHash = m_origin.hash();
+
+        unsigned hashCodes[3] = { nameHash, sessionIDHash, originHash };
         return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
     }
@@ -80 +78 @@
     bool operator==(const IDBDatabaseIdentifier& other) const
     {
-        return other.m_databaseName == m_databaseName
-            && other.m_openingOrigin == m_openingOrigin
-            && other.m_mainFrameOrigin == m_mainFrameOrigin;
+        return other.m_databaseName == m_databaseName && other.m_origin == m_origin;
     }
 
     const String& databaseName() const { return m_databaseName; }
     const PAL::SessionID& sessionID() const { return m_sessionID; }
+    const ClientOrigin& origin() const { return m_origin; }
 
     String databaseDirectoryRelativeToRoot(const String& rootDirectory) const;
@@ -98 +95 @@
 #endif
 
-    bool isRelatedToOrigin(const SecurityOriginData& other) const
-    {
-        return m_openingOrigin == other || m_mainFrameOrigin == other;
-    }
+    bool isRelatedToOrigin(const SecurityOriginData& other) const { return m_origin.isRelated(other); }
 
 private:
     String m_databaseName;
     PAL::SessionID m_sessionID;
-    SecurityOriginData m_openingOrigin;
+    ClientOrigin m_origin;
     SecurityOriginData m_mainFrameOrigin;
 };
@@ -125 +119 @@
 void IDBDatabaseIdentifier::encode(Encoder& encoder) const
 {
-    encoder << m_databaseName << m_sessionID << m_openingOrigin << m_mainFrameOrigin;
+    encoder << m_databaseName << m_sessionID << m_origin;
 }
 
@@ -141 +135 @@
         return WTF::nullopt;
     
-    Optional<SecurityOriginData> openingOrigin;
-    decoder >> openingOrigin;
-    if (!openingOrigin)
-        return WTF::nullopt;
-
-    Optional<SecurityOriginData> mainFrameOrigin;
-    decoder >> mainFrameOrigin;
-    if (!mainFrameOrigin)
+    Optional<ClientOrigin> origin;
+    decoder >> origin;
+    if (!origin)
         return WTF::nullopt;
 
@@ -154 +143 @@
     identifier.m_databaseName = WTFMove(*databaseName); // FIXME: When decoding from IPC, databaseName can be null, and the non-empty constructor asserts that this is not the case.
     identifier.m_sessionID = WTFMove(*sessionID);
-    identifier.m_openingOrigin = WTFMove(*openingOrigin);
-    identifier.m_mainFrameOrigin = WTFMove(*mainFrameOrigin);
+    identifier.m_origin = WTFMove(*origin);
     return WTFMove(identifier);
 }

trunk/Source/WebCore/page/ClientOrigin.h

@@ -42 +42 @@
 
     ClientOrigin isolatedCopy() const;
+    bool isRelated(const SecurityOriginData& other) const { return topOrigin == other || clientOrigin == other; }
 
     SecurityOriginData topOrigin;