Revert "Remove OwnPtr from Blink."

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

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 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
@@ skipping 16 matching lines @@
 #include "core/HTMLNames.h"
 #include "core/css/StylePropertySet.h"
 #include "core/html/HTMLTableCellElement.h"
 #include "core/layout/LayoutAnalyzer.h"
 #include "core/layout/LayoutTableCol.h"
 #include "core/layout/SubtreeLayoutScope.h"
 #include "core/paint/TableCellPainter.h"
 #include "core/style/CollapsedBorderValue.h"
 #include "platform/geometry/FloatQuad.h"
 #include "platform/geometry/TransformState.h"
-#include "wtf/PtrUtil.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 struct SameSizeAsLayoutTableCell : public LayoutBlockFlow {
     unsigned bitfields;
     int paddings[2];
     void* pointer;
 };
@@ skipping 868 matching lines @@
         computeCollapsedBeforeBorder(),
         computeCollapsedAfterBorder()
     };
 
     bool changed = false;
     if (!newValues.startBorder.isVisible() && !newValues.endBorder.isVisible() && !newValues.beforeBorder.isVisible() && !newValues.afterBorder.isVisible()) {
         changed = !!m_collapsedBorderValues;
         m_collapsedBorderValues = nullptr;
     } else if (!m_collapsedBorderValues) {
         changed = true;
-        m_collapsedBorderValues = wrapUnique(new CollapsedBorderValues(newValues));
+        m_collapsedBorderValues = adoptPtr(new CollapsedBorderValues(newValues));
     } else {
         // We check visuallyEquals so that the table cell is invalidated only if a changed
         // collapsed border is visible in the first place.
         changed = !m_collapsedBorderValues->startBorder.visuallyEquals(newValues.startBorder)
             || !m_collapsedBorderValues->endBorder.visuallyEquals(newValues.endBorder)
             || !m_collapsedBorderValues->beforeBorder.visuallyEquals(newValues.beforeBorder)
             || !m_collapsedBorderValues->afterBorder.visuallyEquals(newValues.afterBorder);
         if (changed)
             *m_collapsedBorderValues = newValues;
     }
@@ skipping 73 matching lines @@
 bool LayoutTableCell::backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const
 {
     // If this object has layer, the area of collapsed borders should be transparent
     // to expose the collapsed borders painted on the underlying layer.
     if (hasLayer() && table()->collapseBorders())
         return false;
     return LayoutBlockFlow::backgroundIsKnownToBeOpaqueInRect(localRect);
 }
 
 } // namespace blink