Changeset 156742 in webkit

Timestamp:

Oct 1, 2013 3:47:49 PM (11 years ago)

Author:

joone.hur@intel.com

Message:

Quirksmode: CSS1: WebKit fails dynamic :first-letter test
​https://bugs.webkit.org/show_bug.cgi?id=15602

Reviewed by David Hyatt.

Source/WebCore:

CSS first-letter property does not work properly when the first letter is changed
by DOM scripting.
This patch allows to check if the existing first-letter is no longer the
first-letter. In this case, it deletes the old first-letter object and creates
a new one. For the remaining text, the oldRemainingText object is used
again for containing the full text(first letter + remaining text).

Test: fast/css/first-letter-block-change.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::updateFirstLetter):

LayoutTests:

Add a test case that ensures that CSS first-letter property should work
properly when the first letter is changed by DOM scripting.

• fast/css/first-letter-block-change.html: Added.
• platform/efl/TestExpectations:
• platform/gtk-wk1/fast/css/first-letter-block-change-expected.png: Added.
• platform/gtk-wk2/fast/css/first-letter-block-change-expected.png: Added.
• platform/gtk/fast/css/first-letter-block-change-expected.txt: Added.
• platform/mac/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/first-letter-block-change.html (added)
• LayoutTests/platform/efl/TestExpectations (modified) (1 diff)
• LayoutTests/platform/gtk-wk1/fast/css/first-letter-block-change-expected.png (added)
• LayoutTests/platform/gtk-wk2/fast/css (added)
• LayoutTests/platform/gtk-wk2/fast/css/first-letter-block-change-expected.png (added)
• LayoutTests/platform/gtk/fast/css/first-letter-block-change-expected.txt (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-10-01  Joone Hur  <joone.hur@intel.com>
+
+        Quirksmode: CSS1: WebKit fails dynamic :first-letter test
+        https://bugs.webkit.org/show_bug.cgi?id=15602
+
+        Reviewed by David Hyatt.
+
+        Add a test case that ensures that CSS first-letter property should work 
+        properly when the first letter is changed by DOM scripting.
+
+        * fast/css/first-letter-block-change.html: Added.
+        * platform/efl/TestExpectations:
+        * platform/gtk-wk1/fast/css/first-letter-block-change-expected.png: Added.
+        * platform/gtk-wk2/fast/css/first-letter-block-change-expected.png: Added.
+        * platform/gtk/fast/css/first-letter-block-change-expected.txt: Added.
+        * platform/mac/TestExpectations:
+
 2013-10-01  Brent Fulgham  <bfulgham@apple.com>
 

trunk/LayoutTests/platform/efl/TestExpectations

@@ -1656 +1656 @@
 webkit.org/b/119782 fast/forms/search-styled.html [ Failure ]
 
+# This test case needs to be rebaselined. 
+webkit.org/b/15602 fast/css/first-letter-block-change.html [ Failure ]

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1364 +1364 @@
 
 webkit.org/b/122042 media/media-controller-playback.html [ Pass Failure ]
+
+# This test case needs to be rebaselined. 
+webkit.org/b/15602 fast/css/first-letter-block-change.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-01  Joone Hur  <joone.hur@intel.com>
+
+        Quirksmode: CSS1: WebKit fails dynamic :first-letter test
+        https://bugs.webkit.org/show_bug.cgi?id=15602
+
+        Reviewed by David Hyatt.
+
+        CSS first-letter property does not work properly when the first letter is changed 
+        by DOM scripting. 
+        This patch allows to check if the existing first-letter is no longer the
+        first-letter. In this case, it deletes the old first-letter object and creates 
+        a new one. For the remaining text, the oldRemainingText object is used 
+        again for containing the full text(first letter + remaining text). 
+
+        Test: fast/css/first-letter-block-change.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::updateFirstLetter):
+
 2013-10-01  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -5955 +5955 @@
         return;
 
-    // FIXME: We need to destroy the first-letter object if it is no longer the first child. Need to find
-    // an efficient way to check for that situation though before implementing anything.
     RenderElement* firstLetterBlock = findFirstLetterBlock(this);
     if (!firstLetterBlock)
@@ -5988 +5986 @@
         return;
 
-    // If the child already has style, then it has already been created, so we just want
-    // to update it.
     if (descendant->parent()->style()->styleType() == FIRST_LETTER) {
+        // Destroy the first-letter object if it is no longer the first child.
+        RenderObject* remainingText = descendant->parent()->nextSibling();
+        if (remainingText && descendant->node() != remainingText->node()) {
+            if (!remainingText->isText() || remainingText->isBR())
+                return;
+
+            LayoutStateDisabler layoutStateDisabler(&view());
+
+            if (RenderObject* oldRemainingText = toRenderBoxModelObject(descendant->parent())->firstLetterRemainingText())
+                toRenderText(oldRemainingText)->setText(toText(oldRemainingText->node())->data().impl());
+
+            createFirstLetterRenderer(firstLetterBlock, toRenderText(remainingText));
+            return;
+        }    
+
+        // If the child already has style, then it has already been created, so we just want
+        // to update it.
         updateFirstLetterStyle(firstLetterBlock, descendant);
         return;