Changeset 209631 in webkit

Timestamp:

Dec 9, 2016, 2:43:54 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Frontend should not be resetting TypeProfiler state when switching between ContentViews
​https://bugs.webkit.org/show_bug.cgi?id=165648

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-12-09
Reviewed by Brian Burg.

• UserInterface/Base/Main.js:

(WebInspector.loaded):
Update all backends when the state changes.

• UserInterface/Views/SourceCodeTextEditor.js:

(WebInspector.SourceCodeTextEditor.prototype._setTypeTokenAnnotatorEnabledState):
(WebInspector.SourceCodeTextEditor.prototype.set _basicBlockAnnotatorEnabled):
Moved this code to when the global Setting (which affects all editors) changes.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (2 diffs)
• UserInterface/Views/SourceCodeTextEditor.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-12-09  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Frontend should not be resetting TypeProfiler state when switching between ContentViews
+        https://bugs.webkit.org/show_bug.cgi?id=165648
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Base/Main.js:
+        (WebInspector.loaded):
+        Update all backends when the state changes.
+
+        * UserInterface/Views/SourceCodeTextEditor.js:
+        (WebInspector.SourceCodeTextEditor.prototype._setTypeTokenAnnotatorEnabledState):
+        (WebInspector.SourceCodeTextEditor.prototype.set _basicBlockAnnotatorEnabled):
+        Moved this code to when the global Setting (which affects all editors) changes.
+
 2016-12-09  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -168 +168 @@
     // COMPATIBILITY (iOS 8): Page.enableTypeProfiler did not exist.
     this.showJavaScriptTypeInformationSetting = new WebInspector.Setting("show-javascript-type-information", false);
+    this.showJavaScriptTypeInformationSetting.addEventListener(WebInspector.Setting.Event.Changed, this._showJavaScriptTypeInformationSettingChanged, this);
     if (this.showJavaScriptTypeInformationSetting.value && window.RuntimeAgent && RuntimeAgent.enableTypeProfiler)
         RuntimeAgent.enableTypeProfiler();
 
     this.enableControlFlowProfilerSetting = new WebInspector.Setting("enable-control-flow-profiler", false);
+    this.enableControlFlowProfilerSetting.addEventListener(WebInspector.Setting.Event.Changed, this._enableControlFlowProfilerSettingChanged, this);
     if (this.enableControlFlowProfilerSetting.value && window.RuntimeAgent && RuntimeAgent.enableControlFlowProfiler)
         RuntimeAgent.enableControlFlowProfiler();
@@ -2090 +2092 @@
 };
 
+WebInspector._showJavaScriptTypeInformationSettingChanged = function(event)
+{
+    if (this.showJavaScriptTypeInformationSetting.value) {
+        for (let target of WebInspector.targets)
+            target.RuntimeAgent.enableTypeProfiler();
+    } else {
+        for (let target of WebInspector.targets)
+            target.RuntimeAgent.disableTypeProfiler();
+    }
+};
+
+WebInspector._enableControlFlowProfilerSettingChanged = function(event)
+{
+    if (this.enableControlFlowProfilerSetting.value) {
+        for (let target of WebInspector.targets)
+            target.RuntimeAgent.enableControlFlowProfiler();
+    } else {
+        for (let target of WebInspector.targets)
+            target.RuntimeAgent.disableControlFlowProfiler();
+    }
+};
+
 WebInspector.elementDragStart = function(element, dividerDrag, elementDragEnd, event, cursor, eventTarget)
 {

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

@@ -2066 +2066 @@
             console.assert(this.visible, "Annotators should not be enabled if the TextEditor is not visible");
 
-            for (let target of WebInspector.targets)
-                target.RuntimeAgent.enableTypeProfiler();
-
             this._typeTokenAnnotator.reset();
 
@@ -2074 +2071 @@
                 this._enableScrollEventsForTypeTokenAnnotator();
         } else {
-            for (let target of WebInspector.targets)
-                target.RuntimeAgent.disableTypeProfiler();
-
             this._typeTokenAnnotator.clear();
 
@@ -2095 +2089 @@
         if (shouldActivate) {
             console.assert(this.visible, "Annotators should not be enabled if the TextEditor is not visible");
-
-            for (let target of WebInspector.targets)
-                target.RuntimeAgent.enableControlFlowProfiler();
 
             console.assert(!this._basicBlockAnnotator.isActive());
@@ -2105 +2096 @@
                 this._enableScrollEventsForControlFlowAnnotator();
         } else {
-            for (let target of WebInspector.targets)
-                target.RuntimeAgent.disableControlFlowProfiler();
-
             this._basicBlockAnnotator.clear();