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

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, 7 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 | Annotate | Revision Log
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 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 static void collapseAnonymousBlockChild(RenderBlock* parent, RenderBlock* ch ild); 362 static void collapseAnonymousBlockChild(RenderBlock* parent, RenderBlock* ch ild);
363 363
364 virtual void dirtyLinesFromChangedChild(RenderObject* child) OVERRIDE FINAL { m_lineBoxes.dirtyLinesFromChangedChild(this, child); } 364 virtual void dirtyLinesFromChangedChild(RenderObject* child) OVERRIDE FINAL { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }
365 365
366 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChil d); 366 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChil d);
367 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild) OVERRIDE; 367 virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObje ct* beforeChild) OVERRIDE;
368 void addChildToAnonymousColumnBlocks(RenderObject* newChild, RenderObject* b eforeChild); 368 void addChildToAnonymousColumnBlocks(RenderObject* newChild, RenderObject* b eforeChild);
369 369
370 void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObj ect* beforeChild = 0); 370 void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObj ect* beforeChild = 0);
371 371
372 void removeAnonymousWrappersIfRequired();
373
372 virtual bool isSelfCollapsingBlock() const OVERRIDE; 374 virtual bool isSelfCollapsingBlock() const OVERRIDE;
373 375
374 void insertIntoTrackedRendererMaps(RenderBox* descendant, TrackedDescendants Map*&, TrackedContainerMap*&); 376 void insertIntoTrackedRendererMaps(RenderBox* descendant, TrackedDescendants Map*&, TrackedContainerMap*&);
375 static void removeFromTrackedRendererMaps(RenderBox* descendant, TrackedDesc endantsMap*&, TrackedContainerMap*&); 377 static void removeFromTrackedRendererMaps(RenderBox* descendant, TrackedDesc endantsMap*&, TrackedContainerMap*&);
376 378
377 void createFirstLetterRenderer(RenderObject* firstLetterBlock, RenderObject* currentChild, unsigned length); 379 void createFirstLetterRenderer(RenderObject* firstLetterBlock, RenderObject* currentChild, unsigned length);
378 void updateFirstLetterStyle(RenderObject* firstLetterBlock, RenderObject* fi rstLetterContainer); 380 void updateFirstLetterStyle(RenderObject* firstLetterBlock, RenderObject* fi rstLetterContainer);
379 381
380 Node* nodeForHitTest() const; 382 Node* nodeForHitTest() const;
381 383
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 // FIXME: This is temporary as we move code that accesses block flow 547 // FIXME: This is temporary as we move code that accesses block flow
546 // member variables out of RenderBlock and into RenderBlockFlow. 548 // member variables out of RenderBlock and into RenderBlockFlow.
547 friend class RenderBlockFlow; 549 friend class RenderBlockFlow;
548 }; 550 };
549 551
550 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 552 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
551 553
552 } // namespace WebCore 554 } // namespace WebCore
553 555
554 #endif // RenderBlock_h 556 #endif // RenderBlock_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698