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

Unified Diff: Source/core/layout/LayoutRubyRun.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/layout/LayoutRubyRun.h ('k') | Source/core/layout/LayoutRubyText.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutRubyRun.cpp
diff --git a/Source/core/layout/LayoutRubyRun.cpp b/Source/core/layout/LayoutRubyRun.cpp
index ca45b49fa4d76d8a0419208f15c3586a76acdff4..42cb002da627673ea64ef2bb3089428ad6cf3d89 100644
--- a/Source/core/layout/LayoutRubyRun.cpp
+++ b/Source/core/layout/LayoutRubyRun.cpp
@@ -88,7 +88,7 @@ LayoutRubyBase* LayoutRubyRun::rubyBaseSafe()
return base;
}
-bool LayoutRubyRun::isChildAllowed(LayoutObject* child, const LayoutStyle&) const
+bool LayoutRubyRun::isChildAllowed(LayoutObject* child, const ComputedStyle&) const
{
return child->isRubyText() || child->isInline();
}
@@ -185,7 +185,7 @@ void LayoutRubyRun::removeChild(LayoutObject* child)
LayoutRubyBase* LayoutRubyRun::createRubyBase() const
{
LayoutRubyBase* layoutObject = LayoutRubyBase::createAnonymous(&document());
- RefPtr<LayoutStyle> newStyle = LayoutStyle::createAnonymousStyleWithDisplay(styleRef(), BLOCK);
+ RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWithDisplay(styleRef(), BLOCK);
newStyle->setTextAlign(CENTER); // FIXME: use WEBKIT_CENTER?
layoutObject->setStyle(newStyle.release());
return layoutObject;
@@ -196,7 +196,7 @@ LayoutRubyRun* LayoutRubyRun::staticCreateRubyRun(const LayoutObject* parentRuby
ASSERT(parentRuby && parentRuby->isRuby());
LayoutRubyRun* rr = new LayoutRubyRun();
rr->setDocumentForAnonymous(&parentRuby->document());
- RefPtr<LayoutStyle> newStyle = LayoutStyle::createAnonymousStyleWithDisplay(parentRuby->styleRef(), INLINE_BLOCK);
+ RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWithDisplay(parentRuby->styleRef(), INLINE_BLOCK);
rr->setStyle(newStyle.release());
return rr;
}
« no previous file with comments | « Source/core/layout/LayoutRubyRun.h ('k') | Source/core/layout/LayoutRubyText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698