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

Side by Side Diff: Source/core/css/resolver/StyleBuilderCustom.cpp

Issue 24467007: Generate toCSSCalcValue() instead of using manual inline functions (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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:
View unified diff | Download patch
« no previous file with comments | « Source/core/css/CSSValue.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
(...skipping 1189 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 return false; 1200 return false;
1201 } 1201 }
1202 1202
1203 static bool hasVariableReference(CSSValue* value) 1203 static bool hasVariableReference(CSSValue* value)
1204 { 1204 {
1205 if (value->isPrimitiveValue()) { 1205 if (value->isPrimitiveValue()) {
1206 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 1206 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
1207 return primitiveValue->hasVariableReference(); 1207 return primitiveValue->hasVariableReference();
1208 } 1208 }
1209 1209
1210 if (value->isCalculationValue()) 1210 if (value->isCalcValue())
1211 return static_cast<CSSCalcValue*>(value)->hasVariableReference(); 1211 return toCSSCalcValue(value)->hasVariableReference();
1212 1212
1213 if (value->isReflectValue()) { 1213 if (value->isReflectValue()) {
1214 CSSReflectValue* reflectValue = toCSSReflectValue(value); 1214 CSSReflectValue* reflectValue = toCSSReflectValue(value);
1215 CSSPrimitiveValue* direction = reflectValue->direction(); 1215 CSSPrimitiveValue* direction = reflectValue->direction();
1216 CSSPrimitiveValue* offset = reflectValue->offset(); 1216 CSSPrimitiveValue* offset = reflectValue->offset();
1217 CSSValue* mask = reflectValue->mask(); 1217 CSSValue* mask = reflectValue->mask();
1218 return (direction && hasVariableReference(direction)) || (offset && hasV ariableReference(offset)) || (mask && hasVariableReference(mask)); 1218 return (direction && hasVariableReference(direction)) || (offset && hasV ariableReference(offset)) || (mask && hasVariableReference(mask));
1219 } 1219 }
1220 1220
1221 for (CSSValueListIterator i = value; i.hasMore(); i.advance()) { 1221 for (CSSValueListIterator i = value; i.hasMore(); i.advance()) {
(...skipping 1174 matching lines...) Expand 10 before | Expand all | Expand 10 after
2396 break; 2396 break;
2397 } 2397 }
2398 case CSSPropertyEnableBackground: 2398 case CSSPropertyEnableBackground:
2399 // Silently ignoring this property for now 2399 // Silently ignoring this property for now
2400 // http://bugs.webkit.org/show_bug.cgi?id=6022 2400 // http://bugs.webkit.org/show_bug.cgi?id=6022
2401 break; 2401 break;
2402 } 2402 }
2403 } 2403 }
2404 2404
2405 } // namespace WebCore 2405 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSValue.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698