| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "core/css/CSSCalculationValue.h" | 32 #include "core/css/CSSCalculationValue.h" |
| 33 | 33 |
| 34 #include "core/css/CSSValueList.h" | |
| 35 #include "core/css/resolver/StyleResolver.h" | 34 #include "core/css/resolver/StyleResolver.h" |
| 36 #include "core/dom/WebCoreMemoryInstrumentation.h" | 35 #include "core/dom/WebCoreMemoryInstrumentation.h" |
| 37 #include "core/platform/Length.h" | |
| 38 | 36 |
| 39 #include <wtf/OwnPtr.h> | 37 #include <wtf/OwnPtr.h> |
| 40 #include <wtf/PassOwnPtr.h> | 38 #include <wtf/PassOwnPtr.h> |
| 41 #include <wtf/text/StringBuilder.h> | 39 #include <wtf/text/StringBuilder.h> |
| 42 | 40 |
| 43 static const int maxExpressionDepth = 100; | 41 static const int maxExpressionDepth = 100; |
| 44 | 42 |
| 45 enum ParseState { | 43 enum ParseState { |
| 46 OK, | 44 OK, |
| 47 TooDeep, | 45 TooDeep, |
| (...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 RefPtr<CSSCalcExpressionNode> expression; | 542 RefPtr<CSSCalcExpressionNode> expression; |
| 545 | 543 |
| 546 if (equalIgnoringCase(name, "calc(") || equalIgnoringCase(name, "-webkit-cal
c(")) | 544 if (equalIgnoringCase(name, "calc(") || equalIgnoringCase(name, "-webkit-cal
c(")) |
| 547 expression = parser.parseCalc(parserValueList); | 545 expression = parser.parseCalc(parserValueList); |
| 548 // FIXME calc (http://webkit.org/b/16662) Add parsing for min and max here | 546 // FIXME calc (http://webkit.org/b/16662) Add parsing for min and max here |
| 549 | 547 |
| 550 return expression ? adoptRef(new CSSCalcValue(expression, range)) : 0; | 548 return expression ? adoptRef(new CSSCalcValue(expression, range)) : 0; |
| 551 } | 549 } |
| 552 | 550 |
| 553 } // namespace WebCore | 551 } // namespace WebCore |
| OLD | NEW |