Changeset 80346 in webkit

Timestamp:

Mar 4, 2011 6:20:01 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-03-04 Andrey Adaikin <​aandrey@google.com>

Reviewed by Pavel Feldman.

Web Inspector: [Text editor] DOMNodeRemoved events are missing
​https://bugs.webkit.org/show_bug.cgi?id=55769

• inspector/front-end/TextViewer.js: (WebInspector.TextEditorMainPanel): (WebInspector.TextEditorMainPanel.prototype._handleDOMUpdates): (WebInspector.TextEditorMainChunk): (WebInspector.TextEditorMainChunk.prototype._createRow):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/TextViewer.js (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-04  Andrey Adaikin  <aandrey@google.com>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: [Text editor] DOMNodeRemoved events are missing
+        https://bugs.webkit.org/show_bug.cgi?id=55769
+
+        * inspector/front-end/TextViewer.js:
+        (WebInspector.TextEditorMainPanel):
+        (WebInspector.TextEditorMainPanel.prototype._handleDOMUpdates):
+        (WebInspector.TextEditorMainChunk):
+        (WebInspector.TextEditorMainChunk.prototype._createRow):
+
 2011-03-04  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/TextViewer.js

@@ -678 +678 @@
     this.element = document.createElement("div");
     this.element.className = "text-editor-contents";
+    this.element.tabIndex = 0;
 
     this._container = document.createElement("div");
@@ -690 +691 @@
         this._container.addEventListener("keydown", this._handleKeyDown.bind(this), false);
 
-    var handleDOMUpdates = this._handleDOMUpdates.bind(this);
-    this._container.addEventListener("DOMCharacterDataModified", handleDOMUpdates, false);
-    this._container.addEventListener("DOMNodeInserted", handleDOMUpdates, false);
-    this._container.addEventListener("DOMNodeRemoved", handleDOMUpdates, false);
-    // For some reasons, in a few corner cases the events above are not able to catch the editings.
-    // To workaround that we also listen to a more general event as a backup.
-    this._container.addEventListener("DOMSubtreeModified", this._handleDOMSubtreeModified.bind(this), false);
+    // In WebKit the DOMNodeRemoved event is fired AFTER the node is removed, thus it should be
+    // attached to all DOM nodes that we want to track. Instead, we attach the DOMNodeRemoved
+    // listeners only on the line rows, and use DOMSubtreeModified to track node removals inside
+    // the line rows. For more info see: https://bugs.webkit.org/show_bug.cgi?id=55666
+    this._handleDOMUpdatesCallback = this._handleDOMUpdates.bind(this);
+    this._container.addEventListener("DOMCharacterDataModified", this._handleDOMUpdatesCallback, false);
+    this._container.addEventListener("DOMNodeInserted", this._handleDOMUpdatesCallback, false);
+    this._container.addEventListener("DOMSubtreeModified", this._handleDOMUpdatesCallback, false);
 
     this.freeCachedElements();
@@ -1128 +1130 @@
             return;
 
-        if (lineRow.decorationsElement && lineRow.decorationsElement.isAncestor(target)) {
-            if (this._syncDecorationsForLineListener) {
-                // Wait until this event is processed and only then sync the sizes. This is necessary in
-                // case of the DOMNodeRemoved event, because it is dispatched before the removal takes place.
-                setTimeout(function() {
-                    this._syncDecorationsForLineListener(lineRow.lineNumber);
-                }.bind(this), 0);
-            }
+        if (lineRow.decorationsElement && (lineRow.decorationsElement === target || lineRow.decorationsElement.isAncestor(target))) {
+            if (this._syncDecorationsForLineListener)
+                this._syncDecorationsForLineListener(lineRow.lineNumber);
             return;
         }
@@ -1142 +1139 @@
             return;
 
-        if (target === lineRow && (e.type === "DOMNodeInserted" || e.type === "DOMNodeRemoved")) {
-            // The "lineNumber" (if any) is no longer valid for a line being removed or inserted.
-            delete lineRow.lineNumber;
-        }
-
-        var startLine = 0;
-        for (var row = lineRow; row; row = row.previousSibling) {
-            if (typeof row.lineNumber === "number") {
-                startLine = row.lineNumber;
-                break;
-            }
-        }
-
-        var endLine = this._textModel.linesCount;
-        for (var row = lineRow.nextSibling; row; row = row.nextSibling) {
-            if (typeof row.lineNumber === "number") {
-                endLine = row.lineNumber;
-                break;
-            }
-        }
-
-        this._markDirtyLines(startLine, endLine);
-    },
-
-    _handleDOMSubtreeModified: function(e)
-    {
-        if (this._domUpdateCoalescingLevel || this._readOnly || e.target !== this._container)
-            return;
-
-        // Proceed only when other events failed to catch the DOM updates, otherwise it is not necessary.
-        if (this._dirtyLines)
-            return;
-
-        var selection = this._getSelection();
-        if (!selection)
-            return;
-
-        var startLine = Math.min(selection.startLine, selection.endLine);
-        var endLine = Math.max(selection.startLine, selection.endLine) + 1;
-        endLine = Math.min(this._textModel.linesCount, endLine);
-
-        this._markDirtyLines(startLine, endLine);
-    },
-
-    _markDirtyLines: function(startLine, endLine)
-    {
+        var lineNumber = lineRow.lineNumber;
         if (this._dirtyLines) {
-            this._dirtyLines.start = Math.min(this._dirtyLines.start, startLine);
-            this._dirtyLines.end = Math.max(this._dirtyLines.end, endLine);
+            this._dirtyLines.start = Math.min(this._dirtyLines.start, lineNumber);
+            this._dirtyLines.end = Math.max(this._dirtyLines.end, lineNumber + 1);
         } else {
-            this._dirtyLines = { start: startLine, end: endLine };
+            this._dirtyLines = { start: lineNumber, end: lineNumber + 1 };
             setTimeout(this._applyDomUpdates.bind(this), 0);
             // Remove marked ranges, if any.
@@ -1450 +1402 @@
     this.element.lineNumber = startLine;
     this.element.className = "webkit-line-content";
+    this.element.addEventListener("DOMNodeRemoved", this._textViewer._handleDOMUpdatesCallback, false);
 
     this._startLine = startLine;
@@ -1580 +1533 @@
         lineRow.lineNumber = lineNumber;
         lineRow.className = "webkit-line-content";
+        lineRow.addEventListener("DOMNodeRemoved", this._textViewer._handleDOMUpdatesCallback, false);
         lineRow.textContent = this._textModel.line(lineNumber);
         if (!lineRow.textContent)