| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/strings/string_split.h" | 10 #include "base/strings/string_split.h" |
| 11 #include "cc/base/math_util.h" | 11 #include "cc/base/math_util.h" |
| 12 #include "cc/output/gl_renderer.h" | 12 #include "cc/output/gl_renderer.h" |
| 13 #include "cc/quads/draw_quad.h" | 13 #include "cc/quads/draw_quad.h" |
| 14 #include "cc/quads/picture_draw_quad.h" | 14 #include "cc/quads/picture_draw_quad.h" |
| 15 #include "cc/quads/texture_draw_quad.h" | 15 #include "cc/quads/texture_draw_quad.h" |
| 16 #include "cc/resources/video_resource_updater.h" | 16 #include "cc/resources/video_resource_updater.h" |
| 17 #include "cc/test/fake_raster_source.h" | 17 #include "cc/test/fake_raster_source.h" |
| 18 #include "cc/test/fake_recording_source.h" | 18 #include "cc/test/fake_recording_source.h" |
| 19 #include "cc/test/pixel_test.h" | 19 #include "cc/test/pixel_test.h" |
| 20 #include "cc/test/test_in_process_context_provider.h" | 20 #include "cc/test/test_in_process_context_provider.h" |
| 21 #include "gpu/command_buffer/client/gles2_interface.h" | 21 #include "gpu/command_buffer/client/gles2_interface.h" |
| 22 #include "media/base/video_frame.h" | 22 #include "media/base/video_frame.h" |
| 23 #include "skia/ext/cdl_canvas.h" |
| 23 #include "third_party/skia/include/core/SkColorPriv.h" | 24 #include "third_party/skia/include/core/SkColorPriv.h" |
| 24 #include "third_party/skia/include/core/SkImageFilter.h" | 25 #include "third_party/skia/include/core/SkImageFilter.h" |
| 25 #include "third_party/skia/include/core/SkMatrix.h" | 26 #include "third_party/skia/include/core/SkMatrix.h" |
| 26 #include "third_party/skia/include/core/SkRefCnt.h" | 27 #include "third_party/skia/include/core/SkRefCnt.h" |
| 27 #include "third_party/skia/include/core/SkSurface.h" | 28 #include "third_party/skia/include/core/SkSurface.h" |
| 28 #include "third_party/skia/include/effects/SkColorFilterImageFilter.h" | 29 #include "third_party/skia/include/effects/SkColorFilterImageFilter.h" |
| 29 #include "third_party/skia/include/effects/SkColorMatrixFilter.h" | 30 #include "third_party/skia/include/effects/SkColorMatrixFilter.h" |
| 30 #include "ui/gfx/geometry/rect_conversions.h" | 31 #include "ui/gfx/geometry/rect_conversions.h" |
| 31 | 32 |
| 32 using gpu::gles2::GLES2Interface; | 33 using gpu::gles2::GLES2Interface; |
| (...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 962 } | 963 } |
| 963 | 964 |
| 964 TYPED_TEST(IntersectingQuadSoftwareTest, PictureQuads) { | 965 TYPED_TEST(IntersectingQuadSoftwareTest, PictureQuads) { |
| 965 this->SetupQuadStateAndRenderPass(); | 966 this->SetupQuadStateAndRenderPass(); |
| 966 gfx::Rect outer_rect(this->quad_rect_); | 967 gfx::Rect outer_rect(this->quad_rect_); |
| 967 gfx::Rect inner_rect(this->quad_rect_.x() + (this->quad_rect_.width() / 4), | 968 gfx::Rect inner_rect(this->quad_rect_.x() + (this->quad_rect_.width() / 4), |
| 968 this->quad_rect_.y() + (this->quad_rect_.height() / 4), | 969 this->quad_rect_.y() + (this->quad_rect_.height() / 4), |
| 969 this->quad_rect_.width() / 2, | 970 this->quad_rect_.width() / 2, |
| 970 this->quad_rect_.height() / 2); | 971 this->quad_rect_.height() / 2); |
| 971 | 972 |
| 972 SkPaint black_paint; | 973 CdlPaint black_paint; |
| 973 black_paint.setColor(SK_ColorBLACK); | 974 black_paint.setColor(SK_ColorBLACK); |
| 974 SkPaint blue_paint; | 975 CdlPaint blue_paint; |
| 975 blue_paint.setColor(SK_ColorBLUE); | 976 blue_paint.setColor(SK_ColorBLUE); |
| 976 SkPaint green_paint; | 977 CdlPaint green_paint; |
| 977 green_paint.setColor(SK_ColorGREEN); | 978 green_paint.setColor(SK_ColorGREEN); |
| 978 | 979 |
| 979 std::unique_ptr<FakeRecordingSource> blue_recording = | 980 std::unique_ptr<FakeRecordingSource> blue_recording = |
| 980 FakeRecordingSource::CreateFilledRecordingSource(this->quad_rect_.size()); | 981 FakeRecordingSource::CreateFilledRecordingSource(this->quad_rect_.size()); |
| 981 blue_recording->add_draw_rect_with_paint(outer_rect, black_paint); | 982 blue_recording->add_draw_rect_with_paint(outer_rect, black_paint); |
| 982 blue_recording->add_draw_rect_with_paint(inner_rect, blue_paint); | 983 blue_recording->add_draw_rect_with_paint(inner_rect, blue_paint); |
| 983 blue_recording->Rerecord(); | 984 blue_recording->Rerecord(); |
| 984 scoped_refptr<FakeRasterSource> blue_raster_source = | 985 scoped_refptr<FakeRasterSource> blue_raster_source = |
| 985 FakeRasterSource::CreateFromRecordingSource(blue_recording.get(), false); | 986 FakeRasterSource::CreateFromRecordingSource(blue_recording.get(), false); |
| 986 | 987 |
| (...skipping 1635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2622 std::unique_ptr<RenderPass> pass = | 2623 std::unique_ptr<RenderPass> pass = |
| 2623 CreateTestRenderPass(id, viewport, transform_to_root); | 2624 CreateTestRenderPass(id, viewport, transform_to_root); |
| 2624 | 2625 |
| 2625 // One clipped blue quad in the lower right corner. Outside the clip | 2626 // One clipped blue quad in the lower right corner. Outside the clip |
| 2626 // is red, which should not appear. | 2627 // is red, which should not appear. |
| 2627 gfx::Rect blue_rect(gfx::Size(100, 100)); | 2628 gfx::Rect blue_rect(gfx::Size(100, 100)); |
| 2628 gfx::Rect blue_clip_rect(gfx::Point(50, 50), gfx::Size(50, 50)); | 2629 gfx::Rect blue_clip_rect(gfx::Point(50, 50), gfx::Size(50, 50)); |
| 2629 | 2630 |
| 2630 std::unique_ptr<FakeRecordingSource> blue_recording = | 2631 std::unique_ptr<FakeRecordingSource> blue_recording = |
| 2631 FakeRecordingSource::CreateFilledRecordingSource(blue_rect.size()); | 2632 FakeRecordingSource::CreateFilledRecordingSource(blue_rect.size()); |
| 2632 SkPaint red_paint; | 2633 CdlPaint red_paint; |
| 2633 red_paint.setColor(SK_ColorRED); | 2634 red_paint.setColor(SK_ColorRED); |
| 2634 blue_recording->add_draw_rect_with_paint(blue_rect, red_paint); | 2635 blue_recording->add_draw_rect_with_paint(blue_rect, red_paint); |
| 2635 SkPaint blue_paint; | 2636 CdlPaint blue_paint; |
| 2636 blue_paint.setColor(SK_ColorBLUE); | 2637 blue_paint.setColor(SK_ColorBLUE); |
| 2637 blue_recording->add_draw_rect_with_paint(blue_clip_rect, blue_paint); | 2638 blue_recording->add_draw_rect_with_paint(blue_clip_rect, blue_paint); |
| 2638 blue_recording->Rerecord(); | 2639 blue_recording->Rerecord(); |
| 2639 | 2640 |
| 2640 scoped_refptr<FakeRasterSource> blue_raster_source = | 2641 scoped_refptr<FakeRasterSource> blue_raster_source = |
| 2641 FakeRasterSource::CreateFromRecordingSource(blue_recording.get(), false); | 2642 FakeRasterSource::CreateFromRecordingSource(blue_recording.get(), false); |
| 2642 | 2643 |
| 2643 gfx::Vector2d offset(viewport.bottom_right() - blue_rect.bottom_right()); | 2644 gfx::Vector2d offset(viewport.bottom_right() - blue_rect.bottom_right()); |
| 2644 gfx::Transform blue_quad_to_target_transform; | 2645 gfx::Transform blue_quad_to_target_transform; |
| 2645 blue_quad_to_target_transform.Translate(offset.x(), offset.y()); | 2646 blue_quad_to_target_transform.Translate(offset.x(), offset.y()); |
| 2646 gfx::Rect blue_target_clip_rect = MathUtil::MapEnclosingClippedRect( | 2647 gfx::Rect blue_target_clip_rect = MathUtil::MapEnclosingClippedRect( |
| 2647 blue_quad_to_target_transform, blue_clip_rect); | 2648 blue_quad_to_target_transform, blue_clip_rect); |
| 2648 SharedQuadState* blue_shared_state = | 2649 SharedQuadState* blue_shared_state = |
| 2649 CreateTestSharedQuadStateClipped(blue_quad_to_target_transform, blue_rect, | 2650 CreateTestSharedQuadStateClipped(blue_quad_to_target_transform, blue_rect, |
| 2650 blue_target_clip_rect, pass.get()); | 2651 blue_target_clip_rect, pass.get()); |
| 2651 | 2652 |
| 2652 PictureDrawQuad* blue_quad = pass->CreateAndAppendDrawQuad<PictureDrawQuad>(); | 2653 PictureDrawQuad* blue_quad = pass->CreateAndAppendDrawQuad<PictureDrawQuad>(); |
| 2653 | 2654 |
| 2654 blue_quad->SetNew(blue_shared_state, | 2655 blue_quad->SetNew(blue_shared_state, |
| 2655 viewport, // Intentionally bigger than clip. | 2656 viewport, // Intentionally bigger than clip. |
| 2656 gfx::Rect(), viewport, gfx::RectF(viewport), | 2657 gfx::Rect(), viewport, gfx::RectF(viewport), |
| 2657 viewport.size(), nearest_neighbor, texture_format, viewport, | 2658 viewport.size(), nearest_neighbor, texture_format, viewport, |
| 2658 1.f, std::move(blue_raster_source)); | 2659 1.f, std::move(blue_raster_source)); |
| 2659 | 2660 |
| 2660 // One viewport-filling green quad. | 2661 // One viewport-filling green quad. |
| 2661 std::unique_ptr<FakeRecordingSource> green_recording = | 2662 std::unique_ptr<FakeRecordingSource> green_recording = |
| 2662 FakeRecordingSource::CreateFilledRecordingSource(viewport.size()); | 2663 FakeRecordingSource::CreateFilledRecordingSource(viewport.size()); |
| 2663 SkPaint green_paint; | 2664 CdlPaint green_paint; |
| 2664 green_paint.setColor(SK_ColorGREEN); | 2665 green_paint.setColor(SK_ColorGREEN); |
| 2665 green_recording->add_draw_rect_with_paint(viewport, green_paint); | 2666 green_recording->add_draw_rect_with_paint(viewport, green_paint); |
| 2666 green_recording->Rerecord(); | 2667 green_recording->Rerecord(); |
| 2667 scoped_refptr<FakeRasterSource> green_raster_source = | 2668 scoped_refptr<FakeRasterSource> green_raster_source = |
| 2668 FakeRasterSource::CreateFromRecordingSource(green_recording.get(), false); | 2669 FakeRasterSource::CreateFromRecordingSource(green_recording.get(), false); |
| 2669 | 2670 |
| 2670 gfx::Transform green_quad_to_target_transform; | 2671 gfx::Transform green_quad_to_target_transform; |
| 2671 SharedQuadState* green_shared_state = CreateTestSharedQuadState( | 2672 SharedQuadState* green_shared_state = CreateTestSharedQuadState( |
| 2672 green_quad_to_target_transform, viewport, pass.get()); | 2673 green_quad_to_target_transform, viewport, pass.get()); |
| 2673 | 2674 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 2694 bool nearest_neighbor = false; | 2695 bool nearest_neighbor = false; |
| 2695 | 2696 |
| 2696 RenderPassId id(1, 1); | 2697 RenderPassId id(1, 1); |
| 2697 gfx::Transform transform_to_root; | 2698 gfx::Transform transform_to_root; |
| 2698 std::unique_ptr<RenderPass> pass = | 2699 std::unique_ptr<RenderPass> pass = |
| 2699 CreateTestRenderPass(id, viewport, transform_to_root); | 2700 CreateTestRenderPass(id, viewport, transform_to_root); |
| 2700 | 2701 |
| 2701 // One viewport-filling 0.5-opacity green quad. | 2702 // One viewport-filling 0.5-opacity green quad. |
| 2702 std::unique_ptr<FakeRecordingSource> green_recording = | 2703 std::unique_ptr<FakeRecordingSource> green_recording = |
| 2703 FakeRecordingSource::CreateFilledRecordingSource(viewport.size()); | 2704 FakeRecordingSource::CreateFilledRecordingSource(viewport.size()); |
| 2704 SkPaint green_paint; | 2705 CdlPaint green_paint; |
| 2705 green_paint.setColor(SK_ColorGREEN); | 2706 green_paint.setColor(SK_ColorGREEN); |
| 2706 green_recording->add_draw_rect_with_paint(viewport, green_paint); | 2707 green_recording->add_draw_rect_with_paint(viewport, green_paint); |
| 2707 green_recording->Rerecord(); | 2708 green_recording->Rerecord(); |
| 2708 scoped_refptr<FakeRasterSource> green_raster_source = | 2709 scoped_refptr<FakeRasterSource> green_raster_source = |
| 2709 FakeRasterSource::CreateFromRecordingSource(green_recording.get(), false); | 2710 FakeRasterSource::CreateFromRecordingSource(green_recording.get(), false); |
| 2710 | 2711 |
| 2711 gfx::Transform green_quad_to_target_transform; | 2712 gfx::Transform green_quad_to_target_transform; |
| 2712 SharedQuadState* green_shared_state = CreateTestSharedQuadState( | 2713 SharedQuadState* green_shared_state = CreateTestSharedQuadState( |
| 2713 green_quad_to_target_transform, viewport, pass.get()); | 2714 green_quad_to_target_transform, viewport, pass.get()); |
| 2714 green_shared_state->opacity = 0.5f; | 2715 green_shared_state->opacity = 0.5f; |
| 2715 | 2716 |
| 2716 PictureDrawQuad* green_quad = | 2717 PictureDrawQuad* green_quad = |
| 2717 pass->CreateAndAppendDrawQuad<PictureDrawQuad>(); | 2718 pass->CreateAndAppendDrawQuad<PictureDrawQuad>(); |
| 2718 green_quad->SetNew(green_shared_state, viewport, gfx::Rect(), viewport, | 2719 green_quad->SetNew(green_shared_state, viewport, gfx::Rect(), viewport, |
| 2719 gfx::RectF(0, 0, 1, 1), viewport.size(), nearest_neighbor, | 2720 gfx::RectF(0, 0, 1, 1), viewport.size(), nearest_neighbor, |
| 2720 texture_format, viewport, 1.f, green_raster_source.get()); | 2721 texture_format, viewport, 1.f, green_raster_source.get()); |
| 2721 | 2722 |
| 2722 // One viewport-filling white quad. | 2723 // One viewport-filling white quad. |
| 2723 std::unique_ptr<FakeRecordingSource> white_recording = | 2724 std::unique_ptr<FakeRecordingSource> white_recording = |
| 2724 FakeRecordingSource::CreateFilledRecordingSource(viewport.size()); | 2725 FakeRecordingSource::CreateFilledRecordingSource(viewport.size()); |
| 2725 SkPaint white_paint; | 2726 CdlPaint white_paint; |
| 2726 white_paint.setColor(SK_ColorWHITE); | 2727 white_paint.setColor(SK_ColorWHITE); |
| 2727 white_recording->add_draw_rect_with_paint(viewport, white_paint); | 2728 white_recording->add_draw_rect_with_paint(viewport, white_paint); |
| 2728 white_recording->Rerecord(); | 2729 white_recording->Rerecord(); |
| 2729 scoped_refptr<FakeRasterSource> white_raster_source = | 2730 scoped_refptr<FakeRasterSource> white_raster_source = |
| 2730 FakeRasterSource::CreateFromRecordingSource(white_recording.get(), false); | 2731 FakeRasterSource::CreateFromRecordingSource(white_recording.get(), false); |
| 2731 | 2732 |
| 2732 gfx::Transform white_quad_to_target_transform; | 2733 gfx::Transform white_quad_to_target_transform; |
| 2733 SharedQuadState* white_shared_state = CreateTestSharedQuadState( | 2734 SharedQuadState* white_shared_state = CreateTestSharedQuadState( |
| 2734 white_quad_to_target_transform, viewport, pass.get()); | 2735 white_quad_to_target_transform, viewport, pass.get()); |
| 2735 | 2736 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2783 sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(2, 2); | 2784 sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(2, 2); |
| 2784 ASSERT_NE(surface, nullptr); | 2785 ASSERT_NE(surface, nullptr); |
| 2785 SkCanvas* canvas = surface->getCanvas(); | 2786 SkCanvas* canvas = surface->getCanvas(); |
| 2786 canvas->drawPoint(0, 0, SK_ColorGREEN); | 2787 canvas->drawPoint(0, 0, SK_ColorGREEN); |
| 2787 canvas->drawPoint(0, 1, SK_ColorBLUE); | 2788 canvas->drawPoint(0, 1, SK_ColorBLUE); |
| 2788 canvas->drawPoint(1, 0, SK_ColorBLUE); | 2789 canvas->drawPoint(1, 0, SK_ColorBLUE); |
| 2789 canvas->drawPoint(1, 1, SK_ColorGREEN); | 2790 canvas->drawPoint(1, 1, SK_ColorGREEN); |
| 2790 | 2791 |
| 2791 std::unique_ptr<FakeRecordingSource> recording = | 2792 std::unique_ptr<FakeRecordingSource> recording = |
| 2792 FakeRecordingSource::CreateFilledRecordingSource(viewport.size()); | 2793 FakeRecordingSource::CreateFilledRecordingSource(viewport.size()); |
| 2793 SkPaint paint; | 2794 CdlPaint paint; |
| 2794 paint.setFilterQuality(kLow_SkFilterQuality); | 2795 paint.setFilterQuality(kLow_SkFilterQuality); |
| 2795 recording->add_draw_image_with_paint(surface->makeImageSnapshot(), | 2796 recording->add_draw_image_with_paint(surface->makeImageSnapshot(), |
| 2796 gfx::Point(), paint); | 2797 gfx::Point(), paint); |
| 2797 recording->Rerecord(); | 2798 recording->Rerecord(); |
| 2798 scoped_refptr<FakeRasterSource> raster_source = | 2799 scoped_refptr<FakeRasterSource> raster_source = |
| 2799 FakeRasterSource::CreateFromRecordingSource(recording.get(), false); | 2800 FakeRasterSource::CreateFromRecordingSource(recording.get(), false); |
| 2800 | 2801 |
| 2801 gfx::Transform quad_to_target_transform; | 2802 gfx::Transform quad_to_target_transform; |
| 2802 SharedQuadState* shared_state = | 2803 SharedQuadState* shared_state = |
| 2803 CreateTestSharedQuadState(quad_to_target_transform, viewport, pass.get()); | 2804 CreateTestSharedQuadState(quad_to_target_transform, viewport, pass.get()); |
| (...skipping 28 matching lines...) Expand all Loading... |
| 2832 sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(2, 2); | 2833 sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(2, 2); |
| 2833 ASSERT_NE(surface, nullptr); | 2834 ASSERT_NE(surface, nullptr); |
| 2834 SkCanvas* canvas = surface->getCanvas(); | 2835 SkCanvas* canvas = surface->getCanvas(); |
| 2835 canvas->drawPoint(0, 0, SK_ColorGREEN); | 2836 canvas->drawPoint(0, 0, SK_ColorGREEN); |
| 2836 canvas->drawPoint(0, 1, SK_ColorBLUE); | 2837 canvas->drawPoint(0, 1, SK_ColorBLUE); |
| 2837 canvas->drawPoint(1, 0, SK_ColorBLUE); | 2838 canvas->drawPoint(1, 0, SK_ColorBLUE); |
| 2838 canvas->drawPoint(1, 1, SK_ColorGREEN); | 2839 canvas->drawPoint(1, 1, SK_ColorGREEN); |
| 2839 | 2840 |
| 2840 std::unique_ptr<FakeRecordingSource> recording = | 2841 std::unique_ptr<FakeRecordingSource> recording = |
| 2841 FakeRecordingSource::CreateFilledRecordingSource(viewport.size()); | 2842 FakeRecordingSource::CreateFilledRecordingSource(viewport.size()); |
| 2842 SkPaint paint; | 2843 CdlPaint paint; |
| 2843 paint.setFilterQuality(kLow_SkFilterQuality); | 2844 paint.setFilterQuality(kLow_SkFilterQuality); |
| 2844 recording->add_draw_image_with_paint(surface->makeImageSnapshot(), | 2845 recording->add_draw_image_with_paint(surface->makeImageSnapshot(), |
| 2845 gfx::Point(), paint); | 2846 gfx::Point(), paint); |
| 2846 recording->Rerecord(); | 2847 recording->Rerecord(); |
| 2847 scoped_refptr<FakeRasterSource> raster_source = | 2848 scoped_refptr<FakeRasterSource> raster_source = |
| 2848 FakeRasterSource::CreateFromRecordingSource(recording.get(), false); | 2849 FakeRasterSource::CreateFromRecordingSource(recording.get(), false); |
| 2849 | 2850 |
| 2850 gfx::Transform quad_to_target_transform; | 2851 gfx::Transform quad_to_target_transform; |
| 2851 SharedQuadState* shared_state = | 2852 SharedQuadState* shared_state = |
| 2852 CreateTestSharedQuadState(quad_to_target_transform, viewport, pass.get()); | 2853 CreateTestSharedQuadState(quad_to_target_transform, viewport, pass.get()); |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3037 // a few extra "cleanup rects" need to be added to clobber the blending | 3038 // a few extra "cleanup rects" need to be added to clobber the blending |
| 3038 // to make the output image more clean. This will also test subrects | 3039 // to make the output image more clean. This will also test subrects |
| 3039 // of the layer. | 3040 // of the layer. |
| 3040 gfx::Transform green_quad_to_target_transform; | 3041 gfx::Transform green_quad_to_target_transform; |
| 3041 gfx::Rect green_rect1(gfx::Point(80, 0), gfx::Size(20, 100)); | 3042 gfx::Rect green_rect1(gfx::Point(80, 0), gfx::Size(20, 100)); |
| 3042 gfx::Rect green_rect2(gfx::Point(0, 80), gfx::Size(100, 20)); | 3043 gfx::Rect green_rect2(gfx::Point(0, 80), gfx::Size(100, 20)); |
| 3043 | 3044 |
| 3044 std::unique_ptr<FakeRecordingSource> green_recording = | 3045 std::unique_ptr<FakeRecordingSource> green_recording = |
| 3045 FakeRecordingSource::CreateFilledRecordingSource(viewport.size()); | 3046 FakeRecordingSource::CreateFilledRecordingSource(viewport.size()); |
| 3046 | 3047 |
| 3047 SkPaint red_paint; | 3048 CdlPaint red_paint; |
| 3048 red_paint.setColor(SK_ColorRED); | 3049 red_paint.setColor(SK_ColorRED); |
| 3049 green_recording->add_draw_rect_with_paint(viewport, red_paint); | 3050 green_recording->add_draw_rect_with_paint(viewport, red_paint); |
| 3050 SkPaint green_paint; | 3051 CdlPaint green_paint; |
| 3051 green_paint.setColor(SK_ColorGREEN); | 3052 green_paint.setColor(SK_ColorGREEN); |
| 3052 green_recording->add_draw_rect_with_paint(green_rect1, green_paint); | 3053 green_recording->add_draw_rect_with_paint(green_rect1, green_paint); |
| 3053 green_recording->add_draw_rect_with_paint(green_rect2, green_paint); | 3054 green_recording->add_draw_rect_with_paint(green_rect2, green_paint); |
| 3054 green_recording->Rerecord(); | 3055 green_recording->Rerecord(); |
| 3055 scoped_refptr<FakeRasterSource> green_raster_source = | 3056 scoped_refptr<FakeRasterSource> green_raster_source = |
| 3056 FakeRasterSource::CreateFromRecordingSource(green_recording.get(), false); | 3057 FakeRasterSource::CreateFromRecordingSource(green_recording.get(), false); |
| 3057 | 3058 |
| 3058 SharedQuadState* top_right_green_shared_quad_state = | 3059 SharedQuadState* top_right_green_shared_quad_state = |
| 3059 CreateTestSharedQuadState(green_quad_to_target_transform, viewport, | 3060 CreateTestSharedQuadState(green_quad_to_target_transform, viewport, |
| 3060 pass.get()); | 3061 pass.get()); |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3109 | 3110 |
| 3110 std::unique_ptr<FakeRecordingSource> recording = | 3111 std::unique_ptr<FakeRecordingSource> recording = |
| 3111 FakeRecordingSource::CreateFilledRecordingSource(layer_rect.size()); | 3112 FakeRecordingSource::CreateFilledRecordingSource(layer_rect.size()); |
| 3112 | 3113 |
| 3113 Region outside(layer_rect); | 3114 Region outside(layer_rect); |
| 3114 outside.Subtract(gfx::ToEnclosingRect(union_layer_rect)); | 3115 outside.Subtract(gfx::ToEnclosingRect(union_layer_rect)); |
| 3115 for (Region::Iterator iter(outside); iter.has_rect(); iter.next()) { | 3116 for (Region::Iterator iter(outside); iter.has_rect(); iter.next()) { |
| 3116 recording->add_draw_rect_with_paint(iter.rect(), red_paint); | 3117 recording->add_draw_rect_with_paint(iter.rect(), red_paint); |
| 3117 } | 3118 } |
| 3118 | 3119 |
| 3119 SkPaint blue_paint; | 3120 CdlPaint blue_paint; |
| 3120 blue_paint.setColor(SK_ColorBLUE); | 3121 blue_paint.setColor(SK_ColorBLUE); |
| 3121 recording->add_draw_rectf_with_paint(blue_layer_rect1, blue_paint); | 3122 recording->add_draw_rectf_with_paint(blue_layer_rect1, blue_paint); |
| 3122 recording->add_draw_rectf_with_paint(blue_layer_rect2, blue_paint); | 3123 recording->add_draw_rectf_with_paint(blue_layer_rect2, blue_paint); |
| 3123 recording->Rerecord(); | 3124 recording->Rerecord(); |
| 3124 scoped_refptr<FakeRasterSource> raster_source = | 3125 scoped_refptr<FakeRasterSource> raster_source = |
| 3125 FakeRasterSource::CreateFromRecordingSource(recording.get(), false); | 3126 FakeRasterSource::CreateFromRecordingSource(recording.get(), false); |
| 3126 | 3127 |
| 3127 gfx::Rect content_union_rect( | 3128 gfx::Rect content_union_rect( |
| 3128 gfx::ToEnclosingRect(gfx::ScaleRect(union_layer_rect, contents_scale))); | 3129 gfx::ToEnclosingRect(gfx::ScaleRect(union_layer_rect, contents_scale))); |
| 3129 | 3130 |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3396 | 3397 |
| 3397 EXPECT_TRUE(this->RunPixelTest( | 3398 EXPECT_TRUE(this->RunPixelTest( |
| 3398 &pass_list, base::FilePath(FILE_PATH_LITERAL("spiral.png")), | 3399 &pass_list, base::FilePath(FILE_PATH_LITERAL("spiral.png")), |
| 3399 FuzzyPixelOffByOneComparator(true))); | 3400 FuzzyPixelOffByOneComparator(true))); |
| 3400 } | 3401 } |
| 3401 | 3402 |
| 3402 #endif // !defined(OS_ANDROID) | 3403 #endif // !defined(OS_ANDROID) |
| 3403 | 3404 |
| 3404 } // namespace | 3405 } // namespace |
| 3405 } // namespace cc | 3406 } // namespace cc |
| OLD | NEW |