[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 0d845515bf1981d8ee90c1735a09f680157ae275
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 27 20:53:13 2003 +0000

    	Fix for 3396962, hang on quote.com.  Fieldsets with display:inline should be treated
    	like inline-blocks. This matches WinIE's behavior.
    
            Reviewed by mjs
    
            * khtml/rendering/render_form.cpp:
            (RenderFieldset::setStyle):
            * khtml/rendering/render_form.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4902 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d25c5e3..83f806c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-08-27  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3396962, hang on quote.com.  Fieldsets with display:inline should be treated
+	like inline-blocks. This matches WinIE's behavior.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_form.cpp:
+        (RenderFieldset::setStyle):
+        * khtml/rendering/render_form.h:
+
 2003-08-26  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d25c5e3..83f806c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-08-27  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3396962, hang on quote.com.  Fieldsets with display:inline should be treated
+	like inline-blocks. This matches WinIE's behavior.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_form.cpp:
+        (RenderFieldset::setStyle):
+        * khtml/rendering/render_form.h:
+
 2003-08-26  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/khtml/rendering/render_form.cpp b/WebCore/khtml/rendering/render_form.cpp
index eff71d6..d4cc6d0 100644
--- a/WebCore/khtml/rendering/render_form.cpp
+++ b/WebCore/khtml/rendering/render_form.cpp
@@ -725,6 +725,18 @@ void RenderFieldset::paintBorderMinusLegend(QPainter *p, int _tx, int _ty, int w
     }
 }
 
+void RenderFieldset::setStyle(RenderStyle* _style)
+{
+    RenderBlock::setStyle(_style);
+
+    // WinIE renders fieldsets with display:inline like they're inline-blocks.  For us,
+    // an inline-block is just a block element with replaced set to true and inline set
+    // to true.  Ensure that if we ended up being inline that we set our replaced flag
+    // so that we're treated like an inline-block.
+    if (isInline())
+        setReplaced(true);
+}
+
 // -------------------------------------------------------------------------
 
 RenderFileButton::RenderFileButton(HTMLInputElementImpl *element)
diff --git a/WebCore/khtml/rendering/render_form.h b/WebCore/khtml/rendering/render_form.h
index 3861a68..3b8a579 100644
--- a/WebCore/khtml/rendering/render_form.h
+++ b/WebCore/khtml/rendering/render_form.h
@@ -288,6 +288,8 @@ public:
     virtual const char *renderName() const { return "RenderFieldSet"; }
 
     virtual RenderObject* layoutLegend(bool relayoutChildren);
+
+    virtual void setStyle(RenderStyle* _style);
     
 protected:
     virtual void paintBoxDecorations(QPainter *p,int, int _y,

-- 
WebKit Debian packaging