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

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

Issue 423093002: Oilpan: Prepare to move RenderObject and RenderObjectChildList to Oilpan heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add more trace Created 6 years, 4 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, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 , m_beingDestroyed(false) 153 , m_beingDestroyed(false)
154 , m_hasMarkupTruncation(false) 154 , m_hasMarkupTruncation(false)
155 , m_hasBorderOrPaddingLogicalWidthChanged(false) 155 , m_hasBorderOrPaddingLogicalWidthChanged(false)
156 , m_hasOnlySelfCollapsingChildren(false) 156 , m_hasOnlySelfCollapsingChildren(false)
157 , m_descendantsWithFloatsMarkedForLayout(false) 157 , m_descendantsWithFloatsMarkedForLayout(false)
158 { 158 {
159 // RenderBlockFlow calls setChildrenInline(true). 159 // RenderBlockFlow calls setChildrenInline(true).
160 // By default, subclasses do not have inline children. 160 // By default, subclasses do not have inline children.
161 } 161 }
162 162
163 void RenderBlock::trace(Visitor* visitor)
164 {
165 visitor->trace(m_children);
166 RenderBox::trace(visitor);
167 }
168
163 static void removeBlockFromDescendantAndContainerMaps(RenderBlock* block, Tracke dDescendantsMap*& descendantMap, TrackedContainerMap*& containerMap) 169 static void removeBlockFromDescendantAndContainerMaps(RenderBlock* block, Tracke dDescendantsMap*& descendantMap, TrackedContainerMap*& containerMap)
164 { 170 {
165 if (OwnPtr<TrackedRendererListHashSet> descendantSet = descendantMap->take(b lock)) { 171 if (OwnPtr<TrackedRendererListHashSet> descendantSet = descendantMap->take(b lock)) {
166 TrackedRendererListHashSet::iterator end = descendantSet->end(); 172 TrackedRendererListHashSet::iterator end = descendantSet->end();
167 for (TrackedRendererListHashSet::iterator descendant = descendantSet->be gin(); descendant != end; ++descendant) { 173 for (TrackedRendererListHashSet::iterator descendant = descendantSet->be gin(); descendant != end; ++descendant) {
168 TrackedContainerMap::iterator it = containerMap->find(*descendant); 174 TrackedContainerMap::iterator it = containerMap->find(*descendant);
169 ASSERT(it != containerMap->end()); 175 ASSERT(it != containerMap->end());
170 if (it == containerMap->end()) 176 if (it == containerMap->end())
171 continue; 177 continue;
172 HashSet<RenderBlock*>* containerSet = it->value.get(); 178 HashSet<RenderBlock*>* containerSet = it->value.get();
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after
1043 if (child == m_children.lastChild()) 1049 if (child == m_children.lastChild())
1044 m_children.setLastChild(child->previousSibling()); 1050 m_children.setLastChild(child->previousSibling());
1045 1051
1046 if (child->previousSibling()) 1052 if (child->previousSibling())
1047 child->previousSibling()->setNextSibling(child->nextSibling()); 1053 child->previousSibling()->setNextSibling(child->nextSibling());
1048 if (child->nextSibling()) 1054 if (child->nextSibling())
1049 child->nextSibling()->setPreviousSibling(child->previousSibling()); 1055 child->nextSibling()->setPreviousSibling(child->previousSibling());
1050 } 1056 }
1051 1057
1052 child->children()->setFirstChild(0); 1058 child->children()->setFirstChild(0);
1053 child->m_next = 0; 1059 child->m_next = nullptr;
1054 1060
1055 // Remove all the information in the flow thread associated with the leftove r anonymous block. 1061 // Remove all the information in the flow thread associated with the leftove r anonymous block.
1056 child->removeFromRenderFlowThread(); 1062 child->removeFromRenderFlowThread();
1057 1063
1058 // RenderGrid keeps track of its children, we must notify it about changes i n the tree. 1064 // RenderGrid keeps track of its children, we must notify it about changes i n the tree.
1059 if (child->parent()->isRenderGrid()) 1065 if (child->parent()->isRenderGrid())
1060 toRenderGrid(child->parent())->dirtyGrid(); 1066 toRenderGrid(child->parent())->dirtyGrid();
1061 1067
1062 child->setParent(0); 1068 child->setParent(0);
1063 child->setPreviousSibling(0); 1069 child->setPreviousSibling(0);
(...skipping 3777 matching lines...) Expand 10 before | Expand all | Expand 10 after
4841 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 4847 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4842 { 4848 {
4843 showRenderObject(); 4849 showRenderObject();
4844 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4850 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4845 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4851 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4846 } 4852 }
4847 4853
4848 #endif 4854 #endif
4849 4855
4850 } // namespace blink 4856 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698