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

Unified Diff: Source/core/rendering/RenderBlock.h

Issue 23084002: Use the outermost float for shape-outside (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 7 years, 4 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/RenderBlock.h
diff --git a/Source/core/rendering/RenderBlock.h b/Source/core/rendering/RenderBlock.h
index 9084f8af9181cd7460e4f760ef2e69c5b4a80238..72378974860cae4cffd0af47bcf5d5f93535b6f0 100644
--- a/Source/core/rendering/RenderBlock.h
+++ b/Source/core/rendering/RenderBlock.h
@@ -1181,8 +1181,7 @@ protected:
, m_lineTop(lineTop)
, m_lineBottom(lineBottom)
, m_offset(offset)
- , m_last(0)
- , m_floatForHeight(0)
+ , m_outermostFloat(0)
{
}
@@ -1194,9 +1193,7 @@ protected:
// the outermost float on that line has a shape-outside, the inline
// content that butts up against that float must be positioned using
// the contours of the shape, not the margin box of the float.
- // We save the last float encountered so that the offset can be
- // computed correctly by the code using this adapter.
- const FloatingObject* lastFloat() const { return m_last; }
+ const FloatingObject* outermostFloat() const { return m_outermostFloat; }
LayoutUnit getHeightRemaining() const;
@@ -1207,8 +1204,7 @@ protected:
int m_lineTop;
int m_lineBottom;
LayoutUnit& m_offset;
- const FloatingObject* m_last;
- const FloatingObject* m_floatForHeight;
+ const FloatingObject* m_outermostFloat;
};
void createFloatingObjects();

Powered by Google App Engine
This is Rietveld 408576698