| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "cc/base/region.h" | 10 #include "cc/base/region.h" |
| (...skipping 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1227 &overlay_list, &ca_layer_list, | 1227 &overlay_list, &ca_layer_list, |
| 1228 &damage_rect); | 1228 &damage_rect); |
| 1229 EXPECT_EQ(0U, pass->quad_list.size()); | 1229 EXPECT_EQ(0U, pass->quad_list.size()); |
| 1230 EXPECT_EQ(0U, overlay_list.size()); | 1230 EXPECT_EQ(0U, overlay_list.size()); |
| 1231 EXPECT_EQ(0U, ca_layer_list.size()); | 1231 EXPECT_EQ(0U, ca_layer_list.size()); |
| 1232 EXPECT_EQ(0U, output_surface_->bind_framebuffer_count()); | 1232 EXPECT_EQ(0U, output_surface_->bind_framebuffer_count()); |
| 1233 } | 1233 } |
| 1234 | 1234 |
| 1235 class OverlayInfoRendererGL : public GLRenderer { | 1235 class OverlayInfoRendererGL : public GLRenderer { |
| 1236 public: | 1236 public: |
| 1237 OverlayInfoRendererGL(RendererClient* client, | 1237 OverlayInfoRendererGL(DirectRendererClient* client, |
| 1238 const RendererSettings* settings, | 1238 const RendererSettings* settings, |
| 1239 OutputSurface* output_surface, | 1239 OutputSurface* output_surface, |
| 1240 ResourceProvider* resource_provider) | 1240 ResourceProvider* resource_provider) |
| 1241 : GLRenderer(client, | 1241 : GLRenderer(client, |
| 1242 settings, | 1242 settings, |
| 1243 output_surface, | 1243 output_surface, |
| 1244 resource_provider, | 1244 resource_provider, |
| 1245 NULL, | 1245 NULL, |
| 1246 0), | 1246 0), |
| 1247 expect_overlays_(false) {} | 1247 expect_overlays_(false) {} |
| (...skipping 18 matching lines...) Expand all Loading... |
| 1266 } | 1266 } |
| 1267 | 1267 |
| 1268 void set_expect_overlays(bool expect_overlays) { | 1268 void set_expect_overlays(bool expect_overlays) { |
| 1269 expect_overlays_ = expect_overlays; | 1269 expect_overlays_ = expect_overlays; |
| 1270 } | 1270 } |
| 1271 | 1271 |
| 1272 private: | 1272 private: |
| 1273 bool expect_overlays_; | 1273 bool expect_overlays_; |
| 1274 }; | 1274 }; |
| 1275 | 1275 |
| 1276 class FakeRendererClient : public RendererClient { | 1276 class StubDirectRendererClient : public DirectRendererClient { |
| 1277 public: | 1277 public: |
| 1278 // RendererClient methods. | |
| 1279 void SetFullRootLayerDamage() override {} | 1278 void SetFullRootLayerDamage() override {} |
| 1280 }; | 1279 }; |
| 1281 | 1280 |
| 1282 class MockOverlayScheduler { | 1281 class MockOverlayScheduler { |
| 1283 public: | 1282 public: |
| 1284 MOCK_METHOD5(Schedule, | 1283 MOCK_METHOD5(Schedule, |
| 1285 void(int plane_z_order, | 1284 void(int plane_z_order, |
| 1286 gfx::OverlayTransform plane_transform, | 1285 gfx::OverlayTransform plane_transform, |
| 1287 unsigned overlay_texture_id, | 1286 unsigned overlay_texture_id, |
| 1288 const gfx::Rect& display_bounds, | 1287 const gfx::Rect& display_bounds, |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1333 response.texture = lock.texture_id(); | 1332 response.texture = lock.texture_id(); |
| 1334 response.in_use = false; | 1333 response.in_use = false; |
| 1335 gpu::TextureInUseResponses responses; | 1334 gpu::TextureInUseResponses responses; |
| 1336 responses.push_back(response); | 1335 responses.push_back(response); |
| 1337 renderer_->DidReceiveTextureInUseResponses(responses); | 1336 renderer_->DidReceiveTextureInUseResponses(responses); |
| 1338 } | 1337 } |
| 1339 | 1338 |
| 1340 RendererSettings settings_; | 1339 RendererSettings settings_; |
| 1341 FakeOutputSurfaceClient output_surface_client_; | 1340 FakeOutputSurfaceClient output_surface_client_; |
| 1342 std::unique_ptr<OverlayOutputSurface> output_surface_; | 1341 std::unique_ptr<OverlayOutputSurface> output_surface_; |
| 1343 FakeRendererClient renderer_client_; | 1342 StubDirectRendererClient renderer_client_; |
| 1344 std::unique_ptr<ResourceProvider> resource_provider_; | 1343 std::unique_ptr<ResourceProvider> resource_provider_; |
| 1345 std::unique_ptr<OverlayInfoRendererGL> renderer_; | 1344 std::unique_ptr<OverlayInfoRendererGL> renderer_; |
| 1346 scoped_refptr<TestContextProvider> provider_; | 1345 scoped_refptr<TestContextProvider> provider_; |
| 1347 MockOverlayScheduler scheduler_; | 1346 MockOverlayScheduler scheduler_; |
| 1348 }; | 1347 }; |
| 1349 | 1348 |
| 1350 TEST_F(GLRendererWithOverlaysTest, OverlayQuadNotDrawn) { | 1349 TEST_F(GLRendererWithOverlaysTest, OverlayQuadNotDrawn) { |
| 1351 bool use_validator = true; | 1350 bool use_validator = true; |
| 1352 Init(use_validator); | 1351 Init(use_validator); |
| 1353 renderer_->set_expect_overlays(true); | 1352 renderer_->set_expect_overlays(true); |
| (...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1873 filters_.Append(FilterOperation::CreateZoomFilter(0.9f, 1)); | 1872 filters_.Append(FilterOperation::CreateZoomFilter(0.9f, 1)); |
| 1874 quad_->SetNew(pass_->shared_quad_state_list.back(), kOverlayRect, | 1873 quad_->SetNew(pass_->shared_quad_state_list.back(), kOverlayRect, |
| 1875 kOverlayRect, render_pass_id_, 0, gfx::Vector2dF(), gfx::Size(), | 1874 kOverlayRect, render_pass_id_, 0, gfx::Vector2dF(), gfx::Size(), |
| 1876 filters_, gfx::Vector2dF(1, 1), background_filters_); | 1875 filters_, gfx::Vector2dF(1, 1), background_filters_); |
| 1877 ProcessForOverlays(); | 1876 ProcessForOverlays(); |
| 1878 EXPECT_EQ(0U, ca_layer_list_.size()); | 1877 EXPECT_EQ(0U, ca_layer_list_.size()); |
| 1879 } | 1878 } |
| 1880 | 1879 |
| 1881 } // namespace | 1880 } // namespace |
| 1882 } // namespace cc | 1881 } // namespace cc |
| OLD | NEW |