Title: [102910] trunk/Source/WebCore
- Revision
- 102910
- Author
- [email protected]
- Date
- 2011-12-15 02:09:51 -0800 (Thu, 15 Dec 2011)
Log Message
Unreviewed, build fix after r102906 (poor merge).
* inspector/front-end/ProfileView.js:
(WebInspector.CPUProfileType.prototype.buttonClicked):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (102909 => 102910)
--- trunk/Source/WebCore/ChangeLog 2011-12-15 10:06:22 UTC (rev 102909)
+++ trunk/Source/WebCore/ChangeLog 2011-12-15 10:09:51 UTC (rev 102910)
@@ -1,3 +1,10 @@
+2011-12-15 Alexander Pavlov <[email protected]>
+
+ Unreviewed, build fix after r102906 (poor merge).
+
+ * inspector/front-end/ProfileView.js:
+ (WebInspector.CPUProfileType.prototype.buttonClicked):
+
2011-12-15 Vsevolod Vlasov <[email protected]>
Unreviewed revert of r102696 ([Navigation Timing] Use monotonicallyIncreasingTime() instead of currentTime()).
Modified: trunk/Source/WebCore/inspector/front-end/ProfileView.js (102909 => 102910)
--- trunk/Source/WebCore/inspector/front-end/ProfileView.js 2011-12-15 10:06:22 UTC (rev 102909)
+++ trunk/Source/WebCore/inspector/front-end/ProfileView.js 2011-12-15 10:09:51 UTC (rev 102910)
@@ -592,7 +592,7 @@
if (this._recording) {
this.stopRecordingProfile();
WebInspector.networkManager.enableResourceTracking();
- } else
+ } else {
WebInspector.networkManager.disableResourceTracking();
this.startRecordingProfile();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
