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

Side by Side Diff: Source/core/css/parser/LegacyCSSPropertyParser.cpp

Issue 1335183002: Change CSSImageValue's member variables from String to AtomicString (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: (rebase) Created 5 years, 3 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/css/parser/CSSPropertyParser.h ('k') | no next file » | 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) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 ASSERT(value->unit() == CSSPrimitiveValue::UnitType::String || value->m_unit == CSSParserValue::Identifier); 264 ASSERT(value->unit() == CSSPrimitiveValue::UnitType::String || value->m_unit == CSSParserValue::Identifier);
265 return cssValuePool().createValue(value->string, CSSPrimitiveValue::UnitType ::String); 265 return cssValuePool().createValue(value->string, CSSPrimitiveValue::UnitType ::String);
266 } 266 }
267 267
268 inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::createPrimit iveCustomIdentValue(CSSParserValue* value) 268 inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::createPrimit iveCustomIdentValue(CSSParserValue* value)
269 { 269 {
270 ASSERT(value->unit() == CSSPrimitiveValue::UnitType::String || value->m_unit == CSSParserValue::Identifier); 270 ASSERT(value->unit() == CSSPrimitiveValue::UnitType::String || value->m_unit == CSSParserValue::Identifier);
271 return cssValuePool().createValue(value->string, CSSPrimitiveValue::UnitType ::CustomIdentifier); 271 return cssValuePool().createValue(value->string, CSSPrimitiveValue::UnitType ::CustomIdentifier);
272 } 272 }
273 273
274 inline PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::createCSSImageValueWi thReferrer(const String& rawValue, const KURL& url) 274 inline PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::createCSSImageValueWi thReferrer(const AtomicString& rawValue, const KURL& url)
275 { 275 {
276 RefPtrWillBeRawPtr<CSSValue> imageValue = CSSImageValue::create(rawValue, ur l); 276 RefPtrWillBeRawPtr<CSSValue> imageValue = CSSImageValue::create(rawValue, ur l);
277 toCSSImageValue(imageValue.get())->setReferrer(m_context.referrer()); 277 toCSSImageValue(imageValue.get())->setReferrer(m_context.referrer());
278 return imageValue; 278 return imageValue;
279 } 279 }
280 280
281 static inline bool isComma(CSSParserValue* value) 281 static inline bool isComma(CSSParserValue* value)
282 { 282 {
283 ASSERT(value); 283 ASSERT(value);
284 return value->m_unit == CSSParserValue::Operator && value->iValue == ','; 284 return value->m_unit == CSSParserValue::Operator && value->iValue == ',';
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 // [ [<image> [<x> <y>]?,]* 526 // [ [<image> [<x> <y>]?,]*
527 // [ auto | crosshair | default | pointer | progress | move | e-resize | ne-resize | 527 // [ auto | crosshair | default | pointer | progress | move | e-resize | ne-resize |
528 // nw-resize | n-resize | se-resize | sw-resize | s-resize | w-resize | ew-resize | 528 // nw-resize | n-resize | se-resize | sw-resize | s-resize | w-resize | ew-resize |
529 // ns-resize | nesw-resize | nwse-resize | col-resize | row-resize | tex t | wait | help | 529 // ns-resize | nesw-resize | nwse-resize | col-resize | row-resize | tex t | wait | help |
530 // vertical-text | cell | context-menu | alias | copy | no-drop | not-al lowed | all-scroll | 530 // vertical-text | cell | context-menu | alias | copy | no-drop | not-al lowed | all-scroll |
531 // zoom-in | zoom-out | -webkit-grab | -webkit-grabbing | -webkit-zoom-i n | -webkit-zoom-out ] ] | inherit 531 // zoom-in | zoom-out | -webkit-grab | -webkit-grabbing | -webkit-zoom-i n | -webkit-zoom-out ] ] | inherit
532 RefPtrWillBeRawPtr<CSSValueList> list = nullptr; 532 RefPtrWillBeRawPtr<CSSValueList> list = nullptr;
533 while (value) { 533 while (value) {
534 RefPtrWillBeRawPtr<CSSValue> image = nullptr; 534 RefPtrWillBeRawPtr<CSSValue> image = nullptr;
535 if (value->unit() == CSSPrimitiveValue::UnitType::URI) { 535 if (value->unit() == CSSPrimitiveValue::UnitType::URI) {
536 String uri = value->string; 536 AtomicString uri = value->string;
537 if (!uri.isNull()) 537 if (!uri.isNull())
538 image = createCSSImageValueWithReferrer(uri, completeURL(uri )); 538 image = createCSSImageValueWithReferrer(uri, completeURL(uri ));
539 } else if (value->m_unit == CSSParserValue::Function && value->funct ion->id == CSSValueWebkitImageSet) { 539 } else if (value->m_unit == CSSParserValue::Function && value->funct ion->id == CSSValueWebkitImageSet) {
540 image = parseImageSet(m_valueList); 540 image = parseImageSet(m_valueList);
541 if (!image) 541 if (!image)
542 break; 542 break;
543 } else 543 } else
544 break; 544 break;
545 545
546 Vector<int> coords; 546 Vector<int> coords;
(...skipping 7180 matching lines...) Expand 10 before | Expand all | Expand 10 after
7727 } 7727 }
7728 } 7728 }
7729 7729
7730 if (!list->length()) 7730 if (!list->length())
7731 return nullptr; 7731 return nullptr;
7732 7732
7733 return list.release(); 7733 return list.release();
7734 } 7734 }
7735 7735
7736 } // namespace blink 7736 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/parser/CSSPropertyParser.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698