Beat FrameView with the FINAL stick.
authorakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 8 Sep 2013 04:23:27 +0000 (04:23 +0000)
committerakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 8 Sep 2013 04:23:27 +0000 (04:23 +0000)
<https://webkit.org/b/120989>

Reviewed by Anders Carlsson.

... and mark everything virtual with OVERRIDE, exposing a couple of things
that didn't actually override anything.

* WebCore.exp.in:
* page/FrameView.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155283 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/page/FrameView.h

index cc8c74c..b47d97d 100644 (file)
@@ -1,3 +1,16 @@
+2013-09-07  Andreas Kling  <akling@apple.com>
+
+        Beat FrameView with the FINAL stick.
+        <https://webkit.org/b/120989>
+
+        Reviewed by Anders Carlsson.
+
+        ... and mark everything virtual with OVERRIDE, exposing a couple of things
+        that didn't actually override anything.
+
+        * WebCore.exp.in:
+        * page/FrameView.h:
+
 2013-09-07  Anders Carlsson  <andersca@apple.com>
 
         Remove NonCopyableSort.h from WTF
index c7c10e9..7bdfc9f 100644 (file)
@@ -82,6 +82,7 @@ __ZN7WebCore10Pasteboard14writePlainTextERKN3WTF6StringENS0_18SmartReplaceOption
 __ZN7WebCore10RenderPart9setWidgetEN3WTF10PassRefPtrINS_6WidgetEEE
 __ZN7WebCore10RenderView10compositorEv
 __ZN7WebCore10RenderView7hitTestERKNS_14HitTestRequestERNS_13HitTestResultE
+__ZN7WebCore10ScrollView16setParentVisibleEb
 __ZN7WebCore10ScrollView17setUseFixedLayoutEb
 __ZN7WebCore10ScrollView18setFixedLayoutSizeERKNS_7IntSizeE
 __ZN7WebCore10ScrollView20setCanHaveScrollbarsEb
@@ -89,6 +90,7 @@ __ZN7WebCore10ScrollView21setDelegatesScrollingEb
 __ZN7WebCore10ScrollView23setPaintsEntireContentsEb
 __ZN7WebCore10ScrollView23setScrollbarsSuppressedEbb
 __ZN7WebCore10ScrollView24windowResizerRectChangedEv
+__ZN7WebCore10ScrollView5paintEPNS_15GraphicsContextERKNS_7IntRectE
 __ZN7WebCore10ScrollView8addChildEN3WTF10PassRefPtrINS_6WidgetEEE
 __ZN7WebCore10StorageMap10removeItemERKN3WTF6StringERS2_
 __ZN7WebCore10StorageMap11importItemsERKN3WTF7HashMapINS1_6StringES3_NS1_10StringHashENS1_10HashTraitsIS3_EES6_EE
@@ -1147,8 +1149,11 @@ __ZN7WebCore9FrameTree9clearNameEv
 __ZN7WebCore9FrameView6createERNS_5FrameE
 __ZN7WebCore9FrameView11forceLayoutEb
 __ZN7WebCore9FrameView12setMediaTypeERKN3WTF6StringE
+__ZN7WebCore9FrameView12tiledBackingEv
+__ZN7WebCore9FrameView13paintContentsEPNS_15GraphicsContextERKNS_7IntRectE
 __ZN7WebCore9FrameView13setNodeToDrawEPNS_4NodeE
 __ZN7WebCore9FrameView14adjustViewSizeEv
+__ZN7WebCore9FrameView14invalidateRectERKNS_7IntRectE
 __ZN7WebCore9FrameView14setNeedsLayoutEv
 __ZN7WebCore9FrameView14setTransparentEb
 __ZN7WebCore9FrameView15setFooterHeightEi
@@ -1158,9 +1163,12 @@ __ZN7WebCore9FrameView17addScrollableAreaEPNS_14ScrollableAreaE
 __ZN7WebCore9FrameView17paintControlTintsEv
 __ZN7WebCore9FrameView17setScrollPositionERKNS_8IntPointE
 __ZN7WebCore9FrameView17setTracksRepaintsEb
