OLD | NEW |
---|---|
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "CCLayerTreeHostImpl.h" | 7 #include "CCLayerTreeHostImpl.h" |
8 | 8 |
9 #include "CCAnimationTestCommon.h" | 9 #include "CCAnimationTestCommon.h" |
10 #include "CCDelegatedRendererLayerImpl.h" | 10 #include "CCDelegatedRendererLayerImpl.h" |
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
778 DidDrawCheckLayer* root = static_cast<DidDrawCheckLayer*>(m_hostImpl->rootLa yer()); | 778 DidDrawCheckLayer* root = static_cast<DidDrawCheckLayer*>(m_hostImpl->rootLa yer()); |
779 | 779 |
780 root->addChild(DidDrawCheckLayer::create(2)); | 780 root->addChild(DidDrawCheckLayer::create(2)); |
781 DidDrawCheckLayer* occludedLayer = static_cast<DidDrawCheckLayer*>(root->chi ldren()[0]); | 781 DidDrawCheckLayer* occludedLayer = static_cast<DidDrawCheckLayer*>(root->chi ldren()[0]); |
782 | 782 |
783 root->addChild(DidDrawCheckLayer::create(3)); | 783 root->addChild(DidDrawCheckLayer::create(3)); |
784 DidDrawCheckLayer* topLayer = static_cast<DidDrawCheckLayer*>(root->children ()[1]); | 784 DidDrawCheckLayer* topLayer = static_cast<DidDrawCheckLayer*>(root->children ()[1]); |
785 // This layer covers the occludedLayer above. Make this layer large so it ca n occlude. | 785 // This layer covers the occludedLayer above. Make this layer large so it ca n occlude. |
786 topLayer->setBounds(bigSize); | 786 topLayer->setBounds(bigSize); |
787 topLayer->setContentBounds(bigSize); | 787 topLayer->setContentBounds(bigSize); |
788 topLayer->setOpaque(true); | 788 topLayer->setContentsOpaque(true); |
789 | 789 |
790 CCLayerTreeHostImpl::FrameData frame; | 790 CCLayerTreeHostImpl::FrameData frame; |
791 | 791 |
792 EXPECT_FALSE(occludedLayer->willDrawCalled()); | 792 EXPECT_FALSE(occludedLayer->willDrawCalled()); |
793 EXPECT_FALSE(occludedLayer->didDrawCalled()); | 793 EXPECT_FALSE(occludedLayer->didDrawCalled()); |
794 EXPECT_FALSE(topLayer->willDrawCalled()); | 794 EXPECT_FALSE(topLayer->willDrawCalled()); |
795 EXPECT_FALSE(topLayer->didDrawCalled()); | 795 EXPECT_FALSE(topLayer->didDrawCalled()); |
796 | 796 |
797 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 797 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
798 m_hostImpl->drawLayers(frame); | 798 m_hostImpl->drawLayers(frame); |
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1396 | 1396 |
1397 class BlendStateCheckLayer : public CCLayerImpl { | 1397 class BlendStateCheckLayer : public CCLayerImpl { |
1398 public: | 1398 public: |
1399 static PassOwnPtr<BlendStateCheckLayer> create(int id, CCResourceProvider* r esourceProvider) { return adoptPtr(new BlendStateCheckLayer(id, resourceProvider )); } | 1399 static PassOwnPtr<BlendStateCheckLayer> create(int id, CCResourceProvider* r esourceProvider) { return adoptPtr(new BlendStateCheckLayer(id, resourceProvider )); } |
1400 | 1400 |
1401 virtual void appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuad sData) OVERRIDE | 1401 virtual void appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuad sData) OVERRIDE |
1402 { | 1402 { |
1403 m_quadsAppended = true; | 1403 m_quadsAppended = true; |
1404 | 1404 |
1405 IntRect opaqueRect; | 1405 IntRect opaqueRect; |
1406 if (opaque() || m_opaqueContents) | 1406 if (contentsOpaque()) |
1407 opaqueRect = m_quadRect; | 1407 opaqueRect = m_quadRect; |
1408 else | 1408 else |
1409 opaqueRect = m_opaqueContentRect; | 1409 opaqueRect = m_opaqueContentRect; |
1410 | 1410 |
1411 CCSharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createS haredQuadState()); | 1411 CCSharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createS haredQuadState()); |
1412 scoped_ptr<CCTileDrawQuad> testBlendingDrawQuad = CCTileDrawQuad::create (sharedQuadState, m_quadRect, opaqueRect, m_resourceId, IntPoint(), IntSize(1, 1 ), 0, false, false, false, false, false); | 1412 scoped_ptr<CCTileDrawQuad> testBlendingDrawQuad = CCTileDrawQuad::create (sharedQuadState, m_quadRect, opaqueRect, m_resourceId, IntPoint(), IntSize(1, 1 ), 0, false, false, false, false, false); |
1413 testBlendingDrawQuad->setQuadVisibleRect(m_quadVisibleRect); | 1413 testBlendingDrawQuad->setQuadVisibleRect(m_quadVisibleRect); |
1414 EXPECT_EQ(m_blend, testBlendingDrawQuad->needsBlending()); | 1414 EXPECT_EQ(m_blend, testBlendingDrawQuad->needsBlending()); |
1415 EXPECT_EQ(m_hasRenderSurface, !!renderSurface()); | 1415 EXPECT_EQ(m_hasRenderSurface, !!renderSurface()); |
1416 quadSink.append(testBlendingDrawQuad.PassAs<CCDrawQuad>(), appendQuadsDa ta); | 1416 quadSink.append(testBlendingDrawQuad.PassAs<CCDrawQuad>(), appendQuadsDa ta); |
1417 } | 1417 } |
1418 | 1418 |
1419 void setExpectation(bool blend, bool hasRenderSurface) | 1419 void setExpectation(bool blend, bool hasRenderSurface) |
1420 { | 1420 { |
1421 m_blend = blend; | 1421 m_blend = blend; |
1422 m_hasRenderSurface = hasRenderSurface; | 1422 m_hasRenderSurface = hasRenderSurface; |
1423 m_quadsAppended = false; | 1423 m_quadsAppended = false; |
1424 } | 1424 } |
1425 | 1425 |
1426 bool quadsAppended() const { return m_quadsAppended; } | 1426 bool quadsAppended() const { return m_quadsAppended; } |
1427 | 1427 |
1428 void setQuadRect(const IntRect& rect) { m_quadRect = rect; } | 1428 void setQuadRect(const IntRect& rect) { m_quadRect = rect; } |
1429 void setQuadVisibleRect(const IntRect& rect) { m_quadVisibleRect = rect; } | 1429 void setQuadVisibleRect(const IntRect& rect) { m_quadVisibleRect = rect; } |
1430 void setOpaqueContents(bool opaque) { m_opaqueContents = opaque; } | |
1431 void setOpaqueContentRect(const IntRect& rect) { m_opaqueContentRect = rect; } | 1430 void setOpaqueContentRect(const IntRect& rect) { m_opaqueContentRect = rect; } |
1432 | 1431 |
1433 private: | 1432 private: |
1434 explicit BlendStateCheckLayer(int id, CCResourceProvider* resourceProvider) | 1433 explicit BlendStateCheckLayer(int id, CCResourceProvider* resourceProvider) |
1435 : CCLayerImpl(id) | 1434 : CCLayerImpl(id) |
1436 , m_blend(false) | 1435 , m_blend(false) |
1437 , m_hasRenderSurface(false) | 1436 , m_hasRenderSurface(false) |
1438 , m_quadsAppended(false) | 1437 , m_quadsAppended(false) |
1439 , m_opaqueContents(false) | |
1440 , m_quadRect(5, 5, 5, 5) | 1438 , m_quadRect(5, 5, 5, 5) |
1441 , m_quadVisibleRect(5, 5, 5, 5) | 1439 , m_quadVisibleRect(5, 5, 5, 5) |
1442 , m_resourceId(resourceProvider->createResource(CCRenderer::ContentPool, IntSize(1, 1), GraphicsContext3D::RGBA, CCResourceProvider::TextureUsageAny)) | 1440 , m_resourceId(resourceProvider->createResource(CCRenderer::ContentPool, IntSize(1, 1), GraphicsContext3D::RGBA, CCResourceProvider::TextureUsageAny)) |
1443 { | 1441 { |
1444 setAnchorPoint(FloatPoint(0, 0)); | 1442 setAnchorPoint(FloatPoint(0, 0)); |
1445 setBounds(IntSize(10, 10)); | 1443 setBounds(IntSize(10, 10)); |
1446 setContentBounds(IntSize(10, 10)); | 1444 setContentBounds(IntSize(10, 10)); |
1447 setDrawsContent(true); | 1445 setDrawsContent(true); |
1448 } | 1446 } |
1449 | 1447 |
1450 bool m_blend; | 1448 bool m_blend; |
1451 bool m_hasRenderSurface; | 1449 bool m_hasRenderSurface; |
1452 bool m_quadsAppended; | 1450 bool m_quadsAppended; |
1453 bool m_opaqueContents; | |
1454 IntRect m_quadRect; | 1451 IntRect m_quadRect; |
1455 IntRect m_opaqueContentRect; | 1452 IntRect m_opaqueContentRect; |
1456 IntRect m_quadVisibleRect; | 1453 IntRect m_quadVisibleRect; |
1457 CCResourceProvider::ResourceId m_resourceId; | 1454 CCResourceProvider::ResourceId m_resourceId; |
1458 }; | 1455 }; |
1459 | 1456 |
1460 TEST_F(CCLayerTreeHostImplTest, blendingOffWhenDrawingOpaqueLayers) | 1457 TEST_F(CCLayerTreeHostImplTest, blendingOffWhenDrawingOpaqueLayers) |
1461 { | 1458 { |
1462 { | 1459 { |
1463 OwnPtr<CCLayerImpl> root = CCLayerImpl::create(1); | 1460 OwnPtr<CCLayerImpl> root = CCLayerImpl::create(1); |
1464 root->setAnchorPoint(FloatPoint(0, 0)); | 1461 root->setAnchorPoint(FloatPoint(0, 0)); |
1465 root->setBounds(IntSize(10, 10)); | 1462 root->setBounds(IntSize(10, 10)); |
1466 root->setContentBounds(root->bounds()); | 1463 root->setContentBounds(root->bounds()); |
1467 root->setDrawsContent(false); | 1464 root->setDrawsContent(false); |
1468 m_hostImpl->setRootLayer(root.release()); | 1465 m_hostImpl->setRootLayer(root.release()); |
1469 } | 1466 } |
1470 CCLayerImpl* root = m_hostImpl->rootLayer(); | 1467 CCLayerImpl* root = m_hostImpl->rootLayer(); |
1471 | 1468 |
1472 root->addChild(BlendStateCheckLayer::create(2, m_hostImpl->resourceProvider( ))); | 1469 root->addChild(BlendStateCheckLayer::create(2, m_hostImpl->resourceProvider( ))); |
1473 BlendStateCheckLayer* layer1 = static_cast<BlendStateCheckLayer*>(root->chil dren()[0]); | 1470 BlendStateCheckLayer* layer1 = static_cast<BlendStateCheckLayer*>(root->chil dren()[0]); |
1474 layer1->setPosition(FloatPoint(2, 2)); | 1471 layer1->setPosition(FloatPoint(2, 2)); |
1475 | 1472 |
1476 CCLayerTreeHostImpl::FrameData frame; | 1473 CCLayerTreeHostImpl::FrameData frame; |
1477 | 1474 |
1478 // Opaque layer, drawn without blending. | 1475 // Opaque layer, drawn without blending. |
1479 layer1->setOpaque(true); | 1476 layer1->setContentsOpaque(true); |
1480 layer1->setOpaqueContents(true); | |
1481 layer1->setExpectation(false, false); | 1477 layer1->setExpectation(false, false); |
1482 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1478 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1483 m_hostImpl->drawLayers(frame); | 1479 m_hostImpl->drawLayers(frame); |
1484 EXPECT_TRUE(layer1->quadsAppended()); | |
1485 m_hostImpl->didDrawAllLayers(frame); | |
1486 | |
1487 // Layer with translucent content, but opaque content, so drawn without blen ding. | |
enne (OOO)
2012/10/02 18:06:09
In retrospect, I have no idea what this was trying
danakj
2012/10/02 18:12:08
Think I wrote this.
It has opaque pixels detected
alokp
2012/10/02 18:21:50
CCLayerImpl::setContentsOpaque refers to pixel con
enne (OOO)
2012/10/02 18:25:05
I disagree. setOpaqueContents is setting a value
| |
1488 layer1->setOpaque(false); | |
1489 layer1->setOpaqueContents(true); | |
1490 layer1->setExpectation(false, false); | |
1491 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | |
1492 m_hostImpl->drawLayers(frame); | |
1493 EXPECT_TRUE(layer1->quadsAppended()); | 1480 EXPECT_TRUE(layer1->quadsAppended()); |
1494 m_hostImpl->didDrawAllLayers(frame); | 1481 m_hostImpl->didDrawAllLayers(frame); |
1495 | 1482 |
1496 // Layer with translucent content and painting, so drawn with blending. | 1483 // Layer with translucent content and painting, so drawn with blending. |
1497 layer1->setOpaque(false); | 1484 layer1->setContentsOpaque(false); |
1498 layer1->setOpaqueContents(false); | |
1499 layer1->setExpectation(true, false); | 1485 layer1->setExpectation(true, false); |
1500 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1486 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1501 m_hostImpl->drawLayers(frame); | 1487 m_hostImpl->drawLayers(frame); |
1502 EXPECT_TRUE(layer1->quadsAppended()); | 1488 EXPECT_TRUE(layer1->quadsAppended()); |
1503 m_hostImpl->didDrawAllLayers(frame); | 1489 m_hostImpl->didDrawAllLayers(frame); |
1504 | 1490 |
1505 // Layer with translucent opacity, drawn with blending. | 1491 // Layer with translucent opacity, drawn with blending. |
1506 layer1->setOpaque(true); | 1492 layer1->setContentsOpaque(true); |
1507 layer1->setOpaqueContents(true); | |
1508 layer1->setOpacity(0.5); | 1493 layer1->setOpacity(0.5); |
1509 layer1->setExpectation(true, false); | 1494 layer1->setExpectation(true, false); |
1510 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1495 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1511 m_hostImpl->drawLayers(frame); | 1496 m_hostImpl->drawLayers(frame); |
1512 EXPECT_TRUE(layer1->quadsAppended()); | 1497 EXPECT_TRUE(layer1->quadsAppended()); |
1513 m_hostImpl->didDrawAllLayers(frame); | 1498 m_hostImpl->didDrawAllLayers(frame); |
1514 | 1499 |
1515 // Layer with translucent opacity and painting, drawn with blending. | 1500 // Layer with translucent opacity and painting, drawn with blending. |
1516 layer1->setOpaque(true); | 1501 layer1->setContentsOpaque(true); |
1517 layer1->setOpaqueContents(false); | |
1518 layer1->setOpacity(0.5); | 1502 layer1->setOpacity(0.5); |
1519 layer1->setExpectation(true, false); | 1503 layer1->setExpectation(true, false); |
1520 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1504 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1521 m_hostImpl->drawLayers(frame); | 1505 m_hostImpl->drawLayers(frame); |
1522 EXPECT_TRUE(layer1->quadsAppended()); | 1506 EXPECT_TRUE(layer1->quadsAppended()); |
1523 m_hostImpl->didDrawAllLayers(frame); | 1507 m_hostImpl->didDrawAllLayers(frame); |
1524 | 1508 |
1525 layer1->addChild(BlendStateCheckLayer::create(3, m_hostImpl->resourceProvide r())); | 1509 layer1->addChild(BlendStateCheckLayer::create(3, m_hostImpl->resourceProvide r())); |
1526 BlendStateCheckLayer* layer2 = static_cast<BlendStateCheckLayer*>(layer1->ch ildren()[0]); | 1510 BlendStateCheckLayer* layer2 = static_cast<BlendStateCheckLayer*>(layer1->ch ildren()[0]); |
1527 layer2->setPosition(FloatPoint(4, 4)); | 1511 layer2->setPosition(FloatPoint(4, 4)); |
1528 | 1512 |
1529 // 2 opaque layers, drawn without blending. | 1513 // 2 opaque layers, drawn without blending. |
1530 layer1->setOpaque(true); | 1514 layer1->setContentsOpaque(true); |
1531 layer1->setOpaqueContents(true); | |
1532 layer1->setOpacity(1); | 1515 layer1->setOpacity(1); |
1533 layer1->setExpectation(false, false); | 1516 layer1->setExpectation(false, false); |
1534 layer2->setOpaque(true); | 1517 layer2->setContentsOpaque(true); |
1535 layer2->setOpaqueContents(true); | |
1536 layer2->setOpacity(1); | 1518 layer2->setOpacity(1); |
1537 layer2->setExpectation(false, false); | 1519 layer2->setExpectation(false, false); |
1538 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1520 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1539 m_hostImpl->drawLayers(frame); | 1521 m_hostImpl->drawLayers(frame); |
1540 EXPECT_TRUE(layer1->quadsAppended()); | 1522 EXPECT_TRUE(layer1->quadsAppended()); |
1541 EXPECT_TRUE(layer2->quadsAppended()); | 1523 EXPECT_TRUE(layer2->quadsAppended()); |
1542 m_hostImpl->didDrawAllLayers(frame); | 1524 m_hostImpl->didDrawAllLayers(frame); |
1543 | 1525 |
1544 // Parent layer with translucent content, drawn with blending. | 1526 // Parent layer with translucent content, drawn with blending. |
1545 // Child layer with opaque content, drawn without blending. | 1527 // Child layer with opaque content, drawn without blending. |
1546 layer1->setOpaque(false); | 1528 layer1->setContentsOpaque(false); |
1547 layer1->setOpaqueContents(false); | |
1548 layer1->setExpectation(true, false); | 1529 layer1->setExpectation(true, false); |
1549 layer2->setExpectation(false, false); | 1530 layer2->setExpectation(false, false); |
1550 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1531 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1551 m_hostImpl->drawLayers(frame); | 1532 m_hostImpl->drawLayers(frame); |
1552 EXPECT_TRUE(layer1->quadsAppended()); | 1533 EXPECT_TRUE(layer1->quadsAppended()); |
1553 EXPECT_TRUE(layer2->quadsAppended()); | 1534 EXPECT_TRUE(layer2->quadsAppended()); |
1554 m_hostImpl->didDrawAllLayers(frame); | 1535 m_hostImpl->didDrawAllLayers(frame); |
1555 | 1536 |
1556 // Parent layer with translucent content but opaque painting, drawn without blending. | 1537 // Parent layer with translucent content but opaque painting, drawn without blending. |
1557 // Child layer with opaque content, drawn without blending. | 1538 // Child layer with opaque content, drawn without blending. |
1558 layer1->setOpaque(false); | 1539 layer1->setContentsOpaque(true); |
1559 layer1->setOpaqueContents(true); | |
1560 layer1->setExpectation(false, false); | 1540 layer1->setExpectation(false, false); |
1561 layer2->setExpectation(false, false); | 1541 layer2->setExpectation(false, false); |
1562 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1542 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1563 m_hostImpl->drawLayers(frame); | 1543 m_hostImpl->drawLayers(frame); |
1564 EXPECT_TRUE(layer1->quadsAppended()); | 1544 EXPECT_TRUE(layer1->quadsAppended()); |
1565 EXPECT_TRUE(layer2->quadsAppended()); | 1545 EXPECT_TRUE(layer2->quadsAppended()); |
1566 m_hostImpl->didDrawAllLayers(frame); | 1546 m_hostImpl->didDrawAllLayers(frame); |
1567 | 1547 |
1568 // Parent layer with translucent opacity and opaque content. Since it has a | 1548 // Parent layer with translucent opacity and opaque content. Since it has a |
1569 // drawing child, it's drawn to a render surface which carries the opacity, | 1549 // drawing child, it's drawn to a render surface which carries the opacity, |
1570 // so it's itself drawn without blending. | 1550 // so it's itself drawn without blending. |
1571 // Child layer with opaque content, drawn without blending (parent surface | 1551 // Child layer with opaque content, drawn without blending (parent surface |
1572 // carries the inherited opacity). | 1552 // carries the inherited opacity). |
1573 layer1->setOpaque(true); | 1553 layer1->setContentsOpaque(true); |
1574 layer1->setOpaqueContents(true); | |
1575 layer1->setOpacity(0.5); | 1554 layer1->setOpacity(0.5); |
1576 layer1->setExpectation(false, true); | 1555 layer1->setExpectation(false, true); |
1577 layer2->setExpectation(false, false); | 1556 layer2->setExpectation(false, false); |
1578 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1557 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1579 m_hostImpl->drawLayers(frame); | 1558 m_hostImpl->drawLayers(frame); |
1580 EXPECT_TRUE(layer1->quadsAppended()); | 1559 EXPECT_TRUE(layer1->quadsAppended()); |
1581 EXPECT_TRUE(layer2->quadsAppended()); | 1560 EXPECT_TRUE(layer2->quadsAppended()); |
1582 m_hostImpl->didDrawAllLayers(frame); | 1561 m_hostImpl->didDrawAllLayers(frame); |
1583 | 1562 |
1584 // Draw again, but with child non-opaque, to make sure | 1563 // Draw again, but with child non-opaque, to make sure |
1585 // layer1 not culled. | 1564 // layer1 not culled. |
1586 layer1->setOpaque(true); | 1565 layer1->setContentsOpaque(true); |
1587 layer1->setOpaqueContents(true); | |
1588 layer1->setOpacity(1); | 1566 layer1->setOpacity(1); |
1589 layer1->setExpectation(false, false); | 1567 layer1->setExpectation(false, false); |
1590 layer2->setOpaque(true); | 1568 layer2->setContentsOpaque(true); |
1591 layer2->setOpaqueContents(true); | |
1592 layer2->setOpacity(0.5); | 1569 layer2->setOpacity(0.5); |
1593 layer2->setExpectation(true, false); | 1570 layer2->setExpectation(true, false); |
1594 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1571 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1595 m_hostImpl->drawLayers(frame); | 1572 m_hostImpl->drawLayers(frame); |
1596 EXPECT_TRUE(layer1->quadsAppended()); | 1573 EXPECT_TRUE(layer1->quadsAppended()); |
1597 EXPECT_TRUE(layer2->quadsAppended()); | 1574 EXPECT_TRUE(layer2->quadsAppended()); |
1598 m_hostImpl->didDrawAllLayers(frame); | 1575 m_hostImpl->didDrawAllLayers(frame); |
1599 | 1576 |
1600 // A second way of making the child non-opaque. | 1577 // A second way of making the child non-opaque. |
1601 layer1->setOpaque(true); | 1578 layer1->setContentsOpaque(true); |
1602 layer1->setOpacity(1); | 1579 layer1->setOpacity(1); |
1603 layer1->setExpectation(false, false); | 1580 layer1->setExpectation(false, false); |
1604 layer2->setOpaque(false); | 1581 layer2->setContentsOpaque(false); |
1605 layer2->setOpaqueContents(false); | |
1606 layer2->setOpacity(1); | 1582 layer2->setOpacity(1); |
1607 layer2->setExpectation(true, false); | 1583 layer2->setExpectation(true, false); |
1608 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1584 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1609 m_hostImpl->drawLayers(frame); | 1585 m_hostImpl->drawLayers(frame); |
1610 EXPECT_TRUE(layer1->quadsAppended()); | 1586 EXPECT_TRUE(layer1->quadsAppended()); |
1611 EXPECT_TRUE(layer2->quadsAppended()); | 1587 EXPECT_TRUE(layer2->quadsAppended()); |
1612 m_hostImpl->didDrawAllLayers(frame); | 1588 m_hostImpl->didDrawAllLayers(frame); |
1613 | 1589 |
1614 // And when the layer says its not opaque but is painted opaque, it is not b lended. | 1590 // And when the layer says its not opaque but is painted opaque, it is not b lended. |
1615 layer1->setOpaque(true); | 1591 layer1->setContentsOpaque(true); |
1616 layer1->setOpacity(1); | 1592 layer1->setOpacity(1); |
1617 layer1->setExpectation(false, false); | 1593 layer1->setExpectation(false, false); |
1618 layer2->setOpaque(false); | 1594 layer2->setContentsOpaque(true); |
1619 layer2->setOpaqueContents(true); | |
1620 layer2->setOpacity(1); | 1595 layer2->setOpacity(1); |
1621 layer2->setExpectation(false, false); | 1596 layer2->setExpectation(false, false); |
1622 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1597 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1623 m_hostImpl->drawLayers(frame); | 1598 m_hostImpl->drawLayers(frame); |
1624 EXPECT_TRUE(layer1->quadsAppended()); | 1599 EXPECT_TRUE(layer1->quadsAppended()); |
1625 EXPECT_TRUE(layer2->quadsAppended()); | 1600 EXPECT_TRUE(layer2->quadsAppended()); |
1626 m_hostImpl->didDrawAllLayers(frame); | 1601 m_hostImpl->didDrawAllLayers(frame); |
1627 | 1602 |
1628 // Layer with partially opaque contents, drawn with blending. | 1603 // Layer with partially opaque contents, drawn with blending. |
1629 layer1->setOpaque(false); | 1604 layer1->setContentsOpaque(false); |
1630 layer1->setQuadRect(IntRect(5, 5, 5, 5)); | 1605 layer1->setQuadRect(IntRect(5, 5, 5, 5)); |
1631 layer1->setQuadVisibleRect(IntRect(5, 5, 5, 5)); | 1606 layer1->setQuadVisibleRect(IntRect(5, 5, 5, 5)); |
1632 layer1->setOpaqueContents(false); | |
1633 layer1->setOpaqueContentRect(IntRect(5, 5, 2, 5)); | 1607 layer1->setOpaqueContentRect(IntRect(5, 5, 2, 5)); |
1634 layer1->setExpectation(true, false); | 1608 layer1->setExpectation(true, false); |
1635 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1609 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1636 m_hostImpl->drawLayers(frame); | 1610 m_hostImpl->drawLayers(frame); |
1637 EXPECT_TRUE(layer1->quadsAppended()); | 1611 EXPECT_TRUE(layer1->quadsAppended()); |
1638 m_hostImpl->didDrawAllLayers(frame); | 1612 m_hostImpl->didDrawAllLayers(frame); |
1639 | 1613 |
1640 // Layer with partially opaque contents partially culled, drawn with blendin g. | 1614 // Layer with partially opaque contents partially culled, drawn with blendin g. |
1641 layer1->setOpaque(false); | 1615 layer1->setContentsOpaque(false); |
1642 layer1->setQuadRect(IntRect(5, 5, 5, 5)); | 1616 layer1->setQuadRect(IntRect(5, 5, 5, 5)); |
1643 layer1->setQuadVisibleRect(IntRect(5, 5, 5, 2)); | 1617 layer1->setQuadVisibleRect(IntRect(5, 5, 5, 2)); |
1644 layer1->setOpaqueContents(false); | |
1645 layer1->setOpaqueContentRect(IntRect(5, 5, 2, 5)); | 1618 layer1->setOpaqueContentRect(IntRect(5, 5, 2, 5)); |
1646 layer1->setExpectation(true, false); | 1619 layer1->setExpectation(true, false); |
1647 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1620 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1648 m_hostImpl->drawLayers(frame); | 1621 m_hostImpl->drawLayers(frame); |
1649 EXPECT_TRUE(layer1->quadsAppended()); | 1622 EXPECT_TRUE(layer1->quadsAppended()); |
1650 m_hostImpl->didDrawAllLayers(frame); | 1623 m_hostImpl->didDrawAllLayers(frame); |
1651 | 1624 |
1652 // Layer with partially opaque contents culled, drawn with blending. | 1625 // Layer with partially opaque contents culled, drawn with blending. |
1653 layer1->setOpaque(false); | 1626 layer1->setContentsOpaque(false); |
1654 layer1->setQuadRect(IntRect(5, 5, 5, 5)); | 1627 layer1->setQuadRect(IntRect(5, 5, 5, 5)); |
1655 layer1->setQuadVisibleRect(IntRect(7, 5, 3, 5)); | 1628 layer1->setQuadVisibleRect(IntRect(7, 5, 3, 5)); |
1656 layer1->setOpaqueContents(false); | |
1657 layer1->setOpaqueContentRect(IntRect(5, 5, 2, 5)); | 1629 layer1->setOpaqueContentRect(IntRect(5, 5, 2, 5)); |
1658 layer1->setExpectation(true, false); | 1630 layer1->setExpectation(true, false); |
1659 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1631 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1660 m_hostImpl->drawLayers(frame); | 1632 m_hostImpl->drawLayers(frame); |
1661 EXPECT_TRUE(layer1->quadsAppended()); | 1633 EXPECT_TRUE(layer1->quadsAppended()); |
1662 m_hostImpl->didDrawAllLayers(frame); | 1634 m_hostImpl->didDrawAllLayers(frame); |
1663 | 1635 |
1664 // Layer with partially opaque contents and translucent contents culled, dra wn without blending. | 1636 // Layer with partially opaque contents and translucent contents culled, dra wn without blending. |
1665 layer1->setOpaque(false); | 1637 layer1->setContentsOpaque(false); |
1666 layer1->setQuadRect(IntRect(5, 5, 5, 5)); | 1638 layer1->setQuadRect(IntRect(5, 5, 5, 5)); |
1667 layer1->setQuadVisibleRect(IntRect(5, 5, 2, 5)); | 1639 layer1->setQuadVisibleRect(IntRect(5, 5, 2, 5)); |
1668 layer1->setOpaqueContents(false); | |
1669 layer1->setOpaqueContentRect(IntRect(5, 5, 2, 5)); | 1640 layer1->setOpaqueContentRect(IntRect(5, 5, 2, 5)); |
1670 layer1->setExpectation(false, false); | 1641 layer1->setExpectation(false, false); |
1671 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); | 1642 EXPECT_TRUE(m_hostImpl->prepareToDraw(frame)); |
1672 m_hostImpl->drawLayers(frame); | 1643 m_hostImpl->drawLayers(frame); |
1673 EXPECT_TRUE(layer1->quadsAppended()); | 1644 EXPECT_TRUE(layer1->quadsAppended()); |
1674 m_hostImpl->didDrawAllLayers(frame); | 1645 m_hostImpl->didDrawAllLayers(frame); |
1675 | 1646 |
1676 } | 1647 } |
1677 | 1648 |
1678 TEST_F(CCLayerTreeHostImplTest, viewportCovered) | 1649 TEST_F(CCLayerTreeHostImplTest, viewportCovered) |
1679 { | 1650 { |
1680 m_hostImpl->initializeRenderer(createContext()); | 1651 m_hostImpl->initializeRenderer(createContext()); |
1681 m_hostImpl->setBackgroundColor(SK_ColorGRAY); | 1652 m_hostImpl->setBackgroundColor(SK_ColorGRAY); |
1682 | 1653 |
1683 IntSize viewportSize(1000, 1000); | 1654 IntSize viewportSize(1000, 1000); |
1684 m_hostImpl->setViewportSize(viewportSize, viewportSize); | 1655 m_hostImpl->setViewportSize(viewportSize, viewportSize); |
1685 | 1656 |
1686 m_hostImpl->setRootLayer(BlendStateCheckLayer::create(1, m_hostImpl->resourc eProvider())); | 1657 m_hostImpl->setRootLayer(BlendStateCheckLayer::create(1, m_hostImpl->resourc eProvider())); |
1687 BlendStateCheckLayer* root = static_cast<BlendStateCheckLayer*>(m_hostImpl-> rootLayer()); | 1658 BlendStateCheckLayer* root = static_cast<BlendStateCheckLayer*>(m_hostImpl-> rootLayer()); |
1688 root->setExpectation(false, true); | 1659 root->setExpectation(false, true); |
1689 root->setOpaque(true); | 1660 root->setContentsOpaque(true); |
1690 | 1661 |
1691 // No gutter rects | 1662 // No gutter rects |
1692 { | 1663 { |
1693 IntRect layerRect(0, 0, 1000, 1000); | 1664 IntRect layerRect(0, 0, 1000, 1000); |
1694 root->setPosition(layerRect.location()); | 1665 root->setPosition(layerRect.location()); |
1695 root->setBounds(layerRect.size()); | 1666 root->setBounds(layerRect.size()); |
1696 root->setContentBounds(layerRect.size()); | 1667 root->setContentBounds(layerRect.size()); |
1697 root->setQuadRect(IntRect(IntPoint(), layerRect.size())); | 1668 root->setQuadRect(IntRect(IntPoint(), layerRect.size())); |
1698 root->setQuadVisibleRect(IntRect(IntPoint(), layerRect.size())); | 1669 root->setQuadVisibleRect(IntRect(IntPoint(), layerRect.size())); |
1699 | 1670 |
(...skipping 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2833 | 2804 |
2834 static void addDrawingLayerTo(CCLayerImpl* parent, int id, const IntRect& layerR ect, CCLayerImpl** result) | 2805 static void addDrawingLayerTo(CCLayerImpl* parent, int id, const IntRect& layerR ect, CCLayerImpl** result) |
2835 { | 2806 { |
2836 OwnPtr<CCLayerImpl> layer = FakeLayerWithQuads::create(id); | 2807 OwnPtr<CCLayerImpl> layer = FakeLayerWithQuads::create(id); |
2837 CCLayerImpl* layerPtr = layer.get(); | 2808 CCLayerImpl* layerPtr = layer.get(); |
2838 layerPtr->setAnchorPoint(FloatPoint(0, 0)); | 2809 layerPtr->setAnchorPoint(FloatPoint(0, 0)); |
2839 layerPtr->setPosition(FloatPoint(layerRect.location())); | 2810 layerPtr->setPosition(FloatPoint(layerRect.location())); |
2840 layerPtr->setBounds(layerRect.size()); | 2811 layerPtr->setBounds(layerRect.size()); |
2841 layerPtr->setContentBounds(layerRect.size()); | 2812 layerPtr->setContentBounds(layerRect.size()); |
2842 layerPtr->setDrawsContent(true); // only children draw content | 2813 layerPtr->setDrawsContent(true); // only children draw content |
2843 layerPtr->setOpaque(true); | 2814 layerPtr->setContentsOpaque(true); |
2844 parent->addChild(layer.release()); | 2815 parent->addChild(layer.release()); |
2845 if (result) | 2816 if (result) |
2846 *result = layerPtr; | 2817 *result = layerPtr; |
2847 } | 2818 } |
2848 | 2819 |
2849 static void setupLayersForTextureCaching(CCLayerTreeHostImpl* layerTreeHostImpl, CCLayerImpl*& rootPtr, CCLayerImpl*& intermediateLayerPtr, CCLayerImpl*& surfac eLayerPtr, CCLayerImpl*& childPtr, const IntSize& rootSize) | 2820 static void setupLayersForTextureCaching(CCLayerTreeHostImpl* layerTreeHostImpl, CCLayerImpl*& rootPtr, CCLayerImpl*& intermediateLayerPtr, CCLayerImpl*& surfac eLayerPtr, CCLayerImpl*& childPtr, const IntSize& rootSize) |
2850 { | 2821 { |
2851 OwnPtr<CCGraphicsContext> context = FakeWebCompositorOutputSurface::create(a doptPtr(new PartialSwapContext)); | 2822 OwnPtr<CCGraphicsContext> context = FakeWebCompositorOutputSurface::create(a doptPtr(new PartialSwapContext)); |
2852 | 2823 |
2853 layerTreeHostImpl->initializeRenderer(context.release()); | 2824 layerTreeHostImpl->initializeRenderer(context.release()); |
(...skipping 1390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4244 while (removeRenderPassesCases[testCaseIndex].name) { | 4215 while (removeRenderPassesCases[testCaseIndex].name) { |
4245 RenderPassRemovalTestData testData; | 4216 RenderPassRemovalTestData testData; |
4246 configureRenderPassTestData(removeRenderPassesCases[testCaseIndex].initS cript, testData, renderer.get()); | 4217 configureRenderPassTestData(removeRenderPassesCases[testCaseIndex].initS cript, testData, renderer.get()); |
4247 CCLayerTreeHostImpl::removeRenderPasses(CCLayerTreeHostImpl::CullRenderP assesWithCachedTextures(*renderer), testData); | 4218 CCLayerTreeHostImpl::removeRenderPasses(CCLayerTreeHostImpl::CullRenderP assesWithCachedTextures(*renderer), testData); |
4248 verifyRenderPassTestData(removeRenderPassesCases[testCaseIndex], testDat a); | 4219 verifyRenderPassTestData(removeRenderPassesCases[testCaseIndex], testDat a); |
4249 testCaseIndex++; | 4220 testCaseIndex++; |
4250 } | 4221 } |
4251 } | 4222 } |
4252 | 4223 |
4253 } // namespace | 4224 } // namespace |
OLD | NEW |