| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "core/css/parser/MediaQueryToken.h" | 6 #include "core/css/parser/MediaQueryToken.h" |
| 7 | 7 |
| 8 #include "wtf/HashMap.h" | 8 #include "wtf/HashMap.h" |
| 9 #include "wtf/text/StringHash.h" | 9 #include "wtf/text/StringHash.h" |
| 10 | 10 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 , m_numericValue(numericValue) | 42 , m_numericValue(numericValue) |
| 43 , m_unit(CSSPrimitiveValue::CSS_NUMBER) | 43 , m_unit(CSSPrimitiveValue::CSS_NUMBER) |
| 44 { | 44 { |
| 45 ASSERT(type == NumberToken); | 45 ASSERT(type == NumberToken); |
| 46 } | 46 } |
| 47 | 47 |
| 48 void MediaQueryToken::convertToDimensionWithUnit(String unit) | 48 void MediaQueryToken::convertToDimensionWithUnit(String unit) |
| 49 { | 49 { |
| 50 ASSERT(m_type == NumberToken); | 50 ASSERT(m_type == NumberToken); |
| 51 m_type = DimensionToken; | 51 m_type = DimensionToken; |
| 52 m_unit = CSSPrimitiveValue::getUnitTable().get(unit.lower()); | 52 m_unit = CSSPrimitiveValue::fromName(unit); |
| 53 } | 53 } |
| 54 | 54 |
| 55 void MediaQueryToken::convertToPercentage() | 55 void MediaQueryToken::convertToPercentage() |
| 56 { | 56 { |
| 57 ASSERT(m_type == NumberToken); | 57 ASSERT(m_type == NumberToken); |
| 58 m_type = PercentageToken; | 58 m_type = PercentageToken; |
| 59 m_unit = CSSPrimitiveValue::CSS_PERCENTAGE; | 59 m_unit = CSSPrimitiveValue::CSS_PERCENTAGE; |
| 60 } | 60 } |
| 61 | 61 |
| 62 } // namespace WebCore | 62 } // namespace WebCore |
| OLD | NEW |