Change written by Hyatt, reviewed by me.

        - fixed <rdar://problem/3952698> Function buttons do not display properly with Telia Webmail

        * khtml/rendering/render_replaced.cpp: (RenderReplaced::calcMinMaxWidth):
        Only use a minWidth of 0 for images with a percentage value. Other replaced elements aren't scalable
        so their minWidth should be their calculated width. This has been wrong all along, but it's a relatively
        safe change because it only affects replaced elements' min-width.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8830 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 41f644775c27670e8a51f6f6c7ea07b53dc96e42..72f8fc31dde52eea574b09895d03eb3ce2e0d17f 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2005-03-08  Darin Adler  <darin@apple.com>
+
+        Change written by Hyatt, reviewed by me.
+
+        - fixed <rdar://problem/3952698> Function buttons do not display properly with Telia Webmail
+
+        * khtml/rendering/render_replaced.cpp: (RenderReplaced::calcMinMaxWidth):
+        Only use a minWidth of 0 for images with a percentage value. Other replaced elements aren't scalable
+        so their minWidth should be their calculated width. This has been wrong all along, but it's a relatively
+        safe change because it only affects replaced elements' min-width.
+
 2005-03-08  David Harrison  <harrison@apple.com>
 
         Reviewed by Ken.

diff --git a/WebCore/khtml/rendering/render_replaced.cpp b/WebCore/khtml/rendering/render_replaced.cpp
index c7c7723f1a3ccedb01c3bffa011e3ac80fba6ccd..93d876aa87a98e3f9ff5292ad7eca4fe39cdc426 100644 (file)
--- a/WebCore/khtml/rendering/render_replaced.cpp
+++ b/WebCore/khtml/rendering/render_replaced.cpp
@@ -98,12 +98,12 @@ void RenderReplaced::calcMinMaxWidth()
 #endif
 
     int width = calcReplacedWidth() + paddingLeft() + paddingRight() + borderLeft() + borderRight();
-    if (style()->width().isPercent() || (style()->width().isVariable() && style()->height().isPercent())) {
+    // FIXME: If this is image-specific, then why not move it down into RenderImage?
+    if (isImage() && style()->width().isPercent())
         m_minWidth = 0;
-        m_maxWidth = width;
-    }
     else
-        m_minWidth = m_maxWidth = width;
+        m_minWidth = width;
+    m_maxWidth = width;
 
     setMinMaxKnown();
 }