Source/WebCore/css/CSSPrimitiveValue.cpp - Issue 10908295: Merge 127933

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/css/CSSPrimitiveValue.cpp

Issue 10908295: Merge 127933 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/

Patch Set: Created 8 years, 3 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/css/CSSPrimitiveValue.cpp

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

--- Source/WebCore/css/CSSPrimitiveValue.cpp (revision 128804)

+++ Source/WebCore/css/CSSPrimitiveValue.cpp (working copy)

@@ -469,7 +469,8 @@

template<> Length CSSPrimitiveValue::computeLength(RenderStyle* style, RenderStyle* rootStyle, float multiplier, bool computingFontSize)

{

#if ENABLE(SUBPIXEL_LAYOUT)

- return Length(static_cast<float>(computeLengthDouble(style, rootStyle, multiplier, computingFontSize)), Fixed);

+ double value = computeLengthDouble(style, rootStyle, multiplier, computingFontSize);

+ return Length(static_cast<float>(value > intMaxForLayoutUnit || value < intMinForLayoutUnit ? 0.0 : value), Fixed);

#else

return Length(roundForImpreciseConversion<float>(computeLengthDouble(style, rootStyle, multiplier, computingFontSize)), Fixed);

#endif

« no previous file with comments | « LayoutTests/platform/wk2/Skipped ('k') | Source/WebCore/platform/FractionalLayoutUnit.h » ('j') | no next file with comments »