[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 ad22018e00ccd15c1299bf74d05fe2efbba19c1c
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 30 23:31:20 2003 +0000

    	Fixed Dave's fix to my fix to my fix:
    
            * khtml/html/html_imageimpl.cpp:
            (HTMLImageElementImpl::width): Put back m_render check, consider
    	the case of image with no width/height attributes and display:none
    	set. We don't want to crash on that.
            (HTMLImageElementImpl::height): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5330 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ab1f74a..07503fd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-10-30  Maciej Stachowiak  <mjs at apple.com>
+
+	Fixed Dave's fix to my fix to my fix:
+
+        * khtml/html/html_imageimpl.cpp:
+        (HTMLImageElementImpl::width): Put back m_render check, consider
+	the case of image with no width/height attributes and display:none
+	set. We don't want to crash on that.
+        (HTMLImageElementImpl::height): Ditto.
+
 2003-10-30  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt
diff --git a/WebCore/khtml/html/html_imageimpl.cpp b/WebCore/khtml/html/html_imageimpl.cpp
index 1f13a91..4f9350e 100644
--- a/WebCore/khtml/html/html_imageimpl.cpp
+++ b/WebCore/khtml/html/html_imageimpl.cpp
@@ -233,6 +233,10 @@ long HTMLImageElementImpl::width() const
 	docimpl->updateLayout();
     }
 
+    if (!m_render) {
+	return 0;
+    }
+
     return m_render->contentWidth();
 }
 
@@ -253,6 +257,10 @@ long HTMLImageElementImpl::height() const
 	docimpl->updateLayout();
     }
 
+    if (!m_render) {
+	return 0;
+    }
+
     return m_render->contentHeight();
 }
 

-- 
WebKit Debian packaging