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

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

Issue 311633002: Pull up LayoutStateDisabler in updateFirstLetterStyle (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rename to layoutStateDisabler Created 6 years, 7 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/first-letter-stylechange-isnt-reattach-assert-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 a95ad9ee2a5fb8d4cc81f71a43687feab0881aa4..56a5131759dc392ccf488e33aaa645ef7efaa9c5 100644
--- a/Source/core/rendering/RenderBlock.cpp
+++ b/Source/core/rendering/RenderBlock.cpp
@@ -3986,6 +3986,8 @@ void RenderBlock::updateFirstLetterStyle(RenderObject* firstLetterBlock, RenderO
RenderStyle* pseudoStyle = styleForFirstLetter(firstLetterBlock, firstLetterContainer);
ASSERT(firstLetter->isFloating() || firstLetter->isInline());
+ LayoutStateDisabler layoutStateDisabler(*this);
+
if (RenderStyle::stylePropagationDiff(firstLetter->style(), pseudoStyle) == Reattach) {
// The first-letter renderer needs to be replaced. Create a new renderer of the right type.
RenderBoxModelObject* newFirstLetter;
@@ -3996,7 +3998,6 @@ void RenderBlock::updateFirstLetterStyle(RenderObject* firstLetterBlock, RenderO
newFirstLetter->setStyle(pseudoStyle);
// Move the first letter into the new renderer.
- LayoutStateDisabler layoutStateDisabler(*this);
while (RenderObject* child = firstLetter->slowFirstChild()) {
if (child->isText())
toRenderText(child)->removeAndDestroyTextBoxes();
« no previous file with comments | « LayoutTests/fast/css/first-letter-stylechange-isnt-reattach-assert-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698