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

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

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 bool fullRemoveInsert = false); 508 bool fullRemoveInsert = false);
509 509
510 private: 510 private:
511 void createLayer(); 511 void createLayer();
512 512
513 LayoutUnit computedCSSPadding(const Length&) const; 513 LayoutUnit computedCSSPadding(const Length&) const;
514 bool isBoxModelObject() const final { return true; } 514 bool isBoxModelObject() const final { return true; }
515 515
516 LayoutBoxModelObjectRareData& ensureRareData() { 516 LayoutBoxModelObjectRareData& ensureRareData() {
517 if (!m_rareData) 517 if (!m_rareData)
518 m_rareData = makeUnique<LayoutBoxModelObjectRareData>(); 518 m_rareData = WTF::makeUnique<LayoutBoxModelObjectRareData>();
519 return *m_rareData.get(); 519 return *m_rareData.get();
520 } 520 }
521 521
522 // The PaintLayer associated with this object. |m_layer| can be nullptr 522 // The PaintLayer associated with this object. |m_layer| can be nullptr
523 // depending on the return value of layerTypeRequired(). 523 // depending on the return value of layerTypeRequired().
524 std::unique_ptr<PaintLayer> m_layer; 524 std::unique_ptr<PaintLayer> m_layer;
525 525
526 std::unique_ptr<LayoutBoxModelObjectRareData> m_rareData; 526 std::unique_ptr<LayoutBoxModelObjectRareData> m_rareData;
527 }; 527 };
528 528
529 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBoxModelObject, isBoxModelObject()); 529 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBoxModelObject, isBoxModelObject());
530 530
531 } // namespace blink 531 } // namespace blink
532 532
533 #endif // LayoutBoxModelObject_h 533 #endif // LayoutBoxModelObject_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698