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

Unified Diff: Source/core/layout/LayoutTableSection.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/LayoutTableSection.h ('k') | Source/core/layout/LayoutText.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutTableSection.cpp
diff --git a/Source/core/layout/LayoutTableSection.cpp b/Source/core/layout/LayoutTableSection.cpp
index 47ae6e4ece176b4d001c175f581a5bad865a447b..13246df082465c7302f8b4d8f5f3b2f2f07a2f5e 100644
--- a/Source/core/layout/LayoutTableSection.cpp
+++ b/Source/core/layout/LayoutTableSection.cpp
@@ -98,7 +98,7 @@ LayoutTableSection::~LayoutTableSection()
{
}
-void LayoutTableSection::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)
+void LayoutTableSection::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)
{
LayoutBox::styleDidChange(diff, oldStyle);
propagateStyleToAnonymousChildren();
@@ -1149,7 +1149,7 @@ int LayoutTableSection::calcBlockDirectionOuterBorder(BlockBorderSide side) cons
const CellStruct& current = cellAt(side == BorderBefore ? 0 : m_grid.size() - 1, c);
if (current.inColSpan || !current.hasCells())
continue;
- const LayoutStyle& primaryCellStyle = current.primaryCell()->styleRef();
+ const ComputedStyle& primaryCellStyle = current.primaryCell()->styleRef();
const BorderValue& cb = side == BorderBefore ? primaryCellStyle.borderBefore() : primaryCellStyle.borderAfter(); // FIXME: Make this work with perpendicular and flipped cells.
// FIXME: Don't repeat for the same col group
LayoutTableCol* colGroup = table()->colElement(c);
@@ -1207,8 +1207,8 @@ int LayoutTableSection::calcInlineDirectionOuterBorder(InlineBorderSide side) co
if (!current.hasCells())
continue;
// FIXME: Don't repeat for the same cell
- const LayoutStyle& primaryCellStyle = current.primaryCell()->styleRef();
- const LayoutStyle& primaryCellParentStyle = current.primaryCell()->parent()->styleRef();
+ const ComputedStyle& primaryCellStyle = current.primaryCell()->styleRef();
+ const ComputedStyle& primaryCellParentStyle = current.primaryCell()->parent()->styleRef();
const BorderValue& cb = side == BorderStart ? primaryCellStyle.borderStart() : primaryCellStyle.borderEnd(); // FIXME: Make this work with perpendicular and flipped cells.
const BorderValue& rb = side == BorderStart ? primaryCellParentStyle.borderStart() : primaryCellParentStyle.borderEnd();
if (cb.style() == BHIDDEN || rb.style() == BHIDDEN)
@@ -1593,7 +1593,7 @@ CollapsedBorderValue& LayoutTableSection::cachedCollapsedBorder(const LayoutTabl
LayoutTableSection* LayoutTableSection::createAnonymousWithParentRenderer(const LayoutObject* parent)
{
- RefPtr<LayoutStyle> newStyle = LayoutStyle::createAnonymousStyleWithDisplay(parent->styleRef(), TABLE_ROW_GROUP);
+ RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWithDisplay(parent->styleRef(), TABLE_ROW_GROUP);
LayoutTableSection* newSection = new LayoutTableSection(0);
newSection->setDocumentForAnonymous(&parent->document());
newSection->setStyle(newStyle.release());
« no previous file with comments | « Source/core/layout/LayoutTableSection.h ('k') | Source/core/layout/LayoutText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698