Index: Source/core/frame/FrameView.h |
diff --git a/Source/core/frame/FrameView.h b/Source/core/frame/FrameView.h |
index e408b984c70b1640698f520ca5b88073a4d9557a..5cad0ffd0f641d3dd12179b6c3beb37bcd44635a 100644 |
--- a/Source/core/frame/FrameView.h |
+++ b/Source/core/frame/FrameView.h |
@@ -55,7 +55,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; |
@@ -65,12 +65,12 @@ 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; |
- virtual bool scheduleAnimation(); |
+ virtual bool scheduleAnimation() OVERRIDE; |
Frame& frame() const { return *m_frame; } |
@@ -81,12 +81,12 @@ 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 void setContentsSize(const IntSize&); |
+ virtual void setContentsSize(const IntSize&) OVERRIDE; |
void layout(bool allowSubtree = true); |
bool didFirstLayout() const; |
@@ -151,10 +151,10 @@ 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 { return m_visibleContentScaleFactor; } |
void setVisibleContentScaleFactor(float); |
@@ -164,9 +164,9 @@ public: |
void setInputEventsTransformForEmulation(const IntSize&, float); |
virtual void setScrollPosition(const IntPoint&) OVERRIDE; |
- 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 isRubberBandInProgress() const OVERRIDE; |
void setScrollPositionNonProgrammatically(const IntPoint&); |
@@ -213,7 +213,7 @@ public: |
void addWidgetToUpdate(RenderEmbeddedObject&); |
- virtual void paintContents(GraphicsContext*, const IntRect& damageRect); |
+ virtual void paintContents(GraphicsContext*, const IntRect& damageRect) OVERRIDE; |
void setPaintBehavior(PaintBehavior); |
PaintBehavior paintBehavior() const; |
bool isPainting() const; |
@@ -221,8 +221,8 @@ public: |
void setLastPaintTime(double lastPaintTime) { m_lastPaintTime = lastPaintTime; } |
void setNodeToDraw(Node*); |
- 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; |
@@ -246,10 +246,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; } |
@@ -267,7 +267,7 @@ public: |
// On each repaint the delay increses by this amount |
static void setRepaintThrottlingDeferredRepaintDelayIncrementDuringLoading(double); |
- virtual IntPoint lastKnownMousePosition() const; |
+ virtual IntPoint lastKnownMousePosition() const OVERRIDE; |
bool shouldSetCursor() const; |
void setCursor(const Cursor&); |
@@ -277,8 +277,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(); |
@@ -348,11 +348,11 @@ public: |
}; |
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; |
- virtual bool isVerticalDocument() const; |
- virtual bool isFlippedDocument() const; |
+ virtual bool isVerticalDocument() const OVERRIDE; |
+ virtual bool isFlippedDocument() const OVERRIDE; |
private: |
explicit FrameView(Frame*); |
@@ -365,7 +365,7 @@ private: |
void reset(); |
void init(); |
- virtual void frameRectsChanged(); |
+ virtual void frameRectsChanged() OVERRIDE; |
virtual bool isFrameView() const OVERRIDE { return true; } |
friend class RenderWidget; |
@@ -391,11 +391,11 @@ private: |
void repaintTree(RenderObject* root); |
- virtual void gatherDebugLayoutRects(RenderObject* layoutRoot); |
+ void gatherDebugLayoutRects(RenderObject* layoutRoot); |
- virtual void repaintContentRectangle(const IntRect&); |
+ virtual void repaintContentRectangle(const IntRect&) OVERRIDE; |
virtual void contentsResized() OVERRIDE; |
- virtual void scrollbarExistenceDidChange(); |
+ virtual void scrollbarExistenceDidChange() OVERRIDE; |
// Override ScrollView methods to do point conversion via renderers, in order to |
// take transforms into account. |
@@ -421,7 +421,7 @@ private: |
void updateScrollableAreaSet(); |
- virtual void notifyPageThatContentAreaWillPaint() const; |
+ virtual void notifyPageThatContentAreaWillPaint() const OVERRIDE; |
bool shouldUseLoadTimeDeferredRepaintDelay() const; |
void deferredRepaintTimerFired(Timer<FrameView>*); |
@@ -438,11 +438,11 @@ private: |
bool hasCustomScrollbars() const; |
bool shouldUseCustomScrollbars(Element*& customScrollbarElement, Frame*& customScrollbarFrame); |
- virtual void updateScrollCorner(); |
+ virtual void updateScrollCorner() OVERRIDE; |
FrameView* parentFrameView() const; |
- virtual AXObjectCache* axObjectCache() const; |
+ AXObjectCache* axObjectCache() const; |
void removeFromAXObjectCache(); |
bool isMainFrame() const; |