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

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

Issue 10447080: Merge 117865 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 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/WebCore/rendering/RenderBlock.h
===================================================================
--- Source/WebCore/rendering/RenderBlock.h (revision 118863)
+++ Source/WebCore/rendering/RenderBlock.h (working copy)
@@ -373,6 +373,9 @@
LayoutUnit computeStartPositionDeltaForChildAvoidingFloats(const RenderBox* child, LayoutUnit childMarginStart, RenderRegion* = 0, LayoutUnit offsetFromLogicalTopOfFirstPage = 0);
+ void placeRunInIfNeeded(RenderObject* newChild, PlaceGeneratedRunInFlag);
+ bool runInIsPlacedIntoSiblingBlock(RenderObject* runIn);
+
#ifndef NDEBUG
void showLineTreeAndMark(const InlineBox* = 0, const char* = 0, const InlineBox* = 0, const char* = 0, const RenderObject* = 0) const;
#endif

Powered by Google App Engine
This is Rietveld 408576698