Update from https://crrev.com/306655
Includes updates to ui/ and mojo/services for cc and gpu changes and
a minor update to a unit test in sky/ for skia interface changes.
Review URL: https://codereview.chromium.org/761903003
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 6d5fec4..7e66bd9 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -323,10 +323,24 @@
"resources/bitmap_raster_worker_pool.h",
"resources/bitmap_skpicture_content_layer_updater.cc",
"resources/bitmap_skpicture_content_layer_updater.h",
+ "resources/clip_display_item.cc",
+ "resources/clip_display_item.h",
"resources/content_layer_updater.cc",
"resources/content_layer_updater.h",
+ "resources/display_item.cc",
+ "resources/display_item.h",
+ "resources/display_item_list.cc",
+ "resources/display_item_list.h",
+ "resources/display_list_raster_source.cc",
+ "resources/display_list_raster_source.h",
+ "resources/display_list_recording_source.cc",
+ "resources/display_list_recording_source.h",
+ "resources/drawing_display_item.cc",
+ "resources/drawing_display_item.h",
"resources/eviction_tile_priority_queue.cc",
"resources/eviction_tile_priority_queue.h",
+ "resources/filter_display_item.cc",
+ "resources/filter_display_item.h",
"resources/gpu_raster_worker_pool.cc",
"resources/gpu_raster_worker_pool.h",
"resources/image_layer_updater.cc",
@@ -366,6 +380,8 @@
"resources/raster_buffer.cc",
"resources/raster_buffer.h",
"resources/raster_source.h",
+ "resources/raster_source_helper.cc",
+ "resources/raster_source_helper.h",
"resources/raster_tile_priority_queue.cc",
"resources/raster_tile_priority_queue.h",
"resources/raster_worker_pool.cc",
@@ -417,8 +433,14 @@
"resources/tile_manager.h",
"resources/tile_priority.cc",
"resources/tile_priority.h",
+ "resources/tiling_set_eviction_queue.cc",
+ "resources/tiling_set_eviction_queue.h",
"resources/transferable_resource.cc",
"resources/transferable_resource.h",
+ "resources/transform_display_item.cc",
+ "resources/transform_display_item.h",
+ "resources/transparency_display_item.cc",
+ "resources/transparency_display_item.h",
"resources/ui_resource_bitmap.cc",
"resources/ui_resource_bitmap.h",
"resources/ui_resource_client.h",
@@ -482,6 +504,7 @@
deps = [
"//base",
"//base/third_party/dynamic_annotations",
+ "//cc/surfaces:surface_id",
"//gpu",
"//gpu/command_buffer/client:gles2_interface",
"//gpu/command_buffer/client:gpu_memory_buffer_manager",
@@ -635,6 +658,7 @@
]
deps = [
"//base",
+ "//base/test:test_support",
"//base/third_party/dynamic_annotations",
"//gpu/command_buffer/client:gles2_c_lib",
"//gpu/command_buffer/client:gles2_implementation",
@@ -720,6 +744,7 @@
"quads/draw_quad_unittest.cc",
"quads/list_container_unittest.cc",
"quads/render_pass_unittest.cc",
+ "resources/display_item_list_unittest.cc",
"resources/layer_quad_unittest.cc",
"resources/picture_layer_tiling_set_unittest.cc",
"resources/picture_layer_tiling_unittest.cc",
@@ -786,6 +811,7 @@
":test_support",
"//base/test:test_support",
"//cc/surfaces",
+ "//cc/surfaces:surface_id",
"//gpu",
"//gpu:test_support",
"//gpu/command_buffer/client:gles2_interface",
@@ -795,6 +821,8 @@
"//ui/events:events_base",
"//ui/gfx",
"//ui/gfx/geometry",
+ "//ui/gfx:test_support",
+ "//ui/gl",
]
}
@@ -818,6 +846,7 @@
":cc",
":test_support",
"//base",
+ "//base/test:test_support",
"//gpu",
"//gpu:test_support",
"//gpu/command_buffer/common:gles2_utils",
@@ -827,5 +856,6 @@
"//testing/perf",
"//ui/gfx",
"//ui/gfx/geometry",
+ "//ui/gl",
]
}
