[chromium] Remove dead and unnecessary code related to LayerChromium::cleanupResources

https://bugs.webkit.org/show_bug.cgi?id=77137

Reviewed by James Robinson.

No new test needed. Only removing dead code.

* platform/graphics/chromium/LayerChromium.cpp:
* platform/graphics/chromium/LayerChromium.h:
(WebCore::LayerChromium::layerTreeHost):
* platform/graphics/chromium/TiledLayerChromium.cpp:
(WebCore::TiledLayerChromium::setLayerTreeHost):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106052 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 0e55edd..e38aabe 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2012-01-26  Alok Priyadarshi  <alokp@chromium.org>
+
+        [chromium] Remove dead and unnecessary code related to LayerChromium::cleanupResources
+        https://bugs.webkit.org/show_bug.cgi?id=77137
+
+        Reviewed by James Robinson.
+
+        No new test needed. Only removing dead code.
+
+        * platform/graphics/chromium/LayerChromium.cpp:
+        * platform/graphics/chromium/LayerChromium.h:
+        (WebCore::LayerChromium::layerTreeHost):
+        * platform/graphics/chromium/TiledLayerChromium.cpp:
+        (WebCore::TiledLayerChromium::setLayerTreeHost):
+
 2012-01-26  Anders Carlsson  <andersca@apple.com>
 
         Move horizontal rubber-band checks to ScrollElasticityController::handleWheelEvent

diff --git a/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
index 4c63dfd..4a92751 100644 (file)
--- a/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
+++ b/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
@@ -94,19 +94,6 @@ void LayerChromium::cleanupResources()
 {
 }
 
-void LayerChromium::cleanupResourcesRecursive()
-{
-    for (size_t i = 0; i < children().size(); ++i)
-        children()[i]->cleanupResourcesRecursive();
-
-    if (maskLayer())
-        maskLayer()->cleanupResourcesRecursive();
-    if (replicaLayer())
-        replicaLayer()->cleanupResourcesRecursive();
-
-    cleanupResources();
-}
-
 void LayerChromium::setIsNonCompositedContent(bool isNonCompositedContent)
 {
     m_isNonCompositedContent = isNonCompositedContent;

diff --git a/Source/WebCore/platform/graphics/chromium/LayerChromium.h b/Source/WebCore/platform/graphics/chromium/LayerChromium.h
index c5f88f1..685de0c 100644 (file)
--- a/Source/WebCore/platform/graphics/chromium/LayerChromium.h
+++ b/Source/WebCore/platform/graphics/chromium/LayerChromium.h
@@ -196,7 +196,6 @@ public:
     virtual void contentChanged() { }
 
     CCLayerTreeHost* layerTreeHost() const { return m_layerTreeHost.get(); }
-    void cleanupResourcesRecursive();
 
 protected:
     LayerChromium();

diff --git a/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp
index 6385d68..f2e3122 100644 (file)
--- a/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp
+++ b/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp
@@ -178,9 +178,6 @@ void TiledLayerChromium::setLayerTreeHost(CCLayerTreeHost* host)
     if (host == layerTreeHost())
         return;
 
-    if (layerTreeHost())
-        cleanupResources();
-
     LayerChromium::setLayerTreeHost(host);
 
     if (!host)