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

Side by Side Diff: third_party/WebKit/Source/core/css/StylePropertySet.cpp

Issue 2346193002: Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue (Closed)
Patch Set: Rebase please work Created 4 years, 2 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 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved. 4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
5 * Copyright (C) 2013 Intel Corporation. All rights reserved. 5 * Copyright (C) 2013 Intel Corporation. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 */ 21 */
22 22
23 #include "core/css/StylePropertySet.h" 23 #include "core/css/StylePropertySet.h"
24 24
25 #include "core/StylePropertyShorthand.h" 25 #include "core/StylePropertyShorthand.h"
26 #include "core/css/CSSCustomPropertyDeclaration.h" 26 #include "core/css/CSSCustomPropertyDeclaration.h"
27 #include "core/css/CSSPrimitiveValue.h" 27 #include "core/css/CSSIdentifierValue.h"
28 #include "core/css/CSSPropertyMetadata.h" 28 #include "core/css/CSSPropertyMetadata.h"
29 #include "core/css/StylePropertySerializer.h" 29 #include "core/css/StylePropertySerializer.h"
30 #include "core/css/StyleSheetContents.h" 30 #include "core/css/StyleSheetContents.h"
31 #include "core/css/parser/CSSParser.h" 31 #include "core/css/parser/CSSParser.h"
32 #include "core/frame/UseCounter.h" 32 #include "core/frame/UseCounter.h"
33 #include "platform/RuntimeEnabledFeatures.h" 33 #include "platform/RuntimeEnabledFeatures.h"
34 #include "wtf/text/StringBuilder.h" 34 #include "wtf/text/StringBuilder.h"
35 35
36 #ifndef NDEBUG 36 #ifndef NDEBUG
37 #include "wtf/text/CString.h" 37 #include "wtf/text/CString.h"
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 *toReplace = property; 335 *toReplace = property;
336 return true; 336 return true;
337 } 337 }
338 } 338 }
339 m_propertyVector.append(property); 339 m_propertyVector.append(property);
340 return true; 340 return true;
341 } 341 }
342 342
343 bool MutableStylePropertySet::setProperty(CSSPropertyID propertyID, CSSValueID i dentifier, bool important) 343 bool MutableStylePropertySet::setProperty(CSSPropertyID propertyID, CSSValueID i dentifier, bool important)
344 { 344 {
345 setProperty(CSSProperty(propertyID, *CSSPrimitiveValue::createIdentifier(ide ntifier), important)); 345 setProperty(CSSProperty(propertyID, *CSSIdentifierValue::create(identifier), important));
346 return true; 346 return true;
347 } 347 }
348 348
349 void MutableStylePropertySet::parseDeclarationList(const String& styleDeclaratio n, StyleSheetContents* contextStyleSheet) 349 void MutableStylePropertySet::parseDeclarationList(const String& styleDeclaratio n, StyleSheetContents* contextStyleSheet)
350 { 350 {
351 m_propertyVector.clear(); 351 m_propertyVector.clear();
352 352
353 CSSParserContext context(cssParserMode(), UseCounter::getFrom(contextStyleSh eet)); 353 CSSParserContext context(cssParserMode(), UseCounter::getFrom(contextStyleSh eet));
354 if (contextStyleSheet) { 354 if (contextStyleSheet) {
355 context = contextStyleSheet->parserContext(); 355 context = contextStyleSheet->parserContext();
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 { 570 {
571 return new MutableStylePropertySet(cssParserMode); 571 return new MutableStylePropertySet(cssParserMode);
572 } 572 }
573 573
574 MutableStylePropertySet* MutableStylePropertySet::create(const CSSProperty* prop erties, unsigned count) 574 MutableStylePropertySet* MutableStylePropertySet::create(const CSSProperty* prop erties, unsigned count)
575 { 575 {
576 return new MutableStylePropertySet(properties, count); 576 return new MutableStylePropertySet(properties, count);
577 } 577 }
578 578
579 } // namespace blink 579 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698