[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 ece25b562260494ff4e5ebb53ed309dc437613e0
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 23 04:33:04 2002 +0000

    	Fix for 3107658, text doubling problem caused by layers being
    	constructed for <td>s.  Just disallow positioning of <td>.
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::setStyle):
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::setStyle):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2841 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 7f15a22..40fdf9c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-11-22  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3107658, text doubling problem caused by layers being
+	constructed for <td>s.  Just disallow positioning of <td>.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::setStyle):
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::setStyle):
+
+2002-11-22  David Hyatt  <hyatt at apple.com>
+
 	Oops. I meant to do that for <input type=button> and not
 	<button>.  Just do it for <select>s for now.
 	
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7f15a22..40fdf9c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-11-22  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3107658, text doubling problem caused by layers being
+	constructed for <td>s.  Just disallow positioning of <td>.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::setStyle):
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::setStyle):
+
+2002-11-22  David Hyatt  <hyatt at apple.com>
+
 	Oops. I meant to do that for <input type=button> and not
 	<button>.  Just do it for <select>s for now.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7f15a22..40fdf9c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2002-11-22  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3107658, text doubling problem caused by layers being
+	constructed for <td>s.  Just disallow positioning of <td>.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::setStyle):
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::setStyle):
+
+2002-11-22  David Hyatt  <hyatt at apple.com>
+
 	Oops. I meant to do that for <input type=button> and not
 	<button>.  Just do it for <select>s for now.
 	
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index e0a2b69..3967a8e 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -84,7 +84,7 @@ void RenderBox::setStyle(RenderStyle *_style)
             setRelPositioned(true);
     }
     
-    if ((isPositioned() || isRelPositioned()) && !m_layer)
+    if (!isTableCell() && (isPositioned() || isRelPositioned()) && !m_layer)
         m_layer = new (renderArena()) RenderLayer(this);
 }
 
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index d869852..497b846 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -72,7 +72,7 @@ void RenderFlow::setStyle(RenderStyle *_style)
     if(isPositioned())
         setInline(false);
     
-    if ((isPositioned() || isRelPositioned() || style()->overflow()==OHIDDEN) && !m_layer)
+    if (!isTableCell() && (isPositioned() || isRelPositioned() || style()->overflow()==OHIDDEN) && !m_layer)
         m_layer = new (renderArena()) RenderLayer(this);
     
     if(isFloating() || !style()->display() == INLINE)

-- 
WebKit Debian packaging