+__ZN7WebCore9FrameView17willEndLiveResizeEv
 __ZN7WebCore9FrameView18enableAutoSizeModeEbRKNS_7IntSizeES3_
 __ZN7WebCore9FrameView18updateControlTintsEv
+__ZN7WebCore9FrameView19willStartLiveResizeEv
 __ZN7WebCore9FrameView19scrollElementToRectEPNS_7ElementERKNS_7IntRectE
+__ZN7WebCore9FrameView20setCanHaveScrollbarsEb
 __ZN7WebCore9FrameView20enterCompositingModeEv
 __ZN7WebCore9FrameView20removeScrollableAreaEPNS_14ScrollableAreaE
 __ZN7WebCore9FrameView20resetTrackedRepaintsEv
@@ -1308,8 +1316,11 @@ __ZNK7WebCore10ScrollView16windowToContentsERKNS_7IntRectE
 __ZNK7WebCore10ScrollView16windowToContentsERKNS_8IntPointE
 __ZNK7WebCore10ScrollView18contentsToRootViewERKNS_7IntRectE
 __ZNK7WebCore10ScrollView18contentsToRootViewERKNS_8IntPointE
+__ZNK7WebCore10ScrollView18visibleContentRectENS_14ScrollableArea36VisibleContentRectIncludesScrollbarsE
 __ZNK7WebCore10ScrollView23rootViewToTotalContentsERKNS_8IntPointE
 __ZNK7WebCore10ScrollView30scrollOffsetRelativeToDocumentEv
+__ZN7WebCore10ScrollView4hideEv
+__ZN7WebCore10ScrollView4showEv
 __ZNK7WebCore10StorageMap6lengthEv
 __ZNK7WebCore10StorageMap7getItemERKN3WTF6StringE
 __ZNK7WebCore10StorageMap8containsERKN3WTF6StringE
@@ -1676,8 +1687,14 @@ __ZNK7WebCore9FrameView11needsLayoutEv
 __ZNK7WebCore9FrameView13isTransparentEv
 __ZNK7WebCore9FrameView13paintBehaviorEv
 __ZNK7WebCore9FrameView14didFirstLayoutEv
+__ZNK7WebCore9FrameView17convertToRendererEPKNS_12RenderObjectERKNS_7IntRectE
+__ZNK7WebCore9FrameView17convertToRendererEPKNS_12RenderObjectERKNS_8IntPointE
 __ZNK7WebCore9FrameView19baseBackgroundColorEv
+__ZNK7WebCore9FrameView19convertFromRendererEPKNS_12RenderObjectERKNS_7IntRectE
+__ZNK7WebCore9FrameView19convertFromRendererEPKNS_12RenderObjectERKNS_8IntPointE
 __ZNK7WebCore9FrameView20isSoftwareRenderableEv
+__ZNK7WebCore9FrameView21maximumScrollPositionEv
+__ZNK7WebCore9FrameView21minimumScrollPositionEv
 __ZNK7WebCore9FrameView23documentBackgroundColorEv
 __ZNK7WebCore9FrameView27windowClipRectForFrameOwnerEPKNS_21HTMLFrameOwnerElementEb
 __ZNK7WebCore9FrameView28isEnclosedInCompositingLayerEv
index 4a6e2c3..682beef 100644 (file)
@@ -60,7 +60,7 @@ Pagination::Mode paginationModeForRenderStyle(RenderStyle*);
 
 typedef unsigned long long DOMTimeStamp;
 
