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

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

Issue 14178009: Remove CSS_REGIONS compile flag from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Use RuntimeEnabledFeatures::cssRegionsEnabled all over the places. Guard WEBKIT_REGION_RULE at runt… Created 7 years, 7 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 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 continue; 324 continue;
325 const StyleRuleFontFace* fontFaceRule = static_cast<StyleRuleFontFac e*>(rule); 325 const StyleRuleFontFace* fontFaceRule = static_cast<StyleRuleFontFac e*>(rule);
326 resolver->fontSelector()->addFontFaceRule(fontFaceRule); 326 resolver->fontSelector()->addFontFaceRule(fontFaceRule);
327 resolver->invalidateMatchedPropertiesCache(); 327 resolver->invalidateMatchedPropertiesCache();
328 } else if (rule->isKeyframesRule() && resolver) { 328 } else if (rule->isKeyframesRule() && resolver) {
329 // FIXME (BUG 72462): We don't add @keyframe rules of scoped style s heets for the moment. 329 // FIXME (BUG 72462): We don't add @keyframe rules of scoped style s heets for the moment.
330 if (scope) 330 if (scope)
331 continue; 331 continue;
332 resolver->addKeyframeStyle(static_cast<StyleRuleKeyframes*>(rule)); 332 resolver->addKeyframeStyle(static_cast<StyleRuleKeyframes*>(rule));
333 } 333 }
334 #if ENABLE(CSS_REGIONS)
335 else if (rule->isRegionRule() && resolver) { 334 else if (rule->isRegionRule() && resolver) {
eseidel 2013/04/30 00:11:09 I wonder if we need to runtime guard this?
336 // FIXME (BUG 72472): We don't add @-webkit-region rules of scoped s tyle sheets for the moment. 335 // FIXME (BUG 72472): We don't add @-webkit-region rules of scoped s tyle sheets for the moment.
337 if (scope) 336 if (scope)
338 continue; 337 continue;
339 addRegionRule(static_cast<StyleRuleRegion*>(rule), hasDocumentSecuri tyOrigin); 338 addRegionRule(static_cast<StyleRuleRegion*>(rule), hasDocumentSecuri tyOrigin);
340 } 339 }
341 #endif
342 else if (rule->isHostRule()) 340 else if (rule->isHostRule())
343 resolver->addHostRule(static_cast<StyleRuleHost*>(rule), hasDocument SecurityOrigin, scope); 341 resolver->addHostRule(static_cast<StyleRuleHost*>(rule), hasDocument SecurityOrigin, scope);
344 #if ENABLE(CSS_DEVICE_ADAPTATION) 342 #if ENABLE(CSS_DEVICE_ADAPTATION)
345 else if (rule->isViewportRule() && resolver) { 343 else if (rule->isViewportRule() && resolver) {
346 // @viewport should not be scoped. 344 // @viewport should not be scoped.
347 if (scope) 345 if (scope)
348 continue; 346 continue;
349 resolver->viewportStyleResolver()->addViewportRule(static_cast<Style RuleViewport*>(rule)); 347 resolver->viewportStyleResolver()->addViewportRule(static_cast<Style RuleViewport*>(rule));
350 } 348 }
351 #endif 349 #endif
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 shrinkMapVectorsToFit(m_tagRules); 392 shrinkMapVectorsToFit(m_tagRules);
395 shrinkMapVectorsToFit(m_shadowPseudoElementRules); 393 shrinkMapVectorsToFit(m_shadowPseudoElementRules);
396 m_linkPseudoClassRules.shrinkToFit(); 394 m_linkPseudoClassRules.shrinkToFit();
397 m_cuePseudoRules.shrinkToFit(); 395 m_cuePseudoRules.shrinkToFit();
398 m_focusPseudoClassRules.shrinkToFit(); 396 m_focusPseudoClassRules.shrinkToFit();
399 m_universalRules.shrinkToFit(); 397 m_universalRules.shrinkToFit();
400 m_pageRules.shrinkToFit(); 398 m_pageRules.shrinkToFit();
401 } 399 }
402 400
403 } // namespace WebCore 401 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698