Fix the !(ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)) build after r191112
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Oct 2015 19:46:24 +0000 (19:46 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Oct 2015 19:46:24 +0000 (19:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=150175

Reviewed by Antti Koivisto.

* dom/ComposedTreeAncestorIterator.h:
(WebCore::ComposedTreeAncestorIterator::traverseParent):
* dom/ComposedTreeIterator.cpp:
(WebCore::ComposedTreeIterator::initializeShadowStack):
* dom/Element.cpp:
(WebCore::Element::childrenChanged):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191127 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/dom/ComposedTreeAncestorIterator.h
Source/WebCore/dom/ComposedTreeIterator.cpp
Source/WebCore/dom/Element.cpp

index ac65a91..0f3f208 100644 (file)
@@ -1,5 +1,19 @@
 2015-10-15  Csaba Osztrogon√°c  <ossy@webkit.org>
 
+        Fix the !(ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)) build after r191112
+        https://bugs.webkit.org/show_bug.cgi?id=150175
+
+        Reviewed by Antti Koivisto.
+
+        * dom/ComposedTreeAncestorIterator.h:
+        (WebCore::ComposedTreeAncestorIterator::traverseParent):
+        * dom/ComposedTreeIterator.cpp:
+        (WebCore::ComposedTreeIterator::initializeShadowStack):
+        * dom/Element.cpp:
+        (WebCore::Element::childrenChanged):
+
+2015-10-15  Csaba Osztrogon√°c  <ossy@webkit.org>
+
         Get rid of the only once used isIntegerArray function
         https://bugs.webkit.org/show_bug.cgi?id=150170
 
index d63ab9e..b00ffb9 100644 (file)
@@ -92,6 +92,7 @@ inline ComposedTreeAncestorIterator& ComposedTreeAncestorIterator::traverseParen
 #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
         m_current = shadowRoot->findAssignedSlot(*m_current);
 #else
+        UNUSED_PARAM(shadowRoot);
         m_current = nullptr;
 #endif
         return *this;
index 78ce65f..4143750 100644 (file)
@@ -63,6 +63,7 @@ void ComposedTreeIterator::initializeShadowStack()
             }
             // The node is not part of the composed tree.
 #else
+            UNUSED_PARAM(shadowRoot);
             m_current = nullptr;
             return;
 #endif
index 7ec56a6..12e768b 100644 (file)
@@ -1845,8 +1845,8 @@ void Element::childrenChanged(const ChildChange& change)
         checkForSiblingStyleChanges(*this, checkType, change.previousSiblingElement, change.nextSiblingElement);
     }
 
-    if (ShadowRoot* shadowRoot = this->shadowRoot()) {
 #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+    if (ShadowRoot* shadowRoot = this->shadowRoot()) {
         switch (change.type) {
         case ElementInserted:
         case ElementRemoved:
@@ -1861,8 +1861,8 @@ void Element::childrenChanged(const ChildChange& change)
         case NonContentsChildChanged:
             break;
         }
-#endif
     }
+#endif
 }
 
 void Element::removeAllEventListeners()