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

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

Issue 23737004: Paint flex items atomically, like inline-blocks (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 24cc7472c7b08f796ac5f23eb90d7ffc64825d03..6480aa0718fe1125661d2cf4b61be4d5e17c7268 100644
--- a/Source/core/rendering/RenderBlock.h
+++ b/Source/core/rendering/RenderBlock.h
@@ -454,6 +454,7 @@ public:
bool allowsShapeInsideInfoSharing() const { return !isInline() && !isFloating(); }
virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE;
+ static void paintAsInlineBlock(RenderObject*, PaintInfo&, const LayoutPoint&);
protected:
virtual void willBeDestroyed();
@@ -498,6 +499,7 @@ protected:
virtual void paintObject(PaintInfo&, const LayoutPoint&);
virtual void paintChildren(PaintInfo&, const LayoutPoint&);
void paintChild(RenderBox*, PaintInfo&, const LayoutPoint&);
+ void paintChildAsInlineBlock(RenderBox*, PaintInfo&, const LayoutPoint&);
LayoutUnit logicalRightOffsetForLine(LayoutUnit logicalTop, LayoutUnit fixedOffset, bool applyTextIndent, LayoutUnit* heightRemaining = 0, LayoutUnit logicalHeight = 0) const
{

Powered by Google App Engine
This is Rietveld 408576698