| Index: third_party/WebKit/Source/core/css/cssom/CSSSkew.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/cssom/CSSSkew.cpp b/third_party/WebKit/Source/core/css/cssom/CSSSkew.cpp
|
| index 9fe864822b2f498b1c4b3daf2a4be4cea18ab6f4..12a4ec99ed92d80eb5c5d115d136a05e8825bf45 100644
|
| --- a/third_party/WebKit/Source/core/css/cssom/CSSSkew.cpp
|
| +++ b/third_party/WebKit/Source/core/css/cssom/CSSSkew.cpp
|
| @@ -6,51 +6,58 @@
|
|
|
| #include "core/css/CSSFunctionValue.h"
|
| #include "core/css/CSSPrimitiveValue.h"
|
| -#include "core/css/cssom/CSSAngleValue.h"
|
| +#include "core/css/cssom/CSSNumericValue.h"
|
| +#include "core/css/cssom/CSSUnitValue.h"
|
|
|
| namespace blink {
|
|
|
| CSSSkew* CSSSkew::FromCSSValue(const CSSFunctionValue& value) {
|
| - const CSSPrimitiveValue& x_value = ToCSSPrimitiveValue(value.Item(0));
|
| - if (x_value.IsCalculated()) {
|
| - // TODO(meade): Decide what we want to do with calc angles.
|
| - return nullptr;
|
| - }
|
| - DCHECK(x_value.IsAngle());
|
| - switch (value.FunctionType()) {
|
| - case CSSValueSkew:
|
| - if (value.length() == 2U) {
|
| - const CSSPrimitiveValue& y_value = ToCSSPrimitiveValue(value.Item(1));
|
| - if (y_value.IsCalculated()) {
|
| - // TODO(meade): Decide what we want to do with calc angles.
|
| - return nullptr;
|
| - }
|
| - DCHECK(y_value.IsAngle());
|
| - return CSSSkew::Create(CSSAngleValue::FromCSSValue(x_value),
|
| - CSSAngleValue::FromCSSValue(y_value));
|
| - }
|
| - // Else fall through; skew(ax) == skewX(ax).
|
| - case CSSValueSkewX:
|
| - DCHECK_EQ(value.length(), 1U);
|
| - return CSSSkew::Create(
|
| - CSSAngleValue::FromCSSValue(x_value),
|
| - CSSAngleValue::Create(0, CSSPrimitiveValue::UnitType::kDegrees));
|
| - case CSSValueSkewY:
|
| - DCHECK_EQ(value.length(), 1U);
|
| - return CSSSkew::Create(
|
| - CSSAngleValue::Create(0, CSSPrimitiveValue::UnitType::kDegrees),
|
| - CSSAngleValue::FromCSSValue(x_value));
|
| - default:
|
| - NOTREACHED();
|
| - return nullptr;
|
| - }
|
| + return nullptr;
|
| + // TODO(meade): Re-enable this code once numbers and units types have been
|
| + // re-written to the new spec.
|
| + // const CSSPrimitiveValue& x_value = ToCSSPrimitiveValue(value.Item(0));
|
| + // if (x_value.IsCalculated()) {
|
| + // // TODO(meade): Decide what we want to do with calc angles.
|
| + // return nullptr;
|
| + // }
|
| + // DCHECK(x_value.IsAngle());
|
| + // switch (value.FunctionType()) {
|
| + // case CSSValueSkew:
|
| + // if (value.length() == 2U) {
|
| + // const CSSPrimitiveValue& y_value =
|
| + // ToCSSPrimitiveValue(value.Item(1)); if (y_value.IsCalculated()) {
|
| + // // TODO(meade): Decide what we want to do with calc angles.
|
| + // return nullptr;
|
| + // }
|
| + // DCHECK(y_value.IsAngle());
|
| + // return CSSSkew::Create(CSSNumericValue::FromCSSValue(x_value),
|
| + // CSSNumericValue::FromCSSValue(y_value));
|
| + // }
|
| + // // Else fall through; skew(ax) == skewX(ax).
|
| + // case CSSValueSkewX:
|
| + // DCHECK_EQ(value.length(), 1U);
|
| + // return CSSSkew::Create(
|
| + // CSSNumericValue::FromCSSValue(x_value),
|
| + // CSSUnitValue::Create(0, CSSPrimitiveValue::UnitType::kDegrees));
|
| + // case CSSValueSkewY:
|
| + // DCHECK_EQ(value.length(), 1U);
|
| + // return CSSSkew::Create(
|
| + // CSSUnitValue::Create(0, CSSPrimitiveValue::UnitType::kDegrees),
|
| + // CSSNumericValue::FromCSSValue(x_value));
|
| + // default:
|
| + // NOTREACHED();
|
| + // return nullptr;
|
| + // }
|
| }
|
|
|
| CSSFunctionValue* CSSSkew::ToCSSValue() const {
|
| - CSSFunctionValue* result = CSSFunctionValue::Create(CSSValueSkew);
|
| - result->Append(*CSSPrimitiveValue::Create(ax_->Value(), ax_->Unit()));
|
| - result->Append(*CSSPrimitiveValue::Create(ay_->Value(), ay_->Unit()));
|
| - return result;
|
| + return nullptr;
|
| + // TODO(meade): Re-implement this when we finish rewriting number/length
|
| + // types.
|
| + // CSSFunctionValue* result = CSSFunctionValue::Create(CSSValueSkew);
|
| + // result->Append(*CSSPrimitiveValue::Create(ax_->Value(), ax_->Unit()));
|
| + // result->Append(*CSSPrimitiveValue::Create(ay_->Value(), ay_->Unit()));
|
| + // return result;
|
| }
|
|
|
| } // namespace blink
|
|
|