[WK2] Revert patch / set a limit of layer count and atlas size.

[Title] [WK2] Revert patch / set a limit of layer count and atlas size.
[Issue #] NA
[Problem] flickering in webapp game.
[Cause] repeat creating and destroying new layers.
[Solution] new patch will be merged.
[Developer] jungjik.lee

diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
index 2d5384a..d49ecb8 100644 (file)
--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
@@ -1470,7 +1470,6 @@ bool RenderLayerCompositor::requiresCompositingLayer(const RenderLayer* layer) c
         layer = toRenderBoxModelObject(renderer)->layer();
     }
 
-
     // The root layer always has a compositing layer, but it may not have backing.
     return requiresCompositingForTransform(renderer)
         || requiresCompositingForVideo(renderer)
@@ -1490,11 +1489,6 @@ bool RenderLayerCompositor::requiresCompositingLayer(const RenderLayer* layer) c
 
 bool RenderLayerCompositor::canBeComposited(const RenderLayer* layer) const
 {
-#if ENABLE(TIZEN_WEBKIT2_TILED_AC)
-    if (m_compositedLayerCount > 40)
-        return false;
-#endif
-
     // FIXME: We disable accelerated compositing for elements in a RenderFlowThread as it doesn't work properly.
     // See http://webkit.org/b/84900 to re-enable it.
     return m_hasAcceleratedCompositing && layer->isSelfPaintingLayer() && !layer->renderer()->inRenderFlowThread();

diff --git a/Source/WebKit2/WebProcess/WebPage/efl/LayerTreeHostEfl.cpp b/Source/WebKit2/WebProcess/WebPage/efl/LayerTreeHostEfl.cpp
index 6b372ba..d7bccdd 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/efl/LayerTreeHostEfl.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/efl/LayerTreeHostEfl.cpp
@@ -632,10 +632,6 @@ PassOwnPtr<WebCore::GraphicsContext> LayerTreeHostEfl::beginContentUpdate(const
         }
     }
 
-    // Allow upto 4 atlases (= 64MB)
-    if (m_updateAtlases.size() >= 4)
-        return PassOwnPtr<WebCore::GraphicsContext>();
-
     static const int ScratchBufferDimension = 2000;
     m_updateAtlases.append(UpdateAtlas(ScratchBufferDimension, flags));
     return m_updateAtlases.last().beginPaintingOnAvailableBuffer(handle, size, offset);