Source/core/rendering/RenderBlock.h - Issue 253313005: Strip anonymous blocks when change in style removes need for them

Side by Side Diff: Source/core/rendering/RenderBlock.h

Issue 253313005: Strip anonymous blocks when change in style removes need for them (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Updated 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 | Annotate | Revision Log

« LayoutTests/fast/block/do-not-strip-anonymous-blocks-when-block-child-becomes-float-and-anonymous-blocks-have-inline-children.html ('K') | « LayoutTests/platform/linux/fast/block/do-not-strip-anonymous-blocks-when-block-child-becomes-float-and-other-block-on-line-expected.txt ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | Source/core/rendering/RenderBlock.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 342 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
353 virtual void dirtyLinesFromChangedChild(RenderObject* child) override final { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }	353 virtual void dirtyLinesFromChangedChild(RenderObject* child) override final { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }

354	354

355 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChil d);	355 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChil d);

356 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild) override;	356 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild) override;

357 void addChildToAnonymousColumnBlocks(RenderObject* newChild, RenderObject* b eforeChild);	357 void addChildToAnonymousColumnBlocks(RenderObject* newChild, RenderObject* b eforeChild);

358	358

359 void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObj ect* beforeChild = 0);	359 void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObj ect* beforeChild = 0);

360	360

361 virtual bool isSelfCollapsingBlock() const override;	361 virtual bool isSelfCollapsingBlock() const override;

362	362

	363 void removeAnonymousWrappersIfRequired();

	364

363 void insertIntoTrackedRendererMaps(RenderBox* descendant, TrackedDescendants Map&, TrackedContainerMap&);	365 void insertIntoTrackedRendererMaps(RenderBox* descendant, TrackedDescendants Map&, TrackedContainerMap&);

364 static void removeFromTrackedRendererMaps(RenderBox* descendant, TrackedDesc endantsMap&, TrackedContainerMap&);	366 static void removeFromTrackedRendererMaps(RenderBox* descendant, TrackedDesc endantsMap&, TrackedContainerMap&);

365	367

366 void createFirstLetterRenderer(RenderObject* firstLetterBlock, RenderText& c urrentChild, unsigned length);	368 void createFirstLetterRenderer(RenderObject* firstLetterBlock, RenderText& c urrentChild, unsigned length);

367 void updateFirstLetterStyle(RenderObject* firstLetterBlock, RenderObject* fi rstLetterContainer);	369 void updateFirstLetterStyle(RenderObject* firstLetterBlock, RenderObject* fi rstLetterContainer);

368	370

369 Node* nodeForHitTest() const;	371 Node* nodeForHitTest() const;

370	372

371 private:	373 private:

372 virtual bool avoidsFloats() const override { return true; }	374 virtual bool avoidsFloats() const override { return true; }

(...skipping 121 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
494 // FIXME: This is temporary as we move code that accesses block flow	496 // FIXME: This is temporary as we move code that accesses block flow

495 // member variables out of RenderBlock and into RenderBlockFlow.	497 // member variables out of RenderBlock and into RenderBlockFlow.

496 friend class RenderBlockFlow;	498 friend class RenderBlockFlow;

497 };	499 };

498	500

499 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());	501 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());

500	502

501 } // namespace blink	503 } // namespace blink

502	504

503 #endif // RenderBlock_h	505 #endif // RenderBlock_h

OLD	NEW