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

Side by Side Diff: Source/core/css/resolver/CSSToStyleMap.cpp

Issue 298043007: Support unknown property strings in transition-property (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 return AnimPlayStatePaused; 377 return AnimPlayStatePaused;
378 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueRunning); 378 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueRunning);
379 return AnimPlayStatePlaying; 379 return AnimPlayStatePlaying;
380 } 380 }
381 381
382 CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(CSSVal ue* value) 382 CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(CSSVal ue* value)
383 { 383 {
384 if (value->isInitialValue()) 384 if (value->isInitialValue())
385 return CSSTransitionData::initialProperty(); 385 return CSSTransitionData::initialProperty();
386 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 386 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
387 if (primitiveValue->isString())
388 return CSSTransitionData::TransitionProperty(primitiveValue->getStringVa lue());
387 if (primitiveValue->getValueID() == CSSValueAll) 389 if (primitiveValue->getValueID() == CSSValueAll)
388 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti onAll); 390 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti onAll);
389 if (primitiveValue->getValueID() == CSSValueNone) 391 if (primitiveValue->getValueID() == CSSValueNone)
390 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti onNone); 392 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti onNone);
391 return CSSTransitionData::TransitionProperty(primitiveValue->getPropertyID() ); 393 return CSSTransitionData::TransitionProperty(primitiveValue->getPropertyID() );
392 } 394 }
393 395
394 PassRefPtr<TimingFunction> CSSToStyleMap::mapAnimationTimingFunction(CSSValue* v alue, bool allowStepMiddle) 396 PassRefPtr<TimingFunction> CSSToStyleMap::mapAnimationTimingFunction(CSSValue* v alue, bool allowStepMiddle)
395 { 397 {
396 // FIXME: We should probably only call into this function with a valid 398 // FIXME: We should probably only call into this function with a valid
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 verticalRule = SpaceImageRule; 603 verticalRule = SpaceImageRule;
602 break; 604 break;
603 default: // CSSValueRepeat 605 default: // CSSValueRepeat
604 verticalRule = RepeatImageRule; 606 verticalRule = RepeatImageRule;
605 break; 607 break;
606 } 608 }
607 image.setVerticalRule(verticalRule); 609 image.setVerticalRule(verticalRule);
608 } 610 }
609 611
610 }; 612 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698