Diff
Modified: trunk/Source/WebCore/ChangeLog (105370 => 105371)
--- trunk/Source/WebCore/ChangeLog 2012-01-19 02:02:04 UTC (rev 105370)
+++ trunk/Source/WebCore/ChangeLog 2012-01-19 02:39:04 UTC (rev 105371)
@@ -1,3 +1,30 @@
+2012-01-18 James Robinson <jam...@chromium.org>
+
+ Unreviewed, rolling out r105366.
+ http://trac.webkit.org/changeset/105366
+ https://bugs.webkit.org/show_bug.cgi?id=76015
+
+ Breaks CCLayerTreeHostImplTest unit test
+
+ * platform/graphics/chromium/TiledLayerChromium.cpp:
+ (WebCore::TiledLayerChromium::pushPropertiesTo):
+ (WebCore::TiledLayerChromium::prepareToUpdateTiles):
+ * platform/graphics/chromium/cc/CCDrawQuad.h:
+ (WebCore::CCDrawQuad::drawsOpaque):
+ (WebCore::CCDrawQuad::needsBlending):
+ * platform/graphics/chromium/cc/CCQuadCuller.cpp:
+ (WebCore::CCQuadCuller::cullOccludedQuads):
+ * platform/graphics/chromium/cc/CCSolidColorDrawQuad.cpp:
+ (WebCore::CCSolidColorDrawQuad::CCSolidColorDrawQuad):
+ * platform/graphics/chromium/cc/CCTileDrawQuad.cpp:
+ (WebCore::CCTileDrawQuad::create):
+ (WebCore::CCTileDrawQuad::CCTileDrawQuad):
+ * platform/graphics/chromium/cc/CCTileDrawQuad.h:
+ * platform/graphics/chromium/cc/CCTiledLayerImpl.cpp:
+ (WebCore::CCTiledLayerImpl::appendQuads):
+ (WebCore::CCTiledLayerImpl::syncTextureId):
+ * platform/graphics/chromium/cc/CCTiledLayerImpl.h:
+
2012-01-18 Thiago Marcos P. Santos <tmpsan...@gmail.com>
Save two ID checks on CSS Min/Width property validation
Modified: trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp (105370 => 105371)
--- trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp 2012-01-19 02:02:04 UTC (rev 105370)
+++ trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp 2012-01-19 02:39:04 UTC (rev 105371)
@@ -67,7 +67,6 @@
IntRect m_dirtyRect;
IntRect m_updateRect;
- IntRect m_opaqueRect;
private:
OwnPtr<LayerTextureUpdater::Texture> m_texture;
};
@@ -273,7 +272,7 @@
if (tile->isDirty())
continue;
- tiledLayer->pushTileProperties(i, j, tile->managedTexture()->textureId(), tile->m_opaqueRect);
+ tiledLayer->syncTextureId(i, j, tile->managedTexture()->textureId());
}
}
@@ -413,8 +412,8 @@
// However, we can't free the memory backing the GraphicsContext until the paint finishes,
// so we grab a local reference here to hold the updater alive until the paint completes.
RefPtr<LayerTextureUpdater> protector(textureUpdater());
- IntRect paintedOpaqueRect;
- textureUpdater()->prepareToUpdate(m_paintRect, m_tiler->tileSize(), m_tiler->hasBorderTexels(), contentsScale(), &paintedOpaqueRect);
+ IntRect opaqueRect; // FIXME: unused. remove this and store in the layer to pass to impl for draw culling
+ textureUpdater()->prepareToUpdate(m_paintRect, m_tiler->tileSize(), m_tiler->hasBorderTexels(), contentsScale(), &opaqueRect);
for (int j = top; j <= bottom; ++j) {
for (int i = left; i <= right; ++i) {
UpdatableTile* tile = tileAt(i, j);
@@ -423,21 +422,12 @@
if (!tile)
CRASH();
- IntRect tileRect = m_tiler->tileRect(tile);
-
- // Save what was painted opaque in the tile. If everything painted in the tile was opaque, and the area is a subset of an
- // already opaque area, keep the old area.
- IntRect tilePaintedRect = intersection(tileRect, m_paintRect);
- IntRect tilePaintedOpaqueRect = intersection(tileRect, paintedOpaqueRect);
- if (tilePaintedOpaqueRect != tilePaintedRect || !tile->m_opaqueRect.contains(tilePaintedOpaqueRect))
- tile->m_opaqueRect = tilePaintedOpaqueRect;
-
// Use m_updateRect as copyAndClearDirty above moved the existing dirty rect to m_updateRect.
const IntRect& dirtyRect = tile->m_updateRect;
if (dirtyRect.isEmpty())
continue;
- IntRect sourceRect = tileRect;
+ IntRect sourceRect = m_tiler->tileRect(tile);
sourceRect.intersect(dirtyRect);
// Paint rect not guaranteed to line up on tile boundaries, so
// make sure that sourceRect doesn't extend outside of it.
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCDrawQuad.h (105370 => 105371)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCDrawQuad.h 2012-01-19 02:02:04 UTC (rev 105370)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCDrawQuad.h 2012-01-19 02:39:04 UTC (rev 105371)
@@ -51,16 +51,9 @@
const IntRect& layerRect() const { return m_sharedQuadState->layerRect(); }
const IntRect& clipRect() const { return m_sharedQuadState->clipRect(); }
float opacity() const { return m_sharedQuadState->opacity(); }
- // For the purposes of culling, what part of the contents of this quad are opaque?
- IntRect opaqueRect() const
- {
- if (opacity() != 1)
- return IntRect();
- if (m_sharedQuadState->isOpaque() && m_quadOpaque)
- return m_quadRect;
- return m_opaqueRect;
- }
- bool needsBlending() const { return m_needsBlending || opaqueRect() != m_quadRect; }
+ // For the purposes of culling, are the contents of this quad opaque?
+ bool drawsOpaque() const { return m_sharedQuadState->isOpaque() && m_quadOpaque && opacity() == 1; }
+ bool needsBlending() const { return !m_sharedQuadState->isOpaque() || m_needsBlending || opacity() != 1; }
bool isLayerAxisAlignedIntRect() const { return m_sharedQuadState->isLayerAxisAlignedIntRect(); }
enum Material {
@@ -97,10 +90,6 @@
// variables.
bool m_quadOpaque;
bool m_needsBlending;
-
- // Be default, this rect is empty. It is used when the shared quad state and above
- // variables determine that the quad is not fully opaque but may be partially opaque.
- IntRect m_opaqueRect;
};
}
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCQuadCuller.cpp (105370 => 105371)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCQuadCuller.cpp 2012-01-19 02:02:04 UTC (rev 105370)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCQuadCuller.cpp 2012-01-19 02:39:04 UTC (rev 105371)
@@ -77,8 +77,8 @@
bool keepQuad = !regionContainsRect(opaqueCoverageThusFar, quadRect);
- if (keepQuad && drawQuad->isLayerAxisAlignedIntRect())
- opaqueCoverageThusFar.unite(drawQuad->quadTransform().mapRect(drawQuad->opaqueRect()));
+ if (keepQuad && drawQuad->drawsOpaque() && drawQuad->isLayerAxisAlignedIntRect())
+ opaqueCoverageThusFar.unite(Region(quadRect));
if (keepQuad)
culledList.append(quadList[i].release());
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCSolidColorDrawQuad.cpp (105370 => 105371)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCSolidColorDrawQuad.cpp 2012-01-19 02:02:04 UTC (rev 105370)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCSolidColorDrawQuad.cpp 2012-01-19 02:39:04 UTC (rev 105371)
@@ -40,8 +40,6 @@
{
if (m_color.alpha() != 1)
m_quadOpaque = false;
- else
- m_opaqueRect = quadRect;
}
}
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCTileDrawQuad.cpp (105370 => 105371)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCTileDrawQuad.cpp 2012-01-19 02:02:04 UTC (rev 105370)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCTileDrawQuad.cpp 2012-01-19 02:39:04 UTC (rev 105371)
@@ -29,12 +29,12 @@
namespace WebCore {
-PassOwnPtr<CCTileDrawQuad> CCTileDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, const IntRect& opaqueRect, Platform3DObject textureId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA)
+PassOwnPtr<CCTileDrawQuad> CCTileDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, Platform3DObject textureId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA)
{
- return adoptPtr(new CCTileDrawQuad(sharedQuadState, quadRect, opaqueRect, textureId, textureOffset, textureSize, textureFilter, swizzleContents, leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA));
+ return adoptPtr(new CCTileDrawQuad(sharedQuadState, quadRect, textureId, textureOffset, textureSize, textureFilter, swizzleContents, leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA));
}
-CCTileDrawQuad::CCTileDrawQuad(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, const IntRect& opaqueRect, Platform3DObject textureId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA)
+CCTileDrawQuad::CCTileDrawQuad(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, Platform3DObject textureId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA)
: CCDrawQuad(sharedQuadState, CCDrawQuad::TiledContent, quadRect)
, m_textureId(textureId)
, m_textureOffset(textureOffset)
@@ -48,7 +48,6 @@
{
if (isAntialiased())
m_needsBlending = true;
- m_opaqueRect = opaqueRect;
}
}
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCTileDrawQuad.h (105370 => 105371)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCTileDrawQuad.h 2012-01-19 02:02:04 UTC (rev 105370)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCTileDrawQuad.h 2012-01-19 02:39:04 UTC (rev 105371)
@@ -35,7 +35,7 @@
class CCTileDrawQuad : public CCDrawQuad {
WTF_MAKE_NONCOPYABLE(CCTileDrawQuad);
public:
- static PassOwnPtr<CCTileDrawQuad> create(const CCSharedQuadState*, const IntRect& quadRect, const IntRect& opaqueRect, Platform3DObject textureId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
+ static PassOwnPtr<CCTileDrawQuad> create(const CCSharedQuadState*, const IntRect& quadRect, Platform3DObject textureId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
Platform3DObject textureId() const { return m_textureId; }
IntPoint textureOffset() const { return m_textureOffset; }
@@ -51,7 +51,7 @@
bool isAntialiased() const { return leftEdgeAA() || topEdgeAA() || rightEdgeAA() || bottomEdgeAA(); }
private:
- CCTileDrawQuad(const CCSharedQuadState*, const IntRect& quadRect, const IntRect& opaqueRect, Platform3DObject textureId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
+ CCTileDrawQuad(const CCSharedQuadState*, const IntRect& quadRect, Platform3DObject textureId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
Platform3DObject m_textureId;
IntPoint m_textureOffset;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp (105370 => 105371)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp 2012-01-19 02:02:04 UTC (rev 105370)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp 2012-01-19 02:39:04 UTC (rev 105371)
@@ -51,13 +51,8 @@
Platform3DObject textureId() const { return m_textureId; }
void setTextureId(Platform3DObject textureId) { m_textureId = textureId; }
-
- const IntRect& opaqueRect() const { return m_opaqueRect; }
- void setOpaqueRect(const IntRect& opaqueRect) { m_opaqueRect = opaqueRect; }
-
private:
Platform3DObject m_textureId;
- IntRect m_opaqueRect;
};
CCTiledLayerImpl::CCTiledLayerImpl(int id)
@@ -164,7 +159,7 @@
bool bottomEdgeAA = j == m_tiler->numTilesY() - 1 && useAA;
const GC3Dint textureFilter = m_tiler->hasBorderTexels() ? GraphicsContext3D::LINEAR : GraphicsContext3D::NEAREST;
- quadList.append(CCTileDrawQuad::create(sharedQuadState, tileRect, tile->opaqueRect(), tile->textureId(), textureOffset, textureSize, textureFilter, contentsSwizzled(), leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA));
+ quadList.append(CCTileDrawQuad::create(sharedQuadState, tileRect, tile->textureId(), textureOffset, textureSize, textureFilter, contentsSwizzled(), leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA));
if (hasDebugBorders()) {
Color color(debugBorderColor().red(), debugBorderColor().green(), debugBorderColor().blue(), debugTileBorderAlpha);
@@ -183,15 +178,14 @@
*m_tiler = tiler;
}
-void CCTiledLayerImpl::pushTileProperties(int i, int j, Platform3DObject textureId, const IntRect& opaqueRect)
+void CCTiledLayerImpl::syncTextureId(int i, int j, Platform3DObject textureId)
{
DrawableTile* tile = tileAt(i, j);
if (!tile)
tile = createTile(i, j);
tile->setTextureId(textureId);
- tile->setOpaqueRect(opaqueRect);
}
-} // namespace WebCore
+}
#endif // USE(ACCELERATED_COMPOSITING)
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.h (105370 => 105371)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.h 2012-01-19 02:02:04 UTC (rev 105370)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.h 2012-01-19 02:39:04 UTC (rev 105371)
@@ -51,7 +51,7 @@
void setSkipsDraw(bool skipsDraw) { m_skipsDraw = skipsDraw; }
void setTilingData(const CCLayerTilingData& tiler);
- void pushTileProperties(int, int, Platform3DObject textureId, const IntRect& opaqueRect);
+ void syncTextureId(int, int, Platform3DObject textureId);
void setContentsSwizzled(bool contentsSwizzled) { m_contentsSwizzled = contentsSwizzled; }
bool contentsSwizzled() const { return m_contentsSwizzled; }
Modified: trunk/Source/WebKit/chromium/ChangeLog (105370 => 105371)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-01-19 02:02:04 UTC (rev 105370)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-01-19 02:39:04 UTC (rev 105371)
@@ -1,3 +1,23 @@
+2012-01-18 James Robinson <jam...@chromium.org>
+
+ Unreviewed, rolling out r105366.
+ http://trac.webkit.org/changeset/105366
+ https://bugs.webkit.org/show_bug.cgi?id=76015
+
+ Breaks CCLayerTreeHostImplTest unit test
+
+ * tests/CCQuadCullerTest.cpp:
+ (WebCore::TestDrawQuad::TestDrawQuad):
+ (WebCore::TestDrawQuad::create):
+ (WebCore::setQuads):
+ * tests/CCTiledLayerImplTest.cpp:
+ (WebCore::createLayer):
+ (WebCore::TEST):
+ (WebCore::getQuads):
+ (WebCore::coverageVisibleRectOnTileBoundaries):
+ (WebCore::coverageVisibleRectIntersectsTiles):
+ (WebCore::coverageVisibleRectIntersectsBounds):
+
2012-01-18 Dana Jansens <dan...@chromium.org>
[chromium] Use region reported painted opaque for draw culling
Modified: trunk/Source/WebKit/chromium/tests/CCQuadCullerTest.cpp (105370 => 105371)
--- trunk/Source/WebKit/chromium/tests/CCQuadCullerTest.cpp 2012-01-19 02:02:04 UTC (rev 105370)
+++ trunk/Source/WebKit/chromium/tests/CCQuadCullerTest.cpp 2012-01-19 02:39:04 UTC (rev 105371)
@@ -38,36 +38,35 @@
class TestDrawQuad : public CCDrawQuad {
public:
- TestDrawQuad(const CCSharedQuadState* state, Material m, const IntRect& rect, const IntRect& opaqueRect)
+ TestDrawQuad(const CCSharedQuadState* state, Material m, const IntRect& rect)
: CCDrawQuad(state, m, rect)
{
- m_opaqueRect = opaqueRect;
}
- static PassOwnPtr<TestDrawQuad> create(const CCSharedQuadState* state, Material m, const IntRect& rect, const IntRect& opaqueRect)
+ static PassOwnPtr<TestDrawQuad> create(const CCSharedQuadState* state, Material m, const IntRect& rect)
{
- return adoptPtr(new TestDrawQuad(state, m, rect, opaqueRect));
+ return adoptPtr(new TestDrawQuad(state, m, rect));
}
};
-void setQuads(CCSharedQuadState* rootState, CCSharedQuadState* childState, CCQuadList& quadList, const IntRect& childOpaqueRect = IntRect())
+void setQuads(CCSharedQuadState* rootState, CCSharedQuadState* childState, CCQuadList& quadList)
{
quadList.clear();
- quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(), IntSize(100, 100)), childOpaqueRect));
- quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(100, 0), IntSize(100, 100)), childOpaqueRect));
- quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(200, 0), IntSize(100, 100)), childOpaqueRect));
- quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(0, 100), IntSize(100, 100)), childOpaqueRect));
- quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(100, 100), IntSize(100, 100)), childOpaqueRect));
- quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(200, 100), IntSize(100, 100)), childOpaqueRect));
- quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(0, 200), IntSize(100, 100)), childOpaqueRect));
- quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(100, 200), IntSize(100, 100)), childOpaqueRect));
- quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(200, 200), IntSize(100, 100)), childOpaqueRect));
+ quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(), IntSize(100, 100))));
+ quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(100, 0), IntSize(100, 100))));
+ quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(200, 0), IntSize(100, 100))));
+ quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(0, 100), IntSize(100, 100))));
+ quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(100, 100), IntSize(100, 100))));
+ quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(200, 100), IntSize(100, 100))));
+ quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(0, 200), IntSize(100, 100))));
+ quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(100, 200), IntSize(100, 100))));
+ quadList.append(TestDrawQuad::create(rootState, CCDrawQuad::TiledContent, IntRect(IntPoint(200, 200), IntSize(100, 100))));
- quadList.append(TestDrawQuad::create(childState, CCDrawQuad::TiledContent, IntRect(IntPoint(), IntSize(100, 100)), childOpaqueRect));
- quadList.append(TestDrawQuad::create(childState, CCDrawQuad::TiledContent, IntRect(IntPoint(100, 0), IntSize(100, 100)), childOpaqueRect));
- quadList.append(TestDrawQuad::create(childState, CCDrawQuad::TiledContent, IntRect(IntPoint(0, 100), IntSize(100, 100)), childOpaqueRect));
- quadList.append(TestDrawQuad::create(childState, CCDrawQuad::TiledContent, IntRect(IntPoint(100, 100), IntSize(100, 100)), childOpaqueRect));
+ quadList.append(TestDrawQuad::create(childState, CCDrawQuad::TiledContent, IntRect(IntPoint(), IntSize(100, 100))));
+ quadList.append(TestDrawQuad::create(childState, CCDrawQuad::TiledContent, IntRect(IntPoint(100, 0), IntSize(100, 100))));
+ quadList.append(TestDrawQuad::create(childState, CCDrawQuad::TiledContent, IntRect(IntPoint(0, 100), IntSize(100, 100))));
+ quadList.append(TestDrawQuad::create(childState, CCDrawQuad::TiledContent, IntRect(IntPoint(100, 100), IntSize(100, 100))));
}
#define DECLARE_AND_INITIALIZE_TEST_QUADS \
@@ -147,54 +146,6 @@
EXPECT_EQ(quadList.size(), 9u);
}
-TEST(CCQuadCullerTest, verifyCullSubRegion)
-{
- DECLARE_AND_INITIALIZE_TEST_QUADS
-
- childTransform.translate(50, 50);
-
- OwnPtr<CCSharedQuadState> rootState = CCSharedQuadState::create(TransformationMatrix(), TransformationMatrix(), rootRect, IntRect(), 1.0, true);
- OwnPtr<CCSharedQuadState> childState = CCSharedQuadState::create(childTransform, TransformationMatrix(), childRect, IntRect(), 1.0, false);
- IntRect childOpaqueRect(childRect.x() + childRect.width() / 4, childRect.y() + childRect.height() / 4, childRect.width() / 2, childRect.height() / 2);
-
- setQuads(rootState.get(), childState.get(), quadList, childOpaqueRect);
- EXPECT_EQ(quadList.size(), 13u);
- CCQuadCuller::cullOccludedQuads(quadList);
- EXPECT_EQ(quadList.size(), 12u);
-}
-
-TEST(CCQuadCullerTest, verifyCullSubRegion2)
-{
- DECLARE_AND_INITIALIZE_TEST_QUADS
-
- childTransform.translate(50, 10);
-
- OwnPtr<CCSharedQuadState> rootState = CCSharedQuadState::create(TransformationMatrix(), TransformationMatrix(), rootRect, IntRect(), 1.0, true);
- OwnPtr<CCSharedQuadState> childState = CCSharedQuadState::create(childTransform, TransformationMatrix(), childRect, IntRect(), 1.0, false);
- IntRect childOpaqueRect(childRect.x() + childRect.width() / 4, childRect.y() + childRect.height() / 4, childRect.width() / 2, childRect.height() * 3 / 4);
-
- setQuads(rootState.get(), childState.get(), quadList, childOpaqueRect);
- EXPECT_EQ(quadList.size(), 13u);
- CCQuadCuller::cullOccludedQuads(quadList);
- EXPECT_EQ(quadList.size(), 12u);
-}
-
-TEST(CCQuadCullerTest, verifyCullSubRegionCheckOvercull)
-{
- DECLARE_AND_INITIALIZE_TEST_QUADS
-
- childTransform.translate(50, 49);
-
- OwnPtr<CCSharedQuadState> rootState = CCSharedQuadState::create(TransformationMatrix(), TransformationMatrix(), rootRect, IntRect(), 1.0, true);
- OwnPtr<CCSharedQuadState> childState = CCSharedQuadState::create(childTransform, TransformationMatrix(), childRect, IntRect(), 1.0, false);
- IntRect childOpaqueRect(childRect.x() + childRect.width() / 4, childRect.y() + childRect.height() / 4, childRect.width() / 2, childRect.height() / 2);
-
- setQuads(rootState.get(), childState.get(), quadList, childOpaqueRect);
- EXPECT_EQ(quadList.size(), 13u);
- CCQuadCuller::cullOccludedQuads(quadList);
- EXPECT_EQ(quadList.size(), 13u);
-}
-
TEST(CCQuadCullerTest, verifyNonAxisAlignedQuadsDontOcclude)
{
DECLARE_AND_INITIALIZE_TEST_QUADS
Modified: trunk/Source/WebKit/chromium/tests/CCTiledLayerImplTest.cpp (105370 => 105371)
--- trunk/Source/WebKit/chromium/tests/CCTiledLayerImplTest.cpp 2012-01-19 02:02:04 UTC (rev 105370)
+++ trunk/Source/WebKit/chromium/tests/CCTiledLayerImplTest.cpp 2012-01-19 02:39:04 UTC (rev 105371)
@@ -46,12 +46,11 @@
layer->setTilingData(*tiler);
layer->setSkipsDraw(false);
layer->setVisibleLayerRect(IntRect(IntPoint(), layerSize));
- layer->setDrawOpacity(1);
int textureId = 1;
for (int i = 0; i < tiler->numTilesX(); ++i)
for (int j = 0; j < tiler->numTilesY(); ++j)
- layer->pushTileProperties(i, j, static_cast<Platform3DObject>(textureId++), IntRect(0, 0, 1, 1));
+ layer->syncTextureId(i, j, static_cast<Platform3DObject>(textureId++));
return layer.release();
}
@@ -135,7 +134,7 @@
for (int i = 0; i < numTilesX; ++i)
for (int j = 0; j < numTilesY; ++j)
- layer->pushTileProperties(i, j, static_cast<Platform3DObject>(0), IntRect());
+ layer->syncTextureId(i, j, static_cast<Platform3DObject>(0));
// All checkerboarding
{
@@ -156,7 +155,7 @@
return tester.isEmpty();
}
-static PassOwnPtr<CCSharedQuadState> getQuads(CCQuadList& quads, IntSize tileSize, const IntSize& layerSize, CCLayerTilingData::BorderTexelOption borderTexelOption, const IntRect& visibleLayerRect)
+static void getQuads(CCQuadList& quads, IntSize tileSize, const IntSize& layerSize, CCLayerTilingData::BorderTexelOption borderTexelOption, const IntRect& visibleLayerRect)
{
RefPtr<CCTiledLayerImpl> layer = createLayer(tileSize, layerSize, borderTexelOption);
layer->setVisibleLayerRect(visibleLayerRect);
@@ -164,7 +163,6 @@
OwnPtr<CCSharedQuadState> sharedQuadState = layer->createSharedQuadState();
layer->appendQuads(quads, sharedQuadState.get());
- return sharedQuadState.release(); // The shared data must be owned as long as the quad list exists.
}
// Align with expected and actual output
@@ -202,8 +200,7 @@
IntSize layerSize(1000, 1000);
CCQuadList quads;
- OwnPtr<CCSharedQuadState> sharedState;
- sharedState = getQuads(quads, IntSize(100, 100), layerSize, borders, IntRect(IntPoint(), layerSize));
+ getQuads(quads, IntSize(100, 100), layerSize, borders, IntRect(IntPoint(), layerSize));
verifyQuadsExactlyCoverRect(quads, IntRect(IntPoint(), layerSize));
}
WITH_AND_WITHOUT_BORDER_TEST(coverageVisibleRectOnTileBoundaries);
@@ -219,8 +216,7 @@
IntSize layerSize(250, 250);
CCQuadList quads;
- OwnPtr<CCSharedQuadState> sharedState;
- sharedState = getQuads(quads, IntSize(50, 50), IntSize(250, 250), CCLayerTilingData::NoBorderTexels, visibleLayerRect);
+ getQuads(quads, IntSize(50, 50), IntSize(250, 250), CCLayerTilingData::NoBorderTexels, visibleLayerRect);
verifyQuadsExactlyCoverRect(quads, visibleLayerRect);
}
WITH_AND_WITHOUT_BORDER_TEST(coverageVisibleRectIntersectsTiles);
@@ -232,8 +228,7 @@
IntSize layerSize(220, 210);
IntRect visibleLayerRect(IntPoint(), layerSize);
CCQuadList quads;
- OwnPtr<CCSharedQuadState> sharedState;
- sharedState = getQuads(quads, IntSize(100, 100), layerSize, CCLayerTilingData::NoBorderTexels, visibleLayerRect);
+ getQuads(quads, IntSize(100, 100), layerSize, CCLayerTilingData::NoBorderTexels, visibleLayerRect);
verifyQuadsExactlyCoverRect(quads, visibleLayerRect);
}
WITH_AND_WITHOUT_BORDER_TEST(coverageVisibleRectIntersectsBounds);
@@ -245,8 +240,7 @@
IntSize tileSize(50, 50);
IntSize layerSize(250, 250);
CCQuadList quads;
- OwnPtr<CCSharedQuadState> sharedState;
- sharedState = getQuads(quads, tileSize, layerSize, CCLayerTilingData::NoBorderTexels, IntRect(IntPoint(), layerSize));
+ getQuads(quads, tileSize, layerSize, CCLayerTilingData::NoBorderTexels, IntRect(IntPoint(), layerSize));
for (size_t i = 0; i < quads.size(); ++i) {
ASSERT_EQ(quads[i]->material(), CCDrawQuad::TiledContent) << quadString << i;
@@ -255,26 +249,8 @@
EXPECT_NE(quad->textureId(), 0u) << quadString << i;
EXPECT_EQ(quad->textureOffset(), IntPoint()) << quadString << i;
EXPECT_EQ(quad->textureSize(), tileSize) << quadString << i;
- EXPECT_EQ(IntRect(0, 0, 1, 1), quad->opaqueRect()) << quadString << i;
}
}
-TEST(CCTiledLayerImplTest, tileOpaqueRectForLayerNoBorders)
-{
- DebugScopedSetImplThread scopedImplThread;
- IntSize tileSize(50, 50);
- IntSize layerSize(250, 250);
- CCQuadList quads;
- OwnPtr<CCSharedQuadState> sharedState;
- sharedState = getQuads(quads, tileSize, layerSize, CCLayerTilingData::NoBorderTexels, IntRect(IntPoint(), layerSize));
-
- for (size_t i = 0; i < quads.size(); ++i) {
- ASSERT_EQ(quads[i]->material(), CCDrawQuad::TiledContent) << quadString << i;
- CCTileDrawQuad* quad = static_cast<CCTileDrawQuad*>(quads[i].get());
-
- EXPECT_EQ(IntRect(0, 0, 1, 1), quad->opaqueRect()) << quadString << i;
- }
-}
-
} // namespace
