[webkit-changes] [201893] trunk/Source

Thu, 09 Jun 2016 16:48:23 -0700

Title: [201893] trunk/Source
Revision
201893
Author
[email protected]
Date
2016-06-09 16:48:08 -0700 (Thu, 09 Jun 2016)

Log Message

REGRESSION: Web Inspector: IndexedDB does not show ObjectStore data
https://bugs.webkit.org/show_bug.cgi?id=158592
<rdar://problem/26730696>

Patch by Joseph Pecoraro <[email protected]> on 2016-06-09
Reviewed by Timothy Hatcher.

Source/WebCore:

* inspector/InspectorIndexedDBAgent.cpp:
(WebCore::DataLoader::execute):
Ensure the IDBTransaction is active when attempting to open a cursor.

(WebCore::OpenCursorCallback::handleEvent):
End, when the cursor result is empty, like we do for script results.

Source/WebInspectorUI:

* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid.prototype._noteRowRemoved):
(WebInspector.DataGridNode.prototype._detach):
When rows are removed in the non-Virtual DataGrids, we should
actually remove the row.

* UserInterface/Views/IndexedDatabaseObjectStoreContentView.js:
(WebInspector.IndexedDatabaseObjectStoreContentView):
(WebInspector.IndexedDatabaseObjectStoreContentView.prototype._fetchMoreData.processEntries):
(WebInspector.IndexedDatabaseObjectStoreContentView.prototype._fetchMoreData):
Don't use the delete operator. Use a boolean.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (201892 => 201893)


--- trunk/Source/WebCore/ChangeLog	2016-06-09 23:30:39 UTC (rev 201892)
+++ trunk/Source/WebCore/ChangeLog	2016-06-09 23:48:08 UTC (rev 201893)
@@ -1,3 +1,18 @@
+2016-06-09  Joseph Pecoraro  <[email protected]>
+
+        REGRESSION: Web Inspector: IndexedDB does not show ObjectStore data
+        https://bugs.webkit.org/show_bug.cgi?id=158592
+        <rdar://problem/26730696>
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/InspectorIndexedDBAgent.cpp:
+        (WebCore::DataLoader::execute):
+        Ensure the IDBTransaction is active when attempting to open a cursor.
+
+        (WebCore::OpenCursorCallback::handleEvent):
+        End, when the cursor result is empty, like we do for script results.
+
 2016-06-09  Antoine Quint  <[email protected]>
 
         Changing canvas height immediately after page load does not relayout canvas

Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (201892 => 201893)


--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp	2016-06-09 23:30:39 UTC (rev 201892)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp	2016-06-09 23:48:08 UTC (rev 201893)
@@ -394,7 +394,7 @@
         }
         auto* cursorResult = request.cursorResult();
         if (!cursorResult) {
-            m_requestCallback->sendFailure("Unexpected result type.");
+            end(false);
             return;
         }
 
@@ -483,8 +483,7 @@
             return;
         }
 
-        Ref<OpenCursorCallback> openCursorCallback = OpenCursorCallback::create(m_injectedScript, m_requestCallback.copyRef(), 0, m_pageSize);
-
+        TransactionActivator activator(idbTransaction.get());
         ExceptionCodeWithMessage ec;
         RefPtr<IDBRequest> idbRequest;
         if (!m_indexName.isEmpty()) {
@@ -503,6 +502,7 @@
             return;
         }
 
+        Ref<OpenCursorCallback> openCursorCallback = OpenCursorCallback::create(m_injectedScript, m_requestCallback.copyRef(), 0, m_pageSize);
         idbRequest->addEventListener(eventNames().successEvent, WTFMove(openCursorCallback), false);
     }

Modified: trunk/Source/WebInspectorUI/ChangeLog (201892 => 201893)


--- trunk/Source/WebInspectorUI/ChangeLog	2016-06-09 23:30:39 UTC (rev 201892)
+++ trunk/Source/WebInspectorUI/ChangeLog	2016-06-09 23:48:08 UTC (rev 201893)
@@ -1,3 +1,23 @@
+2016-06-09  Joseph Pecoraro  <[email protected]>
+
+        REGRESSION: Web Inspector: IndexedDB does not show ObjectStore data
+        https://bugs.webkit.org/show_bug.cgi?id=158592
+        <rdar://problem/26730696>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/DataGrid.js:
+        (WebInspector.DataGrid.prototype._noteRowRemoved):
+        (WebInspector.DataGridNode.prototype._detach):
+        When rows are removed in the non-Virtual DataGrids, we should
+        actually remove the row.
+
+        * UserInterface/Views/IndexedDatabaseObjectStoreContentView.js:
+        (WebInspector.IndexedDatabaseObjectStoreContentView):
+        (WebInspector.IndexedDatabaseObjectStoreContentView.prototype._fetchMoreData.processEntries):
+        (WebInspector.IndexedDatabaseObjectStoreContentView.prototype._fetchMoreData):
+        Don't use the delete operator. Use a boolean.
+
 2016-06-09  Nikita Vasilyev  <[email protected]>
 
         Web Inspector: Support Command-P for quick open

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (201892 => 201893)


--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js	2016-06-09 23:30:39 UTC (rev 201892)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js	2016-06-09 23:48:08 UTC (rev 201893)
@@ -1004,6 +1004,19 @@
         this.needsLayout();
     }
 
+    _noteRowRemoved(dataGridNode)
+    {
+        if (this._inline || this._variableHeightRows) {
+            // Inline DataGrids rows are not updated in layout, so
+            // we need to remove rows immediately.
+            if (dataGridNode.element && dataGridNode.element.parentNode)
+                dataGridNode.element.parentNode.removeChild(dataGridNode.element);
+            return;
+        }
+
+        this._noteRowsChanged();
+    }
+
     _noteScrollPositionChanged()
     {
         this._cachedScrollTop = NaN;
@@ -2513,7 +2526,7 @@
         this._attached = false;
 
         this.dataGrid._rows.remove(this, true);
-        this.dataGrid._noteRowsChanged();
+        this.dataGrid._noteRowRemoved(this);
 
         for (var i = 0; i < this.children.length; ++i)
             this.children[i]._detach();

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js (201892 => 201893)


--- trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js	2016-06-09 23:30:39 UTC (rev 201892)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js	2016-06-09 23:48:08 UTC (rev 201893)
@@ -74,6 +74,7 @@
 
         this._entries = [];
 
+        this._fetchingMoreData = false;
         this._fetchMoreData();
 
         this._refreshButtonNavigationItem = new WebInspector.ButtonNavigationItem("indexed-database-object-store-refresh", WebInspector.UIString("Refresh"), "Images/ReloadFull.svg", 13, 13);
@@ -143,7 +144,7 @@
                 this._dataGrid.appendChild(dataGridNode);
             }
 
-            delete this._fetchingMoreData;
+            this._fetchingMoreData = false;
 
             if (moreAvailable && this._dataGrid.isScrolledToLastRow())
                 this._fetchMoreData();

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to