Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/css/invalidation/InvalidationSet.h"
 
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Element.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "platform/TracedValue.h"
 #include "wtf/Compiler.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/text/StringBuilder.h"
-#include <memory>
 
 namespace blink {
 
 static const unsigned char* s_tracingEnabled = nullptr;
 
 #define TRACE_STYLE_INVALIDATOR_INVALIDATION_SELECTORPART_IF_ENABLED(element, reason, invalidationSet, singleSelectorPart) \
     if (UNLIKELY(*s_tracingEnabled)) \
         TRACE_STYLE_INVALIDATOR_INVALIDATION_SELECTORPART(element, reason, invalidationSet, singleSelectorPart);
 
 void InvalidationSet::cacheTracingFlag()
@@ skipping 112 matching lines @@
 {
     if (isDescendantInvalidationSet())
         delete toDescendantInvalidationSet(this);
     else
         delete toSiblingInvalidationSet(this);
 }
 
 HashSet<AtomicString>& InvalidationSet::ensureClassSet()
 {
     if (!m_classes)
-        m_classes = wrapUnique(new HashSet<AtomicString>);
+        m_classes = adoptPtr(new HashSet<AtomicString>);
     return *m_classes;
 }
 
 HashSet<AtomicString>& InvalidationSet::ensureIdSet()
 {
     if (!m_ids)
-        m_ids = wrapUnique(new HashSet<AtomicString>);
+        m_ids = adoptPtr(new HashSet<AtomicString>);
     return *m_ids;
 }
 
 HashSet<AtomicString>& InvalidationSet::ensureTagNameSet()
 {
     if (!m_tagNames)
-        m_tagNames = wrapUnique(new HashSet<AtomicString>);
+        m_tagNames = adoptPtr(new HashSet<AtomicString>);
     return *m_tagNames;
 }
 
 HashSet<AtomicString>& InvalidationSet::ensureAttributeSet()
 {
     if (!m_attributes)
-        m_attributes = wrapUnique(new HashSet<AtomicString>);
+        m_attributes = adoptPtr(new HashSet<AtomicString>);
     return *m_attributes;
 }
 
 void InvalidationSet::addClass(const AtomicString& className)
 {
     if (wholeSubtreeInvalid())
         return;
     ensureClassSet().add(className);
 }
 
@@ skipping 78 matching lines @@
             value->pushString(attribute);
         value->endArray();
     }
 
     value->endDictionary();
 }
 
 #ifndef NDEBUG
 void InvalidationSet::show() const
 {
-    std::unique_ptr<TracedValue> value = TracedValue::create();
+    OwnPtr<TracedValue> value = TracedValue::create();
     value->beginArray("InvalidationSet");
     toTracedValue(value.get());
     value->endArray();
     fprintf(stderr, "%s\n", value->toString().ascii().data());
 }
 #endif // NDEBUG
 
 SiblingInvalidationSet::SiblingInvalidationSet(PassRefPtr<DescendantInvalidationSet> descendants)
     : InvalidationSet(InvalidateSiblings)
     , m_maxDirectAdjacentSelectors(1)
     , m_descendantInvalidationSet(descendants)
 {
 }
 
 DescendantInvalidationSet& SiblingInvalidationSet::ensureSiblingDescendants()
 {
     if (!m_siblingDescendantInvalidationSet)
         m_siblingDescendantInvalidationSet = DescendantInvalidationSet::create();
     return *m_siblingDescendantInvalidationSet;
 }
 
 DescendantInvalidationSet& SiblingInvalidationSet::ensureDescendants()
 {
     if (!m_descendantInvalidationSet)
         m_descendantInvalidationSet = DescendantInvalidationSet::create();
     return *m_descendantInvalidationSet;
 }
 
 } // namespace blink