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 (expressions_.IsEmpty()) {
     result.Append(media_type_);
     return result.ToString();
   }
 
   if (media_type_ != MediaTypeNames::all || restrictor_ != kNone) {
     result.Append(media_type_);
     result.Append(" and ");
   }
 
-  result.Append(expressions_.at(0)->Serialize());
+  result.Append(expressions_.at(0).Serialize());
   for (size_t i = 1; i < expressions_.size(); ++i) {
     result.Append(" and ");
-    result.Append(expressions_.at(i)->Serialize());
+    result.Append(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::kNot, MediaTypeNames::all,
-                        ExpressionHeapVector());
+std::unique_ptr<MediaQuery> MediaQuery::CreateNotAll() {
+  return WTF::WrapUnique(new MediaQuery(MediaQuery::kNot, MediaTypeNames::all,
+                                        ExpressionHeapVector()));
 }
 
-MediaQuery* MediaQuery::Create(RestrictorType restrictor,
-                               String media_type,
-                               ExpressionHeapVector expressions) {
-  return new MediaQuery(restrictor, std::move(media_type),
-                        std::move(expressions));
+std::unique_ptr<MediaQuery> MediaQuery::Create(
+    RestrictorType restrictor,
+    String media_type,
+    ExpressionHeapVector expressions) {
+  return WTF::WrapUnique(new MediaQuery(restrictor, std::move(media_type),
+                                        std::move(expressions)));
 }
 
 MediaQuery::MediaQuery(RestrictorType restrictor,
                        String media_type,
                        ExpressionHeapVector expressions)
     : restrictor_(restrictor),
       media_type_(AttemptStaticStringCreation(media_type.DeprecatedLower())),
       expressions_(std::move(expressions)) {
   NonCopyingSort(expressions_.begin(), expressions_.end(), ExpressionCompare);
 
   // Remove all duplicated expressions.
-  MediaQueryExp* key = 0;
+  MediaQueryExp key = MediaQueryExp::Invalid();
   for (int i = expressions_.size() - 1; i >= 0; --i) {
-    MediaQueryExp* exp = expressions_.at(i).Get();
-
-    if (key && *exp == *key)
+    MediaQueryExp exp = expressions_.at(i);
+    CHECK(exp.IsValid());
+    CHECK(String() == String());

[sof, 2017/04/26 09:16:11]

accidental addition?

[keishi, 2017/04/26 09:44:35]

Oops. Sorry.

+    if (exp == key)
       expressions_.erase(i);
     else
       key = exp;
   }
 }
 
 MediaQuery::MediaQuery(const MediaQuery& o)
     : restrictor_(o.restrictor_),
       media_type_(o.media_type_),
       serialization_cache_(o.serialization_cache_) {
   expressions_.ReserveInitialCapacity(o.expressions_.size());
   for (unsigned i = 0; i < o.expressions_.size(); ++i)
-    expressions_.push_back(o.expressions_[i]->Copy());
+    expressions_.push_back(o.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 (serialization_cache_.IsNull())
     const_cast<MediaQuery*>(this)->serialization_cache_ = Serialize();
 
   return serialization_cache_;
 }
 
-DEFINE_TRACE(MediaQuery) {
-  visitor->Trace(expressions_);
-}
-
 }  // namespace blink