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

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

Issue 1186833003: Split up CSSPrimitiveValue::isString into isString and isCustomIdent (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 return AnimPlayStatePaused; 360 return AnimPlayStatePaused;
361 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueRunning); 361 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueRunning);
362 return AnimPlayStatePlaying; 362 return AnimPlayStatePlaying;
363 } 363 }
364 364
365 CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(CSSVal ue* value) 365 CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(CSSVal ue* value)
366 { 366 {
367 if (value->isInitialValue()) 367 if (value->isInitialValue())
368 return CSSTransitionData::initialProperty(); 368 return CSSTransitionData::initialProperty();
369 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 369 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
370 if (primitiveValue->isString()) 370 if (primitiveValue->isCustomIdent())
371 return CSSTransitionData::TransitionProperty(primitiveValue->getStringVa lue()); 371 return CSSTransitionData::TransitionProperty(primitiveValue->getStringVa lue());
372 if (primitiveValue->getValueID() == CSSValueAll) 372 if (primitiveValue->getValueID() == CSSValueAll)
373 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti onAll); 373 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti onAll);
374 if (primitiveValue->getValueID() == CSSValueNone) 374 if (primitiveValue->getValueID() == CSSValueNone)
375 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti onNone); 375 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti onNone);
376 return CSSTransitionData::TransitionProperty(primitiveValue->getPropertyID() ); 376 return CSSTransitionData::TransitionProperty(primitiveValue->getPropertyID() );
377 } 377 }
378 378
379 PassRefPtr<TimingFunction> CSSToStyleMap::mapAnimationTimingFunction(CSSValue* v alue, bool allowStepMiddle) 379 PassRefPtr<TimingFunction> CSSToStyleMap::mapAnimationTimingFunction(CSSValue* v alue, bool allowStepMiddle)
380 { 380 {
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 verticalRule = SpaceImageRule; 585 verticalRule = SpaceImageRule;
586 break; 586 break;
587 default: // CSSValueRepeat 587 default: // CSSValueRepeat
588 verticalRule = RepeatImageRule; 588 verticalRule = RepeatImageRule;
589 break; 589 break;
590 } 590 }
591 image.setVerticalRule(verticalRule); 591 image.setVerticalRule(verticalRule);
592 } 592 }
593 593
594 }; 594 };
OLDNEW
« no previous file with comments | « Source/core/css/parser/CSSPropertyParser.cpp ('k') | Source/core/css/resolver/StyleBuilderConverter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698