Index: Source/core/layout/LayoutBlockFlowLine.cpp |
diff --git a/Source/core/layout/LayoutBlockFlowLine.cpp b/Source/core/layout/LayoutBlockFlowLine.cpp |
index aa2a79e52e7b21b4307c6c768efb511789fcbe49..dc6fda4bc843220f57ce27edb7d8d3103822c37e 100644 |
--- a/Source/core/layout/LayoutBlockFlowLine.cpp |
+++ b/Source/core/layout/LayoutBlockFlowLine.cpp |
@@ -107,7 +107,7 @@ InlineFlowBox* LayoutBlockFlow::createLineBoxes(LayoutObject* obj, const LineInf |
unsigned lineDepth = 1; |
InlineFlowBox* parentBox = 0; |
InlineFlowBox* result = 0; |
- bool hasDefaultLineBoxContain = style()->lineBoxContain() == LayoutStyle::initialLineBoxContain(); |
+ bool hasDefaultLineBoxContain = style()->lineBoxContain() == ComputedStyle::initialLineBoxContain(); |
do { |
ASSERT_WITH_SECURITY_IMPLICATION(obj->isLayoutInline() || obj == this); |
@@ -788,7 +788,7 @@ void LayoutBlockFlow::layoutRunsAndFloatsInRange(LineLayoutState& layoutState, |
InlineBidiResolver& resolver, const InlineIterator& cleanLineStart, |
const BidiStatus& cleanLineBidiStatus) |
{ |
- const LayoutStyle& styleToUse = styleRef(); |
+ const ComputedStyle& styleToUse = styleRef(); |
bool paginated = view()->layoutState() && view()->layoutState()->isPaginated(); |
LineMidpointState& lineMidpointState = resolver.midpointState(); |
InlineIterator endOfLine = resolver.position(); |
@@ -1156,7 +1156,7 @@ static LayoutUnit getBPMWidth(LayoutUnit childValue, Length cssUnit) |
static LayoutUnit getBorderPaddingMargin(const LayoutBoxModelObject& child, bool endOfInline) |
{ |
- const LayoutStyle& childStyle = child.styleRef(); |
+ const ComputedStyle& childStyle = child.styleRef(); |
if (endOfInline) { |
return getBPMWidth(child.marginEnd(), childStyle.marginEnd()) + |
getBPMWidth(child.paddingEnd(), childStyle.paddingEnd()) + |
@@ -1214,7 +1214,7 @@ void LayoutBlockFlow::computeInlinePreferredLogicalWidths(LayoutUnit& minLogical |
FloatWillBeLayoutUnit inlineMax; |
FloatWillBeLayoutUnit inlineMin; |
- const LayoutStyle& styleToUse = styleRef(); |
+ const ComputedStyle& styleToUse = styleRef(); |
LayoutBlock* containingBlock = this->containingBlock(); |
LayoutUnit cw = containingBlock ? containingBlock->contentLogicalWidth() : LayoutUnit(); |
@@ -1282,7 +1282,7 @@ void LayoutBlockFlow::computeInlinePreferredLogicalWidths(LayoutUnit& minLogical |
// values (if any of them are larger than our current min/max). We then look at |
// the width of the last non-breakable run and use that to start a new line |
// (unless we end in whitespace). |
- const LayoutStyle& childStyle = child->styleRef(); |
+ const ComputedStyle& childStyle = child->styleRef(); |
FloatWillBeLayoutUnit childMin; |
FloatWillBeLayoutUnit childMax; |