Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / HTMLContentElement.cpp

diff --git a/src/third_party/WebKit/Source/core/html/HTMLContentElement.cpp b/src/third_party/WebKit/Source/core/html/HTMLContentElement.cpp
index c6495ab..62eaf75 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/HTMLContentElement.cpp
+++ b/src/third_party/WebKit/Source/core/html/HTMLContentElement.cpp
@@ -28,6 +28,7 @@
 #include "core/html/HTMLContentElement.h"
 
 #include "HTMLNames.h"
+#include "RuntimeEnabledFeatures.h"
 #include "core/css/SelectorChecker.h"
 #include "core/css/SiblingTraversalStrategies.h"
 #include "core/css/parser/BisonCSSParser.h"
@@ -92,11 +93,18 @@ bool HTMLContentElement::validateSelect() const
     if (!m_selectorList.isValid())
         return false;
 
+    bool disallowPseudoClasses = !RuntimeEnabledFeatures::pseudoClassesInMatchingCriteriaInAuthorShadowTreesEnabled() && containingShadowRoot() && containingShadowRoot()->type() == ShadowRoot::AuthorShadowRoot;
+
     for (const CSSSelector* selector = m_selectorList.first(); selector; selector = m_selectorList.next(*selector)) {
         if (!selector->isCompound())
             return false;
+        if (!disallowPseudoClasses)
+            continue;
+        for (const CSSSelector* subSelector = selector; subSelector; subSelector = subSelector->tagHistory()) {
+            if (subSelector->m_match == CSSSelector::PseudoClass)
+                return false;
+        }
     }
-
     return true;
 }