Use correct cascading order for Shadow DOM v1

third_party/WebKit/Source/core/dom/StyleEngine.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
@@ skipping 37 matching lines @@
 
 class CSSFontSelector;
 class CSSStyleSheet;
 class Node;
 class RuleFeatureSet;
 class ShadowTreeStyleSheetCollection;
 class StyleRuleFontFace;
 class StyleSheet;
 class StyleSheetContents;
 
+enum ShadowCascadeOrder {
+    ShadowCascadeNone = 0,

[rune, 2016/03/22 08:57:07]

Enums start at 0 if not specified, so the explicit =0 should not be necessary.

[kochi, 2016/03/22 09:36:26]

Done.

+    ShadowCascadeV0,
+    ShadowCascadeV1
+};
+
 class CORE_EXPORT StyleEngine final : public NoBaseWillBeGarbageCollectedFinalized<StyleEngine>, public CSSFontSelectorClient  {
     USING_FAST_MALLOC_WILL_BE_REMOVED(StyleEngine);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(StyleEngine);
 public:
 
     class IgnoringPendingStylesheet : public TemporaryChange<bool> {
         DISALLOW_NEW();
     public:
         IgnoringPendingStylesheet(StyleEngine& engine)
             : TemporaryChange<bool>(engine.m_ignorePendingStylesheets, true)
@@ skipping 103 matching lines @@
     void attributeChangedForElement(const QualifiedName& attributeName, Element&);
     void idChangedForElement(const AtomicString& oldId, const AtomicString& newId, Element&);
     void pseudoStateChangedForElement(CSSSelector::PseudoType, Element&);
 
     unsigned styleForElementCount() const { return m_styleForElementCount; }
     void incStyleForElementCount() { m_styleForElementCount++; }
 
     StyleResolverStats* stats() { return m_styleResolverStats.get(); }
     void setStatsEnabled(bool);
 
+    ShadowCascadeOrder shadowCascadeOrder() const { return m_shadowCascadeOrder; }
+    void setShadowCascadeOrder(ShadowCascadeOrder);
+
     DECLARE_VIRTUAL_TRACE();
 
 private:
     // CSSFontSelectorClient implementation.
     void fontsNeedUpdate(CSSFontSelector*) override;
 
 private:
     StyleEngine(Document&);
 
     TreeScopeStyleSheetCollection* ensureStyleSheetCollectionFor(TreeScope&);
@@ skipping 54 matching lines @@
     String m_selectedStylesheetSetName;
 
     bool m_usesSiblingRules = false;
     bool m_usesFirstLineRules = false;
     bool m_usesWindowInactiveSelector = false;
     bool m_usesRemUnits = false;
     unsigned m_maxDirectAdjacentSelectors = 0;
 
     bool m_ignorePendingStylesheets = false;
     bool m_didCalculateResolver = false;
+
+    ShadowCascadeOrder m_shadowCascadeOrder = ShadowCascadeNone;
+
     OwnPtrWillBeMember<StyleResolver> m_resolver;
     StyleInvalidator m_styleInvalidator;
 
     RefPtrWillBeMember<CSSFontSelector> m_fontSelector;
 
     WillBeHeapHashMap<AtomicString, RawPtrWillBeMember<StyleSheetContents>> m_textToSheetCache;
     WillBeHeapHashMap<RawPtrWillBeMember<StyleSheetContents>, AtomicString> m_sheetToTextCache;
 
     OwnPtr<StyleResolverStats> m_styleResolverStats;
     unsigned m_styleForElementCount = 0;
 
     friend class StyleEngineTest;
 };
 
 } // namespace blink
 
 #endif