Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2914)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/tools/roll/cc_strip_video.patch

Issue 1013463003: Update from https://crrev.com/320931 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/perftests/texture_upload_perftest.cc ('k') | sandbox/linux/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/tools/roll/cc_strip_video.patch
diff --git a/mojo/tools/roll/cc_strip_video.patch b/mojo/tools/roll/cc_strip_video.patch
index ebc74957f55fa1e672316639241df53ee76a52dd..8d1a3b042f260195a2dcd55bb120a42ebdb9bb57 100644
--- a/mojo/tools/roll/cc_strip_video.patch
+++ b/mojo/tools/roll/cc_strip_video.patch
@@ -1,8 +1,8 @@
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
-index 0411b45..4ee07db 100644
+index bd8bfdd..6e55656 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
-@@ -222,13 +222,6 @@ component("cc") {
+@@ -189,13 +189,6 @@ component("cc") {
"layers/ui_resource_layer.h",
"layers/ui_resource_layer_impl.cc",
"layers/ui_resource_layer_impl.h",
@@ -16,7 +16,7 @@ index 0411b45..4ee07db 100644
"output/begin_frame_args.cc",
"output/begin_frame_args.h",
"output/bsp_tree.cc",
-@@ -486,8 +479,6 @@ component("cc") {
+@@ -458,8 +451,6 @@ component("cc") {
"resources/ui_resource_client.h",
"resources/ui_resource_request.cc",
"resources/ui_resource_request.h",
@@ -25,7 +25,7 @@ index 0411b45..4ee07db 100644
"resources/zero_copy_tile_task_worker_pool.cc",
"resources/zero_copy_tile_task_worker_pool.h",
"scheduler/begin_frame_source.cc",
-@@ -628,8 +619,6 @@ source_set("test_support") {
+@@ -606,8 +597,6 @@ source_set("test_support") {
"test/fake_tile_manager_client.h",
"test/fake_ui_resource_layer_tree_host_impl.cc",
"test/fake_ui_resource_layer_tree_host_impl.h",
@@ -34,7 +34,7 @@ index 0411b45..4ee07db 100644
"test/geometry_test_utils.cc",
"test/geometry_test_utils.h",
"test/impl_side_painting_settings.h",
-@@ -787,7 +776,6 @@ test("cc_unittests") {
+@@ -766,7 +755,6 @@ test("cc_unittests") {
"layers/tiled_layer_unittest.cc",
"layers/ui_resource_layer_impl_unittest.cc",
"layers/ui_resource_layer_unittest.cc",
@@ -42,7 +42,7 @@ index 0411b45..4ee07db 100644
"output/begin_frame_args_unittest.cc",
"output/delegating_renderer_unittest.cc",
"output/filter_operations_unittest.cc",
-@@ -848,7 +836,6 @@ test("cc_unittests") {
+@@ -827,7 +815,6 @@ test("cc_unittests") {
"trees/layer_tree_host_unittest_picture.cc",
"trees/layer_tree_host_unittest_proxy.cc",
"trees/layer_tree_host_unittest_scroll.cc",
@@ -241,23 +241,11 @@ index 4bbd92f..0000000
-}
-
-} // namespace cc
-diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
-index 613ea4b..3813e1d 100644
---- a/cc/output/gl_renderer.cc
-+++ b/cc/output/gl_renderer.cc
-@@ -18,7 +18,6 @@
- #include "build/build_config.h"
- #include "base/trace_event/trace_event.h"
- #include "cc/base/math_util.h"
--#include "cc/layers/video_layer_impl.h"
- #include "cc/output/compositor_frame.h"
- #include "cc/output/compositor_frame_metadata.h"
- #include "cc/output/context_provider.h"
diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc
-index 295fc84..ebda8d6 100644
+index d02df4f..9166ea8 100644
--- a/cc/output/renderer_pixeltest.cc
+++ b/cc/output/renderer_pixeltest.cc
-@@ -12,7 +12,6 @@
+@@ -11,7 +11,6 @@
#include "cc/test/fake_picture_pile_impl.h"
#include "cc/test/pixel_test.h"
#include "gpu/command_buffer/client/gles2_interface.h"
@@ -265,7 +253,7 @@ index 295fc84..ebda8d6 100644
#include "third_party/skia/include/core/SkColorPriv.h"
#include "third_party/skia/include/core/SkImageFilter.h"
#include "third_party/skia/include/core/SkMatrix.h"
-@@ -902,243 +901,6 @@ TEST_F(GLRendererPixelTest, NonPremultipliedTextureWithBackground) {
+@@ -907,267 +906,6 @@ TEST_F(GLRendererPixelTest, NonPremultipliedTextureWithBackground) {
FuzzyPixelOffByOneComparator(true)));
}
@@ -300,9 +288,9 @@ index 295fc84..ebda8d6 100644
- // the final image. Bleeding will appear on all four sides of the video
- // if the tex coords are not clamped.
- CreateTestYUVVideoDrawQuad_TwoColor(
-- shared_state, format, false, tex_coord_rect, background_size, 0, 0, 0,
-- green_rect, 149, 43, 21, pass.get(), video_resource_updater_.get(),
-- resource_provider_.get());
+- shared_state, format, false, tex_coord_rect, background_size,
+- gfx::Rect(background_size), 0, 0, 0, green_rect, 149, 43, 21,
+- pass.get(), video_resource_updater_.get(), resource_provider_.get());
- pass_list->push_back(pass.Pass());
- }
-
@@ -327,7 +315,7 @@ index 295fc84..ebda8d6 100644
- CreateTestYUVVideoDrawQuad_Striped(shared_state, media::VideoFrame::YV12,
- false, gfx::RectF(0.0f, 0.0f, 1.0f, 1.0f),
- pass.get(), video_resource_updater_.get(),
-- rect, resource_provider_.get());
+- rect, rect, resource_provider_.get());
-
- RenderPassList pass_list;
- pass_list.push_back(pass.Pass());
@@ -338,6 +326,30 @@ index 295fc84..ebda8d6 100644
- FuzzyPixelOffByOneComparator(true)));
-}
-
+-TEST_F(VideoGLRendererPixelTest, ClippedYUVRect) {
+- gfx::Rect viewport(this->device_viewport_size_);
+- gfx::Rect draw_rect(this->device_viewport_size_.width() * 1.5,
+- this->device_viewport_size_.height() * 1.5);
+-
+- RenderPassId id(1, 1);
+- scoped_ptr<RenderPass> pass = CreateTestRootRenderPass(id, viewport);
+-
+- SharedQuadState* shared_state =
+- CreateTestSharedQuadState(gfx::Transform(), viewport, pass.get());
+-
+- CreateTestYUVVideoDrawQuad_Striped(shared_state, media::VideoFrame::YV12,
+- false, gfx::RectF(0.0f, 0.0f, 1.0f, 1.0f),
+- pass.get(), video_resource_updater_.get(),
+- draw_rect, viewport,
+- resource_provider_.get());
+- RenderPassList pass_list;
+- pass_list.push_back(pass.Pass());
+-
+- EXPECT_TRUE(this->RunPixelTest(
+- &pass_list, base::FilePath(FILE_PATH_LITERAL("yuv_stripes_clipped.png")),
+- FuzzyPixelOffByOneComparator(true)));
+-}
+-
-TEST_F(VideoGLRendererPixelTest, OffsetYUVRect) {
- gfx::Rect rect(this->device_viewport_size_);
-
@@ -351,7 +363,7 @@ index 295fc84..ebda8d6 100644
- CreateTestYUVVideoDrawQuad_Striped(
- shared_state, media::VideoFrame::I420, false,
- gfx::RectF(0.125f, 0.25f, 0.75f, 0.5f), pass.get(),
-- video_resource_updater_.get(), rect, resource_provider_.get());
+- video_resource_updater_.get(), rect, rect, resource_provider_.get());
-
- RenderPassList pass_list;
- pass_list.push_back(pass.Pass());
@@ -375,7 +387,7 @@ index 295fc84..ebda8d6 100644
- CreateTestYUVVideoDrawQuad_Solid(
- shared_state, media::VideoFrame::YV12, false,
- gfx::RectF(0.0f, 0.0f, 1.0f, 1.0f), 15, 128, 128, pass.get(),
-- video_resource_updater_.get(), rect, resource_provider_.get());
+- video_resource_updater_.get(), rect, rect, resource_provider_.get());
-
- RenderPassList pass_list;
- pass_list.push_back(pass.Pass());
@@ -400,7 +412,7 @@ index 295fc84..ebda8d6 100644
- CreateTestYUVVideoDrawQuad_Solid(
- shared_state, media::VideoFrame::YV12J, false,
- gfx::RectF(0.0f, 0.0f, 1.0f, 1.0f), 149, 43, 21, pass.get(),
-- video_resource_updater_.get(), rect, resource_provider_.get());
+- video_resource_updater_.get(), rect, rect, resource_provider_.get());
-
- RenderPassList pass_list;
- pass_list.push_back(pass.Pass());
@@ -441,7 +453,7 @@ index 295fc84..ebda8d6 100644
- CreateTestYUVVideoDrawQuad_Solid(
- shared_state, media::VideoFrame::YV12J, false,
- gfx::RectF(0.0f, 0.0f, 1.0f, 1.0f), 15, 128, 128, pass.get(),
-- video_resource_updater_.get(), rect, resource_provider_.get());
+- video_resource_updater_.get(), rect, rect, resource_provider_.get());
-
- RenderPassList pass_list;
- pass_list.push_back(pass.Pass());
@@ -464,7 +476,7 @@ index 295fc84..ebda8d6 100644
- CreateTestYUVVideoDrawQuad_Striped(shared_state, media::VideoFrame::YV12A,
- false, gfx::RectF(0.0f, 0.0f, 1.0f, 1.0f),
- pass.get(), video_resource_updater_.get(),
-- rect, resource_provider_.get());
+- rect, rect, resource_provider_.get());
-
- SolidColorDrawQuad* color_quad =
- pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
@@ -491,7 +503,7 @@ index 295fc84..ebda8d6 100644
- CreateTestYUVVideoDrawQuad_Striped(shared_state, media::VideoFrame::YV12A,
- true, gfx::RectF(0.0f, 0.0f, 1.0f, 1.0f),
- pass.get(), video_resource_updater_.get(),
-- rect, resource_provider_.get());
+- rect, rect, resource_provider_.get());
-
- SolidColorDrawQuad* color_quad =
- pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
@@ -509,18 +521,6 @@ index 295fc84..ebda8d6 100644
TYPED_TEST(RendererPixelTest, FastPassColorFilterAlpha) {
gfx::Rect viewport_rect(this->device_viewport_size_);
-diff --git a/cc/quads/yuv_video_draw_quad.h b/cc/quads/yuv_video_draw_quad.h
-index 358929e..15bce98 100644
---- a/cc/quads/yuv_video_draw_quad.h
-+++ b/cc/quads/yuv_video_draw_quad.h
-@@ -8,7 +8,6 @@
- #include "base/basictypes.h"
- #include "base/memory/scoped_ptr.h"
- #include "cc/base/cc_export.h"
--#include "cc/layers/video_layer_impl.h"
- #include "cc/quads/draw_quad.h"
-
- namespace cc {
diff --git a/cc/resources/drawing_display_item.cc b/cc/resources/drawing_display_item.cc
index 648f9de..6dffad9 100644
--- a/cc/resources/drawing_display_item.cc
@@ -534,10 +534,10 @@ index 648f9de..6dffad9 100644
#include "base/trace_event/trace_event_argument.h"
#include "cc/debug/picture_debug_util.h"
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
-index 4289a99..4e3230b 100644
+index 8056387..e8471e2 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
-@@ -27,7 +27,6 @@
+@@ -26,7 +26,6 @@
#include "cc/layers/solid_color_scrollbar_layer_impl.h"
#include "cc/layers/texture_layer_impl.h"
#include "cc/layers/tiled_layer_impl.h"
@@ -614,10 +614,10 @@ index 4289a99..4e3230b 100644
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
-index 68a1f58..2ec6e66 100644
+index aacabd7..9416474 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
-@@ -18,7 +18,6 @@
+@@ -17,7 +17,6 @@
#include "cc/layers/painted_scrollbar_layer.h"
#include "cc/layers/picture_layer.h"
#include "cc/layers/solid_color_layer.h"
@@ -633,7 +633,7 @@ index 68a1f58..2ec6e66 100644
#include "cc/test/geometry_test_utils.h"
#include "cc/test/impl_side_painting_settings.h"
#include "cc/test/layer_tree_test.h"
-@@ -4170,28 +4168,6 @@ class LayerInvalidateCausesDraw : public LayerTreeHostTest {
+@@ -4256,28 +4254,6 @@ class LayerInvalidateCausesDraw : public LayerTreeHostTest {
int num_draws_;
};
« no previous file with comments | « gpu/perftests/texture_upload_perftest.cc ('k') | sandbox/linux/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698