Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1983)

Unified Diff: Source/core/rendering/shapes/ShapeOutsideInfo.h

Issue 149513005: Stacked floats with shape-outside should allow inline content to interact with the non-outermost fl… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/shapes/ShapeOutsideInfo.h
diff --git a/Source/core/rendering/shapes/ShapeOutsideInfo.h b/Source/core/rendering/shapes/ShapeOutsideInfo.h
index 17f5ddbd1ab52e20c07b143268da1908750c9e87..9e0dfdc2e380e91ac9ed488380cad68859087e6b 100644
--- a/Source/core/rendering/shapes/ShapeOutsideInfo.h
+++ b/Source/core/rendering/shapes/ShapeOutsideInfo.h
@@ -43,6 +43,7 @@ class ShapeOutsideInfo FINAL : public ShapeInfo<RenderBox>, public MappedInfo<Re
public:
LayoutUnit leftMarginBoxDelta() const { return m_leftMarginBoxDelta; }
LayoutUnit rightMarginBoxDelta() const { return m_rightMarginBoxDelta; }
+ bool lineOverlapsShape() const { return m_lineOverlapsShape; }
void updateDeltasForContainingBlockLine(const RenderBlockFlow*, const FloatingObject*, LayoutUnit lineTop, LayoutUnit lineHeight);
@@ -69,11 +70,15 @@ protected:
}
private:
- ShapeOutsideInfo(const RenderBox* renderer) : ShapeInfo<RenderBox>(renderer) { }
+ ShapeOutsideInfo(const RenderBox* renderer)
+ : ShapeInfo<RenderBox>(renderer)
+ , m_lineOverlapsShape(false)
+ { }
LayoutUnit m_leftMarginBoxDelta;
LayoutUnit m_rightMarginBoxDelta;
LayoutUnit m_lineTop;
+ bool m_lineOverlapsShape;
};
}

Powered by Google App Engine
This is Rietveld 408576698