| Index: Source/core/rendering/RenderBox.h
|
| diff --git a/Source/core/rendering/RenderBox.h b/Source/core/rendering/RenderBox.h
|
| index 4accc5d81524afd4186678a7a6b2fad6dc59ced1..73e2bc3f6d1a25b7fccd86504f4fb48f4ff522cd 100644
|
| --- a/Source/core/rendering/RenderBox.h
|
| +++ b/Source/core/rendering/RenderBox.h
|
| @@ -68,7 +68,6 @@ public:
|
| LayoutSize m_previousBorderBoxSize;
|
| };
|
|
|
| -
|
| class RenderBox : public RenderBoxModelObject {
|
| public:
|
| explicit RenderBox(ContainerNode*);
|
| @@ -622,9 +621,12 @@ public:
|
| removeFloatingOrPositionedChildFromBlockLists();
|
| }
|
|
|
| + bool backgroundHasOpaqueTopLayer() const;
|
| +
|
| protected:
|
| virtual void willBeDestroyed() OVERRIDE;
|
|
|
| +
|
| virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) OVERRIDE;
|
| virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
|
| virtual void updateFromStyle() OVERRIDE;
|
| @@ -634,28 +636,6 @@ protected:
|
| virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const;
|
| virtual bool computeBackgroundIsKnownToBeObscured() OVERRIDE;
|
|
|
| - void paintBackground(const PaintInfo&, const LayoutRect&, const Color& backgroundColor, BackgroundBleedAvoidance = BackgroundBleedNone);
|
| -
|
| - void paintFillLayer(const PaintInfo&, const Color&, const FillLayer&, const LayoutRect&, BackgroundBleedAvoidance, CompositeOperator, RenderObject* backgroundObject, bool skipBaseColor = false);
|
| - void paintFillLayers(const PaintInfo&, const Color&, const FillLayer&, const LayoutRect&, BackgroundBleedAvoidance = BackgroundBleedNone, CompositeOperator = CompositeSourceOver, RenderObject* backgroundObject = 0);
|
| -
|
| - void paintMaskImages(const PaintInfo&, const LayoutRect&);
|
| - void paintBoxDecorationBackgroundWithRect(PaintInfo&, const LayoutPoint&, const LayoutRect&);
|
| -
|
| - // Information extracted from RenderStyle for box painting.
|
| - // These are always needed during box painting and recomputing them takes time.
|
| - struct BoxDecorationData {
|
| - BoxDecorationData(const RenderStyle&);
|
| -
|
| - Color backgroundColor;
|
| - bool hasBackground;
|
| - bool hasBorder;
|
| - bool hasAppearance;
|
| - };
|
| -
|
| - BackgroundBleedAvoidance determineBackgroundBleedAvoidance(GraphicsContext*, const BoxDecorationData&) const;
|
| - bool backgroundHasOpaqueTopLayer() const;
|
| -
|
| void computePositionedLogicalWidth(LogicalExtentComputedValues&) const;
|
|
|
| LayoutUnit computeIntrinsicLogicalWidthUsing(const Length& logicalWidthLength, LayoutUnit availableLogicalWidth, LayoutUnit borderAndPadding) const;
|
| @@ -666,8 +646,6 @@ protected:
|
| virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const OVERRIDE;
|
| virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const OVERRIDE;
|
|
|
| - void paintRootBoxFillLayers(const PaintInfo&);
|
| -
|
| RenderObject* splitAnonymousBoxesAroundChild(RenderObject* beforeChild);
|
|
|
| virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer* currentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const OVERRIDE;
|
|
|