Changeset 112548 in webkit


Ignore:
Timestamp:
Mar 29, 2012 11:14:01 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[chromium] Remove unneeded code+fixmes from CCOcclusionTracker
​https://bugs.webkit.org/show_bug.cgi?id=82380

Patch by Dana Jansens <​danakj@chromium.org> on 2012-03-29
Reviewed by Adrienne Walker.

Source/WebCore:

The current occlusion was exposed on the occlusion tracker for the
transition over to culling 2.0 which has landed, so we can remove
it now. It still had one use in unit tests which is moved to a
test subclass.

Above test subclass already existed in the occlusion tracker tests,
so pulled it out to a common file CCOcclusionTrackerTestCommon.h
so that other unit tests can use it to get at occlusion internals.

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

(WebCore):

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

Source/WebKit/chromium:

  • WebKit.gypi:
  • tests/CCLayerTreeHostTest.cpp:

(WTF::TestLayerChromium::paintContentsIfDirty):

  • tests/CCOcclusionTrackerTest.cpp:

(WebKitTests::TestCCOcclusionTrackerWithScissor::TestCCOcclusionTrackerWithScissor):
(WebKitTests::CCOcclusionTrackerTestIdentityTransforms::runMyTest):
(WebKitTests::CCOcclusionTrackerTestRotatedChild::runMyTest):
(WebKitTests::CCOcclusionTrackerTestTranslatedChild::runMyTest):
(WebKitTests::CCOcclusionTrackerTestChildInRotatedChild::runMyTest):
(WebKitTests::CCOcclusionTrackerTestVisitTargetTwoTimes::runMyTest):
(WebKitTests::CCOcclusionTrackerTestSurfaceRotatedOffAxis::runMyTest):
(WebKitTests::CCOcclusionTrackerTestSurfaceWithTwoOpaqueChildren::runMyTest):
(WebKitTests::CCOcclusionTrackerTestOverlappingSurfaceSiblings::runMyTest):
(WebKitTests::CCOcclusionTrackerTestOverlappingSurfaceSiblingsWithTwoTransforms::runMyTest):
(WebKitTests::CCOcclusionTrackerTestFilters::runMyTest):
(WebKitTests::CCOcclusionTrackerTestLayerScissorRectOutsideChild::runMyTest):
(WebKitTests::CCOcclusionTrackerTestScreenScissorRectOutsideChild::runMyTest):
(WebKitTests::CCOcclusionTrackerTestLayerScissorRectOverChild::runMyTest):
(WebKitTests::CCOcclusionTrackerTestScreenScissorRectOverChild::runMyTest):
(WebKitTests::CCOcclusionTrackerTestLayerScissorRectPartlyOverChild::runMyTest):
(WebKitTests::CCOcclusionTrackerTestScreenScissorRectPartlyOverChild::runMyTest):
(WebKitTests::CCOcclusionTrackerTestLayerScissorRectOverNothing::runMyTest):
(WebKitTests::CCOcclusionTrackerTestScreenScissorRectOverNothing::runMyTest):
(WebKitTests::CCOcclusionTrackerTestLayerScissorRectForLayerOffOrigin::runMyTest):
(WebKitTests::CCOcclusionTrackerTestOpaqueContentsRegionEmpty::runMyTest):
(WebKitTests::CCOcclusionTrackerTestOpaqueContentsRegionNonEmpty::runMyTest):
(WebKitTests::CCOcclusionTrackerTest3dTransform::runMyTest):
(WebKitTests::CCOcclusionTrackerTestPerspectiveTransform::runMyTest):
(WebKitTests::CCOcclusionTrackerTestPerspectiveTransformBehindCamera::runMyTest):
(WebKitTests::CCOcclusionTrackerTestAnimationOpacity1OnMainThread::runMyTest):
(WebKitTests::CCOcclusionTrackerTestAnimationOpacity0OnMainThread::runMyTest):
(WebKitTests::CCOcclusionTrackerTestAnimationTranslateOnMainThread::runMyTest):
(WebKitTests::CCOcclusionTrackerTestSurfaceOcclusionTranslatesToParent::runMyTest):

  • tests/CCOcclusionTrackerTestCommon.h: Added.

(WebKitTests):
(TestCCOcclusionTrackerBase):
(WebKitTests::TestCCOcclusionTrackerBase::TestCCOcclusionTrackerBase):
(WebKitTests::TestCCOcclusionTrackerBase::occlusionInScreenSpace):
(WebKitTests::TestCCOcclusionTrackerBase::occlusionInTargetSurface):
(WebKitTests::TestCCOcclusionTrackerBase::setOcclusionInScreenSpace):
(WebKitTests::TestCCOcclusionTrackerBase::setOcclusionInTargetSurface):

