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

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

Issue 1616743002: Use more appropriate symbol names for "shadow distributed" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blink_slotted_matching
Patch Set: Created 4 years, 11 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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 StyleRuleBase* rule = rules[i].get(); 254 StyleRuleBase* rule = rules[i].get();
255 255
256 if (rule->isStyleRule()) { 256 if (rule->isStyleRule()) {
257 StyleRule* styleRule = toStyleRule(rule); 257 StyleRule* styleRule = toStyleRule(rule);
258 258
259 const CSSSelectorList& selectorList = styleRule->selectorList(); 259 const CSSSelectorList& selectorList = styleRule->selectorList();
260 for (size_t selectorIndex = 0; selectorIndex != kNotFound; selectorI ndex = selectorList.indexOfNextSelectorAfter(selectorIndex)) { 260 for (size_t selectorIndex = 0; selectorIndex != kNotFound; selectorI ndex = selectorList.indexOfNextSelectorAfter(selectorIndex)) {
261 if (selectorList.selectorUsesDeepCombinatorOrShadowPseudo(select orIndex)) { 261 if (selectorList.selectorUsesDeepCombinatorOrShadowPseudo(select orIndex)) {
262 m_deepCombinatorOrShadowPseudoRules.append(MinimalRuleData(s tyleRule, selectorIndex, addRuleFlags)); 262 m_deepCombinatorOrShadowPseudoRules.append(MinimalRuleData(s tyleRule, selectorIndex, addRuleFlags));
263 } else if (selectorList.selectorHasContentPseudo(selectorIndex)) { 263 } else if (selectorList.selectorHasContentPseudo(selectorIndex)) {
264 m_shadowDistributedRules.append(MinimalRuleData(styleRule, s electorIndex, addRuleFlags)); 264 m_contentPseudoElementRules.append(MinimalRuleData(styleRule , selectorIndex, addRuleFlags));
265 } else if (selectorList.selectorHasSlottedPseudo(selectorIndex)) { 265 } else if (selectorList.selectorHasSlottedPseudo(selectorIndex)) {
266 m_shadowSlottedRules.append(MinimalRuleData(styleRule, selec torIndex, addRuleFlags)); 266 m_slottedPseudoElementRules.append(MinimalRuleData(styleRule , selectorIndex, addRuleFlags));
267 } else { 267 } else {
268 addRule(styleRule, selectorIndex, addRuleFlags); 268 addRule(styleRule, selectorIndex, addRuleFlags);
269 } 269 }
270 } 270 }
271 } else if (rule->isPageRule()) { 271 } else if (rule->isPageRule()) {
272 addPageRule(toStyleRulePage(rule)); 272 addPageRule(toStyleRulePage(rule));
273 } else if (rule->isMediaRule()) { 273 } else if (rule->isMediaRule()) {
274 StyleRuleMedia* mediaRule = toStyleRuleMedia(rule); 274 StyleRuleMedia* mediaRule = toStyleRuleMedia(rule);
275 if ((!mediaRule->mediaQueries() || medium.eval(mediaRule->mediaQueri es(), &m_viewportDependentMediaQueryResults, &m_deviceDependentMediaQueryResults ))) 275 if ((!mediaRule->mediaQueries() || medium.eval(mediaRule->mediaQueri es(), &m_viewportDependentMediaQueryResults, &m_deviceDependentMediaQueryResults )))
276 addChildRules(mediaRule->childRules(), medium, addRuleFlags); 276 addChildRules(mediaRule->childRules(), medium, addRuleFlags);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 m_linkPseudoClassRules.shrinkToFit(); 336 m_linkPseudoClassRules.shrinkToFit();
337 m_cuePseudoRules.shrinkToFit(); 337 m_cuePseudoRules.shrinkToFit();
338 m_focusPseudoClassRules.shrinkToFit(); 338 m_focusPseudoClassRules.shrinkToFit();
339 m_universalRules.shrinkToFit(); 339 m_universalRules.shrinkToFit();
340 m_shadowHostRules.shrinkToFit(); 340 m_shadowHostRules.shrinkToFit();
341 m_pageRules.shrinkToFit(); 341 m_pageRules.shrinkToFit();
342 m_viewportRules.shrinkToFit(); 342 m_viewportRules.shrinkToFit();
343 m_fontFaceRules.shrinkToFit(); 343 m_fontFaceRules.shrinkToFit();
344 m_keyframesRules.shrinkToFit(); 344 m_keyframesRules.shrinkToFit();
345 m_deepCombinatorOrShadowPseudoRules.shrinkToFit(); 345 m_deepCombinatorOrShadowPseudoRules.shrinkToFit();
346 m_shadowDistributedRules.shrinkToFit(); 346 m_contentPseudoElementRules.shrinkToFit();
347 m_shadowSlottedRules.shrinkToFit(); 347 m_slottedPseudoElementRules.shrinkToFit();
348 } 348 }
349 349
350 DEFINE_TRACE(MinimalRuleData) 350 DEFINE_TRACE(MinimalRuleData)
351 { 351 {
352 visitor->trace(m_rule); 352 visitor->trace(m_rule);
353 } 353 }
354 354
355 DEFINE_TRACE(RuleData) 355 DEFINE_TRACE(RuleData)
356 { 356 {
357 visitor->trace(m_rule); 357 visitor->trace(m_rule);
(...skipping 20 matching lines...) Expand all
378 visitor->trace(m_cuePseudoRules); 378 visitor->trace(m_cuePseudoRules);
379 visitor->trace(m_focusPseudoClassRules); 379 visitor->trace(m_focusPseudoClassRules);
380 visitor->trace(m_universalRules); 380 visitor->trace(m_universalRules);
381 visitor->trace(m_shadowHostRules); 381 visitor->trace(m_shadowHostRules);
382 visitor->trace(m_features); 382 visitor->trace(m_features);
383 visitor->trace(m_pageRules); 383 visitor->trace(m_pageRules);
384 visitor->trace(m_viewportRules); 384 visitor->trace(m_viewportRules);
385 visitor->trace(m_fontFaceRules); 385 visitor->trace(m_fontFaceRules);
386 visitor->trace(m_keyframesRules); 386 visitor->trace(m_keyframesRules);
387 visitor->trace(m_deepCombinatorOrShadowPseudoRules); 387 visitor->trace(m_deepCombinatorOrShadowPseudoRules);
388 visitor->trace(m_shadowDistributedRules); 388 visitor->trace(m_contentPseudoElementRules);
389 visitor->trace(m_shadowSlottedRules); 389 visitor->trace(m_slottedPseudoElementRules);
390 visitor->trace(m_viewportDependentMediaQueryResults); 390 visitor->trace(m_viewportDependentMediaQueryResults);
391 visitor->trace(m_deviceDependentMediaQueryResults); 391 visitor->trace(m_deviceDependentMediaQueryResults);
392 visitor->trace(m_pendingRules); 392 visitor->trace(m_pendingRules);
393 #ifndef NDEBUG 393 #ifndef NDEBUG
394 visitor->trace(m_allRules); 394 visitor->trace(m_allRules);
395 #endif 395 #endif
396 #endif 396 #endif
397 } 397 }
398 398
399 #ifndef NDEBUG 399 #ifndef NDEBUG
400 void RuleSet::show() const 400 void RuleSet::show() const
401 { 401 {
402 for (const auto& rule: m_allRules) 402 for (const auto& rule: m_allRules)
403 rule.selector().show(); 403 rule.selector().show();
404 } 404 }
405 #endif 405 #endif
406 406
407 } // namespace blink 407 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/RuleSet.h ('k') | third_party/WebKit/Source/core/css/SelectorChecker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698