[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 52fa1ca79d7848aca8972f2b67708ee35c52dbc9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 20 18:18:02 2003 +0000

    	Fix generated content (before/after) so that it no longer has any restrictions on it.   CSS2.1 lifted
    	restrictions preventing the floating/positioning of generated content.
    
            Reviewed by rjw
    
            * khtml/css/cssstyleselector.cpp:
            (khtml::CSSStyleSelector::adjustRenderStyle):
            * khtml/rendering/render_container.cpp:
            (RenderContainer::updatePseudoChild):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5228 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9a63d7e..212f911 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-10-20  David Hyatt  <hyatt at apple.com>
+
+	Fix generated content (before/after) so that it no longer has any restrictions on it.   CSS2.1 lifted 
+	restrictions preventing the floating/positioning of generated content.
+	
+        Reviewed by rjw
+
+        * khtml/css/cssstyleselector.cpp:
+        (khtml::CSSStyleSelector::adjustRenderStyle):
+        * khtml/rendering/render_container.cpp:
+        (RenderContainer::updatePseudoChild):
+
 2003-10-20  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by David
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9a63d7e..212f911 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-10-20  David Hyatt  <hyatt at apple.com>
+
+	Fix generated content (before/after) so that it no longer has any restrictions on it.   CSS2.1 lifted 
+	restrictions preventing the floating/positioning of generated content.
+	
+        Reviewed by rjw
+
+        * khtml/css/cssstyleselector.cpp:
+        (khtml::CSSStyleSelector::adjustRenderStyle):
+        * khtml/rendering/render_container.cpp:
+        (RenderContainer::updatePseudoChild):
+
 2003-10-20  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by David
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 8afbbd3..85e4819 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -488,12 +488,12 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, DOM::ElementImpl *e
     // Cache our original display.
     style->setOriginalDisplay(style->display());
 
-    if (style->display() != NONE && e) {
+    if (style->display() != NONE) {
         // If we have a <td> that specifies a float property, in quirks mode we just drop the float
         // property.
         // Sites also commonly use display:inline/block on <td>s and <table>s.  In quirks mode we force
         // these tags to retain their display types.
-        if (!strictParsing) {
+        if (!strictParsing && e) {
             if (e->id() == ID_TD) {
                 style->setDisplay(TABLE_CELL);
                 style->setFloating(FNONE);
@@ -506,12 +506,9 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, DOM::ElementImpl *e
         // position or float an inline, compact, or run-in.  Cache the original display, since it
         // may be needed for positioned elements that have to compute their static normal flow
         // positions.  We also force inline-level roots to be block-level.
-        // FIXME: For now we do not mutate pseudo styles.  This is because we do not yet support the
-        // ability to position and float generated content.  This is per the CSS 2 spec, but it's changing
-        // in CSS2.1.  For now, we will just support CSS2.
         if (style->display() != BLOCK && style->display() != TABLE && style->display() != BOX &&
             (style->position() == ABSOLUTE || style->position() == FIXED || style->floating() != FNONE ||
-             e->getDocument()->documentElement() == e)) {
+             (e && e->getDocument()->documentElement() == e))) {
             if (style->display() == INLINE_TABLE)
                 style->setDisplay(TABLE);
             else if (style->display() == INLINE_BOX)
diff --git a/WebCore/khtml/rendering/render_container.cpp b/WebCore/khtml/rendering/render_container.cpp
index 672c09b..8684ca9 100644
--- a/WebCore/khtml/rendering/render_container.cpp
+++ b/WebCore/khtml/rendering/render_container.cpp
@@ -249,18 +249,6 @@ void RenderContainer::updatePseudoChild(RenderStyle::PseudoId type, RenderObject
     // have no generated content and can now return.
     if (!newContentWanted)
         return;
-    
-    // From the CSS2 specification:
-    // User agents must ignore the following properties with :before and :after
-    // pseudo-elements: 'position', 'float', list properties, and table properties.
-    // Basically we need to ensure that no RenderLayer gets made for generated
-    // content.
-    pseudo->setOpacity(1.0f);
-    pseudo->setPosition(STATIC);
-    pseudo->setFloating(FNONE);
-    pseudo->setOverflow(OVISIBLE); // FIXME: Glazman's blog does this. Wacky.
-                                   // This property might need to be allowed if the
-                                   // generated content is a block.
 
     if (isInlineFlow() && pseudo->display() != INLINE)
         // According to the CSS2 spec (the end of section 12.1), the only allowed

-- 
WebKit Debian packaging