| Index: Source/core/css/parser/BisonCSSParser-in.cpp
|
| diff --git a/Source/core/css/parser/BisonCSSParser-in.cpp b/Source/core/css/parser/BisonCSSParser-in.cpp
|
| index 0faad8ae68faf5e76f9e9811f4290086b25b48e6..645086777dde86d9021aad41a0817a3c7b208b53 100644
|
| --- a/Source/core/css/parser/BisonCSSParser-in.cpp
|
| +++ b/Source/core/css/parser/BisonCSSParser-in.cpp
|
| @@ -1295,7 +1295,7 @@ bool BisonCSSParser::parseDeclaration(MutableStylePropertySet* declaration, cons
|
| return ok;
|
| }
|
|
|
| -PassRefPtr<MediaQuerySet> BisonCSSParser::parseMediaQueryList(const String& string)
|
| +PassRefPtrWillBeRawPtr<MediaQuerySet> BisonCSSParser::parseMediaQueryList(const String& string)
|
| {
|
| ASSERT(!m_mediaList);
|
|
|
| @@ -9388,31 +9388,31 @@ MediaQueryExp* BisonCSSParser::createFloatingMediaQueryExp(const AtomicString& m
|
| return m_floatingMediaQueryExp.get();
|
| }
|
|
|
| -PassOwnPtr<MediaQueryExp> BisonCSSParser::sinkFloatingMediaQueryExp(MediaQueryExp* expression)
|
| +PassOwnPtrWillBeRawPtr<MediaQueryExp> BisonCSSParser::sinkFloatingMediaQueryExp(MediaQueryExp* expression)
|
| {
|
| ASSERT_UNUSED(expression, expression == m_floatingMediaQueryExp);
|
| return m_floatingMediaQueryExp.release();
|
| }
|
|
|
| -Vector<OwnPtr<MediaQueryExp> >* BisonCSSParser::createFloatingMediaQueryExpList()
|
| +WillBeHeapVector<OwnPtrWillBeMember<MediaQueryExp> >* BisonCSSParser::createFloatingMediaQueryExpList()
|
| {
|
| - m_floatingMediaQueryExpList = adoptPtr(new Vector<OwnPtr<MediaQueryExp> >);
|
| + m_floatingMediaQueryExpList = adoptPtrWillBeNoop(new WillBeHeapVector<OwnPtrWillBeMember<MediaQueryExp> >);
|
| return m_floatingMediaQueryExpList.get();
|
| }
|
|
|
| -PassOwnPtr<Vector<OwnPtr<MediaQueryExp> > > BisonCSSParser::sinkFloatingMediaQueryExpList(Vector<OwnPtr<MediaQueryExp> >* list)
|
| +PassOwnPtrWillBeRawPtr<WillBeHeapVector<OwnPtrWillBeMember<MediaQueryExp> > > BisonCSSParser::sinkFloatingMediaQueryExpList(WillBeHeapVector<OwnPtrWillBeMember<MediaQueryExp> >* list)
|
| {
|
| ASSERT_UNUSED(list, list == m_floatingMediaQueryExpList);
|
| return m_floatingMediaQueryExpList.release();
|
| }
|
|
|
| -MediaQuery* BisonCSSParser::createFloatingMediaQuery(MediaQuery::Restrictor restrictor, const AtomicString& mediaType, PassOwnPtr<Vector<OwnPtr<MediaQueryExp> > > expressions)
|
| +MediaQuery* BisonCSSParser::createFloatingMediaQuery(MediaQuery::Restrictor restrictor, const AtomicString& mediaType, PassOwnPtrWillBeRawPtr<WillBeHeapVector<OwnPtrWillBeMember<MediaQueryExp> > > expressions)
|
| {
|
| - m_floatingMediaQuery = adoptPtr(new MediaQuery(restrictor, mediaType, expressions));
|
| + m_floatingMediaQuery = adoptPtrWillBeNoop(new MediaQuery(restrictor, mediaType, expressions));
|
| return m_floatingMediaQuery.get();
|
| }
|
|
|
| -MediaQuery* BisonCSSParser::createFloatingMediaQuery(PassOwnPtr<Vector<OwnPtr<MediaQueryExp> > > expressions)
|
| +MediaQuery* BisonCSSParser::createFloatingMediaQuery(PassOwnPtrWillBeRawPtr<WillBeHeapVector<OwnPtrWillBeMember<MediaQueryExp> > > expressions)
|
| {
|
| return createFloatingMediaQuery(MediaQuery::None, AtomicString("all", AtomicString::ConstructFromLiteral), expressions);
|
| }
|
| @@ -9422,7 +9422,7 @@ MediaQuery* BisonCSSParser::createFloatingNotAllQuery()
|
| return createFloatingMediaQuery(MediaQuery::Not, AtomicString("all", AtomicString::ConstructFromLiteral), sinkFloatingMediaQueryExpList(createFloatingMediaQueryExpList()));
|
| }
|
|
|
| -PassOwnPtr<MediaQuery> BisonCSSParser::sinkFloatingMediaQuery(MediaQuery* query)
|
| +PassOwnPtrWillBeRawPtr<MediaQuery> BisonCSSParser::sinkFloatingMediaQuery(MediaQuery* query)
|
| {
|
| ASSERT_UNUSED(query, query == m_floatingMediaQuery);
|
| return m_floatingMediaQuery.release();
|
| @@ -9442,7 +9442,7 @@ PassOwnPtr<Vector<RefPtr<StyleKeyframe> > > BisonCSSParser::sinkFloatingKeyframe
|
|
|
| MediaQuerySet* BisonCSSParser::createMediaQuerySet()
|
| {
|
| - RefPtr<MediaQuerySet> queries = MediaQuerySet::create();
|
| + RefPtrWillBeRawPtr<MediaQuerySet> queries = MediaQuerySet::create();
|
| MediaQuerySet* result = queries.get();
|
| m_parsedMediaQuerySets.append(queries.release());
|
| return result;
|
| @@ -9463,10 +9463,10 @@ StyleRuleBase* BisonCSSParser::createMediaRule(MediaQuerySet* media, RuleList* r
|
| m_allowImportRules = m_allowNamespaceDeclarations = false;
|
| RefPtr<StyleRuleMedia> rule;
|
| if (rules) {
|
| - rule = StyleRuleMedia::create(media ? media : MediaQuerySet::create(), *rules);
|
| + rule = StyleRuleMedia::create(media ? media : MediaQuerySet::create().get(), *rules);
|
| } else {
|
| RuleList emptyRules;
|
| - rule = StyleRuleMedia::create(media ? media : MediaQuerySet::create(), emptyRules);
|
| + rule = StyleRuleMedia::create(media ? media : MediaQuerySet::create().get(), emptyRules);
|
| }
|
| StyleRuleMedia* result = rule.get();
|
| m_parsedRules.append(rule.release());
|
|
|