Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/style/ComputedStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 14 matching lines @@
 #include "core/animation/css/CSSAnimationData.h"
 #include "core/animation/css/CSSTransitionData.h"
 #include "core/css/CSSPaintValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSPropertyEquality.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/layout/TextAutosizer.h"
 #include "core/style/AppliedTextDecoration.h"
 #include "core/style/BorderEdge.h"
+#include "core/style/ContentData.h"
+#include "core/style/DataEquivalency.h"
 #include "core/style/ComputedStyleConstants.h"
-#include "core/style/ContentData.h"
 #include "core/style/CursorData.h"
-#include "core/style/DataEquivalency.h"
 #include "core/style/QuotesData.h"
 #include "core/style/ShadowList.h"
 #include "core/style/StyleImage.h"
 #include "core/style/StyleInheritedData.h"
 #include "core/style/StyleVariableData.h"
 #include "platform/LengthFunctions.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/fonts/Font.h"
 #include "platform/fonts/FontSelector.h"
 #include "platform/geometry/FloatRoundedRect.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/transforms/RotateTransformOperation.h"
 #include "platform/transforms/ScaleTransformOperation.h"
 #include "platform/transforms/TranslateTransformOperation.h"
 #include "wtf/MathExtras.h"
 #include "wtf/PtrUtil.h"
+
 #include <algorithm>
-#include <memory>
 
 namespace blink {
 
 struct SameSizeAsBorderValue {
     RGBA32 m_color;
     unsigned m_width;
 };
 
 static_assert(sizeof(BorderValue) == sizeof(SameSizeAsBorderValue), "BorderValue should stay small");
 
@@ skipping 332 matching lines @@
 ComputedStyle* ComputedStyle::addCachedPseudoStyle(PassRefPtr<ComputedStyle> pseudo)
 {
     if (!pseudo)
         return 0;
 
     ASSERT(pseudo->styleType() > PseudoIdNone);
 
     ComputedStyle* result = pseudo.get();
 
     if (!m_cachedPseudoStyles)
-        m_cachedPseudoStyles = wrapUnique(new PseudoStyleCache);
+        m_cachedPseudoStyles = adoptPtr(new PseudoStyleCache);
 
     m_cachedPseudoStyles->append(pseudo);
 
     return result;
 }
 
 void ComputedStyle::removeCachedPseudoStyle(PseudoId pid)
 {
     if (!m_cachedPseudoStyles)
         return;
@@ skipping 722 matching lines @@
     return allLayersAreFixed(backgroundLayers());
 }
 
 const CounterDirectiveMap* ComputedStyle::counterDirectives() const
 {
     return rareNonInheritedData->m_counterDirectives.get();
 }
 
 CounterDirectiveMap& ComputedStyle::accessCounterDirectives()
 {
-    std::unique_ptr<CounterDirectiveMap>& map = rareNonInheritedData.access()->m_counterDirectives;
+    OwnPtr<CounterDirectiveMap>& map = rareNonInheritedData.access()->m_counterDirectives;
     if (!map)
-        map = wrapUnique(new CounterDirectiveMap);
+        map = adoptPtr(new CounterDirectiveMap);
     return *map;
 }
 
 const CounterDirectives ComputedStyle::getCounterDirectives(const AtomicString& identifier) const
 {
     if (const CounterDirectiveMap* directives = counterDirectives())
         return directives->get(identifier);
     return CounterDirectives();
 }
 
@@ skipping 708 matching lines @@
         if (value < 0)
             fvalue -= 0.5f;
         else
             fvalue += 0.5f;
     }
 
     return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 } // namespace blink