Changeset 200372 in webkit

Timestamp:

May 3, 2016 8:30:52 AM (8 years ago)

Author:

beidson@apple.com

Message:

Add/refactor isolatedCopy methods for 3 IDB classes.
​https://bugs.webkit.org/show_bug.cgi?id=157289

Reviewed by Alex Christensen.

No new tests (Refactor, no behavior change).

In an upcoming, much larger patch, I'll need the ability to directly construct these three objects
as isolated copies.

This is a nice standalone refactor that enables that ability.

• Modules/indexeddb/IDBGetResult.cpp:

(WebCore::IDBGetResult::IDBGetResult):
(WebCore::IDBGetResult::isolatedCopy):

• Modules/indexeddb/IDBGetResult.h:

• Modules/indexeddb/IDBKeyData.cpp:

(WebCore::IDBKeyData::IDBKeyData):
(WebCore::IDBKeyData::isolatedCopy):

• Modules/indexeddb/IDBKeyData.h:

• Modules/indexeddb/shared/IDBTransactionInfo.cpp:

(WebCore::IDBTransactionInfo::IDBTransactionInfo):
(WebCore::IDBTransactionInfo::isolatedCopy):

• Modules/indexeddb/shared/IDBTransactionInfo.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/IDBGetResult.cpp (modified) (1 diff)
• Modules/indexeddb/IDBGetResult.h (modified) (2 diffs)
• Modules/indexeddb/IDBKeyData.cpp (modified) (1 diff)
• Modules/indexeddb/IDBKeyData.h (modified) (2 diffs)
• Modules/indexeddb/shared/IDBTransactionInfo.cpp (modified) (1 diff)
• Modules/indexeddb/shared/IDBTransactionInfo.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-03  Brady Eidson  <beidson@apple.com>
+
+        Add/refactor isolatedCopy methods for 3 IDB classes.
+        https://bugs.webkit.org/show_bug.cgi?id=157289
+
+        Reviewed by Alex Christensen.
+
+        No new tests (Refactor, no behavior change).
+
+        In an upcoming, much larger patch, I'll need the ability to directly construct these three objects
+        as isolated copies.
+        
+        This is a nice standalone refactor that enables that ability.
+
+        * Modules/indexeddb/IDBGetResult.cpp:
+        (WebCore::IDBGetResult::IDBGetResult):
+        (WebCore::IDBGetResult::isolatedCopy):
+        * Modules/indexeddb/IDBGetResult.h:
+        
+        * Modules/indexeddb/IDBKeyData.cpp:
+        (WebCore::IDBKeyData::IDBKeyData):
+        (WebCore::IDBKeyData::isolatedCopy):
+        * Modules/indexeddb/IDBKeyData.h:
+
+        * Modules/indexeddb/shared/IDBTransactionInfo.cpp:
+        (WebCore::IDBTransactionInfo::IDBTransactionInfo):
+        (WebCore::IDBTransactionInfo::isolatedCopy):
+        * Modules/indexeddb/shared/IDBTransactionInfo.h:
+
 2016-05-03  Joanmarie Diggs  <jdiggs@igalia.com>
 

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

@@ -39 +39 @@
 }
 
+IDBGetResult::IDBGetResult(const IDBGetResult& that, IsolatedCopyTag)
+{
+    isolatedCopy(that, *this);
+}
+
 IDBGetResult IDBGetResult::isolatedCopy() const
 {
-    IDBGetResult result;
-    result.m_value = m_value.isolatedCopy();
-    result.m_keyData = m_keyData.isolatedCopy();
-    result.m_primaryKeyData = m_primaryKeyData.isolatedCopy();
-    result.m_keyPath = m_keyPath.isolatedCopy();
-    result.m_isDefined = m_isDefined;
-    return result;
+    return { *this, IsolatedCopy };
+}
+
+void IDBGetResult::isolatedCopy(const IDBGetResult& source, IDBGetResult& destination)
+{
+    destination.m_value = source.m_value.isolatedCopy();
+    destination.m_keyData = source.m_keyData.isolatedCopy();
+    destination.m_primaryKeyData = source.m_primaryKeyData.isolatedCopy();
+    destination.m_keyPath = source.m_keyPath.isolatedCopy();
+    destination.m_isDefined = source.m_isDefined;
 }
 

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

@@ -98 +98 @@
     }
 
+    enum IsolatedCopyTag { IsolatedCopy };
+    IDBGetResult(const IDBGetResult&, IsolatedCopyTag);
+
     IDBGetResult isolatedCopy() const;
 
@@ -111 +114 @@
 private:
     void dataFromBuffer(SharedBuffer&);
+
+    static void isolatedCopy(const IDBGetResult& source, IDBGetResult& destination);
 
     IDBValue m_value;

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

