| Index: sky/engine/core/frame/FrameView.cpp
|
| diff --git a/sky/engine/core/frame/FrameView.cpp b/sky/engine/core/frame/FrameView.cpp
|
| index 009149e53775b496db88f7cf8325ed3b4fcd6f37..3de631c26873175a15316b6212b401c9a959f7a8 100644
|
| --- a/sky/engine/core/frame/FrameView.cpp
|
| +++ b/sky/engine/core/frame/FrameView.cpp
|
| @@ -228,8 +228,6 @@ IntPoint FrameView::clampOffsetAtScale(const IntPoint& offset, float scale) cons
|
| IntPoint clampedOffset = offset;
|
| clampedOffset = clampedOffset.shrunkTo(
|
| IntPoint(size()) - expandedIntSize(scaledSize));
|
| - clampedOffset = clampedOffset.expandedTo(-scrollOrigin());
|
| -
|
| return clampedOffset;
|
| }
|
|
|
| @@ -745,24 +743,11 @@ void FrameView::removeViewportConstrainedObject(RenderObject* object)
|
| }
|
| }
|
|
|
| -LayoutRect FrameView::viewportConstrainedVisibleContentRect() const
|
| -{
|
| - LayoutRect viewportRect = visibleContentRect();
|
| - // Ignore overhang. No-op when not using rubber banding.
|
| - viewportRect.setLocation(clampScrollPosition(scrollPosition()));
|
| - return viewportRect;
|
| -}
|
| -
|
| void FrameView::viewportConstrainedVisibleContentSizeChanged(bool widthChanged, bool heightChanged)
|
| {
|
| // FIXME(sky): Remove
|
| }
|
|
|
| -IntSize FrameView::scrollOffsetForFixedPosition() const
|
| -{
|
| - return toIntSize(clampScrollPosition(scrollPosition()));
|
| -}
|
| -
|
| IntPoint FrameView::lastKnownMousePosition() const
|
| {
|
| return m_frame->eventHandler().lastKnownMousePosition();
|
| @@ -1304,14 +1289,6 @@ float FrameView::inputEventsScaleFactor() const
|
| return pageScale * m_inputEventsScaleFactorForEmulation;
|
| }
|
|
|
| -bool FrameView::scrollbarsCanBeActive() const
|
| -{
|
| - if (m_frame->view() != this)
|
| - return false;
|
| -
|
| - return !!m_frame->document();
|
| -}
|
| -
|
| IntRect FrameView::scrollableAreaBoundingBox() const
|
| {
|
| return frameRect();
|
| @@ -1323,25 +1300,6 @@ bool FrameView::isScrollable()
|
| return false;
|
| }
|
|
|
| -void FrameView::notifyPageThatContentAreaWillPaint() const
|
| -{
|
| - Page* page = m_frame->page();
|
| - if (!page)
|
| - return;
|
| -
|
| - if (!m_scrollableAreas)
|
| - return;
|
| -
|
| - for (HashSet<ScrollableArea*>::const_iterator it = m_scrollableAreas->begin(), end = m_scrollableAreas->end(); it != end; ++it) {
|
| - ScrollableArea* scrollableArea = *it;
|
| -
|
| - if (!scrollableArea->scrollbarsCanBeActive())
|
| - continue;
|
| -
|
| - scrollableArea->contentAreaWillPaint();
|
| - }
|
| -}
|
| -
|
| bool FrameView::scrollAnimatorEnabled() const
|
| {
|
| return m_frame->settings() && m_frame->settings()->scrollAnimatorEnabled();
|
| @@ -1475,12 +1433,6 @@ void FrameView::setNodeToDraw(Node* node)
|
| m_nodeToDraw = node;
|
| }
|
|
|
| -void FrameView::paintOverhangAreas(GraphicsContext* context, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect)
|
| -{
|
| - if (m_frame->page()->chrome().client().paintCustomOverhangArea(context, horizontalOverhangArea, verticalOverhangArea, dirtyRect))
|
| - return;
|
| -}
|
| -
|
| void FrameView::updateWidgetPositionsIfNeeded()
|
| {
|
| if (!m_needsUpdateWidgetPositions)
|
|
|