Update from https://crrev.com/320931

mojo/tools/roll/cc_strip_video.patch

 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",
 -    "layers/video_frame_provider.h",
 -    "layers/video_frame_provider_client_impl.cc",
 -    "layers/video_frame_provider_client_impl.h",
 -    "layers/video_layer.cc",
 -    "layers/video_layer.h",
 -    "layers/video_layer_impl.cc",
 -    "layers/video_layer_impl.h",
      "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",
 -    "resources/video_resource_updater.cc",
 -    "resources/video_resource_updater.h",
      "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",
 -    "test/fake_video_frame_provider.cc",
 -    "test/fake_video_frame_provider.h",
      "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",
 -    "layers/video_layer_impl_unittest.cc",
      "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",
 -    "trees/layer_tree_host_unittest_video.cc",
      "trees/layer_tree_impl_unittest.cc",
      "trees/occlusion_tracker_unittest.cc",
      "trees/occlusion_unittest.cc",
 diff --git a/cc/layers/video_frame_provider.h b/cc/layers/video_frame_provider.h
 deleted file mode 100644
 index 784d951..0000000
@@ skipping 178 matching lines @@
 -  stream_texture_matrix_ = gfx::Transform(
 -      matrix[0], matrix[4], matrix[8], matrix[12],
 -      matrix[1], matrix[5], matrix[9], matrix[13],
 -      matrix[2], matrix[6], matrix[10], matrix[14],
 -      matrix[3], matrix[7], matrix[11], matrix[15]);
 -  if (active_video_layer_)
 -    active_video_layer_->SetNeedsRedraw();
 -}
 -
 -}  // 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"
 -#include "media/base/video_frame.h"
  #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)));
  }
  
 -class VideoGLRendererPixelTest : public GLRendererPixelTest {
 - protected:
 -  void CreateEdgeBleedPass(media::VideoFrame::Format format,
 -                           RenderPassList* pass_list) {
 -    gfx::Rect rect(200, 200);
 -
 -    RenderPassId id(1, 1);
@@ skipping 14 matching lines @@
 -        static_cast<float>(green_rect.y()) / background_size.height(),
 -        static_cast<float>(green_rect.width()) / background_size.width(),
 -        static_cast<float>(green_rect.height()) / background_size.height());
 -
 -    // YUV of (149,43,21) should be green (0,255,0) in RGB.
 -    // Create a video frame that has a non-green background rect, with a
 -    // green sub-rectangle that should be the only thing displayed in
 -    // 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());
 -  }
 -
 -  void SetUp() override {
 -    GLRendererPixelTest::SetUp();
 -    video_resource_updater_.reset(new VideoResourceUpdater(
 -        output_surface_->context_provider(), resource_provider_.get()));
 -  }
 -
 -  scoped_ptr<VideoResourceUpdater> video_resource_updater_;
 -};
 -
 -TEST_F(VideoGLRendererPixelTest, SimpleYUVRect) {
 -  gfx::Rect rect(this->device_viewport_size_);
 -
 -  RenderPassId id(1, 1);
 -  scoped_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
 -
 -  SharedQuadState* shared_state =
 -      CreateTestSharedQuadState(gfx::Transform(), rect, 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(),
--                                     rect, resource_provider_.get());
+-                                     rect, rect, 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.png")),
 -                         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_);
 -
 -  RenderPassId id(1, 1);
 -  scoped_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
 -
 -  SharedQuadState* shared_state =
 -      CreateTestSharedQuadState(gfx::Transform(), rect, pass.get());
 -
 -  // Intentionally sets frame format to I420 for testing coverage.
 -  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());
 -
 -  EXPECT_TRUE(this->RunPixelTest(
 -      &pass_list,
 -      base::FilePath(FILE_PATH_LITERAL("yuv_stripes_offset.png")),
 -      FuzzyPixelOffByOneComparator(true)));
 -}
 -
 -TEST_F(VideoGLRendererPixelTest, SimpleYUVRectBlack) {
 -  gfx::Rect rect(this->device_viewport_size_);
 -
 -  RenderPassId id(1, 1);
 -  scoped_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
 -
 -  SharedQuadState* shared_state =
 -      CreateTestSharedQuadState(gfx::Transform(), rect, pass.get());
 -
 -  // In MPEG color range YUV values of (15,128,128) should produce black.
 -  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());
 -
 -  // If we didn't get black out of the YUV values above, then we probably have a
 -  // color range issue.
 -  EXPECT_TRUE(this->RunPixelTest(&pass_list,
 -                                 base::FilePath(FILE_PATH_LITERAL("black.png")),
 -                                 FuzzyPixelOffByOneComparator(true)));
 -}
 -
 -TEST_F(VideoGLRendererPixelTest, SimpleYUVJRect) {
 -  gfx::Rect rect(this->device_viewport_size_);
 -
 -  RenderPassId id(1, 1);
 -  scoped_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
 -
 -  SharedQuadState* shared_state =
 -      CreateTestSharedQuadState(gfx::Transform(), rect, pass.get());
 -
 -  // YUV of (149,43,21) should be green (0,255,0) in RGB.
 -  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());
 -
 -  EXPECT_TRUE(this->RunPixelTest(&pass_list,
 -                                 base::FilePath(FILE_PATH_LITERAL("green.png")),
 -                                 FuzzyPixelOffByOneComparator(true)));
 -}
 -
 -// Test that a YUV video doesn't bleed outside of its tex coords when the