Location:
trunk/Source
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r112547 r112548  
     12012-03-29  Dana Jansens  <danakj@chromium.org>
     2
     3        [chromium] Remove unneeded code+fixmes from CCOcclusionTracker
     4        https://bugs.webkit.org/show_bug.cgi?id=82380
     5
     6        Reviewed by Adrienne Walker.
     7
     8        The current occlusion was exposed on the occlusion tracker for the
     9        transition over to culling 2.0 which has landed, so we can remove
     10        it now. It still had one use in unit tests which is moved to a
     11        test subclass.
     12
     13        Above test subclass already existed in the occlusion tracker tests,
     14        so pulled it out to a common file CCOcclusionTrackerTestCommon.h
     15        so that other unit tests can use it to get at occlusion internals.
     16
     17        * platform/graphics/chromium/cc/CCOcclusionTracker.cpp:
     18        (WebCore):
     19        * platform/graphics/chromium/cc/CCOcclusionTracker.h:
     20
    1212012-03-29  Joseph Pecoraro  <pecoraro@apple.com>
    222

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

    r112436 r112548  
    346346}
    347347
    348 template<typename LayerType, typename RenderSurfaceType>
    349 const Region& CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::currentOcclusionInScreenSpace() const
    350 {
    351     ASSERT(!m_stack.isEmpty());
    352     return m_stack.last().occlusionInScreen;
    353 }
    354 
    355 template<typename LayerType, typename RenderSurfaceType>
    356 const Region& CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::currentOcclusionInTargetSurface() const
    357 {
    358     ASSERT(!m_stack.isEmpty());
    359     return m_stack.last().occlusionInTarget;
    360 }
    361 
    362 
    363348// Declare the possible functions here for the linker.
    364349template CCOcclusionTrackerBase<LayerChromium, RenderSurfaceChromium>::CCOcclusionTrackerBase(IntRect scissorRectInScreenSpace, bool recordMetricsForFrame);
    … …  
    369354template bool CCOcclusionTrackerBase<LayerChromium, RenderSurfaceChromium>::occluded(const LayerChromium*, const IntRect& contentRect) const;
    370355template IntRect CCOcclusionTrackerBase<LayerChromium, RenderSurfaceChromium>::unoccludedContentRect(const LayerChromium*, const IntRect& contentRect) const;
    371 template const Region& CCOcclusionTrackerBase<LayerChromium, RenderSurfaceChromium>::currentOcclusionInScreenSpace() const;
    372 template const Region& CCOcclusionTrackerBase<LayerChromium, RenderSurfaceChromium>::currentOcclusionInTargetSurface() const;
    373356template IntRect CCOcclusionTrackerBase<LayerChromium, RenderSurfaceChromium>::layerScissorRectInTargetSurface(const LayerChromium*) const;
    374357
    … …  
    380363template bool CCOcclusionTrackerBase<CCLayerImpl, CCRenderSurface>::occluded(const CCLayerImpl*, const IntRect& contentRect) const;
    381364template IntRect CCOcclusionTrackerBase<CCLayerImpl, CCRenderSurface>::unoccludedContentRect(const CCLayerImpl*, const IntRect& contentRect) const;
    382 template const Region& CCOcclusionTrackerBase<CCLayerImpl, CCRenderSurface>::currentOcclusionInScreenSpace() const;
    383 template const Region& CCOcclusionTrackerBase<CCLayerImpl, CCRenderSurface>::currentOcclusionInTargetSurface() const;
    384365template IntRect CCOcclusionTrackerBase<CCLayerImpl, CCRenderSurface>::layerScissorRectInTargetSurface(const CCLayerImpl*) const;
    385366

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

    r111441 r112548  
    7474    void setUsePaintTracking(bool use) { m_usePaintTracking = use; }
    7575
    76     // FIXME: Remove these in future, they are to make CLs for transitioning to this easier.
    77     const Region& currentOcclusionInScreenSpace() const;
    78     const Region& currentOcclusionInTargetSurface() const;
    79 
    8076protected:
    8177    struct StackObject {

  • trunk/Source/WebKit/chromium/ChangeLog

    r112542 r112548  
     12012-03-29  Dana Jansens  <danakj@chromium.org>
     2
     3        [chromium] Remove unneeded code+fixmes from CCOcclusionTracker
     4        https://bugs.webkit.org/show_bug.cgi?id=82380
     5
     6        Reviewed by Adrienne Walker.
     7
     8        * WebKit.gypi:
     9        * tests/CCLayerTreeHostTest.cpp:
     10        (WTF::TestLayerChromium::paintContentsIfDirty):
     11        * tests/CCOcclusionTrackerTest.cpp:
     12        (WebKitTests::TestCCOcclusionTrackerWithScissor::TestCCOcclusionTrackerWithScissor):
     13        (WebKitTests::CCOcclusionTrackerTestIdentityTransforms::runMyTest):
     14        (WebKitTests::CCOcclusionTrackerTestRotatedChild::runMyTest):
     15        (WebKitTests::CCOcclusionTrackerTestTranslatedChild::runMyTest):
     16        (WebKitTests::CCOcclusionTrackerTestChildInRotatedChild::runMyTest):
     17        (WebKitTests::CCOcclusionTrackerTestVisitTargetTwoTimes::runMyTest):
     18        (WebKitTests::CCOcclusionTrackerTestSurfaceRotatedOffAxis::runMyTest):
     19        (WebKitTests::CCOcclusionTrackerTestSurfaceWithTwoOpaqueChildren::runMyTest):
     20        (WebKitTests::CCOcclusionTrackerTestOverlappingSurfaceSiblings::runMyTest):
     21        (WebKitTests::CCOcclusionTrackerTestOverlappingSurfaceSiblingsWithTwoTransforms::runMyTest):
     22        (WebKitTests::CCOcclusionTrackerTestFilters::runMyTest):
     23        (WebKitTests::CCOcclusionTrackerTestLayerScissorRectOutsideChild::runMyTest):
     24        (WebKitTests::CCOcclusionTrackerTestScreenScissorRectOutsideChild::runMyTest):
     25        (WebKitTests::CCOcclusionTrackerTestLayerScissorRectOverChild::runMyTest):
     26        (WebKitTests::CCOcclusionTrackerTestScreenScissorRectOverChild::runMyTest):
     27        (WebKitTests::CCOcclusionTrackerTestLayerScissorRectPartlyOverChild::runMyTest):
     28        (WebKitTests::CCOcclusionTrackerTestScreenScissorRectPartlyOverChild::runMyTest):
     29        (WebKitTests::CCOcclusionTrackerTestLayerScissorRectOverNothing::runMyTest):
     30        (WebKitTests::CCOcclusionTrackerTestScreenScissorRectOverNothing::runMyTest):
     31        (WebKitTests::CCOcclusionTrackerTestLayerScissorRectForLayerOffOrigin::runMyTest):
     32        (WebKitTests::CCOcclusionTrackerTestOpaqueContentsRegionEmpty::runMyTest):
     33        (WebKitTests::CCOcclusionTrackerTestOpaqueContentsRegionNonEmpty::runMyTest):
     34        (WebKitTests::CCOcclusionTrackerTest3dTransform::runMyTest):
     35        (WebKitTests::CCOcclusionTrackerTestPerspectiveTransform::runMyTest):
     36        (WebKitTests::CCOcclusionTrackerTestPerspectiveTransformBehindCamera::runMyTest):
     37        (WebKitTests::CCOcclusionTrackerTestAnimationOpacity1OnMainThread::runMyTest):
     38        (WebKitTests::CCOcclusionTrackerTestAnimationOpacity0OnMainThread::runMyTest):
     39        (WebKitTests::CCOcclusionTrackerTestAnimationTranslateOnMainThread::runMyTest):
     40        (WebKitTests::CCOcclusionTrackerTestSurfaceOcclusionTranslatesToParent::runMyTest):
     41        * tests/CCOcclusionTrackerTestCommon.h: Added.
     42        (WebKitTests):
     43        (TestCCOcclusionTrackerBase):
     44        (WebKitTests::TestCCOcclusionTrackerBase::TestCCOcclusionTrackerBase):
     45        (WebKitTests::TestCCOcclusionTrackerBase::occlusionInScreenSpace):
     46        (WebKitTests::TestCCOcclusionTrackerBase::occlusionInTargetSurface):
     47        (WebKitTests::TestCCOcclusionTrackerBase::setOcclusionInScreenSpace):
     48        (WebKitTests::TestCCOcclusionTrackerBase::setOcclusionInTargetSurface):
     49
    1502012-03-29  Dirk Schulze  <krit@webkit.org>
    251

  • trunk/Source/WebKit/chromium/WebKit.gypi

    r112286 r112548  
    8080            'tests/CCLayerTreeTestCommon.h',
    8181            'tests/CCOcclusionTrackerTest.cpp',
     82            'tests/CCOcclusionTrackerTestCommon.h',
    8283            'tests/CCQuadCullerTest.cpp',
    8384            'tests/CCRenderSurfaceTest.cpp',

  • trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp

    r112356 r112548  
    2828
    2929#include "CCAnimationTestCommon.h"
     30#include "CCOcclusionTrackerTestCommon.h"
    3031#include "CompositorFakeWebGraphicsContext3D.h"
    3132#include "ContentLayerChromium.h"
    … …  
    17571758    virtual void paintContentsIfDirty(const CCOcclusionTracker* occlusion)
    17581759    {
    1759         m_occludedScreenSpace = occlusion ? occlusion->currentOcclusionInScreenSpace() : Region();
     1760        // Gain access to internals of the CCOcclusionTracker.
     1761        const TestCCOcclusionTracker* testOcclusion = static_cast<const TestCCOcclusionTracker*>(occlusion);
     1762        m_occludedScreenSpace = testOcclusion ? testOcclusion->occlusionInScreenSpace() : Region();
    17601763    }
    17611764

  • trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp

    r112327 r112548  
    2828
    2929#include "CCAnimationTestCommon.h"
     30#include "CCOcclusionTrackerTestCommon.h"
    3031#include "FilterOperations.h"
    3132#include "LayerChromium.h"
    … …  
    7475};
    7576
    76 // A subclass to expose the total current occlusion.
    7777template<typename LayerType, typename RenderSurfaceType>
    78 class TestCCOcclusionTrackerBase : public CCOcclusionTrackerBase<LayerType, RenderSurfaceType> {
     78class TestCCOcclusionTrackerWithScissor : public TestCCOcclusionTrackerBase<LayerType, RenderSurfaceType> {
    7979public:
    80     TestCCOcclusionTrackerBase(IntRect screenScissorRect, bool recordMetricsForFrame = false)
    81         : CCOcclusionTrackerBase<LayerType, RenderSurfaceType>(screenScissorRect, recordMetricsForFrame)
     80    TestCCOcclusionTrackerWithScissor(IntRect screenScissorRect, bool recordMetricsForFrame = false)
     81        : TestCCOcclusionTrackerBase<LayerType, RenderSurfaceType>(screenScissorRect, recordMetricsForFrame)
    8282        , m_overrideLayerScissorRect(false)
    8383    {
    8484    }
    85 
    86     Region occlusionInScreenSpace() const { return CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInScreen; }
    87     Region occlusionInTargetSurface() const { return CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInTarget; }
    88 
    89     void setOcclusionInScreenSpace(const Region& region) { CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInScreen = region; }
    90     void setOcclusionInTargetSurface(const Region& region) { CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInTarget = region; }
    9185
    9286    void setLayerScissorRect(const IntRect& rect) { m_overrideLayerScissorRect = true; m_layerScissorRect = rect;}
    … …  
    316310        this->calcDrawEtc(parent);
    317311
    318         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     312        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    319313        occlusion.setLayerScissorRect(IntRect(0, 0, 1000, 1000));
    320314
    … …  
    368362        this->calcDrawEtc(parent);
    369363
    370         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     364        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    371365        occlusion.setLayerScissorRect(IntRect(0, 0, 1000, 1000));
    372366
    … …  
    418412        this->calcDrawEtc(parent);
    419413
    420         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     414        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    421415        occlusion.setLayerScissorRect(IntRect(0, 0, 1000, 1000));
    422416
    … …  
    484478        this->calcDrawEtc(parent);
    485479
    486         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     480        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    487481        occlusion.setLayerScissorRect(IntRect(0, 0, 1000, 1000));
    488482
    … …  
    581575        this->calcDrawEtc(parent);
    582576
    583         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     577        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    584578        occlusion.setLayerScissorRect(IntRect(-10, -10, 1000, 1000));
    585579
    … …  
    728722        this->calcDrawEtc(parent);
    729723
    730         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     724        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    731725        occlusion.setLayerScissorRect(IntRect(0, 0, 1000, 1000));
    732726
    … …  
    793787        this->calcDrawEtc(parent);
    794788
    795         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     789        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    796790        occlusion.setLayerScissorRect(IntRect(0, 0, 1000, 1000));
    797791
    … …  
    882876        this->calcDrawEtc(parent);
    883877
    884         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     878        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    885879        occlusion.setLayerScissorRect(IntRect(-20, -20, 1000, 1000));
    886880
    … …  
    993987        this->calcDrawEtc(parent);
    994988
    995         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     989        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    996990        occlusion.setLayerScissorRect(IntRect(-30, -30, 1000, 1000));
    997991
    … …  
    10991093        this->calcDrawEtc(parent);
    11001094
    1101         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1095        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    11021096        occlusion.setLayerScissorRect(IntRect(0, 0, 1000, 1000));
    11031097
    … …  
    11631157        this->calcDrawEtc(parent);
    11641158
    1165         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1159        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    11661160        occlusion.setLayerScissorRect(IntRect(200, 100, 100, 100));
    11671161
    … …  
    12061200        this->calcDrawEtc(parent);
    12071201
    1208         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(200, 100, 100, 100));
     1202        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(200, 100, 100, 100));
    12091203        occlusion.setLayerScissorRect(IntRect(0, 0, 1000, 1000));
    12101204
    … …  
    12491243        this->calcDrawEtc(parent);
    12501244
    1251         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1245        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    12521246        occlusion.setLayerScissorRect(IntRect(100, 100, 100, 100));
    12531247
    … …  
    12871281        this->calcDrawEtc(parent);
    12881282
    1289         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(100, 100, 100, 100));
     1283        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(100, 100, 100, 100));
    12901284        occlusion.setLayerScissorRect(IntRect(0, 0, 1000, 1000));
    12911285
    … …  
    13251319        this->calcDrawEtc(parent);
    13261320
    1327         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1321        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    13281322        occlusion.setLayerScissorRect(IntRect(50, 50, 200, 200));
    13291323
    … …  
    13671361        this->calcDrawEtc(parent);
    13681362
    1369         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(50, 50, 200, 200));
     1363        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(50, 50, 200, 200));
    13701364        occlusion.setLayerScissorRect(IntRect(0, 0, 1000, 1000));
    13711365
    … …  
    14091403        this->calcDrawEtc(parent);
    14101404
    1411         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1405        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    14121406        occlusion.setLayerScissorRect(IntRect(500, 500, 100, 100));
    14131407
    … …  
    14511445        this->calcDrawEtc(parent);
    14521446
    1453         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(500, 500, 100, 100));
     1447        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(500, 500, 100, 100));
    14541448        occlusion.setLayerScissorRect(IntRect(0, 0, 1000, 1000));
    14551449
    … …  
    14931487        this->calcDrawEtc(parent);
    14941488
    1495         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1489        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    14961490        occlusion.enterTargetRenderSurface(layer->renderSurface());
    14971491
    … …  
    15171511        this->calcDrawEtc(parent);
    15181512
    1519         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1513        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    15201514        occlusion.enterTargetRenderSurface(layer->renderSurface());
    15211515
    … …  
    15531547
    15541548        {
    1555             TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1549            TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    15561550            layer->setOpaqueContentsRect(IntRect(0, 0, 100, 100));
    15571551
    … …  
    15681562
    15691563        {
    1570             TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1564            TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    15711565            layer->setOpaqueContentsRect(IntRect(20, 20, 180, 180));
    15721566
    … …  
    15831577
    15841578        {
    1585             TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1579            TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    15861580            layer->setOpaqueContentsRect(IntRect(150, 150, 100, 100));
    15871581
    … …  
    16141608        this->calcDrawEtc(parent);
    16151609
    1616         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1610        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    16171611        occlusion.enterTargetRenderSurface(parent->renderSurface());
    16181612
    … …  
    16401634        this->calcDrawEtc(parent);
    16411635
    1642         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1636        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    16431637        occlusion.enterTargetRenderSurface(parent->renderSurface());
    16441638
    … …  
    16691663        this->calcDrawEtc(parent);
    16701664
    1671         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1665        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    16721666        occlusion.enterTargetRenderSurface(parent->renderSurface());
    16731667
    … …  
    16991693        EXPECT_TRUE(surface->renderSurface()->drawOpacityIsAnimating());
    17001694
    1701         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1695        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    17021696
    17031697        occlusion.enterTargetRenderSurface(surface->renderSurface());
    … …  
    17401734        EXPECT_TRUE(surface->renderSurface()->drawOpacityIsAnimating());
    17411735
    1742         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1736        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    17431737
    17441738        occlusion.enterTargetRenderSurface(surface->renderSurface());
    … …  
    17891783        EXPECT_TRUE(surfaceChild->screenSpaceTransformIsAnimating());
    17901784
    1791         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1785        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    17921786
    17931787        occlusion.enterTargetRenderSurface(surface2->renderSurface());
    … …  
    18651859        this->calcDrawEtc(parent);
    18661860
    1867         TestCCOcclusionTrackerBase<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
     1861        TestCCOcclusionTrackerWithScissor<typename Types::LayerType, typename Types::RenderSurfaceType> occlusion(IntRect(0, 0, 1000, 1000));
    18681862
    18691863        occlusion.enterTargetRenderSurface(surface2->renderSurface());
Note: See TracChangeset for help on using the changeset viewer.