Index: Source/core/rendering/RenderBoxModelObject.h |
diff --git a/Source/core/rendering/RenderBoxModelObject.h b/Source/core/rendering/RenderBoxModelObject.h |
index 31b318612b8197283ee1120f132d02ec6729a205..03520472cc010d0286dcd05266631240ffb410f3 100644 |
--- a/Source/core/rendering/RenderBoxModelObject.h |
+++ b/Source/core/rendering/RenderBoxModelObject.h |
@@ -200,6 +200,9 @@ protected: |
class BackgroundImageGeometry { |
public: |
+ BackgroundImageGeometry() |
+ : m_hasNonLocalGeometry(false) |
+ { } |
esprehn
2014/01/08 01:53:55
nl after }
Stephen White
2014/03/27 15:07:12
Done.
|
IntPoint destOrigin() const { return m_destOrigin; } |
void setDestOrigin(const IntPoint& destOrigin) |
{ |
@@ -244,17 +247,22 @@ protected: |
void useFixedAttachment(const IntPoint& attachmentPoint); |
void clip(const IntRect&); |
+ |
+ void setHasNonLocalGeometry(bool hasNonLocalGeometry = true) { m_hasNonLocalGeometry = hasNonLocalGeometry; } |
+ bool hasNonLocalGeometry() const { return m_hasNonLocalGeometry; } |
+ |
private: |
IntRect m_destRect; |
IntPoint m_destOrigin; |
IntPoint m_phase; |
IntSize m_tileSize; |
+ bool m_hasNonLocalGeometry; // Has background-attachment: fixed. Implies that we can't always cheaply compute destRect. |
esprehn
2014/01/08 01:53:55
Don't stick a bool between the IntSizes, that caus
Stephen White
2014/03/27 15:07:12
Done.
|
IntSize m_repeatSpacing; |
}; |
LayoutPoint adjustedPositionRelativeToOffsetParent(const LayoutPoint&) const; |
- void calculateBackgroundImageGeometry(const FillLayer*, const LayoutRect& paintRect, BackgroundImageGeometry&, RenderObject* = 0); |
+ void calculateBackgroundImageGeometry(const RenderLayerModelObject* paintContainer, const FillLayer*, const LayoutRect& paintRect, BackgroundImageGeometry&, RenderObject* = 0) const; |
void getBorderEdgeInfo(class BorderEdge[], const RenderStyle*, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const; |
bool borderObscuresBackgroundEdge(const FloatSize& contextScale) const; |
bool borderObscuresBackground() const; |