[chromium] Remove alwaysReserveTextures code - it doesn't do anything
authorjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Aug 2012 17:16:06 +0000 (17:16 +0000)
committerjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Aug 2012 17:16:06 +0000 (17:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=94183

Reviewed by Dimitri Glazkov.

Source/Platform:

Remove deprecated setAlwaysReserveTextures() call from WebLayer.

* chromium/public/WebLayer.h:
(WebLayer):

Source/WebCore:

LayerChromium::setAlwaysReservesTextures doesn't do anything and hasn't since the prioritized texture manager
landed. This deletes the associated code.

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

Source/WebKit/chromium:

Stops attempting to find the scrollbar layers and call setAlwaysReserveTextures() on them since the call doesn't
do anything.

* src/NonCompositedContentHost.cpp:
(WebKit::NonCompositedContentHost::setViewport):
* src/WebLayer.cpp:

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

Source/Platform/ChangeLog
Source/Platform/chromium/public/WebLayer.h
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
Source/WebCore/platform/graphics/chromium/LayerChromium.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/NonCompositedContentHost.cpp
Source/WebKit/chromium/src/WebLayer.cpp

index 7ee676f..e376204 100644 (file)
@@ -1,3 +1,15 @@
+2012-08-16  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove alwaysReserveTextures code - it doesn't do anything
+        https://bugs.webkit.org/show_bug.cgi?id=94183
+
+        Reviewed by Dimitri Glazkov.
+
+        Remove deprecated setAlwaysReserveTextures() call from WebLayer.
+
+        * chromium/public/WebLayer.h:
+        (WebLayer):
+
 2012-08-14  Gregg Tavares  <gman@google.com>
 
         Plumb through EXT_debug_marker entry points
index fa96b5e..f1b9dd3 100644 (file)
@@ -174,11 +174,6 @@ public:
     // Transfers all animations running on the current layer.
     WEBKIT_EXPORT void transferAnimationsTo(WebLayer*);
 
-    // DEPRECATED.
-    // This requests that this layer's compositor-managed textures always be reserved
-    // when determining texture limits.
-    WEBKIT_EXPORT void setAlwaysReserveTextures(bool);
-
     // Forces this layer to use a render surface. There is no benefit in doing
     // so, but this is to facilitate benchmarks and tests.
     WEBKIT_EXPORT void setForceRenderSurface(bool);
index 92769c8..7b2d41d 100644 (file)
@@ -1,3 +1,18 @@
+2012-08-16  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove alwaysReserveTextures code - it doesn't do anything
+        https://bugs.webkit.org/show_bug.cgi?id=94183
+
+        Reviewed by Dimitri Glazkov.
+
+        LayerChromium::setAlwaysReservesTextures doesn't do anything and hasn't since the prioritized texture manager
+        landed. This deletes the associated code.
+
+        * platform/graphics/chromium/LayerChromium.cpp:
+        (WebCore::LayerChromium::LayerChromium):
+        * platform/graphics/chromium/LayerChromium.h:
+        (LayerChromium):
+
 2012-08-16  Adam Barth  <abarth@webkit.org>
 
         Unreviewed. Sort the xcodeproj file.
index 3b9c362..9b0e534 100644 (file)
@@ -81,7 +81,6 @@ LayerChromium::LayerChromium()
     , m_useLCDText(false)
     , m_preserves3D(false)
     , m_useParentBackfaceVisibility(false)
-    , m_alwaysReserveTextures(false)
     , m_drawCheckerboardForMissingTiles(false)
     , m_forceRenderSurface(false)
     , m_replicaLayer(0)
index 29e387e..54ab83a 100644 (file)
@@ -267,9 +267,6 @@ public:
     // Set the priority of all desired textures in this layer.
     virtual void setTexturePriorities(const CCPriorityCalculator&) { }
 
-    void setAlwaysReserveTextures(bool alwaysReserveTextures) { m_alwaysReserveTextures = alwaysReserveTextures; }
-    bool alwaysReserveTextures() const { return m_alwaysReserveTextures; }
-
     bool addAnimation(PassOwnPtr<CCActiveAnimation>);
     void pauseAnimation(int animationId, double timeOffset);
     void removeAnimation(int animationId);
@@ -373,7 +370,6 @@ private:
     bool m_useLCDText;
     bool m_preserves3D;
     bool m_useParentBackfaceVisibility;
-    bool m_alwaysReserveTextures;
     bool m_drawCheckerboardForMissingTiles;
     bool m_forceRenderSurface;
 
index f1b3793..556032e 100644 (file)
@@ -1,3 +1,17 @@
+2012-08-16  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove alwaysReserveTextures code - it doesn't do anything
+        https://bugs.webkit.org/show_bug.cgi?id=94183
+
+        Reviewed by Dimitri Glazkov.
+
+        Stops attempting to find the scrollbar layers and call setAlwaysReserveTextures() on them since the call doesn't
+        do anything.
+
+        * src/NonCompositedContentHost.cpp:
+        (WebKit::NonCompositedContentHost::setViewport):
+        * src/WebLayer.cpp:
+
 2012-08-16  Peter Beverloo  <peter@chromium.org>
 
         Unreviewed.  Rolled DEPS.
index fb9c12d..65dac62 100644 (file)
@@ -87,20 +87,6 @@ void NonCompositedContentHost::setScrollLayer(WebCore::GraphicsLayer* layer)
     ASSERT(haveScrollLayer());
 }
 
-static void reserveScrollbarLayers(WebLayer layer, WebLayer clipLayer)
-{
-    // Scrollbars and corners are known to be attached outside the root clip
-    // rect, so skip the clipLayer subtree.
-    if (layer == clipLayer)
-        return;
-
-    for (size_t i = 0; i < layer.numberOfChildren(); ++i)
-        reserveScrollbarLayers(layer.childAt(i), clipLayer);
-
-    if (layer.drawsContent())
-        layer.setAlwaysReserveTextures(true);
-}
-
 void NonCompositedContentHost::setViewport(const WebCore::IntSize& viewportSize, const WebCore::IntSize& contentsSize, const WebCore::IntPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, float deviceScale)
 {
     if (!haveScrollLayer())
@@ -134,12 +120,6 @@ void NonCompositedContentHost::setViewport(const WebCore::IntSize& viewportSize,
         m_graphicsLayer->setNeedsDisplay();
     } else if (visibleRectChanged)
         m_graphicsLayer->setNeedsDisplay();
-
-    WebLayer clipLayer = layer.parent();
-    WebLayer rootLayer = clipLayer;
-    while (!rootLayer.parent().isNull())
-        rootLayer = rootLayer.parent();
-    reserveScrollbarLayers(rootLayer, clipLayer);
 }
 
 bool NonCompositedContentHost::haveScrollLayer()
index 5d84b87..c555ae1 100644 (file)
@@ -375,11 +375,6 @@ void WebLayer::transferAnimationsTo(WebLayer* other)
         other->m_private->setLayerAnimationController(m_private->releaseLayerAnimationController());
 }
 
-void WebLayer::setAlwaysReserveTextures(bool reserve)
-{
-    m_private->setAlwaysReserveTextures(reserve);
-}
-
 void WebLayer::setForceRenderSurface(bool forceRenderSurface)
 {
     m_private->setForceRenderSurface(forceRenderSurface);