cc/CCLayerTreeHostTest.cpp - Issue 10916292: Adaptively throttle texture uploads

Unified Diff: cc/CCLayerTreeHostTest.cpp

Issue 10916292: Adaptively throttle texture uploads (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: cc_unittests passing again Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: cc/CCLayerTreeHostTest.cpp

diff --git a/cc/CCLayerTreeHostTest.cpp b/cc/CCLayerTreeHostTest.cpp

index 555eec7c5f5dc025a457a5f571511570dfd292a2..85ba23ca0e99ed6beb13acc23ddf34b86ef93e84 100644

--- a/cc/CCLayerTreeHostTest.cpp

+++ b/cc/CCLayerTreeHostTest.cpp

@@ -1673,7 +1673,7 @@ public:

m_layerTreeHost->setViewportSize(rootLayer->bounds(), rootLayer->bounds());

ASSERT_TRUE(m_layerTreeHost->initializeRendererIfNeeded());

CCTextureUpdateQueue queue;

- m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max());

+ m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max(), std::numeric_limits<size_t>::max());

m_layerTreeHost->commitComplete();

EXPECT_RECT_EQ(IntRect(), grandChild->occludedScreenSpace().bounds());

@@ -1690,7 +1690,7 @@ public:

m_layerTreeHost->setRootLayer(rootLayer);

m_layerTreeHost->setViewportSize(rootLayer->bounds(), rootLayer->bounds());

- m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max());

+ m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max(), std::numeric_limits<size_t>::max());

m_layerTreeHost->commitComplete();

EXPECT_RECT_EQ(IntRect(), grandChild->occludedScreenSpace().bounds());

@@ -1708,7 +1708,7 @@ public:

m_layerTreeHost->setRootLayer(rootLayer);

m_layerTreeHost->setViewportSize(rootLayer->bounds(), rootLayer->bounds());

- m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max());

+ m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max(), std::numeric_limits<size_t>::max());

m_layerTreeHost->commitComplete();

EXPECT_RECT_EQ(IntRect(), grandChild->occludedScreenSpace().bounds());

@@ -1728,7 +1728,7 @@ public:

m_layerTreeHost->setRootLayer(rootLayer);

m_layerTreeHost->setViewportSize(rootLayer->bounds(), rootLayer->bounds());

- m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max());

+ m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max(), std::numeric_limits<size_t>::max());

m_layerTreeHost->commitComplete();

EXPECT_RECT_EQ(IntRect(), grandChild->occludedScreenSpace().bounds());

@@ -1750,7 +1750,7 @@ public:

m_layerTreeHost->setRootLayer(rootLayer);

m_layerTreeHost->setViewportSize(rootLayer->bounds(), rootLayer->bounds());

- m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max());

+ m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max(), std::numeric_limits<size_t>::max());

m_layerTreeHost->commitComplete();

EXPECT_RECT_EQ(IntRect(), grandChild->occludedScreenSpace().bounds());

@@ -1772,7 +1772,7 @@ public:

m_layerTreeHost->setRootLayer(rootLayer);

m_layerTreeHost->setViewportSize(rootLayer->bounds(), rootLayer->bounds());

- m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max());

+ m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max(), std::numeric_limits<size_t>::max());

m_layerTreeHost->commitComplete();

EXPECT_RECT_EQ(IntRect(), child2->occludedScreenSpace().bounds());

@@ -1795,7 +1795,7 @@ public:

m_layerTreeHost->setRootLayer(rootLayer);

m_layerTreeHost->setViewportSize(rootLayer->bounds(), rootLayer->bounds());

- m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max());

+ m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max(), std::numeric_limits<size_t>::max());

m_layerTreeHost->commitComplete();

EXPECT_RECT_EQ(IntRect(), grandChild->occludedScreenSpace().bounds());

@@ -1818,7 +1818,7 @@ public:

m_layerTreeHost->setRootLayer(rootLayer);

m_layerTreeHost->setViewportSize(rootLayer->bounds(), rootLayer->bounds());

- m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max());

+ m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max(), std::numeric_limits<size_t>::max());

m_layerTreeHost->commitComplete();

EXPECT_RECT_EQ(IntRect(), child2->occludedScreenSpace().bounds());

@@ -1881,7 +1881,7 @@ public:

m_layerTreeHost->setViewportSize(rootLayer->bounds(), rootLayer->bounds());

ASSERT_TRUE(m_layerTreeHost->initializeRendererIfNeeded());

CCTextureUpdateQueue queue;

- m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max());

+ m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max(), std::numeric_limits<size_t>::max());

m_layerTreeHost->commitComplete();

EXPECT_RECT_EQ(IntRect(), child2->occludedScreenSpace().bounds());

@@ -1908,7 +1908,7 @@ public:

m_layerTreeHost->setRootLayer(rootLayer);

m_layerTreeHost->setViewportSize(rootLayer->bounds(), rootLayer->bounds());

- m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max());

+ m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max(), std::numeric_limits<size_t>::max());

m_layerTreeHost->commitComplete();

EXPECT_RECT_EQ(IntRect(), child2->occludedScreenSpace().bounds());

@@ -1970,7 +1970,7 @@ public:

m_layerTreeHost->setViewportSize(layers[0]->bounds(), layers[0]->bounds());

ASSERT_TRUE(m_layerTreeHost->initializeRendererIfNeeded());

CCTextureUpdateQueue queue;

- m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max());

+ m_layerTreeHost->updateLayers(queue, std::numeric_limits<size_t>::max(), std::numeric_limits<size_t>::max());

m_layerTreeHost->commitComplete();

for (int i = 0; i < numSurfaces-1; ++i) {

« no previous file with comments | « cc/CCLayerTreeHost.cpp ('k') | cc/CCProxy.h » ('j') | cc/CCTextureUpdateController.cpp » ('J')