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

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

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

Powered by Google App Engine
This is Rietveld 408576698