<!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>[190653] 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/190653">190653</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-06 17:06:59 -0700 (Tue, 06 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename IDBRequestIdentifier to IDBResourceIdentifier.
https://bugs.webkit.org/show_bug.cgi?id=149861
Reviewed by Alex Christensen.
No new tests (No change in behavior).
Turns out having an object representing a (connection ID + unique ID pair) is useful for more than just IDBRequests.
* CMakeLists.txt:
* Modules/indexeddb/client/IDBConnectionToServer.cpp:
(WebCore::IDBClient::IDBConnectionToServer::deleteDatabase):
(WebCore::IDBClient::IDBConnectionToServer::openDatabase):
* Modules/indexeddb/client/IDBConnectionToServer.h:
* Modules/indexeddb/client/IDBRequestImpl.cpp:
(WebCore::IDBClient::IDBRequest::IDBRequest):
* Modules/indexeddb/client/IDBRequestImpl.h:
(WebCore::IDBClient::IDBRequest::resourceIdentifier):
(WebCore::IDBClient::IDBRequest::requestIdentifier): Deleted.
* Modules/indexeddb/shared/IDBRequestData.h:
(WebCore::IDBRequestData::requestIdentifier):
* Modules/indexeddb/shared/IDBResourceIdentifier.cpp: Renamed from Source/WebCore/Modules/indexeddb/shared/IDBRequestIdentifier.cpp.
(WebCore::nextResourceNumber):
(WebCore::IDBResourceIdentifier::IDBResourceIdentifier):
(WebCore::IDBResourceIdentifier::emptyValue):
(WebCore::IDBResourceIdentifier::deletedValue):
(WebCore::IDBResourceIdentifier::isHashTableDeletedValue):
* Modules/indexeddb/shared/IDBResourceIdentifier.h: Renamed from Source/WebCore/Modules/indexeddb/shared/IDBRequestIdentifier.h.
(WebCore::IDBResourceIdentifier::isEmpty):
(WebCore::IDBResourceIdentifier::hash):
(WebCore::IDBResourceIdentifier::operator==):
(WebCore::IDBResourceIdentifier::connectionIdentifier):
(WebCore::IDBResourceIdentifierHash::hash):
(WebCore::IDBResourceIdentifierHash::equal):
(WebCore::IDBResourceIdentifierHashTraits::emptyValue):
(WebCore::IDBResourceIdentifierHashTraits::isEmptyValue):
(WebCore::IDBResourceIdentifierHashTraits::constructDeletedValue):
(WebCore::IDBResourceIdentifierHashTraits::isDeletedValue):
* Modules/indexeddb/shared/IDBResultData.cpp:
(WebCore::IDBResultData::IDBResultData):
* Modules/indexeddb/shared/IDBResultData.h:
(WebCore::IDBResultData::requestIdentifier):
* WebCore.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServercpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServerh">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBRequestImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBRequestImplh">trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBRequestDatah">trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBResultDatacpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBResultDatah">trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBResourceIdentifiercpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBResourceIdentifierh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBRequestIdentifiercpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestIdentifier.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBRequestIdentifierh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestIdentifier.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (190652 => 190653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-10-07 00:05:37 UTC (rev 190652)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-10-07 00:06:59 UTC (rev 190653)
</span><span class="lines">@@ -906,7 +906,7 @@
</span><span class="cx"> Modules/indexeddb/shared/IDBDatabaseInfo.cpp
</span><span class="cx"> Modules/indexeddb/shared/IDBError.cpp
</span><span class="cx"> Modules/indexeddb/shared/IDBRequestData.cpp
</span><del>- Modules/indexeddb/shared/IDBRequestIdentifier.cpp
</del><ins>+ Modules/indexeddb/shared/IDBResourceIdentifier.cpp
</ins><span class="cx"> Modules/indexeddb/shared/IDBResultData.cpp
</span><span class="cx"> Modules/indexeddb/shared/InProcessIDBServer.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190652 => 190653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-07 00:05:37 UTC (rev 190652)
+++ trunk/Source/WebCore/ChangeLog 2015-10-07 00:06:59 UTC (rev 190653)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2015-10-06 Brady Eidson <beidson@apple.com>
+
+ Rename IDBRequestIdentifier to IDBResourceIdentifier.
+ https://bugs.webkit.org/show_bug.cgi?id=149861
+
+ Reviewed by Alex Christensen.
+
+ No new tests (No change in behavior).
+
+ Turns out having an object representing a (connection ID + unique ID pair) is useful for more than just IDBRequests.
+
+ * CMakeLists.txt:
+ * Modules/indexeddb/client/IDBConnectionToServer.cpp:
+ (WebCore::IDBClient::IDBConnectionToServer::deleteDatabase):
+ (WebCore::IDBClient::IDBConnectionToServer::openDatabase):
+ * Modules/indexeddb/client/IDBConnectionToServer.h:
+ * Modules/indexeddb/client/IDBRequestImpl.cpp:
+ (WebCore::IDBClient::IDBRequest::IDBRequest):
+ * Modules/indexeddb/client/IDBRequestImpl.h:
+ (WebCore::IDBClient::IDBRequest::resourceIdentifier):
+ (WebCore::IDBClient::IDBRequest::requestIdentifier): Deleted.
+ * Modules/indexeddb/shared/IDBRequestData.h:
+ (WebCore::IDBRequestData::requestIdentifier):
+ * Modules/indexeddb/shared/IDBResourceIdentifier.cpp: Renamed from Source/WebCore/Modules/indexeddb/shared/IDBRequestIdentifier.cpp.
+ (WebCore::nextResourceNumber):
+ (WebCore::IDBResourceIdentifier::IDBResourceIdentifier):
+ (WebCore::IDBResourceIdentifier::emptyValue):
+ (WebCore::IDBResourceIdentifier::deletedValue):
+ (WebCore::IDBResourceIdentifier::isHashTableDeletedValue):
+ * Modules/indexeddb/shared/IDBResourceIdentifier.h: Renamed from Source/WebCore/Modules/indexeddb/shared/IDBRequestIdentifier.h.
+ (WebCore::IDBResourceIdentifier::isEmpty):
+ (WebCore::IDBResourceIdentifier::hash):
+ (WebCore::IDBResourceIdentifier::operator==):
+ (WebCore::IDBResourceIdentifier::connectionIdentifier):
+ (WebCore::IDBResourceIdentifierHash::hash):
+ (WebCore::IDBResourceIdentifierHash::equal):
+ (WebCore::IDBResourceIdentifierHashTraits::emptyValue):
+ (WebCore::IDBResourceIdentifierHashTraits::isEmptyValue):
+ (WebCore::IDBResourceIdentifierHashTraits::constructDeletedValue):
+ (WebCore::IDBResourceIdentifierHashTraits::isDeletedValue):
+ * Modules/indexeddb/shared/IDBResultData.cpp:
+ (WebCore::IDBResultData::IDBResultData):
+ * Modules/indexeddb/shared/IDBResultData.h:
+ (WebCore::IDBResultData::requestIdentifier):
+ * WebCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-10-06 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: ARIA 1.1: aria-orientation now defaults to undefined, supported on more elements, and role-specific defaults are defined.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp (190652 => 190653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2015-10-07 00:05:37 UTC (rev 190652)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2015-10-07 00:06:59 UTC (rev 190653)
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::deleteDatabase - %s", request.databaseIdentifier().debugString().utf8().data());
</span><span class="cx">
</span><del>- ASSERT(!m_openDBRequestMap.contains(request.requestIdentifier()));
- m_openDBRequestMap.set(request.requestIdentifier(), &request);
</del><ins>+ ASSERT(!m_openDBRequestMap.contains(request.resourceIdentifier()));
+ m_openDBRequestMap.set(request.resourceIdentifier(), &request);
</ins><span class="cx">
</span><span class="cx"> IDBRequestData requestData(*this, request);
</span><span class="cx"> m_delegate->deleteDatabase(requestData);
</span><span class="lines">@@ -76,8 +76,8 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::openDatabase - %s", request.databaseIdentifier().debugString().utf8().data());
</span><span class="cx">
</span><del>- ASSERT(!m_openDBRequestMap.contains(request.requestIdentifier()));
- m_openDBRequestMap.set(request.requestIdentifier(), &request);
</del><ins>+ ASSERT(!m_openDBRequestMap.contains(request.resourceIdentifier()));
+ m_openDBRequestMap.set(request.resourceIdentifier(), &request);
</ins><span class="cx">
</span><span class="cx"> IDBRequestData requestData(*this, request);
</span><span class="cx"> m_delegate->openDatabase(requestData);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h (190652 => 190653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2015-10-07 00:05:37 UTC (rev 190652)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2015-10-07 00:06:59 UTC (rev 190653)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="cx"> #include "IDBConnectionToServerDelegate.h"
</span><del>-#include "IDBRequestIdentifier.h"
</del><ins>+#include "IDBResourceIdentifier.h"
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<IDBConnectionToServerDelegate> m_delegate;
</span><span class="cx">
</span><del>- HashMap<IDBRequestIdentifier, RefPtr<IDBClient::IDBOpenDBRequest>> m_openDBRequestMap;
</del><ins>+ HashMap<IDBResourceIdentifier, RefPtr<IDBClient::IDBOpenDBRequest>> m_openDBRequestMap;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace IDBClient
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp (190652 => 190653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp 2015-10-07 00:05:37 UTC (rev 190652)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp 2015-10-07 00:06:59 UTC (rev 190653)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> IDBRequest::IDBRequest(IDBConnectionToServer& connection, ScriptExecutionContext* context)
</span><span class="cx"> : IDBOpenDBRequest(context)
</span><del>- , m_requestIdentifier(connection)
</del><ins>+ , m_resourceIdentifier(connection)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBRequestImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.h (190652 => 190653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.h 2015-10-07 00:05:37 UTC (rev 190652)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.h 2015-10-07 00:06:59 UTC (rev 190653)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="cx"> #include "IDBOpenDBRequest.h"
</span><del>-#include "IDBRequestIdentifier.h"
</del><ins>+#include "IDBResourceIdentifier.h"
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> class IDBRequest : public WebCore::IDBOpenDBRequest, public RefCounted<IDBRequest> {
</span><span class="cx"> public:
</span><del>- const IDBRequestIdentifier& requestIdentifier() const { return m_requestIdentifier; }
</del><ins>+ const IDBResourceIdentifier& resourceIdentifier() const { return m_resourceIdentifier; }
</ins><span class="cx">
</span><span class="cx"> virtual RefPtr<IDBAny> result(ExceptionCode&) const override;
</span><span class="cx"> virtual unsigned short errorCode(ExceptionCode&) const override;
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> virtual void refEventTarget() override final { RefCounted<IDBRequest>::ref(); }
</span><span class="cx"> virtual void derefEventTarget() override final { RefCounted<IDBRequest>::deref(); }
</span><span class="cx">
</span><del>- IDBRequestIdentifier m_requestIdentifier;
</del><ins>+ IDBResourceIdentifier m_resourceIdentifier;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace IDBClient
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBRequestDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h (190652 => 190653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h 2015-10-07 00:05:37 UTC (rev 190652)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h 2015-10-07 00:06:59 UTC (rev 190653)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="cx"> #include "IDBDatabaseIdentifier.h"
</span><del>-#include "IDBRequestIdentifier.h"
</del><ins>+#include "IDBResourceIdentifier.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -42,11 +42,11 @@
</span><span class="cx"> public:
</span><span class="cx"> IDBRequestData(const IDBClient::IDBConnectionToServer&, const IDBClient::IDBOpenDBRequest&);
</span><span class="cx">
</span><del>- IDBRequestIdentifier requestIdentifier() const { return m_requestIdentifier; }
</del><ins>+ IDBResourceIdentifier requestIdentifier() const { return m_requestIdentifier; }
</ins><span class="cx"> const IDBDatabaseIdentifier& databaseIdentifier() const { return m_databaseIdentifier; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- IDBRequestIdentifier m_requestIdentifier;
</del><ins>+ IDBResourceIdentifier m_requestIdentifier;
</ins><span class="cx"> IDBDatabaseIdentifier m_databaseIdentifier;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBRequestIdentifiercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestIdentifier.cpp (190652 => 190653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestIdentifier.cpp 2015-10-07 00:05:37 UTC (rev 190652)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestIdentifier.cpp 2015-10-07 00:06:59 UTC (rev 190653)
</span><span class="lines">@@ -1,85 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "IDBRequestIdentifier.h"
-
-#if ENABLE(INDEXED_DATABASE)
-
-#include "IDBConnectionToServer.h"
-#include "IDBRequestImpl.h"
-#include <wtf/MainThread.h>
-
-namespace WebCore {
-
-static uint64_t nextRequestNumber()
-{
- ASSERT(isMainThread());
- static uint64_t currentNumber = 0;
- return ++currentNumber;
-}
-
-IDBRequestIdentifier::IDBRequestIdentifier()
- : m_requestNumber(nextRequestNumber())
-{
-}
-
-IDBRequestIdentifier::IDBRequestIdentifier(const IDBClient::IDBConnectionToServer& connection)
- : m_idbClientServerConnectionNumber(connection.identifier())
- , m_requestNumber(nextRequestNumber())
-{
-}
-
-IDBRequestIdentifier::IDBRequestIdentifier(const IDBClient::IDBConnectionToServer& connection, const IDBClient::IDBRequest& request)
- : m_idbClientServerConnectionNumber(connection.identifier())
- , m_requestNumber(request.requestIdentifier().m_requestNumber)
-{
-}
-
-IDBRequestIdentifier IDBRequestIdentifier::emptyValue()
-{
- IDBRequestIdentifier result;
- result.m_idbClientServerConnectionNumber = 0;
- result.m_requestNumber = 0;
- return WTF::move(result);
-}
-
-IDBRequestIdentifier IDBRequestIdentifier::deletedValue()
-{
- IDBRequestIdentifier result;
- result.m_idbClientServerConnectionNumber = std::numeric_limits<int64_t>::max();
- result.m_requestNumber = std::numeric_limits<int64_t>::max();
- return WTF::move(result);
-}
-
-bool IDBRequestIdentifier::isHashTableDeletedValue() const
-{
- return m_idbClientServerConnectionNumber == std::numeric_limits<int64_t>::max()
- && m_requestNumber == std::numeric_limits<int64_t>::max();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INDEXED_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBRequestIdentifierh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestIdentifier.h (190652 => 190653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestIdentifier.h 2015-10-07 00:05:37 UTC (rev 190652)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestIdentifier.h 2015-10-07 00:06:59 UTC (rev 190653)
</span><span class="lines">@@ -1,117 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef IDBRequestIdentifier_h
-#define IDBRequestIdentifier_h
-
-#if ENABLE(INDEXED_DATABASE)
-
-#include <wtf/text/StringHash.h>
-
-namespace WebCore {
-
-namespace IDBClient {
-class IDBConnectionToServer;
-class IDBRequest;
-}
-
-class IDBRequestIdentifier {
-public:
- IDBRequestIdentifier(const IDBClient::IDBConnectionToServer&);
- IDBRequestIdentifier(const IDBClient::IDBConnectionToServer&, const IDBClient::IDBRequest&);
-
- static IDBRequestIdentifier deletedValue();
- bool isHashTableDeletedValue() const;
-
- static IDBRequestIdentifier emptyValue();
- bool isEmpty() const
- {
- return !m_requestNumber && !m_idbClientServerConnectionNumber;
- }
-
- unsigned hash() const
- {
- uint64_t hashCodes[2] = { reinterpret_cast<uint64_t>(m_idbClientServerConnectionNumber), static_cast<uint64_t>(m_requestNumber) };
- return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
- }
-
- bool operator==(const IDBRequestIdentifier& other) const
- {
- return m_idbClientServerConnectionNumber == other.m_idbClientServerConnectionNumber
- && m_requestNumber == other.m_requestNumber;
- }
-
- uint64_t connectionIdentifier() const { return m_idbClientServerConnectionNumber; }
-
-private:
- IDBRequestIdentifier();
- uint64_t m_idbClientServerConnectionNumber { 0 };
- uint64_t m_requestNumber;
-};
-
-struct IDBRequestIdentifierHash {
- static unsigned hash(const IDBRequestIdentifier& a) { return a.hash(); }
- static bool equal(const IDBRequestIdentifier& a, const IDBRequestIdentifier& b) { return a == b; }
- static const bool safeToCompareToEmptyOrDeleted = false;
-};
-
-struct IDBRequestIdentifierHashTraits : WTF::CustomHashTraits<IDBRequestIdentifier> {
- static const bool hasIsEmptyValueFunction = true;
- static const bool emptyValueIsZero = false;
-
- static IDBRequestIdentifier emptyValue()
- {
- return IDBRequestIdentifier::emptyValue();
- }
-
- static bool isEmptyValue(const IDBRequestIdentifier& identifier)
- {
- return identifier.isEmpty();
- }
-
- static void constructDeletedValue(IDBRequestIdentifier& identifier)
- {
- identifier = IDBRequestIdentifier::deletedValue();
- }
-
- static bool isDeletedValue(const IDBRequestIdentifier& identifier)
- {
- return identifier.isHashTableDeletedValue();
- }
-};
-
-} // namespace WebCore
-
-namespace WTF {
-
-template<> struct HashTraits<WebCore::IDBRequestIdentifier> : WebCore::IDBRequestIdentifierHashTraits { };
-template<> struct DefaultHash<WebCore::IDBRequestIdentifier> {
- typedef WebCore::IDBRequestIdentifierHash Hash;
-};
-
-} // namespace WTF
-
-#endif // ENABLE(INDEXED_DATABASE)
-#endif // IDBRequestIdentifier_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBResourceIdentifiercppfromrev190652trunkSourceWebCoreModulesindexeddbsharedIDBRequestIdentifiercpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp (from rev 190652, trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestIdentifier.cpp) (0 => 190653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp 2015-10-07 00:06:59 UTC (rev 190653)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "IDBResourceIdentifier.h"
+
+#if ENABLE(INDEXED_DATABASE)
+
+#include "IDBConnectionToServer.h"
+#include "IDBRequestImpl.h"
+#include <wtf/MainThread.h>
+
+namespace WebCore {
+
+static uint64_t nextResourceNumber()
+{
+ ASSERT(isMainThread());
+ static uint64_t currentNumber = 0;
+ return ++currentNumber;
+}
+
+IDBResourceIdentifier::IDBResourceIdentifier()
+ : m_resourceNumber(nextResourceNumber())
+{
+}
+
+IDBResourceIdentifier::IDBResourceIdentifier(const IDBClient::IDBConnectionToServer& connection)
+ : m_idbConnectionIdentifier(connection.identifier())
+ , m_resourceNumber(nextResourceNumber())
+{
+}
+
+IDBResourceIdentifier::IDBResourceIdentifier(const IDBClient::IDBConnectionToServer& connection, const IDBClient::IDBRequest& request)
+ : m_idbConnectionIdentifier(connection.identifier())
+ , m_resourceNumber(request.resourceIdentifier().m_resourceNumber)
+{
+}
+
+IDBResourceIdentifier IDBResourceIdentifier::emptyValue()
+{
+ IDBResourceIdentifier result;
+ result.m_idbConnectionIdentifier = 0;
+ result.m_resourceNumber = 0;
+ return WTF::move(result);
+}
+
+IDBResourceIdentifier IDBResourceIdentifier::deletedValue()
+{
+ IDBResourceIdentifier result;
+ result.m_idbConnectionIdentifier = std::numeric_limits<uint64_t>::max();
+ result.m_resourceNumber = std::numeric_limits<uint64_t>::max();
+ return WTF::move(result);
+}
+
+bool IDBResourceIdentifier::isHashTableDeletedValue() const
+{
+ return m_idbConnectionIdentifier == std::numeric_limits<uint64_t>::max()
+ && m_resourceNumber == std::numeric_limits<uint64_t>::max();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(INDEXED_DATABASE)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBResourceIdentifierhfromrev190652trunkSourceWebCoreModulesindexeddbsharedIDBRequestIdentifierh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h (from rev 190652, trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestIdentifier.h) (0 => 190653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h (rev 0)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h 2015-10-07 00:06:59 UTC (rev 190653)
</span><span class="lines">@@ -0,0 +1,117 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef IDBResourceIdentifier_h
+#define IDBResourceIdentifier_h
+
+#if ENABLE(INDEXED_DATABASE)
+
+#include <wtf/text/StringHash.h>
+
+namespace WebCore {
+
+namespace IDBClient {
+class IDBConnectionToServer;
+class IDBRequest;
+}
+
+class IDBResourceIdentifier {
+public:
+ IDBResourceIdentifier(const IDBClient::IDBConnectionToServer&);
+ IDBResourceIdentifier(const IDBClient::IDBConnectionToServer&, const IDBClient::IDBRequest&);
+
+ static IDBResourceIdentifier deletedValue();
+ bool isHashTableDeletedValue() const;
+
+ static IDBResourceIdentifier emptyValue();
+ bool isEmpty() const
+ {
+ return !m_resourceNumber && !m_idbConnectionIdentifier;
+ }
+
+ unsigned hash() const
+ {
+ uint64_t hashCodes[2] = { m_idbConnectionIdentifier, m_resourceNumber };
+ return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
+ }
+
+ bool operator==(const IDBResourceIdentifier& other) const
+ {
+ return m_idbConnectionIdentifier == other.m_idbConnectionIdentifier
+ && m_resourceNumber == other.m_resourceNumber;
+ }
+
+ uint64_t connectionIdentifier() const { return m_idbConnectionIdentifier; }
+
+private:
+ IDBResourceIdentifier();
+ uint64_t m_idbConnectionIdentifier { 0 };
+ uint64_t m_resourceNumber;
+};
+
+struct IDBResourceIdentifierHash {
+ static unsigned hash(const IDBResourceIdentifier& a) { return a.hash(); }
+ static bool equal(const IDBResourceIdentifier& a, const IDBResourceIdentifier& b) { return a == b; }
+ static const bool safeToCompareToEmptyOrDeleted = false;
+};
+
+struct IDBResourceIdentifierHashTraits : WTF::CustomHashTraits<IDBResourceIdentifier> {
+ static const bool hasIsEmptyValueFunction = true;
+ static const bool emptyValueIsZero = false;
+
+ static IDBResourceIdentifier emptyValue()
+ {
+ return IDBResourceIdentifier::emptyValue();
+ }
+
+ static bool isEmptyValue(const IDBResourceIdentifier& identifier)
+ {
+ return identifier.isEmpty();
+ }
+
+ static void constructDeletedValue(IDBResourceIdentifier& identifier)
+ {
+ identifier = IDBResourceIdentifier::deletedValue();
+ }
+
+ static bool isDeletedValue(const IDBResourceIdentifier& identifier)
+ {
+ return identifier.isHashTableDeletedValue();
+ }
+};
+
+} // namespace WebCore
+
+namespace WTF {
+
+template<> struct HashTraits<WebCore::IDBResourceIdentifier> : WebCore::IDBResourceIdentifierHashTraits { };
+template<> struct DefaultHash<WebCore::IDBResourceIdentifier> {
+ typedef WebCore::IDBResourceIdentifierHash Hash;
+};
+
+} // namespace WTF
+
+#endif // ENABLE(INDEXED_DATABASE)
+#endif // IDBResourceIdentifier_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBResultDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp (190652 => 190653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp 2015-10-07 00:05:37 UTC (rev 190652)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp 2015-10-07 00:06:59 UTC (rev 190653)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-IDBResultData::IDBResultData(const IDBRequestIdentifier& requestIdentifier, const IDBError& error)
</del><ins>+IDBResultData::IDBResultData(const IDBResourceIdentifier& requestIdentifier, const IDBError& error)
</ins><span class="cx"> : m_requestIdentifier(requestIdentifier)
</span><span class="cx"> , m_error(error)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBResultDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h (190652 => 190653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h 2015-10-07 00:05:37 UTC (rev 190652)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h 2015-10-07 00:06:59 UTC (rev 190653)
</span><span class="lines">@@ -29,22 +29,22 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="cx"> #include "IDBError.h"
</span><del>-#include "IDBRequestIdentifier.h"
</del><ins>+#include "IDBResourceIdentifier.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class IDBRequestIdentifier;
</del><ins>+class IDBResourceIdentifier;
</ins><span class="cx">
</span><span class="cx"> class IDBResultData {
</span><span class="cx"> public:
</span><del>- IDBResultData(const IDBRequestIdentifier&, const IDBError&);
</del><ins>+ IDBResultData(const IDBResourceIdentifier&, const IDBError&);
</ins><span class="cx">
</span><del>- IDBRequestIdentifier requestIdentifier() const { return m_requestIdentifier; }
</del><ins>+ IDBResourceIdentifier requestIdentifier() const { return m_requestIdentifier; }
</ins><span class="cx">
</span><span class="cx"> const IDBError& error() const { return m_error; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- IDBRequestIdentifier m_requestIdentifier;
</del><ins>+ IDBResourceIdentifier m_requestIdentifier;
</ins><span class="cx"> IDBError m_error;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (190652 => 190653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-07 00:05:37 UTC (rev 190652)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-07 00:06:59 UTC (rev 190653)
</span><span class="lines">@@ -1921,8 +1921,6 @@
</span><span class="cx"> 510A58E51BAA40B100C19282 /* InProcessIDBServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 510A58E31BAA40AE00C19282 /* InProcessIDBServer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 510A58F91BACC7F200C19282 /* IDBRequestData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510A58F51BACC4A500C19282 /* IDBRequestData.cpp */; };
</span><span class="cx"> 510A58FA1BACC7F200C19282 /* IDBRequestData.h in Headers */ = {isa = PBXBuildFile; fileRef = 510A58F61BACC4A500C19282 /* IDBRequestData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 510A58FB1BACC7F200C19282 /* IDBRequestIdentifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510A58E61BAA41C900C19282 /* IDBRequestIdentifier.cpp */; };
- 510A58FC1BACC7F200C19282 /* IDBRequestIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 510A58E71BAA41C900C19282 /* IDBRequestIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 510D4A33103165EE0049EA54 /* SocketStreamErrorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510D4A2D103165EE0049EA54 /* SocketStreamErrorBase.cpp */; };
</span><span class="cx"> 510D4A34103165EE0049EA54 /* SocketStreamErrorBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A2E103165EE0049EA54 /* SocketStreamErrorBase.h */; };
</span><span class="cx"> 510D4A36103165EE0049EA54 /* SocketStreamHandleBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510D4A30103165EE0049EA54 /* SocketStreamHandleBase.cpp */; };
</span><span class="lines">@@ -1961,6 +1959,8 @@
</span><span class="cx"> 513F14540AB634C400094DDF /* IconLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 513F14520AB634C400094DDF /* IconLoader.h */; };
</span><span class="cx"> 51405C88190B014400754F94 /* SelectionRectGatherer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51405C86190B014400754F94 /* SelectionRectGatherer.cpp */; };
</span><span class="cx"> 51405C89190B014400754F94 /* SelectionRectGatherer.h in Headers */ = {isa = PBXBuildFile; fileRef = 51405C87190B014400754F94 /* SelectionRectGatherer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 5145B1091BC48E2E00E86219 /* IDBResourceIdentifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5145B1071BC4890B00E86219 /* IDBResourceIdentifier.cpp */; };
+ 5145B10A1BC48E2E00E86219 /* IDBResourceIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 5145B1081BC4890B00E86219 /* IDBResourceIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 5148453E1BB9D07E006A72ED /* IDBError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5148453C1BB9D076006A72ED /* IDBError.cpp */; };
</span><span class="cx"> 5148453F1BB9D07E006A72ED /* IDBError.h in Headers */ = {isa = PBXBuildFile; fileRef = 5148453D1BB9D076006A72ED /* IDBError.h */; };
</span><span class="cx"> 514B3F730C722047000530DF /* FileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 514B3F720C722047000530DF /* FileSystem.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -9253,8 +9253,6 @@
</span><span class="cx"> 510A326E18318431003C5326 /* IDBServerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBServerConnection.h; sourceTree = "<group>"; };
</span><span class="cx"> 510A58E21BAA40AE00C19282 /* InProcessIDBServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InProcessIDBServer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 510A58E31BAA40AE00C19282 /* InProcessIDBServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InProcessIDBServer.h; sourceTree = "<group>"; };
</span><del>- 510A58E61BAA41C900C19282 /* IDBRequestIdentifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBRequestIdentifier.cpp; sourceTree = "<group>"; };
- 510A58E71BAA41C900C19282 /* IDBRequestIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBRequestIdentifier.h; sourceTree = "<group>"; };
</del><span class="cx"> 510A58EF1BAB720F00C19282 /* IDBServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBServer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 510A58F01BAB720F00C19282 /* IDBServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBServer.h; sourceTree = "<group>"; };
</span><span class="cx"> 510A58F51BACC4A500C19282 /* IDBRequestData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBRequestData.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -9306,6 +9304,8 @@
</span><span class="cx"> 513F14520AB634C400094DDF /* IconLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IconLoader.h; sourceTree = "<group>"; };
</span><span class="cx"> 51405C86190B014400754F94 /* SelectionRectGatherer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectionRectGatherer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51405C87190B014400754F94 /* SelectionRectGatherer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectionRectGatherer.h; sourceTree = "<group>"; };
</span><ins>+ 5145B1071BC4890B00E86219 /* IDBResourceIdentifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBResourceIdentifier.cpp; sourceTree = "<group>"; };
+ 5145B1081BC4890B00E86219 /* IDBResourceIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBResourceIdentifier.h; sourceTree = "<group>"; };
</ins><span class="cx"> 5148453C1BB9D076006A72ED /* IDBError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBError.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 5148453D1BB9D076006A72ED /* IDBError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBError.h; sourceTree = "<group>"; };
</span><span class="cx"> 514B3F720C722047000530DF /* FileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSystem.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16657,8 +16657,8 @@
</span><span class="cx"> 5148453D1BB9D076006A72ED /* IDBError.h */,
</span><span class="cx"> 510A58F51BACC4A500C19282 /* IDBRequestData.cpp */,
</span><span class="cx"> 510A58F61BACC4A500C19282 /* IDBRequestData.h */,
</span><del>- 510A58E61BAA41C900C19282 /* IDBRequestIdentifier.cpp */,
- 510A58E71BAA41C900C19282 /* IDBRequestIdentifier.h */,
</del><ins>+ 5145B1071BC4890B00E86219 /* IDBResourceIdentifier.cpp */,
+ 5145B1081BC4890B00E86219 /* IDBResourceIdentifier.h */,
</ins><span class="cx"> 51D7236A1BB60BFE00478CA3 /* IDBResultData.cpp */,
</span><span class="cx"> 51D7236B1BB60BFE00478CA3 /* IDBResultData.h */,
</span><span class="cx"> 510A58E21BAA40AE00C19282 /* InProcessIDBServer.cpp */,
</span><span class="lines">@@ -24255,7 +24255,6 @@
</span><span class="cx"> 24F54EAD101FE914000AE741 /* ApplicationCacheHost.h in Headers */,
</span><span class="cx"> 1A8F6BC10DB55CDC001DB794 /* ApplicationCacheResource.h in Headers */,
</span><span class="cx"> 1A2AAC590DC2A3B100A20D9A /* ApplicationCacheStorage.h in Headers */,
</span><del>- 510A58FC1BACC7F200C19282 /* IDBRequestIdentifier.h in Headers */,
</del><span class="cx"> 9B417064125662B3006B28FC /* ApplyBlockElementCommand.h in Headers */,
</span><span class="cx"> 93309DD9099E64920056E581 /* ApplyStyleCommand.h in Headers */,
</span><span class="cx"> 512DD8F60D91E6AF000F89EE /* Archive.h in Headers */,
</span><span class="lines">@@ -26536,6 +26535,7 @@
</span><span class="cx"> 7A674BDC0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h in Headers */,
</span><span class="cx"> 2D5C9D0019C7B52E00B3C5C1 /* PageOverlay.h in Headers */,
</span><span class="cx"> 2D5C9D0219C7B52E00B3C5C1 /* PageOverlayController.h in Headers */,
</span><ins>+ 5145B10A1BC48E2E00E86219 /* IDBResourceIdentifier.h in Headers */,
</ins><span class="cx"> FBDB61A116D6037E00BB3394 /* PageRuleCollector.h in Headers */,
</span><span class="cx"> F3820895147D35F90010BC06 /* PageRuntimeAgent.h in Headers */,
</span><span class="cx"> A5F36D3B18F758720054C024 /* PageScriptDebugServer.h in Headers */,
</span><span class="lines">@@ -30086,6 +30086,7 @@
</span><span class="cx"> 267726001A5B3AD9003C24DD /* NFAToDFA.cpp in Sources */,
</span><span class="cx"> BCEF43E00E674110001C1287 /* NinePieceImage.cpp in Sources */,
</span><span class="cx"> A8C4A80009D563270003AC8D /* Node.cpp in Sources */,
</span><ins>+ 5145B1091BC48E2E00E86219 /* IDBResourceIdentifier.cpp in Sources */,
</ins><span class="cx"> 4129DF851BB5B80700322A16 /* JSReadableStreamPrivateConstructors.cpp in Sources */,
</span><span class="cx"> 854FE7320A2297BE0058D7AD /* NodeFilterCondition.cpp in Sources */,
</span><span class="cx"> 854FE7340A2297BE0058D7AD /* NodeIterator.cpp in Sources */,
</span><span class="lines">@@ -31028,7 +31029,6 @@
</span><span class="cx"> A08CF154152B77B3009C5775 /* WebGLShaderPrecisionFormat.cpp in Sources */,
</span><span class="cx"> 01D3CF8614BD0A3000FE9970 /* WebGLSharedObject.cpp in Sources */,
</span><span class="cx"> 6F995A151A70756200A735F4 /* WebGLSync.cpp in Sources */,
</span><del>- 510A58FB1BACC7F200C19282 /* IDBRequestIdentifier.cpp in Sources */,
</del><span class="cx"> 49C7B9E51042D32F0009D447 /* WebGLTexture.cpp in Sources */,
</span><span class="cx"> 6F995A231A7078B100A735F4 /* WebGLTransformFeedback.cpp in Sources */,
</span><span class="cx"> 0C3F1F5A10C8871200D72CE1 /* WebGLUniformLocation.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>