Changeset 181672 in webkit

Timestamp:

Mar 17, 2015, 5:03:07 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Removal of multiline completion hint broken in Details sidebar
​https://bugs.webkit.org/show_bug.cgi?id=142796

Patch by Tobias Reiss <​tobi+webkit@basecode.de> on 2015-03-17
Reviewed by Joseph Pecoraro.

Prioritize CodeMirrorCompletionController over CSSStyleDeclarationTextEditor.
Both classes control the current CodeMirror instance of the Details Sidebar.
This change prevents possible race conditions during complete or delete-complete phases,
especially during operations on multiple styles in one line.

• UserInterface/Views/CSSStyleDeclarationTextEditor.js:

(WebInspector.CSSStyleDeclarationTextEditor):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/CSSStyleDeclarationTextEditor.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-03-17  Tobias Reiss  <tobi+webkit@basecode.de>
+
+        Web Inspector: Removal of multiline completion hint broken in Details sidebar
+        https://bugs.webkit.org/show_bug.cgi?id=142796
+
+        Reviewed by Joseph Pecoraro.
+
+        Prioritize CodeMirrorCompletionController over CSSStyleDeclarationTextEditor.
+        Both classes control the current CodeMirror instance of the Details Sidebar.
+        This change prevents possible race conditions during complete or delete-complete phases,
+        especially during operations on multiple styles in one line.
+
+        * UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+        (WebInspector.CSSStyleDeclarationTextEditor):
+
 2015-03-17  Matt Baker  <mattbaker@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js

@@ -54 +54 @@
     });
 
-    this._codeMirror.on("change", this._contentChanged.bind(this));
-    this._codeMirror.on("blur", this._editorBlured.bind(this));
-
     this._completionController = new WebInspector.CodeMirrorCompletionController(this._codeMirror, this);
     this._tokenTrackingController = new WebInspector.CodeMirrorTokenTrackingController(this._codeMirror, this);
@@ -65 +62 @@
     this._tokenTrackingController.mouseOutReleaseDelayDuration = 0;
     this._tokenTrackingController.mode = WebInspector.CodeMirrorTokenTrackingController.Mode.NonSymbolTokens;
+
+    // Make sure CompletionController adds event listeners first.
+    // Otherwise we end up in race conditions during complete or delete-complete phases.
+    this._codeMirror.on("change", this._contentChanged.bind(this));
+    this._codeMirror.on("blur", this._editorBlured.bind(this));
 
     this.style = style;