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

Unified Diff: cc/trees/occlusion_tracker_unittest.cc

Issue 2857343002: Delete LayerImpl::GetRenderSurface. (Closed)
Patch Set: none Created 3 years, 8 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
« no previous file with comments | « cc/trees/layer_tree_impl_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/occlusion_tracker_unittest.cc
diff --git a/cc/trees/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc
index 0f1f93ccd0014ae46de43c38c8f111258ab3aa2e..8389954958e4689b8ff28fc37e6b81cb151a878e 100644
--- a/cc/trees/occlusion_tracker_unittest.cc
+++ b/cc/trees/occlusion_tracker_unittest.cc
@@ -19,6 +19,7 @@
#include "cc/test/fake_layer_tree_host.h"
#include "cc/test/fake_layer_tree_host_impl.h"
#include "cc/test/geometry_test_utils.h"
+#include "cc/test/layer_test_common.h"
#include "cc/test/test_occlusion_tracker.h"
#include "cc/test/test_task_graph_runner.h"
#include "cc/trees/layer_tree_host_common.h"
@@ -77,7 +78,7 @@ class TestOcclusionTrackerWithClip : public TestOcclusionTracker {
gfx::Rect UnoccludedSurfaceContentRect(const LayerImpl* layer,
const gfx::Rect& content_rect) const {
- RenderSurfaceImpl* surface = layer->GetRenderSurface();
+ const RenderSurfaceImpl* surface = GetRenderSurface(layer);
return this->GetCurrentOcclusionForContributingSurface(
surface->draw_transform())
.GetUnoccludedContentRect(content_rect);
@@ -247,7 +248,7 @@ class OcclusionTrackerTest : public testing::Test {
void EnterContributingSurface(LayerImpl* layer, OcclusionTracker* occlusion) {
ASSERT_EQ(layer_iterator_->target_render_surface(),
- layer->GetRenderSurface());
+ GetRenderSurface(layer));
ASSERT_TRUE(layer_iterator_->state() ==
EffectTreeLayerListIterator::State::TARGET_SURFACE);
occlusion->EnterLayer(*layer_iterator_);
@@ -260,7 +261,7 @@ class OcclusionTrackerTest : public testing::Test {
void LeaveContributingSurface(LayerImpl* layer, OcclusionTracker* occlusion) {
ASSERT_EQ(layer_iterator_->current_render_surface(),
- layer->GetRenderSurface());
+ GetRenderSurface(layer));
ASSERT_TRUE(layer_iterator_->state() ==
EffectTreeLayerListIterator::State::CONTRIBUTING_SURFACE);
occlusion->LeaveLayer(*layer_iterator_);
« no previous file with comments | « cc/trees/layer_tree_impl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698