Skip to content

Commit 221a746

Browse files
author
Andreas Kling
committed
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: Canonical link: https://commits.webkit.org/138887@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155283 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 593f48b commit 221a746

3 files changed

Lines changed: 64 additions & 34 deletions

File tree

‎Source/WebCore/ChangeLog‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2013-09-07 Andreas Kling <akling@apple.com>
2+
3+
Beat FrameView with the FINAL stick.
4+
<https://webkit.org/b/120989>
5+
6+
Reviewed by Anders Carlsson.
7+
8+
... and mark everything virtual with OVERRIDE, exposing a couple of things
9+
that didn't actually override anything.
10+
11+
* WebCore.exp.in:
12+
* page/FrameView.h:
13+
114
2013-09-07 Anders Carlsson <andersca@apple.com>
215

316
Remove NonCopyableSort.h from WTF

‎Source/WebCore/WebCore.exp.in‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,15 @@ __ZN7WebCore10Pasteboard14writePlainTextERKN3WTF6StringENS0_18SmartReplaceOption
8282
__ZN7WebCore10RenderPart9setWidgetEN3WTF10PassRefPtrINS_6WidgetEEE
8383
__ZN7WebCore10RenderView10compositorEv
8484
__ZN7WebCore10RenderView7hitTestERKNS_14HitTestRequestERNS_13HitTestResultE
85+
__ZN7WebCore10ScrollView16setParentVisibleEb
8586
__ZN7WebCore10ScrollView17setUseFixedLayoutEb
8687
__ZN7WebCore10ScrollView18setFixedLayoutSizeERKNS_7IntSizeE
8788
__ZN7WebCore10ScrollView20setCanHaveScrollbarsEb
8889
__ZN7WebCore10ScrollView21setDelegatesScrollingEb
8990
__ZN7WebCore10ScrollView23setPaintsEntireContentsEb
9091
__ZN7WebCore10ScrollView23setScrollbarsSuppressedEbb
9192
__ZN7WebCore10ScrollView24windowResizerRectChangedEv
93+
__ZN7WebCore10ScrollView5paintEPNS_15GraphicsContextERKNS_7IntRectE
9294
__ZN7WebCore10ScrollView8addChildEN3WTF10PassRefPtrINS_6WidgetEEE
9395
__ZN7WebCore10StorageMap10removeItemERKN3WTF6StringERS2_
9496
__ZN7WebCore10StorageMap11importItemsERKN3WTF7HashMapINS1_6StringES3_NS1_10StringHashENS1_10HashTraitsIS3_EES6_EE
@@ -1147,8 +1149,11 @@ __ZN7WebCore9FrameTree9clearNameEv
11471149
__ZN7WebCore9FrameView6createERNS_5FrameE
11481150
__ZN7WebCore9FrameView11forceLayoutEb
11491151
__ZN7WebCore9FrameView12setMediaTypeERKN3WTF6StringE
1152+
__ZN7WebCore9FrameView12tiledBackingEv
1153+
__ZN7WebCore9FrameView13paintContentsEPNS_15GraphicsContextERKNS_7IntRectE
11501154
__ZN7WebCore9FrameView13setNodeToDrawEPNS_4NodeE
11511155
__ZN7WebCore9FrameView14adjustViewSizeEv
1156+
__ZN7WebCore9FrameView14invalidateRectERKNS_7IntRectE
11521157
__ZN7WebCore9FrameView14setNeedsLayoutEv
11531158
__ZN7WebCore9FrameView14setTransparentEb
11541159
__ZN7WebCore9FrameView15setFooterHeightEi
@@ -1158,9 +1163,12 @@ __ZN7WebCore9FrameView17addScrollableAreaEPNS_14ScrollableAreaE
11581163
__ZN7WebCore9FrameView17paintControlTintsEv
11591164
__ZN7WebCore9FrameView17setScrollPositionERKNS_8IntPointE
11601165
__ZN7WebCore9FrameView17setTracksRepaintsEb
1166+
__ZN7WebCore9FrameView17willEndLiveResizeEv
11611167
__ZN7WebCore9FrameView18enableAutoSizeModeEbRKNS_7IntSizeES3_
11621168
__ZN7WebCore9FrameView18updateControlTintsEv
1169+
__ZN7WebCore9FrameView19willStartLiveResizeEv
11631170
__ZN7WebCore9FrameView19scrollElementToRectEPNS_7ElementERKNS_7IntRectE
1171+
__ZN7WebCore9FrameView20setCanHaveScrollbarsEb
11641172
__ZN7WebCore9FrameView20enterCompositingModeEv
11651173
__ZN7WebCore9FrameView20removeScrollableAreaEPNS_14ScrollableAreaE
11661174
__ZN7WebCore9FrameView20resetTrackedRepaintsEv
@@ -1308,8 +1316,11 @@ __ZNK7WebCore10ScrollView16windowToContentsERKNS_7IntRectE
13081316
__ZNK7WebCore10ScrollView16windowToContentsERKNS_8IntPointE
13091317
__ZNK7WebCore10ScrollView18contentsToRootViewERKNS_7IntRectE
13101318
__ZNK7WebCore10ScrollView18contentsToRootViewERKNS_8IntPointE
1319+
__ZNK7WebCore10ScrollView18visibleContentRectENS_14ScrollableArea36VisibleContentRectIncludesScrollbarsE
13111320
__ZNK7WebCore10ScrollView23rootViewToTotalContentsERKNS_8IntPointE
13121321
__ZNK7WebCore10ScrollView30scrollOffsetRelativeToDocumentEv
1322+
__ZN7WebCore10ScrollView4hideEv
1323+
__ZN7WebCore10ScrollView4showEv
13131324
__ZNK7WebCore10StorageMap6lengthEv
13141325
__ZNK7WebCore10StorageMap7getItemERKN3WTF6StringE
13151326
__ZNK7WebCore10StorageMap8containsERKN3WTF6StringE
@@ -1676,8 +1687,14 @@ __ZNK7WebCore9FrameView11needsLayoutEv
16761687
__ZNK7WebCore9FrameView13isTransparentEv
16771688
__ZNK7WebCore9FrameView13paintBehaviorEv
16781689
__ZNK7WebCore9FrameView14didFirstLayoutEv
1690+
__ZNK7WebCore9FrameView17convertToRendererEPKNS_12RenderObjectERKNS_7IntRectE
1691+
__ZNK7WebCore9FrameView17convertToRendererEPKNS_12RenderObjectERKNS_8IntPointE
16791692
__ZNK7WebCore9FrameView19baseBackgroundColorEv
1693+
__ZNK7WebCore9FrameView19convertFromRendererEPKNS_12RenderObjectERKNS_7IntRectE
1694+
__ZNK7WebCore9FrameView19convertFromRendererEPKNS_12RenderObjectERKNS_8IntPointE
16801695
__ZNK7WebCore9FrameView20isSoftwareRenderableEv
1696+
__ZNK7WebCore9FrameView21maximumScrollPositionEv
1697+
__ZNK7WebCore9FrameView21minimumScrollPositionEv
16811698
__ZNK7WebCore9FrameView23documentBackgroundColorEv
16821699
__ZNK7WebCore9FrameView27windowClipRectForFrameOwnerEPKNS_21HTMLFrameOwnerElementEb
16831700
__ZNK7WebCore9FrameView28isEnclosedInCompositingLayerEv

