Source/WebCore/platform/Length.h - Issue 10442006: Merge 117748

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/WebCore/platform/Length.h

Issue 10442006: Merge 117748 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

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

Index: Source/WebCore/platform/Length.h

===================================================================

--- Source/WebCore/platform/Length.h (revision 118283)

+++ Source/WebCore/platform/Length.h (working copy)

@@ -228,7 +228,7 @@

return *this;

// FIXME http://webkit.org/b/86160 - Blending doesn't work with calculated expressions

- if (type() == Calculated)

+ if (from.type() == Calculated || type() == Calculated)

return *this;

LengthType resultType = type();

« no previous file with comments | « LayoutTests/css3/calc/transition-crash4-expected.txt ('k') | no next file » | no next file with comments »