| 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/quads/draw_quad.h" | 5 #include "cc/quads/draw_quad.h" | 
| 6 | 6 | 
| 7 #include <algorithm> | 7 #include <algorithm> | 
| 8 | 8 | 
| 9 #include "base/bind.h" | 9 #include "base/bind.h" | 
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" | 
| 11 #include "cc/base/math_util.h" | 11 #include "cc/base/math_util.h" | 
|  | 12 #include "cc/output/filter_operations.h" | 
| 12 #include "cc/quads/checkerboard_draw_quad.h" | 13 #include "cc/quads/checkerboard_draw_quad.h" | 
| 13 #include "cc/quads/debug_border_draw_quad.h" | 14 #include "cc/quads/debug_border_draw_quad.h" | 
| 14 #include "cc/quads/io_surface_draw_quad.h" | 15 #include "cc/quads/io_surface_draw_quad.h" | 
| 15 #include "cc/quads/picture_draw_quad.h" | 16 #include "cc/quads/picture_draw_quad.h" | 
| 16 #include "cc/quads/render_pass_draw_quad.h" | 17 #include "cc/quads/render_pass_draw_quad.h" | 
| 17 #include "cc/quads/solid_color_draw_quad.h" | 18 #include "cc/quads/solid_color_draw_quad.h" | 
| 18 #include "cc/quads/stream_video_draw_quad.h" | 19 #include "cc/quads/stream_video_draw_quad.h" | 
| 19 #include "cc/quads/texture_draw_quad.h" | 20 #include "cc/quads/texture_draw_quad.h" | 
| 20 #include "cc/quads/tile_draw_quad.h" | 21 #include "cc/quads/tile_draw_quad.h" | 
| 21 #include "cc/quads/yuv_video_draw_quad.h" | 22 #include "cc/quads/yuv_video_draw_quad.h" | 
| 22 #include "cc/resources/picture_pile_impl.h" | 23 #include "cc/resources/picture_pile_impl.h" | 
| 23 #include "cc/test/geometry_test_utils.h" | 24 #include "cc/test/geometry_test_utils.h" | 
| 24 #include "testing/gtest/include/gtest/gtest.h" | 25 #include "testing/gtest/include/gtest/gtest.h" | 
| 25 #include "third_party/WebKit/public/platform/WebFilterOperations.h" |  | 
| 26 #include "third_party/skia/include/effects/SkBlurImageFilter.h" | 26 #include "third_party/skia/include/effects/SkBlurImageFilter.h" | 
| 27 #include "ui/gfx/transform.h" | 27 #include "ui/gfx/transform.h" | 
| 28 | 28 | 
| 29 namespace cc { | 29 namespace cc { | 
| 30 namespace { | 30 namespace { | 
| 31 | 31 | 
| 32 TEST(DrawQuadTest, CopySharedQuadState) { | 32 TEST(DrawQuadTest, CopySharedQuadState) { | 
| 33   gfx::Transform quad_transform = gfx::Transform(1.0, 0.0, 0.5, 1.0, 0.5, 0.0); | 33   gfx::Transform quad_transform = gfx::Transform(1.0, 0.0, 0.5, 1.0, 0.5, 0.0); | 
| 34   gfx::Size content_bounds(26, 28); | 34   gfx::Size content_bounds(26, 28); | 
| 35   gfx::Rect visible_content_rect(10, 12, 14, 16); | 35   gfx::Rect visible_content_rect(10, 12, 14, 16); | 
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 354   EXPECT_EQ(resource_id, copy_quad->io_surface_resource_id); | 354   EXPECT_EQ(resource_id, copy_quad->io_surface_resource_id); | 
| 355   EXPECT_EQ(orientation, copy_quad->orientation); | 355   EXPECT_EQ(orientation, copy_quad->orientation); | 
| 356 } | 356 } | 
| 357 | 357 | 
| 358 TEST(DrawQuadTest, CopyRenderPassDrawQuad) { | 358 TEST(DrawQuadTest, CopyRenderPassDrawQuad) { | 
| 359   RenderPass::Id render_pass_id(22, 64); | 359   RenderPass::Id render_pass_id(22, 64); | 
| 360   bool is_replica = true; | 360   bool is_replica = true; | 
| 361   ResourceProvider::ResourceId mask_resource_id = 78; | 361   ResourceProvider::ResourceId mask_resource_id = 78; | 
| 362   gfx::Rect contents_changed_since_last_frame(42, 11, 74, 24); | 362   gfx::Rect contents_changed_since_last_frame(42, 11, 74, 24); | 
| 363   gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f); | 363   gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f); | 
| 364   WebKit::WebFilterOperations filters; | 364   FilterOperations filters; | 
| 365   filters.append(WebKit::WebFilterOperation::createBlurFilter(1.f)); | 365   filters.Append(FilterOperation::CreateBlurFilter(1.f)); | 
| 366   WebKit::WebFilterOperations background_filters; | 366   FilterOperations background_filters; | 
| 367   background_filters.append( | 367   background_filters.Append( | 
| 368       WebKit::WebFilterOperation::createGrayscaleFilter(1.f)); | 368       FilterOperation::CreateGrayscaleFilter(1.f)); | 
| 369   skia::RefPtr<SkImageFilter> filter = | 369   skia::RefPtr<SkImageFilter> filter = | 
| 370       skia::AdoptRef(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1)); | 370       skia::AdoptRef(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1)); | 
| 371 | 371 | 
| 372   RenderPass::Id copied_render_pass_id(235, 11); | 372   RenderPass::Id copied_render_pass_id(235, 11); | 
| 373   CREATE_SHARED_STATE(); | 373   CREATE_SHARED_STATE(); | 
| 374 | 374 | 
| 375   CREATE_QUAD_8_NEW_1(RenderPassDrawQuad, | 375   CREATE_QUAD_8_NEW_1(RenderPassDrawQuad, | 
| 376                       render_pass_id, | 376                       render_pass_id, | 
| 377                       is_replica, | 377                       is_replica, | 
| 378                       mask_resource_id, | 378                       mask_resource_id, | 
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 754   EXPECT_EQ(1, IterateAndCount(quad_new.get())); | 754   EXPECT_EQ(1, IterateAndCount(quad_new.get())); | 
| 755   EXPECT_EQ(resource_id + 1, quad_new->io_surface_resource_id); | 755   EXPECT_EQ(resource_id + 1, quad_new->io_surface_resource_id); | 
| 756 } | 756 } | 
| 757 | 757 | 
| 758 TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) { | 758 TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) { | 
| 759   RenderPass::Id render_pass_id(22, 64); | 759   RenderPass::Id render_pass_id(22, 64); | 
| 760   bool is_replica = true; | 760   bool is_replica = true; | 
| 761   ResourceProvider::ResourceId mask_resource_id = 78; | 761   ResourceProvider::ResourceId mask_resource_id = 78; | 
| 762   gfx::Rect contents_changed_since_last_frame(42, 11, 74, 24); | 762   gfx::Rect contents_changed_since_last_frame(42, 11, 74, 24); | 
| 763   gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f); | 763   gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f); | 
| 764   WebKit::WebFilterOperations filters; | 764   FilterOperations filters; | 
| 765   filters.append(WebKit::WebFilterOperation::createBlurFilter(1.f)); | 765   filters.Append(FilterOperation::CreateBlurFilter(1.f)); | 
| 766   WebKit::WebFilterOperations background_filters; | 766   FilterOperations background_filters; | 
| 767   background_filters.append( | 767   background_filters.Append( | 
| 768       WebKit::WebFilterOperation::createGrayscaleFilter(1.f)); | 768       FilterOperation::CreateGrayscaleFilter(1.f)); | 
| 769   skia::RefPtr<SkImageFilter> filter = | 769   skia::RefPtr<SkImageFilter> filter = | 
| 770       skia::AdoptRef(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1)); | 770       skia::AdoptRef(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1)); | 
| 771 | 771 | 
| 772   RenderPass::Id copied_render_pass_id(235, 11); | 772   RenderPass::Id copied_render_pass_id(235, 11); | 
| 773 | 773 | 
| 774   CREATE_SHARED_STATE(); | 774   CREATE_SHARED_STATE(); | 
| 775   CREATE_QUAD_8_NEW_1(RenderPassDrawQuad, | 775   CREATE_QUAD_8_NEW_1(RenderPassDrawQuad, | 
| 776                       render_pass_id, | 776                       render_pass_id, | 
| 777                       is_replica, | 777                       is_replica, | 
| 778                       mask_resource_id, | 778                       mask_resource_id, | 
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 900                     swizzle_contents, | 900                     swizzle_contents, | 
| 901                     content_rect, | 901                     content_rect, | 
| 902                     contents_scale, | 902                     contents_scale, | 
| 903                     can_draw_direct_to_backbuffer, | 903                     can_draw_direct_to_backbuffer, | 
| 904                     picture_pile); | 904                     picture_pile); | 
| 905   EXPECT_EQ(0, IterateAndCount(quad_new.get())); | 905   EXPECT_EQ(0, IterateAndCount(quad_new.get())); | 
| 906 } | 906 } | 
| 907 | 907 | 
| 908 }  // namespace | 908 }  // namespace | 
| 909 }  // namespace cc | 909 }  // namespace cc | 
| OLD | NEW | 
|---|