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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase to ToT mojo Created 5 years, 11 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 | « mojo/services/network/web_socket_impl.h ('k') | mojo/tools/roll/mojo_services_network.patch » ('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 36ed0f89861305afa545a488ecab853ecf011161..8098db6e458b406e98f2b36f8c605bca9e3561d2 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 1100151..44896c1 100644
+index 2ede4ac..eee115c 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
-@@ -214,13 +214,6 @@ component("cc") {
+@@ -222,13 +222,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 1100151..44896c1 100644
"output/begin_frame_args.cc",
"output/begin_frame_args.h",
"output/bsp_tree.cc",
-@@ -464,8 +457,6 @@ component("cc") {
+@@ -480,8 +473,6 @@ component("cc") {
"resources/ui_resource_client.h",
"resources/ui_resource_request.cc",
"resources/ui_resource_request.h",
@@ -25,7 +25,7 @@ index 1100151..44896c1 100644
"resources/zero_copy_tile_task_worker_pool.cc",
"resources/zero_copy_tile_task_worker_pool.h",
"scheduler/begin_frame_source.cc",
-@@ -607,8 +598,6 @@ source_set("test_support") {
+@@ -623,8 +614,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 1100151..44896c1 100644
"test/failure_output_surface.cc",
"test/failure_output_surface.h",
"test/geometry_test_utils.cc",
-@@ -764,7 +753,6 @@ test("cc_unittests") {
+@@ -782,7 +771,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 1100151..44896c1 100644
"output/begin_frame_args_unittest.cc",
"output/delegating_renderer_unittest.cc",
"output/filter_operations_unittest.cc",
-@@ -796,7 +784,6 @@ test("cc_unittests") {
+@@ -814,7 +802,6 @@ test("cc_unittests") {
"resources/texture_uploader_unittest.cc",
"resources/tile_manager_unittest.cc",
"resources/tile_priority_unittest.cc",
@@ -50,7 +50,7 @@ index 1100151..44896c1 100644
"scheduler/begin_frame_source_unittest.cc",
"scheduler/delay_based_time_source_unittest.cc",
"scheduler/scheduler_state_machine_unittest.cc",
-@@ -825,7 +812,6 @@ test("cc_unittests") {
+@@ -843,7 +830,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",
@@ -612,7 +612,7 @@ index e1c5410..edda34a 100644
namespace cc {
diff --git a/cc/resources/drawing_display_item.cc b/cc/resources/drawing_display_item.cc
-index f8d3c62..eb05e33 100644
+index e5610ca..473cb77 100644
--- a/cc/resources/drawing_display_item.cc
+++ b/cc/resources/drawing_display_item.cc
@@ -4,6 +4,7 @@
@@ -624,7 +624,7 @@ index f8d3c62..eb05e33 100644
#include "third_party/skia/include/core/SkDrawPictureCallback.h"
#include "third_party/skia/include/core/SkMatrix.h"
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
-index fb2fdb6..6c46d8f 100644
+index 6ac2f8c..7804f22 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -27,7 +27,6 @@
@@ -659,7 +659,7 @@ index fb2fdb6..6c46d8f 100644
namespace cc {
namespace {
-@@ -95,7 +91,6 @@ class LayerTreeHostImplTest : public testing::Test,
+@@ -96,7 +92,6 @@ class LayerTreeHostImplTest : public testing::Test,
reduce_memory_result_(true),
current_limit_bytes_(0),
current_priority_cutoff_value_(0) {
@@ -667,7 +667,7 @@ index fb2fdb6..6c46d8f 100644
}
LayerTreeSettings DefaultSettings() {
-@@ -5314,18 +5309,6 @@ TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
+@@ -5308,18 +5303,6 @@ TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
root_layer->SetBounds(gfx::Size(10, 10));
root_layer->SetHasRenderSurface(true);
@@ -686,7 +686,7 @@ index fb2fdb6..6c46d8f 100644
scoped_ptr<IOSurfaceLayerImpl> io_surface_layer =
IOSurfaceLayerImpl::Create(host_impl_->active_tree(), 5);
io_surface_layer->SetBounds(gfx::Size(10, 10));
-@@ -6405,16 +6388,6 @@ TEST_F(LayerTreeHostImplTest,
+@@ -6399,16 +6382,6 @@ TEST_F(LayerTreeHostImplTest,
scoped_ptr<SolidColorLayerImpl> root_layer =
SolidColorLayerImpl::Create(host_impl_->active_tree(), 1);
@@ -704,7 +704,7 @@ index fb2fdb6..6c46d8f 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 50ace9b..69e5272 100644
+index 5299d70..1e10588 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -18,7 +18,6 @@
@@ -721,9 +721,9 @@ index 50ace9b..69e5272 100644
#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"
- #include "cc/test/test_shared_bitmap_manager.h"
-@@ -4192,28 +4190,6 @@ class LayerInvalidateCausesDraw : public LayerTreeHostTest {
+@@ -4193,28 +4191,6 @@ class LayerInvalidateCausesDraw : public LayerTreeHostTest {
int num_draws_;
};
@@ -753,7 +753,7 @@ index 50ace9b..69e5272 100644
// to the compositor thread, even though no resources are updated in
// response to that invalidation.
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
-index 24ffcd4..cc4f28f 100644
+index 681ae4e..cc4f28f 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -15,8 +15,6 @@
@@ -791,7 +791,7 @@ index 24ffcd4..cc4f28f 100644
}
void LoseContext() {
-@@ -1041,49 +1034,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1041,43 +1034,6 @@ class LayerTreeHostContextTestDontUseLostResources
layer_with_mask->SetMaskLayer(mask.get());
root->AddChild(layer_with_mask);
@@ -815,24 +815,18 @@ index 24ffcd4..cc4f28f 100644
-
- color_video_frame_ = VideoFrame::CreateColorFrame(
- gfx::Size(4, 4), 0x80, 0x80, 0x80, base::TimeDelta());
-- hw_video_frame_ =
-- VideoFrame::WrapNativeTexture(make_scoped_ptr(new gpu::MailboxHolder(
-- mailbox, GL_TEXTURE_2D, sync_point)),
-- media::VideoFrame::ReleaseMailboxCB(),
-- gfx::Size(4, 4),
-- gfx::Rect(0, 0, 4, 4),
-- gfx::Size(4, 4),
-- base::TimeDelta(),
-- VideoFrame::ReadPixelsCB());
-- scaled_hw_video_frame_ =
-- VideoFrame::WrapNativeTexture(make_scoped_ptr(new gpu::MailboxHolder(
-- mailbox, GL_TEXTURE_2D, sync_point)),
-- media::VideoFrame::ReleaseMailboxCB(),
-- gfx::Size(4, 4),
-- gfx::Rect(0, 0, 3, 2),
-- gfx::Size(4, 4),
-- base::TimeDelta(),
-- VideoFrame::ReadPixelsCB());
+- hw_video_frame_ = VideoFrame::WrapNativeTexture(
+- make_scoped_ptr(
+- new gpu::MailboxHolder(mailbox, GL_TEXTURE_2D, sync_point)),
+- media::VideoFrame::ReleaseMailboxCB(), gfx::Size(4, 4),
+- gfx::Rect(0, 0, 4, 4), gfx::Size(4, 4), base::TimeDelta(),
+- VideoFrame::ReadPixelsCB(), false);
+- scaled_hw_video_frame_ = VideoFrame::WrapNativeTexture(
+- make_scoped_ptr(
+- new gpu::MailboxHolder(mailbox, GL_TEXTURE_2D, sync_point)),
+- media::VideoFrame::ReleaseMailboxCB(), gfx::Size(4, 4),
+- gfx::Rect(0, 0, 3, 2), gfx::Size(4, 4), base::TimeDelta(),
+- VideoFrame::ReadPixelsCB(), false);
-
- color_frame_provider_.set_frame(color_video_frame_);
- hw_frame_provider_.set_frame(hw_video_frame_);
@@ -841,7 +835,7 @@ index 24ffcd4..cc4f28f 100644
if (!delegating_renderer()) {
// TODO(danakj): IOSurface layer can not be transported. crbug.com/239335
scoped_refptr<IOSurfaceLayer> io_surface = IOSurfaceLayer::Create();
-@@ -1113,14 +1063,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1107,14 +1063,6 @@ class LayerTreeHostContextTestDontUseLostResources
void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
LayerTreeHostContextTest::CommitCompleteOnThread(host_impl);
@@ -856,7 +850,7 @@ index 24ffcd4..cc4f28f 100644
}
DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
-@@ -1169,14 +1111,6 @@ class LayerTreeHostContextTestDontUseLostResources
+@@ -1163,14 +1111,6 @@ class LayerTreeHostContextTestDontUseLostResources
scoped_refptr<DelegatedFrameResourceCollection>
delegated_resource_collection_;
scoped_refptr<DelegatedFrameProvider> delegated_frame_provider_;
« no previous file with comments | « mojo/services/network/web_socket_impl.h ('k') | mojo/tools/roll/mojo_services_network.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698