sky/engine/core/rendering/line/BreakingContextInlineHeaders.h - Issue 1068683002: Delete RenderBlockFlow.

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: sky/engine/core/rendering/line/BreakingContextInlineHeaders.h

Issue 1068683002: Delete RenderBlockFlow. (Closed) Base URL: https://github.com/domokit/mojo.git@block

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

« no previous file with comments | « sky/engine/core/rendering/TrailingFloatsRootInlineBox.h ('k') | sky/engine/core/rendering/line/LineBreaker.h » ('j') | sky/engine/core/rendering/line/LineLayoutState.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sky/engine/core/rendering/line/BreakingContextInlineHeaders.h

diff --git a/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h b/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h

index 196acd6d4a53ef3f04dafc5e7706559d14215000..2171e7a0a2d3e7c354b88a67acbccaacb8d473bd 100644

--- a/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h

+++ b/sky/engine/core/rendering/line/BreakingContextInlineHeaders.h

@@ -45,7 +45,7 @@ const unsigned cMaxLineDepth = 200;

class BreakingContext {

public:

- BreakingContext(InlineBidiResolver& resolver, LineInfo& inLineInfo, LineWidth& lineWidth, RenderTextInfo& inRenderTextInfo, FloatingObject* inLastFloatFromPreviousLine, bool appliedStartWidth, RenderBlockFlow* block)

+ BreakingContext(InlineBidiResolver& resolver, LineInfo& inLineInfo, LineWidth& lineWidth, RenderTextInfo& inRenderTextInfo, FloatingObject* inLastFloatFromPreviousLine, bool appliedStartWidth, RenderParagraph* block)

: m_resolver(resolver)

, m_current(resolver.position())

, m_lineBreak(resolver.position())

@@ -105,7 +105,7 @@ private:

InlineIterator m_lineBreak;

InlineIterator m_startOfIgnoredSpaces;

- RenderBlockFlow* m_block;

+ RenderParagraph* m_block;

RenderObject* m_lastObject;

RenderObject* m_nextObject;

@@ -292,7 +292,7 @@ inline void BreakingContext::handleOutOfFlowPositioned(Vector<RenderBox*>& posit

// This is currently just used for list markers and inline flows that have line boxes. Neither should

// have an effect on whitespace at the start of the line.

-inline bool shouldSkipWhitespaceAfterStartObject(RenderBlockFlow* block, RenderObject* o, LineMidpointState& lineMidpointState)

+inline bool shouldSkipWhitespaceAfterStartObject(RenderParagraph* block, RenderObject* o, LineMidpointState& lineMidpointState)

{

RenderObject* next = bidiNextSkippingEmptyInlines(block, o);

while (next && next->isFloatingOrOutOfFlowPositioned())