Index: sky/engine/core/rendering/RenderView.cpp |
diff --git a/sky/engine/core/rendering/RenderView.cpp b/sky/engine/core/rendering/RenderView.cpp |
index 3c4255d9b87394dc6e7071e303f7fcaef68a0e23..7e0b53483da5f48c2a459ec706e6ca570ab657a7 100644 |
--- a/sky/engine/core/rendering/RenderView.cpp |
+++ b/sky/engine/core/rendering/RenderView.cpp |
@@ -396,23 +396,23 @@ IntRect RenderView::documentRect() const |
return IntRect(overflowRect); |
} |
-int RenderView::viewHeight(IncludeScrollbarsInRect scrollbarInclusion) const |
+int RenderView::viewHeight() const |
{ |
if (m_frameView) |
- return m_frameView->layoutSize(scrollbarInclusion).height(); |
+ return m_frameView->layoutSize().height(); |
return 0; |
} |
-int RenderView::viewWidth(IncludeScrollbarsInRect scrollbarInclusion) const |
+int RenderView::viewWidth() const |
{ |
if (m_frameView) |
- return m_frameView->layoutSize(scrollbarInclusion).width(); |
+ return m_frameView->layoutSize().width(); |
return 0; |
} |
int RenderView::viewLogicalHeight() const |
{ |
- return viewHeight(ExcludeScrollbars); |
+ return viewHeight(); |
} |
LayoutUnit RenderView::viewLogicalHeightForPercentages() const |
@@ -430,11 +430,7 @@ void RenderView::updateHitTestResult(HitTestResult& result, const LayoutPoint& p |
result.setInnerNode(node); |
if (!result.innerNonSharedNode()) |
result.setInnerNonSharedNode(node); |
- |
- LayoutPoint adjustedPoint = point; |
- offsetForContents(adjustedPoint); |
- |
- result.setLocalPoint(adjustedPoint); |
+ result.setLocalPoint(point); |
} |
} |
@@ -452,13 +448,13 @@ void RenderView::popLayoutState() |
// FIXME(sky): remove |
double RenderView::layoutViewportWidth() const |
{ |
- return viewWidth(IncludeScrollbars); |
+ return viewWidth(); |
} |
// FIXME(sky): remove |
double RenderView::layoutViewportHeight() const |
{ |
- return viewHeight(IncludeScrollbars); |
+ return viewHeight(); |
} |
void RenderView::addIFrame(RenderIFrame* iframe) |