[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit e28005645972c4e67043ad8c4772d80db7d5322d
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 30 22:51:43 2003 +0000

    	Fix mistake in my last change that I did not mean to commit.
    
            * khtml/html/html_imageimpl.cpp:
            (HTMLImageElementImpl::width): Remove extraneous second attempt to
    	lay out.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5326 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a6f8138..b582588 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2003-10-30  Maciej Stachowiak  <mjs at apple.com>
+
+	Fix mistake in my last change that I did not mean to commit.
+
+        * khtml/html/html_imageimpl.cpp:
+        (HTMLImageElementImpl::width): Remove extraneous second attempt to
+	lay out.
+
 2003-10-30  David Hyatt  <hyatt at apple.com>
 
 	Put paged-media changes back without the wrongful removal of the style data copy constructors (which
@@ -33,6 +41,9 @@
         * khtml/ecma/kjs_html.cpp:
         (KJS::HTMLElement::getValueProperty): Don't force layout for image
 	width/height if you can determine it statically from the attribute.
+        * khtml/html/html_image.cpp:
+        (HTMLImageElementImpl::width):
+        (HTMLImageElementImpl::height):
 
 === Safari-112 ===
 
diff --git a/WebCore/khtml/html/html_imageimpl.cpp b/WebCore/khtml/html/html_imageimpl.cpp
index c983c77..96b839b 100644
--- a/WebCore/khtml/html/html_imageimpl.cpp
+++ b/WebCore/khtml/html/html_imageimpl.cpp
@@ -237,14 +237,6 @@ long HTMLImageElementImpl::width() const
 	return 0;
     }
 
-
-    // ### make a unified call for this
-    if (changed() || m_render->needsLayout()) {
-        getDocument()->updateRendering();
-        if (getDocument()->view())
-            getDocument()->view()->layout();
-    }
-
     return m_render->contentWidth();
 }
 

-- 
WebKit Debian packaging