[webkit-changes] [209726] trunk/Source/WebCore

Mon, 12 Dec 2016 13:49:51 -0800

Title: [209726] trunk/Source/WebCore
Revision
209726
Author
[email protected]
Date
2016-12-12 13:49:53 -0800 (Mon, 12 Dec 2016)

Log Message

[CSS Parser] MediaQueryParser should use Ref and not RefPtr
https://bugs.webkit.org/show_bug.cgi?id=165771

Reviewed by Simon Fraser.

* css/MediaList.cpp:
(WebCore::MediaQuerySet::create):
* css/parser/CSSParserImpl.cpp:
(WebCore::CSSParserImpl::consumeImportRule):
(WebCore::CSSParserImpl::consumeMediaRule):
* css/parser/MediaQueryParser.cpp:
(WebCore::MediaQueryParser::parseMediaQuerySet):
(WebCore::MediaQueryParser::parseMediaCondition):
(WebCore::MediaQueryParser::parseInternal):
* css/parser/MediaQueryParser.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (209725 => 209726)


--- trunk/Source/WebCore/ChangeLog	2016-12-12 21:46:45 UTC (rev 209725)
+++ trunk/Source/WebCore/ChangeLog	2016-12-12 21:49:53 UTC (rev 209726)
@@ -1,3 +1,21 @@
+2016-12-12  Dave Hyatt  <[email protected]>
+
+        [CSS Parser] MediaQueryParser should use Ref and not RefPtr
+        https://bugs.webkit.org/show_bug.cgi?id=165771
+
+        Reviewed by Simon Fraser.
+
+        * css/MediaList.cpp:
+        (WebCore::MediaQuerySet::create):
+        * css/parser/CSSParserImpl.cpp:
+        (WebCore::CSSParserImpl::consumeImportRule):
+        (WebCore::CSSParserImpl::consumeMediaRule):
+        * css/parser/MediaQueryParser.cpp:
+        (WebCore::MediaQueryParser::parseMediaQuerySet):
+        (WebCore::MediaQueryParser::parseMediaCondition):
+        (WebCore::MediaQueryParser::parseInternal):
+        * css/parser/MediaQueryParser.h:
+
 2016-12-12  Zalan Bujtas  <[email protected]>
 
         The CSS 'columns' property when set on the <body> element makes short columns

Modified: trunk/Source/WebCore/css/MediaList.cpp (209725 => 209726)


--- trunk/Source/WebCore/css/MediaList.cpp	2016-12-12 21:46:45 UTC (rev 209725)
+++ trunk/Source/WebCore/css/MediaList.cpp	2016-12-12 21:49:53 UTC (rev 209726)
@@ -70,7 +70,7 @@
     if (mediaString.isEmpty())
         return MediaQuerySet::create();
     
-    return MediaQueryParser::parseMediaQuerySet(mediaString).releaseNonNull();
+    return MediaQueryParser::parseMediaQuerySet(mediaString);
 }
 
 MediaQuerySet::MediaQuerySet()

Modified: trunk/Source/WebCore/css/parser/CSSParserImpl.cpp (209725 => 209726)


--- trunk/Source/WebCore/css/parser/CSSParserImpl.cpp	2016-12-12 21:46:45 UTC (rev 209725)
+++ trunk/Source/WebCore/css/parser/CSSParserImpl.cpp	2016-12-12 21:49:53 UTC (rev 209726)
@@ -519,7 +519,7 @@
         m_observerWrapper->observer().endRuleBody(endOffset);
     }
 
-    return StyleRuleImport::create(uri, MediaQueryParser::parseMediaQuerySet(prelude).releaseNonNull());
+    return StyleRuleImport::create(uri, MediaQueryParser::parseMediaQuerySet(prelude));
 }
 
 RefPtr<StyleRuleNamespace> CSSParserImpl::consumeNamespaceRule(CSSParserTokenRange prelude)
@@ -538,7 +538,7 @@
 RefPtr<StyleRuleMedia> CSSParserImpl::consumeMediaRule(CSSParserTokenRange prelude, CSSParserTokenRange block)
 {
     if (m_deferredParser)
-        return StyleRuleMedia::create(MediaQueryParser::parseMediaQuerySet(prelude).releaseNonNull(),  std::make_unique<DeferredStyleGroupRuleList>(block, *m_deferredParser));
+        return StyleRuleMedia::create(MediaQueryParser::parseMediaQuerySet(prelude), std::make_unique<DeferredStyleGroupRuleList>(block, *m_deferredParser));
 
     Vector<RefPtr<StyleRuleBase>> rules;
 
@@ -555,7 +555,7 @@
     if (m_observerWrapper)
         m_observerWrapper->observer().endRuleBody(m_observerWrapper->endOffset(block));
 
-    return StyleRuleMedia::create(MediaQueryParser::parseMediaQuerySet(prelude).releaseNonNull(), rules);
+    return StyleRuleMedia::create(MediaQueryParser::parseMediaQuerySet(prelude), rules);
 }
 
 RefPtr<StyleRuleSupports> CSSParserImpl::consumeSupportsRule(CSSParserTokenRange prelude, CSSParserTokenRange block)

