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

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

Issue 1068683002: Delete RenderBlockFlow. (Closed) Base URL: https://github.com/domokit/mojo.git@block
Patch Set: Remove unused float-related code instead of moving it. Created 5 years, 8 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 | « sky/engine/core/rendering/InlineIterator.h ('k') | 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 protected: 81 protected:
82 RenderLineBoxList* lineBoxes() { return &m_lineBoxes; } 82 RenderLineBoxList* lineBoxes() { return &m_lineBoxes; }
83 83
84 InlineFlowBox* firstLineBox() const { return m_lineBoxes.firstLineBox(); } 84 InlineFlowBox* firstLineBox() const { return m_lineBoxes.firstLineBox(); }
85 InlineFlowBox* lastLineBox() const { return m_lineBoxes.lastLineBox(); } 85 InlineFlowBox* lastLineBox() const { return m_lineBoxes.lastLineBox(); }
86 86
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 erParagraph
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 void insertPositionedObject(RenderBox*); 97 void insertPositionedObject(RenderBox*);
98 static void removePositionedObject(RenderBox*); 98 static void removePositionedObject(RenderBox*);
99 void removePositionedObjects(RenderBlock*, ContainingBlockState = SameContai ningBlock); 99 void removePositionedObjects(RenderBlock*, ContainingBlockState = SameContai ningBlock);
100 100
101 TrackedRendererListHashSet* positionedObjects() const; 101 TrackedRendererListHashSet* positionedObjects() const;
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 301
302 unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put in RenderBlockRareData since they are set too frequently. 302 unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put in RenderBlockRareData since they are set too frequently.
303 unsigned m_hasMarginAfterQuirk : 1; 303 unsigned m_hasMarginAfterQuirk : 1;
304 unsigned m_beingDestroyed : 1; 304 unsigned m_beingDestroyed : 1;
305 unsigned m_hasBorderOrPaddingLogicalWidthChanged : 1; 305 unsigned m_hasBorderOrPaddingLogicalWidthChanged : 1;
306 306
307 // FIXME-BLOCKFLOW: Remove this when the line layout stuff has all moved out of RenderBlock 307 // FIXME-BLOCKFLOW: Remove this when the line layout stuff has all moved out of RenderBlock
308 friend class LineBreaker; 308 friend class LineBreaker;
309 309
310 // FIXME: This is temporary as we move code that accesses block flow 310 // FIXME: This is temporary as we move code that accesses block flow
311 // member variables out of RenderBlock and into RenderBlockFlow. 311 // member variables out of RenderBlock and into RenderParagraph.
312 friend class RenderBlockFlow;
313 friend class RenderParagraph; 312 friend class RenderParagraph;
314 }; 313 };
315 314
316 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 315 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
317 316
318 } // namespace blink 317 } // namespace blink
319 318
320 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCK_H_ 319 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBLOCK_H_
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/InlineIterator.h ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698