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

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

Issue 922173002: Don't pass semi-detached renderers to the flow thread (or anyone else). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Code review - make a helper method. Created 5 years, 9 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, 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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 325
326 private: 326 private:
327 virtual LayoutObjectChildList* virtualChildren() override final { return chi ldren(); } 327 virtual LayoutObjectChildList* virtualChildren() override final { return chi ldren(); }
328 virtual const LayoutObjectChildList* virtualChildren() const override final { return children(); } 328 virtual const LayoutObjectChildList* virtualChildren() const override final { return children(); }
329 329
330 virtual const char* renderName() const override; 330 virtual const char* renderName() const override;
331 331
332 virtual bool isLayoutBlock() const override final { return true; } 332 virtual bool isLayoutBlock() const override final { return true; }
333 333
334 void makeChildrenNonInline(LayoutObject* insertionPoint = 0); 334 void makeChildrenNonInline(LayoutObject* insertionPoint = 0);
335
336 // Promote all children and make them siblings that come right after this bl ock.
337 void promoteAllChildrenAndInsertAfter();
338
335 virtual void removeLeftoverAnonymousBlock(LayoutBlock* child); 339 virtual void removeLeftoverAnonymousBlock(LayoutBlock* child);
336 340
337 static void collapseAnonymousBlockChild(LayoutBlock* parent, LayoutBlock* ch ild); 341 static void collapseAnonymousBlockChild(LayoutBlock* parent, LayoutBlock* ch ild);
338 342
339 virtual void dirtyLinesFromChangedChild(LayoutObject* child) override final { m_lineBoxes.dirtyLinesFromChangedChild(this, child); } 343 virtual void dirtyLinesFromChangedChild(LayoutObject* child) override final { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }
340 344
341 void addChildToContinuation(LayoutObject* newChild, LayoutObject* beforeChil d); 345 void addChildToContinuation(LayoutObject* newChild, LayoutObject* beforeChil d);
342 virtual void addChildIgnoringContinuation(LayoutObject* newChild, LayoutObje ct* beforeChild) override; 346 virtual void addChildIgnoringContinuation(LayoutObject* newChild, LayoutObje ct* beforeChild) override;
343 void addChildToAnonymousColumnBlocks(LayoutObject* newChild, LayoutObject* b eforeChild); 347 void addChildToAnonymousColumnBlocks(LayoutObject* newChild, LayoutObject* b eforeChild);
344 348
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 // FIXME: This is temporary as we move code that accesses block flow 477 // FIXME: This is temporary as we move code that accesses block flow
474 // member variables out of LayoutBlock and into LayoutBlockFlow. 478 // member variables out of LayoutBlock and into LayoutBlockFlow.
475 friend class LayoutBlockFlow; 479 friend class LayoutBlockFlow;
476 }; 480 };
477 481
478 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 482 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
479 483
480 } // namespace blink 484 } // namespace blink
481 485
482 #endif // LayoutBlock_h 486 #endif // LayoutBlock_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698