Title: [104221] branches/safari-534.54-branch
Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (104220 => 104221)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-05 22:30:58 UTC (rev 104220)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-05 22:33:51 UTC (rev 104221)
@@ -1,5 +1,21 @@
2011-1-5 Lucas Forschler <[email protected]>
+ Merge 98561
+
+ 2011-10-27 Ken Buchanan <[email protected]>
+
+ Crash due to nested first-letter selectors
+ https://bugs.webkit.org/show_bug.cgi?id=70457
+
+ Adding layout test for nested first-letter pseudostyles causing a crash.
+
+ Reviewed by David Hyatt.
+
+ * fast/css/nested-first-letter-with-float-crash.html: Added
+ * fast/css/nested-first-letter-with-float-crash-expected.txt: Added
+
+2011-1-5 Lucas Forschler <[email protected]>
+
Merge 96294
2011-09-28 Dan Bernstein <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104220 => 104221)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-05 22:30:58 UTC (rev 104220)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-05 22:33:51 UTC (rev 104221)
@@ -1,5 +1,25 @@
2011-1-5 Lucas Forschler <[email protected]>
+ Merge 98561
+
+ 2011-10-27 Ken Buchanan <[email protected]>
+
+ Crash due to nested first-letter selectors
+ https://bugs.webkit.org/show_bug.cgi?id=70457
+
+ Now only the lowest-level first-letter pseudostyle will be applied to
+ a given piece of text. Previously the last renderer to have layout
+ done would have its pseudostyle applied, no matter where it was in the
+ tree.
+
+ Reviewed by David Hyatt.
+
+ * renderer/RenderBlock.cpp:
+ (WebCore::RenderBlock::updateFirstLetter): Use the pseudostyle from
+ the lowest level node to have one
+
+2011-1-5 Lucas Forschler <[email protected]>
+
Merge 96294
2011-09-28 Dan Bernstein <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/rendering/RenderBlock.cpp (104220 => 104221)
--- branches/safari-534.54-branch/Source/WebCore/rendering/RenderBlock.cpp 2012-01-05 22:30:58 UTC (rev 104220)
+++ branches/safari-534.54-branch/Source/WebCore/rendering/RenderBlock.cpp 2012-01-05 22:33:51 UTC (rev 104221)
@@ -5365,6 +5365,11 @@
currChild = currChild->nextSibling();
} else if (currChild->isReplaced() || currChild->isRenderButton() || currChild->isMenuList())
break;
+ else if (currChild->style()->hasPseudoStyle(FIRST_LETTER) && currChild->canHaveChildren()) {
+ // We found a lower-level node with first-letter, which supersedes the higher-level style
+ firstLetterBlock = currChild;
+ currChild = currChild->firstChild();
+ }
else
currChild = currChild->firstChild();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
