X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Fdom%2Fshadow%2FElementShadow.cpp;h=17ee8ba1a2642dd3fcd6c558751a6490fd3d2323;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=779b03390c4c51e6d1251d9ed5c9ae9b64b8a3bb;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

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
--- 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);
         }
     }
 }