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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months 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 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * Copyright (C) 2013 Google Inc. All rights reserved. 7 * Copyright (C) 2013 Google Inc. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions are 10 * modification, are permitted provided that the following conditions are
(...skipping 25 matching lines...) Expand all
36 #ifndef LayoutBlockFlow_h 36 #ifndef LayoutBlockFlow_h
37 #define LayoutBlockFlow_h 37 #define LayoutBlockFlow_h
38 38
39 #include "core/CoreExport.h" 39 #include "core/CoreExport.h"
40 #include "core/layout/FloatingObjects.h" 40 #include "core/layout/FloatingObjects.h"
41 #include "core/layout/LayoutBlock.h" 41 #include "core/layout/LayoutBlock.h"
42 #include "core/layout/api/LineLayoutItem.h" 42 #include "core/layout/api/LineLayoutItem.h"
43 #include "core/layout/line/LineBoxList.h" 43 #include "core/layout/line/LineBoxList.h"
44 #include "core/layout/line/RootInlineBox.h" 44 #include "core/layout/line/RootInlineBox.h"
45 #include "core/layout/line/TrailingObjects.h" 45 #include "core/layout/line/TrailingObjects.h"
46 #include <memory>
46 47
47 namespace blink { 48 namespace blink {
48 49
49 class BlockChildrenLayoutInfo; 50 class BlockChildrenLayoutInfo;
50 class MarginInfo; 51 class MarginInfo;
51 class LayoutInline; 52 class LayoutInline;
52 class LineInfo; 53 class LineInfo;
53 class LineLayoutState; 54 class LineLayoutState;
54 class LineWidth; 55 class LineWidth;
55 class LayoutMultiColumnFlowThread; 56 class LayoutMultiColumnFlowThread;
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 609
609 LayoutBlockFlowRareData& ensureRareData(); 610 LayoutBlockFlowRareData& ensureRareData();
610 611
611 LayoutUnit m_paintInvalidationLogicalTop; 612 LayoutUnit m_paintInvalidationLogicalTop;
612 LayoutUnit m_paintInvalidationLogicalBottom; 613 LayoutUnit m_paintInvalidationLogicalBottom;
613 614
614 bool isSelfCollapsingBlock() const override; 615 bool isSelfCollapsingBlock() const override;
615 bool checkIfIsSelfCollapsingBlock() const; 616 bool checkIfIsSelfCollapsingBlock() const;
616 617
617 protected: 618 protected:
618 OwnPtr<LayoutBlockFlowRareData> m_rareData; 619 std::unique_ptr<LayoutBlockFlowRareData> m_rareData;
619 OwnPtr<FloatingObjects> m_floatingObjects; 620 std::unique_ptr<FloatingObjects> m_floatingObjects;
620 621
621 friend class MarginInfo; 622 friend class MarginInfo;
622 friend class LineWidth; // needs to know FloatingObject 623 friend class LineWidth; // needs to know FloatingObject
623 624
624 // LayoutRubyBase objects need to be able to split and merge, moving their c hildren around 625 // LayoutRubyBase objects need to be able to split and merge, moving their c hildren around
625 // (calling makeChildrenNonInline). 626 // (calling makeChildrenNonInline).
626 // TODO(mstensho): Try to get rid of this friendship. 627 // TODO(mstensho): Try to get rid of this friendship.
627 friend class LayoutRubyBase; 628 friend class LayoutRubyBase;
628 629
629 // FIXME-BLOCKFLOW: These methods have implementations in 630 // FIXME-BLOCKFLOW: These methods have implementations in
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 663
663 // END METHODS DEFINED IN LayoutBlockFlowLine 664 // END METHODS DEFINED IN LayoutBlockFlowLine
664 665
665 }; 666 };
666 667
667 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 668 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
668 669
669 } // namespace blink 670 } // namespace blink
670 671
671 #endif // LayoutBlockFlow_h 672 #endif // LayoutBlockFlow_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698