Move MediaQuery classes off BlinkGC heap

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

 /*
  * CSS Media Query
  *
  * Copyright (C) 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 21 matching lines @@
 #include <utility>
 #include "core/CoreExport.h"
 #include "platform/heap/Handle.h"
 #include "platform/wtf/Vector.h"
 #include "platform/wtf/text/StringHash.h"
 #include "platform/wtf/text/WTFString.h"
 
 namespace blink {
 class MediaQueryExp;
 
-using ExpressionHeapVector = HeapVector<Member<MediaQueryExp>>;
+using ExpressionHeapVector = Vector<MediaQueryExp>;
 
-class CORE_EXPORT MediaQuery : public GarbageCollectedFinalized<MediaQuery> {
+class CORE_EXPORT MediaQuery {
  public:
   enum RestrictorType { kOnly, kNot, kNone };
 
-  static MediaQuery* Create(RestrictorType,
-                            String media_type,
-                            ExpressionHeapVector);
-  static MediaQuery* CreateNotAll();
+  static std::unique_ptr<MediaQuery> Create(RestrictorType,
+                                            String media_type,
+                                            ExpressionHeapVector);
+  static std::unique_ptr<MediaQuery> CreateNotAll();
 
   ~MediaQuery();
 
   RestrictorType Restrictor() const { return restrictor_; }
   const ExpressionHeapVector& Expressions() const { return expressions_; }
   const String& MediaType() const { return media_type_; }
   bool operator==(const MediaQuery& other) const;
   String CssText() const;
 
-  MediaQuery* Copy() const { return new MediaQuery(*this); }
-
-  DECLARE_TRACE();
+  std::unique_ptr<MediaQuery> Copy() const {
+    return WTF::WrapUnique(new MediaQuery(*this));

[haraken, 2017/04/26 11:15:25]

MakeUnique

[keishi, 2017/04/26 13:28:58]

Done.

+  }
 
  private:
   MediaQuery(RestrictorType, String media_type, ExpressionHeapVector);
   MediaQuery(const MediaQuery&);
 
   MediaQuery& operator=(const MediaQuery&) = delete;
 
   RestrictorType restrictor_;
   String media_type_;
   ExpressionHeapVector expressions_;
   String serialization_cache_;
 
   String Serialize() const;
 };
 
 }  // namespace blink
 
 #endif