Changeset 95348 in webkit


Ignore:
Timestamp:
Sep 16, 2011 6:14:47 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

Re-named isRootLayer to isNonCompositedContent because
that is what the flag actually means.
​https://bugs.webkit.org/show_bug.cgi?id=68214

Patch by Shawn Singh <​shawnsingh@chromium.org> on 2011-09-16
Reviewed by James Robinson.

Code cleanup towards unit testing.

  • platform/graphics/chromium/LayerChromium.cpp:

(WebCore::LayerChromium::LayerChromium):
(WebCore::LayerChromium::pushPropertiesTo):

  • platform/graphics/chromium/LayerChromium.h:

(WebCore::LayerChromium::setIsNonCompositedContent):
(WebCore::LayerChromium::isNonCompositedContent):

  • platform/graphics/chromium/NonCompositedContentHost.cpp:

(WebCore::NonCompositedContentHost::NonCompositedContentHost):

  • platform/graphics/chromium/TiledLayerChromium.cpp:

(WebCore::TiledLayerChromium::setLayerTreeHost):

  • platform/graphics/chromium/cc/CCLayerImpl.cpp:

(WebCore::CCLayerImpl::CCLayerImpl):

  • platform/graphics/chromium/cc/CCLayerImpl.h:

(WebCore::CCLayerImpl::setIsNonCompositedContent):
(WebCore::CCLayerImpl::isNonCompositedContent):

  • platform/graphics/chromium/cc/CCTiledLayerImpl.cpp:

(WebCore::CCTiledLayerImpl::draw):

Location:
trunk/Source/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r95347 r95348  
     12011-09-16  Shawn Singh  <shawnsingh@chromium.org>
     2
     3        Re-named isRootLayer to isNonCompositedContent because
     4        that is what the flag actually means.
     5        https://bugs.webkit.org/show_bug.cgi?id=68214
     6
     7        Reviewed by James Robinson.
     8
     9        Code cleanup towards unit testing.
     10
     11        * platform/graphics/chromium/LayerChromium.cpp:
     12        (WebCore::LayerChromium::LayerChromium):
     13        (WebCore::LayerChromium::pushPropertiesTo):
     14        * platform/graphics/chromium/LayerChromium.h:
     15        (WebCore::LayerChromium::setIsNonCompositedContent):
     16        (WebCore::LayerChromium::isNonCompositedContent):
     17        * platform/graphics/chromium/NonCompositedContentHost.cpp:
     18        (WebCore::NonCompositedContentHost::NonCompositedContentHost):
     19        * platform/graphics/chromium/TiledLayerChromium.cpp:
     20        (WebCore::TiledLayerChromium::setLayerTreeHost):
     21        * platform/graphics/chromium/cc/CCLayerImpl.cpp:
     22        (WebCore::CCLayerImpl::CCLayerImpl):
     23        * platform/graphics/chromium/cc/CCLayerImpl.h:
     24        (WebCore::CCLayerImpl::setIsNonCompositedContent):
     25        (WebCore::CCLayerImpl::isNonCompositedContent):
     26        * platform/graphics/chromium/cc/CCTiledLayerImpl.cpp:
     27        (WebCore::CCTiledLayerImpl::draw):
     28
    1292011-09-16  Simon Fraser  <simon.fraser@apple.com>
    230

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

    r95341 r95348  
    7676    , m_doubleSided(true)
    7777    , m_usesLayerScissor(false)
    78     , m_isRootLayer(false)
     78    , m_isNonCompositedContent(false)
    7979    , m_replicaLayer(0)
    8080    , m_drawOpacity(0)
    … …  
    305305    layer->setDoubleSided(m_doubleSided);
    306306    layer->setDrawsContent(drawsContent());
    307     layer->setIsRootLayer(m_isRootLayer);
     307    layer->setIsNonCompositedContent(m_isNonCompositedContent);
    308308    layer->setMasksToBounds(m_masksToBounds);
    309309    layer->setName(m_name);

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

    r95344 r95348  
    158158    bool usesLayerScissor() const { return m_usesLayerScissor; }
    159159
    160     void setIsRootLayer(bool isRootLayer) { m_isRootLayer = isRootLayer; }
    161     bool isRootLayer() const { return m_isRootLayer; }
     160    void setIsNonCompositedContent(bool isNonCompositedContent) { m_isNonCompositedContent = isNonCompositedContent; }
     161    bool isNonCompositedContent() const { return m_isNonCompositedContent; }
    162162
    163163    virtual void setLayerTreeHost(CCLayerTreeHost*);
    … …  
    275275    bool m_doubleSided;
    276276    bool m_usesLayerScissor;
    277     bool m_isRootLayer;
     277    bool m_isNonCompositedContent;
    278278
    279279    TransformationMatrix m_transform;

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

    r95152 r95348  
    4343#endif
    4444    m_graphicsLayer->setDrawsContent(true);
    45     m_graphicsLayer->platformLayer()->setIsRootLayer(true);
     45    m_graphicsLayer->platformLayer()->setIsNonCompositedContent(true);
    4646}
    4747

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

    r95148 r95348  
    149149    m_tiler = CCLayerTilingData::create(
    150150        IntSize(defaultTileSize, defaultTileSize),
    151         isRootLayer() ? CCLayerTilingData::NoBorderTexels : CCLayerTilingData::HasBorderTexels);
     151        isNonCompositedContent() ? CCLayerTilingData::NoBorderTexels : CCLayerTilingData::HasBorderTexels);
    152152}
    153153

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.cpp

    r95341 r95348  
    4848    , m_preserves3D(false)
    4949    , m_usesLayerScissor(false)
    50     , m_isRootLayer(false)
     50    , m_isNonCompositedContent(false)
    5151    , m_drawsContent(false)
    5252    , m_targetRenderSurface(0)

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h

    r95135 r95348  
    105105    bool usesLayerScissor() const { return m_usesLayerScissor; }
    106106
    107     void setIsRootLayer(bool isRootLayer) { m_isRootLayer = isRootLayer; }
    108     bool isRootLayer() const { return m_isRootLayer; }
     107    void setIsNonCompositedContent(bool isNonCompositedContent) { m_isNonCompositedContent = isNonCompositedContent; }
     108    bool isNonCompositedContent() const { return m_isNonCompositedContent; }
    109109
    110110    void setSublayerTransform(const TransformationMatrix& sublayerTransform) { m_sublayerTransform = sublayerTransform; }
    … …  
    204204    TransformationMatrix m_transform;
    205205    bool m_usesLayerScissor;
    206     bool m_isRootLayer;
     206    bool m_isNonCompositedContent;
    207207
    208208    bool m_drawsContent;

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp

    r95341 r95348  
    121121
    122122    GraphicsContext3D* context = layerRenderer->context();
    123     if (isRootLayer()) {
     123    if (isNonCompositedContent()) {
    124124        context->colorMask(true, true, true, false);
    125125        GLC(context, context->disable(GraphicsContext3D::BLEND));
    … …  
    149149    }
    150150
    151     if (isRootLayer()) {
     151    if (isNonCompositedContent()) {
    152152        context->colorMask(true, true, true, true);
    153153        GLC(context, context->enable(GraphicsContext3D::BLEND));
Note: See TracChangeset for help on using the changeset viewer.