[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 886a2a64109fc2af82981063dfca7cd02f4b2ff9
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 18:08:27 2010 +0000

    2010-11-02  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Image heights are displayed as 0.
            https://bugs.webkit.org/show_bug.cgi?id=40817
    
            * inspector/front-end/ImageView.js:
            (WebInspector.ImageView.prototype.contentTabSelected):
            (WebInspector.ImageView.prototype.contentTabSelected.onImageLoad):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71133 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index be522a7..673f486 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-02  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Image heights are displayed as 0.
+        https://bugs.webkit.org/show_bug.cgi?id=40817
+
+        * inspector/front-end/ImageView.js:
+        (WebInspector.ImageView.prototype.contentTabSelected):
+        (WebInspector.ImageView.prototype.contentTabSelected.onImageLoad):
+
 2010-11-02  Adele Peterson  <adele at apple.com>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/inspector/front-end/ImageView.js b/WebCore/inspector/front-end/ImageView.js
index 7cff056..130584f 100644
--- a/WebCore/inspector/front-end/ImageView.js
+++ b/WebCore/inspector/front-end/ImageView.js
@@ -47,15 +47,9 @@ WebInspector.ImageView.prototype = {
         this._container.className = "image";
         this.contentElement.appendChild(this._container);
 
-        this.imagePreviewElement = document.createElement("img");
-        this.imagePreviewElement.addStyleClass("resource-image-view");
-        this._container.appendChild(this.imagePreviewElement);
-
-        function onResourceContent(element, content)
-        {
-            this.imagePreviewElement.setAttribute("src", this.resource.contentURL);
-        }
-        this.resource.getContent(onResourceContent.bind(this));
+        var imagePreviewElement = document.createElement("img");
+        imagePreviewElement.addStyleClass("resource-image-view");
+        this._container.appendChild(imagePreviewElement);
 
         this._container = document.createElement("div");
         this._container.className = "info";
@@ -69,18 +63,33 @@ WebInspector.ImageView.prototype = {
         var infoListElement = document.createElement("dl");
         infoListElement.className = "infoList";
 
-        var imageProperties = [
-            { name: WebInspector.UIString("Dimensions"), value: WebInspector.UIString("%d × %d", this.imagePreviewElement.naturalWidth, this.imagePreviewElement.height) },
-            { name: WebInspector.UIString("File size"), value: Number.bytesToString(this.resource.resourceSize, WebInspector.UIString) },
-            { name: WebInspector.UIString("MIME type"), value: this.resource.mimeType }
-        ];
+        function onResourceContent(element, content)
+        {
+            imagePreviewElement.setAttribute("src", this.resource.contentURL);
+        }
+        this.resource.getContent(onResourceContent.bind(this));
 
-        var listHTML = '';
-        for (var i = 0; i < imageProperties.length; ++i)
-            listHTML += "<dt>" + imageProperties[i].name + "</dt><dd>" + imageProperties[i].value + "</dd>";
 
-        infoListElement.innerHTML = listHTML;
-        this._container.appendChild(infoListElement);
+        function onImageLoad()
+        {
+            var imageProperties = [
+                { name: WebInspector.UIString("Dimensions"), value: WebInspector.UIString("%d × %d", imagePreviewElement.naturalWidth, imagePreviewElement.height) },
+                { name: WebInspector.UIString("File size"), value: Number.bytesToString(this.resource.resourceSize, WebInspector.UIString) },
+                { name: WebInspector.UIString("MIME type"), value: this.resource.mimeType }
+            ];
+    
+            infoListElement.removeChildren();
+            for (var i = 0; i < imageProperties.length; ++i) {
+                var dt = document.createElement("dt");
+                dt.textContent = imageProperties[i].name;
+                infoListElement.appendChild(dt);
+                var dd = document.createElement("dd");
+                dd.textContent = imageProperties[i].value;
+                infoListElement.appendChild(dd);
+            }
+            this._container.appendChild(infoListElement);
+        }
+        imagePreviewElement.addEventListener("load", onImageLoad.bind(this), false);
     }
 }
 

-- 
WebKit Debian packaging