OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/output/gl_renderer.h" | 5 #include "cc/output/gl_renderer.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "cc/base/math_util.h" | 9 #include "cc/base/math_util.h" |
10 #include "cc/output/compositor_frame_metadata.h" | 10 #include "cc/output/compositor_frame_metadata.h" |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 class FakeRendererGL : public GLRenderer { | 125 class FakeRendererGL : public GLRenderer { |
126 public: | 126 public: |
127 FakeRendererGL(RendererClient* client, | 127 FakeRendererGL(RendererClient* client, |
128 const LayerTreeSettings* settings, | 128 const LayerTreeSettings* settings, |
129 OutputSurface* output_surface, | 129 OutputSurface* output_surface, |
130 ResourceProvider* resource_provider) | 130 ResourceProvider* resource_provider) |
131 : GLRenderer(client, | 131 : GLRenderer(client, |
132 settings, | 132 settings, |
133 output_surface, | 133 output_surface, |
134 resource_provider, | 134 resource_provider, |
135 NULL, | 135 nullptr, |
136 0) {} | 136 0) {} |
137 | 137 |
138 // GLRenderer methods. | 138 // GLRenderer methods. |
139 | 139 |
140 // Changing visibility to public. | 140 // Changing visibility to public. |
141 using GLRenderer::IsBackbufferDiscarded; | 141 using GLRenderer::IsBackbufferDiscarded; |
142 using GLRenderer::DoDrawQuad; | 142 using GLRenderer::DoDrawQuad; |
143 using GLRenderer::BeginDrawingFrame; | 143 using GLRenderer::BeginDrawingFrame; |
144 using GLRenderer::FinishDrawingQuadList; | 144 using GLRenderer::FinishDrawingQuadList; |
145 using GLRenderer::stencil_enabled; | 145 using GLRenderer::stencil_enabled; |
146 }; | 146 }; |
147 | 147 |
148 class GLRendererWithDefaultHarnessTest : public GLRendererTest { | 148 class GLRendererWithDefaultHarnessTest : public GLRendererTest { |
149 protected: | 149 protected: |
150 GLRendererWithDefaultHarnessTest() { | 150 GLRendererWithDefaultHarnessTest() { |
151 output_surface_ = | 151 output_surface_ = |
152 FakeOutputSurface::Create3d(TestWebGraphicsContext3D::Create()).Pass(); | 152 FakeOutputSurface::Create3d(TestWebGraphicsContext3D::Create()).Pass(); |
153 CHECK(output_surface_->BindToClient(&output_surface_client_)); | 153 CHECK(output_surface_->BindToClient(&output_surface_client_)); |
154 | 154 |
155 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); | 155 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
156 resource_provider_ = ResourceProvider::Create(output_surface_.get(), | 156 resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
157 shared_bitmap_manager_.get(), | 157 shared_bitmap_manager_.get(), |
158 NULL, | 158 nullptr, |
159 0, | 159 0, |
160 false, | 160 false, |
161 1, | 161 1, |
162 false).Pass(); | 162 false).Pass(); |
163 renderer_ = make_scoped_ptr(new FakeRendererGL(&renderer_client_, | 163 renderer_ = make_scoped_ptr(new FakeRendererGL(&renderer_client_, |
164 &settings_, | 164 &settings_, |
165 output_surface_.get(), | 165 output_surface_.get(), |
166 resource_provider_.get())); | 166 resource_provider_.get())); |
167 } | 167 } |
168 | 168 |
(...skipping 15 matching lines...) Expand all Loading... |
184 | 184 |
185 class GLRendererShaderTest : public GLRendererTest { | 185 class GLRendererShaderTest : public GLRendererTest { |
186 protected: | 186 protected: |
187 GLRendererShaderTest() { | 187 GLRendererShaderTest() { |
188 output_surface_ = FakeOutputSurface::Create3d().Pass(); | 188 output_surface_ = FakeOutputSurface::Create3d().Pass(); |
189 CHECK(output_surface_->BindToClient(&output_surface_client_)); | 189 CHECK(output_surface_->BindToClient(&output_surface_client_)); |
190 | 190 |
191 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); | 191 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
192 resource_provider_ = ResourceProvider::Create(output_surface_.get(), | 192 resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
193 shared_bitmap_manager_.get(), | 193 shared_bitmap_manager_.get(), |
194 NULL, | 194 nullptr, |
195 0, | 195 0, |
196 false, | 196 false, |
197 1, | 197 1, |
198 false).Pass(); | 198 false).Pass(); |
199 renderer_.reset(new FakeRendererGL(&renderer_client_, | 199 renderer_.reset(new FakeRendererGL(&renderer_client_, |
200 &settings_, | 200 &settings_, |
201 output_surface_.get(), | 201 output_surface_.get(), |
202 resource_provider_.get())); | 202 resource_provider_.get())); |
203 } | 203 } |
204 | 204 |
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
477 FakeOutputSurfaceClient output_surface_client; | 477 FakeOutputSurfaceClient output_surface_client; |
478 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( | 478 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( |
479 scoped_ptr<TestWebGraphicsContext3D>(new ForbidSynchronousCallContext))); | 479 scoped_ptr<TestWebGraphicsContext3D>(new ForbidSynchronousCallContext))); |
480 CHECK(output_surface->BindToClient(&output_surface_client)); | 480 CHECK(output_surface->BindToClient(&output_surface_client)); |
481 | 481 |
482 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 482 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
483 new TestSharedBitmapManager()); | 483 new TestSharedBitmapManager()); |
484 scoped_ptr<ResourceProvider> resource_provider( | 484 scoped_ptr<ResourceProvider> resource_provider( |
485 ResourceProvider::Create(output_surface.get(), | 485 ResourceProvider::Create(output_surface.get(), |
486 shared_bitmap_manager.get(), | 486 shared_bitmap_manager.get(), |
487 NULL, | 487 nullptr, |
488 0, | 488 0, |
489 false, | 489 false, |
490 1, | 490 1, |
491 false)); | 491 false)); |
492 | 492 |
493 LayerTreeSettings settings; | 493 LayerTreeSettings settings; |
494 FakeRendererClient renderer_client; | 494 FakeRendererClient renderer_client; |
495 FakeRendererGL renderer(&renderer_client, | 495 FakeRendererGL renderer(&renderer_client, |
496 &settings, | 496 &settings, |
497 output_surface.get(), | 497 output_surface.get(), |
(...skipping 21 matching lines...) Expand all Loading... |
519 FakeOutputSurfaceClient output_surface_client; | 519 FakeOutputSurfaceClient output_surface_client; |
520 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( | 520 scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d( |
521 scoped_ptr<TestWebGraphicsContext3D>(new LoseContextOnFirstGetContext))); | 521 scoped_ptr<TestWebGraphicsContext3D>(new LoseContextOnFirstGetContext))); |
522 CHECK(output_surface->BindToClient(&output_surface_client)); | 522 CHECK(output_surface->BindToClient(&output_surface_client)); |
523 | 523 |
524 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 524 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
525 new TestSharedBitmapManager()); | 525 new TestSharedBitmapManager()); |
526 scoped_ptr<ResourceProvider> resource_provider( | 526 scoped_ptr<ResourceProvider> resource_provider( |
527 ResourceProvider::Create(output_surface.get(), | 527 ResourceProvider::Create(output_surface.get(), |
528 shared_bitmap_manager.get(), | 528 shared_bitmap_manager.get(), |
529 NULL, | 529 nullptr, |
530 0, | 530 0, |
531 false, | 531 false, |
532 1, | 532 1, |
533 false)); | 533 false)); |
534 | 534 |
535 LayerTreeSettings settings; | 535 LayerTreeSettings settings; |
536 FakeRendererClient renderer_client; | 536 FakeRendererClient renderer_client; |
537 FakeRendererGL renderer(&renderer_client, | 537 FakeRendererGL renderer(&renderer_client, |
538 &settings, | 538 &settings, |
539 output_surface.get(), | 539 output_surface.get(), |
(...skipping 18 matching lines...) Expand all Loading... |
558 FakeOutputSurfaceClient output_surface_client; | 558 FakeOutputSurfaceClient output_surface_client; |
559 scoped_ptr<OutputSurface> output_surface( | 559 scoped_ptr<OutputSurface> output_surface( |
560 FakeOutputSurface::Create3d(context_owned.Pass())); | 560 FakeOutputSurface::Create3d(context_owned.Pass())); |
561 CHECK(output_surface->BindToClient(&output_surface_client)); | 561 CHECK(output_surface->BindToClient(&output_surface_client)); |
562 | 562 |
563 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 563 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
564 new TestSharedBitmapManager()); | 564 new TestSharedBitmapManager()); |
565 scoped_ptr<ResourceProvider> resource_provider( | 565 scoped_ptr<ResourceProvider> resource_provider( |
566 ResourceProvider::Create(output_surface.get(), | 566 ResourceProvider::Create(output_surface.get(), |
567 shared_bitmap_manager.get(), | 567 shared_bitmap_manager.get(), |
568 NULL, | 568 nullptr, |
569 0, | 569 0, |
570 false, | 570 false, |
571 1, | 571 1, |
572 false)); | 572 false)); |
573 | 573 |
574 LayerTreeSettings settings; | 574 LayerTreeSettings settings; |
575 FakeRendererClient renderer_client; | 575 FakeRendererClient renderer_client; |
576 FakeRendererGL renderer(&renderer_client, | 576 FakeRendererGL renderer(&renderer_client, |
577 &settings, | 577 &settings, |
578 output_surface.get(), | 578 output_surface.get(), |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
610 FakeOutputSurfaceClient output_surface_client; | 610 FakeOutputSurfaceClient output_surface_client; |
611 scoped_ptr<OutputSurface> output_surface( | 611 scoped_ptr<OutputSurface> output_surface( |
612 FakeOutputSurface::Create3d(context_owned.Pass())); | 612 FakeOutputSurface::Create3d(context_owned.Pass())); |
613 CHECK(output_surface->BindToClient(&output_surface_client)); | 613 CHECK(output_surface->BindToClient(&output_surface_client)); |
614 | 614 |
615 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 615 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
616 new TestSharedBitmapManager()); | 616 new TestSharedBitmapManager()); |
617 scoped_ptr<ResourceProvider> resource_provider( | 617 scoped_ptr<ResourceProvider> resource_provider( |
618 ResourceProvider::Create(output_surface.get(), | 618 ResourceProvider::Create(output_surface.get(), |
619 shared_bitmap_manager.get(), | 619 shared_bitmap_manager.get(), |
620 NULL, | 620 nullptr, |
621 0, | 621 0, |
622 false, | 622 false, |
623 1, | 623 1, |
624 false)); | 624 false)); |
625 | 625 |
626 LayerTreeSettings settings; | 626 LayerTreeSettings settings; |
627 FakeRendererClient renderer_client; | 627 FakeRendererClient renderer_client; |
628 FakeRendererGL renderer(&renderer_client, | 628 FakeRendererGL renderer(&renderer_client, |
629 &settings, | 629 &settings, |
630 output_surface.get(), | 630 output_surface.get(), |
(...skipping 24 matching lines...) Expand all Loading... |
655 FakeOutputSurfaceClient output_surface_client; | 655 FakeOutputSurfaceClient output_surface_client; |
656 scoped_ptr<OutputSurface> output_surface( | 656 scoped_ptr<OutputSurface> output_surface( |
657 FakeOutputSurface::CreateOffscreen(context_owned.Pass())); | 657 FakeOutputSurface::CreateOffscreen(context_owned.Pass())); |
658 CHECK(output_surface->BindToClient(&output_surface_client)); | 658 CHECK(output_surface->BindToClient(&output_surface_client)); |
659 | 659 |
660 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 660 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
661 new TestSharedBitmapManager()); | 661 new TestSharedBitmapManager()); |
662 scoped_ptr<ResourceProvider> resource_provider( | 662 scoped_ptr<ResourceProvider> resource_provider( |
663 ResourceProvider::Create(output_surface.get(), | 663 ResourceProvider::Create(output_surface.get(), |
664 shared_bitmap_manager.get(), | 664 shared_bitmap_manager.get(), |
665 NULL, | 665 nullptr, |
666 0, | 666 0, |
667 false, | 667 false, |
668 1, | 668 1, |
669 false)); | 669 false)); |
670 | 670 |
671 LayerTreeSettings settings; | 671 LayerTreeSettings settings; |
672 FakeRendererClient renderer_client; | 672 FakeRendererClient renderer_client; |
673 FakeRendererGL renderer(&renderer_client, | 673 FakeRendererGL renderer(&renderer_client, |
674 &settings, | 674 &settings, |
675 output_surface.get(), | 675 output_surface.get(), |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
742 FakeOutputSurfaceClient output_surface_client; | 742 FakeOutputSurfaceClient output_surface_client; |
743 scoped_ptr<OutputSurface> output_surface( | 743 scoped_ptr<OutputSurface> output_surface( |
744 FakeOutputSurface::Create3d(provider)); | 744 FakeOutputSurface::Create3d(provider)); |
745 CHECK(output_surface->BindToClient(&output_surface_client)); | 745 CHECK(output_surface->BindToClient(&output_surface_client)); |
746 | 746 |
747 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 747 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
748 new TestSharedBitmapManager()); | 748 new TestSharedBitmapManager()); |
749 scoped_ptr<ResourceProvider> resource_provider( | 749 scoped_ptr<ResourceProvider> resource_provider( |
750 ResourceProvider::Create(output_surface.get(), | 750 ResourceProvider::Create(output_surface.get(), |
751 shared_bitmap_manager.get(), | 751 shared_bitmap_manager.get(), |
752 NULL, | 752 nullptr, |
753 0, | 753 0, |
754 false, | 754 false, |
755 1, | 755 1, |
756 false)); | 756 false)); |
757 | 757 |
758 LayerTreeSettings settings; | 758 LayerTreeSettings settings; |
759 FakeRendererClient renderer_client; | 759 FakeRendererClient renderer_client; |
760 FakeRendererGL renderer(&renderer_client, | 760 FakeRendererGL renderer(&renderer_client, |
761 &settings, | 761 &settings, |
762 output_surface.get(), | 762 output_surface.get(), |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
813 FakeOutputSurfaceClient output_surface_client; | 813 FakeOutputSurfaceClient output_surface_client; |
814 scoped_ptr<OutputSurface> output_surface( | 814 scoped_ptr<OutputSurface> output_surface( |
815 FakeOutputSurface::Create3d(context_owned.Pass())); | 815 FakeOutputSurface::Create3d(context_owned.Pass())); |
816 CHECK(output_surface->BindToClient(&output_surface_client)); | 816 CHECK(output_surface->BindToClient(&output_surface_client)); |
817 | 817 |
818 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 818 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
819 new TestSharedBitmapManager()); | 819 new TestSharedBitmapManager()); |
820 scoped_ptr<ResourceProvider> resource_provider( | 820 scoped_ptr<ResourceProvider> resource_provider( |
821 ResourceProvider::Create(output_surface.get(), | 821 ResourceProvider::Create(output_surface.get(), |
822 shared_bitmap_manager.get(), | 822 shared_bitmap_manager.get(), |
823 NULL, | 823 nullptr, |
824 0, | 824 0, |
825 false, | 825 false, |
826 1, | 826 1, |
827 false)); | 827 false)); |
828 | 828 |
829 LayerTreeSettings settings; | 829 LayerTreeSettings settings; |
830 FakeRendererClient renderer_client; | 830 FakeRendererClient renderer_client; |
831 FakeRendererGL renderer(&renderer_client, | 831 FakeRendererGL renderer(&renderer_client, |
832 &settings, | 832 &settings, |
833 output_surface.get(), | 833 output_surface.get(), |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
904 FakeOutputSurfaceClient output_surface_client; | 904 FakeOutputSurfaceClient output_surface_client; |
905 scoped_ptr<OutputSurface> output_surface( | 905 scoped_ptr<OutputSurface> output_surface( |
906 FakeOutputSurface::Create3d(mock_context_owned.Pass())); | 906 FakeOutputSurface::Create3d(mock_context_owned.Pass())); |
907 CHECK(output_surface->BindToClient(&output_surface_client)); | 907 CHECK(output_surface->BindToClient(&output_surface_client)); |
908 | 908 |
909 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 909 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
910 new TestSharedBitmapManager()); | 910 new TestSharedBitmapManager()); |
911 scoped_ptr<ResourceProvider> resource_provider( | 911 scoped_ptr<ResourceProvider> resource_provider( |
912 ResourceProvider::Create(output_surface.get(), | 912 ResourceProvider::Create(output_surface.get(), |
913 shared_bitmap_manager.get(), | 913 shared_bitmap_manager.get(), |
914 NULL, | 914 nullptr, |
915 0, | 915 0, |
916 false, | 916 false, |
917 1, | 917 1, |
918 false)); | 918 false)); |
919 | 919 |
920 LayerTreeSettings settings; | 920 LayerTreeSettings settings; |
921 settings.should_clear_root_render_pass = false; | 921 settings.should_clear_root_render_pass = false; |
922 | 922 |
923 FakeRendererClient renderer_client; | 923 FakeRendererClient renderer_client; |
924 FakeRendererGL renderer(&renderer_client, | 924 FakeRendererGL renderer(&renderer_client, |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1002 FakeOutputSurfaceClient output_surface_client; | 1002 FakeOutputSurfaceClient output_surface_client; |
1003 scoped_ptr<OutputSurface> output_surface( | 1003 scoped_ptr<OutputSurface> output_surface( |
1004 FakeOutputSurface::Create3d(context_owned.Pass())); | 1004 FakeOutputSurface::Create3d(context_owned.Pass())); |
1005 CHECK(output_surface->BindToClient(&output_surface_client)); | 1005 CHECK(output_surface->BindToClient(&output_surface_client)); |
1006 | 1006 |
1007 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 1007 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
1008 new TestSharedBitmapManager()); | 1008 new TestSharedBitmapManager()); |
1009 scoped_ptr<ResourceProvider> resource_provider( | 1009 scoped_ptr<ResourceProvider> resource_provider( |
1010 ResourceProvider::Create(output_surface.get(), | 1010 ResourceProvider::Create(output_surface.get(), |
1011 shared_bitmap_manager.get(), | 1011 shared_bitmap_manager.get(), |
1012 NULL, | 1012 nullptr, |
1013 0, | 1013 0, |
1014 false, | 1014 false, |
1015 1, | 1015 1, |
1016 false)); | 1016 false)); |
1017 | 1017 |
1018 LayerTreeSettings settings; | 1018 LayerTreeSettings settings; |
1019 FakeRendererClient renderer_client; | 1019 FakeRendererClient renderer_client; |
1020 FakeRendererGL renderer(&renderer_client, | 1020 FakeRendererGL renderer(&renderer_client, |
1021 &settings, | 1021 &settings, |
1022 output_surface.get(), | 1022 output_surface.get(), |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1100 scoped_ptr<NonReshapableOutputSurface> output_surface( | 1100 scoped_ptr<NonReshapableOutputSurface> output_surface( |
1101 new NonReshapableOutputSurface(context_owned.Pass())); | 1101 new NonReshapableOutputSurface(context_owned.Pass())); |
1102 CHECK(output_surface->BindToClient(&output_surface_client)); | 1102 CHECK(output_surface->BindToClient(&output_surface_client)); |
1103 output_surface->set_fixed_size(gfx::Size(100, 100)); | 1103 output_surface->set_fixed_size(gfx::Size(100, 100)); |
1104 | 1104 |
1105 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 1105 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
1106 new TestSharedBitmapManager()); | 1106 new TestSharedBitmapManager()); |
1107 scoped_ptr<ResourceProvider> resource_provider( | 1107 scoped_ptr<ResourceProvider> resource_provider( |
1108 ResourceProvider::Create(output_surface.get(), | 1108 ResourceProvider::Create(output_surface.get(), |
1109 shared_bitmap_manager.get(), | 1109 shared_bitmap_manager.get(), |
1110 NULL, | 1110 nullptr, |
1111 0, | 1111 0, |
1112 false, | 1112 false, |
1113 1, | 1113 1, |
1114 false)); | 1114 false)); |
1115 | 1115 |
1116 LayerTreeSettings settings; | 1116 LayerTreeSettings settings; |
1117 settings.partial_swap_enabled = true; | 1117 settings.partial_swap_enabled = true; |
1118 FakeRendererClient renderer_client; | 1118 FakeRendererClient renderer_client; |
1119 FakeRendererGL renderer(&renderer_client, | 1119 FakeRendererGL renderer(&renderer_client, |
1120 &settings, | 1120 &settings, |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1291 FakeOutputSurfaceClient output_surface_client; | 1291 FakeOutputSurfaceClient output_surface_client; |
1292 scoped_ptr<OutputSurface> output_surface( | 1292 scoped_ptr<OutputSurface> output_surface( |
1293 new NonReshapableOutputSurface(context_owned.Pass())); | 1293 new NonReshapableOutputSurface(context_owned.Pass())); |
1294 CHECK(output_surface->BindToClient(&output_surface_client)); | 1294 CHECK(output_surface->BindToClient(&output_surface_client)); |
1295 | 1295 |
1296 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 1296 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
1297 new TestSharedBitmapManager()); | 1297 new TestSharedBitmapManager()); |
1298 scoped_ptr<ResourceProvider> resource_provider( | 1298 scoped_ptr<ResourceProvider> resource_provider( |
1299 ResourceProvider::Create(output_surface.get(), | 1299 ResourceProvider::Create(output_surface.get(), |
1300 shared_bitmap_manager.get(), | 1300 shared_bitmap_manager.get(), |
1301 NULL, | 1301 nullptr, |
1302 0, | 1302 0, |
1303 false, | 1303 false, |
1304 1, | 1304 1, |
1305 false)); | 1305 false)); |
1306 | 1306 |
1307 LayerTreeSettings settings; | 1307 LayerTreeSettings settings; |
1308 FakeRendererClient renderer_client; | 1308 FakeRendererClient renderer_client; |
1309 FakeRendererGL renderer(&renderer_client, | 1309 FakeRendererGL renderer(&renderer_client, |
1310 &settings, | 1310 &settings, |
1311 output_surface.get(), | 1311 output_surface.get(), |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1360 matrix[8] = matrix[9] = 0; | 1360 matrix[8] = matrix[9] = 0; |
1361 matrix[10] = 0.213f - 0.213f * amount; | 1361 matrix[10] = 0.213f - 0.213f * amount; |
1362 matrix[11] = 0.715f - 0.715f * amount; | 1362 matrix[11] = 0.715f - 0.715f * amount; |
1363 matrix[12] = 1.f - (matrix[10] + matrix[11]); | 1363 matrix[12] = 1.f - (matrix[10] + matrix[11]); |
1364 matrix[13] = matrix[14] = 0; | 1364 matrix[13] = matrix[14] = 0; |
1365 matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0; | 1365 matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0; |
1366 matrix[18] = 1; | 1366 matrix[18] = 1; |
1367 skia::RefPtr<SkColorFilter> color_filter( | 1367 skia::RefPtr<SkColorFilter> color_filter( |
1368 skia::AdoptRef(SkColorMatrixFilter::Create(matrix))); | 1368 skia::AdoptRef(SkColorMatrixFilter::Create(matrix))); |
1369 skia::RefPtr<SkImageFilter> filter = skia::AdoptRef( | 1369 skia::RefPtr<SkImageFilter> filter = skia::AdoptRef( |
1370 SkColorFilterImageFilter::Create(color_filter.get(), NULL)); | 1370 SkColorFilterImageFilter::Create(color_filter.get(), nullptr)); |
1371 FilterOperations filters; | 1371 FilterOperations filters; |
1372 filters.Append(FilterOperation::CreateReferenceFilter(filter)); | 1372 filters.Append(FilterOperation::CreateReferenceFilter(filter)); |
1373 | 1373 |
1374 gfx::Transform transform_causing_aa; | 1374 gfx::Transform transform_causing_aa; |
1375 transform_causing_aa.Rotate(20.0); | 1375 transform_causing_aa.Rotate(20.0); |
1376 | 1376 |
1377 // RenderPassProgram | 1377 // RenderPassProgram |
1378 child_pass = AddRenderPass(&render_passes_in_draw_order_, | 1378 child_pass = AddRenderPass(&render_passes_in_draw_order_, |
1379 child_pass_id, | 1379 child_pass_id, |
1380 child_rect, | 1380 child_rect, |
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1670 | 1670 |
1671 class MockOutputSurfaceTest : public GLRendererTest { | 1671 class MockOutputSurfaceTest : public GLRendererTest { |
1672 protected: | 1672 protected: |
1673 virtual void SetUp() { | 1673 virtual void SetUp() { |
1674 FakeOutputSurfaceClient output_surface_client_; | 1674 FakeOutputSurfaceClient output_surface_client_; |
1675 CHECK(output_surface_.BindToClient(&output_surface_client_)); | 1675 CHECK(output_surface_.BindToClient(&output_surface_client_)); |
1676 | 1676 |
1677 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); | 1677 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
1678 resource_provider_ = ResourceProvider::Create(&output_surface_, | 1678 resource_provider_ = ResourceProvider::Create(&output_surface_, |
1679 shared_bitmap_manager_.get(), | 1679 shared_bitmap_manager_.get(), |
1680 NULL, | 1680 nullptr, |
1681 0, | 1681 0, |
1682 false, | 1682 false, |
1683 1, | 1683 1, |
1684 false).Pass(); | 1684 false).Pass(); |
1685 | 1685 |
1686 renderer_.reset(new FakeRendererGL(&renderer_client_, | 1686 renderer_.reset(new FakeRendererGL(&renderer_client_, |
1687 &settings_, | 1687 &settings_, |
1688 &output_surface_, | 1688 &output_surface_, |
1689 resource_provider_.get())); | 1689 resource_provider_.get())); |
1690 } | 1690 } |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1836 base::MessageLoop::current()->Run(); | 1836 base::MessageLoop::current()->Run(); |
1837 | 1837 |
1838 // The sync point should have happened. | 1838 // The sync point should have happened. |
1839 EXPECT_EQ(1, sync_point_callback_count); | 1839 EXPECT_EQ(1, sync_point_callback_count); |
1840 EXPECT_EQ(1, other_callback_count); | 1840 EXPECT_EQ(1, other_callback_count); |
1841 } | 1841 } |
1842 #endif // OS_ANDROID | 1842 #endif // OS_ANDROID |
1843 | 1843 |
1844 } // namespace | 1844 } // namespace |
1845 } // namespace cc | 1845 } // namespace cc |
OLD | NEW |