Changeset 116855 in webkit

Timestamp:

May 12, 2012 6:54:27 AM (12 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: move recording button state control out of addProfileHeader.
​https://bugs.webkit.org/show_bug.cgi?id=86293

Reviewed by Yury Semikhatsky.

• inspector/front-end/CSSSelectorProfileView.js:

(WebInspector.CSSSelectorProfileType.prototype.buttonClicked):

• inspector/front-end/HeapSnapshotView.js:

(WebInspector.HeapSnapshotProfileType.prototype.buttonClicked):

• inspector/front-end/ProfileView.js:

(WebInspector.CPUProfileType.prototype.buttonClicked):

• inspector/front-end/ProfilesPanel.js:

(WebInspector.ProfileType.prototype.buttonClicked):
(WebInspector.ProfilesPanel.prototype.toggleRecordButton):
(WebInspector.ProfilesPanel.prototype.addProfileHeader):
(WebInspector.ProfilesPanel.prototype.setRecordingProfile):
(WebInspector.ProfilesPanel.prototype.takeHeapSnapshot.done):
(WebInspector.ProfilesPanel.prototype.takeHeapSnapshot):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/CSSSelectorProfileView.js (modified) (1 diff)
• inspector/front-end/HeapSnapshotView.js (modified) (1 diff)
• inspector/front-end/ProfileView.js (modified) (2 diffs)
• inspector/front-end/ProfilesPanel.js (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-12  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: move recording button state control out of addProfileHeader.
+        https://bugs.webkit.org/show_bug.cgi?id=86293
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/CSSSelectorProfileView.js:
+        (WebInspector.CSSSelectorProfileType.prototype.buttonClicked):
+        * inspector/front-end/HeapSnapshotView.js:
+        (WebInspector.HeapSnapshotProfileType.prototype.buttonClicked):
+        * inspector/front-end/ProfileView.js:
+        (WebInspector.CPUProfileType.prototype.buttonClicked):
+        * inspector/front-end/ProfilesPanel.js:
+        (WebInspector.ProfileType.prototype.buttonClicked):
+        (WebInspector.ProfilesPanel.prototype.toggleRecordButton):
+        (WebInspector.ProfilesPanel.prototype.addProfileHeader):
+        (WebInspector.ProfilesPanel.prototype.setRecordingProfile):
+        (WebInspector.ProfilesPanel.prototype.takeHeapSnapshot.done):
+        (WebInspector.ProfilesPanel.prototype.takeHeapSnapshot):
+
 2012-05-12  Eugene Klyuchnikov  <eustas.bug@gmail.com>
 

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

@@ -284 +284 @@
     },
 
+    /**
+     * @override
+     * @return {boolean}
+     */
     buttonClicked: function()
     {
-        if (this._recording)
+        if (this._recording) {
             this.stopRecordingProfile();
-        else
+            return false;
+        } else {
             this.startRecordingProfile();
+            return true;
+        }
     },
 

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

@@ -728 +728 @@
     },
 
+    /**
+     * @override
+     * @return {boolean}
+     */
     buttonClicked: function()
     {
         WebInspector.panels.profiles.takeHeapSnapshot();
+        return false;
     },
 

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

@@ -565 +565 @@
     },
 
+    /**
+     * @override
+     * @return {boolean}
+     */
     buttonClicked: function()
     {
@@ -570 +574 @@
             this.stopRecordingProfile();
             WebInspector.networkManager.enableResourceTracking();
+            return false;
         } else {
             WebInspector.networkManager.disableResourceTracking();
             this.startRecordingProfile();
+            return true;
         }
     },

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

@@ -58 +58 @@
     },
 
+    /**
+     * @return {boolean}
+     */
     buttonClicked: function()
     {
+        return false;
     },
 
@@ -281 +285 @@
     toggleRecordButton: function()
     {
-        this._selectedProfileType.buttonClicked();
+        var isProfiling = this._selectedProfileType.buttonClicked();
+        this.dispatchEventToListeners(isProfiling ? WebInspector.ProfilesPanel.EventTypes.ProfileStarted : WebInspector.ProfilesPanel.EventTypes.ProfileFinished);
     },
 
@@ -492 +497 @@
                 this.showProfile(profile);
             this.dispatchEventToListeners("profile added");
-            this.dispatchEventToListeners(WebInspector.ProfilesPanel.EventTypes.ProfileFinished);
-            this.recordButton.toggled = false;
-        } else {
-            this.dispatchEventToListeners(WebInspector.ProfilesPanel.EventTypes.ProfileStarted);
-            this.recordButton.toggled = true;
-        }
-
-        this.recordButton.title = this._selectedProfileType.buttonTooltip;
+        }
     },
 
@@ -1006 +1004 @@
         else
             this._removeTemporaryProfile(profileType);
+        this.recordButton.toggled = isProfiling;
+        this.recordButton.title = profileTypeObject.buttonTooltip;
+        this.dispatchEventToListeners(isProfiling ? WebInspector.ProfilesPanel.EventTypes.ProfileStarted : WebInspector.ProfilesPanel.EventTypes.ProfileFinished);
     },
 
@@ -1015 +1016 @@
             this.addProfileHeader(profileTypeObject.createTemporaryProfile());
         }
-        ProfilerAgent.takeHeapSnapshot();
+        this.dispatchEventToListeners(WebInspector.ProfilesPanel.EventTypes.ProfileStarted);
+        function done() {
+            this.dispatchEventToListeners(WebInspector.ProfilesPanel.EventTypes.ProfileFinished);
+        }
+        ProfilerAgent.takeHeapSnapshot(done.bind(this));
         WebInspector.userMetrics.ProfilesHeapProfileTaken.record();
     },