-class FrameView : public ScrollView {
+class FrameView FINAL : public ScrollView {
 public:
     friend class RenderView;
     friend class Internals;
@@ -70,13 +70,13 @@ public:
 
     virtual ~FrameView();
 
-    virtual HostWindow* hostWindow() const;
+    virtual HostWindow* hostWindow() const OVERRIDE;
     
-    virtual void invalidateRect(const IntRect&);
-    virtual void setFrameRect(const IntRect&);
+    virtual void invalidateRect(const IntRect&) OVERRIDE;
+    virtual void setFrameRect(const IntRect&) OVERRIDE;
 
 #if ENABLE(REQUEST_ANIMATION_FRAME)
-    virtual bool scheduleAnimation();
+    virtual bool scheduleAnimation() OVERRIDE;
 #endif
 
     Frame& frame() const { return *m_frame; }
@@ -91,14 +91,14 @@ public:
     void setMarginWidth(LayoutUnit);
     void setMarginHeight(LayoutUnit);
 
-    virtual void setCanHaveScrollbars(bool);
+    virtual void setCanHaveScrollbars(bool) OVERRIDE;
     void updateCanHaveScrollbars();
 
-    virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
+    virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation) OVERRIDE;
 
-    virtual bool avoidScrollbarCreation() const;
+    virtual bool avoidScrollbarCreation() const OVERRIDE;
 
-    virtual void setContentsSize(const IntSize&);
+    virtual void setContentsSize(const IntSize&) OVERRIDE;
 
     void layout(bool allowSubtree = true);
     bool didFirstLayout() const;
@@ -164,7 +164,7 @@ public:
     void resetScrollbarsAndClearContentsSize();
     void prepareForDetach();
     void detachCustomScrollbars();
-    virtual void recalculateScrollbarOverlayStyle();
+    void recalculateScrollbarOverlayStyle();
 
     void clear();
 
@@ -184,19 +184,19 @@ public:
 
     void adjustViewSize();
     
-    virtual IntRect windowClipRect(bool clipToContents = true) const;
+    virtual IntRect windowClipRect(bool clipToContents = true) const OVERRIDE;
     IntRect windowClipRectForFrameOwner(const HTMLFrameOwnerElement*, bool clipToLayerContents) const;
 
-    virtual IntRect windowResizerRect() const;
+    virtual IntRect windowResizerRect() const OVERRIDE;
 
     virtual float visibleContentScaleFactor() const OVERRIDE;
 
     virtual void setFixedVisibleContentRect(const IntRect&) OVERRIDE;
     virtual void setScrollPosition(const IntPoint&) OVERRIDE;
     void scrollPositionChangedViaPlatformWidget();
-    virtual void repaintFixedElementsAfterScrolling();
-    virtual void updateFixedElementsAfterScrolling();
-    virtual bool shouldRubberBandInDirection(ScrollDirection) const;
+    virtual void repaintFixedElementsAfterScrolling() OVERRIDE;
+    virtual void updateFixedElementsAfterScrolling() OVERRIDE;
+    virtual bool shouldRubberBandInDirection(ScrollDirection) const OVERRIDE;
     virtual bool requestScrollPositionUpdate(const IntPoint&) OVERRIDE;
     virtual bool isRubberBandInProgress() const OVERRIDE;
     virtual IntPoint minimumScrollPosition() const OVERRIDE;
@@ -271,7 +271,7 @@ public:
     void addWidgetToUpdate(RenderObject*);
     void removeWidgetToUpdate(RenderObject*);
 
-    virtual void paintContents(GraphicsContext*, const IntRect& damageRect);
+    virtual void paintContents(GraphicsContext*, const IntRect& damageRect) OVERRIDE;
     void setPaintBehavior(PaintBehavior);
     PaintBehavior paintBehavior() const;
     bool isPainting() const;
@@ -283,8 +283,8 @@ public:
     enum CoordinateSpaceForSnapshot { DocumentCoordinates, ViewCoordinates };
     void paintContentsForSnapshot(GraphicsContext*, const IntRect& imageRect, SelectionInSnapshot shouldPaintSelection, CoordinateSpaceForSnapshot);
 
-    virtual void paintOverhangAreas(GraphicsContext*, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect);
-    virtual void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect);
+    virtual void paintOverhangAreas(GraphicsContext*, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect) OVERRIDE;
+    virtual void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect) OVERRIDE;
     virtual void paintScrollbar(GraphicsContext*, Scrollbar*, const IntRect&) OVERRIDE;
 
     Color documentBackgroundColor() const;
