<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[51539] trunk/LayoutTests</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/51539">51539</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2009-12-01 08:19:23 -0800 (Tue, 01 Dec 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-12-01  Eric Z. Ayers  &lt;zundel@google.com&gt;

        Reviewed by Pavel Feldman.

        Adds test for Timeline network resource records.

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

        * inspector/timeline-network-resource-expected.txt: Added.
        * inspector/timeline-network-resource.html: Added.
        * inspector/timeline-network-resource.js: Added.
        * inspector/timeline-test.js:
        (printTimelineRecords):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinetestjs">trunk/LayoutTests/inspector/timeline-test.js</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectortimelinenetworkresourceexpectedtxt">trunk/LayoutTests/inspector/timeline-network-resource-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinenetworkresourcehtml">trunk/LayoutTests/inspector/timeline-network-resource.html</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinenetworkresourcejs">trunk/LayoutTests/inspector/timeline-network-resource.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (51538 => 51539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-12-01 16:17:42 UTC (rev 51538)
+++ trunk/LayoutTests/ChangeLog        2009-12-01 16:19:23 UTC (rev 51539)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2009-12-01  Eric Z. Ayers  &lt;zundel@google.com&gt;
+
+        Reviewed by Pavel Feldman.
+
+        Adds test for Timeline network resource records.

+        https://bugs.webkit.org/show_bug.cgi?id=31378
+
+        * inspector/timeline-network-resource-expected.txt: Added.
+        * inspector/timeline-network-resource.html: Added.
+        * inspector/timeline-network-resource.js: Added.
+        * inspector/timeline-test.js:
+        (printTimelineRecords):
+
</ins><span class="cx"> 2009-12-01  Chris Marrin  &lt;cmarrin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Adam Roben.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinenetworkresourceexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/timeline-network-resource-expected.txt (0 => 51539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline-network-resource-expected.txt                                (rev 0)
+++ trunk/LayoutTests/inspector/timeline-network-resource-expected.txt        2009-12-01 16:19:23 UTC (rev 51539)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+Tests the Timeline API instrumentation of a network resource load
+
+
+ResourceSendRequest Properties:
++ startTime : * DEFINED *
++ data : {
++- identifier : * DEFINED *
++- url : * DEFINED *
++- requestMethod : GET
++- isMainResource : false
++ }
++ type : 12
+
+ResourceReceiveResponse Properties:
++ startTime : * DEFINED *
++ data : {
++- identifier : * DEFINED *
++- statusCode : 0
++- mimeType : application/x-javascript
++- expectedContentLength : 210
++ }
++ type : 13
+
+ResourceFinish Properties:
++ startTime : * DEFINED *
++ data : {
++- identifier : * DEFINED *
++- didFail : false
++ }
++ type : 14
+Script resource loaded
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinenetworkresourcehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/timeline-network-resource.html (0 => 51539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline-network-resource.html                                (rev 0)
+++ trunk/LayoutTests/inspector/timeline-network-resource.html        2009-12-01 16:19:23 UTC (rev 51539)
</span><span class="lines">@@ -0,0 +1,84 @@
</span><ins>+&lt;html&gt;
+&lt;head&gt;
+&lt;script src=&quot;inspector-test.js&quot;&gt;&lt;/script&gt;
+&lt;script src=&quot;timeline-test.js&quot;&gt;&lt;/script&gt;
+&lt;script&gt;
+
+var scriptUrl = &quot;timeline-network-resource.js&quot;;
+
+function runAfterScriptIsEvaluated(continuation)
+{
+    function step()
+    {
+        if (!window.scriptEvaluated)
+            setTimeout(step, 100);
+        else
+            continuation();
+    }
+    setTimeout(step, 100);
+}
+
+function printRecord(record)
+{
+    output(&quot;&quot;);
+    printTimelineRecordProperties(record);
+}
+
+function printSend(record)
+{
+    printRecord(record);
+    window.resourceId = record.data.identifier;
+    if (record.data.url === undefined) 
+        output(&quot;* No 'url' property in record&quot;);
+    else if (record.data.url.indexOf(scriptUrl) === -1)
+        output(&quot;* Didn't find URL: &quot; + scriptUrl);
+}
+
+function printReceive(record)
+{
+    printRecord(record);
+    if (window.resourceId !== record.data.identifier)
+        output(&quot;Didn't find matching resourceId: &quot; + window.resourceId);
+    if (record.data.statusCode !== 0)
+        output(&quot;Response received status: &quot; + record.data.statusCode);
+}
+
+function printFinish(record)
+{
+    printRecord(record);
+    if (window.resourceId !== record.data.identifier)
+        output(&quot;Didn't find matching resourceId: &quot; + window.resourceId);
+    if (record.data.didFail)
+        output(&quot;Request failed.&quot;);
+}
+
+function doit() 
+{
+    if (window.layoutTestController)
+        layoutTestController.setTimelineProfilingEnabled(true);
+
+    var script = document.createElement(&quot;script&quot;);
+    script.src = scriptUrl;
+    document.body.appendChild(script);
+    runAfterScriptIsEvaluated(function() {
+        printTimelineRecords(null, null, function(record) {
+            if (record.type === timelineAgentRecordType[&quot;ResourceSendRequest&quot;])
+                printSend(record);
+     
+            else if (record.type === timelineAgentRecordType[&quot;ResourceReceiveResponse&quot;])
+                printReceive(record);
+            else if (record.type === timelineAgentRecordType[&quot;ResourceFinish&quot;])
+                printFinish(record);
+        });
+    });
+}
+
+&lt;/script&gt;
+&lt;/head&gt;
+
+&lt;body onload=&quot;onload()&quot;&gt;
+&lt;p&gt;
+Tests the Timeline API instrumentation of a network resource load
+&lt;/p&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinenetworkresourcejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/timeline-network-resource.js (0 => 51539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline-network-resource.js                                (rev 0)
+++ trunk/LayoutTests/inspector/timeline-network-resource.js        2009-12-01 16:19:23 UTC (rev 51539)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+// Sample script resource to find in timeline data
+
+var element = document.createElement(&quot;div&quot;);
+element.innerHTML = &quot;Script resource loaded&quot;;
+document.body.appendChild(element);
+window.scriptEvaluated = true;
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinetestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/timeline-test.js (51538 => 51539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline-test.js        2009-12-01 16:17:42 UTC (rev 51538)
+++ trunk/LayoutTests/inspector/timeline-test.js        2009-12-01 16:19:23 UTC (rev 51539)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">     children : 1,
</span><span class="cx">     endTime : 1, 
</span><span class="cx">     height : 1,
</span><ins>+    identifier : 1,
</ins><span class="cx">     startTime : 1,
</span><span class="cx">     width : 1,
</span><span class="cx">     url : 1
</span><span class="lines">@@ -27,10 +28,11 @@
</span><span class="cx">             output(&quot;Error fetching Timeline results: &quot; + timelineRecords);
</span><span class="cx">         else {
</span><span class="cx">             for (var i = 0; i &lt; timelineRecords.length; ++i) {
</span><del>-                if (typeName &amp;&amp; timelineRecords[i].type === timelineAgentRecordType[typeName])
-                    printTimelineRecordProperties(timelineRecords[i]);
</del><ins>+                var record = timelineRecords[i];
+                if (typeName &amp;&amp; record.type === timelineAgentRecordType[typeName])
+                    printTimelineRecordProperties(record);
</ins><span class="cx">                 if (formatter)
</span><del>-                    formatter(timelineRecords[i]);
</del><ins>+                    formatter(record);
</ins><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">         if (window.layoutTestController)
</span></span></pre>
</div>
</div>

</body>
</html>