| Index: Source/core/rendering/RenderBox.h
|
| diff --git a/Source/core/rendering/RenderBox.h b/Source/core/rendering/RenderBox.h
|
| index 52a8aa51750e341edc162155b33bd219b707fa44..5c1b024681cbd5ea0eff1ba848939c2b241631f4 100644
|
| --- a/Source/core/rendering/RenderBox.h
|
| +++ b/Source/core/rendering/RenderBox.h
|
| @@ -51,7 +51,7 @@ public:
|
| // position:static elements that are not flex-items get their z-index coerced to auto.
|
| virtual bool requiresLayer() const OVERRIDE { return isRoot() || isPositioned() || createsGroup() || hasClipPath() || hasOverflowClip() || hasTransform() || hasHiddenBackface() || hasReflection() || style()->specifiesColumns() || !style()->hasAutoZIndex() || isFloatingWithShapeOutside(); }
|
|
|
| - virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const OVERRIDE;
|
| + virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const OVERRIDE FINAL;
|
|
|
| // Use this with caution! No type checking is done!
|
| RenderBox* firstChildBox() const;
|
| @@ -149,7 +149,7 @@ public:
|
| LayoutRect borderBoxRect() const { return LayoutRect(LayoutPoint(), size()); }
|
| LayoutRect paddingBoxRect() const { return LayoutRect(borderLeft(), borderTop(), contentWidth() + paddingLeft() + paddingRight(), contentHeight() + paddingTop() + paddingBottom()); }
|
| IntRect pixelSnappedBorderBoxRect() const { return IntRect(IntPoint(), m_frameRect.pixelSnappedSize()); }
|
| - virtual IntRect borderBoundingBox() const { return pixelSnappedBorderBoxRect(); }
|
| + virtual IntRect borderBoundingBox() const OVERRIDE FINAL { return pixelSnappedBorderBoxRect(); }
|
|
|
| // The content area of the box (excludes padding - and intrinsic padding for table cells, etc... - and border).
|
| LayoutRect contentBoxRect() const { return LayoutRect(borderLeft() + paddingLeft(), borderTop() + paddingTop(), contentWidth(), contentHeight()); }
|
| @@ -163,7 +163,7 @@ public:
|
| LayoutRect computedCSSContentBoxRect() const { return LayoutRect(borderLeft() + computedCSSPaddingLeft(), borderTop() + computedCSSPaddingTop(), clientWidth() - computedCSSPaddingLeft() - computedCSSPaddingRight(), clientHeight() - computedCSSPaddingTop() - computedCSSPaddingBottom()); }
|
|
|
| // Bounds of the outline box in absolute coords. Respects transforms
|
| - virtual LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* /*repaintContainer*/, const RenderGeometryMap*) const OVERRIDE;
|
| + virtual LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* /*repaintContainer*/, const RenderGeometryMap*) const OVERRIDE FINAL;
|
| virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE;
|
|
|
| // Use this with caution! No type checking is done!
|
| @@ -207,8 +207,8 @@ public:
|
| virtual LayoutUnit offsetWidth() const { return width(); }
|
| virtual LayoutUnit offsetHeight() const { return height(); }
|
|
|
| - virtual int pixelSnappedOffsetWidth() const OVERRIDE;
|
| - virtual int pixelSnappedOffsetHeight() const OVERRIDE;
|
| + virtual int pixelSnappedOffsetWidth() const OVERRIDE FINAL;
|
| + virtual int pixelSnappedOffsetHeight() const OVERRIDE FINAL;
|
|
|
| // More IE extensions. clientWidth and clientHeight represent the interior of an object
|
| // excluding border and scrollbar. clientLeft/Top are just the borderLeftWidth and borderTopWidth.
|
| @@ -245,17 +245,17 @@ public:
|
| void setMarginLeft(LayoutUnit margin) { m_marginBox.setLeft(margin); }
|
| void setMarginRight(LayoutUnit margin) { m_marginBox.setRight(margin); }
|
|
|
| - virtual LayoutUnit marginLogicalLeft() const { return m_marginBox.logicalLeft(style()->writingMode()); }
|
| - virtual LayoutUnit marginLogicalRight() const { return m_marginBox.logicalRight(style()->writingMode()); }
|
| + LayoutUnit marginLogicalLeft() const { return m_marginBox.logicalLeft(style()->writingMode()); }
|
| + LayoutUnit marginLogicalRight() const { return m_marginBox.logicalRight(style()->writingMode()); }
|
|
|
| - virtual LayoutUnit marginBefore(const RenderStyle* overrideStyle = 0) const OVERRIDE { return m_marginBox.before((overrideStyle ? overrideStyle : style())->writingMode()); }
|
| - virtual LayoutUnit marginAfter(const RenderStyle* overrideStyle = 0) const OVERRIDE { return m_marginBox.after((overrideStyle ? overrideStyle : style())->writingMode()); }
|
| - virtual LayoutUnit marginStart(const RenderStyle* overrideStyle = 0) const OVERRIDE
|
| + virtual LayoutUnit marginBefore(const RenderStyle* overrideStyle = 0) const OVERRIDE FINAL { return m_marginBox.before((overrideStyle ? overrideStyle : style())->writingMode()); }
|
| + virtual LayoutUnit marginAfter(const RenderStyle* overrideStyle = 0) const OVERRIDE FINAL { return m_marginBox.after((overrideStyle ? overrideStyle : style())->writingMode()); }
|
| + virtual LayoutUnit marginStart(const RenderStyle* overrideStyle = 0) const OVERRIDE FINAL
|
| {
|
| const RenderStyle* styleToUse = overrideStyle ? overrideStyle : style();
|
| return m_marginBox.start(styleToUse->writingMode(), styleToUse->direction());
|
| }
|
| - virtual LayoutUnit marginEnd(const RenderStyle* overrideStyle = 0) const OVERRIDE
|
| + virtual LayoutUnit marginEnd(const RenderStyle* overrideStyle = 0) const OVERRIDE FINAL
|
| {
|
| const RenderStyle* styleToUse = overrideStyle ? overrideStyle : style();
|
| return m_marginBox.end(styleToUse->writingMode(), styleToUse->direction());
|
| @@ -544,7 +544,7 @@ public:
|
|
|
| virtual bool hasRelativeDimensions() const;
|
| virtual bool hasRelativeLogicalHeight() const;
|
| - virtual bool hasViewportPercentageLogicalHeight() const;
|
| + bool hasViewportPercentageLogicalHeight() const;
|
|
|
| bool hasHorizontalLayoutOverflow() const
|
| {
|
| @@ -664,7 +664,7 @@ private:
|
| // These include tables, positioned objects, floats and flexible boxes.
|
| virtual void computePreferredLogicalWidths() { setPreferredLogicalWidthsDirty(false); }
|
|
|
| - virtual LayoutRect frameRectForStickyPositioning() const OVERRIDE { return frameRect(); }
|
| + virtual LayoutRect frameRectForStickyPositioning() const OVERRIDE FINAL { return frameRect(); }
|
|
|
| private:
|
| // The width/height of the contents + borders + padding. The x/y location is relative to our container (which is not always our parent).
|
|
|