@@ skipping 20 matching lines @@
 -  RenderPassId id(1, 1);
 -  scoped_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
 -
 -  SharedQuadState* shared_state =
 -      CreateTestSharedQuadState(gfx::Transform(), rect, pass.get());
 -
 -  // Dark grey in JPEG color range (in MPEG, this is black).
 -  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());
 -
 -  EXPECT_TRUE(
 -      this->RunPixelTest(&pass_list,
 -                         base::FilePath(FILE_PATH_LITERAL("dark_grey.png")),
 -                         FuzzyPixelOffByOneComparator(true)));
 -}
 -
 -TEST_F(VideoGLRendererPixelTest, SimpleYUVARect) {
 -  gfx::Rect rect(this->device_viewport_size_);
 -
 -  RenderPassId id(1, 1);
 -  scoped_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
 -
 -  SharedQuadState* shared_state =
 -      CreateTestSharedQuadState(gfx::Transform(), rect, pass.get());
 -
 -  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>();
 -  color_quad->SetNew(shared_state, rect, rect, SK_ColorWHITE, false);
 -
 -  RenderPassList pass_list;
 -  pass_list.push_back(pass.Pass());
 -
 -  EXPECT_TRUE(this->RunPixelTest(
 -      &pass_list,
 -      base::FilePath(FILE_PATH_LITERAL("yuv_stripes_alpha.png")),
 -      FuzzyPixelOffByOneComparator(true)));
 -}
 -
 -TEST_F(VideoGLRendererPixelTest, FullyTransparentYUVARect) {
 -  gfx::Rect rect(this->device_viewport_size_);
 -
 -  RenderPassId id(1, 1);
 -  scoped_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
 -
 -  SharedQuadState* shared_state =
 -      CreateTestSharedQuadState(gfx::Transform(), rect, pass.get());
 -
 -  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>();
 -  color_quad->SetNew(shared_state, rect, rect, SK_ColorBLACK, false);
 -
 -  RenderPassList pass_list;
 -  pass_list.push_back(pass.Pass());
 -
 -  EXPECT_TRUE(this->RunPixelTest(
 -      &pass_list,
 -      base::FilePath(FILE_PATH_LITERAL("black.png")),
 -      ExactPixelComparator(true)));
 -}
 -
  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
 +++ b/cc/resources/drawing_display_item.cc
 @@ -6,6 +6,7 @@
  
  #include <string>
  
 +#include "base/logging.h"
  #include "base/strings/stringprintf.h"
  #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"
 -#include "cc/layers/video_layer_impl.h"
  #include "cc/output/begin_frame_args.h"
  #include "cc/output/compositor_frame_ack.h"
  #include "cc/output/compositor_frame_metadata.h"
 @@ -47,7 +46,6 @@
  #include "cc/test/fake_picture_layer_impl.h"
  #include "cc/test/fake_picture_pile_impl.h"
@@ skipping 56 matching lines @@
 -  video_layer->SetBounds(gfx::Size(10, 10));
 -  video_layer->SetContentBounds(gfx::Size(10, 10));
 -  video_layer->SetDrawsContent(true);
 -  root_layer->AddChild(video_layer.Pass());
 -  SetupRootLayerImpl(root_layer.Pass());
 -
    LayerTreeHostImpl::FrameData frame;
    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"
 -#include "cc/layers/video_layer.h"
  #include "cc/output/begin_frame_args.h"
  #include "cc/output/compositor_frame_ack.h"
  #include "cc/output/copy_output_request.h"
 @@ -41,7 +40,6 @@
  #include "cc/test/fake_picture_pile.h"
  #include "cc/test/fake_proxy.h"
  #include "cc/test/fake_scoped_ui_resource.h"
 -#include "cc/test/fake_video_frame_provider.h"
  #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_;
  };
  
 -// VideoLayer must support being invalidated and then passing that along
 -// to the compositor thread, even though no resources are updated in
 -// response to that invalidation.
 -class LayerTreeHostTestVideoLayerInvalidate : public LayerInvalidateCausesDraw {
 - public:
 -  void SetupTree() override {
 -    LayerTreeHostTest::SetupTree();
@@ skipping 119 matching lines @@
 -  scoped_refptr<VideoFrame> color_video_frame_;
 -  scoped_refptr<VideoFrame> hw_video_frame_;
 -  scoped_refptr<VideoFrame> scaled_hw_video_frame_;
 -
 -  FakeVideoFrameProvider color_frame_provider_;
 -  FakeVideoFrameProvider hw_frame_provider_;
 -  FakeVideoFrameProvider scaled_hw_frame_provider_;
  };
  
  SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostContextTestDontUseLostResources);