[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 57107fbf8f571783f2d47d71386a410c6fdbc64b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 21 18:52:06 2003 +0000

    	Fix for 3387302, floats weren't being allowed to be relatively positioned.  The
    	fix is trivial.  Stop making floating/relpositiion setting an if/else and just make
    	it two ifs.
    
            Reviewed by darin
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::setStyle):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4869 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 57cb0a6..b2a9bd8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-08-21  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3387302, floats weren't being allowed to be relatively positioned.  The
+	fix is trivial.  Stop making floating/relpositiion setting an if/else and just make
+	it two ifs.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::setStyle):
+
+2003-08-21  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3384635, breakable unicode characters that were preceded by multiple spaces
 	accidentally added in those spaces to their widths.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 57cb0a6..b2a9bd8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-08-21  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3387302, floats weren't being allowed to be relatively positioned.  The
+	fix is trivial.  Stop making floating/relpositiion setting an if/else and just make
+	it two ifs.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::setStyle):
+
+2003-08-21  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3384635, breakable unicode characters that were preceded by multiple spaces
 	accidentally added in those spaces to their widths.
 	
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index b72f5e5..4c2bc5b 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -64,11 +64,6 @@ RenderBox::RenderBox(DOM::NodeImpl* node)
     m_layer = 0;
 }
 
-// FIXME: Remove this workaround for gcc bug (Radar 3321716) once it's fixed.
-static void workAroundBug3321716(int)
-{
-}
-
 void RenderBox::setStyle(RenderStyle *_style)
 {
     RenderObject::setStyle(_style);
@@ -87,13 +82,12 @@ void RenderBox::setStyle(RenderStyle *_style)
         break;
     default:
         setPositioned(false);
-        if (_style->isFloating()) {
+
+        if (_style->isFloating())
             setFloating(true);
-            workAroundBug3321716(1);
-        } else if (_style->position() == RELATIVE) {
+
+        if (_style->position() == RELATIVE)
             setRelPositioned(true);
-            workAroundBug3321716(2);
-        }
     }
 
     // Frames and framesets never honor position:relative or position:absolute.  This is necessary to

-- 
WebKit Debian packaging