| Index: Source/core/rendering/RenderInline.cpp
|
| diff --git a/Source/core/rendering/RenderInline.cpp b/Source/core/rendering/RenderInline.cpp
|
| index 750c3bb033ecff12e6555f3c483650bf73165a5d..e443c5153431b32130ef45bf9b58a08e009d7607 100644
|
| --- a/Source/core/rendering/RenderInline.cpp
|
| +++ b/Source/core/rendering/RenderInline.cpp
|
| @@ -696,8 +696,6 @@ static LayoutUnit computeMargin(const RenderInline* renderer, const Length& marg
|
| return margin.value();
|
| if (margin.isPercent())
|
| return minimumValueForLength(margin, max<LayoutUnit>(0, renderer->containingBlock()->availableLogicalWidth()));
|
| - if (margin.isViewportPercentage())
|
| - return valueForLength(margin, 0, renderer->view());
|
| return 0;
|
| }
|
|
|
| @@ -1290,10 +1288,10 @@ LayoutUnit RenderInline::lineHeight(bool firstLine, LineDirectionMode /*directio
|
| if (firstLine && document().styleEngine()->usesFirstLineRules()) {
|
| RenderStyle* s = style(firstLine);
|
| if (s != style())
|
| - return s->computedLineHeight(view());
|
| + return s->computedLineHeight();
|
| }
|
|
|
| - return style()->computedLineHeight(view());
|
| + return style()->computedLineHeight();
|
| }
|
|
|
| int RenderInline::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
|
|
|