Source/core/css/CSSPrimitiveValue.h - Issue 345903005: calc expressions should support time, angle and frequency values.

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/CSSPrimitiveValue.h

Issue 345903005: calc expressions should support time, angle and frequency values. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fix build warrning. Created 6 years, 5 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/css/CSSCalculationValue.cpp ('K') | « Source/core/css/CSSCalculationValue.cpp ('k') | Source/core/css/CSSPrimitiveValue.cpp » ('j') | Source/core/css/CSSPrimitiveValue.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/CSSPrimitiveValue.h

diff --git a/Source/core/css/CSSPrimitiveValue.h b/Source/core/css/CSSPrimitiveValue.h

index 76846ab687dc2594d74dc633f276f7ae97ceb738..516e96e0f45413ef4438b7e85dbdf7a4f31abc37 100644

--- a/Source/core/css/CSSPrimitiveValue.h

+++ b/Source/core/css/CSSPrimitiveValue.h

@@ -270,24 +270,12 @@ public:

void cleanup();

+ enum TimeUnit { Seconds, Milliseconds };

alancutter (OOO until 2018) 2014/07/21 14:03:47 Is TimeUnit used anywhere? Can it be removed?

UnitType primitiveType() const;

+ UnitType calcUnitType() const;

alancutter (OOO until 2018) 2014/07/21 14:03:47 This function should be able to live in the CPP fi

double computeDegrees();

- enum TimeUnit { Seconds, Milliseconds };

- template <typename T, TimeUnit timeUnit> T computeTime()

- {

- if (timeUnit == Seconds && m_primitiveUnitType == CSS_S)

- return getValue<T>();

- if (timeUnit == Seconds && m_primitiveUnitType == CSS_MS)

- return getValue<T>() / 1000;

- if (timeUnit == Milliseconds && m_primitiveUnitType == CSS_MS)

- return getValue<T>();

- if (timeUnit == Milliseconds && m_primitiveUnitType == CSS_S)

- return getValue<T>() * 1000;

- ASSERT_NOT_REACHED();

- return 0;

- }

+ double computeSeconds();

* Computes a length in pixels out of the given CSSValue

« Source/core/css/CSSCalculationValue.cpp ('K') | « Source/core/css/CSSCalculationValue.cpp ('k') | Source/core/css/CSSPrimitiveValue.cpp » ('j') | Source/core/css/CSSPrimitiveValue.cpp » ('J')