@@ -330,10 +330,10 @@ public:
     void scrollElementToRect(Element*, const IntRect&);
 
     // Methods to convert points and rects between the coordinate space of the renderer, and this view.
-    virtual IntRect convertFromRenderer(const RenderObject*, const IntRect&) const;
-    virtual IntRect convertToRenderer(const RenderObject*, const IntRect&) const;
-    virtual IntPoint convertFromRenderer(const RenderObject*, const IntPoint&) const;
-    virtual IntPoint convertToRenderer(const RenderObject*, const IntPoint&) const;
+    IntRect convertFromRenderer(const RenderObject*, const IntRect&) const;
+    IntRect convertToRenderer(const RenderObject*, const IntRect&) const;
+    IntPoint convertFromRenderer(const RenderObject*, const IntPoint&) const;
+    IntPoint convertToRenderer(const RenderObject*, const IntPoint&) const;
 
     bool isFrameViewScrollCorner(RenderScrollbarPart* scrollCorner) const { return m_scrollCorner == scrollCorner; }
 
@@ -351,7 +351,7 @@ public:
     // On each repaint the delay increses by this amount
     static void setRepaintThrottlingDeferredRepaintDelayIncrementDuringLoading(double p);
 
-    virtual IntPoint lastKnownMousePosition() const;
+    virtual IntPoint lastKnownMousePosition() const OVERRIDE;
     virtual bool isHandlingWheelEvent() const OVERRIDE;
     bool shouldSetCursor() const;
 
@@ -360,8 +360,8 @@ public:
     // FIXME: Remove this method once plugin loading is decoupled from layout.
     void flushAnyPendingPostLayoutTasks();
 
-    virtual bool shouldSuspendScrollAnimations() const;
-    virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate);
+    virtual bool shouldSuspendScrollAnimations() const OVERRIDE;
+    virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate) OVERRIDE;
 
     void setAnimatorsAreActive();
 
@@ -442,13 +442,13 @@ public:
     void setScrollPinningBehavior(ScrollPinningBehavior);
 
 protected:
-    virtual bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);
-    virtual void scrollContentsSlowPath(const IntRect& updateRect);
+    virtual bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect) OVERRIDE;
+    virtual void scrollContentsSlowPath(const IntRect& updateRect) OVERRIDE;
     
     void repaintSlowRepaintObjects();
 
-    virtual bool isVerticalDocument() const;
-    virtual bool isFlippedDocument() const;
+    virtual bool isVerticalDocument() const OVERRIDE;
+    virtual bool isFlippedDocument() const OVERRIDE;
 
 private:
     explicit FrameView(Frame&);
@@ -479,12 +479,12 @@ private:
     void performPostLayoutTasks();
     void autoSizeIfEnabled();
 
-    virtual void repaintContentRectangle(const IntRect&, bool immediate);
+    virtual void repaintContentRectangle(const IntRect&, bool immediate) OVERRIDE;
     virtual void contentsResized() OVERRIDE;
-    virtual void visibleContentsResized();
+    virtual void visibleContentsResized() OVERRIDE;
     virtual void fixedLayoutSizeChanged() OVERRIDE;
 
-    virtual void delegatesScrollingDidChange();
+    virtual void delegatesScrollingDidChange() OVERRIDE;
 
     // Override ScrollView methods to do point conversion via renderers, in order to
     // take transforms into account.
@@ -535,7 +535,7 @@ private:
 
     bool hasCustomScrollbars() const;
 
-    virtual void updateScrollCorner();
+    virtual void updateScrollCorner() OVERRIDE;
 
     FrameView* parentFrameView() const;
 
@@ -545,7 +545,7 @@ private:
 
     bool qualifiesAsVisuallyNonEmpty() const;
 
-    virtual AXObjectCache* axObjectCache() const;
+    AXObjectCache* axObjectCache() const;
     void notifyWidgetsInAllFrames(WidgetNotification);
     void removeFromAXObjectCache();