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

Unified Diff: Source/core/rendering/RenderBlock.cpp

Issue 440233002: [CSS Grid Layout] Ignore ::first-letter pseudo-element (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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-grid-layout/grid-item-first-letter-valid-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlock.cpp
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
index 3236fff5313b2a16e790d163ebeb88e54ca2d988..a6266d15aa43d738a46eb72ff82cae208f8c99ca 100644
--- a/Source/core/rendering/RenderBlock.cpp
+++ b/Source/core/rendering/RenderBlock.cpp
@@ -3998,7 +3998,7 @@ static inline RenderObject* findFirstLetterBlock(RenderBlock* start)
// of flexbox.
bool canHaveFirstLetterRenderer = firstLetterBlock->style()->hasPseudoStyle(FIRST_LETTER)
&& firstLetterBlock->canHaveGeneratedChildren()
- && (!firstLetterBlock->isFlexibleBox() || firstLetterBlock->isRenderButton());
+ && (firstLetterBlock->isRenderBlockFlow() || firstLetterBlock->isRenderButton());
if (canHaveFirstLetterRenderer)
return firstLetterBlock;
@@ -4176,7 +4176,7 @@ void RenderBlock::updateFirstLetter()
break;
}
currChild = currChild->nextSibling();
- } else if (currChild->isReplaced() || currChild->isRenderButton() || currChild->isMenuList()) {
+ } else if (currChild->isReplaced() || currChild->isRenderButton() || currChild->isMenuList() || (!firstLetterBlock->isRenderBlockFlow() && !firstLetterBlock->isRenderButton())) {
Julien - ping for review 2014/08/07 20:55:57 This is repeated several now so we should put it i
Manuel Rego 2014/08/07 22:19:47 Done.
break;
} else if (currChild->style()->hasPseudoStyle(FIRST_LETTER) && currChild->canHaveGeneratedChildren()) {
// We found a lower-level node with first-letter, which supersedes the higher-level style
« no previous file with comments | « LayoutTests/fast/css-grid-layout/grid-item-first-letter-valid-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698