<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[200372] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/200372">200372</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-05-03 08:30:52 -0700 (Tue, 03 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBGetResultcpp">trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBGetResulth">trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyDatah">trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBTransactionInfocpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBTransactionInfoh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200371 => 200372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-03 15:24:36 UTC (rev 200371)
+++ trunk/Source/WebCore/ChangeLog 2016-05-03 15:30:52 UTC (rev 200372)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+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:
+
</ins><span class="cx"> 2016-05-03 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> [ATK] accessibility/content-editable-as-textarea.html fails
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBGetResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.cpp (200371 => 200372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.cpp 2016-05-03 15:24:36 UTC (rev 200371)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.cpp 2016-05-03 15:30:52 UTC (rev 200372)
</span><span class="lines">@@ -38,17 +38,25 @@
</span><span class="cx"> m_value = ThreadSafeDataBuffer::adoptVector(data);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+IDBGetResult::IDBGetResult(const IDBGetResult& that, IsolatedCopyTag)
+{
+ isolatedCopy(that, *this);
+}
+
</ins><span class="cx"> IDBGetResult IDBGetResult::isolatedCopy() const
</span><span class="cx"> {
</span><del>- 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;
</del><ins>+ return { *this, IsolatedCopy };
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBGetResulth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.h (200371 => 200372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.h 2016-05-03 15:24:36 UTC (rev 200371)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.h 2016-05-03 15:30:52 UTC (rev 200372)
</span><span class="lines">@@ -97,6 +97,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ enum IsolatedCopyTag { IsolatedCopy };
+ IDBGetResult(const IDBGetResult&, IsolatedCopyTag);
+
</ins><span class="cx"> IDBGetResult isolatedCopy() const;
</span><span class="cx">
</span><span class="cx"> const IDBValue& value() const { return m_value; }
</span><span class="lines">@@ -111,6 +114,8 @@
</span><span class="cx"> private:
</span><span class="cx"> void dataFromBuffer(SharedBuffer&);
</span><span class="cx">
</span><ins>+ static void isolatedCopy(const IDBGetResult& source, IDBGetResult& destination);
+
</ins><span class="cx"> IDBValue m_value;
</span><span class="cx"> IDBKeyData m_keyData;
</span><span class="cx"> IDBKeyData m_primaryKeyData;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp (200371 => 200372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2016-05-03 15:24:36 UTC (rev 200371)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2016-05-03 15:30:52 UTC (rev 200372)
</span><span class="lines">@@ -98,33 +98,41 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+IDBKeyData::IDBKeyData(const IDBKeyData& that, IsolatedCopyTag)
+{
+ isolatedCopy(that, *this);
+}
+
</ins><span class="cx"> IDBKeyData IDBKeyData::isolatedCopy() const
</span><span class="cx"> {
</span><del>- IDBKeyData result;
- result.m_type = m_type;
- result.m_isNull = m_isNull;
</del><ins>+ return { *this, IsolatedCopy };
+}
</ins><span class="cx">
</span><del>- switch (m_type) {
</del><ins>+void IDBKeyData::isolatedCopy(const IDBKeyData& source, IDBKeyData& destination)
+{
+ destination.m_type = source.m_type;
+ destination.m_isNull = source.m_isNull;
+
+ switch (source.m_type) {
</ins><span class="cx"> case KeyType::Invalid:
</span><del>- return result;
</del><ins>+ return;
</ins><span class="cx"> case KeyType::Array:
</span><del>- for (auto& key : m_arrayValue)
- result.m_arrayValue.append(key.isolatedCopy());
- return result;
</del><ins>+ for (auto& key : source.m_arrayValue)
+ destination.m_arrayValue.append(key.isolatedCopy());
+ return;
</ins><span class="cx"> case KeyType::String:
</span><del>- result.m_stringValue = m_stringValue.isolatedCopy();
- return result;
</del><ins>+ destination.m_stringValue = source.m_stringValue.isolatedCopy();
+ return;
</ins><span class="cx"> case KeyType::Date:
</span><span class="cx"> case KeyType::Number:
</span><del>- result.m_numberValue = m_numberValue;
- return result;
</del><ins>+ destination.m_numberValue = source.m_numberValue;
+ return;
</ins><span class="cx"> case KeyType::Max:
</span><span class="cx"> case KeyType::Min:
</span><del>- return result;
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return result;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBKeyData::encode(KeyedEncoder& encoder) const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h (200371 => 200372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h 2016-05-03 15:24:36 UTC (rev 200371)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h 2016-05-03 15:30:52 UTC (rev 200372)
</span><span class="lines">@@ -46,6 +46,9 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT IDBKeyData(const IDBKey*);
</span><span class="cx">
</span><ins>+ enum IsolatedCopyTag { IsolatedCopy };
+ IDBKeyData(const IDBKeyData&, IsolatedCopyTag);
+
</ins><span class="cx"> static IDBKeyData minimum()
</span><span class="cx"> {
</span><span class="cx"> IDBKeyData result;
</span><span class="lines">@@ -153,6 +156,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ static void isolatedCopy(const IDBKeyData& source, IDBKeyData& destination);
+
</ins><span class="cx"> KeyType m_type;
</span><span class="cx"> Vector<IDBKeyData> m_arrayValue;
</span><span class="cx"> String m_stringValue;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBTransactionInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp (200371 => 200372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp 2016-05-03 15:24:36 UTC (rev 200371)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp 2016-05-03 15:30:52 UTC (rev 200372)
</span><span class="lines">@@ -70,20 +70,28 @@
</span><span class="cx"> m_originalDatabaseInfo = std::make_unique<IDBDatabaseInfo>(*info.m_originalDatabaseInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+IDBTransactionInfo::IDBTransactionInfo(const IDBTransactionInfo& that, IsolatedCopyTag)
+{
+ isolatedCopy(that, *this);
+}
+
</ins><span class="cx"> IDBTransactionInfo IDBTransactionInfo::isolatedCopy() const
</span><span class="cx"> {
</span><del>- IDBTransactionInfo result(m_identifier);
- result.m_mode = m_mode;
- result.m_newVersion = m_newVersion;
</del><ins>+ return { *this, IsolatedCopy };
+}
</ins><span class="cx">
</span><del>- result.m_objectStores.reserveCapacity(m_objectStores.size());
- for (auto& objectStore : m_objectStores)
- result.m_objectStores.uncheckedAppend(objectStore.isolatedCopy());
</del><ins>+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;
</ins><span class="cx">
</span><del>- if (m_originalDatabaseInfo)
- result.m_originalDatabaseInfo = std::make_unique<IDBDatabaseInfo>(*m_originalDatabaseInfo, IDBDatabaseInfo::IsolatedCopy);
</del><ins>+ destination.m_objectStores.reserveCapacity(source.m_objectStores.size());
+ for (auto& objectStore : source.m_objectStores)
+ destination.m_objectStores.uncheckedAppend(objectStore.isolatedCopy());
</ins><span class="cx">
</span><del>- return result;
</del><ins>+ if (source.m_originalDatabaseInfo)
+ destination.m_originalDatabaseInfo = std::make_unique<IDBDatabaseInfo>(*source.m_originalDatabaseInfo, IDBDatabaseInfo::IsolatedCopy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBTransactionInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h (200371 => 200372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h 2016-05-03 15:24:36 UTC (rev 200371)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h 2016-05-03 15:30:52 UTC (rev 200372)
</span><span class="lines">@@ -50,6 +50,9 @@
</span><span class="cx">
</span><span class="cx"> IDBTransactionInfo(const IDBTransactionInfo&);
</span><span class="cx">
</span><ins>+ enum IsolatedCopyTag { IsolatedCopy };
+ IDBTransactionInfo(const IDBTransactionInfo&, IsolatedCopyTag);
+
</ins><span class="cx"> IDBTransactionInfo isolatedCopy() const;
</span><span class="cx">
</span><span class="cx"> const IDBResourceIdentifier& identifier() const { return m_identifier; }
</span><span class="lines">@@ -72,6 +75,8 @@
</span><span class="cx"> private:
</span><span class="cx"> IDBTransactionInfo(const IDBResourceIdentifier&);
</span><span class="cx">
</span><ins>+ static void isolatedCopy(const IDBTransactionInfo& source, IDBTransactionInfo& destination);
+
</ins><span class="cx"> IDBResourceIdentifier m_identifier;
</span><span class="cx">
</span><span class="cx"> IndexedDB::TransactionMode m_mode { IndexedDB::TransactionMode::ReadOnly };
</span></span></pre>
</div>
</div>
</body>
</html>