| Index: cc/output/overlay_unittest.cc
|
| diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc
|
| index 9d112535a88e1daf44894c433ec139623d2f75e4..54672a3b23f15928cf206bd75c23ad924b0dd1b9 100644
|
| --- a/cc/output/overlay_unittest.cc
|
| +++ b/cc/output/overlay_unittest.cc
|
| @@ -506,7 +506,7 @@ TEST_F(FullscreenOverlayTest, SuccessfulOverlay) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(1U, candidate_list.size());
|
| @@ -532,7 +532,7 @@ TEST_F(FullscreenOverlayTest, AlphaFail) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
|
|
| @@ -555,7 +555,7 @@ TEST_F(FullscreenOverlayTest, ResourceSizeInPixelsFail) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(0U, candidate_list.size());
|
| @@ -582,7 +582,7 @@ TEST_F(FullscreenOverlayTest, OnTopFail) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(0U, candidate_list.size());
|
| @@ -605,7 +605,7 @@ TEST_F(FullscreenOverlayTest, NotCoveringFullscreenFail) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(0U, candidate_list.size());
|
| @@ -635,7 +635,7 @@ TEST_F(FullscreenOverlayTest, RemoveFullscreenQuadFromQuadList) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(1U, candidate_list.size());
|
| @@ -665,7 +665,7 @@ TEST_F(SingleOverlayOnTopTest, SuccessfulOverlay) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(1U, candidate_list.size());
|
| @@ -713,7 +713,7 @@ TEST_F(SingleOverlayOnTopTest, PrioritizeBiggerOne) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(1U, candidate_list.size());
|
| @@ -754,7 +754,7 @@ TEST_F(SingleOverlayOnTopTest, DamageRect) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_TRUE(damage_rect_.IsEmpty());
|
| @@ -777,9 +777,9 @@ TEST_F(SingleOverlayOnTopTest, NoCandidates) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass_list.back().get(), render_pass_filters,
|
| - render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| - &damage_rect_, &content_bounds_);
|
| + resource_provider_.get(), pass_list.back().get(), false,
|
| + render_pass_filters, render_pass_background_filters, &candidate_list,
|
| + nullptr, nullptr, &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(0U, candidate_list.size());
|
| // There should be nothing new here.
|
| CompareRenderPassLists(pass_list, original_pass_list);
|
| @@ -806,9 +806,9 @@ TEST_F(SingleOverlayOnTopTest, OccludedCandidates) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass_list.back().get(), render_pass_filters,
|
| - render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| - &damage_rect_, &content_bounds_);
|
| + resource_provider_.get(), pass_list.back().get(), false,
|
| + render_pass_filters, render_pass_background_filters, &candidate_list,
|
| + nullptr, nullptr, &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(0U, candidate_list.size());
|
| // There should be nothing new here.
|
| CompareRenderPassLists(pass_list, original_pass_list);
|
| @@ -832,7 +832,7 @@ TEST_F(SingleOverlayOnTopTest, MultipleRenderPasses) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(1U, candidate_list.size());
|
| @@ -852,7 +852,7 @@ TEST_F(SingleOverlayOnTopTest, AcceptBlending) {
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| damage_rect_ = quad->rect;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(1U, candidate_list.size());
|
| @@ -871,7 +871,7 @@ TEST_F(SingleOverlayOnTopTest, RejectBackgroundColor) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(0U, candidate_list.size());
|
| @@ -888,7 +888,7 @@ TEST_F(SingleOverlayOnTopTest, RejectBlendMode) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(0U, candidate_list.size());
|
| @@ -905,7 +905,7 @@ TEST_F(SingleOverlayOnTopTest, RejectOpacity) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(0U, candidate_list.size());
|
| @@ -923,7 +923,7 @@ TEST_F(SingleOverlayOnTopTest, RejectNonAxisAlignedTransform) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(0U, candidate_list.size());
|
| @@ -941,7 +941,7 @@ TEST_F(SingleOverlayOnTopTest, AllowClipped) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(1U, candidate_list.size());
|
| @@ -960,7 +960,7 @@ TEST_F(UnderlayTest, AllowVerticalFlip) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(1U, candidate_list.size());
|
| @@ -982,7 +982,7 @@ TEST_F(UnderlayTest, AllowHorizontalFlip) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(1U, candidate_list.size());
|
| @@ -1002,7 +1002,7 @@ TEST_F(SingleOverlayOnTopTest, AllowPositiveScaleTransform) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(1U, candidate_list.size());
|
| @@ -1021,7 +1021,7 @@ TEST_F(SingleOverlayOnTopTest, AcceptMirrorYTransform) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(1U, candidate_list.size());
|
| @@ -1040,7 +1040,7 @@ TEST_F(UnderlayTest, Allow90DegreeRotation) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(1U, candidate_list.size());
|
| @@ -1060,7 +1060,7 @@ TEST_F(UnderlayTest, Allow180DegreeRotation) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(1U, candidate_list.size());
|
| @@ -1080,7 +1080,7 @@ TEST_F(UnderlayTest, Allow270DegreeRotation) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(1U, candidate_list.size());
|
| @@ -1104,7 +1104,7 @@ TEST_F(SingleOverlayOnTopTest, AllowNotTopIfNotOccluded) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(1U, candidate_list.size());
|
| @@ -1128,7 +1128,7 @@ TEST_F(SingleOverlayOnTopTest, AllowTransparentOnTop) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(1U, candidate_list.size());
|
| @@ -1150,7 +1150,7 @@ TEST_F(SingleOverlayOnTopTest, AllowTransparentColorOnTop) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(1U, candidate_list.size());
|
| @@ -1171,7 +1171,7 @@ TEST_F(SingleOverlayOnTopTest, RejectOpaqueColorOnTop) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(0U, candidate_list.size());
|
| @@ -1190,7 +1190,7 @@ TEST_F(SingleOverlayOnTopTest, RejectTransparentColorOnTopWithoutBlending) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(0U, candidate_list.size());
|
| @@ -1206,7 +1206,7 @@ TEST_F(SingleOverlayOnTopTest, RejectVideoSwapTransform) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(0U, candidate_list.size());
|
| @@ -1222,7 +1222,7 @@ TEST_F(UnderlayTest, AllowVideoXMirrorTransform) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(1U, candidate_list.size());
|
| @@ -1238,7 +1238,7 @@ TEST_F(UnderlayTest, AllowVideoBothMirrorTransform) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(1U, candidate_list.size());
|
| @@ -1254,7 +1254,7 @@ TEST_F(UnderlayTest, AllowVideoNormalTransform) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(1U, candidate_list.size());
|
| @@ -1270,7 +1270,7 @@ TEST_F(SingleOverlayOnTopTest, AllowVideoYMirrorTransform) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(1U, candidate_list.size());
|
| @@ -1291,7 +1291,7 @@ TEST_F(UnderlayTest, OverlayLayerUnderMainLayer) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(1U, candidate_list.size());
|
| @@ -1314,7 +1314,7 @@ TEST_F(UnderlayTest, AllowOnTop) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| ASSERT_EQ(1U, candidate_list.size());
|
| @@ -1336,7 +1336,7 @@ TEST_F(UnderlayTest, InitialUnderlayDamageNotSubtracted) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
|
|
| @@ -1362,7 +1362,7 @@ TEST_F(UnderlayTest, DamageSubtractedForConsecutiveIdenticalUnderlays) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| }
|
| @@ -1392,7 +1392,7 @@ TEST_F(UnderlayTest, DamageNotSubtractedForNonIdenticalConsecutiveUnderlays) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
|
|
| @@ -1424,7 +1424,7 @@ TEST_F(UnderlayTest, DamageNotSubtractedForNonConsecutiveIdenticalUnderlays) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| }
|
| @@ -1448,7 +1448,7 @@ TEST_F(UnderlayTest, DamageNotSubtractedWhenQuadsAboveOverlap) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| }
|
| @@ -1476,7 +1476,7 @@ TEST_F(UnderlayTest, DamageSubtractedWhenQuadsAboveDontOverlap) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| }
|
| @@ -1495,7 +1495,7 @@ TEST_F(UnderlayCastTest, NoOverlayContentBounds) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(0U, content_bounds_.size());
|
| @@ -1511,7 +1511,7 @@ TEST_F(UnderlayCastTest, FullScreenOverlayContentBounds) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
|
|
| @@ -1541,7 +1541,7 @@ TEST_F(UnderlayCastTest, BlackOutsideOverlayContentBounds) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
|
|
| @@ -1562,7 +1562,7 @@ TEST_F(UnderlayCastTest, OverlayOccludedContentBounds) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
|
|
| @@ -1586,7 +1586,7 @@ TEST_F(UnderlayCastTest, OverlayOccludedUnionContentBounds) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
|
|
| @@ -1616,7 +1616,7 @@ TEST_F(UnderlayCastTest, RoundOverlayContentBounds) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
|
|
| @@ -1647,7 +1647,7 @@ TEST_F(UnderlayCastTest, RoundContentBounds) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &candidate_list, nullptr, nullptr,
|
| &damage_rect_, &content_bounds_);
|
|
|
| @@ -1681,7 +1681,7 @@ TEST_F(CALayerOverlayTest, AllowNonAxisAlignedTransform) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &overlay_list, &ca_layer_list, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(gfx::Rect(), damage_rect);
|
| @@ -1704,7 +1704,7 @@ TEST_F(CALayerOverlayTest, ThreeDTransform) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &overlay_list, &ca_layer_list, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(0U, overlay_list.size());
|
| @@ -1730,7 +1730,7 @@ TEST_F(CALayerOverlayTest, AllowContainingClip) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &overlay_list, &ca_layer_list, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(gfx::Rect(), damage_rect);
|
| @@ -1753,7 +1753,7 @@ TEST_F(CALayerOverlayTest, NontrivialClip) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &overlay_list, &ca_layer_list, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(gfx::Rect(), damage_rect);
|
| @@ -1778,7 +1778,7 @@ TEST_F(CALayerOverlayTest, SkipTransparent) {
|
| base::flat_map<int, FilterOperations*> render_pass_filters;
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &overlay_list, &ca_layer_list, nullptr,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(gfx::Rect(), damage_rect);
|
| @@ -1805,7 +1805,7 @@ TEST_F(DCLayerOverlayTest, AllowNonAxisAlignedTransform) {
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| damage_rect_ = gfx::Rect(1, 1, 10, 10);
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &overlay_list, nullptr, &dc_layer_list,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(gfx::Rect(), damage_rect);
|
| @@ -1835,7 +1835,7 @@ TEST_F(DCLayerOverlayTest, Occluded) {
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| damage_rect_ = gfx::Rect(1, 1, 10, 10);
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &overlay_list, nullptr, &dc_layer_list,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(gfx::Rect(), damage_rect);
|
| @@ -1862,7 +1862,7 @@ TEST_F(DCLayerOverlayTest, Occluded) {
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| damage_rect_ = gfx::Rect(1, 1, 10, 10);
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &overlay_list, nullptr, &dc_layer_list,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(gfx::Rect(), damage_rect);
|
| @@ -1890,7 +1890,7 @@ TEST_F(DCLayerOverlayTest, DamageRect) {
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| damage_rect_ = gfx::Rect(1, 1, 10, 10);
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), (i == 0), render_pass_filters,
|
| render_pass_background_filters, &overlay_list, nullptr, &dc_layer_list,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(gfx::Rect(), damage_rect);
|
| @@ -1936,7 +1936,7 @@ TEST_F(DCLayerOverlayTest, ClipRect) {
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| damage_rect_ = gfx::Rect(1, 1, 10, 10);
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &overlay_list, nullptr, &dc_layer_list,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(0U, overlay_list.size());
|
| @@ -1971,7 +1971,7 @@ TEST_F(DCLayerOverlayTest, TransparentOnTop) {
|
| base::flat_map<int, FilterOperations*> render_pass_background_filters;
|
| damage_rect_ = gfx::Rect(1, 1, 10, 10);
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass.get(), render_pass_filters,
|
| + resource_provider_.get(), pass.get(), false, render_pass_filters,
|
| render_pass_background_filters, &overlay_list, nullptr, &dc_layer_list,
|
| &damage_rect_, &content_bounds_);
|
| EXPECT_EQ(0U, overlay_list.size());
|
| @@ -2518,7 +2518,7 @@ class CALayerOverlayRPDQTest : public CALayerOverlayTest {
|
| gfx::Rect damage_rect;
|
| overlay_list_ = BackbufferOverlayList(pass_.get());
|
| overlay_processor_->ProcessForOverlays(
|
| - resource_provider_.get(), pass_.get(), render_pass_filters_,
|
| + resource_provider_.get(), pass_.get(), false, render_pass_filters_,
|
| render_pass_background_filters_, &overlay_list_, &ca_layer_list_,
|
| nullptr, &damage_rect_, &content_bounds_);
|
| }
|
|
|