[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 158e2591851fcaaca54129f7d8ff57e82448ea0c
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 23 21:52:41 2003 +0000

    	Fix for 3142124.
    
    	When pseudo-elements have display:none, they should not generate
    	rendering objects.
    
            Reviewed by darin.
    
            * khtml/rendering/render_container.cpp:
            (RenderContainer::insertPseudoChild):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3429 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b02bc34..71f4a8e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-01-23  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3142124.  
+
+	When pseudo-elements have display:none, they should not generate
+	rendering objects.
+	
+        Reviewed by darin.
+
+        * khtml/rendering/render_container.cpp:
+        (RenderContainer::insertPseudoChild):
+
 2003-01-23  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b02bc34..71f4a8e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-01-23  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3142124.  
+
+	When pseudo-elements have display:none, they should not generate
+	rendering objects.
+	
+        Reviewed by darin.
+
+        * khtml/rendering/render_container.cpp:
+        (RenderContainer::insertPseudoChild):
+
 2003-01-23  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/khtml/rendering/render_container.cpp b/WebCore/khtml/rendering/render_container.cpp
index a254787..8070d3e 100644
--- a/WebCore/khtml/rendering/render_container.cpp
+++ b/WebCore/khtml/rendering/render_container.cpp
@@ -212,7 +212,7 @@ void RenderContainer::insertPseudoChild(RenderStyle::PseudoId type, RenderObject
 
     RenderStyle* pseudo = child->style()->getPseudoStyle(type);
 
-    if (pseudo)
+    if (pseudo && pseudo->display() != NONE)
     {
         if (pseudo->contentType()==CONTENT_TEXT)
         {

-- 
WebKit Debian packaging