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

Unified Diff: Source/core/rendering/RenderBlock.cpp

Issue 869323003: Oilpan: move RenderObjects off heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: review-induced improvements Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderBlock.h ('k') | Source/core/rendering/RenderBlockFlow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlock.cpp
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
index ba9413e84b2bd82202614b5fe17c04509a9d98ed..e5402221ac9cd1966960a12f6e4cd4f402a833e0 100644
--- a/Source/core/rendering/RenderBlock.cpp
+++ b/Source/core/rendering/RenderBlock.cpp
@@ -158,12 +158,6 @@ RenderBlock::RenderBlock(ContainerNode* node)
// By default, subclasses do not have inline children.
}
-void RenderBlock::trace(Visitor* visitor)
-{
- visitor->trace(m_children);
- RenderBox::trace(visitor);
-}
-
static void removeBlockFromDescendantAndContainerMaps(RenderBlock* block, TrackedDescendantsMap*& descendantMap, TrackedContainerMap*& containerMap)
{
if (OwnPtr<TrackedRendererListHashSet> descendantSet = descendantMap->take(block)) {
@@ -226,18 +220,7 @@ void RenderBlock::removeFromGlobalMaps()
RenderBlock::~RenderBlock()
{
-#if !ENABLE(OILPAN)
removeFromGlobalMaps();
-#endif
-}
-
-void RenderBlock::destroy()
-{
- RenderBox::destroy();
-#if ENABLE(OILPAN)
- // RenderObject::removeChild called in destory() depends on gColumnInfoMap.
- removeFromGlobalMaps();
-#endif
}
void RenderBlock::willBeDestroyed()
« no previous file with comments | « Source/core/rendering/RenderBlock.h ('k') | Source/core/rendering/RenderBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698