StorageTracker::deleteOrigin being called off the main thread (ASSERT…

…s 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.

Canonical link: https://commits.webkit.org/154944@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@173991 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog

@@ -1,3 +1,14 @@
+2014-09-25  Brian J. Burg  <burg@cs.washington.edu>
+
+        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.
+
 2014-09-25  Sungmann Cho  <sungmann.cho@navercorp.com>
 
         Unprefix CSS cursor values zoom-in and zoom-out.

LayoutTests/TestExpectations

@@ -90,25 +90,24 @@ webkit.org/b/129639 inspector-protocol/dom/dom-search-crash.html [ Skip ]
 webkit.org/b/129327 inspector-protocol/indexeddb/basics.html [ Pass Failure ]
 webkit.org/b/127414 inspector-protocol/page/deny-X-FrameOption.html [ Pass Failure ]
 
-webkit.org/b/129642 inspector [ Skip ]
-
 # These tests cause assertion failures in subsequent tests
 webkit.org/b/131919 inspector/dom [ Skip ]
 
 # Disabled the expectations because these tests are also skipped above.
 # webkit.org/b/129817 inspector/dom/content-flow-list.html [ Pass Failure ]
 # webkit.org/b/129817 inspector/dom/content-flow-content-removal.html [ Pass Failure ]
 
-# Collecting region's children in a named flow not supported yet
-webkit.org/b/74144 fast/regions/flow-body-in-html.html [ Skip ]
-webkit.org/b/74144 fast/regions/universal-selector-children-to-the-same-region.html [ Skip ]
-webkit.org/b/74144 fast/regions/region-content-flown-into-region.html [ Skip ]
+# 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 ]
 
-# Asserts in debug builds.
-[ Debug ] http/tests/inspector/replay/document-last-modified-fallback-value.html [ Skip ]
+# Collecting region's children in a named flow not supported yet
+webkit.org/b/74144 fast/regions/flow-body-in-html.html [ Skip ]
+webkit.org/b/74144 fast/regions/universal-selector-children-to-the-same-region.html [ Skip ]
+webkit.org/b/74144 fast/regions/region-content-flown-into-region.html [ Skip ]
 
 # Expando properties on attribute nodes disappear
 webkit.org/b/88045 fast/dom/gc-attribute-node.html [ Failure Pass ]

Source/WebCore/ChangeLog

@@ -1,3 +1,19 @@
+2014-09-25  Brian J. Burg  <burg@cs.washington.edu>
+
+        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().
+
 2014-09-25  Sungmann Cho  <sungmann.cho@navercorp.com>
 
         Unprefix CSS cursor values zoom-in and zoom-out.

Source/WebCore/storage/StorageAreaSync.cpp

@@ -521,9 +521,11 @@ void StorageAreaSync::deleteEmptyDatabase()
     if (!count) {
         query.finalize();
         m_database.close();
-        if (StorageTracker::tracker().isActive())
-            StorageTracker::tracker().deleteOriginWithIdentifier(m_databaseIdentifier);
-        else {
+        if (StorageTracker::tracker().isActive()) {
+            callOnMainThread([this] {
+                StorageTracker::tracker().deleteOriginWithIdentifier(m_databaseIdentifier);
+            });
+        } else {
             String databaseFilename = m_syncManager->fullDatabaseFilename(m_databaseIdentifier);
             if (!SQLiteFileSystem::deleteDatabaseFile(databaseFilename))
                 LOG_ERROR("Failed to delete database file %s\n", databaseFilename.utf8().data());