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

Side by Side Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 14409013: Rename CSSAnimationData* -> StyleAnimationData* (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 7 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/core.gypi ('k') | Source/core/css/CSSToStyleMap.h » ('j') | 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) 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 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1039 matching lines...) Expand 10 before | Expand all | Expand 10 after
1050 return cssValuePool().createIdentifierValue(CSSValueAuto); 1050 return cssValuePool().createIdentifierValue(CSSValueAuto);
1051 1051
1052 if (position.isInteger()) 1052 if (position.isInteger())
1053 return cssValuePool().createValue(position.integerPosition(), CSSPrimiti veValue::CSS_NUMBER); 1053 return cssValuePool().createValue(position.integerPosition(), CSSPrimiti veValue::CSS_NUMBER);
1054 1054
1055 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); 1055 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
1056 list->append(cssValuePool().createIdentifierValue(CSSValueSpan)); 1056 list->append(cssValuePool().createIdentifierValue(CSSValueSpan));
1057 list->append(cssValuePool().createValue(position.spanPosition(), CSSPrimitiv eValue::CSS_NUMBER)); 1057 list->append(cssValuePool().createValue(position.spanPosition(), CSSPrimitiv eValue::CSS_NUMBER));
1058 return list; 1058 return list;
1059 } 1059 }
1060 static PassRefPtr<CSSValue> createTransitionPropertyValue(const CSSAnimationData * animation) 1060 static PassRefPtr<CSSValue> createTransitionPropertyValue(const StyleAnimationDa ta* animation)
1061 { 1061 {
1062 RefPtr<CSSValue> propertyValue; 1062 RefPtr<CSSValue> propertyValue;
1063 if (animation->animationMode() == CSSAnimationData::AnimateNone) 1063 if (animation->animationMode() == StyleAnimationData::AnimateNone)
1064 propertyValue = cssValuePool().createIdentifierValue(CSSValueNone); 1064 propertyValue = cssValuePool().createIdentifierValue(CSSValueNone);
1065 else if (animation->animationMode() == CSSAnimationData::AnimateAll) 1065 else if (animation->animationMode() == StyleAnimationData::AnimateAll)
1066 propertyValue = cssValuePool().createIdentifierValue(CSSValueAll); 1066 propertyValue = cssValuePool().createIdentifierValue(CSSValueAll);
1067 else 1067 else
1068 propertyValue = cssValuePool().createValue(getPropertyNameString(animati on->property()), CSSPrimitiveValue::CSS_STRING); 1068 propertyValue = cssValuePool().createValue(getPropertyNameString(animati on->property()), CSSPrimitiveValue::CSS_STRING);
1069 return propertyValue.release(); 1069 return propertyValue.release();
1070 } 1070 }
1071 static PassRefPtr<CSSValue> getTransitionPropertyValue(const CSSAnimationDataLis t* animList) 1071 static PassRefPtr<CSSValue> getTransitionPropertyValue(const StyleAnimationDataL ist* animList)
1072 { 1072 {
1073 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); 1073 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
1074 if (animList) { 1074 if (animList) {
1075 for (size_t i = 0; i < animList->size(); ++i) 1075 for (size_t i = 0; i < animList->size(); ++i)
1076 list->append(createTransitionPropertyValue(animList->animation(i))); 1076 list->append(createTransitionPropertyValue(animList->animation(i)));
1077 } else 1077 } else
1078 list->append(cssValuePool().createIdentifierValue(CSSValueAll)); 1078 list->append(cssValuePool().createIdentifierValue(CSSValueAll));
1079 return list.release(); 1079 return list.release();
1080 } 1080 }
1081 1081
1082 static PassRefPtr<CSSValue> getDelayValue(const CSSAnimationDataList* animList) 1082 static PassRefPtr<CSSValue> getDelayValue(const StyleAnimationDataList* animList )
1083 { 1083 {
1084 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); 1084 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
1085 if (animList) { 1085 if (animList) {
1086 for (size_t i = 0; i < animList->size(); ++i) 1086 for (size_t i = 0; i < animList->size(); ++i)
1087 list->append(cssValuePool().createValue(animList->animation(i)->dela y(), CSSPrimitiveValue::CSS_S)); 1087 list->append(cssValuePool().createValue(animList->animation(i)->dela y(), CSSPrimitiveValue::CSS_S));
1088 } else { 1088 } else {
1089 // Note that initialAnimationDelay() is used for both transitions and an imations 1089 // Note that initialAnimationDelay() is used for both transitions and an imations
1090 list->append(cssValuePool().createValue(CSSAnimationData::initialAnimati onDelay(), CSSPrimitiveValue::CSS_S)); 1090 list->append(cssValuePool().createValue(StyleAnimationData::initialAnima tionDelay(), CSSPrimitiveValue::CSS_S));
1091 } 1091 }
1092 return list.release(); 1092 return list.release();
1093 } 1093 }
1094 1094
1095 static PassRefPtr<CSSValue> getDurationValue(const CSSAnimationDataList* animLis t) 1095 static PassRefPtr<CSSValue> getDurationValue(const StyleAnimationDataList* animL ist)
1096 { 1096 {
1097 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); 1097 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
1098 if (animList) { 1098 if (animList) {
1099 for (size_t i = 0; i < animList->size(); ++i) 1099 for (size_t i = 0; i < animList->size(); ++i)
1100 list->append(cssValuePool().createValue(animList->animation(i)->dura tion(), CSSPrimitiveValue::CSS_S)); 1100 list->append(cssValuePool().createValue(animList->animation(i)->dura tion(), CSSPrimitiveValue::CSS_S));
1101 } else { 1101 } else {
1102 // Note that initialAnimationDuration() is used for both transitions and animations 1102 // Note that initialAnimationDuration() is used for both transitions and animations
1103 list->append(cssValuePool().createValue(CSSAnimationData::initialAnimati onDuration(), CSSPrimitiveValue::CSS_S)); 1103 list->append(cssValuePool().createValue(StyleAnimationData::initialAnima tionDuration(), CSSPrimitiveValue::CSS_S));
1104 } 1104 }
1105 return list.release(); 1105 return list.release();
1106 } 1106 }
1107 1107
1108 static PassRefPtr<CSSValue> createTimingFunctionValue(const TimingFunction* timi ngFunction) 1108 static PassRefPtr<CSSValue> createTimingFunctionValue(const TimingFunction* timi ngFunction)
1109 { 1109 {
1110 if (timingFunction->isCubicBezierTimingFunction()) { 1110 if (timingFunction->isCubicBezierTimingFunction()) {
1111 const CubicBezierTimingFunction* bezierTimingFunction = static_cast<cons t CubicBezierTimingFunction*>(timingFunction); 1111 const CubicBezierTimingFunction* bezierTimingFunction = static_cast<cons t CubicBezierTimingFunction*>(timingFunction);
1112 if (bezierTimingFunction->timingFunctionPreset() != CubicBezierTimingFun ction::Custom) { 1112 if (bezierTimingFunction->timingFunctionPreset() != CubicBezierTimingFun ction::Custom) {
1113 CSSValueID valueId = CSSValueInvalid; 1113 CSSValueID valueId = CSSValueInvalid;
(...skipping 20 matching lines...) Expand all
1134 } 1134 }
1135 1135
1136 if (timingFunction->isStepsTimingFunction()) { 1136 if (timingFunction->isStepsTimingFunction()) {
1137 const StepsTimingFunction* stepsTimingFunction = static_cast<const Steps TimingFunction*>(timingFunction); 1137 const StepsTimingFunction* stepsTimingFunction = static_cast<const Steps TimingFunction*>(timingFunction);
1138 return CSSStepsTimingFunctionValue::create(stepsTimingFunction->numberOf Steps(), stepsTimingFunction->stepAtStart()); 1138 return CSSStepsTimingFunctionValue::create(stepsTimingFunction->numberOf Steps(), stepsTimingFunction->stepAtStart());
1139 } 1139 }
1140 1140
1141 return CSSLinearTimingFunctionValue::create(); 1141 return CSSLinearTimingFunctionValue::create();
1142 } 1142 }
1143 1143
1144 static PassRefPtr<CSSValue> getTimingFunctionValue(const CSSAnimationDataList* a nimList) 1144 static PassRefPtr<CSSValue> getTimingFunctionValue(const StyleAnimationDataList* animList)
1145 { 1145 {
1146 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); 1146 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
1147 if (animList) { 1147 if (animList) {
1148 for (size_t i = 0; i < animList->size(); ++i) 1148 for (size_t i = 0; i < animList->size(); ++i)
1149 list->append(createTimingFunctionValue(animList->animation(i)->timin gFunction().get())); 1149 list->append(createTimingFunctionValue(animList->animation(i)->timin gFunction().get()));
1150 } else 1150 } else
1151 // Note that initialAnimationTimingFunction() is used for both transitio ns and animations 1151 // Note that initialAnimationTimingFunction() is used for both transitio ns and animations
1152 list->append(createTimingFunctionValue(CSSAnimationData::initialAnimatio nTimingFunction().get())); 1152 list->append(createTimingFunctionValue(StyleAnimationData::initialAnimat ionTimingFunction().get()));
1153 return list.release(); 1153 return list.release();
1154 } 1154 }
1155 1155
1156 static PassRefPtr<CSSValue> createLineBoxContainValue(unsigned lineBoxContain) 1156 static PassRefPtr<CSSValue> createLineBoxContainValue(unsigned lineBoxContain)
1157 { 1157 {
1158 if (!lineBoxContain) 1158 if (!lineBoxContain)
1159 return cssValuePool().createIdentifierValue(CSSValueNone); 1159 return cssValuePool().createIdentifierValue(CSSValueNone);
1160 return CSSLineBoxContainValue::create(lineBoxContain); 1160 return CSSLineBoxContainValue::create(lineBoxContain);
1161 } 1161 }
1162 1162
(...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after
2278 case CSSPropertyBoxSizing: 2278 case CSSPropertyBoxSizing:
2279 if (style->boxSizing() == CONTENT_BOX) 2279 if (style->boxSizing() == CONTENT_BOX)
2280 return cssValuePool().createIdentifierValue(CSSValueContentBox); 2280 return cssValuePool().createIdentifierValue(CSSValueContentBox);
2281 return cssValuePool().createIdentifierValue(CSSValueBorderBox); 2281 return cssValuePool().createIdentifierValue(CSSValueBorderBox);
2282 case CSSPropertyWebkitAppRegion: 2282 case CSSPropertyWebkitAppRegion:
2283 return cssValuePool().createIdentifierValue(style->getDraggableRegio nMode() == DraggableRegionDrag ? CSSValueDrag : CSSValueNoDrag); 2283 return cssValuePool().createIdentifierValue(style->getDraggableRegio nMode() == DraggableRegionDrag ? CSSValueDrag : CSSValueNoDrag);
2284 case CSSPropertyWebkitAnimationDelay: 2284 case CSSPropertyWebkitAnimationDelay:
2285 return getDelayValue(style->animations()); 2285 return getDelayValue(style->animations());
2286 case CSSPropertyWebkitAnimationDirection: { 2286 case CSSPropertyWebkitAnimationDirection: {
2287 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); 2287 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
2288 const CSSAnimationDataList* t = style->animations(); 2288 const StyleAnimationDataList* t = style->animations();
2289 if (t) { 2289 if (t) {
2290 for (size_t i = 0; i < t->size(); ++i) { 2290 for (size_t i = 0; i < t->size(); ++i) {
2291 if (t->animation(i)->direction()) 2291 if (t->animation(i)->direction())
2292 list->append(cssValuePool().createIdentifierValue(CSSVal ueAlternate)); 2292 list->append(cssValuePool().createIdentifierValue(CSSVal ueAlternate));
2293 else 2293 else
2294 list->append(cssValuePool().createIdentifierValue(CSSVal ueNormal)); 2294 list->append(cssValuePool().createIdentifierValue(CSSVal ueNormal));
2295 } 2295 }
2296 } else 2296 } else
2297 list->append(cssValuePool().createIdentifierValue(CSSValueNormal )); 2297 list->append(cssValuePool().createIdentifierValue(CSSValueNormal ));
2298 return list.release(); 2298 return list.release();
2299 } 2299 }
2300 case CSSPropertyWebkitAnimationDuration: 2300 case CSSPropertyWebkitAnimationDuration:
2301 return getDurationValue(style->animations()); 2301 return getDurationValue(style->animations());
2302 case CSSPropertyWebkitAnimationFillMode: { 2302 case CSSPropertyWebkitAnimationFillMode: {
2303 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); 2303 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
2304 const CSSAnimationDataList* t = style->animations(); 2304 const StyleAnimationDataList* t = style->animations();
2305 if (t) { 2305 if (t) {
2306 for (size_t i = 0; i < t->size(); ++i) { 2306 for (size_t i = 0; i < t->size(); ++i) {
2307 switch (t->animation(i)->fillMode()) { 2307 switch (t->animation(i)->fillMode()) {
2308 case AnimationFillModeNone: 2308 case AnimationFillModeNone:
2309 list->append(cssValuePool().createIdentifierValue(CSSVal ueNone)); 2309 list->append(cssValuePool().createIdentifierValue(CSSVal ueNone));
2310 break; 2310 break;
2311 case AnimationFillModeForwards: 2311 case AnimationFillModeForwards:
2312 list->append(cssValuePool().createIdentifierValue(CSSVal ueForwards)); 2312 list->append(cssValuePool().createIdentifierValue(CSSVal ueForwards));
2313 break; 2313 break;
2314 case AnimationFillModeBackwards: 2314 case AnimationFillModeBackwards:
2315 list->append(cssValuePool().createIdentifierValue(CSSVal ueBackwards)); 2315 list->append(cssValuePool().createIdentifierValue(CSSVal ueBackwards));
2316 break; 2316 break;
2317 case AnimationFillModeBoth: 2317 case AnimationFillModeBoth:
2318 list->append(cssValuePool().createIdentifierValue(CSSVal ueBoth)); 2318 list->append(cssValuePool().createIdentifierValue(CSSVal ueBoth));
2319 break; 2319 break;
2320 } 2320 }
2321 } 2321 }
2322 } else 2322 } else
2323 list->append(cssValuePool().createIdentifierValue(CSSValueNone)) ; 2323 list->append(cssValuePool().createIdentifierValue(CSSValueNone)) ;
2324 return list.release(); 2324 return list.release();
2325 } 2325 }
2326 case CSSPropertyWebkitAnimationIterationCount: { 2326 case CSSPropertyWebkitAnimationIterationCount: {
2327 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); 2327 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
2328 const CSSAnimationDataList* t = style->animations(); 2328 const StyleAnimationDataList* t = style->animations();
2329 if (t) { 2329 if (t) {
2330 for (size_t i = 0; i < t->size(); ++i) { 2330 for (size_t i = 0; i < t->size(); ++i) {
2331 double iterationCount = t->animation(i)->iterationCount(); 2331 double iterationCount = t->animation(i)->iterationCount();
2332 if (iterationCount == CSSAnimationData::IterationCountInfini te) 2332 if (iterationCount == StyleAnimationData::IterationCountInfi nite)
2333 list->append(cssValuePool().createIdentifierValue(CSSVal ueInfinite)); 2333 list->append(cssValuePool().createIdentifierValue(CSSVal ueInfinite));
2334 else 2334 else
2335 list->append(cssValuePool().createValue(iterationCount, CSSPrimitiveValue::CSS_NUMBER)); 2335 list->append(cssValuePool().createValue(iterationCount, CSSPrimitiveValue::CSS_NUMBER));
2336 } 2336 }
2337 } else 2337 } else
2338 list->append(cssValuePool().createValue(CSSAnimationData::initia lAnimationIterationCount(), CSSPrimitiveValue::CSS_NUMBER)); 2338 list->append(cssValuePool().createValue(StyleAnimationData::init ialAnimationIterationCount(), CSSPrimitiveValue::CSS_NUMBER));
2339 return list.release(); 2339 return list.release();
2340 } 2340 }
2341 case CSSPropertyWebkitAnimationName: { 2341 case CSSPropertyWebkitAnimationName: {
2342 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); 2342 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
2343 const CSSAnimationDataList* t = style->animations(); 2343 const StyleAnimationDataList* t = style->animations();
2344 if (t) { 2344 if (t) {
2345 for (size_t i = 0; i < t->size(); ++i) 2345 for (size_t i = 0; i < t->size(); ++i)
2346 list->append(cssValuePool().createValue(t->animation(i)->nam e(), CSSPrimitiveValue::CSS_STRING)); 2346 list->append(cssValuePool().createValue(t->animation(i)->nam e(), CSSPrimitiveValue::CSS_STRING));
2347 } else 2347 } else
2348 list->append(cssValuePool().createIdentifierValue(CSSValueNone)) ; 2348 list->append(cssValuePool().createIdentifierValue(CSSValueNone)) ;
2349 return list.release(); 2349 return list.release();
2350 } 2350 }
2351 case CSSPropertyWebkitAnimationPlayState: { 2351 case CSSPropertyWebkitAnimationPlayState: {
2352 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); 2352 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
2353 const CSSAnimationDataList* t = style->animations(); 2353 const StyleAnimationDataList* t = style->animations();
2354 if (t) { 2354 if (t) {
2355 for (size_t i = 0; i < t->size(); ++i) { 2355 for (size_t i = 0; i < t->size(); ++i) {
2356 int prop = t->animation(i)->playState(); 2356 int prop = t->animation(i)->playState();
2357 if (prop == AnimPlayStatePlaying) 2357 if (prop == AnimPlayStatePlaying)
2358 list->append(cssValuePool().createIdentifierValue(CSSVal ueRunning)); 2358 list->append(cssValuePool().createIdentifierValue(CSSVal ueRunning));
2359 else 2359 else
2360 list->append(cssValuePool().createIdentifierValue(CSSVal uePaused)); 2360 list->append(cssValuePool().createIdentifierValue(CSSVal uePaused));
2361 } 2361 }
2362 } else 2362 } else
2363 list->append(cssValuePool().createIdentifierValue(CSSValueRunnin g)); 2363 list->append(cssValuePool().createIdentifierValue(CSSValueRunnin g));
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
2493 case CSSPropertyWebkitTransitionDuration: 2493 case CSSPropertyWebkitTransitionDuration:
2494 return getDurationValue(style->transitions()); 2494 return getDurationValue(style->transitions());
2495 case CSSPropertyTransitionProperty: 2495 case CSSPropertyTransitionProperty:
2496 case CSSPropertyWebkitTransitionProperty: 2496 case CSSPropertyWebkitTransitionProperty:
2497 return getTransitionPropertyValue(style->transitions()); 2497 return getTransitionPropertyValue(style->transitions());
2498 case CSSPropertyTransitionTimingFunction: 2498 case CSSPropertyTransitionTimingFunction:
2499 case CSSPropertyWebkitTransitionTimingFunction: 2499 case CSSPropertyWebkitTransitionTimingFunction:
2500 return getTimingFunctionValue(style->transitions()); 2500 return getTimingFunctionValue(style->transitions());
2501 case CSSPropertyTransition: 2501 case CSSPropertyTransition:
2502 case CSSPropertyWebkitTransition: { 2502 case CSSPropertyWebkitTransition: {
2503 const CSSAnimationDataList* animList = style->transitions(); 2503 const StyleAnimationDataList* animList = style->transitions();
2504 if (animList) { 2504 if (animList) {
2505 RefPtr<CSSValueList> transitionsList = CSSValueList::createComma Separated(); 2505 RefPtr<CSSValueList> transitionsList = CSSValueList::createComma Separated();
2506 for (size_t i = 0; i < animList->size(); ++i) { 2506 for (size_t i = 0; i < animList->size(); ++i) {
2507 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed(); 2507 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed();
2508 const CSSAnimationData* animation = animList->animation(i); 2508 const StyleAnimationData* animation = animList->animation(i) ;
2509 list->append(createTransitionPropertyValue(animation)); 2509 list->append(createTransitionPropertyValue(animation));
2510 list->append(cssValuePool().createValue(animation->duration( ), CSSPrimitiveValue::CSS_S)); 2510 list->append(cssValuePool().createValue(animation->duration( ), CSSPrimitiveValue::CSS_S));
2511 list->append(createTimingFunctionValue(animation->timingFunc tion().get())); 2511 list->append(createTimingFunctionValue(animation->timingFunc tion().get()));
2512 list->append(cssValuePool().createValue(animation->delay(), CSSPrimitiveValue::CSS_S)); 2512 list->append(cssValuePool().createValue(animation->delay(), CSSPrimitiveValue::CSS_S));
2513 transitionsList->append(list); 2513 transitionsList->append(list);
2514 } 2514 }
2515 return transitionsList.release(); 2515 return transitionsList.release();
2516 } 2516 }
2517 2517
2518 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); 2518 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
2519 // transition-property default value. 2519 // transition-property default value.
2520 list->append(cssValuePool().createIdentifierValue(CSSValueAll)); 2520 list->append(cssValuePool().createIdentifierValue(CSSValueAll));
2521 list->append(cssValuePool().createValue(CSSAnimationData::initialAni mationDuration(), CSSPrimitiveValue::CSS_S)); 2521 list->append(cssValuePool().createValue(StyleAnimationData::initialA nimationDuration(), CSSPrimitiveValue::CSS_S));
2522 list->append(createTimingFunctionValue(CSSAnimationData::initialAnim ationTimingFunction().get())); 2522 list->append(createTimingFunctionValue(StyleAnimationData::initialAn imationTimingFunction().get()));
2523 list->append(cssValuePool().createValue(CSSAnimationData::initialAni mationDelay(), CSSPrimitiveValue::CSS_S)); 2523 list->append(cssValuePool().createValue(StyleAnimationData::initialA nimationDelay(), CSSPrimitiveValue::CSS_S));
2524 return list.release(); 2524 return list.release();
2525 } 2525 }
2526 case CSSPropertyPointerEvents: 2526 case CSSPropertyPointerEvents:
2527 return cssValuePool().createValue(style->pointerEvents()); 2527 return cssValuePool().createValue(style->pointerEvents());
2528 case CSSPropertyWebkitColorCorrection: 2528 case CSSPropertyWebkitColorCorrection:
2529 return cssValuePool().createValue(style->colorSpace()); 2529 return cssValuePool().createValue(style->colorSpace());
2530 case CSSPropertyWebkitLineGrid: 2530 case CSSPropertyWebkitLineGrid:
2531 if (style->lineGrid().isNull()) 2531 if (style->lineGrid().isNull())
2532 return cssValuePool().createIdentifierValue(CSSValueNone); 2532 return cssValuePool().createIdentifierValue(CSSValueNone);
2533 return cssValuePool().createValue(style->lineGrid(), CSSPrimitiveVal ue::CSS_STRING); 2533 return cssValuePool().createValue(style->lineGrid(), CSSPrimitiveVal ue::CSS_STRING);
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
2993 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2993 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2994 CSSPropertyB ackgroundClip }; 2994 CSSPropertyB ackgroundClip };
2995 2995
2996 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2996 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2997 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or)))); 2997 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or))));
2998 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator )))); 2998 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator ))));
2999 return list.release(); 2999 return list.release();
3000 } 3000 }
3001 3001
3002 } // namespace WebCore 3002 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/css/CSSToStyleMap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698