[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 429bcf2c2cf0be038064cf990eb66a99aca4d9c4
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 17 16:33:51 2011 +0000

    2011-01-17  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed: first timeline-network-resource flakiness.
    
            * inspector/timeline-network-resource.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75947 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e856a5a..ed9e7bf 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-17  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed: first timeline-network-resource flakiness.
+
+        * inspector/timeline-network-resource.html:
+
 2011-01-17  Pavel Podivilov  <podivilov at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/LayoutTests/inspector/timeline-network-resource.html b/LayoutTests/inspector/timeline-network-resource.html
index 7286fb6..6fc508f 100644
--- a/LayoutTests/inspector/timeline-network-resource.html
+++ b/LayoutTests/inspector/timeline-network-resource.html
@@ -16,6 +16,9 @@ function runAfterScriptIsEvaluated()
         else if (record.type === timelineAgentRecordType["ResourceFinish"])
             printFinish(record);
     });
+    evaluateInWebInspector("0", function(result) {
+        // Temporary noop to remove flake.
+    });
 }
 
 function printRecord(record)

-- 
WebKit Debian packaging