‎Source/WebCore/page/FrameView.h‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Pagination::Mode paginationModeForRenderStyle(RenderStyle*);
6060

6161
typedef unsigned long long DOMTimeStamp;
6262

63-
class FrameView : public ScrollView {
63+
class FrameView FINAL : public ScrollView {
6464
public:
6565
friend class RenderView;
6666
friend class Internals;
@@ -70,13 +70,13 @@ class FrameView : public ScrollView {
7070

7171
virtual ~FrameView();
7272

73-
virtual HostWindow* hostWindow() const;
73+
virtual HostWindow* hostWindow() const OVERRIDE;
7474

75-
virtual void invalidateRect(const IntRect&);
76-
virtual void setFrameRect(const IntRect&);
75+
virtual void invalidateRect(const IntRect&) OVERRIDE;
76+
virtual void setFrameRect(const IntRect&) OVERRIDE;
7777

7878
#if ENABLE(REQUEST_ANIMATION_FRAME)
79-
virtual bool scheduleAnimation();
79+
virtual bool scheduleAnimation() OVERRIDE;
8080
#endif
8181

8282
Frame& frame() const { return *m_frame; }
@@ -91,14 +91,14 @@ class FrameView : public ScrollView {
9191
void setMarginWidth(LayoutUnit);
9292
void setMarginHeight(LayoutUnit);
9393

94-
virtual void setCanHaveScrollbars(bool);
94+
virtual void setCanHaveScrollbars(bool) OVERRIDE;
9595
void updateCanHaveScrollbars();
9696

97-
virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
97+
virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation) OVERRIDE;
9898

99-
virtual bool avoidScrollbarCreation() const;
99+
virtual bool avoidScrollbarCreation() const OVERRIDE;
100100

101-
virtual void setContentsSize(const IntSize&);
101+
virtual void setContentsSize(const IntSize&) OVERRIDE;
102102

103103
void layout(bool allowSubtree = true);
104104
bool didFirstLayout() const;
@@ -164,7 +164,7 @@ class FrameView : public ScrollView {
164164
void resetScrollbarsAndClearContentsSize();
165165
void prepareForDetach();
166166
void detachCustomScrollbars();
167-
virtual void recalculateScrollbarOverlayStyle();
167+
void recalculateScrollbarOverlayStyle();
168168

169169
void clear();
170170

@@ -184,19 +184,19 @@ class FrameView : public ScrollView {
184184

185185
void adjustViewSize();
186186

187-
virtual IntRect windowClipRect(bool clipToContents = true) const;
187+
virtual IntRect windowClipRect(bool clipToContents = true) const OVERRIDE;
188188
IntRect windowClipRectForFrameOwner(const HTMLFrameOwnerElement*, bool clipToLayerContents) const;
189189

190-
virtual IntRect windowResizerRect() const;
190+
virtual IntRect windowResizerRect() const OVERRIDE;
191191

192192
virtual float visibleContentScaleFactor() const OVERRIDE;
193193

194194
virtual void setFixedVisibleContentRect(const IntRect&) OVERRIDE;
195195
virtual void setScrollPosition(const IntPoint&) OVERRIDE;
196196
void scrollPositionChangedViaPlatformWidget();
197-
virtual void repaintFixedElementsAfterScrolling();
198-
virtual void updateFixedElementsAfterScrolling();
199-
virtual bool shouldRubberBandInDirection(ScrollDirection) const;
197+
virtual void repaintFixedElementsAfterScrolling() OVERRIDE;
198+
virtual void updateFixedElementsAfterScrolling() OVERRIDE;
199+
virtual bool shouldRubberBandInDirection(ScrollDirection) const OVERRIDE;
200200
virtual bool requestScrollPositionUpdate(const IntPoint&) OVERRIDE;
201201
virtual bool isRubberBandInProgress() const OVERRIDE;
202202
virtual IntPoint minimumScrollPosition() const OVERRIDE;
@@ -271,7 +271,7 @@ class FrameView : public ScrollView {
271271
void addWidgetToUpdate(RenderObject*);
272272
void removeWidgetToUpdate(RenderObject*);
273273

274-
virtual void paintContents(GraphicsContext*, const IntRect& damageRect);
274+
virtual void paintContents(GraphicsContext*, const IntRect& damageRect) OVERRIDE;
275275
void setPaintBehavior(PaintBehavior);
276276
PaintBehavior paintBehavior() const;
277277
bool isPainting() const;
@@ -283,8 +283,8 @@ class FrameView : public ScrollView {
283283
enum CoordinateSpaceForSnapshot { DocumentCoordinates, ViewCoordinates };
284284
void paintContentsForSnapshot(GraphicsContext*, const IntRect& imageRect, SelectionInSnapshot shouldPaintSelection, CoordinateSpaceForSnapshot);
285285

286-
virtual void paintOverhangAreas(GraphicsContext*, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect);
287-
virtual void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect);
286+
virtual void paintOverhangAreas(GraphicsContext*, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect) OVERRIDE;
287+
virtual void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect) OVERRIDE;
288288
virtual void paintScrollbar(GraphicsContext*, Scrollbar*, const IntRect&) OVERRIDE;
289289

290290
Color documentBackgroundColor() const;
@@ -330,10 +330,10 @@ class FrameView : public ScrollView {
330330
void scrollElementToRect(Element*, const IntRect&);
331331

332332
// Methods to convert points and rects between the coordinate space of the renderer, and this view.
333-
virtual IntRect convertFromRenderer(const RenderObject*, const IntRect&) const;
334-
virtual IntRect convertToRenderer(const RenderObject*, const IntRect&) const;
335-
virtual IntPoint convertFromRenderer(const RenderObject*, const IntPoint&) const;
336-
virtual IntPoint convertToRenderer(const RenderObject*, const IntPoint&) const;
333+
IntRect convertFromRenderer(const RenderObject*, const IntRect&) const;
334+
IntRect convertToRenderer(const RenderObject*, const IntRect&) const;
335+
IntPoint convertFromRenderer(const RenderObject*, const IntPoint&) const;
336+
IntPoint convertToRenderer(const RenderObject*, const IntPoint&) const;
337337

338338
bool isFrameViewScrollCorner(RenderScrollbarPart* scrollCorner) const { return m_scrollCorner == scrollCorner; }
339339

@@ -351,7 +351,7 @@ class FrameView : public ScrollView {
351351
// On each repaint the delay increses by this amount
352352
static void setRepaintThrottlingDeferredRepaintDelayIncrementDuringLoading(double p);
353353

354-
virtual IntPoint lastKnownMousePosition() const;
354+
virtual IntPoint lastKnownMousePosition() const OVERRIDE;
355355
virtual bool isHandlingWheelEvent() const OVERRIDE;
356356
bool shouldSetCursor() const;
357357

@@ -360,8 +360,8 @@ class FrameView : public ScrollView {
360360
// FIXME: Remove this method once plugin loading is decoupled from layout.
361361
void flushAnyPendingPostLayoutTasks();
362362

363-
virtual bool shouldSuspendScrollAnimations() const;
364-
virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate);
363+
virtual bool shouldSuspendScrollAnimations() const OVERRIDE;
364+
virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate) OVERRIDE;
365365

366366
void setAnimatorsAreActive();
367367

@@ -442,13 +442,13 @@ class FrameView : public ScrollView {
442442
void setScrollPinningBehavior(ScrollPinningBehavior);
443443

444444
protected:
445-
virtual bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);
446-
virtual void scrollContentsSlowPath(const IntRect& updateRect);
445+
virtual bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect) OVERRIDE;
446+
virtual void scrollContentsSlowPath(const IntRect& updateRect) OVERRIDE;
447447

448448
void repaintSlowRepaintObjects();
449449

450-
virtual bool isVerticalDocument() const;
451-
virtual bool isFlippedDocument() const;
450+
virtual bool isVerticalDocument() const OVERRIDE;
451+
virtual bool isFlippedDocument() const OVERRIDE;
452452

453453
private:
454454
explicit FrameView(Frame&);
@@ -479,12 +479,12 @@ class FrameView : public ScrollView {
479479
void performPostLayoutTasks();
480480
void autoSizeIfEnabled();
481481

482-
virtual void repaintContentRectangle(const IntRect&, bool immediate);
482+
virtual void repaintContentRectangle(const IntRect&, bool immediate) OVERRIDE;
483483
virtual void contentsResized() OVERRIDE;
484-
virtual void visibleContentsResized();
484+
virtual void visibleContentsResized() OVERRIDE;
485485
virtual void fixedLayoutSizeChanged() OVERRIDE;
486486

487-
virtual void delegatesScrollingDidChange();
487+
virtual void delegatesScrollingDidChange() OVERRIDE;
488488

489489
// Override ScrollView methods to do point conversion via renderers, in order to
490490
// take transforms into account.
@@ -535,7 +535,7 @@ class FrameView : public ScrollView {
535535

536536
bool hasCustomScrollbars() const;
537537

538-
virtual void updateScrollCorner();
538+
virtual void updateScrollCorner() OVERRIDE;
539539

540540
FrameView* parentFrameView() const;
541541

@@ -545,7 +545,7 @@ class FrameView : public ScrollView {
545545

546546
bool qualifiesAsVisuallyNonEmpty() const;
547547

548-
virtual AXObjectCache* axObjectCache() const;
548+
AXObjectCache* axObjectCache() const;
549549
void notifyWidgetsInAllFrames(WidgetNotification);
550550
void removeFromAXObjectCache();
551551

0 commit comments

Comments
 (0)