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

Unified Diff: Source/core/dom/LayoutTreeBuilder.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/LayoutTreeBuilder.h ('k') | Source/core/dom/Node.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/LayoutTreeBuilder.cpp
diff --git a/Source/core/dom/LayoutTreeBuilder.cpp b/Source/core/dom/LayoutTreeBuilder.cpp
index 47499d7e35009afb728b9a9becf86717cb9e9f71..fcf1695c169f69bf9e7d78b10306f919928a922b 100644
--- a/Source/core/dom/LayoutTreeBuilder.cpp
+++ b/Source/core/dom/LayoutTreeBuilder.cpp
@@ -43,7 +43,7 @@
namespace blink {
-LayoutTreeBuilderForElement::LayoutTreeBuilderForElement(Element& element, LayoutStyle* style)
+LayoutTreeBuilderForElement::LayoutTreeBuilderForElement(Element& element, ComputedStyle* style)
: LayoutTreeBuilder(element, nullptr)
, m_style(style)
{
@@ -106,7 +106,7 @@ bool LayoutTreeBuilderForElement::shouldCreateLayoutObject() const
return m_node->layoutObjectIsNeeded(style());
}
-LayoutStyle& LayoutTreeBuilderForElement::style() const
+ComputedStyle& LayoutTreeBuilderForElement::style() const
{
if (!m_style)
m_style = m_node->styleForLayoutObject();
@@ -115,7 +115,7 @@ LayoutStyle& LayoutTreeBuilderForElement::style() const
void LayoutTreeBuilderForElement::createLayoutObject()
{
- LayoutStyle& style = this->style();
+ ComputedStyle& style = this->style();
LayoutObject* newLayoutObject = m_node->createLayoutObject(style);
if (!newLayoutObject)
@@ -149,7 +149,7 @@ void LayoutTreeBuilderForElement::createLayoutObject()
void LayoutTreeBuilderForText::createLayoutObject()
{
LayoutObject* parentLayoutObject = this->parentLayoutObject();
- LayoutStyle& style = parentLayoutObject->mutableStyleRef();
+ ComputedStyle& style = parentLayoutObject->mutableStyleRef();
ASSERT(m_node->textRendererIsNeeded(style, *parentLayoutObject));
« no previous file with comments | « Source/core/dom/LayoutTreeBuilder.h ('k') | Source/core/dom/Node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698