| Index: sky/engine/core/frame/FrameView.h
|
| diff --git a/sky/engine/core/frame/FrameView.h b/sky/engine/core/frame/FrameView.h
|
| index 2ceb7c49b48aa098385dd4ff560c2ac4fc8c855b..92c33e0deecef7a8cca657d4164c2f748cc2cef8 100644
|
| --- a/sky/engine/core/frame/FrameView.h
|
| +++ b/sky/engine/core/frame/FrameView.h
|
| @@ -138,9 +138,6 @@ public:
|
|
|
| void postLayoutTimerFired(Timer<FrameView>*);
|
|
|
| - bool wasScrolledByUser() const;
|
| - void setWasScrolledByUser(bool);
|
| -
|
| void paintContents(GraphicsContext*, const IntRect& damageRect);
|
| void setPaintBehavior(PaintBehavior);
|
| PaintBehavior paintBehavior() const;
|
| @@ -196,9 +193,6 @@ public:
|
| // we need this function in order to do the scroll ourselves.
|
| bool wheelEvent(const PlatformWheelEvent&);
|
|
|
| - bool inProgrammaticScroll() const { return m_inProgrammaticScroll; }
|
| - void setInProgrammaticScroll(bool programmaticScroll) { m_inProgrammaticScroll = programmaticScroll; }
|
| -
|
| void setHasSoftwareFilters(bool hasSoftwareFilters) { m_hasSoftwareFilters = hasSoftwareFilters; }
|
| bool hasSoftwareFilters() const { return m_hasSoftwareFilters; }
|
|
|
| @@ -257,13 +251,6 @@ private:
|
| void contentRectangleForPaintInvalidation(const IntRect&);
|
| void contentsResized();
|
|
|
| - // Override ScrollView methods to do point conversion via renderers, in order to
|
| - // take transforms into account.
|
| - virtual IntRect convertToContainingView(const IntRect&) const override;
|
| - virtual IntRect convertFromContainingView(const IntRect&) const override;
|
| - virtual IntPoint convertToContainingView(const IntPoint&) const override;
|
| - virtual IntPoint convertFromContainingView(const IntPoint&) const override;
|
| -
|
| bool wasViewportResized();
|
| void sendResizeEventIfNeeded();
|
|
|
| @@ -310,9 +297,6 @@ private:
|
| bool m_verticalOverflow;
|
| RenderObject* m_viewportRenderer;
|
|
|
| - bool m_wasScrolledByUser;
|
| - bool m_inProgrammaticScroll;
|
| -
|
| double m_lastPaintTime;
|
|
|
| bool m_isTrackingPaintInvalidations; // Used for testing.
|
|
|