@@ -99 +99 @@
 }
 
+IDBKeyData::IDBKeyData(const IDBKeyData& that, IsolatedCopyTag)
+{
+    isolatedCopy(that, *this);
+}
+
 IDBKeyData IDBKeyData::isolatedCopy() const
 {
-    IDBKeyData result;
-    result.m_type = m_type;
-    result.m_isNull = m_isNull;
-
-    switch (m_type) {
-    case KeyType::Invalid:
-        return result;
-    case KeyType::Array:
-        for (auto& key : m_arrayValue)
-            result.m_arrayValue.append(key.isolatedCopy());
-        return result;
-    case KeyType::String:
-        result.m_stringValue = m_stringValue.isolatedCopy();
-        return result;
-    case KeyType::Date:
-    case KeyType::Number:
-        result.m_numberValue = m_numberValue;
-        return result;
-    case KeyType::Max:
-    case KeyType::Min:
-        return result;
+    return { *this, IsolatedCopy };
+}
+
+void IDBKeyData::isolatedCopy(const IDBKeyData& source, IDBKeyData& destination)
+{
+    destination.m_type = source.m_type;
+    destination.m_isNull = source.m_isNull;
+
+    switch (source.m_type) {
+    case KeyType::Invalid:
+        return;
+    case KeyType::Array:
+        for (auto& key : source.m_arrayValue)
+            destination.m_arrayValue.append(key.isolatedCopy());
+        return;
+    case KeyType::String:
+        destination.m_stringValue = source.m_stringValue.isolatedCopy();
+        return;
+    case KeyType::Date:
+    case KeyType::Number:
+        destination.m_numberValue = source.m_numberValue;
+        return;
+    case KeyType::Max:
+    case KeyType::Min:
+        return;
     }
 
     ASSERT_NOT_REACHED();
-    return result;
 }
 

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

@@ -47 +47 @@
     WEBCORE_EXPORT IDBKeyData(const IDBKey*);
 
+    enum IsolatedCopyTag { IsolatedCopy };
+    IDBKeyData(const IDBKeyData&, IsolatedCopyTag);
+
     static IDBKeyData minimum()
     {
@@ -154 +157 @@
 
 private:
+    static void isolatedCopy(const IDBKeyData& source, IDBKeyData& destination);
+
     KeyType m_type;
     Vector<IDBKeyData> m_arrayValue;

trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp

@@ -71 +71 @@
 }
 
+IDBTransactionInfo::IDBTransactionInfo(const IDBTransactionInfo& that, IsolatedCopyTag)
+{
+    isolatedCopy(that, *this);
+}
+
 IDBTransactionInfo IDBTransactionInfo::isolatedCopy() const
 {
-    IDBTransactionInfo result(m_identifier);
-    result.m_mode = m_mode;
-    result.m_newVersion = m_newVersion;
+    return { *this, IsolatedCopy };
+}
 
-    result.m_objectStores.reserveCapacity(m_objectStores.size());
-    for (auto& objectStore : m_objectStores)
-        result.m_objectStores.uncheckedAppend(objectStore.isolatedCopy());
+void IDBTransactionInfo::isolatedCopy(const IDBTransactionInfo& source, IDBTransactionInfo& destination)
+{
+    destination.m_identifier = source.m_identifier.isolatedCopy();
+    destination.m_mode = source.m_mode;
+    destination.m_newVersion = source.m_newVersion;
 
-    if (m_originalDatabaseInfo)
-        result.m_originalDatabaseInfo = std::make_unique<IDBDatabaseInfo>(*m_originalDatabaseInfo, IDBDatabaseInfo::IsolatedCopy);
+    destination.m_objectStores.reserveCapacity(source.m_objectStores.size());
+    for (auto& objectStore : source.m_objectStores)
+        destination.m_objectStores.uncheckedAppend(objectStore.isolatedCopy());
 
-    return result;
+    if (source.m_originalDatabaseInfo)
+        destination.m_originalDatabaseInfo = std::make_unique<IDBDatabaseInfo>(*source.m_originalDatabaseInfo, IDBDatabaseInfo::IsolatedCopy);
 }
 

trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h

@@ -51 +51 @@
     IDBTransactionInfo(const IDBTransactionInfo&);
 
+    enum IsolatedCopyTag { IsolatedCopy };
+    IDBTransactionInfo(const IDBTransactionInfo&, IsolatedCopyTag);
+
     IDBTransactionInfo isolatedCopy() const;
 
@@ -72 +75 @@
 private:
     IDBTransactionInfo(const IDBResourceIdentifier&);
+
+    static void isolatedCopy(const IDBTransactionInfo& source, IDBTransactionInfo& destination);
 
     IDBResourceIdentifier m_identifier;