summaryrefslogtreecommitdiffstats
path: root/cc/CCDamageTrackerTest.cpp
diff options
context:
space:
mode:
authorilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-20 04:09:51 +0000
committerilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-20 04:09:51 +0000
commit3b8b4771e372c145e07683c039bfd04f080061b4 (patch)
treeb3fcb68dc4810de2c2d84182c8f0703208bb58f1 /cc/CCDamageTrackerTest.cpp
parent79e0ea1be9350ef5153d88bf8c7a4b04c746fa87 (diff)
downloadchromium_src-3b8b4771e372c145e07683c039bfd04f080061b4.zip
chromium_src-3b8b4771e372c145e07683c039bfd04f080061b4.tar.gz
chromium_src-3b8b4771e372c145e07683c039bfd04f080061b4.tar.bz2
Revert 157700 - Add the ubercomp DelegatedRendererLayer.
This adds a layer that owns a set of RenderPasses with DrawQuads, and is able to insert those RenderPasses and DrawQuads into the current frame during CCLayerTreeHostImpl::calculateRenderPasses(). The layer owns whatever quads/passes you give to it, and copies them with modifications as needed into the current frame via the QuadSink. Quads from the layer's root RenderPass are merged into its target RenderPass, with the transform and opacity being modified if needed. Other RenderPasses are inserted into the frame as-is, with RenderPass ids being adjusted to not collide with any other RenderPasses in the frame, and using a scheme that allows the layer to reverse-lookup its own copy of a RenderPass from the id it generated. Moved from: https://bugs.webkit.org/show_bug.cgi?id=94145 Tests: CCDelegatedRendererLayerImplTestSimple.AddsContributingRenderPasses CCDelegatedRendererLayerImplTestSimple.AddsQuadsToContributingRenderPasses CCDelegatedRendererLayerImplTestSimple.AddsQuadsToTargetRenderPass CCDelegatedRendererLayerImplTestSimple.QuadsFromRootRenderPassAreModifiedForTheTarget CCDelegatedRendererLayerImplTestOwnSurface.AddsRenderPasses CCDelegatedRendererLayerImplTestOwnSurface.AddsQuadsToContributingRenderPasses CCDelegatedRendererLayerImplTestOwnSurface.AddsQuadsToTargetRenderPass CCDelegatedRendererLayerImplTestOwnSurface.QuadsFromRootRenderPassAreNotModifiedForTheTarget BUG=123445 Review URL: https://chromiumcodereview.appspot.com/10916307 TBR=danakj@chromium.org Review URL: https://codereview.chromium.org/10957011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/CCDamageTrackerTest.cpp')
-rw-r--r--cc/CCDamageTrackerTest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/CCDamageTrackerTest.cpp b/cc/CCDamageTrackerTest.cpp
index ee05a3a..bf290f2 100644
--- a/cc/CCDamageTrackerTest.cpp
+++ b/cc/CCDamageTrackerTest.cpp
@@ -1096,7 +1096,7 @@ TEST_F(CCDamageTrackerTest, verifyDamageForEmptyLayerList)
ASSERT_TRUE(root == root->renderTarget());
CCRenderSurface* targetSurface = root->renderSurface();
- targetSurface->clearLayerLists();
+ targetSurface->clearLayerList();
targetSurface->damageTracker()->updateDamageTrackingState(targetSurface->layerList(), targetSurface->owningLayerId(), false, IntRect(), 0, WebFilterOperations());
FloatRect damageRect = targetSurface->damageTracker()->currentDamageRect();