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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 9 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 | « Source/core/dom/FirstLetterPseudoElement.h ('k') | Source/core/dom/Fullscreen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/FirstLetterPseudoElement.cpp
diff --git a/Source/core/dom/FirstLetterPseudoElement.cpp b/Source/core/dom/FirstLetterPseudoElement.cpp
index 3046053078f3185acf9b743950e53603075f6835..c1b7d039b8c2ca2a0ddfce654c8bd48d7b89b492 100644
--- a/Source/core/dom/FirstLetterPseudoElement.cpp
+++ b/Source/core/dom/FirstLetterPseudoElement.cpp
@@ -224,7 +224,7 @@ void FirstLetterPseudoElement::detach(const AttachContext& context)
PseudoElement::detach(context);
}
-LayoutStyle* FirstLetterPseudoElement::styleForFirstLetter(LayoutObject* rendererContainer)
+ComputedStyle* FirstLetterPseudoElement::styleForFirstLetter(LayoutObject* rendererContainer)
{
ASSERT(rendererContainer);
@@ -236,7 +236,7 @@ LayoutStyle* FirstLetterPseudoElement::styleForFirstLetter(LayoutObject* rendere
// into account.
styleContainer->style()->removeCachedPseudoStyle(FIRST_LETTER);
- LayoutStyle* pseudoStyle = styleContainer->getCachedPseudoStyle(FIRST_LETTER, rendererContainer->firstLineStyle());
+ ComputedStyle* pseudoStyle = styleContainer->getCachedPseudoStyle(FIRST_LETTER, rendererContainer->firstLineStyle());
ASSERT(pseudoStyle);
return pseudoStyle;
@@ -254,7 +254,7 @@ void FirstLetterPseudoElement::attachFirstLetterTextRenderers()
String oldText = toLayoutText(nextRenderer)->isTextFragment() ? toLayoutTextFragment(nextRenderer)->completeText() : toLayoutText(nextRenderer)->originalText();
ASSERT(oldText.impl());
- LayoutStyle* pseudoStyle = styleForFirstLetter(nextRenderer->parent());
+ ComputedStyle* pseudoStyle = styleForFirstLetter(nextRenderer->parent());
layoutObject()->setStyle(pseudoStyle);
// FIXME: This would already have been calculated in firstLetterRenderer. Can we pass the length through?
@@ -297,7 +297,7 @@ void FirstLetterPseudoElement::didRecalcStyle(StyleRecalcChange)
// We need to re-calculate the correct style for the first letter element
// and then apply that to the container and the text fragment inside.
if (child->style()->styleType() == FIRST_LETTER && m_remainingTextRenderer) {
- if (LayoutStyle* pseudoStyle = styleForFirstLetter(m_remainingTextRenderer->parent()))
+ if (ComputedStyle* pseudoStyle = styleForFirstLetter(m_remainingTextRenderer->parent()))
child->setPseudoStyle(pseudoStyle);
continue;
}
« no previous file with comments | « Source/core/dom/FirstLetterPseudoElement.h ('k') | Source/core/dom/Fullscreen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698