<!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>[163892] trunk</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/163892">163892</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 11:31:46 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>IndexedDB tests on some bots are flakey (timeouts)
<rdar://problem/16038745> and https://bugs.webkit.org/show_bug.cgi?id=128612
Reviewed by Sam Weinig.
Source/WebKit2:
When messing with JSC VM’s and such, always use APIEntryShim instead of JSLockHolder.
*ESPECIALLY* when dealing with multiple threads.
* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::~UniqueIDBDatabaseBackingStoreSQLite):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::createIndex):
LayoutTests:
* platform/mac-wk2/TestExpectations: Reenable the tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163891 => 163892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-11 19:27:12 UTC (rev 163891)
+++ trunk/LayoutTests/ChangeLog 2014-02-11 19:31:46 UTC (rev 163892)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-02-11 Brady Eidson <beidson@apple.com>
+
+ IndexedDB tests on some bots are flakey (timeouts)
+ <rdar://problem/16038745> and https://bugs.webkit.org/show_bug.cgi?id=128612
+
+ Reviewed by Sam Weinig.
+
+ * platform/mac-wk2/TestExpectations: Reenable the tests.
+
</ins><span class="cx"> 2014-02-11 James Craig <jcraig@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: AX: Accessibility Node Inspection
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (163891 => 163892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-02-11 19:27:12 UTC (rev 163891)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-02-11 19:31:46 UTC (rev 163892)
</span><span class="lines">@@ -472,20 +472,20 @@
</span><span class="cx"> # All IndexedDB tests are skipped in WK1.
</span><span class="cx"> # Reenable individual tests here that are known to pass, with the eventual goal of re-enabling the entire directory.
</span><span class="cx"> # (Except, skip them for now since https://bugs.webkit.org/show_bug.cgi?id=128341 is getting in the way of testing in general)
</span><del>-# storage/indexeddb/mozilla/add-twice-failure.html [ Pass ]
-# storage/indexeddb/mozilla/autoincrement-indexes.html [ Pass ]
-# storage/indexeddb/mozilla/clear.html [ Pass ]
-# storage/indexeddb/mozilla/create-index-with-integer-keys.html [ Pass ]
-# storage/indexeddb/mozilla/cursor-mutation-objectstore-only.html [ Pass ]
-# storage/indexeddb/mozilla/cursor-mutation.html [ Pass ]
-# storage/indexeddb/mozilla/cursor-update-updates-indexes.html [ Pass ]
-# storage/indexeddb/mozilla/cursors.html [ Pass ]
-# storage/indexeddb/mozilla/index-prev-no-duplicate.html [ Pass ]
-# storage/indexeddb/mozilla/indexes.html [ Pass ]
-# storage/indexeddb/mozilla/object-cursors.html [ Pass ]
-# storage/indexeddb/mozilla/object-store-inline-autoincrement-key-added-on-put.html [ Pass ]
-# storage/indexeddb/mozilla/object-store-remove-values.html [ Pass ]
-# storage/indexeddb/mozilla/versionchange-abort.html [ Pass ]
</del><ins>+storage/indexeddb/mozilla/add-twice-failure.html [ Pass ]
+storage/indexeddb/mozilla/autoincrement-indexes.html [ Pass ]
+storage/indexeddb/mozilla/clear.html [ Pass ]
+storage/indexeddb/mozilla/create-index-with-integer-keys.html [ Pass ]
+storage/indexeddb/mozilla/cursor-mutation-objectstore-only.html [ Pass ]
+storage/indexeddb/mozilla/cursor-mutation.html [ Pass ]
+storage/indexeddb/mozilla/cursor-update-updates-indexes.html [ Pass ]
+storage/indexeddb/mozilla/cursors.html [ Pass ]
+storage/indexeddb/mozilla/index-prev-no-duplicate.html [ Pass ]
+storage/indexeddb/mozilla/indexes.html [ Pass ]
+storage/indexeddb/mozilla/object-cursors.html [ Pass ]
+storage/indexeddb/mozilla/object-store-inline-autoincrement-key-added-on-put.html [ Pass ]
+storage/indexeddb/mozilla/object-store-remove-values.html [ Pass ]
+storage/indexeddb/mozilla/versionchange-abort.html [ Pass ]
</ins><span class="cx">
</span><span class="cx"> ### END OF (5) Features that are not supported in WebKit1, so skipped in mac/TestExpectations then re-enabled here
</span><span class="cx"> ########################################
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163891 => 163892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-11 19:27:12 UTC (rev 163891)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-11 19:31:46 UTC (rev 163892)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-11 Brady Eidson <beidson@apple.com>
+
+ IndexedDB tests on some bots are flakey (timeouts)
+ <rdar://problem/16038745> and https://bugs.webkit.org/show_bug.cgi?id=128612
+
+ Reviewed by Sam Weinig.
+
+ When messing with JSC VM’s and such, always use APIEntryShim instead of JSLockHolder.
+ *ESPECIALLY* when dealing with multiple threads.
+
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::~UniqueIDBDatabaseBackingStoreSQLite):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::createIndex):
+
</ins><span class="cx"> 2014-02-11 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop using PLATFORM(MAC) in WebKit2/Shared except where it means “OS X but not iOS”
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp (163891 => 163892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2014-02-11 19:27:12 UTC (rev 163891)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2014-02-11 19:31:46 UTC (rev 163892)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "SQLiteIDBCursor.h"
</span><span class="cx"> #include "SQLiteIDBTransaction.h"
</span><ins>+#include <JavaScriptCore/APIShims.h>
</ins><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/IDBBindingUtilities.h>
</span><span class="cx"> #include <WebCore/IDBDatabaseMetadata.h>
</span><span class="lines">@@ -76,7 +77,7 @@
</span><span class="cx"> m_sqliteDB = nullptr;
</span><span class="cx">
</span><span class="cx"> if (m_vm) {
</span><del>- JSLockHolder lockHolder(m_vm.get());
</del><ins>+ APIEntryShim shim(m_vm.get());
</ins><span class="cx"> m_globalObject.clear();
</span><span class="cx"> m_vm = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -630,7 +631,7 @@
</span><span class="cx">
</span><span class="cx"> m_cursors.set(cursor->identifier(), cursor);
</span><span class="cx">
</span><del>- OwnPtr<JSLockHolder> lockHolder;
</del><ins>+ OwnPtr<APIEntryShim> shim;
</ins><span class="cx"> while (!cursor->currentKey().isNull) {
</span><span class="cx"> const IDBKeyData& key = cursor->currentKey();
</span><span class="cx"> const Vector<uint8_t>& valueBuffer = cursor->currentValueBuffer();
</span><span class="lines">@@ -638,12 +639,12 @@
</span><span class="cx"> if (!m_globalObject) {
</span><span class="cx"> ASSERT(!m_vm);
</span><span class="cx"> m_vm = VM::create();
</span><del>- lockHolder = adoptPtr(new JSLockHolder(m_vm.get()));
</del><ins>+ shim = adoptPtr(new APIEntryShim(m_vm.get()));
</ins><span class="cx"> m_globalObject.set(*m_vm, JSGlobalObject::create(*m_vm, JSGlobalObject::createStructure(*m_vm, jsNull())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!lockHolder)
- lockHolder = adoptPtr(new JSLockHolder(m_vm.get()));
</del><ins>+ if (!shim)
+ shim = adoptPtr(new APIEntryShim(m_vm.get()));
</ins><span class="cx">
</span><span class="cx"> Deprecated::ScriptValue value = deserializeIDBValueBuffer(m_globalObject->globalExec(), valueBuffer, true);
</span><span class="cx"> Vector<IDBKeyData> indexKeys;
</span></span></pre>
</div>
</div>
</body>
</html>