Changeset 112327 in webkit


Ignore:
Timestamp:
Mar 27, 2012 3:46:36 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[chromium] Rename opaqueContentsRegion() to visibleContentOpaqueRegion()
​https://bugs.webkit.org/show_bug.cgi?id=81689

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

Source/WebCore:

The return value from this function is a region of opaque pixels in the
layer's content space that intersect with its visible rect. Rather than
adding a comment to this effect, renaming the method to make it clear.

  • platform/graphics/chromium/LayerChromium.h:

(WebCore::LayerChromium::visibleContentOpaqueRegion):

  • platform/graphics/chromium/TiledLayerChromium.cpp:

(WebCore::TiledLayerChromium::visibleContentOpaqueRegion):

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

(WebCore::CCLayerImpl::visibleContentOpaqueRegion):

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

(WebCore::computeOcclusionBehindLayer):

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

(WebCore::CCTiledLayerImpl::visibleContentOpaqueRegion):

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

(CCTiledLayerImpl):

Source/WebKit/chromium:

  • tests/CCLayerTreeHostTest.cpp:

(WTF::TestLayerChromium::opaqueVisibleContents):

  • tests/CCOcclusionTrackerTest.cpp:

(WebCore::TestContentLayerChromium::opaqueVisibleContents):
(WebCore::TestContentLayerImpl::opaqueVisibleContents):

  • tests/TiledLayerChromiumTest.cpp:

(WTF::TEST):

