Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / CSSGroupingRule.cpp

diff --git a/src/third_party/WebKit/Source/core/css/CSSGroupingRule.cpp b/src/third_party/WebKit/Source/core/css/CSSGroupingRule.cpp
index 8dd8624..768f795 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/CSSGroupingRule.cpp
+++ b/src/third_party/WebKit/Source/core/css/CSSGroupingRule.cpp
@@ -35,7 +35,9 @@
 #include "core/css/parser/BisonCSSParser.h"
 #include "core/css/CSSRuleList.h"
 #include "core/css/CSSStyleSheet.h"
+#include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
+#include "core/frame/ContentSecurityPolicy.h"
 #include "core/frame/UseCounter.h"
 #include "wtf/text/StringBuilder.h"
 
@@ -61,13 +63,23 @@ unsigned CSSGroupingRule::insertRule(const String& ruleString, unsigned index, E
 {
     ASSERT(m_childRuleCSSOMWrappers.size() == m_groupRule->childRules().size());
 
+    CSSStyleSheet* styleSheet = parentStyleSheet();
+    if (styleSheet) {
+        if (Document* document = styleSheet->ownerDocument()) {
+            if (!document->contentSecurityPolicy()->allowStyleEval()) {
+                exceptionState.throwSecurityError(document->contentSecurityPolicy()->styleEvalDisabledErrorMessage());
+                return 0;
+            }
+        }
+    }
+
     if (index > m_groupRule->childRules().size()) {
         exceptionState.throwDOMException(IndexSizeError, "the index " + String::number(index) + " must be less than or equal to the length of the rule list.");
         return 0;
     }
 
-    CSSStyleSheet* styleSheet = parentStyleSheet();
-    BisonCSSParser parser(parserContext(), UseCounter::getFrom(styleSheet));
+    CSSParserContext context(parserContext(), UseCounter::getFrom(styleSheet));
+    BisonCSSParser parser(context);
     RefPtr<StyleRuleBase> newRule = parser.parseRule(styleSheet ? styleSheet->contents() : 0, ruleString);
     if (!newRule) {
         exceptionState.throwDOMException(SyntaxError, "the rule '" + ruleString + "' is invalid and cannot be parsed.");