Upstream version 10.39.225.0

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

diff --git a/src/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp b/src/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp
index 6add0d9..fa9b774 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp
+++ b/src/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp
@@ -28,11 +28,11 @@
 #include "core/SVGNames.h"
 #include "core/css/CSSCharsetRule.h"
 #include "core/css/CSSImportRule.h"
-#include "core/css/parser/BisonCSSParser.h"
 #include "core/css/CSSRuleList.h"
 #include "core/css/MediaList.h"
 #include "core/css/StyleRule.h"
 #include "core/css/StyleSheetContents.h"
+#include "core/css/parser/CSSParser.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/Node.h"
@@ -123,7 +123,6 @@ CSSStyleSheet::CSSStyleSheet(PassRefPtrWillBeRawPtr<StyleSheetContents> contents
     , m_startPosition(TextPosition::minimumPosition())
     , m_loadCompleted(false)
 {
-    ScriptWrappable::init(this);
     m_contents->registerClient(this);
 }
 
@@ -136,7 +135,6 @@ CSSStyleSheet::CSSStyleSheet(PassRefPtrWillBeRawPtr<StyleSheetContents> contents
     , m_startPosition(startPosition)
     , m_loadCompleted(false)
 {
-    ScriptWrappable::init(this);
     ASSERT(isAcceptableCSSStyleSheetParent(ownerNode));
     m_contents->registerClient(this);
 }
@@ -312,8 +310,7 @@ unsigned CSSStyleSheet::insertRule(const String& ruleString, unsigned index, Exc
         return 0;
     }
     CSSParserContext context(m_contents->parserContext(), UseCounter::getFrom(this));
-    BisonCSSParser p(context);
-    RefPtrWillBeRawPtr<StyleRuleBase> rule = p.parseRule(m_contents.get(), ruleString);
+    RefPtrWillBeRawPtr<StyleRuleBase> rule = CSSParser::parseRule(context, m_contents.get(), ruleString);
 
     if (!rule) {
         exceptionState.throwDOMException(SyntaxError, "Failed to parse the rule '" + ruleString + "'.");
@@ -468,4 +465,4 @@ void CSSStyleSheet::trace(Visitor* visitor)
     StyleSheet::trace(visitor);
 }
 
-}
+} // namespace blink