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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 2d63368529ee94dc9827f1d9a6a221dbb19decb3
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 23 23:09:50 2002 +0000

            * khtml/rendering/font.cpp:
    	Fix deployment build bustage by including <algorithm>.
    
            * khtml/rendering/render_frames.cpp:
            (RenderPartObject::calcReplacedWidth):
    	Fix a bug with http://www.moveabletype.com's top portion
    	not showing up (bug 2986714).  A hack was being improperly
    	applied to fixed width plugins, when it should have only
    	been applied to variable width plugins.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1640 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 5aa84b7..a9580c5 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-07-23  David Hyatt  <hyatt at apple.com>
+
+        * khtml/rendering/font.cpp:
+	Fix deployment build bustage by including <algorithm>.
+	
+        * khtml/rendering/render_frames.cpp:
+        (RenderPartObject::calcReplacedWidth):
+	Fix a bug with http://www.moveabletype.com's top portion
+	not showing up (bug 2986714).  A hack was being improperly
+	applied to fixed width plugins, when it should have only
+	been applied to variable width plugins.
+	
 2002-07-23  Darin Adler  <darin at apple.com>
 
         * Makefile.am: Clean based on all, not all-am, so it happens before subdirs
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5aa84b7..a9580c5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-07-23  David Hyatt  <hyatt at apple.com>
+
+        * khtml/rendering/font.cpp:
+	Fix deployment build bustage by including <algorithm>.
+	
+        * khtml/rendering/render_frames.cpp:
+        (RenderPartObject::calcReplacedWidth):
+	Fix a bug with http://www.moveabletype.com's top portion
+	not showing up (bug 2986714).  A hack was being improperly
+	applied to fixed width plugins, when it should have only
+	been applied to variable width plugins.
+	
 2002-07-23  Darin Adler  <darin at apple.com>
 
         * Makefile.am: Clean based on all, not all-am, so it happens before subdirs
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5aa84b7..a9580c5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-07-23  David Hyatt  <hyatt at apple.com>
+
+        * khtml/rendering/font.cpp:
+	Fix deployment build bustage by including <algorithm>.
+	
+        * khtml/rendering/render_frames.cpp:
+        (RenderPartObject::calcReplacedWidth):
+	Fix a bug with http://www.moveabletype.com's top portion
+	not showing up (bug 2986714).  A hack was being improperly
+	applied to fixed width plugins, when it should have only
+	been applied to variable width plugins.
+	
 2002-07-23  Darin Adler  <darin at apple.com>
 
         * Makefile.am: Clean based on all, not all-am, so it happens before subdirs
diff --git a/WebCore/khtml/rendering/font.cpp b/WebCore/khtml/rendering/font.cpp
index aa320fd..d0fafd5 100644
--- a/WebCore/khtml/rendering/font.cpp
+++ b/WebCore/khtml/rendering/font.cpp
@@ -33,6 +33,8 @@
 #include <qfontdatabase.h>
 #include <qpaintdevicemetrics.h>
 
+#include <algorithm>
+
 using namespace khtml;
 
 void Font::drawText( QPainter *p, int x, int y, QChar *str, int slen, int pos, int len,
diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index 122e4b5..160d80b 100644
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -846,11 +846,32 @@ void RenderPartObject::slotPartLoadingErrorNotify()
 short RenderPartObject::calcReplacedWidth(bool* ieHack) const
 {
     Length w = style()->width();
-    if (ieHack)
-        *ieHack = true;
-
-    if ( w.isVariable() )
+    
+    // Always setting ieHack is incorrect and causes the following example test case to break.
+    // <table width="100%" height="90">
+    // <tr>
+    //   <td width="200" style="border: 2px solid green">
+    //     <object width="200" height="90" style="border: 2px solid red">
+    //       <embed width="200" height="90" style="border: 2px solid blue"></embed>
+    //     </object>
+    //   </td>
+    //   <td width="100%" style="border: 2px solid blue"></td>
+    //   <td width="500" style="border: 2px solid green">
+    //     <object width="500" height="90" style="border: 2px solid red">
+    //       <embed width="500" height="90" style="border: 2px solid blue"></embed>
+    //     </object>
+    //   </td>
+    // </tr>
+    // </table>
+    //
+    // Real-world example is at: http://www.moveabletype.com/top.html
+    // I am commenting this out, since it causes all plugins to have a min width of 0
+    // all the time (unless they have a variable length).  This is clearly wrong. - dwh
+    if ( w.isVariable() ) {
+        if (ieHack) // Move it inside.  Only applies in the override case. -dwh
+            *ieHack = true;
         return intrinsicWidth();
+    }
     else
         return RenderReplaced::calcReplacedWidth();
 }

-- 
WebKit Debian packaging