Revert of Oilpan: Move more code of RenderObject destructors to destroy().

Source/core/rendering/RenderBlock.cpp

Index: Source/core/rendering/RenderBlock.cpp
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
index fb4dd16de83b758328d9a3be7075a17a4c9e7fa3..7a4db09eda33c4fdc5d87bc6e6582270b9c086ae 100644
--- a/Source/core/rendering/RenderBlock.cpp
+++ b/Source/core/rendering/RenderBlock.cpp
@@ -216,7 +216,7 @@
         appendImageIfNotNull(images, blockStyle.shapeOutside()->image());
 }
 
-void RenderBlock::removeFromGlobalMaps()
+RenderBlock::~RenderBlock()
 {
     if (hasColumns())
         gColumnInfoMap->take(this);
@@ -224,22 +224,6 @@
         removeBlockFromDescendantAndContainerMaps(this, gPercentHeightDescendantsMap, gPercentHeightContainerMap);
     if (gPositionedDescendantsMap)
         removeBlockFromDescendantAndContainerMaps(this, gPositionedDescendantsMap, gPositionedContainerMap);
-}
-
-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()