[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit cf1a29095e30d6b257b14bd876ae26da8b46820c
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 26 14:54:33 2010 +0000

    2010-11-26  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed. Fixing inspector tests.
    
            * inspector/front-end/Resource.js:
            (WebInspector.Resource.prototype.set timing):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72759 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d1fbc79..da2ea4d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-26  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed. Fixing inspector tests.
+
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource.prototype.set timing):
+
 2010-11-25  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/inspector/front-end/Resource.js b/WebCore/inspector/front-end/Resource.js
index 4217cd6..9da7f82 100644
--- a/WebCore/inspector/front-end/Resource.js
+++ b/WebCore/inspector/front-end/Resource.js
@@ -296,7 +296,7 @@ WebInspector.Resource.prototype = {
 
     set timing(x)
     {
-        if (!this._cached) {
+        if (x && !this._cached) {
             // Take startTime and responseReceivedTime from timing data for better accuracy.
             // Timing's requestTime is a baseline in seconds, rest of the numbers there are ticks in millis.
             this._startTime = x.requestTime;

-- 
WebKit Debian packaging