| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 "cc/trees/layer_tree_host_impl.h" | 5 #include "cc/trees/layer_tree_host_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 1911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1922 } | 1922 } |
| 1923 | 1923 |
| 1924 bool WillDraw(DrawMode draw_mode, ResourceProvider* provider) override { | 1924 bool WillDraw(DrawMode draw_mode, ResourceProvider* provider) override { |
| 1925 will_draw_called_ = true; | 1925 will_draw_called_ = true; |
| 1926 if (will_draw_returns_false_) | 1926 if (will_draw_returns_false_) |
| 1927 return false; | 1927 return false; |
| 1928 return LayerImpl::WillDraw(draw_mode, provider); | 1928 return LayerImpl::WillDraw(draw_mode, provider); |
| 1929 } | 1929 } |
| 1930 | 1930 |
| 1931 void AppendQuads(RenderPass* render_pass, | 1931 void AppendQuads(RenderPass* render_pass, |
| 1932 const Occlusion& occlusion_in_content_space, | |
| 1933 AppendQuadsData* append_quads_data) override { | 1932 AppendQuadsData* append_quads_data) override { |
| 1934 append_quads_called_ = true; | 1933 append_quads_called_ = true; |
| 1935 LayerImpl::AppendQuads( | 1934 LayerImpl::AppendQuads(render_pass, append_quads_data); |
| 1936 render_pass, occlusion_in_content_space, append_quads_data); | |
| 1937 } | 1935 } |
| 1938 | 1936 |
| 1939 void DidDraw(ResourceProvider* provider) override { | 1937 void DidDraw(ResourceProvider* provider) override { |
| 1940 did_draw_called_ = true; | 1938 did_draw_called_ = true; |
| 1941 LayerImpl::DidDraw(provider); | 1939 LayerImpl::DidDraw(provider); |
| 1942 } | 1940 } |
| 1943 | 1941 |
| 1944 bool will_draw_called() const { return will_draw_called_; } | 1942 bool will_draw_called() const { return will_draw_called_; } |
| 1945 bool append_quads_called() const { return append_quads_called_; } | 1943 bool append_quads_called() const { return append_quads_called_; } |
| 1946 bool did_draw_called() const { return did_draw_called_; } | 1944 bool did_draw_called() const { return did_draw_called_; } |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2149 ResourceProvider* resource_provider) { | 2147 ResourceProvider* resource_provider) { |
| 2150 return make_scoped_ptr(new MissingTextureAnimatingLayer(tree_impl, | 2148 return make_scoped_ptr(new MissingTextureAnimatingLayer(tree_impl, |
| 2151 id, | 2149 id, |
| 2152 tile_missing, | 2150 tile_missing, |
| 2153 had_incomplete_tile, | 2151 had_incomplete_tile, |
| 2154 animating, | 2152 animating, |
| 2155 resource_provider)); | 2153 resource_provider)); |
| 2156 } | 2154 } |
| 2157 | 2155 |
| 2158 void AppendQuads(RenderPass* render_pass, | 2156 void AppendQuads(RenderPass* render_pass, |
| 2159 const Occlusion& occlusion_in_content_space, | |
| 2160 AppendQuadsData* append_quads_data) override { | 2157 AppendQuadsData* append_quads_data) override { |
| 2161 LayerImpl::AppendQuads( | 2158 LayerImpl::AppendQuads(render_pass, append_quads_data); |
| 2162 render_pass, occlusion_in_content_space, append_quads_data); | |
| 2163 if (had_incomplete_tile_) | 2159 if (had_incomplete_tile_) |
| 2164 append_quads_data->num_incomplete_tiles++; | 2160 append_quads_data->num_incomplete_tiles++; |
| 2165 if (tile_missing_) | 2161 if (tile_missing_) |
| 2166 append_quads_data->num_missing_tiles++; | 2162 append_quads_data->num_missing_tiles++; |
| 2167 } | 2163 } |
| 2168 | 2164 |
| 2169 private: | 2165 private: |
| 2170 MissingTextureAnimatingLayer(LayerTreeImpl* tree_impl, | 2166 MissingTextureAnimatingLayer(LayerTreeImpl* tree_impl, |
| 2171 int id, | 2167 int id, |
| 2172 bool tile_missing, | 2168 bool tile_missing, |
| (...skipping 2265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4438 class BlendStateCheckLayer : public LayerImpl { | 4434 class BlendStateCheckLayer : public LayerImpl { |
| 4439 public: | 4435 public: |
| 4440 static scoped_ptr<LayerImpl> Create(LayerTreeImpl* tree_impl, | 4436 static scoped_ptr<LayerImpl> Create(LayerTreeImpl* tree_impl, |
| 4441 int id, | 4437 int id, |
| 4442 ResourceProvider* resource_provider) { | 4438 ResourceProvider* resource_provider) { |
| 4443 return make_scoped_ptr( | 4439 return make_scoped_ptr( |
| 4444 new BlendStateCheckLayer(tree_impl, id, resource_provider)); | 4440 new BlendStateCheckLayer(tree_impl, id, resource_provider)); |
| 4445 } | 4441 } |
| 4446 | 4442 |
| 4447 void AppendQuads(RenderPass* render_pass, | 4443 void AppendQuads(RenderPass* render_pass, |
| 4448 const Occlusion& occlusion_in_content_space, | |
| 4449 AppendQuadsData* append_quads_data) override { | 4444 AppendQuadsData* append_quads_data) override { |
| 4450 quads_appended_ = true; | 4445 quads_appended_ = true; |
| 4451 | 4446 |
| 4452 gfx::Rect opaque_rect; | 4447 gfx::Rect opaque_rect; |
| 4453 if (contents_opaque()) | 4448 if (contents_opaque()) |
| 4454 opaque_rect = quad_rect_; | 4449 opaque_rect = quad_rect_; |
| 4455 else | 4450 else |
| 4456 opaque_rect = opaque_content_rect_; | 4451 opaque_rect = opaque_content_rect_; |
| 4457 gfx::Rect visible_quad_rect = quad_rect_; | 4452 gfx::Rect visible_quad_rect = quad_rect_; |
| 4458 | 4453 |
| (...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5163 host_impl_->DidDrawAllLayers(frame); | 5158 host_impl_->DidDrawAllLayers(frame); |
| 5164 } | 5159 } |
| 5165 | 5160 |
| 5166 class FakeLayerWithQuads : public LayerImpl { | 5161 class FakeLayerWithQuads : public LayerImpl { |
| 5167 public: | 5162 public: |
| 5168 static scoped_ptr<LayerImpl> Create(LayerTreeImpl* tree_impl, int id) { | 5163 static scoped_ptr<LayerImpl> Create(LayerTreeImpl* tree_impl, int id) { |
| 5169 return make_scoped_ptr(new FakeLayerWithQuads(tree_impl, id)); | 5164 return make_scoped_ptr(new FakeLayerWithQuads(tree_impl, id)); |
| 5170 } | 5165 } |
| 5171 | 5166 |
| 5172 void AppendQuads(RenderPass* render_pass, | 5167 void AppendQuads(RenderPass* render_pass, |
| 5173 const Occlusion& occlusion_in_content_space, | |
| 5174 AppendQuadsData* append_quads_data) override { | 5168 AppendQuadsData* append_quads_data) override { |
| 5175 SharedQuadState* shared_quad_state = | 5169 SharedQuadState* shared_quad_state = |
| 5176 render_pass->CreateAndAppendSharedQuadState(); | 5170 render_pass->CreateAndAppendSharedQuadState(); |
| 5177 PopulateSharedQuadState(shared_quad_state); | 5171 PopulateSharedQuadState(shared_quad_state); |
| 5178 | 5172 |
| 5179 SkColor gray = SkColorSetRGB(100, 100, 100); | 5173 SkColor gray = SkColorSetRGB(100, 100, 100); |
| 5180 gfx::Rect quad_rect(content_bounds()); | 5174 gfx::Rect quad_rect(content_bounds()); |
| 5181 gfx::Rect visible_quad_rect(quad_rect); | 5175 gfx::Rect visible_quad_rect(quad_rect); |
| 5182 SolidColorDrawQuad* my_quad = | 5176 SolidColorDrawQuad* my_quad = |
| 5183 render_pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); | 5177 render_pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); |
| (...skipping 3238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8422 // surface. | 8416 // surface. |
| 8423 EXPECT_EQ(0, num_lost_surfaces_); | 8417 EXPECT_EQ(0, num_lost_surfaces_); |
| 8424 host_impl_->DidLoseOutputSurface(); | 8418 host_impl_->DidLoseOutputSurface(); |
| 8425 EXPECT_EQ(1, num_lost_surfaces_); | 8419 EXPECT_EQ(1, num_lost_surfaces_); |
| 8426 host_impl_->DidLoseOutputSurface(); | 8420 host_impl_->DidLoseOutputSurface(); |
| 8427 EXPECT_LE(1, num_lost_surfaces_); | 8421 EXPECT_LE(1, num_lost_surfaces_); |
| 8428 } | 8422 } |
| 8429 | 8423 |
| 8430 } // namespace | 8424 } // namespace |
| 8431 } // namespace cc | 8425 } // namespace cc |
| OLD | NEW |