summaryrefslogtreecommitdiffstats
path: root/cc/trees/occlusion_tracker_unittest.cc
diff options
context:
space:
mode:
authorvollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-15 18:22:27 +0000
committervollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-15 18:22:27 +0000
commit8d96434f9b5e6dca2ee4b6417bf7392b3c2a7b70 (patch)
tree9957e5b9a712851d9f38c46a9b5040553dea62f5 /cc/trees/occlusion_tracker_unittest.cc
parent40c2a1b88240d7bdb12c5cc0ac31788082793469 (diff)
downloadchromium_src-8d96434f9b5e6dca2ee4b6417bf7392b3c2a7b70.zip
chromium_src-8d96434f9b5e6dca2ee4b6417bf7392b3c2a7b70.tar.gz
chromium_src-8d96434f9b5e6dca2ee4b6417bf7392b3c2a7b70.tar.bz2
Remove hit-testing-only RSLL entries
As of https://codereview.chromium.org/266913021/ we no longer hit test via the RSLL; we walk the tree instead. This means we can remove the machinery added to allow hidden layers to appear in the RSLL for hit testing purposes. This is essentially a revert of https://codereview.chromium.org/25712004 R=danakj@chromium.org BUG=None Review URL: https://codereview.chromium.org/289973003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/occlusion_tracker_unittest.cc')
-rw-r--r--cc/trees/occlusion_tracker_unittest.cc39
1 files changed, 0 insertions, 39 deletions
diff --git a/cc/trees/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc
index 8f083f5..4687dab 100644
--- a/cc/trees/occlusion_tracker_unittest.cc
+++ b/cc/trees/occlusion_tracker_unittest.cc
@@ -328,14 +328,6 @@ template <typename Types> class OcclusionTrackerTest : public testing::Test {
Types::TestLayerIterator::Begin(render_surface_layer_list_.get());
}
- void SetDrawsContent(LayerImpl* layer_impl, bool draws_content) {
- layer_impl->SetDrawsContent(draws_content);
- }
-
- void SetDrawsContent(Layer* layer, bool draws_content) {
- layer->SetIsDrawable(draws_content);
- }
-
void EnterLayer(typename Types::LayerType* layer,
typename Types::OcclusionTrackerType* occlusion) {
ASSERT_EQ(layer, *layer_iterator_);
@@ -3565,36 +3557,5 @@ class OcclusionTrackerTestHiddenCopyRequestDoesNotOcclude
ALL_OCCLUSIONTRACKER_TEST(OcclusionTrackerTestHiddenCopyRequestDoesNotOcclude)
-template <class Types>
-class OcclusionTrackerTestEmptyEventLayerDoesNotOcclude
- : public OcclusionTrackerTest<Types> {
- protected:
- explicit OcclusionTrackerTestEmptyEventLayerDoesNotOcclude(
- bool opaque_layers)
- : OcclusionTrackerTest<Types>(opaque_layers) {}
- void RunMyTest() {
- typename Types::ContentLayerType* root = this->CreateRoot(
- this->identity_matrix, gfx::Point(), gfx::Size(400, 400));
- typename Types::ContentLayerType* empty_layer = this->CreateDrawingLayer(
- root, this->identity_matrix, gfx::Point(), gfx::Size(200, 200), true);
- this->SetDrawsContent(empty_layer, false);
- empty_layer->SetTouchEventHandlerRegion(gfx::Rect(10, 10, 10, 10));
-
- this->CalcDrawEtc(root);
-
- TestOcclusionTrackerWithClip<typename Types::LayerType> occlusion(
- gfx::Rect(0, 0, 1000, 1000));
-
- this->VisitLayer(empty_layer, &occlusion);
-
- EXPECT_EQ(gfx::Rect().ToString(),
- occlusion.occlusion_from_outside_target().ToString());
- EXPECT_EQ(gfx::Rect().ToString(),
- occlusion.occlusion_from_inside_target().ToString());
- }
-};
-
-ALL_OCCLUSIONTRACKER_TEST(OcclusionTrackerTestEmptyEventLayerDoesNotOcclude)
-
} // namespace
} // namespace cc