Source/core/layout/LayoutText.cpp - Issue 1156143002: *** NOT FOR LANDING *** Text nodes should only inherit inheritable properties.

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/layout/LayoutText.cpp

Issue 1156143002: *** NOT FOR LANDING *** Text nodes should only inherit inheritable properties. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Some tests need to be rebaselined. Text nodes can no longer have z-index. 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

« Source/core/dom/LayoutTreeBuilder.cpp ('K') | « Source/core/layout/LayoutTableSection.cpp ('k') | Source/core/layout/line/BreakingContextInlineHeaders.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/layout/LayoutText.cpp

diff --git a/Source/core/layout/LayoutText.cpp b/Source/core/layout/LayoutText.cpp

index 37dc21c7a7457d1cffeb0fb537cb1bfac9a2c1da..bb26cf249b6678095bf49506522d16b14d64e66f 100644

--- a/Source/core/layout/LayoutText.cpp

+++ b/Source/core/layout/LayoutText.cpp

@@ -709,7 +709,7 @@ LayoutRect LayoutText::localCaretRect(InlineBox* inlineBox, int caretOffset, Lay

ALWAYS_INLINE float LayoutText::widthFromCache(const Font& f, int start, int len, float xPos, TextDirection textDirection, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const

{

- if (style()->hasTextCombine() && isCombineText()) {

+ if (isCombineText()) {

Julien - ping for review 2015/06/01 19:13:47 We were only creating LayoutCombineText nodes if s

mstensho (USE GERRIT) 2015/06/01 19:31:37 -webkit-combine-text isn't an inherited property.

const LayoutTextCombine* combineText = toLayoutTextCombine(this);

if (combineText->isCombined())

return combineText->combinedTextWidth(f);

« Source/core/dom/LayoutTreeBuilder.cpp ('K') | « Source/core/layout/LayoutTableSection.cpp ('k') | Source/core/layout/line/BreakingContextInlineHeaders.h » ('j') | no next file with comments »