Location:
trunk/Source
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r112325 r112327  
     12012-03-27  Dana Jansens  <danakj@chromium.org>
     2
     3        [chromium] Rename opaqueContentsRegion() to visibleContentOpaqueRegion()
     4        https://bugs.webkit.org/show_bug.cgi?id=81689
     5
     6        Reviewed by Adrienne Walker.
     7
     8        The return value from this function is a region of opaque pixels in the
     9        layer's content space that intersect with its visible rect. Rather than
     10        adding a comment to this effect, renaming the method to make it clear.
     11
     12        * platform/graphics/chromium/LayerChromium.h:
     13        (WebCore::LayerChromium::visibleContentOpaqueRegion):
     14        * platform/graphics/chromium/TiledLayerChromium.cpp:
     15        (WebCore::TiledLayerChromium::visibleContentOpaqueRegion):
     16        * platform/graphics/chromium/TiledLayerChromium.h:
     17        * platform/graphics/chromium/cc/CCLayerImpl.h:
     18        (WebCore::CCLayerImpl::visibleContentOpaqueRegion):
     19        * platform/graphics/chromium/cc/CCOcclusionTracker.cpp:
     20        (WebCore::computeOcclusionBehindLayer):
     21        * platform/graphics/chromium/cc/CCTiledLayerImpl.cpp:
     22        (WebCore::CCTiledLayerImpl::visibleContentOpaqueRegion):
     23        * platform/graphics/chromium/cc/CCTiledLayerImpl.h:
     24        (CCTiledLayerImpl):
     25
    1262012-03-27  James Robinson  <jamesr@chromium.org>
    227

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

    r111803 r112327  
    247247    void notifyAnimationStarted(const CCAnimationStartedEvent&, double wallClockTime);
    248248
    249     virtual Region opaqueContentsRegion() const { return Region(); };
     249    virtual Region visibleContentOpaqueRegion() const { return Region(); };
    250250
    251251    virtual ScrollbarLayerChromium* toScrollbarLayerChromium() { return 0; }

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

    r112049 r112327  
    579579}
    580580
    581 Region TiledLayerChromium::opaqueContentsRegion() const
     581Region TiledLayerChromium::visibleContentOpaqueRegion() const
    582582{
    583583    if (m_skipsDraw)

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

    r112049 r112327  
    6565    virtual void reserveTextures();
    6666
    67     virtual Region opaqueContentsRegion() const;
     67    virtual Region visibleContentOpaqueRegion() const;
    6868
    6969protected:

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

    r111700 r112327  
    232232    CCLayerAnimationController* layerAnimationController() { return m_layerAnimationController.get(); }
    233233
    234     virtual Region opaqueContentsRegion() const { return Region(); };
     234    virtual Region visibleContentOpaqueRegion() const { return Region(); };
    235235
    236236    // Indicates that the context previously used to render this layer

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

    r111502 r112327  
    207207        opaqueRegion = enclosedIntRect(unoccludedQuad.boundingBox());
    208208    else if (usePaintTracking && transform.isIdentity())
    209         opaqueRegion = layer->opaqueContentsRegion();
     209        opaqueRegion = layer->visibleContentOpaqueRegion();
    210210    else if (usePaintTracking) {
    211         Region contentRegion = layer->opaqueContentsRegion();
     211        Region contentRegion = layer->visibleContentOpaqueRegion();
    212212        Vector<IntRect> contentRects = contentRegion.rects();
    213213        for (size_t i = 0; i < contentRects.size(); ++i)

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

    r111978 r112327  
    224224}
    225225
    226 Region CCTiledLayerImpl::opaqueContentsRegion() const
     226Region CCTiledLayerImpl::visibleContentOpaqueRegion() const
    227227{
    228228    if (m_skipsDraw)

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

    r111978 r112327  
    5757    bool contentsSwizzled() const { return m_contentsSwizzled; }
    5858
    59     virtual Region opaqueContentsRegion() const;
     59    virtual Region visibleContentOpaqueRegion() const;
    6060
    6161    typedef ProgramBinding<VertexShaderTile, FragmentShaderRGBATexAlpha> Program;

  • trunk/Source/WebKit/chromium/ChangeLog

    r112326 r112327  
     12012-03-27  Dana Jansens  <danakj@chromium.org>
     2
     3        [chromium] Rename opaqueContentsRegion() to visibleContentOpaqueRegion()
     4        https://bugs.webkit.org/show_bug.cgi?id=81689
     5
     6        Reviewed by Adrienne Walker.
     7
     8        * tests/CCLayerTreeHostTest.cpp:
     9        (WTF::TestLayerChromium::opaqueVisibleContents):
     10        * tests/CCOcclusionTrackerTest.cpp:
     11        (WebCore::TestContentLayerChromium::opaqueVisibleContents):
     12        (WebCore::TestContentLayerImpl::opaqueVisibleContents):
     13        * tests/TiledLayerChromiumTest.cpp:
     14        (WTF::TEST):
     15
    1162012-03-27  Dana Jansens  <danakj@chromium.org>
    217

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

    r112278 r112327  
    17621762    virtual bool drawsContent() const { return true; }
    17631763
    1764     virtual Region opaqueContentsRegion() const { return intersection(m_opaqueContentsRect, visibleLayerRect()); }
     1764    virtual Region visibleContentOpaqueRegion() const { return intersection(m_opaqueContentsRect, visibleLayerRect()); }
    17651765    void setOpaqueContentsRect(const IntRect& opaqueContentsRect) { m_opaqueContentsRect = opaqueContentsRect; }
    17661766

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

    r112326 r112327  
    5757
    5858    virtual bool drawsContent() const { return true; }
    59     virtual Region opaqueContentsRegion() const { return intersection(m_opaqueContentsRect, visibleLayerRect()); }
     59    virtual Region visibleContentOpaqueRegion() const { return intersection(m_opaqueContentsRect, visibleLayerRect()); }
    6060    void setOpaqueContentsRect(const IntRect& opaqueContentsRect) { m_opaqueContentsRect = opaqueContentsRect; }
    6161
    … …  
    6868    TestContentLayerImpl(int id) : CCLayerImpl(id) { setDrawsContent(true); }
    6969
    70     virtual Region opaqueContentsRegion() const { return intersection(m_opaqueContentsRect, visibleLayerRect()); }
     70    virtual Region visibleContentOpaqueRegion() const { return intersection(m_opaqueContentsRect, visibleLayerRect()); }
    7171    void setOpaqueContentsRect(const IntRect& opaqueContentsRect) { m_opaqueContentsRect = opaqueContentsRect; }
    7272private:

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

    r112286 r112327  
    13811381}
    13821382
    1383 TEST(TiledLayerChromiumTest, opaqueContentsRegion)
     1383TEST(TiledLayerChromiumTest, visibleContentOpaqueRegion)
    13841384{
    13851385    OwnPtr<TextureManager> textureManager = TextureManager::create(4*1024*1024, 2*1024*1024, 1024);
    … …  
    14001400    layer->setDrawOpacity(1);
    14011401
    1402     // If the layer doesn't paint opaque content, then the opaqueContentsRegion should be empty.
     1402    // If the layer doesn't paint opaque content, then the visibleContentOpaqueRegion should be empty.
    14031403    layer->fakeLayerTextureUpdater()->setOpaquePaintRect(IntRect());
    14041404    layer->invalidateRect(contentBounds);
    14051405    layer->prepareToUpdate(contentBounds, &occluded);
    1406     opaqueContents = layer->opaqueContentsRegion();
     1406    opaqueContents = layer->visibleContentOpaqueRegion();
    14071407    EXPECT_TRUE(opaqueContents.isEmpty());
    14081408
    … …  
    14121412    EXPECT_NEAR(occluded.overdrawMetrics().pixelsCulled(), 0, 1);
    14131413
    1414     // opaqueContentsRegion should match the visible part of what is painted opaque.
     1414    // visibleContentOpaqueRegion should match the visible part of what is painted opaque.
    14151415    opaquePaintRect = IntRect(10, 10, 90, 190);
    14161416    layer->fakeLayerTextureUpdater()->setOpaquePaintRect(opaquePaintRect);
    14171417    layer->invalidateRect(contentBounds);
    14181418    layer->prepareToUpdate(contentBounds, &occluded);
    1419     opaqueContents = layer->opaqueContentsRegion();
     1419    opaqueContents = layer->visibleContentOpaqueRegion();
    14201420    EXPECT_EQ_RECT(intersection(opaquePaintRect, visibleBounds), opaqueContents.bounds());
    14211421    EXPECT_EQ(1u, opaqueContents.rects().size());
    … …  
    14291429    layer->fakeLayerTextureUpdater()->setOpaquePaintRect(IntRect());
    14301430    layer->prepareToUpdate(contentBounds, &occluded);
    1431     opaqueContents = layer->opaqueContentsRegion();
     1431    opaqueContents = layer->visibleContentOpaqueRegion();
    14321432    EXPECT_EQ_RECT(intersection(opaquePaintRect, visibleBounds), opaqueContents.bounds());
    14331433    EXPECT_EQ(1u, opaqueContents.rects().size());
    … …  
    14431443    layer->invalidateRect(IntRect(0, 0, 1, 1));
    14441444    layer->prepareToUpdate(contentBounds, &occluded);
    1445     opaqueContents = layer->opaqueContentsRegion();
     1445    opaqueContents = layer->visibleContentOpaqueRegion();
    14461446    EXPECT_EQ_RECT(intersection(opaquePaintRect, visibleBounds), opaqueContents.bounds());
    14471447    EXPECT_EQ(1u, opaqueContents.rects().size());
    … …  
    14571457    layer->invalidateRect(IntRect(10, 10, 1, 1));
    14581458    layer->prepareToUpdate(contentBounds, &occluded);
    1459     opaqueContents = layer->opaqueContentsRegion();
     1459    opaqueContents = layer->visibleContentOpaqueRegion();
    14601460    EXPECT_EQ_RECT(intersection(IntRect(10, 100, 90, 100), visibleBounds), opaqueContents.bounds());
    14611461    EXPECT_EQ(1u, opaqueContents.rects().size());
    … …  
    14901490    layer->invalidateRect(contentBounds);
    14911491    layer->prepareToUpdate(contentBounds, &occluded);
    1492     opaqueContents = layer->opaqueContentsRegion();
     1492    opaqueContents = layer->visibleContentOpaqueRegion();
    14931493    EXPECT_TRUE(opaqueContents.isEmpty());
    14941494
    … …  
    15041504    layer->invalidateRect(IntRect(50, 200, 10, 10));
    15051505    layer->prepareToUpdate(contentBounds, &occluded);
    1506     opaqueContents = layer->opaqueContentsRegion();
     1506    opaqueContents = layer->visibleContentOpaqueRegion();
    15071507    EXPECT_TRUE(opaqueContents.isEmpty());
    15081508
Note: See TracChangeset for help on using the changeset viewer.