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

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

Issue 706203003: Update from https://crrev.com/303153 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/gles2/command_buffer_type_conversions.cc ('k') | mojo/tools/roll/skia_build.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 2bd6fb88204c1ae589df39cd38a0ceffcb4c4d99..07c6fae51eb1bf0185d638a14db898389e2acbf4 100644
--- a/mojo/tools/roll/cc_strip_video.patch
+++ b/mojo/tools/roll/cc_strip_video.patch
@@ -1,5 +1,5 @@
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
-index 24c5833..8cb8e8a 100644
+index 9b417f0..f753895 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -208,13 +208,6 @@ component("cc") {
@@ -16,7 +16,7 @@ index 24c5833..8cb8e8a 100644
"output/begin_frame_args.cc",
"output/begin_frame_args.h",
"output/bsp_tree.cc",
-@@ -426,8 +419,6 @@ component("cc") {
+@@ -427,8 +420,6 @@ component("cc") {
"resources/ui_resource_client.h",
"resources/ui_resource_request.cc",
"resources/ui_resource_request.h",
@@ -25,7 +25,7 @@ index 24c5833..8cb8e8a 100644
"resources/zero_copy_raster_worker_pool.cc",
"resources/zero_copy_raster_worker_pool.h",
"scheduler/begin_frame_source.cc",
-@@ -489,7 +480,6 @@ component("cc") {
+@@ -490,7 +481,6 @@ component("cc") {
"//gpu",
"//gpu/command_buffer/client:gles2_interface",
"//gpu/command_buffer/client:gpu_memory_buffer_manager",
@@ -33,7 +33,7 @@ index 24c5833..8cb8e8a 100644
"//ui/events:events_base",
"//ui/gfx",
"//ui/gfx/geometry",
-@@ -558,8 +548,6 @@ source_set("test_support") {
+@@ -559,8 +549,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",
@@ -42,7 +42,7 @@ index 24c5833..8cb8e8a 100644
"test/geometry_test_utils.cc",
"test/geometry_test_utils.h",
"test/test_in_process_context_provider.cc",
-@@ -707,7 +695,6 @@ test("cc_unittests") {
+@@ -713,7 +701,6 @@ test("cc_unittests") {
"layers/tiled_layer_unittest.cc",
"layers/ui_resource_layer_impl_unittest.cc",
"layers/ui_resource_layer_unittest.cc",
@@ -50,7 +50,7 @@ index 24c5833..8cb8e8a 100644
"output/begin_frame_args_unittest.cc",
"output/delegating_renderer_unittest.cc",
"output/filter_operations_unittest.cc",
-@@ -737,7 +724,6 @@ test("cc_unittests") {
+@@ -743,7 +730,6 @@ test("cc_unittests") {
"resources/texture_uploader_unittest.cc",
"resources/tile_manager_unittest.cc",
"resources/tile_priority_unittest.cc",
@@ -58,7 +58,7 @@ index 24c5833..8cb8e8a 100644
"scheduler/begin_frame_source_unittest.cc",
"scheduler/delay_based_time_source_unittest.cc",
"scheduler/scheduler_state_machine_unittest.cc",
-@@ -765,7 +751,6 @@ test("cc_unittests") {
+@@ -772,7 +758,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",
@@ -66,7 +66,7 @@ index 24c5833..8cb8e8a 100644
"trees/layer_tree_impl_unittest.cc",
"trees/occlusion_tracker_unittest.cc",
"trees/occlusion_unittest.cc",
-@@ -792,7 +777,6 @@ test("cc_unittests") {
+@@ -799,7 +784,6 @@ test("cc_unittests") {
"//gpu:test_support",
"//gpu/command_buffer/client:gles2_interface",
"//gpu/command_buffer/common:gles2_utils",
@@ -74,7 +74,7 @@ index 24c5833..8cb8e8a 100644
"//testing/gmock",
"//testing/gtest",
"//ui/events:events_base",
-@@ -824,7 +808,6 @@ test("cc_perftests") {
+@@ -831,7 +815,6 @@ test("cc_perftests") {
"//gpu",
"//gpu:test_support",
"//gpu/command_buffer/common:gles2_utils",
@@ -253,7 +253,7 @@ index 50333c1..0000000
-
-} // namespace cc
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
-index a302f7e..b93ddcf 100644
+index a472475..4eb1324 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -13,7 +13,6 @@
@@ -636,7 +636,7 @@ index e1c5410..edda34a 100644
namespace cc {
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
-index fb23ba6..8e7fa0f 100644
+index 9395639..5d2d939 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -27,7 +27,6 @@
@@ -647,15 +647,15 @@ index fb23ba6..8e7fa0f 100644
#include "cc/output/begin_frame_args.h"
#include "cc/output/compositor_frame_ack.h"
#include "cc/output/compositor_frame_metadata.h"
-@@ -48,7 +47,6 @@
+@@ -47,7 +46,6 @@
+ #include "cc/test/fake_picture_layer_impl.h"
#include "cc/test/fake_picture_pile_impl.h"
#include "cc/test/fake_proxy.h"
- #include "cc/test/fake_rendering_stats_instrumentation.h"
-#include "cc/test/fake_video_frame_provider.h"
#include "cc/test/geometry_test_utils.h"
#include "cc/test/layer_test_common.h"
#include "cc/test/render_pass_test_common.h"
-@@ -57,7 +55,6 @@
+@@ -56,7 +54,6 @@
#include "cc/test/test_web_graphics_context_3d.h"
#include "cc/trees/layer_tree_impl.h"
#include "cc/trees/single_thread_proxy.h"
@@ -663,7 +663,7 @@ index fb23ba6..8e7fa0f 100644
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkMallocPixelRef.h"
-@@ -71,7 +68,6 @@ using ::testing::Return;
+@@ -70,7 +67,6 @@ using ::testing::Return;
using ::testing::AnyNumber;
using ::testing::AtLeast;
using ::testing::_;
@@ -671,7 +671,7 @@ index fb23ba6..8e7fa0f 100644
namespace cc {
namespace {
-@@ -96,7 +92,6 @@ class LayerTreeHostImplTest : public testing::Test,
+@@ -95,7 +91,6 @@ class LayerTreeHostImplTest : public testing::Test,
reduce_memory_result_(true),
current_limit_bytes_(0),
current_priority_cutoff_value_(0) {
@@ -679,7 +679,7 @@ index fb23ba6..8e7fa0f 100644
}
LayerTreeSettings DefaultSettings() {
-@@ -5090,18 +5085,6 @@ TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
+@@ -5066,18 +5061,6 @@ TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
LayerImpl::Create(host_impl_->active_tree(), 1);
root_layer->SetBounds(gfx::Size(10, 10));
@@ -698,7 +698,7 @@ index fb23ba6..8e7fa0f 100644
scoped_ptr<IOSurfaceLayerImpl> io_surface_layer =
IOSurfaceLayerImpl::Create(host_impl_->active_tree(), 5);
io_surface_layer->SetBounds(gfx::Size(10, 10));
-@@ -6165,16 +6148,6 @@ TEST_F(LayerTreeHostImplTest,
+@@ -6139,16 +6122,6 @@ TEST_F(LayerTreeHostImplTest,
scoped_ptr<SolidColorLayerImpl> root_layer =
SolidColorLayerImpl::Create(host_impl_->active_tree(), 1);
@@ -716,7 +716,7 @@ index fb23ba6..8e7fa0f 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 8d554dc..d15c6a3 100644
+index aedd0d9..0859d86 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -18,7 +18,6 @@
« no previous file with comments | « mojo/services/gles2/command_buffer_type_conversions.cc ('k') | mojo/tools/roll/skia_build.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698