Move MediaQuery classes off BlinkGC heap

third_party/WebKit/Source/core/css/MediaQuery.cpp

 /*
  * CSS Media Query
  *
  * Copyright (C) 2005, 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 43 matching lines @@
   if (m_expressions.isEmpty()) {
     result.append(m_mediaType);
     return result.toString();
   }
 
   if (m_mediaType != MediaTypeNames::all || m_restrictor != None) {
     result.append(m_mediaType);
     result.append(" and ");
   }
 
-  result.append(m_expressions.at(0)->serialize());
+  result.append(m_expressions.at(0).serialize());
   for (size_t i = 1; i < m_expressions.size(); ++i) {
     result.append(" and ");
-    result.append(m_expressions.at(i)->serialize());
+    result.append(m_expressions.at(i).serialize());
   }
   return result.toString();
 }
 
-static bool expressionCompare(const Member<MediaQueryExp>& a,
-                              const Member<MediaQueryExp>& b) {
-  return codePointCompare(a->serialize(), b->serialize()) < 0;
+static bool expressionCompare(const MediaQueryExp& a, const MediaQueryExp& b) {
+  return codePointCompare(a.serialize(), b.serialize()) < 0;
 }
 
-MediaQuery* MediaQuery::createNotAll() {
-  return new MediaQuery(MediaQuery::Not, MediaTypeNames::all,
-                        ExpressionHeapVector());
+std::unique_ptr<MediaQuery> MediaQuery::createNotAll() {
+  return WTF::makeUnique<MediaQuery>(MediaQuery::Not, MediaTypeNames::all,
+                                     ExpressionHeapVector());
 }
 
-MediaQuery* MediaQuery::create(RestrictorType restrictor,
-                               String mediaType,
-                               ExpressionHeapVector expressions) {
-  return new MediaQuery(restrictor, std::move(mediaType),
-                        std::move(expressions));
+std::unique_ptr<MediaQuery> MediaQuery::create(
+    RestrictorType restrictor,
+    String mediaType,
+    ExpressionHeapVector expressions) {
+  return WTF::makeUnique<MediaQuery>(restrictor, std::move(mediaType),
+                                     std::move(expressions));
 }
 
 MediaQuery::MediaQuery(RestrictorType restrictor,
                        String mediaType,
                        ExpressionHeapVector expressions)
     : m_restrictor(restrictor),
       m_mediaType(attemptStaticStringCreation(mediaType.lower())),
       m_expressions(std::move(expressions)) {
   nonCopyingSort(m_expressions.begin(), m_expressions.end(), expressionCompare);
 
   // Remove all duplicated expressions.
-  MediaQueryExp* key = 0;
+  MediaQueryExp key = MediaQueryExp::invalid();
   for (int i = m_expressions.size() - 1; i >= 0; --i) {
-    MediaQueryExp* exp = m_expressions.at(i).get();
+    MediaQueryExp exp = m_expressions.at(i);
 
-    if (key && *exp == *key)
+    if (exp == key)
       m_expressions.remove(i);
     else
       key = exp;
   }
 }
 
 MediaQuery::MediaQuery(const MediaQuery& o)
     : m_restrictor(o.m_restrictor),
       m_mediaType(o.m_mediaType),
       m_serializationCache(o.m_serializationCache) {
   m_expressions.reserveInitialCapacity(o.m_expressions.size());
   for (unsigned i = 0; i < o.m_expressions.size(); ++i)
-    m_expressions.push_back(o.m_expressions[i]->copy());
+    m_expressions.push_back(o.m_expressions[i]);
 }
 
 MediaQuery::~MediaQuery() {}
 
 // http://dev.w3.org/csswg/cssom/#compare-media-queries
 bool MediaQuery::operator==(const MediaQuery& other) const {
   return cssText() == other.cssText();
 }
 
 // http://dev.w3.org/csswg/cssom/#serialize-a-list-of-media-queries
 String MediaQuery::cssText() const {
   if (m_serializationCache.isNull())
     const_cast<MediaQuery*>(this)->m_serializationCache = serialize();
 
   return m_serializationCache;
 }
 
-DEFINE_TRACE(MediaQuery) {
-  visitor->trace(m_expressions);
-}
-
 }  // namespace blink