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

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

Issue 1306823004: Split out String, URI and CustomIdent from CSSPrimitiveValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@split_out_attr_values
Patch Set: Rebase Created 5 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 * 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 12 matching lines...) Expand all
23 * You should have received a copy of the GNU Library General Public License 23 * You should have received a copy of the GNU Library General Public License
24 * along with this library; see the file COPYING.LIB. If not, write to 24 * along with this library; see the file COPYING.LIB. If not, write to
25 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 25 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
26 * Boston, MA 02110-1301, USA. 26 * Boston, MA 02110-1301, USA.
27 */ 27 */
28 28
29 #include "config.h" 29 #include "config.h"
30 #include "core/css/RuleFeature.h" 30 #include "core/css/RuleFeature.h"
31 31
32 #include "core/HTMLNames.h" 32 #include "core/HTMLNames.h"
33 #include "core/css/CSSCustomIdentValue.h"
33 #include "core/css/CSSFunctionValue.h" 34 #include "core/css/CSSFunctionValue.h"
34 #include "core/css/CSSSelector.h" 35 #include "core/css/CSSSelector.h"
35 #include "core/css/CSSSelectorList.h" 36 #include "core/css/CSSSelectorList.h"
36 #include "core/css/CSSValueList.h" 37 #include "core/css/CSSValueList.h"
37 #include "core/css/RuleSet.h" 38 #include "core/css/RuleSet.h"
38 #include "core/css/StylePropertySet.h" 39 #include "core/css/StylePropertySet.h"
39 #include "core/css/StyleRule.h" 40 #include "core/css/StyleRule.h"
40 #include "core/css/invalidation/InvalidationSet.h" 41 #include "core/css/invalidation/InvalidationSet.h"
41 #include "core/dom/Element.h" 42 #include "core/dom/Element.h"
42 #include "core/dom/Node.h" 43 #include "core/dom/Node.h"
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 312
312 if (!contentValue->isValueList()) 313 if (!contentValue->isValueList())
313 return; 314 return;
314 315
315 for (auto& item : toCSSValueList(*contentValue)) { 316 for (auto& item : toCSSValueList(*contentValue)) {
316 if (!item->isFunctionValue()) 317 if (!item->isFunctionValue())
317 continue; 318 continue;
318 CSSFunctionValue* functionValue = toCSSFunctionValue(item.get()); 319 CSSFunctionValue* functionValue = toCSSFunctionValue(item.get());
319 if (functionValue->functionType() != CSSValueAttr) 320 if (functionValue->functionType() != CSSValueAttr)
320 continue; 321 continue;
321 ensureAttributeInvalidationSet(AtomicString(toCSSPrimitiveValue(function Value->item(0))->getStringValue())).setInvalidatesSelf(); 322 ensureAttributeInvalidationSet(AtomicString(toCSSCustomIdentValue(functi onValue->item(0))->value())).setInvalidatesSelf();
322 } 323 }
323 } 324 }
324 325
325 std::pair<const CSSSelector*, RuleFeatureSet::UseFeaturesType> 326 std::pair<const CSSSelector*, RuleFeatureSet::UseFeaturesType>
326 RuleFeatureSet::extractInvalidationSetFeatures(const CSSSelector& selector, Inva lidationSetFeatures& features, bool negated) 327 RuleFeatureSet::extractInvalidationSetFeatures(const CSSSelector& selector, Inva lidationSetFeatures& features, bool negated)
327 { 328 {
328 bool foundFeatures = false; 329 bool foundFeatures = false;
329 for (const CSSSelector* current = &selector; current; current = current->tag History()) { 330 for (const CSSSelector* current = &selector; current; current = current->tag History()) {
330 if (!negated) 331 if (!negated)
331 foundFeatures |= extractInvalidationSetFeature(*current, features); 332 foundFeatures |= extractInvalidationSetFeature(*current, features);
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 visitor->trace(siblingRules); 589 visitor->trace(siblingRules);
589 visitor->trace(uncommonAttributeRules); 590 visitor->trace(uncommonAttributeRules);
590 visitor->trace(m_classInvalidationSets); 591 visitor->trace(m_classInvalidationSets);
591 visitor->trace(m_attributeInvalidationSets); 592 visitor->trace(m_attributeInvalidationSets);
592 visitor->trace(m_idInvalidationSets); 593 visitor->trace(m_idInvalidationSets);
593 visitor->trace(m_pseudoInvalidationSets); 594 visitor->trace(m_pseudoInvalidationSets);
594 #endif 595 #endif
595 } 596 }
596 597
597 } // namespace blink 598 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/FontFace.cpp ('k') | third_party/WebKit/Source/core/css/parser/CSSParserValues.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698