Changeset 125788 in webkit


Ignore:
Timestamp:
Aug 16, 2012, 10:16:06 AM (13 years ago)
Author:
jamesr@google.com
Message:

[chromium] Remove alwaysReserveTextures code - it doesn't do anything
​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:
Location:
trunk/Source
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/Platform/ChangeLog

    r125580 r125788  
     12012-08-16  James Robinson  <jamesr@chromium.org>
     2
     3        [chromium] Remove alwaysReserveTextures code - it doesn't do anything
     4        https://bugs.webkit.org/show_bug.cgi?id=94183
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        Remove deprecated setAlwaysReserveTextures() call from WebLayer.
     9
     10        * chromium/public/WebLayer.h:
     11        (WebLayer):
     12
    1132012-08-14  Gregg Tavares  <gman@google.com>
    214

  • trunk/Source/Platform/chromium/public/WebLayer.h

    r125469 r125788  
    175175    WEBKIT_EXPORT void transferAnimationsTo(WebLayer*);
    176176
    177     // DEPRECATED.
    178     // This requests that this layer's compositor-managed textures always be reserved
    179     // when determining texture limits.
    180     WEBKIT_EXPORT void setAlwaysReserveTextures(bool);
    181 
    182177    // Forces this layer to use a render surface. There is no benefit in doing
    183178    // so, but this is to facilitate benchmarks and tests.

  • trunk/Source/WebCore/ChangeLog

    r125787 r125788  
     12012-08-16  James Robinson  <jamesr@chromium.org>
     2
     3        [chromium] Remove alwaysReserveTextures code - it doesn't do anything
     4        https://bugs.webkit.org/show_bug.cgi?id=94183
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        LayerChromium::setAlwaysReservesTextures doesn't do anything and hasn't since the prioritized texture manager
     9        landed. This deletes the associated code.
     10
     11        * platform/graphics/chromium/LayerChromium.cpp:
     12        (WebCore::LayerChromium::LayerChromium):
     13        * platform/graphics/chromium/LayerChromium.h:
     14        (LayerChromium):
     15
    1162012-08-16  Adam Barth  <abarth@webkit.org>
    217

  • trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp

    r125088 r125788  
    8282    , m_preserves3D(false)
    8383    , m_useParentBackfaceVisibility(false)
    84     , m_alwaysReserveTextures(false)
    8584    , m_drawCheckerboardForMissingTiles(false)
    8685    , m_forceRenderSurface(false)

  • trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h

    r125196 r125788  
    268268    virtual void setTexturePriorities(const CCPriorityCalculator&) { }
    269269
    270     void setAlwaysReserveTextures(bool alwaysReserveTextures) { m_alwaysReserveTextures = alwaysReserveTextures; }
    271     bool alwaysReserveTextures() const { return m_alwaysReserveTextures; }
    272 
    273270    bool addAnimation(PassOwnPtr<CCActiveAnimation>);
    274271    void pauseAnimation(int animationId, double timeOffset);
    … …  
    374371    bool m_preserves3D;
    375372    bool m_useParentBackfaceVisibility;
    376     bool m_alwaysReserveTextures;
    377373    bool m_drawCheckerboardForMissingTiles;
    378374    bool m_forceRenderSurface;

  • trunk/Source/WebKit/chromium/ChangeLog

    r125780 r125788  
     12012-08-16  James Robinson  <jamesr@chromium.org>
     2
     3        [chromium] Remove alwaysReserveTextures code - it doesn't do anything
     4        https://bugs.webkit.org/show_bug.cgi?id=94183
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        Stops attempting to find the scrollbar layers and call setAlwaysReserveTextures() on them since the call doesn't
     9        do anything.
     10
     11        * src/NonCompositedContentHost.cpp:
     12        (WebKit::NonCompositedContentHost::setViewport):
     13        * src/WebLayer.cpp:
     14
    1152012-08-16  Peter Beverloo  <peter@chromium.org>
    216

  • trunk/Source/WebKit/chromium/src/NonCompositedContentHost.cpp

    r125088 r125788  
    8888}
    8989
    90 static void reserveScrollbarLayers(WebLayer layer, WebLayer clipLayer)
    91 {
    92     // Scrollbars and corners are known to be attached outside the root clip
    93     // rect, so skip the clipLayer subtree.
    94     if (layer == clipLayer)
    95         return;
    96 
    97     for (size_t i = 0; i < layer.numberOfChildren(); ++i)
    98         reserveScrollbarLayers(layer.childAt(i), clipLayer);
    99 
    100     if (layer.drawsContent())
    101         layer.setAlwaysReserveTextures(true);
    102 }
    103 
    10490void NonCompositedContentHost::setViewport(const WebCore::IntSize& viewportSize, const WebCore::IntSize& contentsSize, const WebCore::IntPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, float deviceScale)
    10591{
    … …  
    135121    } else if (visibleRectChanged)
    136122        m_graphicsLayer->setNeedsDisplay();
    137 
    138     WebLayer clipLayer = layer.parent();
    139     WebLayer rootLayer = clipLayer;
    140     while (!rootLayer.parent().isNull())
    141         rootLayer = rootLayer.parent();
    142     reserveScrollbarLayers(rootLayer, clipLayer);
    143123}
    144124

  • trunk/Source/WebKit/chromium/src/WebLayer.cpp

    r125469 r125788  
    376376}
    377377
    378 void WebLayer::setAlwaysReserveTextures(bool reserve)
    379 {
    380     m_private->setAlwaysReserveTextures(reserve);
    381 }
    382 
    383378void WebLayer::setForceRenderSurface(bool forceRenderSurface)
    384379{
Note: See TracChangeset for help on using the changeset viewer.