[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 a32fb5134a656a3776ab53b6c74b24302464231d
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 12 22:33:25 2009 +0000

    Fixes <http://webkit.org/b/30315>.
    Web Inspector: DOM Content and Load lines in Resources are unclear what they mean.
    
    Reviewed by Timothy Hatcher.
    
    Add tooltip text to the Load event and DOM Content event lines through
    a new layer that allows these lines to be on top of the view.
    
    * inspector/front-end/ResourcesPanel.js:
    (WebInspector.ResourcesPanel.prototype._updateGraphDividersIfNeeded):
    (WebInspector.ResourcesPanel.prototype._updateDividersLabelBarPosition):
    * inspector/front-end/inspector.css:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49479 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 51c33ab..bd757ff 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-10-12  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Fixes <http://webkit.org/b/30315>.
+        Web Inspector: DOM Content and Load lines in Resources are unclear what they mean.
+        
+        Add tooltip text to the Load event and DOM Content event lines through
+        a new layer that allows these lines to be on top of the view.
+
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype._updateGraphDividersIfNeeded):
+        (WebInspector.ResourcesPanel.prototype._updateDividersLabelBarPosition):
+        * inspector/front-end/inspector.css:
+
 2009-10-12  Dimitri Glazkov  <dglazkov at chromium.org>
 
         No review, rolling out r49429, because it broke layout tests.
diff --git a/WebCore/inspector/front-end/ResourcesPanel.js b/WebCore/inspector/front-end/ResourcesPanel.js
index d4da3c8..0f873e7 100644
--- a/WebCore/inspector/front-end/ResourcesPanel.js
+++ b/WebCore/inspector/front-end/ResourcesPanel.js
@@ -71,6 +71,10 @@ WebInspector.ResourcesPanel = function()
     this.dividersElement = document.createElement("div");
     this.dividersElement.id = "resources-dividers";
     this.containerContentElement.appendChild(this.dividersElement);
+    
+    this.eventDividersElement = document.createElement("div");
+    this.eventDividersElement.id = "resources-event-dividers";
+    this.containerContentElement.appendChild(this.eventDividersElement);
 
     this.dividersLabelBarElement = document.createElement("div");
     this.dividersLabelBarElement.id = "resources-dividers-label-bar";
@@ -740,6 +744,7 @@ WebInspector.ResourcesPanel.prototype = {
         this._currentDividerSlice = slice;
 
         this.dividersElement.removeChildren();
+        this.eventDividersElement.removeChildren();
         this.dividersLabelBarElement.removeChildren();
 
         for (var i = 1; i <= dividerCount; ++i) {
@@ -769,20 +774,32 @@ WebInspector.ResourcesPanel.prototype = {
 
         if (this.mainResourceLoadTime !== -1) {
             var percent = this.calculator.computePercentageFromEventTime(this.mainResourceLoadTime);
+
             var loadDivider = document.createElement("div");
             loadDivider.className = "resources-onload-divider";
-            loadDivider.style.left = percent + "%";
-            loadDivider.title = WebInspector.UIString("Load event fired");
-            this.dividersElement.appendChild(loadDivider);
+
+            var loadDividerPadding = document.createElement("div");
+            loadDividerPadding.className = "resources-event-divider-padding";
+            loadDividerPadding.style.left = percent + "%";
+            loadDividerPadding.title = WebInspector.UIString("Load event fired");
+            loadDividerPadding.appendChild(loadDivider);
+            
+            this.eventDividersElement.appendChild(loadDividerPadding);
         }
         
         if (this.mainResourceDOMContentTime !== -1) {
             var percent = this.calculator.computePercentageFromEventTime(this.mainResourceDOMContentTime);
+
             var domContentDivider = document.createElement("div");
             domContentDivider.className = "resources-ondomcontent-divider";
-            domContentDivider.title = WebInspector.UIString("DOMContent event fired");
-            domContentDivider.style.left = percent + "%";
-            this.dividersElement.appendChild(domContentDivider);
+            
+            var domContentDividerPadding = document.createElement("div");
+            domContentDividerPadding.className = "resources-event-divider-padding";
+            domContentDividerPadding.style.left = percent + "%";
+            domContentDividerPadding.title = WebInspector.UIString("DOMContent event fired");
+            domContentDividerPadding.appendChild(domContentDivider);
+            
+            this.eventDividersElement.appendChild(domContentDividerPadding);
         }
     },
 
@@ -796,6 +813,7 @@ WebInspector.ResourcesPanel.prototype = {
         var scrollTop = this.containerElement.scrollTop;
         var dividersTop = (scrollTop < this.summaryBar.element.offsetHeight ? this.summaryBar.element.offsetHeight : scrollTop);
         this.dividersElement.style.top = scrollTop + "px";
+        this.eventDividersElement.style.top = scrollTop + "px";
         this.dividersLabelBarElement.style.top = dividersTop + "px";
     },
 
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index ffd5562..48cb960 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -2519,6 +2519,7 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
     -webkit-background-size: 1px 6px;
     -webkit-background-origin: padding;
     -webkit-background-clip: padding;
+    z-index: 400;
 }
 
 .summary-graph-legend {
@@ -2565,6 +2566,15 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
     z-index: -100;
 }
 
+#resources-event-dividers {
+    position: absolute;
+    left: 0;
+    right: 0;
+    height: 100%;
+    top: 0;
+    z-index: 300;
+}
+
 #resources-dividers-label-bar {
     position: absolute;
     top: 93px;
@@ -2585,6 +2595,13 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
     background-color: rgba(0, 0, 0, 0.1);
 }
 
+.resources-event-divider-padding {
+    position: absolute;
+    width: 8px;
+    top: 0;
+    bottom: 0;
+}
+
 .resources-onload-divider {
     position: absolute;
     width: 2px;

-- 
WebKit Debian packaging