Changeset 153380 in webkit
- Timestamp:
- Jul 26, 2013 1:41:32 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 102 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r153378 r153380 1 2013-07-26 Andreas Kling <akling@apple.com> 2 3 Apply FINAL to the RenderObject hierarchy. 4 <http://webkit.org/b/115977> 5 6 Mostly from Blink r148795 by <cevans@chromium.org> 7 <http://src.chromium.org/viewvc/blink?view=revision&revision=148795> 8 9 * rendering/: Beat things with the FINAL stick. 10 * WebCore.exp.in: Export a now-needed symbol. 11 1 12 2013-07-26 Tim Horton <timothy_horton@apple.com> 2 13 -
trunk/Source/WebCore/WebCore.exp.in
r153378 r153380 81 81 __ZN7WebCore10Pasteboard14writePlainTextERKN3WTF6StringENS0_18SmartReplaceOptionE 82 82 __ZN7WebCore10Pasteboard17generalPasteboardEv 83 __ZN7WebCore10RenderPart9setWidgetEN3WTF10PassRefPtrINS_6WidgetEEE 83 84 __ZN7WebCore10RenderView10compositorEv 84 85 __ZN7WebCore10RenderView7hitTestERKNS_14HitTestRequestERNS_13HitTestResultE -
trunk/Source/WebCore/rendering/InlineFlowBox.h
r150312 r153380 81 81 InlineBox* lastChild() const { checkConsistency(); return m_lastChild; } 82 82 83 virtual bool isLeaf() const FINAL { return false; }83 virtual bool isLeaf() const OVERRIDE FINAL { return false; } 84 84 85 85 InlineBox* firstLeafChild() const; … … 89 89 void collectLeafBoxesInLogicalOrder(Vector<InlineBox*>&, CustomInlineBoxRangeReverse customReverseImplementation = 0, void* userData = 0) const; 90 90 91 virtual void setConstructed() FINAL91 virtual void setConstructed() OVERRIDE FINAL 92 92 { 93 93 InlineBox::setConstructed(); … … 97 97 98 98 void addToLine(InlineBox* child); 99 virtual void deleteLine(RenderArena*) FINAL;100 virtual void extractLine() FINAL;101 virtual void attachLine() FINAL;99 virtual void deleteLine(RenderArena*) OVERRIDE FINAL; 100 virtual void extractLine() OVERRIDE FINAL; 101 virtual void attachLine() OVERRIDE FINAL; 102 102 virtual void adjustPosition(float dx, float dy); 103 103 … … 110 110 IntRect roundedFrameRect() const; 111 111 112 v irtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&) FINAL;113 v irtual void paintMask(PaintInfo&, const LayoutPoint&) FINAL;112 void paintBoxDecorations(PaintInfo&, const LayoutPoint&); 113 void paintMask(PaintInfo&, const LayoutPoint&); 114 114 void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver); 115 115 void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver); … … 300 300 OwnPtr<RenderOverflow> m_overflow; 301 301 302 virtual bool isInlineFlowBox() const FINAL { return true; }302 virtual bool isInlineFlowBox() const OVERRIDE FINAL { return true; } 303 303 304 304 InlineBox* m_firstChild; -
trunk/Source/WebCore/rendering/InlineTextBox.h
r150525 r153380 58 58 } 59 59 60 virtual void destroy(RenderArena*) FINAL;60 virtual void destroy(RenderArena*) OVERRIDE FINAL; 61 61 62 62 InlineTextBox* prevTextBox() const { return m_prevTextBox; } … … 86 86 static inline bool compareByStart(const InlineTextBox* first, const InlineTextBox* second) { return first->start() < second->start(); } 87 87 88 virtual int baselinePosition(FontBaseline) const FINAL;89 virtual LayoutUnit lineHeight() const FINAL;88 virtual int baselinePosition(FontBaseline) const OVERRIDE FINAL; 89 virtual LayoutUnit lineHeight() const OVERRIDE FINAL; 90 90 91 91 bool getEmphasisMarkPosition(RenderStyle*, TextEmphasisPosition&) const; … … 126 126 127 127 private: 128 virtual void deleteLine(RenderArena*) FINAL;129 virtual void extractLine() FINAL;130 virtual void attachLine() FINAL;131 132 public: 133 virtual RenderObject::SelectionState selectionState() FINAL;134 135 private: 136 virtual void clearTruncation() FINAL { m_truncation = cNoTruncation; }128 virtual void deleteLine(RenderArena*) OVERRIDE FINAL; 129 virtual void extractLine() OVERRIDE FINAL; 130 virtual void attachLine() OVERRIDE FINAL; 131 132 public: 133 virtual RenderObject::SelectionState selectionState() OVERRIDE FINAL; 134 135 private: 136 virtual void clearTruncation() OVERRIDE FINAL { m_truncation = cNoTruncation; } 137 137 virtual float placeEllipsisBox(bool flowIsLTR, float visibleLeftEdge, float visibleRightEdge, float ellipsisWidth, float &truncatedWidth, bool& foundBox) OVERRIDE FINAL; 138 138 139 139 public: 140 virtual bool isLineBreak() const FINAL;140 virtual bool isLineBreak() const OVERRIDE FINAL; 141 141 142 142 void setExpansion(int newExpansion) … … 148 148 149 149 private: 150 virtual bool isInlineTextBox() const FINAL { return true; }151 152 public: 153 virtual int caretMinOffset() const FINAL;154 virtual int caretMaxOffset() const FINAL;150 virtual bool isInlineTextBox() const OVERRIDE FINAL { return true; } 151 152 public: 153 virtual int caretMinOffset() const OVERRIDE FINAL; 154 virtual int caretMaxOffset() const OVERRIDE FINAL; 155 155 156 156 private: -
trunk/Source/WebCore/rendering/RenderApplet.h
r150312 r153380 29 29 class HTMLAppletElement; 30 30 31 class RenderApplet : public RenderEmbeddedObject {31 class RenderApplet FINAL : public RenderEmbeddedObject { 32 32 public: 33 33 explicit RenderApplet(HTMLAppletElement*); -
trunk/Source/WebCore/rendering/RenderBR.h
r150312 r153380 32 32 class Position; 33 33 34 class RenderBR : public RenderText {34 class RenderBR FINAL : public RenderText { 35 35 public: 36 36 explicit RenderBR(Node*); -
trunk/Source/WebCore/rendering/RenderBlock.h
r152911 r153380 104 104 105 105 // These two functions are overridden for inline-block. 106 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const ;106 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL; 107 107 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const; 108 108 … … 160 160 void markSiblingsWithFloatsForLayout(RenderBox* floatToRemove = 0); 161 161 void markPositionedObjectsForLayout(); 162 virtual void markForPaginationRelayoutIfNeeded() ;162 virtual void markForPaginationRelayoutIfNeeded() OVERRIDE FINAL; 163 163 164 164 bool containsFloats() const { return m_floatingObjects && !m_floatingObjects->set().isEmpty(); } … … 232 232 233 233 // Block flows subclass availableWidth to handle multi column layout (shrinking the width available to children when laying out.) 234 virtual LayoutUnit availableLogicalWidth() const ;234 virtual LayoutUnit availableLogicalWidth() const OVERRIDE FINAL; 235 235 236 236 LayoutPoint flipForWritingModeIncludingColumns(const LayoutPoint&) const; … … 259 259 260 260 void adjustRectForColumns(LayoutRect&) const; 261 virtual void adjustForColumns(LayoutSize&, const LayoutPoint&) const ;261 virtual void adjustForColumns(LayoutSize&, const LayoutPoint&) const OVERRIDE FINAL; 262 262 void adjustForColumnRect(LayoutSize& offset, const LayoutPoint& locationInContainer) const; 263 263 … … 265 265 bool paintsContinuationOutline(RenderInline*); 266 266 267 virtual RenderBoxModelObject* virtualContinuation() const { return continuation(); }267 virtual RenderBoxModelObject* virtualContinuation() const OVERRIDE FINAL { return continuation(); } 268 268 bool isAnonymousBlockContinuation() const { return continuation() && isAnonymousBlock(); } 269 269 RenderInline* inlineElementContinuation() const; … … 618 618 virtual const char* renderName() const; 619 619 620 virtual bool isRenderBlock() const { return true; }621 virtual bool isBlockFlow() const { return (!isInline() || isReplaced()) && !isTable(); }622 virtual bool isInlineBlockOrInlineTable() const { return isInline() && isReplaced(); }620 virtual bool isRenderBlock() const OVERRIDE FINAL { return true; } 621 virtual bool isBlockFlow() const OVERRIDE FINAL { return (!isInline() || isReplaced()) && !isTable(); } 622 virtual bool isInlineBlockOrInlineTable() const OVERRIDE FINAL { return isInline() && isReplaced(); } 623 623 624 624 void makeChildrenNonInline(RenderObject* insertionPoint = 0); … … 627 627 void moveAllChildrenIncludingFloatsTo(RenderBlock* toBlock, bool fullRemoveInsert); 628 628 629 virtual void dirtyLinesFromChangedChild(RenderObject* child) { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }629 virtual void dirtyLinesFromChangedChild(RenderObject* child) OVERRIDE FINAL { m_lineBoxes.dirtyLinesFromChangedChild(this, child); } 630 630 631 631 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChild); … … 633 633 void addChildToAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild); 634 634 635 v irtual void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild = 0);636 637 virtual bool isSelfCollapsingBlock() const ;638 639 virtual LayoutUnit collapsedMarginBefore() const { return maxPositiveMarginBefore() - maxNegativeMarginBefore(); }640 virtual LayoutUnit collapsedMarginAfter() const { return maxPositiveMarginAfter() - maxNegativeMarginAfter(); }641 642 virtual void repaintOverhangingFloats(bool paintAllDescendants) OVERRIDE ;635 void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild = 0); 636 637 virtual bool isSelfCollapsingBlock() const OVERRIDE FINAL; 638 639 virtual LayoutUnit collapsedMarginBefore() const OVERRIDE FINAL { return maxPositiveMarginBefore() - maxNegativeMarginBefore(); } 640 virtual LayoutUnit collapsedMarginAfter() const OVERRIDE FINAL { return maxPositiveMarginAfter() - maxNegativeMarginAfter(); } 641 642 virtual void repaintOverhangingFloats(bool paintAllDescendants) OVERRIDE FINAL; 643 643 644 644 void layoutBlockChildren(bool relayoutChildren, LayoutUnit& maxFloatLogicalBottom); … … 921 921 LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit) const; 922 922 923 virtualbool hitTestColumns(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);923 bool hitTestColumns(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction); 924 924 virtual bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction); 925 925 bool hitTestFloats(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset); … … 933 933 // Obtains the nearest enclosing block (including this block) that contributes a first-line style to our inline 934 934 // children. 935 virtual RenderBlock* firstLineBlock() const ;936 937 virtual LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const OVERRIDE ;938 virtual RenderStyle* outlineStyleForRepaint() const ;939 940 virtual RenderObject* hoverAncestor() const ;941 virtual void updateDragState(bool dragOn) ;942 virtual void childBecameNonInline(RenderObject* child) ;943 944 virtual LayoutRect selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool /*clipToVisibleContent*/) OVERRIDE 935 virtual RenderBlock* firstLineBlock() const OVERRIDE; 936 937 virtual LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const OVERRIDE FINAL; 938 virtual RenderStyle* outlineStyleForRepaint() const OVERRIDE FINAL; 939 940 virtual RenderObject* hoverAncestor() const OVERRIDE FINAL; 941 virtual void updateDragState(bool dragOn) OVERRIDE FINAL; 942 virtual void childBecameNonInline(RenderObject* child) OVERRIDE FINAL; 943 944 virtual LayoutRect selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool /*clipToVisibleContent*/) OVERRIDE FINAL 945 945 { 946 946 return selectionGapRectsForRepaint(repaintContainer); 947 947 } 948 virtual bool shouldPaintSelectionGaps() const ;948 virtual bool shouldPaintSelectionGaps() const OVERRIDE FINAL; 949 949 bool isSelectionRoot() const; 950 950 GapRects selectionGaps(RenderBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock, … … 969 969 void paintContinuationOutlines(PaintInfo&, const LayoutPoint&); 970 970 971 virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) ;971 virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) OVERRIDE FINAL; 972 972 973 973 void adjustPointToColumnContents(LayoutPoint&) const; -
trunk/Source/WebCore/rendering/RenderBox.h
r153330 r153380 60 60 } 61 61 62 virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const OVERRIDE ;62 virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const OVERRIDE FINAL; 63 63 64 64 // Use this with caution! No type checking is done! … … 158 158 LayoutRect paddingBoxRect() const { return LayoutRect(borderLeft(), borderTop(), contentWidth() + paddingLeft() + paddingRight(), contentHeight() + paddingTop() + paddingBottom()); } 159 159 IntRect pixelSnappedBorderBoxRect() const { return IntRect(IntPoint(), m_frameRect.pixelSnappedSize()); } 160 virtual IntRect borderBoundingBox() const { return pixelSnappedBorderBoxRect(); }160 virtual IntRect borderBoundingBox() const OVERRIDE FINAL { return pixelSnappedBorderBoxRect(); } 161 161 162 162 // The content area of the box (excludes padding - and intrinsic padding for table cells, etc... - and border). … … 172 172 173 173 // Bounds of the outline box in absolute coords. Respects transforms 174 virtual LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* /*repaintContainer*/, const RenderGeometryMap*) const OVERRIDE ;174 virtual LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* /*repaintContainer*/, const RenderGeometryMap*) const OVERRIDE FINAL; 175 175 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE; 176 176 … … 213 213 virtual LayoutUnit offsetHeight() const { return height(); } 214 214 215 virtual int pixelSnappedOffsetWidth() const OVERRIDE ;216 virtual int pixelSnappedOffsetHeight() const OVERRIDE ;215 virtual int pixelSnappedOffsetWidth() const OVERRIDE FINAL; 216 virtual int pixelSnappedOffsetHeight() const OVERRIDE FINAL; 217 217 218 218 // More IE extensions. clientWidth and clientHeight represent the interior of an object … … 251 251 void setMarginRight(LayoutUnit margin) { m_marginBox.setRight(margin); } 252 252 253 virtualLayoutUnit marginLogicalLeft() const { return m_marginBox.logicalLeft(style()->writingMode()); }254 virtualLayoutUnit marginLogicalRight() const { return m_marginBox.logicalRight(style()->writingMode()); }255 256 virtual LayoutUnit marginBefore(const RenderStyle* overrideStyle = 0) const OVERRIDE { return m_marginBox.before((overrideStyle ? overrideStyle : style())->writingMode()); }257 virtual LayoutUnit marginAfter(const RenderStyle* overrideStyle = 0) const OVERRIDE { return m_marginBox.after((overrideStyle ? overrideStyle : style())->writingMode()); }258 virtual LayoutUnit marginStart(const RenderStyle* overrideStyle = 0) const OVERRIDE 253 LayoutUnit marginLogicalLeft() const { return m_marginBox.logicalLeft(style()->writingMode()); } 254 LayoutUnit marginLogicalRight() const { return m_marginBox.logicalRight(style()->writingMode()); } 255 256 virtual LayoutUnit marginBefore(const RenderStyle* overrideStyle = 0) const OVERRIDE FINAL { return m_marginBox.before((overrideStyle ? overrideStyle : style())->writingMode()); } 257 virtual LayoutUnit marginAfter(const RenderStyle* overrideStyle = 0) const OVERRIDE FINAL { return m_marginBox.after((overrideStyle ? overrideStyle : style())->writingMode()); } 258 virtual LayoutUnit marginStart(const RenderStyle* overrideStyle = 0) const OVERRIDE FINAL 259 259 { 260 260 const RenderStyle* styleToUse = overrideStyle ? overrideStyle : style(); 261 261 return m_marginBox.start(styleToUse->writingMode(), styleToUse->direction()); 262 262 } 263 virtual LayoutUnit marginEnd(const RenderStyle* overrideStyle = 0) const OVERRIDE 263 virtual LayoutUnit marginEnd(const RenderStyle* overrideStyle = 0) const OVERRIDE FINAL 264 264 { 265 265 const RenderStyle* styleToUse = overrideStyle ? overrideStyle : style(); … … 553 553 virtual bool hasRelativeDimensions() const; 554 554 virtual bool hasRelativeLogicalHeight() const; 555 virtualbool hasViewportPercentageLogicalHeight() const;555 bool hasViewportPercentageLogicalHeight() const; 556 556 557 557 bool hasHorizontalLayoutOverflow() const … … 673 673 virtual void computePreferredLogicalWidths() { setPreferredLogicalWidthsDirty(false); } 674 674 675 virtual LayoutRect frameRectForStickyPositioning() const OVERRIDE { return frameRect(); }675 virtual LayoutRect frameRectForStickyPositioning() const OVERRIDE FINAL { return frameRect(); } 676 676 677 677 private: -
trunk/Source/WebCore/rendering/RenderBoxModelObject.h
r152293 r153380 303 303 private: 304 304 LayoutUnit computedCSSPadding(Length) const; 305 virtual bool isBoxModelObject() const { return true; }305 virtual bool isBoxModelObject() const OVERRIDE FINAL { return true; } 306 306 307 307 virtual LayoutRect frameRectForStickyPositioning() const = 0; -
trunk/Source/WebCore/rendering/RenderButton.h
r151799 r153380 33 33 // For inputs, they will also generate an anonymous RenderText and keep its style and content up 34 34 // to date as the button changes. 35 class RenderButton : public RenderFlexibleBox {35 class RenderButton FINAL : public RenderFlexibleBox { 36 36 public: 37 37 explicit RenderButton(Element*); -
trunk/Source/WebCore/rendering/RenderCombineText.h
r150312 r153380 27 27 namespace WebCore { 28 28 29 class RenderCombineText : public RenderText {29 class RenderCombineText FINAL : public RenderText { 30 30 public: 31 31 RenderCombineText(Node*, PassRefPtr<StringImpl>); -
trunk/Source/WebCore/rendering/RenderCounter.h
r150312 r153380 30 30 class CounterNode; 31 31 32 class RenderCounter : public RenderText {32 class RenderCounter FINAL : public RenderText { 33 33 public: 34 34 RenderCounter(Document*, const CounterContent&); -
trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h
r150312 r153380 30 30 class FlexBoxIterator; 31 31 32 class RenderDeprecatedFlexibleBox : public RenderBlock {32 class RenderDeprecatedFlexibleBox FINAL : public RenderBlock { 33 33 public: 34 34 RenderDeprecatedFlexibleBox(Element*); -
trunk/Source/WebCore/rendering/RenderDetailsMarker.h
r150876 r153380 27 27 namespace WebCore { 28 28 29 class RenderDetailsMarker : public RenderBlock {29 class RenderDetailsMarker FINAL : public RenderBlock { 30 30 public: 31 31 RenderDetailsMarker(Element*); -
trunk/Source/WebCore/rendering/RenderEmbeddedObject.h
r153017 r153380 61 61 62 62 #if USE(ACCELERATED_COMPOSITING) 63 virtualbool allowsAcceleratedCompositing() const;63 bool allowsAcceleratedCompositing() const; 64 64 #endif 65 65 66 66 protected: 67 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) ;68 virtual void paint(PaintInfo&, const LayoutPoint&) ;67 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 68 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 69 69 70 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const ;70 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const OVERRIDE; 71 71 72 72 const RenderObjectChildList* children() const { return &m_children; } … … 78 78 private: 79 79 virtual const char* renderName() const { return "RenderEmbeddedObject"; } 80 virtual bool isEmbeddedObject() const { return true; }80 virtual bool isEmbeddedObject() const OVERRIDE FINAL { return true; } 81 81 82 82 void paintSnapshotImage(PaintInfo&, const LayoutPoint&, Image*); 83 virtual void paintContents(PaintInfo&, const LayoutPoint&) OVERRIDE ;83 virtual void paintContents(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 84 84 85 85 #if USE(ACCELERATED_COMPOSITING) 86 virtual bool requiresLayer() const ;86 virtual bool requiresLayer() const OVERRIDE FINAL; 87 87 #endif 88 88 89 virtual void viewCleared() ;89 virtual void viewCleared() OVERRIDE FINAL; 90 90 91 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE ;91 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE FINAL; 92 92 93 virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier, Node** stopNode) ;94 virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier, Node** stopNode) ;93 virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier, Node** stopNode) OVERRIDE FINAL; 94 virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier, Node** stopNode) OVERRIDE FINAL; 95 95 96 96 void setUnavailablePluginIndicatorIsPressed(bool); … … 100 100 LayoutRect unavailablePluginIndicatorBounds(const LayoutPoint&) const; 101 101 102 virtual bool canHaveChildren() const ;103 virtual RenderObjectChildList* virtualChildren() { return children(); }104 virtual const RenderObjectChildList* virtualChildren() const { return children(); }102 virtual bool canHaveChildren() const OVERRIDE FINAL; 103 virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return children(); } 104 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); } 105 105 106 106 virtual bool canHaveWidget() const { return true; } -
trunk/Source/WebCore/rendering/RenderFieldset.h
r150312 r153380 29 29 namespace WebCore { 30 30 31 class RenderFieldset : public RenderBlock {31 class RenderFieldset FINAL : public RenderBlock { 32 32 public: 33 33 explicit RenderFieldset(Element*); -
trunk/Source/WebCore/rendering/RenderFileUploadControl.h
r150312 r153380 32 32 // associated with it to receive click/hover events. 33 33 34 class RenderFileUploadControl : public RenderBlock {34 class RenderFileUploadControl FINAL : public RenderBlock { 35 35 public: 36 36 RenderFileUploadControl(HTMLInputElement*); -
trunk/Source/WebCore/rendering/RenderFlexibleBox.h
r150312 r153380 45 45 virtual const char* renderName() const OVERRIDE; 46 46 47 virtual bool isFlexibleBox() const OVERRIDE { return true; }48 virtual bool avoidsFloats() const OVERRIDE { return true; }49 virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; }50 virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) OVERRIDE ;47 virtual bool isFlexibleBox() const OVERRIDE FINAL { return true; } 48 virtual bool avoidsFloats() const OVERRIDE FINAL { return true; } 49 virtual bool canCollapseAnonymousBlockChild() const OVERRIDE FINAL { return false; } 50 virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) OVERRIDE FINAL; 51 51 52 52 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE; … … 54 54 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE; 55 55 56 virtual void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) OVERRIDE ;56 virtual void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) OVERRIDE FINAL; 57 57 58 58 bool isHorizontalFlow() const; -
trunk/Source/WebCore/rendering/RenderFlowThread.h
r152572 r153380 58 58 virtual ~RenderFlowThread() { }; 59 59 60 virtual bool isRenderFlowThread() const { return true; }61 62 virtual void layout() ;60 virtual bool isRenderFlowThread() const OVERRIDE FINAL { return true; } 61 62 virtual void layout() OVERRIDE FINAL; 63 63 64 64 // Always create a RenderLayer for the RenderFlowThread so that we 65 65 // can easily avoid drawing the children directly. 66 virtual bool requiresLayer() const { return true; }66 virtual bool requiresLayer() const OVERRIDE FINAL { return true; } 67 67 68 68 void removeFlowChildInfo(RenderObject*); … … 75 75 const RenderRegionList& renderRegionList() const { return m_regionList; } 76 76 77 virtual void updateLogicalWidth() OVERRIDE ;77 virtual void updateLogicalWidth() OVERRIDE FINAL; 78 78 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE; 79 79 -
trunk/Source/WebCore/rendering/RenderFrame.h
r150312 r153380 31 31 class HTMLFrameElement; 32 32 33 class RenderFrame : public RenderFrameBase {33 class RenderFrame FINAL : public RenderFrameBase { 34 34 public: 35 35 explicit RenderFrame(HTMLFrameElement*); -
trunk/Source/WebCore/rendering/RenderFrameSet.h
r150312 r153380 54 54 }; 55 55 56 class RenderFrameSet : public RenderBox {56 class RenderFrameSet FINAL : public RenderBox { 57 57 public: 58 58 RenderFrameSet(HTMLFrameSetElement*); -
trunk/Source/WebCore/rendering/RenderFullScreen.cpp
r150312 r153380 37 37 using namespace WebCore; 38 38 39 class RenderFullScreenPlaceholder : public RenderBlock {39 class RenderFullScreenPlaceholder FINAL : public RenderBlock { 40 40 public: 41 41 RenderFullScreenPlaceholder(RenderFullScreen* owner) -
trunk/Source/WebCore/rendering/RenderFullScreen.h
r150312 r153380 33 33 namespace WebCore { 34 34 35 class RenderFullScreen : public RenderFlexibleBox {35 class RenderFullScreen FINAL : public RenderFlexibleBox { 36 36 public: 37 37 static RenderFullScreen* createAnonymous(Document*); -
trunk/Source/WebCore/rendering/RenderGrid.h
r150312 r153380 33 33 class GridTrack; 34 34 35 class RenderGrid : public RenderBlock {35 class RenderGrid FINAL : public RenderBlock { 36 36 public: 37 37 RenderGrid(Element*); -
trunk/Source/WebCore/rendering/RenderHTMLCanvas.h
r150312 r153380 33 33 class HTMLCanvasElement; 34 34 35 class RenderHTMLCanvas : public RenderReplaced {35 class RenderHTMLCanvas FINAL : public RenderReplaced { 36 36 public: 37 37 explicit RenderHTMLCanvas(HTMLCanvasElement*); -
trunk/Source/WebCore/rendering/RenderIFrame.h
r150312 r153380 33 33 class RenderView; 34 34 35 class RenderIFrame : public RenderFrameBase {35 class RenderIFrame FINAL : public RenderFrameBase { 36 36 public: 37 37 explicit RenderIFrame(Element*); -
trunk/Source/WebCore/rendering/RenderImage.h
r150312 r153380 63 63 64 64 protected: 65 virtual bool needsPreferredWidthsRecalculation() const ;66 virtual RenderBox* embeddedContentBox() const ;67 virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const ;65 virtual bool needsPreferredWidthsRecalculation() const OVERRIDE FINAL; 66 virtual RenderBox* embeddedContentBox() const OVERRIDE FINAL; 67 virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const OVERRIDE FINAL; 68 68 virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const OVERRIDE; 69 69 70 virtual void styleDidChange(StyleDifference, const RenderStyle*) ;70 virtual void styleDidChange(StyleDifference, const RenderStyle*) OVERRIDE FINAL; 71 71 72 72 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0); 73 73 74 v irtual void paintIntoRect(GraphicsContext*, const LayoutRect&);75 virtual void paint(PaintInfo&, const LayoutPoint&) ;74 void paintIntoRect(GraphicsContext*, const LayoutRect&); 75 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 76 76 virtual void layout(); 77 77 … … 86 86 87 87 virtual bool isImage() const { return true; } 88 virtual bool isRenderImage() const { return true; }88 virtual bool isRenderImage() const OVERRIDE FINAL { return true; } 89 89 90 90 virtual void paintReplaced(PaintInfo&, const LayoutPoint&); 91 91 92 virtual bool computeBackgroundIsKnownToBeObscured() OVERRIDE ;92 virtual bool computeBackgroundIsKnownToBeObscured() OVERRIDE FINAL; 93 93 94 94 virtual LayoutUnit minimumReplacedHeight() const OVERRIDE; 95 95 96 virtual void notifyFinished(CachedResource*) ;97 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE ;96 virtual void notifyFinished(CachedResource*) OVERRIDE FINAL; 97 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE FINAL; 98 98 99 virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox*) const OVERRIDE ;99 virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox*) const OVERRIDE FINAL; 100 100 101 101 IntSize imageSizeForError(CachedImage*) const; -
trunk/Source/WebCore/rendering/RenderInline.h
r150312 r153380 45 45 Element* node() const { return toElement(RenderBoxModelObject::node()); } 46 46 47 virtual LayoutUnit marginLeft() const ;48 virtual LayoutUnit marginRight() const ;49 virtual LayoutUnit marginTop() const ;50 virtual LayoutUnit marginBottom() const ;51 virtual LayoutUnit marginBefore(const RenderStyle* otherStyle = 0) const ;52 virtual LayoutUnit marginAfter(const RenderStyle* otherStyle = 0) const ;53 virtual LayoutUnit marginStart(const RenderStyle* otherStyle = 0) const ;54 virtual LayoutUnit marginEnd(const RenderStyle* otherStyle = 0) const ;55 56 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const ;47 virtual LayoutUnit marginLeft() const OVERRIDE FINAL; 48 virtual LayoutUnit marginRight() const OVERRIDE FINAL; 49 virtual LayoutUnit marginTop() const OVERRIDE FINAL; 50 virtual LayoutUnit marginBottom() const OVERRIDE FINAL; 51 virtual LayoutUnit marginBefore(const RenderStyle* otherStyle = 0) const OVERRIDE FINAL; 52 virtual LayoutUnit marginAfter(const RenderStyle* otherStyle = 0) const OVERRIDE FINAL; 53 virtual LayoutUnit marginStart(const RenderStyle* otherStyle = 0) const OVERRIDE FINAL; 54 virtual LayoutUnit marginEnd(const RenderStyle* otherStyle = 0) const OVERRIDE FINAL; 55 56 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const OVERRIDE FINAL; 57 57 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const; 58 58 59 virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const ;59 virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const OVERRIDE FINAL; 60 60 61 61 IntRect linesBoundingBox() const; … … 75 75 InlineBox* lastLineBoxIncludingCulling() const { return alwaysCreateLineBoxes() ? lastLineBox() : culledInlineLastLineBox(); } 76 76 77 virtual RenderBoxModelObject* virtualContinuation() const { return continuation(); }77 virtual RenderBoxModelObject* virtualContinuation() const OVERRIDE FINAL { return continuation(); } 78 78 RenderInline* inlineElementContinuation() const; 79 79 80 virtual void updateDragState(bool dragOn) ;80 virtual void updateDragState(bool dragOn) OVERRIDE FINAL; 81 81 82 82 LayoutSize offsetForInFlowPositionedInline(const RenderBox* child) const; 83 83 84 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE ;84 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE FINAL; 85 85 void paintOutline(PaintInfo&, const LayoutPoint&); 86 86 … … 92 92 void updateAlwaysCreateLineBoxes(bool fullLayout); 93 93 94 virtual LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToEndOfLine) OVERRIDE ;94 virtual LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToEndOfLine) OVERRIDE FINAL; 95 95 96 96 bool hitTestCulledInline(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset); … … 102 102 103 103 private: 104 virtual RenderObjectChildList* virtualChildren() { return children(); }105 virtual const RenderObjectChildList* virtualChildren() const { return children(); }104 virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return children(); } 105 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); } 106 106 const RenderObjectChildList* children() const { return &m_children; } 107 107 RenderObjectChildList* children() { return &m_children; } … … 109 109 virtual const char* renderName() const; 110 110 111 virtual bool isRenderInline() const { return true; }111 virtual bool isRenderInline() const OVERRIDE FINAL { return true; } 112 112 113 113 LayoutRect culledInlineVisualOverflowBoundingBox() const; … … 121 121 122 122 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChild); 123 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild = 0) ;123 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE FINAL; 124 124 125 125 void splitInlines(RenderBlock* fromBlock, RenderBlock* toBlock, RenderBlock* middleBlock, … … 128 128 RenderObject* newChild, RenderBoxModelObject* oldCont); 129 129 130 virtual void layout() { ASSERT_NOT_REACHED(); } // Do nothing for layout()131 132 virtual void paint(PaintInfo&, const LayoutPoint&) ;133 134 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE ;135 136 virtual bool requiresLayer() const { return isInFlowPositioned() || createsGroup() || hasClipPath(); }137 138 virtual LayoutUnit offsetLeft() const ;139 virtual LayoutUnit offsetTop() const ;140 virtual LayoutUnit offsetWidth() const { return linesBoundingBox().width(); }141 virtual LayoutUnit offsetHeight() const { return linesBoundingBox().height(); }130 virtual void layout() OVERRIDE FINAL { ASSERT_NOT_REACHED(); } // Do nothing for layout() 131 132 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 133 134 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE FINAL; 135 136 virtual bool requiresLayer() const OVERRIDE { return isInFlowPositioned() || createsGroup() || hasClipPath(); } 137 138 virtual LayoutUnit offsetLeft() const OVERRIDE FINAL; 139 virtual LayoutUnit offsetTop() const OVERRIDE FINAL; 140 virtual LayoutUnit offsetWidth() const OVERRIDE FINAL { return linesBoundingBox().width(); } 141 virtual LayoutUnit offsetHeight() const OVERRIDE FINAL { return linesBoundingBox().height(); } 142 142 143 143 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const OVERRIDE; 144 virtual LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const OVERRIDE ;145 virtual void computeRectForRepaint(const RenderLayerModelObject* repaintContainer, LayoutRect&, bool fixed) const OVERRIDE ;144 virtual LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const OVERRIDE FINAL; 145 virtual void computeRectForRepaint(const RenderLayerModelObject* repaintContainer, LayoutRect&, bool fixed) const OVERRIDE FINAL; 146 146 147 147 virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE; 148 148 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE; 149 149 150 virtual VisiblePosition positionForPoint(const LayoutPoint&) ;151 152 virtual LayoutRect frameRectForStickyPositioning() const OVERRIDE { return linesBoundingBox(); }153 154 virtual IntRect borderBoundingBox() const 150 virtual VisiblePosition positionForPoint(const LayoutPoint&) OVERRIDE FINAL; 151 152 virtual LayoutRect frameRectForStickyPositioning() const OVERRIDE FINAL { return linesBoundingBox(); } 153 154 virtual IntRect borderBoundingBox() const OVERRIDE FINAL 155 155 { 156 156 IntRect boundingBox = linesBoundingBox(); … … 160 160 virtual InlineFlowBox* createInlineFlowBox(); // Subclassed by SVG and Ruby 161 161 162 virtual void dirtyLinesFromChangedChild(RenderObject* child) { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }163 164 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const ;165 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const ;166 167 virtual void childBecameNonInline(RenderObject* child) ;168 169 virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) ;170 171 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) ;162 virtual void dirtyLinesFromChangedChild(RenderObject* child) OVERRIDE FINAL { m_lineBoxes.dirtyLinesFromChangedChild(this, child); } 163 164 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL; 165 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL; 166 167 virtual void childBecameNonInline(RenderObject* child) OVERRIDE FINAL; 168 169 virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) OVERRIDE FINAL; 170 171 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE FINAL; 172 172 173 173 #if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION) 174 virtual void addAnnotatedRegions(Vector<AnnotatedRegionValue>&) ;174 virtual void addAnnotatedRegions(Vector<AnnotatedRegionValue>&) OVERRIDE FINAL; 175 175 #endif 176 176 177 virtual void updateFromStyle() OVERRIDE ;177 virtual void updateFromStyle() OVERRIDE FINAL; 178 178 179 179 RenderInline* clone() const; -
trunk/Source/WebCore/rendering/RenderLayerModelObject.h
r151685 r153380 60 60 61 61 private: 62 virtual bool isLayerModelObject() const OVERRIDE { return true; }62 virtual bool isLayerModelObject() const OVERRIDE FINAL { return true; } 63 63 64 64 RenderLayer* m_layer; -
trunk/Source/WebCore/rendering/RenderListBox.h
r151799 r153380 39 39 class HTMLSelectElement; 40 40 41 class RenderListBox : public RenderBlock, private ScrollableArea {41 class RenderListBox FINAL : public RenderBlock, private ScrollableArea { 42 42 public: 43 43 explicit RenderListBox(Element*); -
trunk/Source/WebCore/rendering/RenderListItem.h
r150312 r153380 31 31 class RenderListMarker; 32 32 33 class RenderListItem : public RenderBlock {33 class RenderListItem FINAL : public RenderBlock { 34 34 public: 35 35 explicit RenderListItem(Element*); -
trunk/Source/WebCore/rendering/RenderListMarker.h
r150312 r153380 34 34 // Used to render the list item's marker. 35 35 // The RenderListMarker always has to be a child of a RenderListItem. 36 class RenderListMarker : public RenderBox {36 class RenderListMarker FINAL : public RenderBox { 37 37 public: 38 38 static RenderListMarker* createAnonymous(RenderListItem*); -
trunk/Source/WebCore/rendering/RenderMedia.h
r150312 r153380 53 53 54 54 private: 55 virtual RenderObjectChildList* virtualChildren() { return children(); }56 virtual const RenderObjectChildList* virtualChildren() const { return children(); }57 virtual bool canHaveChildren() const { return true; }55 virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return children(); } 56 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); } 57 virtual bool canHaveChildren() const OVERRIDE FINAL { return true; } 58 58 59 59 virtual const char* renderName() const { return "RenderMedia"; } 60 virtual bool isMedia() const { return true; }61 virtual bool isImage() const { return false; }60 virtual bool isMedia() const OVERRIDE FINAL { return true; } 61 virtual bool isImage() const OVERRIDE FINAL { return false; } 62 62 virtual void paintReplaced(PaintInfo&, const LayoutPoint&); 63 63 64 virtual bool requiresForcedStyleRecalcPropagation() const { return true; }64 virtual bool requiresForcedStyleRecalcPropagation() const OVERRIDE FINAL { return true; } 65 65 66 66 RenderObjectChildList m_children; -
trunk/Source/WebCore/rendering/RenderMediaControlElements.h
r150312 r153380 37 37 namespace WebCore { 38 38 39 class RenderMediaVolumeSliderContainer : public RenderBlock {39 class RenderMediaVolumeSliderContainer FINAL : public RenderBlock { 40 40 public: 41 41 RenderMediaVolumeSliderContainer(Element*); … … 47 47 // ---------------------------- 48 48 49 class RenderMediaControlTimelineContainer : public RenderFlexibleBox {49 class RenderMediaControlTimelineContainer FINAL : public RenderFlexibleBox { 50 50 public: 51 51 RenderMediaControlTimelineContainer(Element*); … … 59 59 #if ENABLE(VIDEO_TRACK) 60 60 61 class RenderTextTrackContainerElement : public RenderBlock {61 class RenderTextTrackContainerElement FINAL : public RenderBlock { 62 62 public: 63 63 RenderTextTrackContainerElement(Element*); -
trunk/Source/WebCore/rendering/RenderMenuList.h
r153094 r153380 41 41 class RenderText; 42 42 43 class RenderMenuList : public RenderFlexibleBox, private PopupMenuClient {43 class RenderMenuList FINAL : public RenderFlexibleBox, private PopupMenuClient { 44 44 45 45 public: -
trunk/Source/WebCore/rendering/RenderMeter.h
r150312 r153380 31 31 class HTMLMeterElement; 32 32 33 class RenderMeter : public RenderBlock {33 class RenderMeter FINAL : public RenderBlock { 34 34 public: 35 35 explicit RenderMeter(HTMLElement*); -
trunk/Source/WebCore/rendering/RenderMultiColumnBlock.h
r151545 r153380 34 34 class RenderMultiColumnFlowThread; 35 35 36 class RenderMultiColumnBlock : public RenderBlock {36 class RenderMultiColumnBlock FINAL : public RenderBlock { 37 37 public: 38 38 RenderMultiColumnBlock(Element*); -
trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h
r151545 r153380 32 32 namespace WebCore { 33 33 34 class RenderMultiColumnFlowThread : public RenderFlowThread {34 class RenderMultiColumnFlowThread FINAL : public RenderFlowThread { 35 35 public: 36 36 ~RenderMultiColumnFlowThread(); -
trunk/Source/WebCore/rendering/RenderMultiColumnSet.h
r151545 r153380 42 42 // Column spans result in the creation of new column sets as well, since a spanning region has to be placed in between the column sets that 43 43 // come before and after the span. 44 class RenderMultiColumnSet : public RenderRegionSet {44 class RenderMultiColumnSet FINAL : public RenderRegionSet { 45 45 public: 46 46 static RenderMultiColumnSet* createAnonymous(RenderFlowThread*); -
trunk/Source/WebCore/rendering/RenderNamedFlowThread.h
r151843 r153380 44 44 typedef ListHashSet<Node*> NamedFlowContentNodes; 45 45 46 class RenderNamedFlowThread : public RenderFlowThread {46 class RenderNamedFlowThread FINAL : public RenderFlowThread { 47 47 public: 48 48 virtual ~RenderNamedFlowThread(); -
trunk/Source/WebCore/rendering/RenderPart.h
r150312 r153380 34 34 virtual ~RenderPart(); 35 35 36 virtual void setWidget(PassRefPtr<Widget>) ;36 virtual void setWidget(PassRefPtr<Widget>) OVERRIDE FINAL; 37 37 virtual void viewCleared(); 38 38 … … 41 41 #endif 42 42 43 virtual bool needsPreferredWidthsRecalculation() const ;44 virtual RenderBox* embeddedContentBox() const ;43 virtual bool needsPreferredWidthsRecalculation() const OVERRIDE FINAL; 44 virtual RenderBox* embeddedContentBox() const OVERRIDE FINAL; 45 45 46 46 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE; … … 48 48 protected: 49 49 #if USE(ACCELERATED_COMPOSITING) 50 virtual bool requiresLayer() const ;50 virtual bool requiresLayer() const OVERRIDE; 51 51 #endif 52 52 53 53 private: 54 virtual bool isRenderPart() const { return true; }55 virtual const char* renderName() const { return "RenderPart"; }54 virtual bool isRenderPart() const OVERRIDE FINAL { return true; } 55 virtual const char* renderName() const OVERRIDE { return "RenderPart"; } 56 56 }; 57 57 -
trunk/Source/WebCore/rendering/RenderProgress.h
r150312 r153380 29 29 class HTMLProgressElement; 30 30 31 class RenderProgress : public RenderBlock {31 class RenderProgress FINAL : public RenderBlock { 32 32 public: 33 33 explicit RenderProgress(HTMLElement*); -
trunk/Source/WebCore/rendering/RenderRegion.h
r152320 r153380 47 47 explicit RenderRegion(Element*, RenderFlowThread*); 48 48 49 virtual bool isRenderRegion() const { return true; }49 virtual bool isRenderRegion() const OVERRIDE FINAL { return true; } 50 50 51 51 virtual bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE; -
trunk/Source/WebCore/rendering/RenderRegionSet.h
r150312 r153380 54 54 55 55 private: 56 virtual void installFlowThread() OVERRIDE ;56 virtual void installFlowThread() OVERRIDE FINAL; 57 57 58 virtual void expandToEncompassFlowThreadContentsIfNeeded() OVERRIDE ;58 virtual void expandToEncompassFlowThreadContentsIfNeeded() OVERRIDE FINAL; 59 59 60 60 virtual const char* renderName() const = 0; 61 61 62 virtual bool isRenderRegionSet() const OVERRIDE { return true; }62 virtual bool isRenderRegionSet() const OVERRIDE FINAL { return true; } 63 63 }; 64 64 -
trunk/Source/WebCore/rendering/RenderReplaced.h
r151799 r153380 44 44 virtual void layout(); 45 45 46 virtual LayoutSize intrinsicSize() const OVERRIDE { return m_intrinsicSize; }46 virtual LayoutSize intrinsicSize() const OVERRIDE FINAL { return m_intrinsicSize; } 47 47 virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const; 48 48 49 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE ;49 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE FINAL; 50 50 51 51 virtual LayoutUnit minimumReplacedHeight() const { return LayoutUnit(); } … … 61 61 virtual bool hasRelativeIntrinsicLogicalWidth() const { return false; } 62 62 63 virtual void paint(PaintInfo&, const LayoutPoint&) ;63 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 64 64 bool shouldPaint(PaintInfo&, const LayoutPoint&); 65 65 LayoutRect localSelectionRect(bool checkWhetherSelected = true) const; // This is in local coordinates, but it's a physical rect (so the top left corner is physical top left). … … 67 67 private: 68 68 virtual RenderBox* embeddedContentBox() const { return 0; } 69 virtual const char* renderName() const { return "RenderReplaced"; }69 virtual const char* renderName() const OVERRIDE { return "RenderReplaced"; } 70 70 71 71 virtual bool canHaveChildren() const { return false; } 72 72 73 virtual void computePreferredLogicalWidths() ;73 virtual void computePreferredLogicalWidths() OVERRIDE FINAL; 74 74 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) { } 75 75 76 76 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const OVERRIDE; 77 77 78 virtual VisiblePosition positionForPoint(const LayoutPoint&) ;78 virtual VisiblePosition positionForPoint(const LayoutPoint&) OVERRIDE FINAL; 79 79 80 80 virtual bool canBeSelectionLeaf() const { return true; } 81 81 82 virtual LayoutRect selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool clipToVisibleContent = true) OVERRIDE ;82 virtual LayoutRect selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool clipToVisibleContent = true) OVERRIDE FINAL; 83 83 void computeAspectRatioInformationForRenderBox(RenderBox*, FloatSize& constrainedSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const; 84 84 -
trunk/Source/WebCore/rendering/RenderReplica.h
r150312 r153380 34 34 namespace WebCore { 35 35 36 class RenderReplica : public RenderBox {36 class RenderReplica FINAL : public RenderBox { 37 37 public: 38 38 static RenderReplica* createAnonymous(Document*); -
trunk/Source/WebCore/rendering/RenderRuby.h
r150312 r153380 52 52 53 53 // <ruby> when used as 'display:inline' 54 class RenderRubyAsInline : public RenderInline {54 class RenderRubyAsInline FINAL : public RenderInline { 55 55 public: 56 56 RenderRubyAsInline(Element*); … … 71 71 72 72 // <ruby> when used as 'display:block' or 'display:inline-block' 73 class RenderRubyAsBlock : public RenderBlock {73 class RenderRubyAsBlock FINAL : public RenderBlock { 74 74 public: 75 75 RenderRubyAsBlock(Element*); -
trunk/Source/WebCore/rendering/RenderRubyBase.h
r150312 r153380 38 38 class RenderRubyRun; 39 39 40 class RenderRubyBase : public RenderBlock {40 class RenderRubyBase FINAL : public RenderBlock { 41 41 public: 42 42 virtual ~RenderRubyBase(); -
trunk/Source/WebCore/rendering/RenderRubyRun.h
r150312 r153380 42 42 // See RenderRuby.h for further comments on the structure 43 43 44 class RenderRubyRun : public RenderBlock {44 class RenderRubyRun FINAL : public RenderBlock { 45 45 public: 46 46 virtual ~RenderRubyRun(); -
trunk/Source/WebCore/rendering/RenderRubyText.h
r150312 r153380 36 36 namespace WebCore { 37 37 38 class RenderRubyText : public RenderBlock {38 class RenderRubyText FINAL : public RenderBlock { 39 39 public: 40 40 RenderRubyText(Element*); -
trunk/Source/WebCore/rendering/RenderScrollbarPart.h
r150312 r153380 34 34 class RenderScrollbar; 35 35 36 class RenderScrollbarPart : public RenderBlock {36 class RenderScrollbarPart FINAL : public RenderBlock { 37 37 public: 38 38 static RenderScrollbarPart* createAnonymous(Document*, RenderScrollbar* = 0, ScrollbarPart = NoPart); -
trunk/Source/WebCore/rendering/RenderSearchField.h
r150312 r153380 32 32 class SearchPopupMenu; 33 33 34 class RenderSearchField : public RenderTextControlSingleLine, private PopupMenuClient {34 class RenderSearchField FINAL : public RenderTextControlSingleLine, private PopupMenuClient { 35 35 public: 36 36 RenderSearchField(Element*); -
trunk/Source/WebCore/rendering/RenderSlider.h
r150312 r153380 30 30 class SliderThumbElement; 31 31 32 class RenderSlider : public RenderFlexibleBox {32 class RenderSlider FINAL : public RenderFlexibleBox { 33 33 public: 34 34 static const int defaultTrackLength; -
trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.h
r150312 r153380 35 35 class HTMLPlugInImageElement; 36 36 37 class RenderSnapshottedPlugIn : public RenderEmbeddedObject {37 class RenderSnapshottedPlugIn FINAL : public RenderEmbeddedObject { 38 38 public: 39 39 explicit RenderSnapshottedPlugIn(HTMLPlugInImageElement*); … … 48 48 virtual const char* renderName() const { return "RenderSnapshottedPlugIn"; } 49 49 50 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const OVERRIDE ;51 virtual bool isSnapshottedPlugIn() const OVERRIDE { return true; }50 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const OVERRIDE FINAL; 51 virtual bool isSnapshottedPlugIn() const OVERRIDE FINAL { return true; } 52 52 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 53 53 54 virtual bool canHaveWidget() const OVERRIDE { return false; }54 virtual bool canHaveWidget() const OVERRIDE FINAL { return false; } 55 55 56 56 void paintSnapshot(PaintInfo&, const LayoutPoint&); -
trunk/Source/WebCore/rendering/RenderTable.h
r153089 r153380 125 125 void recalcBordersInRowDirection(); 126 126 127 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) ;127 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OVERRIDE FINAL; 128 128 129 129 struct ColumnStruct { … … 196 196 197 197 // Override paddingStart/End to return pixel values to match behavor of RenderTableCell. 198 virtual LayoutUnit paddingEnd() const OVERRIDE { return static_cast<int>(RenderBlock::paddingEnd()); }199 virtual LayoutUnit paddingStart() const OVERRIDE { return static_cast<int>(RenderBlock::paddingStart()); }198 virtual LayoutUnit paddingEnd() const OVERRIDE FINAL { return static_cast<int>(RenderBlock::paddingEnd()); } 199 virtual LayoutUnit paddingStart() const OVERRIDE FINAL { return static_cast<int>(RenderBlock::paddingStart()); } 200 200 201 201 LayoutUnit bordersPaddingAndSpacingInRowDirection() const … … 264 264 265 265 protected: 266 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ;267 virtual void simplifiedNormalFlowLayout() ;266 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE FINAL; 267 virtual void simplifiedNormalFlowLayout() OVERRIDE FINAL; 268 268 269 269 private: 270 virtual const char* renderName() const { return "RenderTable"; }271 272 virtual bool isTable() const { return true; }273 274 virtual bool avoidsFloats() const { return true; }275 276 virtual void paint(PaintInfo&, const LayoutPoint&) ;277 virtual void paintObject(PaintInfo&, const LayoutPoint&) ;278 virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&) ;279 virtual void paintMask(PaintInfo&, const LayoutPoint&) ;280 virtual void layout() ;281 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) const OVERRIDE ;270 virtual const char* renderName() const OVERRIDE { return "RenderTable"; } 271 272 virtual bool isTable() const OVERRIDE FINAL { return true; } 273 274 virtual bool avoidsFloats() const OVERRIDE FINAL { return true; } 275 276 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 277 virtual void paintObject(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 278 virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 279 virtual void paintMask(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 280 virtual void layout() OVERRIDE FINAL; 281 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) const OVERRIDE FINAL; 282 282 virtual void computePreferredLogicalWidths() OVERRIDE; 283 283 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE; 284 284 285 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE ;285 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL; 286 286 virtual int firstLineBoxBaseline() const OVERRIDE; 287 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE ;287 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE FINAL; 288 288 289 289 RenderTableCol* slowColElement(unsigned col, bool* startEdge, bool* endEdge) const; … … 292 292 void invalidateCachedColumns(); 293 293 294 virtual RenderBlock* firstLineBlock() const ;295 virtual void updateFirstLetter() ;296 297 virtual void updateLogicalWidth() OVERRIDE ;294 virtual RenderBlock* firstLineBlock() const OVERRIDE FINAL; 295 virtual void updateFirstLetter() OVERRIDE FINAL; 296 297 virtual void updateLogicalWidth() OVERRIDE FINAL; 298 298 299 299 LayoutUnit convertStyleLogicalWidthToComputedWidth(const Length& styleLogicalWidth, LayoutUnit availableWidth); 300 300 LayoutUnit convertStyleLogicalHeightToComputedHeight(const Length& styleLogicalHeight); 301 301 302 virtual LayoutRect overflowClipRect(const LayoutPoint& location, RenderRegion*, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize, PaintPhase = PaintPhaseBlockBackground) ;302 virtual LayoutRect overflowClipRect(const LayoutPoint& location, RenderRegion*, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize, PaintPhase = PaintPhaseBlockBackground) OVERRIDE FINAL; 303 303 virtual LayoutRect overflowClipRectForChildLayers(const LayoutPoint& location, RenderRegion* region, OverlayScrollbarSizeRelevancy relevancy) { return RenderBox::overflowClipRect(location, region, relevancy); } 304 304 305 virtual void addOverflowFromChildren() ;305 virtual void addOverflowFromChildren() OVERRIDE FINAL; 306 306 307 307 void subtractCaptionRect(LayoutRect&) const; -
trunk/Source/WebCore/rendering/RenderTableCaption.h
r150312 r153380 27 27 class RenderTable; 28 28 29 class RenderTableCaption : public RenderBlock {29 class RenderTableCaption FINAL : public RenderBlock { 30 30 public: 31 31 explicit RenderTableCaption(Element*); -
trunk/Source/WebCore/rendering/RenderTableCell.h
r150312 r153380 36 36 enum IncludeBorderColorOrNot { DoNotIncludeBorderColor, IncludeBorderColor }; 37 37 38 class RenderTableCell : public RenderBlock {38 class RenderTableCell FINAL : public RenderBlock { 39 39 public: 40 40 explicit RenderTableCell(Element*); -
trunk/Source/WebCore/rendering/RenderTableCol.h
r150312 r153380 34 34 class RenderTableCell; 35 35 36 class RenderTableCol : public RenderBox {36 class RenderTableCol FINAL : public RenderBox { 37 37 public: 38 38 explicit RenderTableCol(Element*); -
trunk/Source/WebCore/rendering/RenderTableRow.h
r150312 r153380 33 33 static const unsigned maxRowIndex = 0x7FFFFFFE; // 2,147,483,646 34 34 35 class RenderTableRow : public RenderBox {35 class RenderTableRow FINAL : public RenderBox { 36 36 public: 37 37 explicit RenderTableRow(Element*); -
trunk/Source/WebCore/rendering/RenderTableSection.h
r150312 r153380 61 61 class RenderTableRow; 62 62 63 class RenderTableSection : public RenderBox {63 class RenderTableSection FINAL : public RenderBox { 64 64 public: 65 65 RenderTableSection(Element*); -
trunk/Source/WebCore/rendering/RenderText.h
r150312 r153380 39 39 #endif 40 40 41 virtual const char* renderName() const ;41 virtual const char* renderName() const OVERRIDE; 42 42 43 43 virtual bool isTextFragment() const; … … 56 56 void dirtyLineBoxes(bool fullLayout); 57 57 58 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const ;58 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const OVERRIDE FINAL; 59 59 void absoluteRectsForRange(Vector<IntRect>&, unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false, bool* wasFixed = 0); 60 60 61 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const ;61 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const OVERRIDE FINAL; 62 62 void absoluteQuadsForRange(Vector<FloatQuad>&, unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false, bool* wasFixed = 0); 63 63 … … 102 102 103 103 virtual bool canBeSelectionLeaf() const { return true; } 104 virtual void setSelectionState(SelectionState s) ;104 virtual void setSelectionState(SelectionState s) OVERRIDE FINAL; 105 105 virtual LayoutRect selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool clipToVisibleContent = true) OVERRIDE; 106 106 virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0); 107 107 108 virtualLayoutUnit marginLeft() const { return minimumValueForLength(style()->marginLeft(), 0, view()); }109 virtualLayoutUnit marginRight() const { return minimumValueForLength(style()->marginRight(), 0, view()); }110 111 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const OVERRIDE ;108 LayoutUnit marginLeft() const { return minimumValueForLength(style()->marginLeft(), 0, view()); } 109 LayoutUnit marginRight() const { return minimumValueForLength(style()->marginRight(), 0, view()); } 110 111 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const OVERRIDE FINAL; 112 112 113 113 InlineTextBox* firstTextBox() const { return m_firstTextBox; } … … 116 116 virtual int caretMinOffset() const; 117 117 virtual int caretMaxOffset() const; 118 virtualunsigned renderedTextLength() const;119 120 virtual int previousOffset(int current) const ;121 virtual int previousOffsetForBackwardDeletion(int current) const ;122 virtual int nextOffset(int current) const ;118 unsigned renderedTextLength() const; 119 120 virtual int previousOffset(int current) const OVERRIDE FINAL; 121 virtual int previousOffsetForBackwardDeletion(int current) const OVERRIDE FINAL; 122 virtual int nextOffset(int current) const OVERRIDE FINAL; 123 123 124 124 bool containsReversedText() const { return m_containsReversedText; } … … 142 142 virtual void willBeDestroyed(); 143 143 144 virtual void styleWillChange(StyleDifference, const RenderStyle*) { }144 virtual void styleWillChange(StyleDifference, const RenderStyle*) OVERRIDE FINAL { } 145 145 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 146 146 … … 158 158 // will use the more efficient textLength() instead, while 159 159 // callers with a RenderObject* can continue to use length(). 160 virtual unsigned length() const { return textLength(); }161 162 virtual void paint(PaintInfo&, const LayoutPoint&) { ASSERT_NOT_REACHED(); }163 virtual void layout() { ASSERT_NOT_REACHED(); }164 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint&, HitTestAction) OVERRIDE { ASSERT_NOT_REACHED(); return false; }160 virtual unsigned length() const OVERRIDE FINAL { return textLength(); } 161 162 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL { ASSERT_NOT_REACHED(); } 163 virtual void layout() OVERRIDE FINAL { ASSERT_NOT_REACHED(); } 164 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint&, HitTestAction) OVERRIDE FINAL { ASSERT_NOT_REACHED(); return false; } 165 165 166 166 void deleteTextBoxes(); -
trunk/Source/WebCore/rendering/RenderTextControl.h
r151799 r153380 48 48 void adjustInnerTextStyle(const RenderStyle* startStyle, RenderStyle* textBlockStyle) const; 49 49 50 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ;50 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE; 51 51 52 52 void hitInnerTextElement(HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset); … … 68 68 69 69 private: 70 virtual const char* renderName() const { return "RenderTextControl"; }71 virtual bool isTextControl() const { return true; }70 virtual const char* renderName() const OVERRIDE { return "RenderTextControl"; } 71 virtual bool isTextControl() const OVERRIDE FINAL { return true; } 72 72 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE; 73 73 virtual void computePreferredLogicalWidths() OVERRIDE; 74 74 virtual void removeLeftoverAnonymousBlock(RenderBlock*) { } 75 virtual bool avoidsFloats() const { return true; }75 virtual bool avoidsFloats() const OVERRIDE { return true; } 76 76 virtual bool canHaveGeneratedChildren() const OVERRIDE { return false; } 77 77 virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE; … … 103 103 // baseline definition, and then inputs of different types wouldn't line up 104 104 // anymore. 105 class RenderTextControlInnerContainer : public RenderFlexibleBox {105 class RenderTextControlInnerContainer FINAL : public RenderFlexibleBox { 106 106 public: 107 107 explicit RenderTextControlInnerContainer(Element* element) -
trunk/Source/WebCore/rendering/RenderTextControlMultiLine.h
r150312 r153380 27 27 namespace WebCore { 28 28 29 class RenderTextControlMultiLine : public RenderTextControl {29 class RenderTextControlMultiLine FINAL : public RenderTextControl { 30 30 public: 31 31 RenderTextControlMultiLine(Element*); -
trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h
r150312 r153380 50 50 51 51 private: 52 virtual bool hasControlClip() const ;53 virtual LayoutRect controlClipRect(const LayoutPoint&) const ;54 virtual bool isTextField() const { return true; }52 virtual bool hasControlClip() const OVERRIDE; 53 virtual LayoutRect controlClipRect(const LayoutPoint&) const OVERRIDE; 54 virtual bool isTextField() const OVERRIDE FINAL { return true; } 55 55 56 virtual void paint(PaintInfo&, const LayoutPoint&) ;57 virtual void layout() ;56 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 57 virtual void layout() OVERRIDE; 58 58 59 59 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE; 60 60 61 virtual void autoscroll(const IntPoint&) ;61 virtual void autoscroll(const IntPoint&) OVERRIDE; 62 62 63 63 // Subclassed to forward to our inner div. 64 virtual int scrollLeft() const ;65 virtual int scrollTop() const ;66 virtual int scrollWidth() const ;67 virtual int scrollHeight() const ;68 virtual void setScrollLeft(int) ;69 virtual void setScrollTop(int) ;70 virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Node** stopNode = 0) ;71 virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Node** stopNode = 0) ;64 virtual int scrollLeft() const OVERRIDE; 65 virtual int scrollTop() const OVERRIDE; 66 virtual int scrollWidth() const OVERRIDE; 67 virtual int scrollHeight() const OVERRIDE; 68 virtual void setScrollLeft(int) OVERRIDE; 69 virtual void setScrollTop(int) OVERRIDE; 70 virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Node** stopNode = 0) OVERRIDE; 71 virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Node** stopNode = 0) OVERRIDE; 72 72 73 73 int textBlockWidth() const; 74 virtual float getAvgCharWidth(AtomicString family) ;75 virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const ;74 virtual float getAvgCharWidth(AtomicString family) OVERRIDE; 75 virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const OVERRIDE; 76 76 virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const OVERRIDE; 77 77 78 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ;78 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE; 79 79 80 virtual RenderStyle* textBaseStyle() const ;80 virtual RenderStyle* textBaseStyle() const OVERRIDE; 81 81 82 82 bool textShouldBeTruncated() const; -
trunk/Source/WebCore/rendering/RenderTextFragment.h
r150312 r153380 32 32 // We cache offsets so that text transformations can be applied in such a way that we can recover 33 33 // the original unaltered string from our corresponding DOM node. 34 class RenderTextFragment : public RenderText {34 class RenderTextFragment FINAL : public RenderText { 35 35 public: 36 36 RenderTextFragment(Node*, StringImpl*, int startOffset, int length); -
trunk/Source/WebCore/rendering/RenderTextTrackCue.h
r150452 r153380 39 39 class TextTrackCueBox; 40 40 41 class RenderTextTrackCue : public RenderBlock {41 class RenderTextTrackCue FINAL : public RenderBlock { 42 42 public: 43 43 explicit RenderTextTrackCue(TextTrackCueBox*); -
trunk/Source/WebCore/rendering/RenderVideo.h
r150312 r153380 36 36 class HTMLVideoElement; 37 37 38 class RenderVideo : public RenderMedia {38 class RenderVideo FINAL : public RenderMedia { 39 39 public: 40 40 RenderVideo(HTMLVideoElement*); -
trunk/Source/WebCore/rendering/RenderView.h
r152911 r153380 43 43 #endif 44 44 45 class RenderView : public RenderBlock {45 class RenderView FINAL : public RenderBlock { 46 46 public: 47 47 explicit RenderView(Document*); -
trunk/Source/WebCore/rendering/RenderWidget.h
r152814 r153380 80 80 void clearWidget(); 81 81 82 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ;83 virtual void layout() ;84 virtual void paint(PaintInfo&, const LayoutPoint&) ;85 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const ;82 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE FINAL; 83 virtual void layout() OVERRIDE; 84 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 85 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const OVERRIDE; 86 86 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE; 87 87 … … 89 89 90 90 private: 91 virtual bool isWidget() const { return true; }91 virtual bool isWidget() const OVERRIDE FINAL { return true; } 92 92 93 virtual void willBeDestroyed() ;94 virtual void destroy() ;95 virtual void setSelectionState(SelectionState) ;96 virtual void setOverlapTestResult(bool) ;93 virtual void willBeDestroyed() OVERRIDE FINAL; 94 virtual void destroy() OVERRIDE FINAL; 95 virtual void setSelectionState(SelectionState) OVERRIDE FINAL; 96 virtual void setOverlapTestResult(bool) OVERRIDE FINAL; 97 97 98 98 bool setWidgetGeometry(const LayoutRect&); -
trunk/Source/WebCore/rendering/RenderWordBreak.h
r150312 r153380 34 34 class HTMLElement; 35 35 36 class RenderWordBreak : public RenderText {36 class RenderWordBreak FINAL : public RenderText { 37 37 public: 38 38 explicit RenderWordBreak(HTMLElement*); -
trunk/Source/WebCore/rendering/RootInlineBox.h
r150312 r153380 39 39 explicit RootInlineBox(RenderBlock*); 40 40 41 virtual void destroy(RenderArena*) FINAL;42 43 virtual bool isRootInlineBox() const FINAL { return true; }41 virtual void destroy(RenderArena*) OVERRIDE FINAL; 42 43 virtual bool isRootInlineBox() const OVERRIDE FINAL { return true; } 44 44 45 45 void detachEllipsisBox(RenderArena*); … … 48 48 RootInlineBox* prevRootBox() const { return static_cast<RootInlineBox*>(m_prevLineBox); } 49 49 50 virtual void adjustPosition(float dx, float dy) FINAL;50 virtual void adjustPosition(float dx, float dy) OVERRIDE FINAL; 51 51 52 52 LayoutUnit lineTop() const { return m_lineTop; } … … 86 86 } 87 87 88 virtual RenderLineBoxList* rendererLineBoxes() const FINAL;88 virtual RenderLineBoxList* rendererLineBoxes() const OVERRIDE FINAL; 89 89 90 90 RenderObject* lineBreakObj() const { return m_lineBreakObj; } … … 115 115 bool isHyphenated() const; 116 116 117 virtual int baselinePosition(FontBaseline baselineType) const FINAL;118 virtual LayoutUnit lineHeight() const FINAL;117 virtual int baselinePosition(FontBaseline baselineType) const OVERRIDE FINAL; 118 virtual LayoutUnit lineHeight() const OVERRIDE FINAL; 119 119 120 120 #if PLATFORM(MAC) … … 129 129 using InlineBox::setHasSelectedChildren; 130 130 131 virtual RenderObject::SelectionState selectionState() FINAL;131 virtual RenderObject::SelectionState selectionState() OVERRIDE FINAL; 132 132 InlineBox* firstSelectedBox(); 133 133 InlineBox* lastSelectedBox(); … … 152 152 Vector<RenderBox*>* floatsPtr() { ASSERT(!isDirty()); return m_floats.get(); } 153 153 154 virtual void extractLineBoxFromRenderObject() FINAL;155 virtual void attachLineBoxToRenderObject() FINAL;156 virtual void removeLineBoxFromRenderObject() FINAL;154 virtual void extractLineBoxFromRenderObject() OVERRIDE FINAL; 155 virtual void attachLineBoxToRenderObject() OVERRIDE FINAL; 156 virtual void removeLineBoxFromRenderObject() OVERRIDE FINAL; 157 157 158 158 FontBaseline baselineType() const { return static_cast<FontBaseline>(m_baselineType); } -
trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h
r152840 r153380 119 119 void toRenderMathMLBlock(const RenderMathMLBlock*); 120 120 121 class RenderMathMLTable : public RenderTable {121 class RenderMathMLTable FINAL : public RenderTable { 122 122 public: 123 123 explicit RenderMathMLTable(Element* element) : RenderTable(element) { } -
trunk/Source/WebCore/rendering/svg/RenderSVGBlock.h
r152293 r153380 33 33 explicit RenderSVGBlock(SVGElement*); 34 34 35 virtual LayoutRect visualOverflowRect() const ;35 virtual LayoutRect visualOverflowRect() const OVERRIDE FINAL; 36 36 37 37 protected: … … 39 39 40 40 private: 41 virtual void setStyle(PassRefPtr<RenderStyle>) ;42 virtual void updateFromStyle() OVERRIDE ;41 virtual void setStyle(PassRefPtr<RenderStyle>) OVERRIDE FINAL; 42 virtual void updateFromStyle() OVERRIDE FINAL; 43 43 44 virtual bool isRenderSVGBlock() const OVERRIDE { return true; };44 virtual bool isRenderSVGBlock() const OVERRIDE FINAL { return true; }; 45 45 46 46 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const; 47 47 48 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle) ;49 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ;48 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle) OVERRIDE FINAL; 49 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE FINAL; 50 50 }; 51 51 -
trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h
r150312 r153380 44 44 45 45 virtual void paint(PaintInfo&, const LayoutPoint&); 46 virtual void setNeedsBoundariesUpdate() { m_needsBoundariesUpdate = true; }47 virtual bool needsBoundariesUpdate() OVERRIDE { return m_needsBoundariesUpdate; }46 virtual void setNeedsBoundariesUpdate() OVERRIDE FINAL { m_needsBoundariesUpdate = true; } 47 virtual bool needsBoundariesUpdate() OVERRIDE FINAL { return m_needsBoundariesUpdate; } 48 48 virtual bool didTransformToRootUpdate() { return false; } 49 49 bool isObjectBoundingBoxValid() const { return m_objectBoundingBoxValid; } 50 50 51 51 protected: 52 virtual RenderObjectChildList* virtualChildren() { return children(); }53 virtual const RenderObjectChildList* virtualChildren() const { return children(); }52 virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return children(); } 53 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); } 54 54 55 virtual bool isSVGContainer() const { return true; }56 virtual const char* renderName() const { return "RenderSVGContainer"; }55 virtual bool isSVGContainer() const OVERRIDE FINAL { return true; } 56 virtual const char* renderName() const OVERRIDE { return "RenderSVGContainer"; } 57 57 58 virtual void layout() ;58 virtual void layout() OVERRIDE; 59 59 60 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OVERRIDE ;61 virtual void removeChild(RenderObject*) OVERRIDE ;62 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE ;60 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OVERRIDE FINAL; 61 virtual void removeChild(RenderObject*) OVERRIDE FINAL; 62 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE FINAL; 63 63 64 virtual FloatRect objectBoundingBox() const { return m_objectBoundingBox; }65 virtual FloatRect strokeBoundingBox() const { return m_strokeBoundingBox; }66 virtual FloatRect repaintRectInLocalCoordinates() const { return m_repaintBoundingBox; }64 virtual FloatRect objectBoundingBox() const OVERRIDE FINAL { return m_objectBoundingBox; } 65 virtual FloatRect strokeBoundingBox() const OVERRIDE FINAL { return m_strokeBoundingBox; } 66 virtual FloatRect repaintRectInLocalCoordinates() const OVERRIDE FINAL { return m_repaintBoundingBox; } 67 67 68 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) ;68 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) OVERRIDE; 69 69 70 70 // Allow RenderSVGTransformableContainer to hook in at the right time in layout() -
trunk/Source/WebCore/rendering/svg/RenderSVGEllipse.h
r152167 r153380 34 34 namespace WebCore { 35 35 36 class RenderSVGEllipse : public RenderSVGShape {36 class RenderSVGEllipse FINAL : public RenderSVGShape { 37 37 public: 38 38 explicit RenderSVGEllipse(SVGGraphicsElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h
r150312 r153380 32 32 class SVGForeignObjectElement; 33 33 34 class RenderSVGForeignObject : public RenderSVGBlock {34 class RenderSVGForeignObject FINAL : public RenderSVGBlock { 35 35 public: 36 36 explicit RenderSVGForeignObject(SVGForeignObjectElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.h
r150312 r153380 31 31 32 32 // This class exists mostly so we can hear about gradient stop style changes 33 class RenderSVGGradientStop : public RenderObject {33 class RenderSVGGradientStop FINAL : public RenderObject { 34 34 public: 35 35 RenderSVGGradientStop(SVGStopElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGHiddenContainer.h
r150312 r153380 34 34 explicit RenderSVGHiddenContainer(SVGStyledElement*); 35 35 36 virtual const char* renderName() const { return "RenderSVGHiddenContainer"; }36 virtual const char* renderName() const OVERRIDE { return "RenderSVGHiddenContainer"; } 37 37 38 38 protected: 39 virtual void layout() ;39 virtual void layout() OVERRIDE; 40 40 41 41 private: 42 virtual bool isSVGHiddenContainer() const { return true; }42 virtual bool isSVGHiddenContainer() const OVERRIDE FINAL { return true; } 43 43 44 virtual void paint(PaintInfo&, const LayoutPoint&) ;44 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 45 45 46 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject*) const OVERRIDE { return LayoutRect(); }47 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const ;46 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject*) const OVERRIDE FINAL { return LayoutRect(); } 47 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const OVERRIDE FINAL; 48 48 49 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) ;49 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) OVERRIDE FINAL; 50 50 }; 51 51 } -
trunk/Source/WebCore/rendering/svg/RenderSVGImage.h
r150312 r153380 37 37 class SVGImageElement; 38 38 39 class RenderSVGImage : public RenderSVGModelObject {39 class RenderSVGImage FINAL : public RenderSVGModelObject { 40 40 public: 41 41 RenderSVGImage(SVGImageElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGInline.h
r150312 r153380 33 33 explicit RenderSVGInline(Element*); 34 34 35 virtual const char* renderName() const { return "RenderSVGInline"; }36 virtual bool requiresLayer() const { return false; }37 virtual bool isSVGInline() const { return true; }35 virtual const char* renderName() const OVERRIDE { return "RenderSVGInline"; } 36 virtual bool requiresLayer() const OVERRIDE FINAL { return false; } 37 virtual bool isSVGInline() const OVERRIDE FINAL { return true; } 38 38 39 39 // Chapter 10.4 of the SVG Specification say that we should use the … … 42 42 // It is also necessary to take the stroke and repaint rect of 43 43 // this element, since we need it for filters. 44 virtual FloatRect objectBoundingBox() const ;45 virtual FloatRect strokeBoundingBox() const ;46 virtual FloatRect repaintRectInLocalCoordinates() const ;44 virtual FloatRect objectBoundingBox() const OVERRIDE FINAL; 45 virtual FloatRect strokeBoundingBox() const OVERRIDE FINAL; 46 virtual FloatRect repaintRectInLocalCoordinates() const OVERRIDE FINAL; 47 47 48 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const OVERRIDE ;49 virtual void computeFloatRectForRepaint(const RenderLayerModelObject* repaintContainer, FloatRect&, bool fixed = false) const OVERRIDE ;50 virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE ;51 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE ;52 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const ;48 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const OVERRIDE FINAL; 49 virtual void computeFloatRectForRepaint(const RenderLayerModelObject* repaintContainer, FloatRect&, bool fixed = false) const OVERRIDE FINAL; 50 virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE FINAL; 51 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE FINAL; 52 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const OVERRIDE FINAL; 53 53 54 54 private: 55 virtual InlineFlowBox* createInlineFlowBox() ;55 virtual InlineFlowBox* createInlineFlowBox() OVERRIDE FINAL; 56 56 57 virtual void willBeDestroyed() ;58 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle) ;59 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ;57 virtual void willBeDestroyed() OVERRIDE FINAL; 58 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle) OVERRIDE FINAL; 59 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE FINAL; 60 60 61 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OVERRIDE ;62 virtual void removeChild(RenderObject*) OVERRIDE ;61 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OVERRIDE FINAL; 62 virtual void removeChild(RenderObject*) OVERRIDE FINAL; 63 63 }; 64 64 -
trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.h
r150312 r153380 32 32 class SVGInlineTextBox; 33 33 34 class RenderSVGInlineText : public RenderText {34 class RenderSVGInlineText FINAL : public RenderText { 35 35 public: 36 36 RenderSVGInlineText(Node*, PassRefPtr<StringImpl>); -
trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h
r150312 r153380 50 50 explicit RenderSVGModelObject(SVGStyledElement*); 51 51 52 virtual bool requiresLayer() const { return false; } 52 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const OVERRIDE; 53 virtual void computeFloatRectForRepaint(const RenderLayerModelObject* repaintContainer, FloatRect&, bool fixed = false) const OVERRIDE FINAL; 54 virtual LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* repaintContainer, const RenderGeometryMap*) const OVERRIDE FINAL; 53 55 54 virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const OVERRIDE; 55 virtual void computeFloatRectForRepaint(const RenderLayerModelObject* repaintContainer, FloatRect&, bool fixed = false) const OVERRIDE; 56 virtual LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* repaintContainer, const RenderGeometryMap*) const OVERRIDE; 57 58 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const; 56 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const OVERRIDE FINAL; 59 57 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const; 60 58 61 virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE ;62 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE ;63 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle) ;59 virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE FINAL; 60 virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE FINAL; 61 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle) OVERRIDE FINAL; 64 62 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 65 63 … … 72 70 73 71 protected: 74 virtual void willBeDestroyed() ;72 virtual void willBeDestroyed() OVERRIDE; 75 73 76 74 private: 77 75 // This method should never be called, SVG uses a different nodeAtPoint method 78 76 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE; 79 virtual void absoluteFocusRingQuads(Vector<FloatQuad>&) ;77 virtual void absoluteFocusRingQuads(Vector<FloatQuad>&) OVERRIDE FINAL; 80 78 bool m_hasSVGShadow; 81 79 }; -
trunk/Source/WebCore/rendering/svg/RenderSVGPath.h
r152167 r153380 32 32 namespace WebCore { 33 33 34 class RenderSVGPath : public RenderSVGShape {34 class RenderSVGPath FINAL : public RenderSVGShape { 35 35 public: 36 36 explicit RenderSVGPath(SVGGraphicsElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGRect.h
r150312 r153380 35 35 namespace WebCore { 36 36 37 class RenderSVGRect : public RenderSVGShape {37 class RenderSVGRect FINAL : public RenderSVGShape { 38 38 public: 39 39 explicit RenderSVGRect(SVGRectElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
r150312 r153380 42 42 }; 43 43 44 class RenderSVGResourceClipper : public RenderSVGResourceContainer {44 class RenderSVGResourceClipper FINAL : public RenderSVGResourceContainer { 45 45 public: 46 46 RenderSVGResourceClipper(SVGClipPathElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h
r150312 r153380 35 35 virtual ~RenderSVGResourceContainer(); 36 36 37 virtual void layout() ;38 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ;37 virtual void layout() OVERRIDE; 38 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE FINAL; 39 39 40 virtual bool isSVGResourceContainer() const { return true; }41 virtual RenderSVGResourceContainer* toRenderSVGResourceContainer() { return this; }40 virtual bool isSVGResourceContainer() const OVERRIDE FINAL { return true; } 41 virtual RenderSVGResourceContainer* toRenderSVGResourceContainer() OVERRIDE FINAL { return this; } 42 42 43 43 static bool shouldTransformOnTextPainting(RenderObject*, AffineTransform&); … … 67 67 68 68 private: 69 virtual void willBeDestroyed() ;69 virtual void willBeDestroyed() OVERRIDE FINAL; 70 70 void registerResource(); 71 71 -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h
r152615 r153380 64 64 class GraphicsContext; 65 65 66 class RenderSVGResourceFilter : public RenderSVGResourceContainer {66 class RenderSVGResourceFilter FINAL : public RenderSVGResourceContainer { 67 67 public: 68 68 RenderSVGResourceFilter(SVGFilterElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilterPrimitive.h
r150312 r153380 37 37 class FilterEffect; 38 38 39 class RenderSVGResourceFilterPrimitive : public RenderSVGHiddenContainer {39 class RenderSVGResourceFilterPrimitive FINAL : public RenderSVGHiddenContainer { 40 40 public: 41 41 explicit RenderSVGResourceFilterPrimitive(SVGStyledElement* filterPrimitiveElement) -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h
r150312 r153380 48 48 RenderSVGResourceGradient(SVGGradientElement*); 49 49 50 virtual void removeAllClientsFromCache(bool markForInvalidation = true) ;51 virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true) ;50 virtual void removeAllClientsFromCache(bool markForInvalidation = true) OVERRIDE FINAL; 51 virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true) OVERRIDE FINAL; 52 52 53 virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode) ;54 virtual void postApplyResource(RenderObject*, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) ;55 virtual FloatRect resourceBoundingBox(RenderObject*) { return FloatRect(); }53 virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode) OVERRIDE FINAL; 54 virtual void postApplyResource(RenderObject*, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) OVERRIDE FINAL; 55 virtual FloatRect resourceBoundingBox(RenderObject*) OVERRIDE FINAL { return FloatRect(); } 56 56 57 57 protected: -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.h
r150312 r153380 30 30 class SVGLinearGradientElement; 31 31 32 class RenderSVGResourceLinearGradient : public RenderSVGResourceGradient {32 class RenderSVGResourceLinearGradient FINAL : public RenderSVGResourceGradient { 33 33 public: 34 34 RenderSVGResourceLinearGradient(SVGLinearGradientElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.h
r152826 r153380 34 34 class RenderObject; 35 35 36 class RenderSVGResourceMarker : public RenderSVGResourceContainer {36 class RenderSVGResourceMarker FINAL : public RenderSVGResourceContainer { 37 37 public: 38 38 RenderSVGResourceMarker(SVGMarkerElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h
r150312 r153380 39 39 }; 40 40 41 class RenderSVGResourceMasker : public RenderSVGResourceContainer {41 class RenderSVGResourceMasker FINAL : public RenderSVGResourceContainer { 42 42 public: 43 43 RenderSVGResourceMasker(SVGMaskElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h
r150312 r153380 44 44 }; 45 45 46 class RenderSVGResourcePattern : public RenderSVGResourceContainer {46 class RenderSVGResourcePattern FINAL : public RenderSVGResourceContainer { 47 47 public: 48 48 RenderSVGResourcePattern(SVGPatternElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.h
r150312 r153380 30 30 class SVGRadialGradientElement; 31 31 32 class RenderSVGResourceRadialGradient : public RenderSVGResourceGradient {32 class RenderSVGResourceRadialGradient FINAL : public RenderSVGResourceGradient { 33 33 public: 34 34 RenderSVGResourceRadialGradient(SVGRadialGradientElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h
r150312 r153380 35 35 class SVGStyledElement; 36 36 37 class RenderSVGRoot : public RenderReplaced {37 class RenderSVGRoot FINAL : public RenderReplaced { 38 38 public: 39 39 explicit RenderSVGRoot(SVGStyledElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGShape.h
r152167 r153380 72 72 73 73 void setNeedsShapeUpdate() { m_needsShapeUpdate = true; } 74 virtual void setNeedsBoundariesUpdate() { m_needsBoundariesUpdate = true; }75 virtual bool needsBoundariesUpdate() OVERRIDE { return m_needsBoundariesUpdate; }76 virtual void setNeedsTransformUpdate() { m_needsTransformUpdate = true; }74 virtual void setNeedsBoundariesUpdate() OVERRIDE FINAL { m_needsBoundariesUpdate = true; } 75 virtual bool needsBoundariesUpdate() OVERRIDE FINAL { return m_needsBoundariesUpdate; } 76 virtual void setNeedsTransformUpdate() OVERRIDE FINAL { m_needsTransformUpdate = true; } 77 77 virtual void fillShape(GraphicsContext*) const; 78 78 virtual void strokeShape(GraphicsContext*) const; … … 105 105 bool strokeContains(const FloatPoint&, bool requiresStroke = true); 106 106 107 virtual FloatRect repaintRectInLocalCoordinates() const { return m_repaintBoundingBox; }108 virtual FloatRect repaintRectInLocalCoordinatesExcludingSVGShadow() const OVERRIDE { return m_repaintBoundingBoxExcludingShadow; }109 virtual const AffineTransform& localToParentTransform() const { return m_localTransform; }110 virtual AffineTransform localTransform() const { return m_localTransform; }107 virtual FloatRect repaintRectInLocalCoordinates() const OVERRIDE FINAL { return m_repaintBoundingBox; } 108 virtual FloatRect repaintRectInLocalCoordinatesExcludingSVGShadow() const OVERRIDE FINAL { return m_repaintBoundingBoxExcludingShadow; } 109 virtual const AffineTransform& localToParentTransform() const OVERRIDE FINAL { return m_localTransform; } 110 virtual AffineTransform localTransform() const OVERRIDE FINAL { return m_localTransform; } 111 111 112 virtual bool isSVGShape() const { return true; }112 virtual bool isSVGShape() const OVERRIDE FINAL { return true; } 113 113 virtual const char* renderName() const { return "RenderSVGShape"; } 114 114 115 virtual void layout() ;116 virtual void paint(PaintInfo&, const LayoutPoint&) ;117 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE ;115 virtual void layout() OVERRIDE FINAL; 116 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 117 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE FINAL; 118 118 119 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) ;119 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) OVERRIDE FINAL; 120 120 121 virtual FloatRect objectBoundingBox() const { return m_fillBoundingBox; }122 virtual FloatRect strokeBoundingBox() const { return m_strokeBoundingBox; }121 virtual FloatRect objectBoundingBox() const OVERRIDE FINAL { return m_fillBoundingBox; } 122 virtual FloatRect strokeBoundingBox() const OVERRIDE FINAL { return m_strokeBoundingBox; } 123 123 FloatRect calculateObjectBoundingBox() const; 124 124 FloatRect calculateStrokeBoundingBox() const; -
trunk/Source/WebCore/rendering/svg/RenderSVGTSpan.h
r150312 r153380 27 27 28 28 namespace WebCore { 29 class RenderSVGTSpan : public RenderSVGInline {29 class RenderSVGTSpan FINAL : public RenderSVGInline { 30 30 public: 31 31 explicit RenderSVGTSpan(Element*); -
trunk/Source/WebCore/rendering/svg/RenderSVGText.h
r150312 r153380 34 34 class RenderSVGInlineText; 35 35 36 class RenderSVGText : public RenderSVGBlock {36 class RenderSVGText FINAL : public RenderSVGBlock { 37 37 public: 38 38 RenderSVGText(SVGTextElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGTextPath.h
r150312 r153380 27 27 namespace WebCore { 28 28 29 class RenderSVGTextPath : public RenderSVGInline {29 class RenderSVGTextPath FINAL : public RenderSVGInline { 30 30 public: 31 31 RenderSVGTextPath(Element*); -
trunk/Source/WebCore/rendering/svg/RenderSVGTransformableContainer.h
r152167 r153380 28 28 29 29 class SVGGraphicsElement; 30 class RenderSVGTransformableContainer : public RenderSVGContainer {30 class RenderSVGTransformableContainer FINAL : public RenderSVGContainer { 31 31 public: 32 32 explicit RenderSVGTransformableContainer(SVGGraphicsElement*); -
trunk/Source/WebCore/rendering/svg/RenderSVGViewportContainer.h
r150312 r153380 31 31 // This is used for non-root <svg> elements and <marker> elements, neither of which are SVGTransformable 32 32 // thus we inherit from RenderSVGContainer instead of RenderSVGTransformableContainer 33 class RenderSVGViewportContainer : public RenderSVGContainer {33 class RenderSVGViewportContainer FINAL : public RenderSVGContainer { 34 34 public: 35 35 explicit RenderSVGViewportContainer(SVGStyledElement*); -
trunk/Tools/Scripts/webkitpy/port/mac.py
r151462 r153380 141 141 142 142 def _build_java_test_support(self): 143 return True 143 144 java_tests_path = self._filesystem.join(self.layout_tests_dir(), "java") 144 145 build_java = [self.make_command(), "-C", java_tests_path]
Note: See TracChangeset
for help on using the changeset viewer.