Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(370)

Side by Side Diff: cc/CCOcclusionTrackerTest.cpp

Issue 11079012: Refactor CCLayerTreeHostCommon - merge visible rect computation into calc draw transforms. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Same patch without renaming calculateVisibleRect() Created 8 years, 2 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 unified diff | Download patch
« cc/CCLayerTreeHostCommon.cpp ('K') | « cc/CCLayerTreeHostImpl.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "CCOcclusionTracker.h" 7 #include "CCOcclusionTracker.h"
8 8
9 #include "CCAnimationTestCommon.h" 9 #include "CCAnimationTestCommon.h"
10 #include "CCGeometryTestUtils.h" 10 #include "CCGeometryTestUtils.h"
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 234
235 void calcDrawEtc(TestContentLayerImpl* root) 235 void calcDrawEtc(TestContentLayerImpl* root)
236 { 236 {
237 ASSERT(root == m_root.get()); 237 ASSERT(root == m_root.get());
238 int dummyMaxTextureSize = 512; 238 int dummyMaxTextureSize = 512;
239 CCLayerSorter layerSorter; 239 CCLayerSorter layerSorter;
240 240
241 ASSERT(!root->renderSurface()); 241 ASSERT(!root->renderSurface());
242 242
243 CCLayerTreeHostCommon::calculateDrawTransforms(root, root->bounds(), 1, &layerSorter, dummyMaxTextureSize, m_renderSurfaceLayerListImpl); 243 CCLayerTreeHostCommon::calculateDrawTransforms(root, root->bounds(), 1, &layerSorter, dummyMaxTextureSize, m_renderSurfaceLayerListImpl);
244 CCLayerTreeHostCommon::calculateVisibleRects(m_renderSurfaceLayerListImp l);
245 244
246 m_layerIterator = m_layerIteratorBegin = Types::LayerIterator::begin(&m_ renderSurfaceLayerListImpl); 245 m_layerIterator = m_layerIteratorBegin = Types::LayerIterator::begin(&m_ renderSurfaceLayerListImpl);
247 } 246 }
248 247
249 void calcDrawEtc(TestContentLayerChromium* root) 248 void calcDrawEtc(TestContentLayerChromium* root)
250 { 249 {
251 ASSERT(root == m_root.get()); 250 ASSERT(root == m_root.get());
252 int dummyMaxTextureSize = 512; 251 int dummyMaxTextureSize = 512;
253 252
254 ASSERT(!root->renderSurface()); 253 ASSERT(!root->renderSurface());
255 254
256 CCLayerTreeHostCommon::calculateDrawTransforms(root, root->bounds(), 1, dummyMaxTextureSize, m_renderSurfaceLayerListChromium); 255 CCLayerTreeHostCommon::calculateDrawTransforms(root, root->bounds(), 1, dummyMaxTextureSize, m_renderSurfaceLayerListChromium);
257 CCLayerTreeHostCommon::calculateVisibleRects(m_renderSurfaceLayerListChr omium);
258 256
259 m_layerIterator = m_layerIteratorBegin = Types::LayerIterator::begin(&m_ renderSurfaceLayerListChromium); 257 m_layerIterator = m_layerIteratorBegin = Types::LayerIterator::begin(&m_ renderSurfaceLayerListChromium);
260 } 258 }
261 259
262 void enterLayer(typename Types::LayerType* layer, typename Types::OcclusionT rackerType& occlusion) 260 void enterLayer(typename Types::LayerType* layer, typename Types::OcclusionT rackerType& occlusion)
263 { 261 {
264 ASSERT_EQ(layer, *m_layerIterator); 262 ASSERT_EQ(layer, *m_layerIterator);
265 ASSERT_TRUE(m_layerIterator.representsItself()); 263 ASSERT_TRUE(m_layerIterator.representsItself());
266 occlusion.enterLayer(m_layerIterator); 264 occlusion.enterLayer(m_layerIterator);
267 } 265 }
(...skipping 2738 matching lines...) Expand 10 before | Expand all | Expand 10 after
3006 EXPECT_RECT_EQ(IntRect(IntPoint(), trackingSize), occlusion.occlusionInS creenSpace().bounds()); 3004 EXPECT_RECT_EQ(IntRect(IntPoint(), trackingSize), occlusion.occlusionInS creenSpace().bounds());
3007 EXPECT_EQ(1u, occlusion.occlusionInScreenSpace().rects().size()); 3005 EXPECT_EQ(1u, occlusion.occlusionInScreenSpace().rects().size());
3008 EXPECT_RECT_EQ(IntRect(IntPoint(), trackingSize), occlusion.occlusionInT argetSurface().bounds()); 3006 EXPECT_RECT_EQ(IntRect(IntPoint(), trackingSize), occlusion.occlusionInT argetSurface().bounds());
3009 EXPECT_EQ(1u, occlusion.occlusionInTargetSurface().rects().size()); 3007 EXPECT_EQ(1u, occlusion.occlusionInTargetSurface().rects().size());
3010 } 3008 }
3011 }; 3009 };
3012 3010
3013 ALL_CCOCCLUSIONTRACKER_TEST(CCOcclusionTrackerTestMinimumTrackingSize); 3011 ALL_CCOCCLUSIONTRACKER_TEST(CCOcclusionTrackerTestMinimumTrackingSize);
3014 3012
3015 } // namespace 3013 } // namespace
OLDNEW
« cc/CCLayerTreeHostCommon.cpp ('K') | « cc/CCLayerTreeHostImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698