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

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

Issue 729693003: First step at getting rid of anonymous blocks and continuations. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Address review comments Created 6 years, 1 month 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, 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 bool paintsContinuationOutline(RenderInline*); 168 bool paintsContinuationOutline(RenderInline*);
169 169
170 virtual RenderBoxModelObject* virtualContinuation() const override final { r eturn continuation(); } 170 virtual RenderBoxModelObject* virtualContinuation() const override final { r eturn continuation(); }
171 bool isAnonymousBlockContinuation() const { return continuation() && isAnony mousBlock(); } 171 bool isAnonymousBlockContinuation() const { return continuation() && isAnony mousBlock(); }
172 RenderInline* inlineElementContinuation() const; 172 RenderInline* inlineElementContinuation() const;
173 RenderBlock* blockElementContinuation() const; 173 RenderBlock* blockElementContinuation() const;
174 174
175 using RenderBoxModelObject::continuation; 175 using RenderBoxModelObject::continuation;
176 using RenderBoxModelObject::setContinuation; 176 using RenderBoxModelObject::setContinuation;
177 177
178 static RenderBlock* createAnonymousWithParentRendererAndDisplay(const Render Object*, EDisplay = BLOCK); 178 static RenderBlock* createAnonymousWithParentRendererAndDisplay(const Render Object*, EDisplay = PARAGRAPH);
179 RenderBlock* createAnonymousBlock(EDisplay display = BLOCK) const { return c reateAnonymousWithParentRendererAndDisplay(this, display); } 179 RenderBlock* createAnonymousBlock(EDisplay display = PARAGRAPH) const { retu rn createAnonymousWithParentRendererAndDisplay(this, display); }
180 180
181 virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* pare nt) const override; 181 virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* pare nt) const override;
182 182
183 // Accessors for logical width/height and margins in the containing block's block-flow direction. 183 // Accessors for logical width/height and margins in the containing block's block-flow direction.
184 LayoutUnit logicalWidthForChild(const RenderBox* child) const { return child ->width(); } 184 LayoutUnit logicalWidthForChild(const RenderBox* child) const { return child ->width(); }
185 LayoutUnit logicalHeightForChild(const RenderBox* child) const { return chil d->height(); } 185 LayoutUnit logicalHeightForChild(const RenderBox* child) const { return chil d->height(); }
186 LayoutSize logicalSizeForChild(const RenderBox* child) const { return child- >size(); } 186 LayoutSize logicalSizeForChild(const RenderBox* child) const { return child- >size(); }
187 LayoutUnit logicalTopForChild(const RenderBox* child) const { return child-> y(); } 187 LayoutUnit logicalTopForChild(const RenderBox* child) const { return child-> y(); }
188 LayoutUnit marginBeforeForChild(const RenderBoxModelObject* child) const { r eturn child->marginBefore(style()); } 188 LayoutUnit marginBeforeForChild(const RenderBoxModelObject* child) const { r eturn child->marginBefore(style()); }
189 LayoutUnit marginAfterForChild(const RenderBoxModelObject* child) const { re turn child->marginAfter(style()); } 189 LayoutUnit marginAfterForChild(const RenderBoxModelObject* child) const { re turn child->marginAfter(style()); }
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 291
292 private: 292 private:
293 virtual RenderObjectChildList* virtualChildren() override final { return chi ldren(); } 293 virtual RenderObjectChildList* virtualChildren() override final { return chi ldren(); }
294 virtual const RenderObjectChildList* virtualChildren() const override final { return children(); } 294 virtual const RenderObjectChildList* virtualChildren() const override final { return children(); }
295 295
296 virtual const char* renderName() const override; 296 virtual const char* renderName() const override;
297 297
298 virtual bool isRenderBlock() const override final { return true; } 298 virtual bool isRenderBlock() const override final { return true; }
299 299
300 void makeChildrenNonInline(RenderObject* insertionPoint = 0); 300 void makeChildrenNonInline(RenderObject* insertionPoint = 0);
301 virtual void removeLeftoverAnonymousBlock(RenderBlock* child);
302 301
303 static void collapseAnonymousBlockChild(RenderBlock* parent, RenderBlock* ch ild); 302 static void collapseAnonymousBlockChild(RenderBlock* parent, RenderBlock* ch ild);
304 303
305 virtual void dirtyLinesFromChangedChild(RenderObject* child) override final { m_lineBoxes.dirtyLinesFromChangedChild(this, child); } 304 virtual void dirtyLinesFromChangedChild(RenderObject* child) override final { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }
306 305
307 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChil d); 306 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChil d);
308 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild) override; 307 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild) override;
309 308
310 void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObj ect* beforeChild = 0); 309 void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObj ect* beforeChild = 0);
311 310
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 // FIXME: This is temporary as we move code that accesses block flow 396 // FIXME: This is temporary as we move code that accesses block flow
398 // member variables out of RenderBlock and into RenderBlockFlow. 397 // member variables out of RenderBlock and into RenderBlockFlow.
399 friend class RenderBlockFlow; 398 friend class RenderBlockFlow;
400 }; 399 };
401 400
402 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 401 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
403 402
404 } // namespace blink 403 } // namespace blink
405 404
406 #endif // RenderBlock_h 405 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « sky/engine/core/css/resolver/StyleAdjuster.cpp ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698