Changeset 56641 in webkit

Timestamp:

Mar 26, 2010 1:44:45 PM (14 years ago)

Author:

Joseph Pecoraro

Message:

2010-03-26 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Dave Hyatt.

Generated run-in Content is Mistakenly Getting Deleted
​https://bugs.webkit.org/show_bug.cgi?id=36505
<rdar://problem/7767161>

Test: fast/runin/generated2.html
Test: fast/runin/generated3.html
Test: fast/runin/generated4.html

Do not destroy :before/:after generated content with display run-in
when relaying out different nodes. Have their real owners correctly
handle them.

• rendering/RenderObjectChildList.cpp: (WebCore::RenderObjectChildList::updateBeforeAfterContent): simplified logic (WebCore::RenderObjectChildList::beforeAfterContainer): skip generated run-ins when checking children, check for them in grandchildren

2010-03-26 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Dave Hyatt.

Generated run-in Content is Mistakenly Getting Deleted
​https://bugs.webkit.org/show_bug.cgi?id=36505
<rdar://problem/7767161>

Test dynamic update of the inner block, containing the generated
run-in, but not owning it with the :before rule, and owners.

• fast/runin/generated2.html: Added.
• platform/mac/fast/runin/generated2-expected.txt: Added.

Test dynamic update of the outer block, this block owns the
generated run-in, but it is actually contained in a child block.

• fast/runin/generated3.html: Added.
• platform/mac/fast/runin/generated3-expected.txt: Added.

Test dynamic updates affecting generated run-ins both
in relation to and not in relation to list markers.

• fast/runin/generated4.html: Added.
• platform/mac/fast/runin/generated4-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/runin/generated2.html (added)
• LayoutTests/fast/runin/generated3.html (added)
• LayoutTests/fast/runin/generated4.html (added)
• LayoutTests/platform/mac/fast/runin/generated2-expected.txt (added)
• LayoutTests/platform/mac/fast/runin/generated3-expected.txt (added)
• LayoutTests/platform/mac/fast/runin/generated4-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderObjectChildList.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-26  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Dave Hyatt.
+
+        Generated run-in Content is Mistakenly Getting Deleted
+        https://bugs.webkit.org/show_bug.cgi?id=36505
+        <rdar://problem/7767161>
+
+          Test dynamic update of the inner block, containing the generated
+          run-in, but not owning it with the :before rule, and owners.
+
+        * fast/runin/generated2.html: Added.
+        * platform/mac/fast/runin/generated2-expected.txt: Added.
+
+          Test dynamic update of the outer block, this block owns the
+          generated run-in, but it is actually contained in a child block.
+
+        * fast/runin/generated3.html: Added.
+        * platform/mac/fast/runin/generated3-expected.txt: Added.
+
+          Test dynamic updates affecting generated run-ins both
+          in relation to and not in relation to list markers.
+
+        * fast/runin/generated4.html: Added.
+        * platform/mac/fast/runin/generated4-expected.txt: Added.
+
 2010-03-25  Ojan Vafai  <ojan@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-26  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Dave Hyatt.
+
+        Generated run-in Content is Mistakenly Getting Deleted
+        https://bugs.webkit.org/show_bug.cgi?id=36505
+        <rdar://problem/7767161>
+
+        Test: fast/runin/generated2.html
+        Test: fast/runin/generated3.html
+        Test: fast/runin/generated4.html
+
+        Do not destroy :before/:after generated content with display run-in
+        when relaying out different nodes. Have their real owners correctly
+        handle them.
+
+        * rendering/RenderObjectChildList.cpp:
+        (WebCore::RenderObjectChildList::updateBeforeAfterContent): simplified logic
+        (WebCore::RenderObjectChildList::beforeAfterContainer): skip generated run-ins when checking children, check for them in grandchildren
+
 2010-03-25  Ojan Vafai  <ojan@chromium.org>
 

trunk/WebCore/rendering/RenderObjectChildList.cpp

@@ -235 +235 @@
 {
     if (type == BEFORE) {
+        // An anonymous (generated) inline run-in that has PseudoId BEFORE must come from a grandparent.
+        // Therefore we should skip these generated run-ins when checking our immediate children.
+        // If we don't find our :before child immediately, then we should check if we own a
+        // generated inline run-in in the next level of children.
         RenderObject* first = container;
         do {
-            // Skip list markers.
+            // Skip list markers and generated run-ins
             first = first->firstChild();
+            while (first && (first->isListMarker() || (first->isRenderInline() && first->isRunIn() && first->isAnonymous())))
+                first = first->nextSibling();
+        } while (first && first->isAnonymous() && first->style()->styleType() == NOPSEUDO);
+
+        if (!first)
+            return 0;
+
+        if (first->style()->styleType() == type)
+            return first;
+
+        // Check for a possible generated run-in, using run-in positioning rules.
+        // Skip inlines and floating / positioned blocks, and place as the first child.
+        first = container->firstChild();
+        if (!first->isRenderBlock())
+            return 0;
+        while (first && first->isFloatingOrPositioned())
+            first = first->nextSibling();
+        if (first) {
+            first = first->firstChild();
+            // We still need to skip any list markers that could exist before the run-in.
             while (first && first->isListMarker())
                 first = first->nextSibling();
-        } while (first && first->isAnonymous() && first->style()->styleType() == NOPSEUDO);
-        if (first && first->style()->styleType() != type)
-            return 0;
-        return first;
-    }
+            if (first && first->style()->styleType() == type && first->isRenderInline() && first->isRunIn() && first->isAnonymous())
+                return first;
+        }
+        return 0;
+    }
+
     if (type == AFTER) {
         RenderObject* last = container;
@@ -315 +340 @@
     bool oldContentPresent = child;
 
-    // Whether or not we now want generated content.  
+    // Whether or not we now want generated content.
     bool newContentWanted = pseudoElementStyle && pseudoElementStyle->display() != NONE;
 
@@ -331 +356 @@
     // identical to the new content data we want to build render objects for, then we nuke all
     // of the old generated content.
-    if (!newContentWanted || (oldContentPresent && Node::diff(child->style(), pseudoElementStyle) == Node::Detach)) {
+    if (oldContentPresent && (!newContentWanted || Node::diff(child->style(), pseudoElementStyle) == Node::Detach)) {
         // Nuke the child. 
-        if (child && child->style()->styleType() == type) {
+        if (child->style()->styleType() == type) {
             oldContentPresent = false;
             child->destroy();