Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h

Issue 2494333002: Replace wrapUnique(new T(args)) by makeUnique<T>(args) in Blink (Closed)
Patch Set: Drop redundant WTF:: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2006, 2007, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2006, 2007, 2009 Apple Inc. All rights reserved.
5 * Copyright (C) 2010 Google Inc. All rights reserved. 5 * Copyright (C) 2010 Google Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 bool fullRemoveInsert = false); 504 bool fullRemoveInsert = false);
505 505
506 private: 506 private:
507 void createLayer(); 507 void createLayer();
508 508
509 LayoutUnit computedCSSPadding(const Length&) const; 509 LayoutUnit computedCSSPadding(const Length&) const;
510 bool isBoxModelObject() const final { return true; } 510 bool isBoxModelObject() const final { return true; }
511 511
512 LayoutBoxModelObjectRareData& ensureRareData() { 512 LayoutBoxModelObjectRareData& ensureRareData() {
513 if (!m_rareData) 513 if (!m_rareData)
514 m_rareData = wrapUnique(new LayoutBoxModelObjectRareData()); 514 m_rareData = makeUnique<LayoutBoxModelObjectRareData>();
515 return *m_rareData.get(); 515 return *m_rareData.get();
516 } 516 }
517 517
518 // The PaintLayer associated with this object. |m_layer| can be nullptr 518 // The PaintLayer associated with this object. |m_layer| can be nullptr
519 // depending on the return value of layerTypeRequired(). 519 // depending on the return value of layerTypeRequired().
520 std::unique_ptr<PaintLayer> m_layer; 520 std::unique_ptr<PaintLayer> m_layer;
521 521
522 std::unique_ptr<LayoutBoxModelObjectRareData> m_rareData; 522 std::unique_ptr<LayoutBoxModelObjectRareData> m_rareData;
523 }; 523 };
524 524
525 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBoxModelObject, isBoxModelObject()); 525 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBoxModelObject, isBoxModelObject());
526 526
527 } // namespace blink 527 } // namespace blink
528 528
529 #endif // LayoutBoxModelObject_h 529 #endif // LayoutBoxModelObject_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.h ('k') | third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698