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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 42f42fcfc80856160a9fbd368872b1969f71b20e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 10 18:49:52 2003 +0000

            Reviewed by Chris.
    
            - fixed 3317693 -- REGRESSION: many web pages are rendering with wrong layout (columns in HelpViewer, etc.)
    
            This is a workaround for the code generation bug in gcc that causes this problem with
            gcc 3.3 in optimized builds. We can remove it once both we and B&I are using a newer
            gcc with the fix. The bug number for the gcc problem is 3321716.
    
            * khtml/rendering/render_box.cpp:
            (workAroundBug3321716): Added. A function that does nothing and takes an integer parameter.
            (RenderBox::setStyle): Add a couple of calls to workAroundBug3321716 in the right places.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4609 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index be68d54..94a7271 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-07-10  Darin Adler  <darin at apple.com>
+
+        Reviewed by Chris.
+
+        - fixed 3317693 -- REGRESSION: many web pages are rendering with wrong layout (columns in HelpViewer, etc.)
+
+        This is a workaround for the code generation bug in gcc that causes this problem with
+        gcc 3.3 in optimized builds. We can remove it once both we and B&I are using a newer
+        gcc with the fix. The bug number for the gcc problem is 3321716.
+
+        * khtml/rendering/render_box.cpp:
+        (workAroundBug3321716): Added. A function that does nothing and takes an integer parameter.
+        (RenderBox::setStyle): Add a couple of calls to workAroundBug3321716 in the right places.
+
 2003-07-09  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3141257.  Animate multiple copies of the same
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index be68d54..94a7271 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-07-10  Darin Adler  <darin at apple.com>
+
+        Reviewed by Chris.
+
+        - fixed 3317693 -- REGRESSION: many web pages are rendering with wrong layout (columns in HelpViewer, etc.)
+
+        This is a workaround for the code generation bug in gcc that causes this problem with
+        gcc 3.3 in optimized builds. We can remove it once both we and B&I are using a newer
+        gcc with the fix. The bug number for the gcc problem is 3321716.
+
+        * khtml/rendering/render_box.cpp:
+        (workAroundBug3321716): Added. A function that does nothing and takes an integer parameter.
+        (RenderBox::setStyle): Add a couple of calls to workAroundBug3321716 in the right places.
+
 2003-07-09  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3141257.  Animate multiple copies of the same
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 566f64a..d686d49 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -64,6 +64,11 @@ 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)
 {
     // Make sure the root element retains its display:block type even across style
@@ -92,10 +97,13 @@ void RenderBox::setStyle(RenderStyle *_style)
         break;
     default:
         setPositioned(false);
-        if(_style->isFloating())
+        if (_style->isFloating()) {
             setFloating(true);
-        else if(_style->position() == RELATIVE)
+            workAroundBug3321716(1);
+        } else if (_style->position() == RELATIVE) {
             setRelPositioned(true);
+            workAroundBug3321716(2);
+        }
     }
     
     if (requiresLayer()) {

-- 
WebKit Debian packaging