Changeset 145670 in webkit


Ignore:
Timestamp:
Mar 12, 2013 6:51:16 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Coordinated Graphics: Remove CoordinatedGraphicsLayer::setRootLayer().
​https://bugs.webkit.org/show_bug.cgi?id=111835

Patch by Huang Dongsung <​luxtella@company100.net> on 2013-03-12
Reviewed by Luiz Agostini.

Source/WebCore:

This patch removes CoordinatedGraphicsLayer::setRootLayer() because
CoordinatedGraphicsScene already knows which layer is root.

No new tests, no behavior change.

  • platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
  • platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:

(CoordinatedGraphicsLayer):

  • platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp:

(WebCore::CoordinatedGraphicsScene::setLayerState):

  • platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h:

(WebCore::CoordinatedGraphicsLayerState::CoordinatedGraphicsLayerState):

Source/WebKit2:

Amend CoordinatedLayerTreeHost because
CoordinatedGraphicsLayer::setRootLayer() is removed.

  • WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:

(WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):

Location:
trunk/Source
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r145669 r145670  
     12013-03-12  Huang Dongsung  <luxtella@company100.net>
     2
     3        Coordinated Graphics: Remove CoordinatedGraphicsLayer::setRootLayer().
     4        https://bugs.webkit.org/show_bug.cgi?id=111835
     5
     6        Reviewed by Luiz Agostini.
     7
     8        This patch removes CoordinatedGraphicsLayer::setRootLayer() because
     9        CoordinatedGraphicsScene already knows which layer is root.
     10
     11        No new tests, no behavior change.
     12
     13        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
     14        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
     15        (CoordinatedGraphicsLayer):
     16        * platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp:
     17        (WebCore::CoordinatedGraphicsScene::setLayerState):
     18        * platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h:
     19        (WebCore::CoordinatedGraphicsLayerState::CoordinatedGraphicsLayerState):
     20
    1212013-03-12  Jun Jiang  <jun.a.jiang@intel.com>
    222

  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp

    r145207 r145670  
    800800}
    801801
    802 void CoordinatedGraphicsLayer::setRootLayer(bool isRoot)
    803 {
    804     m_layerState.isRootLayer = isRoot;
    805     m_layerState.flagsChanged = true;
    806     didChangeLayerState();
    807 }
    808 
    809802void CoordinatedGraphicsLayer::setVisibleContentRectTrajectoryVector(const FloatPoint& trajectoryVector)
    810803{

  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h

    r144907 r145670  
    115115    void setVisibleContentRectTrajectoryVector(const FloatPoint&);
    116116
    117     void setRootLayer(bool);
    118 
    119117    void setScrollableArea(ScrollableArea*);
    120118    bool isScrollable() const { return !!m_scrollableArea; }

  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp

    r145207 r145670  
    353353
    354354        // Never clip the root layer.
    355         layer->setMasksToBounds(layerState.isRootLayer ? false : layerState.masksToBounds);
     355        layer->setMasksToBounds(id == m_rootLayerID ? false : layerState.masksToBounds);
    356356        layer->setPreserves3D(layerState.preserves3D);
    357357

  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h

    r145207 r145670  
    104104            bool masksToBounds : 1;
    105105            bool preserves3D : 1;
    106             bool isRootLayer: 1;
    107106            bool fixedToViewport : 1;
    108107            bool showDebugBorders : 1;
    … …  
    121120        , masksToBounds(false)
    122121        , preserves3D(false)
    123         , isRootLayer(false)
    124122        , fixedToViewport(false)
    125123        , showDebugBorders(false)

  • trunk/Source/WebKit2/ChangeLog

    r145644 r145670  
     12013-03-12  Huang Dongsung  <luxtella@company100.net>
     2
     3        Coordinated Graphics: Remove CoordinatedGraphicsLayer::setRootLayer().
     4        https://bugs.webkit.org/show_bug.cgi?id=111835
     5
     6        Reviewed by Luiz Agostini.
     7
     8        Amend CoordinatedLayerTreeHost because
     9        CoordinatedGraphicsLayer::setRootLayer() is removed.
     10
     11        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
     12        (WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
     13
    1142013-03-12  Dean Jackson  <dino@apple.com>
    215

  • trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp

    r145230 r145670  
    100100    m_rootLayer = GraphicsLayer::create(this, this);
    101101    CoordinatedGraphicsLayer* coordinatedRootLayer = toCoordinatedGraphicsLayer(m_rootLayer.get());
    102     coordinatedRootLayer->setRootLayer(true);
    103102#ifndef NDEBUG
    104103    m_rootLayer->setName("CoordinatedLayerTreeHost root layer");
Note: See TracChangeset for help on using the changeset viewer.