[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kov at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit a88b987248f026e6f923f486c992c720e6f1db61
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 3 18:53:45 2009 +0000

    Reviewed by Xan Lopez.
    
    Platform-specific result for test. GIO identifies the file as
    application/javascript, as opposed to other platforms identifying
    it as application/x-javascript.
    
    * platform/gtk/inspector/timeline-network-resource-expected.txt: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51643 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 253c671..4bef668 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,15 @@
 2009-12-03  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
+        Reviewed by Xan Lopez.
+
+        Platform-specific result for test. GIO identifies the file as
+        application/javascript, as opposed to other platforms identifying
+        it as application/x-javascript.
+
+        * platform/gtk/inspector/timeline-network-resource-expected.txt: Added.
+
+2009-12-03  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
         Rubber-stamped by Oliver Hunt.
 
         Re-baseline required after r51522.
diff --git a/LayoutTests/platform/gtk/inspector/timeline-network-resource-expected.txt b/LayoutTests/platform/gtk/inspector/timeline-network-resource-expected.txt
new file mode 100644
index 0000000..bdef8f1
--- /dev/null
+++ b/LayoutTests/platform/gtk/inspector/timeline-network-resource-expected.txt
@@ -0,0 +1,31 @@
+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/javascript
++- expectedContentLength : 210
++ }
++ type : 13
+
+ResourceFinish Properties:
++ startTime : * DEFINED *
++ data : {
++- identifier : * DEFINED *
++- didFail : false
++ }
++ type : 14
+Script resource loaded

-- 
WebKit Debian packaging