sky/engine/core/rendering/InlineTextBox.cpp - Issue 1148253003: Add LayoutRoot

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/InlineTextBox.cpp

Issue 1148253003: Add LayoutRoot (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Updated Created 5 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

« sky/engine/core/painting/LayoutRoot.idl ('K') | « sky/engine/core/painting/LayoutRoot.idl ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | sky/examples/spinning_arabic.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sky/engine/core/rendering/InlineTextBox.cpp

diff --git a/sky/engine/core/rendering/InlineTextBox.cpp b/sky/engine/core/rendering/InlineTextBox.cpp

index 6a9db8af8da17ab7f7439ef09455e72b7fe17e86..3132df88be7b7b532de198962c128f8e9521b601 100644

--- a/sky/engine/core/rendering/InlineTextBox.cpp

+++ b/sky/engine/core/rendering/InlineTextBox.cpp

@@ -527,8 +527,8 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,

FloatRect boxRect(boxOrigin, LayoutSize(logicalWidth(), logicalHeight()));

// Determine whether or not we have composition underlines to draw.

- bool containsComposition = renderer().node() && renderer().frame()->inputMethodController().compositionNode() == renderer().node();

- bool useCustomUnderlines = containsComposition && renderer().frame()->inputMethodController().compositionUsesCustomUnderlines();

+ bool containsComposition = renderer().frame() && renderer().node() && renderer().frame()->inputMethodController().compositionNode() == renderer().node();

+ bool useCustomUnderlines = renderer().frame() && containsComposition && renderer().frame()->inputMethodController().compositionUsesCustomUnderlines();

bool haveSelection = selectionState() != RenderObject::SelectionNone;

« sky/engine/core/painting/LayoutRoot.idl ('K') | « sky/engine/core/painting/LayoutRoot.idl ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | sky/examples/spinning_arabic.dart » ('J')