Index: Source/core/rendering/RenderView.h |
diff --git a/Source/core/rendering/RenderView.h b/Source/core/rendering/RenderView.h |
index 5fc0c0ce9a2b18abe4326cae4dfd225ab0e74f0e..8c5559e2820282182150b6f0e8c0a6d65af15d30 100644 |
--- a/Source/core/rendering/RenderView.h |
+++ b/Source/core/rendering/RenderView.h |
@@ -40,11 +40,11 @@ class RenderQuote; |
// It's dimensions match that of the logical viewport (which may be different from |
// the visible viewport in fixed-layout mode), and it is always at position (0,0) |
// relative to the document (and so isn't necessarily in view). |
-class RenderView FINAL : public RenderBlockFlow { |
+class RenderView final : public RenderBlockFlow { |
public: |
explicit RenderView(Document*); |
virtual ~RenderView(); |
- virtual void trace(Visitor*) OVERRIDE; |
+ virtual void trace(Visitor*) override; |
bool hitTest(const HitTestRequest&, HitTestResult&); |
bool hitTest(const HitTestRequest&, const HitTestLocation&, HitTestResult&); |
@@ -52,19 +52,19 @@ public: |
// Returns the total count of calls to HitTest, for testing. |
unsigned hitTestCount() const { return m_hitTestCount; } |
- virtual const char* renderName() const OVERRIDE { return "RenderView"; } |
+ virtual const char* renderName() const override { return "RenderView"; } |
- virtual bool isRenderView() const OVERRIDE { return true; } |
+ virtual bool isRenderView() const override { return true; } |
- virtual LayerType layerTypeRequired() const OVERRIDE { return NormalLayer; } |
+ virtual LayerType layerTypeRequired() const override { return NormalLayer; } |
- virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE; |
+ virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override; |
- virtual void layout() OVERRIDE; |
- virtual void updateLogicalWidth() OVERRIDE; |
- virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE; |
+ virtual void layout() override; |
+ virtual void updateLogicalWidth() override; |
+ virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override; |
- virtual LayoutUnit availableLogicalHeight(AvailableLogicalHeightType) const OVERRIDE; |
+ virtual LayoutUnit availableLogicalHeight(AvailableLogicalHeightType) const override; |
// The same as the FrameView's layoutHeight/layoutWidth but with null check guards. |
int viewHeight(IncludeScrollbarsInRect = ExcludeScrollbars) const; |
@@ -85,14 +85,14 @@ public: |
IsFixedPosition, |
}; |
void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, ViewportConstrainedPosition, const PaintInvalidationState*) const; |
- virtual void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const OVERRIDE; |
+ virtual void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const override; |
void invalidatePaintForRectangle(const LayoutRect&, InvalidationReason) const; |
void invalidatePaintForViewAndCompositedLayers(); |
- virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; |
- virtual void paintBoxDecorationBackground(PaintInfo&, const LayoutPoint&) OVERRIDE; |
+ virtual void paint(PaintInfo&, const LayoutPoint&) override; |
+ virtual void paintBoxDecorationBackground(PaintInfo&, const LayoutPoint&) override; |
enum SelectionPaintInvalidationMode { PaintInvalidationNewXOROld, PaintInvalidationNewMinusOld }; |
void setSelection(RenderObject* start, int startPos, RenderObject*, int endPos, SelectionPaintInvalidationMode = PaintInvalidationNewXOROld); |
@@ -103,17 +103,17 @@ public: |
void selectionStartEnd(int& startPos, int& endPos) const; |
void invalidatePaintForSelection() const; |
- virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const OVERRIDE; |
- virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const OVERRIDE; |
+ virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override; |
+ virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override; |
- virtual LayoutRect viewRect() const OVERRIDE; |
+ virtual LayoutRect viewRect() const override; |
bool shouldDoFullPaintInvalidationForNextLayout() const; |
bool doingFullPaintInvalidation() const { return m_frameView->needsFullPaintInvalidation(); } |
LayoutState* layoutState() const { return m_layoutState; } |
- virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) OVERRIDE; |
+ virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) override; |
LayoutUnit pageLogicalHeight() const { return m_pageLogicalHeight; } |
void setPageLogicalHeight(LayoutUnit height) |
@@ -154,20 +154,20 @@ public: |
void removeRenderCounter() { ASSERT(m_renderCounterCount > 0); m_renderCounterCount--; } |
bool hasRenderCounters() { return m_renderCounterCount; } |
- virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const OVERRIDE; |
+ virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const override; |
double layoutViewportWidth() const; |
double layoutViewportHeight() const; |
void pushLayoutState(LayoutState&); |
void popLayoutState(); |
- virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) OVERRIDE FINAL; |
+ virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) override final; |
private: |
- virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const OVERRIDE; |
- virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE; |
- virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const OVERRIDE; |
- virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const OVERRIDE; |
+ virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override; |
+ virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override; |
+ virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const override; |
+ virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const override; |
void layoutContent(); |
#if ENABLE(ASSERT) |