Source/WebCore/rendering/RenderBlock.h - Issue 9371032: Merge 106694

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 9371032: Merge 106694 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/

Patch Set: Created 8 years, 10 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:

Index: Source/WebCore/rendering/RenderBlock.h

===================================================================

--- Source/WebCore/rendering/RenderBlock.h (revision 107302)

+++ Source/WebCore/rendering/RenderBlock.h (working copy)

@@ -448,6 +448,8 @@

}

#endif

+ void computeInitialRegionRangeForBlock();

+ void computeRegionRangeForBlock();

private:

virtual RenderObjectChildList* virtualChildren() { return children(); }

virtual const RenderObjectChildList* virtualChildren() const { return children(); }

@@ -468,6 +470,7 @@

void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChild);

void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild);

void addChildToAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild);

virtual void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild = 0);

virtual bool isSelfCollapsingBlock() const;