| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * * Redistributions of source code must retain the above copyright | 4 * * Redistributions of source code must retain the above copyright |
| 5 * notice, this list of conditions and the following disclaimer. | 5 * notice, this list of conditions and the following disclaimer. |
| 6 * * Redistributions in binary form must reproduce the above | 6 * * Redistributions in binary form must reproduce the above |
| 7 * copyright notice, this list of conditions and the following disclaimer | 7 * copyright notice, this list of conditions and the following disclaimer |
| 8 * in the documentation and/or other materials provided with the | 8 * in the documentation and/or other materials provided with the |
| 9 * distribution. | 9 * distribution. |
| 10 * * Neither the name of Google Inc. nor the names of its | 10 * * Neither the name of Google Inc. nor the names of its |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 fragmentIdentifier); | 151 fragmentIdentifier); |
| 152 } | 152 } |
| 153 DCHECK(value.isIdentifierValue() && | 153 DCHECK(value.isIdentifierValue() && |
| 154 toCSSIdentifierValue(value).getValueID() == CSSValueNone); | 154 toCSSIdentifierValue(value).getValueID() == CSSValueNone); |
| 155 return nullptr; | 155 return nullptr; |
| 156 } | 156 } |
| 157 | 157 |
| 158 FilterOperations StyleBuilderConverter::convertFilterOperations( | 158 FilterOperations StyleBuilderConverter::convertFilterOperations( |
| 159 StyleResolverState& state, | 159 StyleResolverState& state, |
| 160 const CSSValue& value) { | 160 const CSSValue& value) { |
| 161 return FilterOperationResolver::createFilterOperations(state, value); | 161 return FilterOperationResolver::createFilterOperations(&state, value); |
| 162 } | 162 } |
| 163 | 163 |
| 164 static FontDescription::GenericFamilyType convertGenericFamily( | 164 static FontDescription::GenericFamilyType convertGenericFamily( |
| 165 CSSValueID valueID) { | 165 CSSValueID valueID) { |
| 166 switch (valueID) { | 166 switch (valueID) { |
| 167 case CSSValueWebkitBody: | 167 case CSSValueWebkitBody: |
| 168 return FontDescription::StandardFamily; | 168 return FontDescription::StandardFamily; |
| 169 case CSSValueSerif: | 169 case CSSValueSerif: |
| 170 return FontDescription::SerifFamily; | 170 return FontDescription::SerifFamily; |
| 171 case CSSValueSansSerif: | 171 case CSSValueSansSerif: |
| (...skipping 1124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1296 // Instead of the actual zoom, use 1 to avoid potential rounding errors | 1296 // Instead of the actual zoom, use 1 to avoid potential rounding errors |
| 1297 Length length = primitiveValue.convertToLength( | 1297 Length length = primitiveValue.convertToLength( |
| 1298 state.cssToLengthConversionData().copyWithAdjustedZoom(1)); | 1298 state.cssToLengthConversionData().copyWithAdjustedZoom(1)); |
| 1299 return *CSSPrimitiveValue::create(length, 1); | 1299 return *CSSPrimitiveValue::create(length, 1); |
| 1300 } | 1300 } |
| 1301 } | 1301 } |
| 1302 return value; | 1302 return value; |
| 1303 } | 1303 } |
| 1304 | 1304 |
| 1305 } // namespace blink | 1305 } // namespace blink |
| OLD | NEW |