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

Unified Diff: trunk/Source/core/dom/FirstLetterPseudoElement.cpp

Issue 948053002: Revert 190605 "Make RenderObject::style() return a const object" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 5 years, 10 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 | « trunk/Source/core/dom/Element.cpp ('k') | trunk/Source/core/dom/Node.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/Source/core/dom/FirstLetterPseudoElement.cpp
===================================================================
--- trunk/Source/core/dom/FirstLetterPseudoElement.cpp (revision 190671)
+++ trunk/Source/core/dom/FirstLetterPseudoElement.cpp (working copy)
@@ -234,7 +234,7 @@
// We always force the pseudo style to recompute as the first-letter style
// computed by the style container may not have taken the renderers styles
// into account.
- styleContainer->mutableStyleRef().removeCachedPseudoStyle(FIRST_LETTER);
+ styleContainer->style()->removeCachedPseudoStyle(FIRST_LETTER);
LayoutStyle* pseudoStyle = styleContainer->getCachedPseudoStyle(FIRST_LETTER, rendererContainer->firstLineStyle());
ASSERT(pseudoStyle);
@@ -266,7 +266,7 @@
new RenderTextFragment(nextRenderer->node() ? nextRenderer->node() : &nextRenderer->document(), oldText.impl(), length, oldText.length() - length);
remainingText->setFirstLetterPseudoElement(this);
remainingText->setIsRemainingTextRenderer(true);
- remainingText->setStyle(nextRenderer->mutableStyle());
+ remainingText->setStyle(nextRenderer->style());
if (remainingText->node())
remainingText->node()->setRenderer(remainingText);
@@ -306,7 +306,7 @@
if (!child->isText() && !child->isQuote() && !child->isImage())
continue;
- child->setPseudoStyle(renderer->mutableStyle());
+ child->setPseudoStyle(renderer->style());
}
}
« no previous file with comments | « trunk/Source/core/dom/Element.cpp ('k') | trunk/Source/core/dom/Node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698