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

Side by Side Diff: sky/engine/core/rendering/RenderBlock.h

Issue 876663003: Remove layoutBlock. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | sky/engine/core/rendering/RenderBlock.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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 RootInlineBox* firstRootBox() const { return static_cast<RootInlineBox*>(fir stLineBox()); } 87 RootInlineBox* firstRootBox() const { return static_cast<RootInlineBox*>(fir stLineBox()); }
88 RootInlineBox* lastRootBox() const { return static_cast<RootInlineBox*>(last LineBox()); } 88 RootInlineBox* lastRootBox() const { return static_cast<RootInlineBox*>(last LineBox()); }
89 89
90 public: 90 public:
91 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Rend erBlockFlow 91 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Rend erBlockFlow
92 virtual void deleteLineBoxTree(); 92 virtual void deleteLineBoxTree();
93 93
94 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override; 94 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override;
95 virtual void removeChild(RenderObject*) override; 95 virtual void removeChild(RenderObject*) override;
96 96
97 virtual void layoutBlock(bool relayoutChildren);
98
99 void insertPositionedObject(RenderBox*); 97 void insertPositionedObject(RenderBox*);
100 static void removePositionedObject(RenderBox*); 98 static void removePositionedObject(RenderBox*);
101 void removePositionedObjects(RenderBlock*, ContainingBlockState = SameContai ningBlock); 99 void removePositionedObjects(RenderBlock*, ContainingBlockState = SameContai ningBlock);
102 100
103 TrackedRendererListHashSet* positionedObjects() const; 101 TrackedRendererListHashSet* positionedObjects() const;
104 bool hasPositionedObjects() const 102 bool hasPositionedObjects() const
105 { 103 {
106 TrackedRendererListHashSet* objects = positionedObjects(); 104 TrackedRendererListHashSet* objects = positionedObjects();
107 return objects && !objects->isEmpty(); 105 return objects && !objects->isEmpty();
108 } 106 }
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 static void paintAsInlineBlock(RenderObject*, PaintInfo&, const LayoutPoint& ); 199 static void paintAsInlineBlock(RenderObject*, PaintInfo&, const LayoutPoint& );
202 200
203 bool recalcChildOverflowAfterStyleChange(); 201 bool recalcChildOverflowAfterStyleChange();
204 bool recalcOverflowAfterStyleChange(); 202 bool recalcOverflowAfterStyleChange();
205 203
206 protected: 204 protected:
207 virtual void willBeDestroyed() override; 205 virtual void willBeDestroyed() override;
208 206
209 void dirtyForLayoutFromPercentageHeightDescendants(SubtreeLayoutScope&); 207 void dirtyForLayoutFromPercentageHeightDescendants(SubtreeLayoutScope&);
210 208
211 virtual void layout() override;
212
213 enum PositionedLayoutBehavior { 209 enum PositionedLayoutBehavior {
214 DefaultLayout, 210 DefaultLayout,
215 ForcedLayoutAfterContainingBlockMoved 211 ForcedLayoutAfterContainingBlockMoved
216 }; 212 };
217 213
218 void layoutPositionedObjects(bool relayoutChildren, PositionedLayoutBehavior = DefaultLayout); 214 void layoutPositionedObjects(bool relayoutChildren, PositionedLayoutBehavior = DefaultLayout);
219 215
220 LayoutUnit marginIntrinsicLogicalWidthForChild(RenderBox* child) const; 216 LayoutUnit marginIntrinsicLogicalWidthForChild(RenderBox* child) const;
221 217
222 int beforeMarginInLineDirection(LineDirectionMode) const; 218 int beforeMarginInLineDirection(LineDirectionMode) const;
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 // member variables out of RenderBlock and into RenderBlockFlow. 340 // member variables out of RenderBlock and into RenderBlockFlow.
345 friend class RenderBlockFlow; 341 friend class RenderBlockFlow;
346 friend class RenderParagraph; 342 friend class RenderParagraph;
347 }; 343 };
348 344
349 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 345 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
350 346
351 } // namespace blink 347 } // namespace blink
352 348
353 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCK_H_ 349 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCK_H_
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698