Title: [191127] trunk/Source/WebCore
Revision
191127
Author
o...@webkit.org
Date
2015-10-15 12:46:24 -0700 (Thu, 15 Oct 2015)

Log Message

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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (191126 => 191127)


--- trunk/Source/WebCore/ChangeLog	2015-10-15 19:34:09 UTC (rev 191126)
+++ trunk/Source/WebCore/ChangeLog	2015-10-15 19:46:24 UTC (rev 191127)
@@ -1,5 +1,19 @@
 2015-10-15  Csaba Osztrogonác  <o...@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  <o...@webkit.org>
+
         Get rid of the only once used isIntegerArray function
         https://bugs.webkit.org/show_bug.cgi?id=150170
 

Modified: trunk/Source/WebCore/dom/ComposedTreeAncestorIterator.h (191126 => 191127)


--- trunk/Source/WebCore/dom/ComposedTreeAncestorIterator.h	2015-10-15 19:34:09 UTC (rev 191126)
+++ trunk/Source/WebCore/dom/ComposedTreeAncestorIterator.h	2015-10-15 19:46:24 UTC (rev 191127)
@@ -92,6 +92,7 @@
 #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
         m_current = shadowRoot->findAssignedSlot(*m_current);
 #else
+        UNUSED_PARAM(shadowRoot);
         m_current = nullptr;
 #endif
         return *this;

Modified: trunk/Source/WebCore/dom/ComposedTreeIterator.cpp (191126 => 191127)


--- trunk/Source/WebCore/dom/ComposedTreeIterator.cpp	2015-10-15 19:34:09 UTC (rev 191126)
+++ trunk/Source/WebCore/dom/ComposedTreeIterator.cpp	2015-10-15 19:46:24 UTC (rev 191127)
@@ -63,6 +63,7 @@
             }
             // The node is not part of the composed tree.
 #else
+            UNUSED_PARAM(shadowRoot);
             m_current = nullptr;
             return;
 #endif

Modified: trunk/Source/WebCore/dom/Element.cpp (191126 => 191127)


--- trunk/Source/WebCore/dom/Element.cpp	2015-10-15 19:34:09 UTC (rev 191126)
+++ trunk/Source/WebCore/dom/Element.cpp	2015-10-15 19:46:24 UTC (rev 191127)
@@ -1845,8 +1845,8 @@
         checkForSiblingStyleChanges(*this, checkType, change.previousSiblingElement, change.nextSiblingElement);
     }
 
+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
     if (ShadowRoot* shadowRoot = this->shadowRoot()) {
-#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
         switch (change.type) {
         case ElementInserted:
         case ElementRemoved:
@@ -1861,8 +1861,8 @@
         case NonContentsChildChanged:
             break;
         }
+    }
 #endif
-    }
 }
 
 void Element::removeAllEventListeners()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to