Changeset 50809 in webkit

Timestamp:

Nov 11, 2009 9:05:30 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-11 Eric Z. Ayers <​zundel@google.com>

Reviewed by Timothy Hatcher.

Adds a test that dumps the timeline data for a simple script tag.

​https://bugs.webkit.org/show_bug.cgi?id=31204

• inspector/inspector-test.js: (onload):
• inspector/timeline-script-tag-1-expected.txt: Added.
• inspector/timeline-script-tag-1.html: Added.
• inspector/timeline-test.js: Added. (retrieveTimelineData): (): (dumpTimelineRecords): (printTimelineRecordProperties): (isNonDeterministicProp): (printProps): (isTimelineOverheadRecord): (markTimelineRecordAsOverhead): (timelineAgentTypeToString): (frontend_startTimelineProfiler.window.WebInspector.addRecordToTimeline): (frontend_startTimelineProfiler): (frontend_getTimelineResults): (frontend_setup):

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• inspector/inspector-test.js (modified) (3 diffs)
• inspector/timeline-script-tag-1-expected.txt (added)
• inspector/timeline-script-tag-1.html (added)
• inspector/timeline-test.js (added)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-11-11  Eric Z. Ayers  <zundel@google.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Adds a test that dumps the timeline data for a simple script tag.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31204
+
+        * inspector/inspector-test.js:
+        (onload):
+        * inspector/timeline-script-tag-1-expected.txt: Added.
+        * inspector/timeline-script-tag-1.html: Added.
+        * inspector/timeline-test.js: Added.
+        (retrieveTimelineData):
+        ():
+        (dumpTimelineRecords):
+        (printTimelineRecordProperties):
+        (isNonDeterministicProp):
+        (printProps):
+        (isTimelineOverheadRecord):
+        (markTimelineRecordAsOverhead):
+        (timelineAgentTypeToString):
+        (frontend_startTimelineProfiler.window.WebInspector.addRecordToTimeline):
+        (frontend_startTimelineProfiler):
+        (frontend_getTimelineResults):
+        (frontend_setup):
+
 2009-11-11  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/LayoutTests/inspector/inspector-test.js

@@ -11 +11 @@
 var ignoreLoad = window.location.href.indexOf("?reload") === -1;
 if (ignoreLoad) {
+    // Start in a timer, as synchronous opening of web inspector may fail on Windows
     setTimeout(function() {
         if (window.layoutTestController)
             layoutTestController.showWebInspector();
-        window.location.href += "?reload";
     }, 0);
 }
@@ -20 +20 @@
 function onload()
 {
-    if (ignoreLoad)
+    if (ignoreLoad) {
+        // Inject scripts into the frontend on the first pass.  Some other logic may want to
+        // use them before the reload.
+        var toInject = [];
+        for (var name in window) {
+            if (name.indexOf("frontend_") === 0 && typeof window[name] === "function")
+                toInject.push(window[name].toString());
+        }
+        // Invoke a setup method if it has been specified
+        if (window["frontend_setup"]) 
+            toInject.push("frontend_setup();");
+
+        evaluateInWebInspector(toInject.join("\n"), function(arg) {
+            window.location.href += "?reload";
+        });
         return;
+    }
 
     var outputElement = document.createElement("div");
@@ -27 +42 @@
     document.body.appendChild(outputElement);
 
-    var toInject = [];
-    for (var name in window) {
-        if (name.indexOf("frontend_") === 0 && typeof window[name] === "function")
-            toInject.push(window[name].toString());
-    }
-    evaluateInWebInspector(toInject.join("\n"), doit);
+    // Make sure web inspector has settled down before executing user code
+    evaluateInWebInspector("true", doit);
 
     // Make sure web inspector window is closed before the test is interrupted.