<!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>[189813] 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/189813">189813</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-09-15 11:09:29 -0700 (Tue, 15 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the IDBAny::Type enum into an enum class.
https://bugs.webkit.org/show_bug.cgi?id=149169.
Reviewed by Oliver Hunt.
No new tests (Cleanup, no behavior change).
* Modules/indexeddb/IDBAny.h:
* Modules/indexeddb/legacy/LegacyAny.cpp:
(WebCore::LegacyAny::createInvalid):
(WebCore::LegacyAny::createNull):
(WebCore::LegacyAny::LegacyAny):
(WebCore::LegacyAny::domStringList):
(WebCore::LegacyAny::idbCursor):
(WebCore::LegacyAny::idbCursorWithValue):
(WebCore::LegacyAny::idbDatabase):
(WebCore::LegacyAny::idbFactory):
(WebCore::LegacyAny::idbIndex):
(WebCore::LegacyAny::idbObjectStore):
(WebCore::LegacyAny::idbTransaction):
(WebCore::LegacyAny::scriptValue):
(WebCore::LegacyAny::string):
(WebCore::LegacyAny::integer):
(WebCore::LegacyAny::legacyCursor):
(WebCore::LegacyAny::legacyCursorWithValue):
(WebCore::LegacyAny::legacyDatabase):
(WebCore::LegacyAny::legacyFactory):
(WebCore::LegacyAny::legacyIndex):
(WebCore::LegacyAny::legacyObjectStore):
(WebCore::LegacyAny::legacyTransaction):
* Modules/indexeddb/legacy/LegacyCursor.cpp:
(WebCore::LegacyCursor::LegacyCursor):
(WebCore::LegacyCursor::effectiveObjectStore):
* Modules/indexeddb/legacy/LegacyObjectStore.cpp:
* Modules/indexeddb/legacy/LegacyOpenDBRequest.cpp:
(WebCore::LegacyOpenDBRequest::dispatchEvent):
* Modules/indexeddb/legacy/LegacyRequest.cpp:
(WebCore::LegacyRequest::getResultCursor):
(WebCore::effectiveObjectStore):
* bindings/js/JSIDBAnyCustom.cpp:
(WebCore::toJS):
* inspector/InspectorIndexedDBAgent.cpp:
* page/DatabaseProvider.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBAnyh">trunk/Source/WebCore/Modules/indexeddb/IDBAny.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddblegacyLegacyAnycpp">trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddblegacyLegacyCursorcpp">trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyCursor.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddblegacyLegacyObjectStorecpp">trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyObjectStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddblegacyLegacyOpenDBRequestcpp">trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyOpenDBRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddblegacyLegacyRequestcpp">trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyRequest.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSIDBAnyCustomcpp">trunk/Source/WebCore/bindings/js/JSIDBAnyCustom.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDatabaseProviderh">trunk/Source/WebCore/page/DatabaseProvider.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189812 => 189813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-15 17:48:58 UTC (rev 189812)
+++ trunk/Source/WebCore/ChangeLog 2015-09-15 18:09:29 UTC (rev 189813)
</span><span class="lines">@@ -1,5 +1,51 @@
</span><span class="cx"> 2015-09-15 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Make the IDBAny::Type enum into an enum class.
+ https://bugs.webkit.org/show_bug.cgi?id=149169.
+
+ Reviewed by Oliver Hunt.
+
+ No new tests (Cleanup, no behavior change).
+
+ * Modules/indexeddb/IDBAny.h:
+ * Modules/indexeddb/legacy/LegacyAny.cpp:
+ (WebCore::LegacyAny::createInvalid):
+ (WebCore::LegacyAny::createNull):
+ (WebCore::LegacyAny::LegacyAny):
+ (WebCore::LegacyAny::domStringList):
+ (WebCore::LegacyAny::idbCursor):
+ (WebCore::LegacyAny::idbCursorWithValue):
+ (WebCore::LegacyAny::idbDatabase):
+ (WebCore::LegacyAny::idbFactory):
+ (WebCore::LegacyAny::idbIndex):
+ (WebCore::LegacyAny::idbObjectStore):
+ (WebCore::LegacyAny::idbTransaction):
+ (WebCore::LegacyAny::scriptValue):
+ (WebCore::LegacyAny::string):
+ (WebCore::LegacyAny::integer):
+ (WebCore::LegacyAny::legacyCursor):
+ (WebCore::LegacyAny::legacyCursorWithValue):
+ (WebCore::LegacyAny::legacyDatabase):
+ (WebCore::LegacyAny::legacyFactory):
+ (WebCore::LegacyAny::legacyIndex):
+ (WebCore::LegacyAny::legacyObjectStore):
+ (WebCore::LegacyAny::legacyTransaction):
+ * Modules/indexeddb/legacy/LegacyCursor.cpp:
+ (WebCore::LegacyCursor::LegacyCursor):
+ (WebCore::LegacyCursor::effectiveObjectStore):
+ * Modules/indexeddb/legacy/LegacyObjectStore.cpp:
+ * Modules/indexeddb/legacy/LegacyOpenDBRequest.cpp:
+ (WebCore::LegacyOpenDBRequest::dispatchEvent):
+ * Modules/indexeddb/legacy/LegacyRequest.cpp:
+ (WebCore::LegacyRequest::getResultCursor):
+ (WebCore::effectiveObjectStore):
+ * bindings/js/JSIDBAnyCustom.cpp:
+ (WebCore::toJS):
+ * inspector/InspectorIndexedDBAgent.cpp:
+ * page/DatabaseProvider.h:
+
+2015-09-15 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Move most IDB object encoding/decoding from WebKit2 to WebCore.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149152
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBAnyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBAny.h (189812 => 189813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBAny.h 2015-09-15 17:48:58 UTC (rev 189812)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBAny.h 2015-09-15 18:09:29 UTC (rev 189813)
</span><span class="lines">@@ -52,21 +52,21 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~IDBAny() { }
</span><span class="cx">
</span><del>- enum Type {
- UndefinedType = 0,
- NullType,
- DOMStringListType,
- IDBCursorType,
- IDBCursorWithValueType,
- IDBDatabaseType,
- IDBFactoryType,
- IDBIndexType,
- IDBObjectStoreType,
- IDBTransactionType,
- ScriptValueType,
- IntegerType,
- StringType,
- KeyPathType,
</del><ins>+ enum class Type {
+ Undefined = 0,
+ Null,
+ DOMStringList,
+ IDBCursor,
+ IDBCursorWithValue,
+ IDBDatabase,
+ IDBFactory,
+ IDBIndex,
+ IDBObjectStore,
+ IDBTransaction,
+ ScriptValue,
+ Integer,
+ String,
+ KeyPath,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> virtual Type type() const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddblegacyLegacyAnycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.cpp (189812 => 189813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.cpp 2015-09-15 17:48:58 UTC (rev 189812)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.cpp 2015-09-15 18:09:29 UTC (rev 189813)
</span><span class="lines">@@ -40,12 +40,12 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<LegacyAny> LegacyAny::createInvalid()
</span><span class="cx"> {
</span><del>- return adoptRef(new LegacyAny(UndefinedType));
</del><ins>+ return adoptRef(new LegacyAny(Type::Undefined));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<LegacyAny> LegacyAny::createNull()
</span><span class="cx"> {
</span><del>- return adoptRef(new LegacyAny(NullType));
</del><ins>+ return adoptRef(new LegacyAny(Type::Null));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<LegacyAny> LegacyAny::createString(const String& value)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> : m_type(type)
</span><span class="cx"> , m_integer(0)
</span><span class="cx"> {
</span><del>- ASSERT(type == UndefinedType || type == NullType);
</del><ins>+ ASSERT(type == Type::Undefined || type == Type::Null);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyAny::~LegacyAny()
</span><span class="lines">@@ -66,192 +66,192 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<DOMStringList> LegacyAny::domStringList()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == DOMStringListType);
</del><ins>+ ASSERT(m_type == Type::DOMStringList);
</ins><span class="cx"> return m_domStringList;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<IDBCursor> LegacyAny::idbCursor()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IDBCursorType);
</del><ins>+ ASSERT(m_type == Type::IDBCursor);
</ins><span class="cx"> return m_idbCursor;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<IDBCursorWithValue> LegacyAny::idbCursorWithValue()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IDBCursorWithValueType);
</del><ins>+ ASSERT(m_type == Type::IDBCursorWithValue);
</ins><span class="cx"> return m_idbCursorWithValue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<IDBDatabase> LegacyAny::idbDatabase()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IDBDatabaseType);
</del><ins>+ ASSERT(m_type == Type::IDBDatabase);
</ins><span class="cx"> return m_idbDatabase;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<IDBFactory> LegacyAny::idbFactory()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IDBFactoryType);
</del><ins>+ ASSERT(m_type == Type::IDBFactory);
</ins><span class="cx"> return m_idbFactory;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<IDBIndex> LegacyAny::idbIndex()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IDBIndexType);
</del><ins>+ ASSERT(m_type == Type::IDBIndex);
</ins><span class="cx"> return m_idbIndex;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<IDBObjectStore> LegacyAny::idbObjectStore()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IDBObjectStoreType);
</del><ins>+ ASSERT(m_type == Type::IDBObjectStore);
</ins><span class="cx"> return m_idbObjectStore;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<IDBTransaction> LegacyAny::idbTransaction()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IDBTransactionType);
</del><ins>+ ASSERT(m_type == Type::IDBTransaction);
</ins><span class="cx"> return m_idbTransaction;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const Deprecated::ScriptValue& LegacyAny::scriptValue()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == ScriptValueType);
</del><ins>+ ASSERT(m_type == Type::ScriptValue);
</ins><span class="cx"> return m_scriptValue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& LegacyAny::string()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == StringType);
</del><ins>+ ASSERT(m_type == Type::String);
</ins><span class="cx"> return m_string;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int64_t LegacyAny::integer()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IntegerType);
</del><ins>+ ASSERT(m_type == Type::Integer);
</ins><span class="cx"> return m_integer;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyAny::LegacyAny(PassRefPtr<DOMStringList> value)
</span><del>- : m_type(DOMStringListType)
</del><ins>+ : m_type(Type::DOMStringList)
</ins><span class="cx"> , m_domStringList(value)
</span><span class="cx"> , m_integer(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyAny::LegacyAny(PassRefPtr<LegacyCursorWithValue> value)
</span><del>- : m_type(IDBCursorWithValueType)
</del><ins>+ : m_type(Type::IDBCursorWithValue)
</ins><span class="cx"> , m_idbCursorWithValue(value)
</span><span class="cx"> , m_integer(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyAny::LegacyAny(PassRefPtr<LegacyCursor> value)
</span><del>- : m_type(IDBCursorType)
</del><ins>+ : m_type(Type::IDBCursor)
</ins><span class="cx"> , m_idbCursor(value)
</span><span class="cx"> , m_integer(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyAny::LegacyAny(PassRefPtr<LegacyDatabase> value)
</span><del>- : m_type(IDBDatabaseType)
</del><ins>+ : m_type(Type::IDBDatabase)
</ins><span class="cx"> , m_idbDatabase(value)
</span><span class="cx"> , m_integer(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyAny::LegacyAny(PassRefPtr<LegacyFactory> value)
</span><del>- : m_type(IDBFactoryType)
</del><ins>+ : m_type(Type::IDBFactory)
</ins><span class="cx"> , m_idbFactory(value)
</span><span class="cx"> , m_integer(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyAny::LegacyAny(PassRefPtr<LegacyIndex> value)
</span><del>- : m_type(IDBIndexType)
</del><ins>+ : m_type(Type::IDBIndex)
</ins><span class="cx"> , m_idbIndex(value)
</span><span class="cx"> , m_integer(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyAny::LegacyAny(PassRefPtr<LegacyTransaction> value)
</span><del>- : m_type(IDBTransactionType)
</del><ins>+ : m_type(Type::IDBTransaction)
</ins><span class="cx"> , m_idbTransaction(value)
</span><span class="cx"> , m_integer(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyAny::LegacyAny(PassRefPtr<LegacyObjectStore> value)
</span><del>- : m_type(IDBObjectStoreType)
</del><ins>+ : m_type(Type::IDBObjectStore)
</ins><span class="cx"> , m_idbObjectStore(value)
</span><span class="cx"> , m_integer(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyAny::LegacyAny(const Deprecated::ScriptValue& value)
</span><del>- : m_type(ScriptValueType)
</del><ins>+ : m_type(Type::ScriptValue)
</ins><span class="cx"> , m_scriptValue(value)
</span><span class="cx"> , m_integer(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyAny::LegacyAny(const IDBKeyPath& value)
</span><del>- : m_type(KeyPathType)
</del><ins>+ : m_type(Type::KeyPath)
</ins><span class="cx"> , m_idbKeyPath(value)
</span><span class="cx"> , m_integer(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyAny::LegacyAny(const String& value)
</span><del>- : m_type(StringType)
</del><ins>+ : m_type(Type::String)
</ins><span class="cx"> , m_string(value)
</span><span class="cx"> , m_integer(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyAny::LegacyAny(int64_t value)
</span><del>- : m_type(IntegerType)
</del><ins>+ : m_type(Type::Integer)
</ins><span class="cx"> , m_integer(value)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyCursor* LegacyAny::legacyCursor()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IDBCursorType);
</del><ins>+ ASSERT(m_type == Type::IDBCursor);
</ins><span class="cx"> return m_idbCursor.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyCursorWithValue* LegacyAny::legacyCursorWithValue()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IDBCursorWithValueType);
</del><ins>+ ASSERT(m_type == Type::IDBCursorWithValue);
</ins><span class="cx"> return m_idbCursorWithValue.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyDatabase* LegacyAny::legacyDatabase()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IDBDatabaseType);
</del><ins>+ ASSERT(m_type == Type::IDBDatabase);
</ins><span class="cx"> return m_idbDatabase.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyFactory* LegacyAny::legacyFactory()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IDBFactoryType);
</del><ins>+ ASSERT(m_type == Type::IDBFactory);
</ins><span class="cx"> return m_idbFactory.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyIndex* LegacyAny::legacyIndex()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IDBIndexType);
</del><ins>+ ASSERT(m_type == Type::IDBIndex);
</ins><span class="cx"> return m_idbIndex.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyObjectStore* LegacyAny::legacyObjectStore()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IDBObjectStoreType);
</del><ins>+ ASSERT(m_type == Type::IDBObjectStore);
</ins><span class="cx"> return m_idbObjectStore.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyTransaction* LegacyAny::legacyTransaction()
</span><span class="cx"> {
</span><del>- ASSERT(m_type == IDBTransactionType);
</del><ins>+ ASSERT(m_type == Type::IDBTransaction);
</ins><span class="cx"> return m_idbTransaction.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddblegacyLegacyCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyCursor.cpp (189812 => 189813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyCursor.cpp 2015-09-15 17:48:58 UTC (rev 189812)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyCursor.cpp 2015-09-15 18:09:29 UTC (rev 189813)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_backend);
</span><span class="cx"> ASSERT(m_request);
</span><del>- ASSERT(m_source->type() == IDBAny::IDBObjectStoreType || m_source->type() == IDBAny::IDBIndexType);
</del><ins>+ ASSERT(m_source->type() == IDBAny::Type::IDBObjectStore || m_source->type() == IDBAny::Type::IDBIndex);
</ins><span class="cx"> ASSERT(m_transaction);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<LegacyObjectStore> LegacyCursor::effectiveObjectStore()
</span><span class="cx"> {
</span><del>- if (m_source->type() == IDBAny::IDBObjectStoreType)
</del><ins>+ if (m_source->type() == IDBAny::Type::IDBObjectStore)
</ins><span class="cx"> return m_source->legacyObjectStore();
</span><span class="cx"> RefPtr<LegacyIndex> index = m_source->legacyIndex();
</span><span class="cx"> return index->legacyObjectStore();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddblegacyLegacyObjectStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyObjectStore.cpp (189812 => 189813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyObjectStore.cpp 2015-09-15 17:48:58 UTC (rev 189812)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyObjectStore.cpp 2015-09-15 18:09:29 UTC (rev 189813)
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<LegacyAny> cursorAny = request->legacyResult(ASSERT_NO_EXCEPTION);
</span><span class="cx"> RefPtr<LegacyCursorWithValue> cursor;
</span><del>- if (cursorAny->type() == IDBAny::IDBCursorWithValueType)
</del><ins>+ if (cursorAny->type() == IDBAny::Type::IDBCursorWithValue)
</ins><span class="cx"> cursor = cursorAny->legacyCursorWithValue();
</span><span class="cx">
</span><span class="cx"> Vector<int64_t, 1> indexIds;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddblegacyLegacyOpenDBRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyOpenDBRequest.cpp (189812 => 189813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyOpenDBRequest.cpp 2015-09-15 17:48:58 UTC (rev 189812)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyOpenDBRequest.cpp 2015-09-15 18:09:29 UTC (rev 189813)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> {
</span><span class="cx"> // If the connection closed between onUpgradeNeeded and the delivery of the "success" event,
</span><span class="cx"> // an "error" event should be fired instead.
</span><del>- if (event->type() == eventNames().successEvent && m_result->type() == IDBAny::IDBDatabaseType && m_result->legacyDatabase()->isClosePending()) {
</del><ins>+ if (event->type() == eventNames().successEvent && m_result->type() == IDBAny::Type::IDBDatabase && m_result->legacyDatabase()->isClosePending()) {
</ins><span class="cx"> m_result = nullptr;
</span><span class="cx"> onError(IDBDatabaseError::create(IDBDatabaseException::AbortError, "The connection was closed."));
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddblegacyLegacyRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyRequest.cpp (189812 => 189813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyRequest.cpp 2015-09-15 17:48:58 UTC (rev 189812)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyRequest.cpp 2015-09-15 18:09:29 UTC (rev 189813)
</span><span class="lines">@@ -209,9 +209,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_result)
</span><span class="cx"> return nullptr;
</span><del>- if (m_result->type() == IDBAny::IDBCursorType)
</del><ins>+ if (m_result->type() == IDBAny::Type::IDBCursor)
</ins><span class="cx"> return m_result->legacyCursor();
</span><del>- if (m_result->type() == IDBAny::IDBCursorWithValueType)
</del><ins>+ if (m_result->type() == IDBAny::Type::IDBCursorWithValue)
</ins><span class="cx"> return m_result->legacyCursorWithValue();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -340,9 +340,9 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> static PassRefPtr<IDBObjectStore> effectiveObjectStore(LegacyAny* source)
</span><span class="cx"> {
</span><del>- if (source->type() == IDBAny::IDBObjectStoreType)
</del><ins>+ if (source->type() == IDBAny::Type::IDBObjectStore)
</ins><span class="cx"> return source->idbObjectStore();
</span><del>- if (source->type() == IDBAny::IDBIndexType)
</del><ins>+ if (source->type() == IDBAny::Type::IDBIndex)
</ins><span class="cx"> return source->idbIndex()->objectStore();
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSIDBAnyCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSIDBAnyCustom.cpp (189812 => 189813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSIDBAnyCustom.cpp 2015-09-15 17:48:58 UTC (rev 189812)
+++ trunk/Source/WebCore/bindings/js/JSIDBAnyCustom.cpp 2015-09-15 18:09:29 UTC (rev 189813)
</span><span class="lines">@@ -77,33 +77,33 @@
</span><span class="cx"> return jsNull();
</span><span class="cx">
</span><span class="cx"> switch (idbAny->type()) {
</span><del>- case IDBAny::UndefinedType:
</del><ins>+ case IDBAny::Type::Undefined:
</ins><span class="cx"> return jsUndefined();
</span><del>- case IDBAny::NullType:
</del><ins>+ case IDBAny::Type::Null:
</ins><span class="cx"> return jsNull();
</span><del>- case IDBAny::DOMStringListType:
</del><ins>+ case IDBAny::Type::DOMStringList:
</ins><span class="cx"> return toJS(exec, globalObject, idbAny->domStringList());
</span><del>- case IDBAny::IDBCursorType:
</del><ins>+ case IDBAny::Type::IDBCursor:
</ins><span class="cx"> return toJS(exec, globalObject, idbAny->idbCursor());
</span><del>- case IDBAny::IDBCursorWithValueType:
</del><ins>+ case IDBAny::Type::IDBCursorWithValue:
</ins><span class="cx"> return wrap<JSIDBCursorWithValue>(globalObject, idbAny->idbCursorWithValue().get());
</span><del>- case IDBAny::IDBDatabaseType:
</del><ins>+ case IDBAny::Type::IDBDatabase:
</ins><span class="cx"> return toJS(exec, globalObject, idbAny->idbDatabase());
</span><del>- case IDBAny::IDBFactoryType:
</del><ins>+ case IDBAny::Type::IDBFactory:
</ins><span class="cx"> return toJS(exec, globalObject, idbAny->idbFactory());
</span><del>- case IDBAny::IDBIndexType:
</del><ins>+ case IDBAny::Type::IDBIndex:
</ins><span class="cx"> return toJS(exec, globalObject, idbAny->idbIndex());
</span><del>- case IDBAny::IDBObjectStoreType:
</del><ins>+ case IDBAny::Type::IDBObjectStore:
</ins><span class="cx"> return toJS(exec, globalObject, idbAny->idbObjectStore());
</span><del>- case IDBAny::IDBTransactionType:
</del><ins>+ case IDBAny::Type::IDBTransaction:
</ins><span class="cx"> return toJS(exec, globalObject, idbAny->idbTransaction());
</span><del>- case IDBAny::ScriptValueType:
</del><ins>+ case IDBAny::Type::ScriptValue:
</ins><span class="cx"> return idbAny->scriptValue().jsValue();
</span><del>- case IDBAny::StringType:
</del><ins>+ case IDBAny::Type::String:
</ins><span class="cx"> return jsStringWithCache(exec, idbAny->string());
</span><del>- case IDBAny::IntegerType:
</del><ins>+ case IDBAny::Type::Integer:
</ins><span class="cx"> return jsNumber(idbAny->integer());
</span><del>- case IDBAny::KeyPathType:
</del><ins>+ case IDBAny::Type::KeyPath:
</ins><span class="cx"> return toJS(exec, globalObject, idbAny->keyPath());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (189812 => 189813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-09-15 17:48:58 UTC (rev 189812)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-09-15 18:09:29 UTC (rev 189813)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> m_requestCallback->sendFailure("Could not get result in callback.");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (requestResult->type() != IDBAny::DOMStringListType) {
</del><ins>+ if (requestResult->type() != IDBAny::Type::DOMStringList) {
</ins><span class="cx"> m_requestCallback->sendFailure("Unexpected result type.");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> m_executableWithDatabase->requestCallback().sendFailure("Could not get result in callback.");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (requestResult->type() != IDBAny::IDBDatabaseType) {
</del><ins>+ if (requestResult->type() != IDBAny::Type::IDBDatabase) {
</ins><span class="cx"> m_executableWithDatabase->requestCallback().sendFailure("Unexpected result type.");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -439,11 +439,11 @@
</span><span class="cx"> m_requestCallback->sendFailure("Could not get result in callback.");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (requestResult->type() == IDBAny::ScriptValueType) {
</del><ins>+ if (requestResult->type() == IDBAny::Type::ScriptValue) {
</ins><span class="cx"> end(false);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (requestResult->type() != IDBAny::IDBCursorWithValueType) {
</del><ins>+ if (requestResult->type() != IDBAny::Type::IDBCursorWithValue) {
</ins><span class="cx"> m_requestCallback->sendFailure("Unexpected result type.");
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageDatabaseProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DatabaseProvider.h (189812 => 189813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DatabaseProvider.h 2015-09-15 17:48:58 UTC (rev 189812)
+++ trunk/Source/WebCore/page/DatabaseProvider.h 2015-09-15 18:09:29 UTC (rev 189813)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class IDBConnectionManager;
</ins><span class="cx"> class IDBFactoryBackendInterface;
</span><span class="cx">
</span><span class="cx"> class WEBCORE_EXPORT DatabaseProvider : public RefCounted<DatabaseProvider> {
</span></span></pre>
</div>
</div>
</body>
</html>