Title: [143185] branches/chromium/1410/Source/WebCore/inspector/front-end
- Revision
- 143185
- Author
- yu...@chromium.org
- Date
- 2013-02-18 02:45:28 -0800 (Mon, 18 Feb 2013)
Log Message
Merge 142870
> Web Inspector: fix to record button remaining red after heap snapshot is taken
> https://bugs.webkit.org/show_bug.cgi?id=109804
>
> Patch by Alexei Filippov <a...@chromium.org> on 2013-02-14
> Reviewed by Yury Semikhatsky.
>
> Revert part of r142243 fix. Namely heap snapshot taking button made
> stateless as it was before.
>
> * inspector/front-end/HeapSnapshotView.js:
> (WebInspector.HeapSnapshotProfileType.prototype.buttonClicked):
> * inspector/front-end/ProfilesPanel.js:
> (WebInspector.ProfilesPanel.prototype.toggleRecordButton):
TBR=commit-qu...@webkit.org
Review URL: https://codereview.chromium.org/12294013
Modified Paths
Diff
Modified: branches/chromium/1410/Source/WebCore/inspector/front-end/HeapSnapshotView.js (143184 => 143185)
--- branches/chromium/1410/Source/WebCore/inspector/front-end/HeapSnapshotView.js 2013-02-18 10:45:04 UTC (rev 143184)
+++ branches/chromium/1410/Source/WebCore/inspector/front-end/HeapSnapshotView.js 2013-02-18 10:45:28 UTC (rev 143185)
@@ -775,7 +775,7 @@
buttonClicked: function(profilesPanel)
{
profilesPanel.takeHeapSnapshot();
- return true;
+ return false;
},
get treeItemTitle()
Modified: branches/chromium/1410/Source/WebCore/inspector/front-end/ProfilesPanel.js (143184 => 143185)
--- branches/chromium/1410/Source/WebCore/inspector/front-end/ProfilesPanel.js 2013-02-18 10:45:04 UTC (rev 143184)
+++ branches/chromium/1410/Source/WebCore/inspector/front-end/ProfilesPanel.js 2013-02-18 10:45:28 UTC (rev 143185)
@@ -357,6 +357,10 @@
var isProfiling = this._selectedProfileType.buttonClicked(this);
this.recordButton.toggled = isProfiling;
this.recordButton.title = this._selectedProfileType.buttonTooltip;
+ if (isProfiling)
+ this._launcherView.profileStarted();
+ else
+ this._launcherView.profileFinished();
},
wasShown: function()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes