<!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>[190731] 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/190731">190731</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-08 10:35:25 -0700 (Thu, 08 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update Inspector to only work with Legacy IDB (for now).
https://bugs.webkit.org/show_bug.cgi?id=149928.
Reviewed by Tim Horton.
* Modules/indexeddb/IDBAny.h:
(WebCore::IDBAny::isLegacy):
* Modules/indexeddb/legacy/LegacyAny.h:
* inspector/InspectorIndexedDBAgent.cpp:</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="#trunkSourceWebCoreModulesindexeddblegacyLegacyAnyh">trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190730 => 190731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-08 17:07:37 UTC (rev 190730)
+++ trunk/Source/WebCore/ChangeLog 2015-10-08 17:35:25 UTC (rev 190731)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-08 Brady Eidson <beidson@apple.com>
+
+ Update Inspector to only work with Legacy IDB (for now).
+ https://bugs.webkit.org/show_bug.cgi?id=149928.
+
+ Reviewed by Tim Horton.
+
+ * Modules/indexeddb/IDBAny.h:
+ (WebCore::IDBAny::isLegacy):
+
+ * Modules/indexeddb/legacy/LegacyAny.h:
+ * inspector/InspectorIndexedDBAgent.cpp:
+
</ins><span class="cx"> 2015-10-08 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> CrashTracer: [USER] com.apple.WebKit.WebContent at …Core::SelectorChecker::checkScrollbarPseudoClass const + 217
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBAnyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBAny.h (190730 => 190731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBAny.h 2015-10-08 17:07:37 UTC (rev 190730)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBAny.h 2015-10-08 17:35:25 UTC (rev 190731)
</span><span class="lines">@@ -68,6 +68,10 @@
</span><span class="cx"> KeyPath,
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ // FIXME: This is a temporary hack to allow casts in WebInspector code while Modern IDB and Legacy IDB live side-by-side.
+ // It should be removed when the legacy implementation is removed as part of https://bugs.webkit.org/show_bug.cgi?id=149117
+ virtual bool isLegacy() const { return false; }
+
</ins><span class="cx"> virtual Type type() const = 0;
</span><span class="cx"> virtual RefPtr<DOMStringList> domStringList() = 0;
</span><span class="cx"> virtual RefPtr<IDBCursor> idbCursor() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddblegacyLegacyAnyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.h (190730 => 190731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.h 2015-10-08 17:07:37 UTC (rev 190730)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.h 2015-10-08 17:35:25 UTC (rev 190731)
</span><span class="lines">@@ -84,6 +84,10 @@
</span><span class="cx"> }
</span><span class="cx"> ~LegacyAny();
</span><span class="cx">
</span><ins>+ // FIXME: This is a temporary hack to allow casts in WebInspector code while Modern IDB and Legacy IDB live side-by-side.
+ // It should be removed when the legacy implementation is removed as part of https://bugs.webkit.org/show_bug.cgi?id=149117
+ virtual bool isLegacy() const override final { return true; }
+
</ins><span class="cx"> virtual Type type() const override final { return m_type; }
</span><span class="cx"> // Use type() to figure out which one of these you're allowed to call.
</span><span class="cx"> virtual RefPtr<DOMStringList> domStringList() override final;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (190730 => 190731)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-10-08 17:07:37 UTC (rev 190730)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-10-08 17:35:25 UTC (rev 190731)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> #include "IDBTransaction.h"
</span><span class="cx"> #include "InspectorPageAgent.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><ins>+#include "LegacyDatabase.h"
</ins><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include <inspector/InjectedScript.h>
</span><span class="cx"> #include <inspector/InjectedScriptManager.h>
</span><span class="lines">@@ -149,7 +150,7 @@
</span><span class="cx"> : m_context(context) { }
</span><span class="cx"> virtual ~ExecutableWithDatabase() { };
</span><span class="cx"> void start(IDBFactory*, SecurityOrigin*, const String& databaseName);
</span><del>- virtual void execute(RefPtr<IDBDatabase>&&) = 0;
</del><ins>+ virtual void execute(RefPtr<LegacyDatabase>&&) = 0;
</ins><span class="cx"> virtual RequestCallback& requestCallback() = 0;
</span><span class="cx"> ScriptExecutionContext* context() { return m_context; };
</span><span class="cx"> private:
</span><span class="lines">@@ -188,8 +189,12 @@
</span><span class="cx"> m_executableWithDatabase->requestCallback().sendFailure("Unexpected result type.");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+ if (!requestResult->isLegacy()) {
+ m_executableWithDatabase->requestCallback().sendFailure("Only Legacy IDB is supported right now.");
+ return;
+ }
</ins><span class="cx">
</span><del>- RefPtr<IDBDatabase> idbDatabase = requestResult->idbDatabase();
</del><ins>+ RefPtr<LegacyDatabase> idbDatabase = adoptRef(static_cast<LegacyDatabase*>(requestResult->idbDatabase().leakRef()));
</ins><span class="cx"> m_executableWithDatabase->execute(WTF::move(idbDatabase));
</span><span class="cx"> IDBPendingTransactionMonitor::deactivateNewTransactions();
</span><span class="cx"> idbDatabase->close();
</span><span class="lines">@@ -283,7 +288,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~DatabaseLoader() { }
</span><span class="cx">
</span><del>- virtual void execute(RefPtr<IDBDatabase>&& database) override
</del><ins>+ virtual void execute(RefPtr<LegacyDatabase>&& database) override
</ins><span class="cx"> {
</span><span class="cx"> if (!requestCallback().isActive())
</span><span class="cx"> return;
</span><span class="lines">@@ -512,7 +517,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~DataLoader() { }
</span><span class="cx">
</span><del>- virtual void execute(RefPtr<IDBDatabase>&& database) override
</del><ins>+ virtual void execute(RefPtr<LegacyDatabase>&& database) override
</ins><span class="cx"> {
</span><span class="cx"> if (!requestCallback().isActive())
</span><span class="cx"> return;
</span><span class="lines">@@ -728,7 +733,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void execute(RefPtr<IDBDatabase>&& database) override
</del><ins>+ virtual void execute(RefPtr<LegacyDatabase>&& database) override
</ins><span class="cx"> {
</span><span class="cx"> if (!requestCallback().isActive())
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>