Title: [104220] branches/safari-534.54-branch
Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (104219 => 104220)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-05 22:30:50 UTC (rev 104219)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-05 22:30:58 UTC (rev 104220)
@@ -1,5 +1,19 @@
2011-1-5 Lucas Forschler <[email protected]>
+ Merge 96294
+
+ 2011-09-28 Dan Bernstein <[email protected]>
+
+ <rdar://problem/10196497> first-letter after list marker not updated correctly
+
+ Reviewed by Simon Fraser.
+
+ * fast/dynamic/first-letter-after-list-marker-expected.png: Added.
+ * fast/dynamic/first-letter-after-list-marker-expected.txt: Added.
+ * fast/dynamic/first-letter-after-list-marker.html: Added.
+
+2011-1-5 Lucas Forschler <[email protected]>
+
Merge 98344
2011-10-25 Justin Schuh <[email protected]>
Copied: branches/safari-534.54-branch/LayoutTests/fast/dynamic/first-letter-after-list-marker-expected.png (from rev 96294, trunk/LayoutTests/fast/dynamic/first-letter-after-list-marker-expected.png)
(Binary files differ)
Copied: branches/safari-534.54-branch/LayoutTests/fast/dynamic/first-letter-after-list-marker-expected.txt (from rev 96294, trunk/LayoutTests/fast/dynamic/first-letter-after-list-marker-expected.txt) (0 => 104220)
--- branches/safari-534.54-branch/LayoutTests/fast/dynamic/first-letter-after-list-marker-expected.txt (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/dynamic/first-letter-after-list-marker-expected.txt 2012-01-05 22:30:58 UTC (rev 104220)
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x492
+ RenderBlock {UL} at (0,0) size 784x100
+ RenderListItem {LI} at (40,0) size 744x100
+ RenderListMarker at (-61,0) size 29x100: bullet
+ RenderInline (generated) at (0,0) size 100x100 [color=#008000]
+ RenderText {#text} at (0,0) size 100x100
+ text run at (0,0) width 100: "a"
+ RenderText {#text} at (0,0) size 0x0
Copied: branches/safari-534.54-branch/LayoutTests/fast/dynamic/first-letter-after-list-marker.html (from rev 96294, trunk/LayoutTests/fast/dynamic/first-letter-after-list-marker.html) (0 => 104220)
--- branches/safari-534.54-branch/LayoutTests/fast/dynamic/first-letter-after-list-marker.html (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/dynamic/first-letter-after-list-marker.html 2012-01-05 22:30:58 UTC (rev 104220)
@@ -0,0 +1,11 @@
+<style>
+ li:first-letter { color: red; }
+ li.green:first-letter { color: green; }
+</style>
+<ul style="font-family: ahem; font-size: 100px; -webkit-font-smoothing: none;">
+ <li id="target">a</li>
+</ul>
+<script>
+ document.body.offsetTop;
+ document.getElementById("target").className = "green";
+</script>
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104219 => 104220)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-05 22:30:50 UTC (rev 104219)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-05 22:30:58 UTC (rev 104220)
@@ -1,5 +1,21 @@
2011-1-5 Lucas Forschler <[email protected]>
+ Merge 96294
+
+ 2011-09-28 Dan Bernstein <[email protected]>
+
+ <rdar://problem/10196497> first-letter after list marker not updated correctly
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/dynamic/first-letter-after-list-marker.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::updateFirstLetter): Improved the logic for continuing past list markers
+ when trying to locate a first letter to update.
+
+2011-1-5 Lucas Forschler <[email protected]>
+
Merge 98374
2011-10-25 Chris Evans <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/rendering/RenderBlock.cpp (104219 => 104220)
--- branches/safari-534.54-branch/Source/WebCore/rendering/RenderBlock.cpp 2012-01-05 22:30:50 UTC (rev 104219)
+++ branches/safari-534.54-branch/Source/WebCore/rendering/RenderBlock.cpp 2012-01-05 22:30:58 UTC (rev 104220)
@@ -5352,21 +5352,23 @@
// Drill into inlines looking for our first text child.
RenderObject* currChild = firstLetterBlock->firstChild();
- while (currChild && ((!currChild->isReplaced() && !currChild->isRenderButton() && !currChild->isMenuList()) || currChild->isFloatingOrPositioned()) && !currChild->isText()) {
- if (currChild->isFloatingOrPositioned()) {
+ while (currChild) {
+ if (currChild->isText())
+ break;
+ if (currChild->isListMarker())
+ currChild = currChild->nextSibling();
+ else if (currChild->isFloatingOrPositioned()) {
if (currChild->style()->styleType() == FIRST_LETTER) {
currChild = currChild->firstChild();
break;
- }
+ }
currChild = currChild->nextSibling();
- } else
+ } else if (currChild->isReplaced() || currChild->isRenderButton() || currChild->isMenuList())
+ break;
+ else
currChild = currChild->firstChild();
}
- // Get list markers out of the way.
- while (currChild && currChild->isListMarker())
- currChild = currChild->nextSibling();
-
if (!currChild)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
