| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> | 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. |
| 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
| 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. | 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. |
| 7 * Copyright (C) 2015 Google Inc. All rights reserved. | 7 * Copyright (C) 2015 Google Inc. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Lesser General Public | 10 * modify it under the terms of the GNU Lesser General Public |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #include "core/css/ComputedStyleCSSValueMapping.h" | 25 #include "core/css/ComputedStyleCSSValueMapping.h" |
| 26 | 26 |
| 27 #include "core/StylePropertyShorthand.h" | 27 #include "core/StylePropertyShorthand.h" |
| 28 #include "core/animation/css/CSSAnimationData.h" | 28 #include "core/animation/css/CSSAnimationData.h" |
| 29 #include "core/animation/css/CSSTransitionData.h" | 29 #include "core/animation/css/CSSTransitionData.h" |
| 30 #include "core/css/BasicShapeFunctions.h" | 30 #include "core/css/BasicShapeFunctions.h" |
| 31 #include "core/css/CSSBasicShapeValues.h" | 31 #include "core/css/CSSBasicShapeValues.h" |
| 32 #include "core/css/CSSBorderImage.h" | 32 #include "core/css/CSSBorderImage.h" |
| 33 #include "core/css/CSSBorderImageSliceValue.h" | 33 #include "core/css/CSSBorderImageSliceValue.h" |
| 34 #include "core/css/CSSCounterValue.h" | 34 #include "core/css/CSSCounterValue.h" |
| 35 #include "core/css/CSSCursorImageValue.h" |
| 35 #include "core/css/CSSCustomIdentValue.h" | 36 #include "core/css/CSSCustomIdentValue.h" |
| 36 #include "core/css/CSSCustomPropertyDeclaration.h" | 37 #include "core/css/CSSCustomPropertyDeclaration.h" |
| 37 #include "core/css/CSSFontFeatureValue.h" | 38 #include "core/css/CSSFontFeatureValue.h" |
| 38 #include "core/css/CSSFunctionValue.h" | 39 #include "core/css/CSSFunctionValue.h" |
| 39 #include "core/css/CSSGridLineNamesValue.h" | 40 #include "core/css/CSSGridLineNamesValue.h" |
| 40 #include "core/css/CSSGridTemplateAreasValue.h" | 41 #include "core/css/CSSGridTemplateAreasValue.h" |
| 41 #include "core/css/CSSPathValue.h" | 42 #include "core/css/CSSPathValue.h" |
| 42 #include "core/css/CSSPrimitiveValueMappings.h" | 43 #include "core/css/CSSPrimitiveValueMappings.h" |
| 43 #include "core/css/CSSQuadValue.h" | 44 #include "core/css/CSSQuadValue.h" |
| 44 #include "core/css/CSSReflectValue.h" | 45 #include "core/css/CSSReflectValue.h" |
| (...skipping 1797 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1842 case CSSPropertyTabSize: | 1843 case CSSPropertyTabSize: |
| 1843 return cssValuePool().createValue( | 1844 return cssValuePool().createValue( |
| 1844 style.getTabSize().getPixelSize(1.0), style.getTabSize().isSpaces()
? CSSPrimitiveValue::UnitType::Number : CSSPrimitiveValue::UnitType::Pixels); | 1845 style.getTabSize().getPixelSize(1.0), style.getTabSize().isSpaces()
? CSSPrimitiveValue::UnitType::Number : CSSPrimitiveValue::UnitType::Pixels); |
| 1845 case CSSPropertyCursor: { | 1846 case CSSPropertyCursor: { |
| 1846 CSSValueList* list = nullptr; | 1847 CSSValueList* list = nullptr; |
| 1847 CursorList* cursors = style.cursors(); | 1848 CursorList* cursors = style.cursors(); |
| 1848 if (cursors && cursors->size() > 0) { | 1849 if (cursors && cursors->size() > 0) { |
| 1849 list = CSSValueList::createCommaSeparated(); | 1850 list = CSSValueList::createCommaSeparated(); |
| 1850 for (unsigned i = 0; i < cursors->size(); ++i) { | 1851 for (unsigned i = 0; i < cursors->size(); ++i) { |
| 1851 if (StyleImage* image = cursors->at(i).image()) | 1852 if (StyleImage* image = cursors->at(i).image()) |
| 1852 list->append(image->computedCSSValue()); | 1853 list->append(CSSCursorImageValue::create(image->computedCSSV
alue(), cursors->at(i).hotSpotSpecified(), cursors->at(i).hotSpot())); |
| 1853 } | 1854 } |
| 1854 } | 1855 } |
| 1855 CSSValue* value = cssValuePool().createValue(style.cursor()); | 1856 CSSValue* value = cssValuePool().createValue(style.cursor()); |
| 1856 if (list) { | 1857 if (list) { |
| 1857 list->append(value); | 1858 list->append(value); |
| 1858 return list; | 1859 return list; |
| 1859 } | 1860 } |
| 1860 return value; | 1861 return value; |
| 1861 } | 1862 } |
| 1862 case CSSPropertyDirection: | 1863 case CSSPropertyDirection: |
| (...skipping 1136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2999 case CSSPropertyAll: | 3000 case CSSPropertyAll: |
| 3000 return nullptr; | 3001 return nullptr; |
| 3001 default: | 3002 default: |
| 3002 break; | 3003 break; |
| 3003 } | 3004 } |
| 3004 ASSERT_NOT_REACHED(); | 3005 ASSERT_NOT_REACHED(); |
| 3005 return nullptr; | 3006 return nullptr; |
| 3006 } | 3007 } |
| 3007 | 3008 |
| 3008 } // namespace blink | 3009 } // namespace blink |
| OLD | NEW |