Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/TransformBuilder.cpp

Issue 2346193002: Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue (Closed)
Patch Set: Rebase please work Created 4 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:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 ASSERT_NOT_REACHED(); 75 ASSERT_NOT_REACHED();
76 // FIXME: We shouldn't have a type None since we never create them 76 // FIXME: We shouldn't have a type None since we never create them
77 return TransformOperation::None; 77 return TransformOperation::None;
78 } 78 }
79 } 79 }
80 80
81 void TransformBuilder::createTransformOperations(const CSSValue& inValue, const CSSToLengthConversionData& conversionData, TransformOperations& outOperations) 81 void TransformBuilder::createTransformOperations(const CSSValue& inValue, const CSSToLengthConversionData& conversionData, TransformOperations& outOperations)
82 { 82 {
83 ASSERT(!outOperations.size()); 83 ASSERT(!outOperations.size());
84 if (!inValue.isValueList()) { 84 if (!inValue.isValueList()) {
85 ASSERT(inValue.isPrimitiveValue() && toCSSPrimitiveValue(inValue).getVal ueID() == CSSValueNone); 85 DCHECK_EQ(toCSSIdentifierValue(inValue).getValueID(), CSSValueNone);
86 return; 86 return;
87 } 87 }
88 88
89 float zoomFactor = conversionData.zoom(); 89 float zoomFactor = conversionData.zoom();
90 for (auto& value : toCSSValueList(inValue)) { 90 for (auto& value : toCSSValueList(inValue)) {
91 const CSSFunctionValue* transformValue = toCSSFunctionValue(value.get()) ; 91 const CSSFunctionValue* transformValue = toCSSFunctionValue(value.get()) ;
92 TransformOperation::OperationType transformType = getTransformOperationT ype(transformValue->functionType()); 92 TransformOperation::OperationType transformType = getTransformOperationT ype(transformValue->functionType());
93 93
94 const CSSPrimitiveValue& firstValue = toCSSPrimitiveValue(transformValue ->item(0)); 94 const CSSPrimitiveValue& firstValue = toCSSPrimitiveValue(transformValue ->item(0));
95 95
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 break; 244 break;
245 } 245 }
246 default: 246 default:
247 ASSERT_NOT_REACHED(); 247 ASSERT_NOT_REACHED();
248 break; 248 break;
249 } 249 }
250 } 250 }
251 } 251 }
252 252
253 } // namespace blink 253 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698