<!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>[173991] 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/173991">173991</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-09-25 19:20:05 -0700 (Thu, 25 Sep 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>StorageTracker::deleteOrigin being called off the main thread (ASSERTs in inspector/test-harness-trivially-works.html test)
https://bugs.webkit.org/show_bug.cgi?id=129642

Reviewed by Brady Eidson.

Source/WebCore:

When tearing down the inspector frontend's page, we trigger a threading violation
in StorageAreaSync's final sync code underneath StorageAreaSync::deleteEmptyDatabase().

No new tests. Regression is covered by inspector/test-harness-trivially-works.html.

* storage/StorageAreaSync.cpp:
(WebCore::StorageAreaSync::deleteEmptyDatabase): add a missing callOnMainThread() when
calling StorageTracker::deleteOriginWithIdentifier().

LayoutTests:

Remove the blanket Skip for all tests in inspector/.

* TestExpectations: clean up expectations for inspector/ and add new tracking bugs.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorestorageStorageAreaSynccpp">trunk/Source/WebCore/storage/StorageAreaSync.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173990 => 173991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-09-26 01:09:39 UTC (rev 173990)
+++ trunk/LayoutTests/ChangeLog        2014-09-26 02:20:05 UTC (rev 173991)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-09-25  Brian J. Burg  &lt;burg@cs.washington.edu&gt;
+
+        StorageTracker::deleteOrigin being called off the main thread (ASSERTs in inspector/test-harness-trivially-works.html test)
+        https://bugs.webkit.org/show_bug.cgi?id=129642
+
+        Reviewed by Brady Eidson.
+
+        Remove the blanket Skip for all tests in inspector/.
+
+        * TestExpectations: clean up expectations for inspector/ and add new tracking bugs.
+
</ins><span class="cx"> 2014-09-25  Sungmann Cho  &lt;sungmann.cho@navercorp.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unprefix CSS cursor values zoom-in and zoom-out.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (173990 => 173991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations        2014-09-26 01:09:39 UTC (rev 173990)
+++ trunk/LayoutTests/TestExpectations        2014-09-26 02:20:05 UTC (rev 173991)
</span><span class="lines">@@ -90,8 +90,6 @@
</span><span class="cx"> webkit.org/b/129327 inspector-protocol/indexeddb/basics.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/127414 inspector-protocol/page/deny-X-FrameOption.html [ Pass Failure ]
</span><span class="cx"> 
</span><del>-webkit.org/b/129642 inspector [ Skip ]
-
</del><span class="cx"> # These tests cause assertion failures in subsequent tests
</span><span class="cx"> webkit.org/b/131919 inspector/dom [ Skip ]
</span><span class="cx"> 
</span><span class="lines">@@ -99,17 +97,18 @@
</span><span class="cx"> # webkit.org/b/129817 inspector/dom/content-flow-list.html [ Pass Failure ]
</span><span class="cx"> # webkit.org/b/129817 inspector/dom/content-flow-content-removal.html [ Pass Failure ]
</span><span class="cx"> 
</span><ins>+# These tests still mysteriously flake and/or time out.
+webkit.org/b/137131 inspector/debugger [ Skip ]
+webkit.org/b/137130 inspector/replay [ Skip ]
+
+# Doesn't work yet, relies on network replay functionality (webkit.org/b/130728, webkit.org/b/129391)
+webkit.org/b/131318 http/tests/inspector/replay/document-last-modified-fallback-value.html [ Skip ]
+
</ins><span class="cx"> # Collecting region's children in a named flow not supported yet
</span><span class="cx"> webkit.org/b/74144 fast/regions/flow-body-in-html.html [ Skip ]
</span><span class="cx"> webkit.org/b/74144 fast/regions/universal-selector-children-to-the-same-region.html [ Skip ]
</span><span class="cx"> webkit.org/b/74144 fast/regions/region-content-flown-into-region.html [ Skip ]
</span><span class="cx"> 
</span><del>-# Doesn't work yet, relies on network replay functionality (webkit.org/b/130728, webkit.org/b/129391)
-webkit.org/b/131318 http/tests/inspector/replay/document-last-modified-fallback-value.html [ Skip ]
-
-# Asserts in debug builds.
-[ Debug ] http/tests/inspector/replay/document-last-modified-fallback-value.html [ Skip ]
-
</del><span class="cx"> # Expando properties on attribute nodes disappear
</span><span class="cx"> webkit.org/b/88045 fast/dom/gc-attribute-node.html [ Failure Pass ]
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173990 => 173991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-09-26 01:09:39 UTC (rev 173990)
+++ trunk/Source/WebCore/ChangeLog        2014-09-26 02:20:05 UTC (rev 173991)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-09-25  Brian J. Burg  &lt;burg@cs.washington.edu&gt;
+
+        StorageTracker::deleteOrigin being called off the main thread (ASSERTs in inspector/test-harness-trivially-works.html test)
+        https://bugs.webkit.org/show_bug.cgi?id=129642
+
+        Reviewed by Brady Eidson.
+
+        When tearing down the inspector frontend's page, we trigger a threading violation
+        in StorageAreaSync's final sync code underneath StorageAreaSync::deleteEmptyDatabase().
+
+        No new tests. Regression is covered by inspector/test-harness-trivially-works.html.
+
+        * storage/StorageAreaSync.cpp:
+        (WebCore::StorageAreaSync::deleteEmptyDatabase): add a missing callOnMainThread() when
+        calling StorageTracker::deleteOriginWithIdentifier().
+
</ins><span class="cx"> 2014-09-25  Sungmann Cho  &lt;sungmann.cho@navercorp.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unprefix CSS cursor values zoom-in and zoom-out.
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageAreaSynccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageAreaSync.cpp (173990 => 173991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageAreaSync.cpp        2014-09-26 01:09:39 UTC (rev 173990)
+++ trunk/Source/WebCore/storage/StorageAreaSync.cpp        2014-09-26 02:20:05 UTC (rev 173991)
</span><span class="lines">@@ -521,9 +521,11 @@
</span><span class="cx">     if (!count) {
</span><span class="cx">         query.finalize();
</span><span class="cx">         m_database.close();
</span><del>-        if (StorageTracker::tracker().isActive())
-            StorageTracker::tracker().deleteOriginWithIdentifier(m_databaseIdentifier);
-        else {
</del><ins>+        if (StorageTracker::tracker().isActive()) {
+            callOnMainThread([this] {
+                StorageTracker::tracker().deleteOriginWithIdentifier(m_databaseIdentifier);
+            });
+        } else {
</ins><span class="cx">             String databaseFilename = m_syncManager-&gt;fullDatabaseFilename(m_databaseIdentifier);
</span><span class="cx">             if (!SQLiteFileSystem::deleteDatabaseFile(databaseFilename))
</span><span class="cx">                 LOG_ERROR(&quot;Failed to delete database file %s\n&quot;, databaseFilename.utf8().data());
</span></span></pre>
</div>
</div>

</body>
</html>