Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/layout/LayoutView.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 26 matching lines @@
 #include "core/paint/PaintLayer.h"
 #include "core/paint/ViewPainter.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "platform/Histogram.h"
 #include "platform/TraceEvent.h"
 #include "platform/TracedValue.h"
 #include "platform/geometry/FloatQuad.h"
 #include "platform/geometry/TransformState.h"
 #include "platform/graphics/paint/PaintController.h"
 #include "public/platform/Platform.h"
-#include "wtf/PtrUtil.h"
 #include <inttypes.h>
 
 namespace blink {
 
 namespace {
 
 class HitTestLatencyRecorder {
 public:
     HitTestLatencyRecorder(bool allowsChildFrameContent)
         : m_start(WTF::monotonicallyIncreasingTime())
@@ skipping 179 matching lines @@
 }
 
 void LayoutView::layout()
 {
     if (!document().paginated())
         setPageLogicalHeight(LayoutUnit());
 
     if (pageLogicalHeight() && shouldUsePrintingLayout()) {
         m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = logicalWidth();
         if (!m_fragmentationContext)
-            m_fragmentationContext = wrapUnique(new ViewFragmentationContext(*this));
+            m_fragmentationContext = adoptPtr(new ViewFragmentationContext(*this));
     } else if (m_fragmentationContext) {
         m_fragmentationContext.reset();
     }
 
     SubtreeLayoutScope layoutScope(*this);
 
     LayoutRect oldLayoutOverflowRect = layoutOverflowRect();
 
     // Use calcWidth/Height to get the new width/height, since this will take the full page zoom factor into account.
     bool relayoutChildren = !shouldUsePrintingLayout() && (!m_frameView
@@ skipping 688 matching lines @@
 }
 
 bool LayoutView::usesCompositing() const
 {
     return m_compositor && m_compositor->staleInCompositingMode();
 }
 
 PaintLayerCompositor* LayoutView::compositor()
 {
     if (!m_compositor)
-        m_compositor = wrapUnique(new PaintLayerCompositor(*this));
+        m_compositor = adoptPtr(new PaintLayerCompositor(*this));
 
     return m_compositor.get();
 }
 
 void LayoutView::setIsInWindow(bool isInWindow)
 {
     if (m_compositor)
         m_compositor->setIsInWindow(isInWindow);
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
     // We don't invalidate layers during document detach(), so must clear the should-keep-alive
@@ skipping 76 matching lines @@
     // ASSERT(!frame()->isMainFrame()) here. All main frame scrolling should
     // be handled by the ViewportScrollCallback.
 
     if (!frameView())
         return ScrollResult(false, false, delta.width(), delta.height());
 
     return frameView()->getScrollableArea()->userScroll(granularity, delta);
 }
 
 } // namespace blink