Move LayerTreeResourceProvider to viz/client/ as ClientResourceProvider
As the LayerTreeResourceProvider now has no cc-specific things to it,
we can move it to viz/client/ where it is clear to be used by any and
all viz clients. It's renamed to not refer to LayerTree anymore also.
R=kylechar@chromium.org, pdr@chromium.org
TBR=thakis
Bug: 722935
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I07546622ad5482bf050403f8d6fe30769a05f4f4
Reviewed-on: https://chromium-review.googlesource.com/1073611
Reviewed-by: danakj <danakj@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: kylechar <kylechar@chromium.org>
Reviewed-by: Philip Rogers <pdr@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562445}
diff --git a/cc/raster/gpu_raster_buffer_provider.cc b/cc/raster/gpu_raster_buffer_provider.cc
index f4490955..e42d065 100644
--- a/cc/raster/gpu_raster_buffer_provider.cc
+++ b/cc/raster/gpu_raster_buffer_provider.cc
@@ -17,7 +17,7 @@
#include "cc/paint/paint_recorder.h"
#include "cc/raster/raster_source.h"
#include "cc/raster/scoped_gpu_raster.h"
-#include "cc/resources/layer_tree_resource_provider.h"
+#include "components/viz/client/client_resource_provider.h"
#include "components/viz/common/gpu/context_provider.h"
#include "components/viz/common/gpu/raster_context_provider.h"
#include "components/viz/common/gpu/texture_allocation.h"
@@ -71,7 +71,7 @@
SkImageInfo n32Info = SkImageInfo::MakeN32Premul(
intermediate_size.width(), intermediate_size.height());
SkSurfaceProps surface_props =
- LayerTreeResourceProvider::ScopedSkSurface::ComputeSurfaceProps(
+ viz::ClientResourceProvider::ScopedSkSurface::ComputeSurfaceProps(
can_use_lcd_text);
surface_ = SkSurface::MakeRenderTarget(
context_provider->GrContext(), SkBudgeted::kNo, n32Info,
@@ -212,7 +212,7 @@
{
ScopedGrContextAccess gr_context_access(context_provider);
- base::Optional<LayerTreeResourceProvider::ScopedSkSurface> scoped_surface;
+ base::Optional<viz::ClientResourceProvider::ScopedSkSurface> scoped_surface;
base::Optional<ScopedSkSurfaceForUnpremultiplyAndDither>
scoped_dither_surface;
SkSurface* surface;
@@ -385,7 +385,7 @@
// Save a sync token in the backing so that we always wait on it even if
// this task is cancelled between being scheduled and running.
backing->returned_sync_token =
- LayerTreeResourceProvider::GenerateSyncTokenHelper(gl);
+ viz::ClientResourceProvider::GenerateSyncTokenHelper(gl);
resource.set_gpu_backing(std::move(backing));
}
@@ -528,7 +528,7 @@
}
// Generate sync token for cross context synchronization.
- return LayerTreeResourceProvider::GenerateSyncTokenHelper(ri);
+ return viz::ClientResourceProvider::GenerateSyncTokenHelper(ri);
}
bool GpuRasterBufferProvider::ShouldUnpremultiplyAndDitherResource(