Changeset 71133 in webkit

Timestamp:

Nov 2, 2010 11:08:27 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2010-11-02 Pavel Feldman <​pfeldman@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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ImageView.js (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-02  Pavel Feldman  <pfeldman@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@apple.com>
 

trunk/WebCore/inspector/front-end/ImageView.js

@@ -48 +48 @@
         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");
@@ -70 +64 @@
         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);
     }
 }