[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 0b56082403cc3e6712116c6b8fa3f8e3832daf01
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 21 19:53:59 2009 +0000

    Fixes <https://bugs.webkit.org/show_bug.cgi?id=30616>.
    REGRESSION (r49036): Web Inspector: Summary graph no longer switching to size summary.
    
    Reviewed by Timothy Hatcher.
    
    Add a check to make sure a function we need to calculate percentages is
    defined before we use it.
    
    * inspector/front-end/ResourcesPanel.js:
    (WebInspector.ResourcesPanel.prototype._updateGraphDividersIfNeeded):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49919 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a97d6fe..46289a6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-21  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Fixes <https://bugs.webkit.org/show_bug.cgi?id=30616>.
+        REGRESSION (r49036): Web Inspector: Summary graph no longer switching to size summary.
+        
+        Add a check to make sure a function we need to calculate percentages is
+        defined before we use it.
+
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype._updateGraphDividersIfNeeded):
+
 2009-10-21  Keishi Hattori  <casey.hattori at gmail.com>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/inspector/front-end/ResourcesPanel.js b/WebCore/inspector/front-end/ResourcesPanel.js
index 0f873e7..05f2b51 100644
--- a/WebCore/inspector/front-end/ResourcesPanel.js
+++ b/WebCore/inspector/front-end/ResourcesPanel.js
@@ -765,10 +765,13 @@ WebInspector.ResourcesPanel.prototype = {
             this.dividersLabelBarElement.appendChild(divider);
         }
 
-        if (this.calculator.startAtZero) {
+        if (this.calculator.startAtZero || !this.calculator.computePercentageFromEventTime) {
             // If our current sorting method starts at zero, that means it shows all
             // resources starting at the same point, and so onLoad event and DOMContent
             // event lines really wouldn't make much sense here, so don't render them.
+            // Additionally, if the calculator doesn't have the computePercentageFromEventTime
+            // function defined, we are probably sorting by size, and event times aren't relevant
+            // in this case.
             return;
         }
 

-- 
WebKit Debian packaging