Source/core/rendering/RenderBlockFlow.h - Issue 695423002: Push LayoutState from RenderSVGText

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/core/rendering/RenderBlockFlow.h

Issue 695423002: Push LayoutState from RenderSVGText (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 1 month 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

« no previous file with comments | « LayoutTests/svg/text/layout-inline-children-assert-expected.txt ('k') | Source/core/rendering/svg/RenderSVGText.cpp » ('j') | Source/core/rendering/svg/RenderSVGText.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderBlockFlow.h

diff --git a/Source/core/rendering/RenderBlockFlow.h b/Source/core/rendering/RenderBlockFlow.h

index a6aaabb69660e327192be509fb3d525f45db7cf3..632a6b103f5a9eea97fbf03a139da211f2951390 100644

--- a/Source/core/rendering/RenderBlockFlow.h

+++ b/Source/core/rendering/RenderBlockFlow.h

@@ -230,6 +230,7 @@ protected:

void setLogicalLeftForChild(RenderBox* child, LayoutUnit logicalLeft);

void setLogicalTopForChild(RenderBox* child, LayoutUnit logicalTop);

void determineLogicalLeftPositionForChild(RenderBox* child);

+ void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight);

private:

bool layoutBlockFlow(bool relayoutChildren, LayoutUnit& pageLogicalHeight, SubtreeLayoutScope&);

@@ -292,7 +293,6 @@ private:

void createOrDestroyMultiColumnFlowThreadIfNeeded(const RenderStyle* oldStyle);

void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*, BidiRun* trailingSpaceRun, float& logicalLeft, float& totalLogicalWidth, float& availableLogicalWidth, unsigned expansionOpportunityCount);

- void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight);

bool shouldRelayoutForPagination(LayoutUnit& pageLogicalHeight, LayoutUnit layoutOverflowLogicalBottom) const;

void setColumnCountAndHeight(unsigned count, LayoutUnit pageLogicalHeight);