Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / shadow / ElementShadow.cpp

diff --git a/src/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp b/src/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp
index 779b033..17ee8ba 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp
+++ b/src/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp
@@ -291,7 +291,7 @@ const DestinationInsertionPoints* ElementShadow::destinationInsertionPointsFor(c
 
 void ElementShadow::distribute()
 {
-    host()->setNeedsStyleRecalc();
+    host()->setNeedsStyleRecalc(SubtreeStyleChange);
     Vector<HTMLShadowElement*, 32> shadowInsertionPoints;
     DistributionPool pool(*host());
 
@@ -335,7 +335,7 @@ void ElementShadow::distribute()
 void ElementShadow::didDistributeNode(const Node* node, InsertionPoint* insertionPoint)
 {
     NodeToDestinationInsertionPoints::AddResult result = m_nodeToInsertionPoints.add(node, DestinationInsertionPoints());
-    result.iterator->value.append(insertionPoint);
+    result.storedValue->value.append(insertionPoint);
 }
 
 const SelectRuleFeatureSet& ElementShadow::ensureSelectFeatureSet()
@@ -361,9 +361,9 @@ void ElementShadow::collectSelectFeatureSetFrom(ShadowRoot& root)
         if (!element->hasTagName(HTMLNames::contentTag))
             continue;
         const CSSSelectorList& list = toHTMLContentElement(element)->selectorList();
-        for (const CSSSelector* selector = list.first(); selector; selector = CSSSelectorList::next(selector)) {
+        for (const CSSSelector* selector = list.first(); selector; selector = CSSSelectorList::next(*selector)) {
             for (const CSSSelector* component = selector; component; component = component->tagHistory())
-                m_selectFeatures.collectFeaturesFromSelector(component);
+                m_selectFeatures.collectFeaturesFromSelector(*component);
         }
     }
 }