Changeset 96326 in webkit

Timestamp:

Sep 29, 2011 7:30:38 AM (13 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: UI performance test for network panel is incorrect. The time is including a timeout between scheduled refresh and actual refresh.
​https://bugs.webkit.org/show_bug.cgi?id=69087

The fix has the changes for the test and minor perf framework improvements.

Reviewed by Yury Semikhatsky.

Source/WebCore:

• inspector/front-end/NetworkPanel.js:

(WebInspector.NetworkLogView.prototype._defaultRefreshDelay.500._scheduleRefresh):

LayoutTests:

• inspector/performance/resources/network-append-30-requests.html:
• inspector/performance/resources/performance-test.js:

(initialize_TimeTracker.InspectorTest.runPerformanceTest.Timer.prototype.done):
(initialize_TimeTracker.InspectorTest.runPerformanceTest):
(initialize_TimeTracker.InspectorTest.mark):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/performance/resources/network-append-30-requests.html (modified) (1 diff)
• LayoutTests/inspector/performance/resources/performance-test.js (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/NetworkPanel.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-29  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: UI performance test for network panel is incorrect. The time is including a timeout between scheduled refresh and actual refresh.
+        https://bugs.webkit.org/show_bug.cgi?id=69087
+
+        The fix has the changes for the test and minor perf framework improvements.
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/performance/resources/network-append-30-requests.html:
+        * inspector/performance/resources/performance-test.js:
+        (initialize_TimeTracker.InspectorTest.runPerformanceTest.Timer.prototype.done):
+        (initialize_TimeTracker.InspectorTest.runPerformanceTest):
+        (initialize_TimeTracker.InspectorTest.mark):
+
 2011-09-29  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/LayoutTests/inspector/performance/resources/network-append-30-requests.html

@@ -18 +18 @@
     WebInspector.showPanel("network");
 
+    var originalRefresh = InspectorTest.override(WebInspector.panels.network._networkLogView, "refresh", timeTrackingRefresh, true);
+    WebInspector.panels.network._networkLogView._defaultRefreshDelay = 30;
+    function timeTrackingRefresh()
+    {
+        var cookie = InspectorTest.timer.start("network-append-30-requests");
+        originalRefresh.call(this);
+        InspectorTest.timer.finish(cookie);
+        InspectorTest.timer.done();
+    }
+
     function test(timer)
     {
         WebInspector.panels.network._networkLogView._reset();
-        var cookie = timer.start("network-append-30-requests");
         InspectorTest.evaluateInPage("makeXHRRequests(30)");
-        function finish()
-        {
-            timer.finish(cookie);
-            timer.done();
-        }
-        InspectorTest.addSniffer(WebInspector.panels.network._networkLogView, "refresh", finish);
     }
+
     InspectorTest.runPerformanceTest(test, 15000);
 }

trunk/LayoutTests/inspector/performance/resources/performance-test.js

@@ -44 +44 @@
                 this._runTest();
             else {
+                if (this._complete)
+                    return;
+                this._complete = true;
+
                 this._dump();
                 if (this._callback)
@@ -78 +82 @@
     }
 
-    var timer = new Timer(perfTest, callback);
-    timer._runTest();
+    InspectorTest.timer = new Timer(perfTest, callback);
+    InspectorTest.timer._runTest();
+}
+
+InspectorTest.mark = function(markerName)
+{
+    var timer = InspectorTest.timer;
+    if (!timer)
+        return;
+
+    if (InspectorTest.lastMarkCookie)
+        timer.finish(InspectorTest.lastMarkCookie);
+
+    InspectorTest.lastMarkCookie = markerName ? timer.start(markerName) : null;
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-29  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: UI performance test for network panel is incorrect. The time is including a timeout between scheduled refresh and actual refresh.
+        https://bugs.webkit.org/show_bug.cgi?id=69087
+
+        The fix has the changes for the test and minor perf framework improvements.
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/NetworkPanel.js:
+        (WebInspector.NetworkLogView.prototype._defaultRefreshDelay.500._scheduleRefresh):
+
 2011-09-29  Vsevolod Vlasov  <vsevik@chromium.org>
 

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

@@ -497 +497 @@
     },
 
+    _defaultRefreshDelay: 500,
+
     _scheduleRefresh: function()
     {
@@ -505 +507 @@
 
         if (this.visible && !("_refreshTimeout" in this))
-            this._refreshTimeout = setTimeout(this.refresh.bind(this), 500);
+            this._refreshTimeout = setTimeout(this.refresh.bind(this), this._defaultRefreshDelay);
     },