Source/core/layout/LayoutTextCombine.cpp - Issue 1033943002: Rename LayoutStyle to papayawhip

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: ensureComputedStyle Created 5 years, 9 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/core/layout/LayoutTextCombine.cpp

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

index 83445ad4d609d27684e2ec854792ccd65746ee7e..12ddcf72c79b382b2de3a37544c02b20148e5f09 100644

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

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

@@ -37,9 +37,9 @@ LayoutTextCombine::LayoutTextCombine(Node* node, PassRefPtr<StringImpl> string)

{

}

-void LayoutTextCombine::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)

+void LayoutTextCombine::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)

{

- setStyleInternal(LayoutStyle::clone(styleRef()));

+ setStyleInternal(ComputedStyle::clone(styleRef()));

LayoutText::styleDidChange(diff, oldStyle);

updateIsCombined();

« no previous file with comments | « Source/core/layout/LayoutTextCombine.h ('k') | Source/core/layout/LayoutTextControl.h » ('j') | no next file with comments »