Modified: trunk/Source/WebCore/css/parser/MediaQueryParser.cpp (209725 => 209726)


--- trunk/Source/WebCore/css/parser/MediaQueryParser.cpp	2016-12-12 21:46:45 UTC (rev 209725)
+++ trunk/Source/WebCore/css/parser/MediaQueryParser.cpp	2016-12-12 21:49:53 UTC (rev 209726)
@@ -36,17 +36,17 @@
 
 namespace WebCore {
 
-RefPtr<MediaQuerySet> MediaQueryParser::parseMediaQuerySet(const String& queryString)
+Ref<MediaQuerySet> MediaQueryParser::parseMediaQuerySet(const String& queryString)
 {
     return parseMediaQuerySet(CSSTokenizer(queryString).tokenRange());
 }
 
-RefPtr<MediaQuerySet> MediaQueryParser::parseMediaQuerySet(CSSParserTokenRange range)
+Ref<MediaQuerySet> MediaQueryParser::parseMediaQuerySet(CSSParserTokenRange range)
 {
     return MediaQueryParser(MediaQuerySetParser).parseInternal(range);
 }
 
-RefPtr<MediaQuerySet> MediaQueryParser::parseMediaCondition(CSSParserTokenRange range)
+Ref<MediaQuerySet> MediaQueryParser::parseMediaCondition(CSSParserTokenRange range)
 {
     return MediaQueryParser(MediaConditionParser).parseInternal(range);
 }
@@ -246,7 +246,7 @@
 }
 
 // The state machine loop
-RefPtr<MediaQuerySet> MediaQueryParser::parseInternal(CSSParserTokenRange range)
+Ref<MediaQuerySet> MediaQueryParser::parseInternal(CSSParserTokenRange range)
 {
     while (!range.atEnd())
         processToken(range.consume());
@@ -261,7 +261,7 @@
     } else if (m_mediaQueryData.currentMediaQueryChanged())
         commitMediaQuery();
 
-    return m_querySet;
+    return WTFMove(m_querySet);
 }
 
 MediaQueryData::MediaQueryData()

Modified: trunk/Source/WebCore/css/parser/MediaQueryParser.h (209725 => 209726)


--- trunk/Source/WebCore/css/parser/MediaQueryParser.h	2016-12-12 21:46:45 UTC (rev 209725)
+++ trunk/Source/WebCore/css/parser/MediaQueryParser.h	2016-12-12 21:49:53 UTC (rev 209726)
@@ -76,9 +76,9 @@
 class MediaQueryParser {
     WTF_MAKE_NONCOPYABLE(MediaQueryParser);
 public:
-    static RefPtr<MediaQuerySet> parseMediaQuerySet(const String&);
-    static RefPtr<MediaQuerySet> parseMediaQuerySet(CSSParserTokenRange);
-    static RefPtr<MediaQuerySet> parseMediaCondition(CSSParserTokenRange);
+    static Ref<MediaQuerySet> parseMediaQuerySet(const String&);
+    static Ref<MediaQuerySet> parseMediaQuerySet(CSSParserTokenRange);
+    static Ref<MediaQuerySet> parseMediaCondition(CSSParserTokenRange);
 
 private:
     enum ParserType {
@@ -89,7 +89,7 @@
     MediaQueryParser(ParserType);
     virtual ~MediaQueryParser();
 
-    RefPtr<MediaQuerySet> parseInternal(CSSParserTokenRange);
+    Ref<MediaQuerySet> parseInternal(CSSParserTokenRange);
 
     void processToken(const CSSParserToken&);
 
@@ -116,7 +116,7 @@
     State m_state;
     ParserType m_parserType;
     MediaQueryData m_mediaQueryData;
-    RefPtr<MediaQuerySet> m_querySet;
+    Ref<MediaQuerySet> m_querySet;
     MediaQueryBlockWatcher m_blockWatcher;
 
     const static State ReadRestrictor;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to