Index: Source/core/rendering/RenderBlock.cpp |
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp |
index cab494d0dbbff0b07350ca420edc7e75e7d5f256..e3715c715eefae0d52e890855f8f35cca4580a06 100644 |
--- a/Source/core/rendering/RenderBlock.cpp |
+++ b/Source/core/rendering/RenderBlock.cpp |
@@ -2914,12 +2914,9 @@ void RenderBlock::clearPercentHeightDescendantsFrom(RenderBox* parent) |
LayoutUnit RenderBlock::textIndentOffset() const |
{ |
LayoutUnit cw = 0; |
- RenderView* renderView = 0; |
if (style()->textIndent().isPercent()) |
cw = containingBlock()->availableLogicalWidth(); |
- else if (style()->textIndent().isViewportPercentage()) |
- renderView = view(); |
- return minimumValueForLength(style()->textIndent(), cw, renderView); |
+ return minimumValueForLength(style()->textIndent(), cw); |
} |
LayoutUnit RenderBlock::logicalLeftOffsetForContent(RenderRegion* region) const |
@@ -3122,7 +3119,7 @@ bool RenderBlock::nodeAtPoint(const HitTestRequest& request, HitTestResult& resu |
if (!isRenderView() && style()->hasBorderRadius()) { |
LayoutRect borderRect = borderBoxRect(); |
borderRect.moveBy(adjustedLocation); |
- RoundedRect border = style()->getRoundedBorderFor(borderRect, view()); |
+ RoundedRect border = style()->getRoundedBorderFor(borderRect); |
if (!locationInContainer.intersects(border)) |
return false; |
} |
@@ -4104,7 +4101,7 @@ void RenderBlock::computeInlinePreferredLogicalWidths(LayoutUnit& minLogicalWidt |
// Signals the text indent was more negative than the min preferred width |
bool hasRemainingNegativeTextIndent = false; |
- LayoutUnit textIndent = minimumValueForLength(styleToUse->textIndent(), cw, view()); |
+ LayoutUnit textIndent = minimumValueForLength(styleToUse->textIndent(), cw); |
RenderObject* prevFloat = 0; |
bool isPrevChildInlineFlow = false; |
bool shouldBreakLineAfterText = false; |
@@ -4508,11 +4505,11 @@ LayoutUnit RenderBlock::lineHeight(bool firstLine, LineDirectionMode direction, |
if (firstLine && document().styleEngine()->usesFirstLineRules()) { |
RenderStyle* s = style(firstLine); |
if (s != style()) |
- return s->computedLineHeight(view()); |
+ return s->computedLineHeight(); |
} |
if (m_lineHeight == -1) |
- m_lineHeight = style()->computedLineHeight(view()); |
+ m_lineHeight = style()->computedLineHeight(); |
return m_lineHeight; |
} |