Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(305)

Unified Diff: Source/WebCore/rendering/RenderObjectChildList.cpp

Issue 8229001: Merge 97124 - Style not updated on text fragment in :first-letter nested in :before table. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/css-generated-content/first-letter-in-nested-before-table-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderObjectChildList.cpp
===================================================================
--- Source/WebCore/rendering/RenderObjectChildList.cpp (revision 97124)
+++ Source/WebCore/rendering/RenderObjectChildList.cpp (working copy)
@@ -446,6 +446,14 @@
ASSERT(genChild->isListMarker() || genChild->style()->styleType() == FIRST_LETTER);
}
}
+
+ // Update style on the remaining text fragment after the first-letter.
+ if (beforeAfterParent->style()->styleType() == FIRST_LETTER) {
+ if (RenderObject* nextSibling = beforeAfterParent->nextSibling()) {
+ if (nextSibling->isText() && nextSibling->style()->styleType() == child->style()->styleType())
+ nextSibling->setStyle(pseudoElementStyle);
+ }
+ }
}
return; // We've updated the generated content. That's all we needed to do.
}
« no previous file with comments | « LayoutTests/fast/css-generated-content/first-letter-in-nested-before-table-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698