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

Unified Diff: Source/core/layout/shapes/ShapeOutsideInfo.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/shapes/ShapeOutsideInfo.h ('k') | Source/core/layout/style/AppliedTextDecoration.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/shapes/ShapeOutsideInfo.cpp
diff --git a/Source/core/layout/shapes/ShapeOutsideInfo.cpp b/Source/core/layout/shapes/ShapeOutsideInfo.cpp
index fb0cfaf501405dc27008db8d346776b9395cbfb0..7a110df8b54bcaac27aa3d9957b7f95ab8817f2a 100644
--- a/Source/core/layout/shapes/ShapeOutsideInfo.cpp
+++ b/Source/core/layout/shapes/ShapeOutsideInfo.cpp
@@ -148,9 +148,9 @@ const Shape& ShapeOutsideInfo::computedShape() const
TemporaryChange<bool> isInComputingShape(m_isComputingShape, true);
- const LayoutStyle& style = *m_renderer.style();
+ const ComputedStyle& style = *m_renderer.style();
ASSERT(m_renderer.containingBlock());
- const LayoutStyle& containingBlockStyle = *m_renderer.containingBlock()->style();
+ const ComputedStyle& containingBlockStyle = *m_renderer.containingBlock()->style();
WritingMode writingMode = containingBlockStyle.writingMode();
LayoutUnit maximumValue = m_renderer.containingBlock() ? m_renderer.containingBlock()->contentWidth() : LayoutUnit();
@@ -220,7 +220,7 @@ LayoutUnit ShapeOutsideInfo::logicalTopOffset() const
return LayoutUnit();
}
-inline LayoutUnit borderStartWithStyleForWritingMode(const LayoutBox& renderer, const LayoutStyle* style)
+inline LayoutUnit borderStartWithStyleForWritingMode(const LayoutBox& renderer, const ComputedStyle* style)
{
if (style->isHorizontalWritingMode()) {
if (style->isLeftToRightDirection())
@@ -234,7 +234,7 @@ inline LayoutUnit borderStartWithStyleForWritingMode(const LayoutBox& renderer,
return renderer.borderBottom();
}
-inline LayoutUnit borderAndPaddingStartWithStyleForWritingMode(const LayoutBox& renderer, const LayoutStyle* style)
+inline LayoutUnit borderAndPaddingStartWithStyleForWritingMode(const LayoutBox& renderer, const ComputedStyle* style)
{
if (style->isHorizontalWritingMode()) {
if (style->isLeftToRightDirection())
« no previous file with comments | « Source/core/layout/shapes/ShapeOutsideInfo.h ('k') | Source/core/layout/style/AppliedTextDecoration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698