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

Unified Diff: Source/core/dom/Text.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/Text.h ('k') | Source/core/dom/TreeScope.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Text.cpp
diff --git a/Source/core/dom/Text.cpp b/Source/core/dom/Text.cpp
index ae1e81e8ae3588fba11f64951df065b25c50dd42..d48c27e8cd5c3a82c78f874b84b63c0c2e0b9177 100644
--- a/Source/core/dom/Text.cpp
+++ b/Source/core/dom/Text.cpp
@@ -28,7 +28,7 @@
#include "core/css/resolver/StyleResolver.h"
#include "core/dom/ExceptionCode.h"
#include "core/dom/LayoutTreeBuilder.h"
-#include "core/dom/NodeLayoutStyle.h"
+#include "core/dom/NodeComputedStyle.h"
#include "core/dom/NodeRenderingTraversal.h"
#include "core/dom/NodeTraversal.h"
#include "core/dom/shadow/ShadowRoot.h"
@@ -289,7 +289,7 @@ static inline bool canHaveWhitespaceChildren(const LayoutObject& parent)
return true;
}
-bool Text::textRendererIsNeeded(const LayoutStyle& style, const LayoutObject& parent)
+bool Text::textRendererIsNeeded(const ComputedStyle& style, const LayoutObject& parent)
{
if (!parent.canHaveChildren())
return false;
@@ -350,7 +350,7 @@ static bool isSVGText(Text* text)
return parentOrShadowHostNode->isSVGElement() && !isSVGForeignObjectElement(*parentOrShadowHostNode);
}
-LayoutText* Text::createTextRenderer(const LayoutStyle& style)
+LayoutText* Text::createTextRenderer(const ComputedStyle& style)
{
if (isSVGText(this))
return new LayoutSVGInlineText(this, dataImpl());
@@ -418,7 +418,7 @@ void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling)
bool Text::needsWhitespaceRenderer()
{
ASSERT(!layoutObject());
- if (const LayoutStyle* style = parentLayoutStyle())
+ if (const ComputedStyle* style = parentComputedStyle())
return style->preserveNewline();
return false;
}
« no previous file with comments | « Source/core/dom/Text.h ('k') | Source/core/dom/TreeScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698