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

Unified Diff: Source/core/layout/LayoutObjectInlines.h

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/layout/LayoutObjectChildList.cpp ('k') | Source/core/layout/LayoutPagedFlowThread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutObjectInlines.h
diff --git a/Source/core/layout/LayoutObjectInlines.h b/Source/core/layout/LayoutObjectInlines.h
index 346fc03c4353a97360d528efffe0436f8e6f7295..56792aa73e5d66181605204da785c28ce9c7c209 100644
--- a/Source/core/layout/LayoutObjectInlines.h
+++ b/Source/core/layout/LayoutObjectInlines.h
@@ -15,26 +15,26 @@ namespace blink {
// to StyleEngine.h for all users of LayoutObject.h that don't use
// these methods.
-inline const LayoutStyle* LayoutObject::firstLineStyle() const
+inline const ComputedStyle* LayoutObject::firstLineStyle() const
{
return document().styleEngine().usesFirstLineRules() ? cachedFirstLineStyle() : style();
}
-inline const LayoutStyle& LayoutObject::firstLineStyleRef() const
+inline const ComputedStyle& LayoutObject::firstLineStyleRef() const
{
- const LayoutStyle* style = firstLineStyle();
+ const ComputedStyle* style = firstLineStyle();
ASSERT(style);
return *style;
}
-inline const LayoutStyle* LayoutObject::style(bool firstLine) const
+inline const ComputedStyle* LayoutObject::style(bool firstLine) const
{
return firstLine ? firstLineStyle() : style();
}
-inline const LayoutStyle& LayoutObject::styleRef(bool firstLine) const
+inline const ComputedStyle& LayoutObject::styleRef(bool firstLine) const
{
- const LayoutStyle* style = this->style(firstLine);
+ const ComputedStyle* style = this->style(firstLine);
ASSERT(style);
return *style;
}
« no previous file with comments | « Source/core/layout/LayoutObjectChildList.cpp ('k') | Source/core/layout/LayoutPagedFlowThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698