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

Side by Side Diff: 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, 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
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 15 matching lines...) Expand all
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/CSSFunctionValue.h" 33 #include "core/css/CSSFunctionValue.h"
34 #include "core/css/CSSSelector.h" 34 #include "core/css/CSSSelector.h"
35 #include "core/css/CSSSelectorList.h" 35 #include "core/css/CSSSelectorList.h"
36 #include "core/css/CSSStringValue.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/DescendantInvalidationSet.h" 41 #include "core/css/invalidation/DescendantInvalidationSet.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"
43 #include "core/inspector/InspectorTraceEvents.h" 44 #include "core/inspector/InspectorTraceEvents.h"
44 #include "wtf/BitVector.h" 45 #include "wtf/BitVector.h"
45 46
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 310
310 if (!contentValue->isValueList()) 311 if (!contentValue->isValueList())
311 return; 312 return;
312 313
313 for (auto& item : toCSSValueList(*contentValue)) { 314 for (auto& item : toCSSValueList(*contentValue)) {
314 if (!item->isFunctionValue()) 315 if (!item->isFunctionValue())
315 continue; 316 continue;
316 CSSFunctionValue* functionValue = toCSSFunctionValue(item.get()); 317 CSSFunctionValue* functionValue = toCSSFunctionValue(item.get());
317 if (functionValue->functionType() != CSSValueAttr) 318 if (functionValue->functionType() != CSSValueAttr)
318 continue; 319 continue;
319 ensureAttributeInvalidationSet(AtomicString(toCSSPrimitiveValue(function Value->item(0))->getStringValue())); 320 ensureAttributeInvalidationSet(AtomicString(toCSSStringValue(functionVal ue->item(0))->getStringValue()));
320 } 321 }
321 } 322 }
322 323
323 std::pair<const CSSSelector*, RuleFeatureSet::UseFeaturesType> 324 std::pair<const CSSSelector*, RuleFeatureSet::UseFeaturesType>
324 RuleFeatureSet::extractInvalidationSetFeatures(const CSSSelector& selector, Inva lidationSetFeatures& features, bool negated) 325 RuleFeatureSet::extractInvalidationSetFeatures(const CSSSelector& selector, Inva lidationSetFeatures& features, bool negated)
325 { 326 {
326 bool foundFeatures = false; 327 bool foundFeatures = false;
327 for (const CSSSelector* current = &selector; current; current = current->tag History()) { 328 for (const CSSSelector* current = &selector; current; current = current->tag History()) {
328 if (!negated) 329 if (!negated)
329 foundFeatures |= extractInvalidationSetFeature(*current, features); 330 foundFeatures |= extractInvalidationSetFeature(*current, features);
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 visitor->trace(siblingRules); 584 visitor->trace(siblingRules);
584 visitor->trace(uncommonAttributeRules); 585 visitor->trace(uncommonAttributeRules);
585 visitor->trace(m_classInvalidationSets); 586 visitor->trace(m_classInvalidationSets);
586 visitor->trace(m_attributeInvalidationSets); 587 visitor->trace(m_attributeInvalidationSets);
587 visitor->trace(m_idInvalidationSets); 588 visitor->trace(m_idInvalidationSets);
588 visitor->trace(m_pseudoInvalidationSets); 589 visitor->trace(m_pseudoInvalidationSets);
589 #endif 590 #endif
590 } 591 }
591 592
592 } // namespace blink 593 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698