Source/core/css/CSSCalculationValue.cpp - Issue 23439004: CSS Calc: Use Lengths instead of numbers to represent pixels

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

Issue 23439004: CSS Calc: Use Lengths instead of numbers to represent pixels (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Rebased to ToT again Created 7 years, 2 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/css/CSSCalculationValue.cpp

diff --git a/Source/core/css/CSSCalculationValue.cpp b/Source/core/css/CSSCalculationValue.cpp

index f2eaae38cd7e0879349f8bfd1dad51482919738f..1ca3fca2d09b8863be3b1cc390f20b45f63990b4 100644

--- a/Source/core/css/CSSCalculationValue.cpp

+++ b/Source/core/css/CSSCalculationValue.cpp

@@ -230,7 +230,7 @@ public:

case CalcNumber:

return adoptPtr(new CalcExpressionNumber(m_value->getFloatValue()));

case CalcLength:

- return adoptPtr(new CalcExpressionNumber(m_value->computeLength<float>(style, rootStyle, zoom)));

+ return adoptPtr(new CalcExpressionLength(Length(m_value->computeLength<float>(style, rootStyle, zoom), WebCore::Fixed)));

case CalcPercent:

case CalcPercentLength: {

CSSPrimitiveValue* primitiveValue = m_value.get();