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

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

Issue 100463004: Make calls to AtomicString(const String&) explicit in css/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Make MediaQuery::mediaType() return an AtomicString Created 7 years 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 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 return; 394 return;
395 } 395 }
396 396
397 if (!value->isPrimitiveValue()) 397 if (!value->isPrimitiveValue())
398 return; 398 return;
399 399
400 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 400 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
401 if (primitiveValue->getValueID() == CSSValueNone) 401 if (primitiveValue->getValueID() == CSSValueNone)
402 layer->setIsNoneAnimation(true); 402 layer->setIsNoneAnimation(true);
403 else 403 else
404 layer->setName(primitiveValue->getStringValue()); 404 layer->setName(AtomicString(primitiveValue->getStringValue()));
405 } 405 }
406 406
407 void CSSToStyleMap::mapAnimationPlayState(CSSAnimationData* layer, CSSValue* val ue) const 407 void CSSToStyleMap::mapAnimationPlayState(CSSAnimationData* layer, CSSValue* val ue) const
408 { 408 {
409 if (value->isInitialValue()) { 409 if (value->isInitialValue()) {
410 layer->setPlayState(CSSAnimationData::initialAnimationPlayState()); 410 layer->setPlayState(CSSAnimationData::initialAnimationPlayState());
411 return; 411 return;
412 } 412 }
413 413
414 if (!value->isPrimitiveValue()) 414 if (!value->isPrimitiveValue())
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 verticalRule = SpaceImageRule; 651 verticalRule = SpaceImageRule;
652 break; 652 break;
653 default: // CSSValueRepeat 653 default: // CSSValueRepeat
654 verticalRule = RepeatImageRule; 654 verticalRule = RepeatImageRule;
655 break; 655 break;
656 } 656 }
657 image.setVerticalRule(verticalRule); 657 image.setVerticalRule(verticalRule);
658 } 658 }
659 659
660 }; 660 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698