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

Powered by Google App Engine
This is Rietveld 408576698