diff options
Diffstat (limited to 'Source/WebCore/rendering/RenderBox.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderBox.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h index db274fb84..563bbefdc 100644 --- a/Source/WebCore/rendering/RenderBox.h +++ b/Source/WebCore/rendering/RenderBox.h @@ -154,7 +154,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(RenderBoxModelObject* /*repaintContainer*/, LayoutPoint* cachedOffsetToRepaintContainer) const; + virtual LayoutRect outlineBoundsForRepaint(RenderLayerModelObject* /*repaintContainer*/, LayoutPoint* cachedOffsetToRepaintContainer) const OVERRIDE; virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint&); // Use this with caution! No type checking is done! @@ -289,6 +289,10 @@ public: virtual LayoutUnit minPreferredLogicalWidth() const; virtual LayoutUnit maxPreferredLogicalWidth() const; + // FIXME: We should rename these back to overrideLogicalHeight/Width and have them store + // the border-box height/width like the regular height/width accessors on RenderBox. + // Right now, these are different than contentHeight/contentWidth because they still + // include the scrollbar height/width. LayoutUnit overrideLogicalContentWidth() const; LayoutUnit overrideLogicalContentHeight() const; bool hasOverrideHeight() const; @@ -354,8 +358,8 @@ public: void setInlineBoxWrapper(InlineBox* boxWrapper) { m_inlineBoxWrapper = boxWrapper; } void deleteLineBoxWrapper(); - virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; - virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, LayoutRect&, bool fixed = false) const; + virtual LayoutRect clippedOverflowRectForRepaint(RenderLayerModelObject* repaintContainer) const OVERRIDE; + virtual void computeRectForRepaint(RenderLayerModelObject* repaintContainer, LayoutRect&, bool fixed = false) const OVERRIDE; virtual void repaintDuringLayoutIfMoved(const LayoutRect&); @@ -550,7 +554,7 @@ protected: virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle); virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); - virtual void updateBoxModelInfoFromStyle(); + virtual void updateFromStyle() OVERRIDE; virtual bool backgroundIsObscured() const { return false; } void paintBackground(const PaintInfo&, const LayoutRect&, BackgroundBleedAvoidance = BackgroundBleedNone); @@ -570,9 +574,9 @@ protected: virtual bool shouldComputeSizeAsReplaced() const { return isReplaced() && !isInlineBlockOrInlineTable(); } - virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState&, MapLocalToContainerFlags mode = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE; - virtual const RenderObject* pushMappingToContainer(const RenderBoxModelObject*, RenderGeometryMap&) const; - virtual void mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState&) const; + virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE; + virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject*, RenderGeometryMap&) const OVERRIDE; + virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const; void paintRootBoxFillLayers(const PaintInfo&); |