diff --git a/engine/core/dom/Touch.cpp b/engine/core/dom/Touch.cpp index fcf244862bc8b64831f94b7b482110454a21df7a..fe05912db85612d7417e909fb31bc7c02ae6ff5b 100644 --- a/engine/core/dom/Touch.cpp +++ b/engine/core/dom/Touch.cpp @@ -33,21 +33,10 @@ namespace blink { -static FloatPoint contentsOffset(LocalFrame* frame) -{ - if (!frame) - return FloatPoint(); - FrameView* frameView = frame->view(); - if (!frameView) - return FloatPoint(); - float scale = 1.0f / frame->pageZoomFactor(); - return FloatPoint(frameView->scrollPosition()).scaledBy(scale); -} - Touch::Touch(LocalFrame* frame, EventTarget* target, unsigned identifier, const FloatPoint& screenPos, const FloatPoint& pagePos, const FloatSize& radius, float rotationAngle, float force) : m_target(target) , m_identifier(identifier) - , m_clientPos(pagePos - contentsOffset(frame)) + , m_clientPos(pagePos) , m_screenPos(screenPos) , m_pagePos(pagePos) , m_radius(radius) diff --git a/engine/core/events/MouseRelatedEvent.cpp b/engine/core/events/MouseRelatedEvent.cpp index 5a4fae3a9a3cbbe35b43200ba73f0d9bc49803b1..972b78986f7635619e799bc042e0d78ec8d93033 100644 --- a/engine/core/events/MouseRelatedEvent.cpp +++ b/engine/core/events/MouseRelatedEvent.cpp @@ -48,22 +48,19 @@ MouseRelatedEvent::MouseRelatedEvent(const AtomicString& eventType, bool canBubb , m_isSimulated(isSimulated) { LayoutPoint adjustedPageLocation; - LayoutPoint scrollPosition; LocalFrame* frame = view() ? view()->frame() : 0; if (frame && !isSimulated) { if (FrameView* frameView = frame->view()) { - scrollPosition = frameView->scrollPosition(); adjustedPageLocation = frameView->windowToContents(windowLocation); float scaleFactor = 1 / frame->pageZoomFactor(); if (scaleFactor != 1.0f) { adjustedPageLocation.scale(scaleFactor, scaleFactor); - scrollPosition.scale(scaleFactor, scaleFactor); } } } - m_clientLocation = adjustedPageLocation - toLayoutSize(scrollPosition); + m_clientLocation = adjustedPageLocation; m_pageLocation = adjustedPageLocation; initCoordinates(); diff --git a/engine/core/frame/FrameView.cpp b/engine/core/frame/FrameView.cpp index 009149e53775b496db88f7cf8325ed3b4fcd6f37..3de631c26873175a15316b6212b401c9a959f7a8 100644 --- a/engine/core/frame/FrameView.cpp +++ b/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::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) diff --git a/engine/core/frame/FrameView.h b/engine/core/frame/FrameView.h index 29f5903fd71d8e1efecc253dc9386479c158cc5e..2da880c9391182c7c91d1d77ff946a544e62ce3c 100644 --- a/engine/core/frame/FrameView.h +++ b/engine/core/frame/FrameView.h @@ -139,7 +139,6 @@ public: // This is different than visibleContentRect() in that it ignores negative (or overly positive) // offsets from rubber-banding, and it takes zooming into account. - LayoutRect viewportConstrainedVisibleContentRect() const; void viewportConstrainedVisibleContentSizeChanged(bool widthChanged, bool heightChanged); AtomicString mediaType() const; @@ -174,9 +173,6 @@ public: bool hasEverPainted() const { return m_lastPaintTime; } void setNodeToDraw(Node*); - // FIXME(sky): Remove - void paintOverhangAreas(GraphicsContext*, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect); - Color documentBackgroundColor() const; static double currentFrameTimeStamp() { return s_currentFrameTimeStamp; } @@ -207,9 +203,6 @@ public: void setCursor(const Cursor&); - // FIXME(sky): Remove - bool scrollbarsCanBeActive() const; - // FIXME: Remove this method once plugin loading is decoupled from layout. void flushAnyPendingPostLayoutTasks(); @@ -248,9 +241,6 @@ public: bool isActive() const; - // DEPRECATED: Use viewportConstrainedVisibleContentRect() instead. - IntSize scrollOffsetForFixedPosition() const; - // FIXME: This should probably be renamed as the 'inSubtreeLayout' parameter // passed around the FrameView layout methods can be true while this returns // false. @@ -290,8 +280,6 @@ public: bool scheduleAnimation(); IntRect visibleContentRect(IncludeScrollbarsInRect = ExcludeScrollbars) const { return IntRect(IntPoint(), expandedIntSize(frameRect().size())); } IntSize unscaledVisibleContentSize(IncludeScrollbarsInRect = ExcludeScrollbars) const { return frameRect().size(); } - IntPoint clampScrollPosition(const IntPoint& scrollPosition) const { return scrollPosition; } - const IntPoint scrollOrigin() const { return IntPoint(); } // FIXME(sky): Not clear what values these should return. This is just what they happen to be // returning today. bool paintsEntireContents() const { return false; } @@ -350,9 +338,6 @@ private: bool wasViewportResized(); void sendResizeEventIfNeeded(); - // FIXME(sky): Remove now that we're not a ScrollView? - void notifyPageThatContentAreaWillPaint() const; - void scrollPositionChanged(); void didScrollTimerFired(Timer*); diff --git a/engine/core/loader/EmptyClients.h b/engine/core/loader/EmptyClients.h index cca8bbfc4602e56a6e85f275664d3c77c391e8db..74309c96d9bfbd744e47f8f9547e05630ee12168 100644 --- a/engine/core/loader/EmptyClients.h +++ b/engine/core/loader/EmptyClients.h @@ -102,7 +102,6 @@ public: virtual void needTouchEvents(bool) override { } virtual void setTouchAction(TouchAction touchAction) override { }; - virtual bool paintCustomOverhangArea(GraphicsContext*, const IntRect&, const IntRect&, const IntRect&) override { return false; } virtual String acceptLanguages() override; }; diff --git a/engine/core/page/ChromeClient.h b/engine/core/page/ChromeClient.h index b9fec1c503d7e89842079a8f143c8a431ee8b4f9..14d1fd0f562eff1c10bf28f73cf5f80c859fba92 100644 --- a/engine/core/page/ChromeClient.h +++ b/engine/core/page/ChromeClient.h @@ -99,8 +99,6 @@ public: virtual void setToolTip(const String&, TextDirection) = 0; - virtual bool paintCustomOverhangArea(GraphicsContext*, const IntRect&, const IntRect&, const IntRect&) = 0; - // Allows ports to customize the type of graphics layers created by this page. virtual GraphicsLayerFactory* graphicsLayerFactory() const { return 0; } diff --git a/engine/core/rendering/RenderBox.cpp b/engine/core/rendering/RenderBox.cpp index 447196bb9523f281c4d1e6090676dd25fd3bd6d4..f809797691387ddbe47c2b6fc73d1eb4368a4d7c 100644 --- a/engine/core/rendering/RenderBox.cpp +++ b/engine/core/rendering/RenderBox.cpp @@ -1794,7 +1794,7 @@ void RenderBox::mapRectToPaintInvalidationBacking(const RenderLayerModelObject* } if (o->isRenderView()) - toRenderView(o)->mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect, position == FixedPosition ? RenderView::IsFixedPosition : RenderView::IsNotFixedPosition, paintInvalidationState); + toRenderView(o)->mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect, paintInvalidationState); else o->mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect, paintInvalidationState); } @@ -2459,7 +2459,7 @@ LayoutUnit RenderBox::containingBlockLogicalWidthForPositioned(const RenderBoxMo if (style()->position() == FixedPosition && containingBlock->isRenderView()) { const RenderView* view = toRenderView(containingBlock); if (FrameView* frameView = view->frameView()) { - LayoutRect viewportRect = frameView->viewportConstrainedVisibleContentRect(); + LayoutRect viewportRect = frameView->visibleContentRect(); return containingBlock->isHorizontalWritingMode() ? viewportRect.width() : viewportRect.height(); } } @@ -2499,7 +2499,7 @@ LayoutUnit RenderBox::containingBlockLogicalHeightForPositioned(const RenderBoxM if (style()->position() == FixedPosition && containingBlock->isRenderView()) { const RenderView* view = toRenderView(containingBlock); if (FrameView* frameView = view->frameView()) { - LayoutRect viewportRect = frameView->viewportConstrainedVisibleContentRect(); + LayoutRect viewportRect = frameView->visibleContentRect(); return containingBlock->isHorizontalWritingMode() ? viewportRect.height() : viewportRect.width(); } } diff --git a/engine/core/rendering/RenderBoxModelObject.cpp b/engine/core/rendering/RenderBoxModelObject.cpp index a9367328d22c3978f3876d6e3914077d04330f57..52450b05b079344cadc76c9836491ebac21b02fa 100644 --- a/engine/core/rendering/RenderBoxModelObject.cpp +++ b/engine/core/rendering/RenderBoxModelObject.cpp @@ -883,8 +883,6 @@ void RenderBoxModelObject::calculateBackgroundImageGeometry(const RenderLayerMod IntRect viewportRect = pixelSnappedIntRect(viewRect()); if (fixedBackgroundPaintsInLocalCoordinates()) viewportRect.setLocation(IntPoint()); - else if (FrameView* frameView = view()->frameView()) - viewportRect.setLocation(IntPoint(frameView->scrollOffsetForFixedPosition())); if (paintContainer) { IntPoint absoluteContainerOffset = roundedIntPoint(paintContainer->localToAbsolute(FloatPoint())); diff --git a/engine/core/rendering/RenderLayerClipper.cpp b/engine/core/rendering/RenderLayerClipper.cpp index 1c00bb9dc13a2b72ff19aba0dfd7307159350383..9f699a3394ed7fb4df3953d503d81b315c43beb2 100644 --- a/engine/core/rendering/RenderLayerClipper.cpp +++ b/engine/core/rendering/RenderLayerClipper.cpp @@ -69,11 +69,6 @@ static void applyClipRects(const ClipRectsContext& context, RenderObject& render { ASSERT(renderer.hasOverflowClip() || renderer.hasClip()); - RenderView* view = renderer.view(); - ASSERT(view); - if (clipRects.fixed() && context.rootLayer->renderer() == view) - offset -= view->frameView()->scrollOffsetForFixedPosition(); - if (renderer.hasOverflowClip()) { ClipRect newOverflowClip = toRenderBox(renderer).overflowClipRect(offset, context.scrollbarRelevancy); newOverflowClip.setHasRadius(renderer.style()->hasBorderRadius()); @@ -329,13 +324,7 @@ ClipRect RenderLayerClipper::backgroundClipRect(const ClipRectsContext& context) else m_renderer.layer()->parent()->clipper().getOrCalculateClipRects(context, parentClipRects); - ClipRect result = backgroundClipRectForPosition(parentClipRects, m_renderer.style()->position()); - - // Note: infinite clipRects should not be scrolled here, otherwise they will accidentally no longer be considered infinite. - if (parentClipRects.fixed() && context.rootLayer->renderer() == m_renderer.view() && result != PaintInfo::infiniteRect()) - result.move(m_renderer.view()->frameView()->scrollOffsetForFixedPosition()); - - return result; + return backgroundClipRectForPosition(parentClipRects, m_renderer.style()->position()); } void RenderLayerClipper::getOrCalculateClipRects(const ClipRectsContext& context, ClipRects& clipRects) const diff --git a/engine/core/rendering/RenderLayerScrollableArea.cpp b/engine/core/rendering/RenderLayerScrollableArea.cpp index 00ec725c903e10db37cf712f340783d56cbc00e4..e8d0ca694cfe2be660cbb643be6d436717afe5ad 100644 --- a/engine/core/rendering/RenderLayerScrollableArea.cpp +++ b/engine/core/rendering/RenderLayerScrollableArea.cpp @@ -442,14 +442,6 @@ IntPoint RenderLayerScrollableArea::lastKnownMousePosition() const return box().frame() ? box().frame()->eventHandler().lastKnownMousePosition() : IntPoint(); } -bool RenderLayerScrollableArea::scrollbarsCanBeActive() const -{ - RenderView* view = box().view(); - if (!view) - return false; - return view->frameView()->scrollbarsCanBeActive(); -} - IntRect RenderLayerScrollableArea::scrollableAreaBoundingBox() const { return box().absoluteBoundingBoxRect(); diff --git a/engine/core/rendering/RenderLayerScrollableArea.h b/engine/core/rendering/RenderLayerScrollableArea.h index 5b4acfc6ba745a9d0977580f2e4aefd80714e4d6..f4a67d64a260e37da740ac62eb1236dd691cd36b 100644 --- a/engine/core/rendering/RenderLayerScrollableArea.h +++ b/engine/core/rendering/RenderLayerScrollableArea.h @@ -97,7 +97,6 @@ public: virtual IntSize contentsSize() const override; virtual IntSize overhangAmount() const override; virtual IntPoint lastKnownMousePosition() const override; - virtual bool scrollbarsCanBeActive() const override; virtual IntRect scrollableAreaBoundingBox() const override; virtual bool userInputScrollable(ScrollbarOrientation) const override; virtual bool shouldPlaceVerticalScrollbarOnLeft() const override; diff --git a/engine/core/rendering/RenderView.cpp b/engine/core/rendering/RenderView.cpp index 8f5a7dd127c4577ff3aae2fb25c20b94b3263a3a..945d22aebc36711dc2b9e1601d0e095f32573e36 100644 --- a/engine/core/rendering/RenderView.cpp +++ b/engine/core/rendering/RenderView.cpp @@ -200,23 +200,15 @@ void RenderView::mapLocalToContainer(const RenderLayerModelObject* paintInvalida getTransformFromContainer(0, LayoutSize(), t); transformState.applyTransform(t); } - - if (mode & IsFixed && m_frameView) - transformState.move(m_frameView->scrollOffsetForFixedPosition()); - - if (paintInvalidationContainer == this) - return; } const RenderObject* RenderView::pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const { + // FIXME(sky): Can we remove offsetForFixedPosition? LayoutSize offsetForFixedPosition; LayoutSize offset; RenderObject* container = 0; - if (m_frameView) - offsetForFixedPosition = m_frameView->scrollOffsetForFixedPosition(); - // If a container was specified, and was not 0 or the RenderView, then we // should have found it by now unless we're traversing to a parent document. ASSERT_ARG(ancestorToStopAt, !ancestorToStopAt || ancestorToStopAt == this || container); @@ -234,9 +226,6 @@ const RenderObject* RenderView::pushMappingToContainer(const RenderLayerModelObj void RenderView::mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformState& transformState) const { - if (mode & IsFixed && m_frameView) - transformState.move(m_frameView->scrollOffsetForFixedPosition()); - if (mode & UseTransforms && shouldUseTransformFromContainer(0)) { TransformationMatrix t; getTransformFromContainer(0, LayoutSize(), t); @@ -360,12 +349,7 @@ void RenderView::invalidatePaintForViewAndCompositedLayers() compositor()->fullyInvalidatePaint(); } -void RenderView::mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect, const PaintInvalidationState* invalidationState) const -{ - mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect, IsNotFixedPosition, invalidationState); -} - -void RenderView::mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect, ViewportConstrainedPosition viewportConstraint, const PaintInvalidationState* state) const +void RenderView::mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect, const PaintInvalidationState* state) const { if (style()->isFlippedBlocksWritingMode()) { // We have to flip by hand since the view's logical height has not been determined. We @@ -376,10 +360,6 @@ void RenderView::mapRectToPaintInvalidationBacking(const RenderLayerModelObject* rect.setX(viewWidth() - rect.maxX()); } - if (viewportConstraint == IsFixedPosition && m_frameView) { - rect.move(m_frameView->scrollOffsetForFixedPosition()); - } - // Apply our transform if we have one (because of full page zooming). if (!paintInvalidationContainer && layer() && layer()->transform()) rect = layer()->transform()->mapRect(rect); diff --git a/engine/core/rendering/RenderView.h b/engine/core/rendering/RenderView.h index 36cc69e3b74c2c1f80a07f7b46c872557b60282b..96223e339620d59ae452c5bb29a523ed2c237b84 100644 --- a/engine/core/rendering/RenderView.h +++ b/engine/core/rendering/RenderView.h @@ -78,11 +78,6 @@ public: FrameView* frameView() const { return m_frameView; } - enum ViewportConstrainedPosition { - IsNotFixedPosition, - IsFixedPosition, - }; - void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, ViewportConstrainedPosition, const PaintInvalidationState*) const; virtual void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const override; void invalidatePaintForRectangle(const LayoutRect&) const; diff --git a/engine/platform/scroll/ScrollAnimator.h b/engine/platform/scroll/ScrollAnimator.h index 93e382f3adfb74f1a1b6621241b55ffd7e93d6e6..54c4e3be648b403dd720bcc7dc950f3b1218ee88 100644 --- a/engine/platform/scroll/ScrollAnimator.h +++ b/engine/platform/scroll/ScrollAnimator.h @@ -76,7 +76,6 @@ public: virtual void cancelAnimations() { } virtual void serviceScrollAnimations() { } - virtual void contentAreaWillPaint() const { } virtual void mouseEnteredContentArea() const { } virtual void mouseExitedContentArea() const { } virtual void mouseMovedInContentArea() const { } diff --git a/engine/platform/scroll/ScrollableArea.cpp b/engine/platform/scroll/ScrollableArea.cpp index 39f8aa8ba2f3ec04c46c43eb9fa14cd367661a87..747546efa46d5ce8b5cb9059c95d4e694d4c0ddf 100644 --- a/engine/platform/scroll/ScrollableArea.cpp +++ b/engine/platform/scroll/ScrollableArea.cpp @@ -274,12 +274,6 @@ void ScrollableArea::willEndLiveResize() scrollAnimator->willEndLiveResize(); } -void ScrollableArea::contentAreaWillPaint() const -{ - if (ScrollAnimator* scrollAnimator = existingScrollAnimator()) - scrollAnimator->contentAreaWillPaint(); -} - void ScrollableArea::mouseEnteredContentArea() const { if (ScrollAnimator* scrollAnimator = existingScrollAnimator()) diff --git a/engine/platform/scroll/ScrollableArea.h b/engine/platform/scroll/ScrollableArea.h index 8816828b8394a08587f511d28f63f1859b6a8a8a..c2cedd84260cedcdef65f5eb2a5c549fd0294191 100644 --- a/engine/platform/scroll/ScrollableArea.h +++ b/engine/platform/scroll/ScrollableArea.h @@ -91,7 +91,6 @@ public: void willStartLiveResize(); void willEndLiveResize(); - void contentAreaWillPaint() const; void mouseEnteredContentArea() const; void mouseExitedContentArea() const; void mouseMovedInContentArea() const; @@ -173,8 +172,6 @@ public: virtual bool shouldSuspendScrollAnimations() const { return true; } - virtual bool scrollbarsCanBeActive() const = 0; - // Returns the bounding box of this scrollable area, in the coordinate system of the enclosing scroll view. virtual IntRect scrollableAreaBoundingBox() const = 0; diff --git a/engine/web/ChromeClientImpl.cpp b/engine/web/ChromeClientImpl.cpp index 913f4083aefdcf9d3511c6f78af341dff049beb8..e05b3069dc2430b68506f2b1d621cc83db3e1ed1 100644 --- a/engine/web/ChromeClientImpl.cpp +++ b/engine/web/ChromeClientImpl.cpp @@ -343,11 +343,6 @@ String ChromeClientImpl::acceptLanguages() return m_webView->client()->acceptLanguages(); } -bool ChromeClientImpl::paintCustomOverhangArea(GraphicsContext* context, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect) -{ - return false; -} - GraphicsLayerFactory* ChromeClientImpl::graphicsLayerFactory() const { return m_webView->graphicsLayerFactory(); diff --git a/engine/web/ChromeClientImpl.h b/engine/web/ChromeClientImpl.h index efc650c02f5b03bd4c7088fbd7b3c628e0dc4a33..84055d5cbc3122b40b1e15eb8addbef264e94245 100644 --- a/engine/web/ChromeClientImpl.h +++ b/engine/web/ChromeClientImpl.h @@ -85,7 +85,6 @@ public: virtual void mouseDidMoveOverElement( const HitTestResult&, unsigned modifierFlags) override; virtual void setToolTip(const WTF::String& tooltipText, TextDirection) override; - virtual bool paintCustomOverhangArea(GraphicsContext*, const IntRect&, const IntRect&, const IntRect&) override; virtual void setCursor(const Cursor&) override; virtual void needTouchEvents(bool needTouchEvents) override; virtual void setTouchAction(TouchAction) override; diff --git a/engine/web/ScrollbarGroup.cpp b/engine/web/ScrollbarGroup.cpp index f986aa4c5c26e719ca13ac35969ebfc6ada71ee7..529e3aa74273cc02f5bd92bf576b868e60a78d3a 100644 --- a/engine/web/ScrollbarGroup.cpp +++ b/engine/web/ScrollbarGroup.cpp @@ -143,11 +143,6 @@ IntPoint ScrollbarGroup::lastKnownMousePosition() const return m_lastMousePosition; } -bool ScrollbarGroup::scrollbarsCanBeActive() const -{ - return true; -} - bool ScrollbarGroup::userInputScrollable(ScrollbarOrientation orientation) const { return false; diff --git a/engine/web/ScrollbarGroup.h b/engine/web/ScrollbarGroup.h index f259f3f780689c3217274a03515bad637fdf6883..8f24577f8c7485398b14973fe01643bec9b50f08 100644 --- a/engine/web/ScrollbarGroup.h +++ b/engine/web/ScrollbarGroup.h @@ -62,7 +62,6 @@ public: virtual IntSize contentsSize() const override; virtual IntSize overhangAmount() const override; virtual IntPoint lastKnownMousePosition() const override; - virtual bool scrollbarsCanBeActive() const override; virtual IntRect scrollableAreaBoundingBox() const override; virtual bool userInputScrollable(ScrollbarOrientation) const override; virtual bool shouldPlaceVerticalScrollbarOnLeft() const override;