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

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

Issue 1968403002: LayoutBlock::removeChild() override no longer needed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutBlock.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 // |this|. This happens e.g. when there's an anonymous block child of |this| and 150 // |this|. This happens e.g. when there's an anonymous block child of |this| and
151 // |beforeDescendant| has been reparented into that one. Such things are inv isible to the DOM, 151 // |beforeDescendant| has been reparented into that one. Such things are inv isible to the DOM,
152 // and addChild() is typically called with the DOM tree (and not the layout tree) in mind. 152 // and addChild() is typically called with the DOM tree (and not the layout tree) in mind.
153 void addChildBeforeDescendant(LayoutObject* newChild, LayoutObject* beforeDe scendant); 153 void addChildBeforeDescendant(LayoutObject* newChild, LayoutObject* beforeDe scendant);
154 154
155 public: 155 public:
156 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Layo utBlockFlow 156 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Layo utBlockFlow
157 virtual void deleteLineBoxTree(); 157 virtual void deleteLineBoxTree();
158 158
159 void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) o verride; 159 void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) o verride;
160 void removeChild(LayoutObject*) override;
161 160
162 virtual void layoutBlock(bool relayoutChildren); 161 virtual void layoutBlock(bool relayoutChildren);
163 162
164 void insertPositionedObject(LayoutBox*); 163 void insertPositionedObject(LayoutBox*);
165 static void removePositionedObject(LayoutBox*); 164 static void removePositionedObject(LayoutBox*);
166 void removePositionedObjects(LayoutBlock*, ContainingBlockState = SameContai ningBlock); 165 void removePositionedObjects(LayoutBlock*, ContainingBlockState = SameContai ningBlock);
167 166
168 TrackedLayoutBoxListHashSet* positionedObjects() const { return hasPositione dObjects() ? positionedObjectsInternal() : nullptr; } 167 TrackedLayoutBoxListHashSet* positionedObjects() const { return hasPositione dObjects() ? positionedObjectsInternal() : nullptr; }
169 bool hasPositionedObjects() const 168 bool hasPositionedObjects() const
170 { 169 {
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 // FIXME: This is temporary as we move code that accesses block flow 497 // FIXME: This is temporary as we move code that accesses block flow
499 // member variables out of LayoutBlock and into LayoutBlockFlow. 498 // member variables out of LayoutBlock and into LayoutBlockFlow.
500 friend class LayoutBlockFlow; 499 friend class LayoutBlockFlow;
501 }; 500 };
502 501
503 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 502 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
504 503
505 } // namespace blink 504 } // namespace blink
506 505
507 #endif // LayoutBlock_h 506 #endif // LayoutBlock_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698