viz: Move cc::ResourceSettings to components/viz/common/resources
This CL:
1. Moves ResourceSettings to components/viz/common/resources.
2. Moves BufferToTextureTargetMap to components/viz/common/resources.
The rest of the changes are mechanical updates to includes, namespaces, and
deps.
TBR=sadrul@chromium.org
Bug: 722935
Change-Id: I323c3e2a75b7a7048aa6a5a8c091ac51e359ef2d
Reviewed-on: https://chromium-review.googlesource.com/565638
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Commit-Queue: Fady Samuel <fsamuel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485397}diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 2fe2405..76fd6498 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -140,8 +140,6 @@
"output/bsp_tree.h",
"output/bsp_walk_action.cc",
"output/bsp_walk_action.h",
- "output/buffer_to_texture_target_map.cc",
- "output/buffer_to_texture_target_map.h",
"output/ca_layer_overlay.cc",
"output/ca_layer_overlay.h",
"output/color_lut_cache.cc",
@@ -295,8 +293,6 @@
"resources/resource_pool.h",
"resources/resource_provider.cc",
"resources/resource_provider.h",
- "resources/resource_settings.cc",
- "resources/resource_settings.h",
"resources/resource_util.h",
"resources/returned_resource.h",
"resources/scoped_resource.cc",
@@ -682,6 +678,7 @@
"//cc/paint",
"//cc/surfaces",
"//cc/surfaces:surface_id",
+ "//components/viz/common",
"//gpu/command_buffer/client:gles2_c_lib",
"//gpu/command_buffer/client:gles2_implementation",
"//gpu/command_buffer/common:gles2_utils",
@@ -762,7 +759,6 @@
"layers/viewport_unittest.cc",
"output/begin_frame_args_unittest.cc",
"output/bsp_tree_unittest.cc",
- "output/buffer_to_texture_target_map_unittest.cc",
"output/context_cache_controller_unittest.cc",
"output/gl_renderer_unittest.cc",
"output/layer_quad_unittest.cc",
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 4c25f7ee..dfa2f2b 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -18,7 +18,6 @@
#include "cc/base/math_util.h"
#include "cc/layers/append_quads_data.h"
#include "cc/layers/picture_layer.h"
-#include "cc/output/buffer_to_texture_target_map.h"
#include "cc/quads/draw_quad.h"
#include "cc/quads/tile_draw_quad.h"
#include "cc/test/begin_frame_args_test.h"
@@ -39,6 +38,7 @@
#include "cc/tiles/tiling_set_raster_queue_all.h"
#include "cc/tiles/tiling_set_raster_queue_required.h"
#include "cc/trees/layer_tree_impl.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/geometry/rect_conversions.h"
#include "ui/gfx/geometry/size_conversions.h"
@@ -82,7 +82,7 @@
settings.layer_transforms_should_scale_layer_contents = true;
settings.create_low_res_tiling = true;
settings.resource_settings.buffer_to_texture_target_map =
- DefaultBufferToTextureTargetMapForTesting();
+ viz::DefaultBufferToTextureTargetMapForTesting();
return settings;
}
diff --git a/cc/output/renderer_settings.h b/cc/output/renderer_settings.h
index 47c0fc7..e102cbfc 100644
--- a/cc/output/renderer_settings.h
+++ b/cc/output/renderer_settings.h
@@ -8,7 +8,7 @@
#include <stddef.h>
#include "cc/cc_export.h"
-#include "cc/resources/resource_settings.h"
+#include "components/viz/common/resources/resource_settings.h"
namespace cc {
@@ -18,7 +18,7 @@
RendererSettings(const RendererSettings& other);
~RendererSettings();
- ResourceSettings resource_settings;
+ viz::ResourceSettings resource_settings;
bool allow_antialiasing = true;
bool force_antialiasing = false;
bool force_blending_with_shaders = false;
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index d4feafe..3d022fa 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -369,7 +369,7 @@
ContextProvider* compositor_context_provider,
bool delegated_sync_points_required,
bool enable_color_correct_rasterization,
- const ResourceSettings& resource_settings)
+ const viz::ResourceSettings& resource_settings)
: default_resource_type(resource_settings.use_gpu_memory_buffer_resources
? RESOURCE_TYPE_GPU_MEMORY_BUFFER
: RESOURCE_TYPE_GL_TEXTURE),
@@ -416,7 +416,7 @@
BlockingTaskRunner* blocking_main_thread_task_runner,
bool delegated_sync_points_required,
bool enable_color_correct_rasterization,
- const ResourceSettings& resource_settings)
+ const viz::ResourceSettings& resource_settings)
: settings_(compositor_context_provider,
delegated_sync_points_required,
enable_color_correct_rasterization,
@@ -2039,7 +2039,7 @@
viz::ResourceFormat format) {
gfx::BufferFormat buffer_format = BufferFormat(format);
auto found = buffer_to_texture_target_map_.find(
- BufferToTextureTargetKey(usage, buffer_format));
+ viz::BufferToTextureTargetKey(usage, buffer_format));
DCHECK(found != buffer_to_texture_target_map_.end());
return found->second;
}
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
index 49b27250..a53db3d7 100644
--- a/cc/resources/resource_provider.h
+++ b/cc/resources/resource_provider.h
@@ -30,13 +30,13 @@
#include "cc/output/output_surface.h"
#include "cc/output/renderer_settings.h"
#include "cc/resources/release_callback_impl.h"
-#include "cc/resources/resource_settings.h"
#include "cc/resources/return_callback.h"
#include "cc/resources/shared_bitmap.h"
#include "cc/resources/single_release_callback_impl.h"
#include "cc/resources/texture_mailbox.h"
#include "cc/resources/transferable_resource.h"
#include "components/viz/common/quads/resource_format.h"
+#include "components/viz/common/resources/resource_settings.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/khronos/GLES2/gl2ext.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -87,7 +87,7 @@
BlockingTaskRunner* blocking_main_thread_task_runner,
bool delegated_sync_points_required,
bool enable_color_correct_rasterization,
- const ResourceSettings& resource_settings);
+ const viz::ResourceSettings& resource_settings);
~ResourceProvider() override;
void Initialize();
@@ -766,7 +766,7 @@
Settings(ContextProvider* compositor_context_provider,
bool delegated_sync_points_needed,
bool enable_color_correct_rasterization,
- const ResourceSettings& resource_settings);
+ const viz::ResourceSettings& resource_settings);
int max_texture_size = 0;
bool use_texture_storage_ext = false;
@@ -793,7 +793,7 @@
ChildMap children_;
scoped_refptr<Fence> current_read_lock_fence_;
std::unique_ptr<TextureIdAllocator> texture_id_allocator_;
- BufferToTextureTargetMap buffer_to_texture_target_map_;
+ viz::BufferToTextureTargetMap buffer_to_texture_target_map_;
// Keep track of whether deleted resources should be batched up or returned
// immediately.
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index b8b9df6..b9cf56c 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -18,7 +18,6 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
-#include "cc/output/buffer_to_texture_target_map.h"
#include "cc/resources/returned_resource.h"
#include "cc/resources/shared_bitmap_manager.h"
#include "cc/resources/single_release_callback.h"
@@ -28,6 +27,7 @@
#include "cc/test/test_texture.h"
#include "cc/test/test_web_graphics_context_3d.h"
#include "cc/trees/blocking_task_runner.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
#include "components/viz/common/resources/resource_format_utils.h"
#include "gpu/GLES2/gl2extchromium.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -104,15 +104,15 @@
return shared_bitmap;
}
-static ResourceSettings CreateResourceSettings(
+static viz::ResourceSettings CreateResourceSettings(
size_t texture_id_allocation_chunk_size = 1) {
- ResourceSettings resource_settings;
+ viz::ResourceSettings resource_settings;
resource_settings.texture_id_allocation_chunk_size =
texture_id_allocation_chunk_size;
resource_settings.use_gpu_memory_buffer_resources =
kUseGpuMemoryBufferResources;
resource_settings.buffer_to_texture_target_map =
- DefaultBufferToTextureTargetMapForTesting();
+ viz::DefaultBufferToTextureTargetMapForTesting();
return resource_settings;
}
@@ -462,7 +462,7 @@
child_gpu_memory_buffer_manager_ =
gpu_memory_buffer_manager_->CreateClientGpuMemoryBufferManager();
- ResourceSettings resource_settings = CreateResourceSettings();
+ viz::ResourceSettings resource_settings = CreateResourceSettings();
resource_provider_ = base::MakeUnique<ResourceProvider>(
context_provider_.get(), shared_bitmap_manager_.get(),
gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(),
@@ -2105,7 +2105,7 @@
child_context_provider->BindToCurrentThread();
auto shared_bitmap_manager = base::MakeUnique<TestSharedBitmapManager>();
- ResourceSettings resource_settings = CreateResourceSettings();
+ viz::ResourceSettings resource_settings = CreateResourceSettings();
std::unique_ptr<ResourceProvider> child_resource_provider(
base::MakeUnique<ResourceProvider>(
child_context_provider.get(), shared_bitmap_manager.get(), nullptr,
diff --git a/cc/test/fake_resource_provider.h b/cc/test/fake_resource_provider.h
index fb46f1f..8123cd0b 100644
--- a/cc/test/fake_resource_provider.h
+++ b/cc/test/fake_resource_provider.h
@@ -8,8 +8,8 @@
#include <stddef.h>
#include "base/memory/ptr_util.h"
-#include "cc/output/buffer_to_texture_target_map.h"
#include "cc/resources/resource_provider.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
#include "ui/gfx/buffer_types.h"
namespace cc {
@@ -19,10 +19,10 @@
static std::unique_ptr<FakeResourceProvider> Create(
ContextProvider* context_provider,
SharedBitmapManager* shared_bitmap_manager) {
- ResourceSettings resource_settings;
+ viz::ResourceSettings resource_settings;
resource_settings.texture_id_allocation_chunk_size = 1;
resource_settings.buffer_to_texture_target_map =
- DefaultBufferToTextureTargetMapForTesting();
+ viz::DefaultBufferToTextureTargetMapForTesting();
return base::WrapUnique(new FakeResourceProvider(
context_provider, shared_bitmap_manager, nullptr, nullptr, true, false,
resource_settings));
@@ -32,10 +32,10 @@
ContextProvider* context_provider,
SharedBitmapManager* shared_bitmap_manager,
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
- ResourceSettings resource_settings;
+ viz::ResourceSettings resource_settings;
resource_settings.texture_id_allocation_chunk_size = 1;
resource_settings.buffer_to_texture_target_map =
- DefaultBufferToTextureTargetMapForTesting();
+ viz::DefaultBufferToTextureTargetMapForTesting();
return base::WrapUnique(new FakeResourceProvider(
context_provider, shared_bitmap_manager, gpu_memory_buffer_manager,
nullptr, true, false, resource_settings));
@@ -48,7 +48,7 @@
BlockingTaskRunner* blocking_main_thread_task_runner,
bool delegated_sync_points_required,
bool enable_color_corect_rasterization,
- const ResourceSettings resource_settings)
+ const viz::ResourceSettings resource_settings)
: ResourceProvider(context_provider,
shared_bitmap_manager,
gpu_memory_buffer_manager,
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index c3b179f..af95a2e 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -19,7 +19,6 @@
#include "cc/input/input_handler.h"
#include "cc/layers/layer.h"
#include "cc/layers/layer_impl.h"
-#include "cc/output/buffer_to_texture_target_map.h"
#include "cc/test/animation_test_common.h"
#include "cc/test/begin_frame_args_test.h"
#include "cc/test/fake_layer_tree_host_client.h"
@@ -34,6 +33,7 @@
#include "cc/trees/proxy_impl.h"
#include "cc/trees/proxy_main.h"
#include "cc/trees/single_thread_proxy.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "ui/gfx/geometry/size_conversions.h"
@@ -834,7 +834,7 @@
// actions and less dependent on timings to make decisions.
settings_.enable_latency_recovery = false;
settings_.resource_settings.buffer_to_texture_target_map =
- DefaultBufferToTextureTargetMapForTesting();
+ viz::DefaultBufferToTextureTargetMapForTesting();
InitializeSettings(&settings_);
base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ -866,7 +866,7 @@
// mocked out.
constexpr double refresh_rate = 200.0;
renderer_settings.resource_settings.buffer_to_texture_target_map =
- DefaultBufferToTextureTargetMapForTesting();
+ viz::DefaultBufferToTextureTargetMapForTesting();
auto layer_tree_frame_sink = CreateLayerTreeFrameSink(
renderer_settings, refresh_rate, std::move(shared_context_provider),
std::move(worker_context_provider));
diff --git a/cc/tiles/tile_manager_unittest.cc b/cc/tiles/tile_manager_unittest.cc
index 6497489..c42e166 100644
--- a/cc/tiles/tile_manager_unittest.cc
+++ b/cc/tiles/tile_manager_unittest.cc
@@ -88,7 +88,7 @@
LayerTreeSettings settings;
settings.create_low_res_tiling = true;
settings.resource_settings.buffer_to_texture_target_map =
- DefaultBufferToTextureTargetMapForTesting();
+ viz::DefaultBufferToTextureTargetMapForTesting();
return settings;
}
@@ -2057,7 +2057,7 @@
LayerTreeSettings CreateSettings() override {
LayerTreeSettings settings;
settings.resource_settings.buffer_to_texture_target_map =
- DefaultBufferToTextureTargetMapForTesting();
+ viz::DefaultBufferToTextureTargetMapForTesting();
return settings;
}
@@ -2336,7 +2336,7 @@
LayerTreeSettings settings;
settings.enable_checker_imaging = true;
settings.resource_settings.buffer_to_texture_target_map =
- DefaultBufferToTextureTargetMapForTesting();
+ viz::DefaultBufferToTextureTargetMapForTesting();
return settings;
}
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 4449c64..1753e6d 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -132,7 +132,7 @@
settings.minimum_occlusion_tracking_size = gfx::Size();
settings.resource_settings.texture_id_allocation_chunk_size = 1;
settings.resource_settings.buffer_to_texture_target_map =
- DefaultBufferToTextureTargetMapForTesting();
+ viz::DefaultBufferToTextureTargetMapForTesting();
return settings;
}
diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
index a154d9b..56743c60 100644
--- a/cc/trees/layer_tree_settings.h
+++ b/cc/trees/layer_tree_settings.h
@@ -14,10 +14,10 @@
#include "cc/debug/layer_tree_debug_state.h"
#include "cc/output/managed_memory_policy.h"
#include "cc/output/renderer_settings.h"
-#include "cc/resources/resource_settings.h"
#include "cc/scheduler/scheduler_settings.h"
#include "cc/tiles/tile_manager_settings.h"
#include "components/viz/common/quads/resource_format.h"
+#include "components/viz/common/resources/resource_settings.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/geometry/size.h"
@@ -32,7 +32,7 @@
SchedulerSettings ToSchedulerSettings() const;
TileManagerSettings ToTileManagerSettings() const;
- ResourceSettings resource_settings;
+ viz::ResourceSettings resource_settings;
bool single_thread_proxy_scheduler = true;
bool main_frame_before_activation_enabled = false;
bool using_synchronous_renderer_compositor = false;
diff --git a/components/viz/common/BUILD.gn b/components/viz/common/BUILD.gn
index a72063a..802694b 100644
--- a/components/viz/common/BUILD.gn
+++ b/components/viz/common/BUILD.gn
@@ -13,9 +13,13 @@
"gl_helper_scaling.cc",
"gl_helper_scaling.h",
"quads/resource_format.h",
+ "resources/buffer_to_texture_target_map.cc",
+ "resources/buffer_to_texture_target_map.h",
"resources/platform_color.h",
"resources/resource_format_utils.cc",
"resources/resource_format_utils.h",
+ "resources/resource_settings.cc",
+ "resources/resource_settings.h",
]
deps = [
@@ -37,6 +41,8 @@
testonly = true
sources = [
"gl_helper_unittest.cc",
+ "resources/buffer_to_texture_target_map_unittest.cc",
+ "resources/platform_color_unittest.cc",
"yuv_readback_unittest.cc",
]
diff --git a/cc/output/buffer_to_texture_target_map.cc b/components/viz/common/resources/buffer_to_texture_target_map.cc
similarity index 95%
rename from cc/output/buffer_to_texture_target_map.cc
rename to components/viz/common/resources/buffer_to_texture_target_map.cc
index f2343bd..83877f4 100644
--- a/cc/output/buffer_to_texture_target_map.cc
+++ b/components/viz/common/resources/buffer_to_texture_target_map.cc
@@ -1,7 +1,7 @@
// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/output/buffer_to_texture_target_map.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
#include <vector>
@@ -9,7 +9,7 @@
#include "base/strings/string_split.h"
#include "gpu/GLES2/gl2extchromium.h"
-namespace cc {
+namespace viz {
BufferToTextureTargetMap StringToBufferToTextureTargetMap(
const std::string& str) {
@@ -69,4 +69,4 @@
return image_targets;
}
-} // namespace cc
+} // namespace viz
diff --git a/cc/output/buffer_to_texture_target_map.h b/components/viz/common/resources/buffer_to_texture_target_map.h
similarity index 67%
rename from cc/output/buffer_to_texture_target_map.h
rename to components/viz/common/resources/buffer_to_texture_target_map.h
index 95193fe7..b8b7364 100644
--- a/cc/output/buffer_to_texture_target_map.h
+++ b/components/viz/common/resources/buffer_to_texture_target_map.h
@@ -2,16 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_OUTPUT_BUFFER_TO_TEXTURE_TARGET_MAP_H_
-#define CC_OUTPUT_BUFFER_TO_TEXTURE_TARGET_MAP_H_
+#ifndef COMPONENTS_VIZ_COMMON_RESOURCES_BUFFER_TO_TEXTURE_TARGET_MAP_H_
+#define COMPONENTS_VIZ_COMMON_RESOURCES_BUFFER_TO_TEXTURE_TARGET_MAP_H_
#include <map>
#include <string>
-#include "cc/cc_export.h"
#include "ui/gfx/buffer_types.h"
-namespace cc {
+namespace viz {
// A map of GPU Memory Buffer usage/format to GL texture target.
using BufferToTextureTargetKey = std::pair<gfx::BufferUsage, gfx::BufferFormat>;
using BufferToTextureTargetMap = std::map<BufferToTextureTargetKey, uint32_t>;
@@ -19,18 +18,18 @@
// Converts a serialized ImageTextureTargetsMap back to the runtime format.
// Serialization takes the form:
// "usage,format,target;usage,format,target;...;usage,format,target"
-CC_EXPORT BufferToTextureTargetMap
-StringToBufferToTextureTargetMap(const std::string& str);
+BufferToTextureTargetMap StringToBufferToTextureTargetMap(
+ const std::string& str);
// Converts an ImageTextureTargetsMap to a string representation of the format:
// "usage,format,target;usage,format,target;...;usage,format,target"
-CC_EXPORT std::string BufferToTextureTargetMapToString(
+std::string BufferToTextureTargetMapToString(
const BufferToTextureTargetMap& map);
// Returns a default-initialized BufferToTextureTargetsMap where every entry
// maps to GL_TEXTURE_2D.
-CC_EXPORT BufferToTextureTargetMap DefaultBufferToTextureTargetMapForTesting();
+BufferToTextureTargetMap DefaultBufferToTextureTargetMapForTesting();
-} // namespace cc
+} // namespace viz
-#endif // CC_OUTPUT_BUFFER_TO_TEXTURE_TARGET_MAP_H_
+#endif // COMPONENTS_VIZ_COMMON_RESOURCES_BUFFER_TO_TEXTURE_TARGET_MAP_H_
diff --git a/cc/output/buffer_to_texture_target_map_unittest.cc b/components/viz/common/resources/buffer_to_texture_target_map_unittest.cc
similarity index 91%
rename from cc/output/buffer_to_texture_target_map_unittest.cc
rename to components/viz/common/resources/buffer_to_texture_target_map_unittest.cc
index 79e6240..f037b998 100644
--- a/cc/output/buffer_to_texture_target_map_unittest.cc
+++ b/components/viz/common/resources/buffer_to_texture_target_map_unittest.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/output/buffer_to_texture_target_map.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/buffer_types.h"
-namespace cc {
+namespace viz {
namespace {
// Ensures that a map populated with various values can be serialized to/from
@@ -34,4 +34,4 @@
}
} // namespace
-} // namespace cc
+} // namespace viz
diff --git a/cc/resources/resource_settings.cc b/components/viz/common/resources/resource_settings.cc
similarity index 81%
rename from cc/resources/resource_settings.cc
rename to components/viz/common/resources/resource_settings.cc
index 95600dc..2519c0c 100644
--- a/cc/resources/resource_settings.cc
+++ b/components/viz/common/resources/resource_settings.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/resources/resource_settings.h"
+#include "components/viz/common/resources/resource_settings.h"
-namespace cc {
+namespace viz {
ResourceSettings::ResourceSettings() = default;
@@ -15,4 +15,4 @@
ResourceSettings& ResourceSettings::operator=(const ResourceSettings& other) =
default;
-} // namespace cc
+} // namespace viz
diff --git a/cc/resources/resource_settings.h b/components/viz/common/resources/resource_settings.h
similarity index 64%
rename from cc/resources/resource_settings.h
rename to components/viz/common/resources/resource_settings.h
index d54ea29..e20fe8f 100644
--- a/cc/resources/resource_settings.h
+++ b/components/viz/common/resources/resource_settings.h
@@ -2,17 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_RESOURCES_RESOURCE_SETTINGS_H_
-#define CC_RESOURCES_RESOURCE_SETTINGS_H_
+#ifndef COMPONENTS_VIZ_COMMON_RESOURCES_RESOURCE_SETTINGS_H_
+#define COMPONENTS_VIZ_COMMON_RESOURCES_RESOURCE_SETTINGS_H_
-#include "cc/cc_export.h"
-#include "cc/output/buffer_to_texture_target_map.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
-namespace cc {
+namespace viz {
// ResourceSettings contains all the settings that are needed to create a
// ResourceProvider.
-class CC_EXPORT ResourceSettings {
+class ResourceSettings {
public:
ResourceSettings();
ResourceSettings(const ResourceSettings& other);
@@ -24,6 +23,6 @@
BufferToTextureTargetMap buffer_to_texture_target_map;
};
-} // namespace cc
+} // namespace viz
-#endif // CC_RESOURCES_RESOURCE_SETTINGS_H_
+#endif // COMPONENTS_VIZ_COMMON_RESOURCES_RESOURCE_SETTINGS_H_
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 19b47d9..a3272d542 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -812,7 +812,7 @@
data->display->SetOutputIsSecure(secure);
}
-const cc::ResourceSettings& GpuProcessTransportFactory::GetResourceSettings()
+const viz::ResourceSettings& GpuProcessTransportFactory::GetResourceSettings()
const {
return renderer_settings_.resource_settings;
}
diff --git a/content/browser/compositor/gpu_process_transport_factory.h b/content/browser/compositor/gpu_process_transport_factory.h
index 7c17eb8d..29f69eeb 100644
--- a/content/browser/compositor/gpu_process_transport_factory.h
+++ b/content/browser/compositor/gpu_process_transport_factory.h
@@ -53,7 +53,7 @@
double GetRefreshRate() const override;
gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
cc::TaskGraphRunner* GetTaskGraphRunner() override;
- const cc::ResourceSettings& GetResourceSettings() const override;
+ const viz::ResourceSettings& GetResourceSettings() const override;
void AddObserver(ui::ContextFactoryObserver* observer) override;
void RemoveObserver(ui::ContextFactoryObserver* observer) override;
diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc
index a51635a..fde31285 100644
--- a/content/browser/gpu/compositor_util.cc
+++ b/content/browser/gpu/compositor_util.cc
@@ -402,8 +402,8 @@
return GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds();
}
-cc::BufferToTextureTargetMap CreateBufferToTextureTargetMap() {
- cc::BufferToTextureTargetMap image_targets;
+viz::BufferToTextureTargetMap CreateBufferToTextureTargetMap() {
+ viz::BufferToTextureTargetMap image_targets;
for (int usage_idx = 0; usage_idx <= static_cast<int>(gfx::BufferUsage::LAST);
++usage_idx) {
gfx::BufferUsage usage = static_cast<gfx::BufferUsage>(usage_idx);
diff --git a/content/browser/gpu/compositor_util.h b/content/browser/gpu/compositor_util.h
index 123dee0..5e4808f 100644
--- a/content/browser/gpu/compositor_util.h
+++ b/content/browser/gpu/compositor_util.h
@@ -8,7 +8,7 @@
#include <memory>
#include "base/values.h"
-#include "cc/output/buffer_to_texture_target_map.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
#include "content/common/content_export.h"
namespace content {
@@ -50,7 +50,7 @@
CONTENT_EXPORT std::vector<std::string> GetDriverBugWorkarounds();
// Populate BufferToTextureTargetMap for all buffer usage/formats.
-CONTENT_EXPORT cc::BufferToTextureTargetMap CreateBufferToTextureTargetMap();
+CONTENT_EXPORT viz::BufferToTextureTargetMap CreateBufferToTextureTargetMap();
} // namespace content
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index caea5b7..54bb6e07 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -53,9 +53,9 @@
#include "base/tracked_objects.h"
#include "build/build_config.h"
#include "cc/base/switches.h"
-#include "cc/output/buffer_to_texture_target_map.h"
#include "components/metrics/single_sample_metrics.h"
#include "components/tracing/common/tracing_switches.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
#include "content/browser/appcache/appcache_dispatcher_host.h"
#include "content/browser/appcache/chrome_appcache_service.h"
#include "content/browser/background_fetch/background_fetch_service_impl.h"
@@ -2165,7 +2165,7 @@
command_line->AppendSwitchASCII(
switches::kContentImageTextureTarget,
- cc::BufferToTextureTargetMapToString(CreateBufferToTextureTargetMap()));
+ viz::BufferToTextureTargetMapToString(CreateBufferToTextureTargetMap()));
// Appending disable-gpu-feature switches due to software rendering list.
GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance();
diff --git a/content/renderer/DEPS b/content/renderer/DEPS
index 93126e8..7d13e18 100644
--- a/content/renderer/DEPS
+++ b/content/renderer/DEPS
@@ -9,6 +9,7 @@
"+components/url_formatter",
"+components/variations",
"+components/viz/client",
+ "+components/viz/common/resources",
"+cc/blink",
"+content/public/child",
diff --git a/content/renderer/gpu/compositor_dependencies.h b/content/renderer/gpu/compositor_dependencies.h
index 05e6bf5d..38503df 100644
--- a/content/renderer/gpu/compositor_dependencies.h
+++ b/content/renderer/gpu/compositor_dependencies.h
@@ -38,7 +38,8 @@
virtual bool IsPartialRasterEnabled() = 0;
virtual bool IsGpuMemoryBufferCompositorResourcesEnabled() = 0;
virtual bool IsElasticOverscrollEnabled() = 0;
- virtual const cc::BufferToTextureTargetMap& GetBufferToTextureTargetMap() = 0;
+ virtual const viz::BufferToTextureTargetMap&
+ GetBufferToTextureTargetMap() = 0;
virtual scoped_refptr<base::SingleThreadTaskRunner>
GetCompositorMainThreadTaskRunner() = 0;
// Returns null if the compositor is in single-threaded mode (ie. there is no
diff --git a/content/renderer/media/DEPS b/content/renderer/media/DEPS
index 3dfd058..0efadbcf 100644
--- a/content/renderer/media/DEPS
+++ b/content/renderer/media/DEPS
@@ -1,4 +1,5 @@
include_rules = [
+ "+components/viz/common/resources",
"+third_party/libyuv",
'+third_party/webrtc_overrides',
]
diff --git a/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc b/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc
index 4d2c678..a3c4fa0 100644
--- a/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc
+++ b/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc
@@ -12,6 +12,7 @@
#include "base/metrics/histogram_macros.h"
#include "base/unguessable_token.h"
#include "cc/output/context_provider.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
#include "content/child/child_thread_impl.h"
#include "content/renderer/render_thread_impl.h"
#include "gpu/command_buffer/client/gles2_interface.h"
@@ -51,7 +52,7 @@
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
const scoped_refptr<ui::ContextProviderCommandBuffer>& context_provider,
bool enable_gpu_memory_buffer_video_frames,
- const cc::BufferToTextureTargetMap& image_texture_targets,
+ const viz::BufferToTextureTargetMap& image_texture_targets,
bool enable_video_accelerator) {
RecordContextProviderPhaseUmaEnum(
ContextProviderPhase::CONTEXT_PROVIDER_ACQUIRED);
@@ -67,7 +68,7 @@
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
const scoped_refptr<ui::ContextProviderCommandBuffer>& context_provider,
bool enable_gpu_memory_buffer_video_frames,
- const cc::BufferToTextureTargetMap& image_texture_targets,
+ const viz::BufferToTextureTargetMap& image_texture_targets,
bool enable_video_accelerator)
: main_thread_task_runner_(main_thread_task_runner),
task_runner_(task_runner),
@@ -262,7 +263,7 @@
unsigned GpuVideoAcceleratorFactoriesImpl::ImageTextureTarget(
gfx::BufferFormat format) {
- auto found = image_texture_targets_.find(cc::BufferToTextureTargetKey(
+ auto found = image_texture_targets_.find(viz::BufferToTextureTargetKey(
gfx::BufferUsage::GPU_READ_CPU_READ_WRITE, format));
DCHECK(found != image_texture_targets_.end());
return found->second;
diff --git a/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.h b/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.h
index 969b73f..c8fad256 100644
--- a/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.h
+++ b/content/renderer/media/gpu/gpu_video_accelerator_factories_impl.h
@@ -17,7 +17,7 @@
#include "base/single_thread_task_runner.h"
#include "base/synchronization/waitable_event.h"
#include "base/unguessable_token.h"
-#include "cc/output/buffer_to_texture_target_map.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
#include "content/child/thread_safe_sender.h"
#include "content/common/content_export.h"
#include "media/renderers/gpu_video_accelerator_factories.h"
@@ -54,7 +54,7 @@
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
const scoped_refptr<ui::ContextProviderCommandBuffer>& context_provider,
bool enable_gpu_memory_buffer_video_frames,
- const cc::BufferToTextureTargetMap& image_texture_targets,
+ const viz::BufferToTextureTargetMap& image_texture_targets,
bool enable_video_accelerator);
// media::GpuVideoAcceleratorFactories implementation.
@@ -109,7 +109,7 @@
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
const scoped_refptr<ui::ContextProviderCommandBuffer>& context_provider,
bool enable_gpu_memory_buffer_video_frames,
- const cc::BufferToTextureTargetMap& image_texture_targets,
+ const viz::BufferToTextureTargetMap& image_texture_targets,
bool enable_video_accelerator);
scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
@@ -127,7 +127,7 @@
// Whether gpu memory buffers should be used to hold video frames data.
bool enable_gpu_memory_buffer_video_frames_;
- const cc::BufferToTextureTargetMap image_texture_targets_;
+ const viz::BufferToTextureTargetMap image_texture_targets_;
// Whether video acceleration encoding/decoding should be enabled.
const bool video_accelerator_enabled_;
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 97d5731..ec0cca1 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -45,7 +45,6 @@
#include "cc/base/histograms.h"
#include "cc/base/switches.h"
#include "cc/blink/web_layer_impl.h"
-#include "cc/output/buffer_to_texture_target_map.h"
#include "cc/output/copy_output_request.h"
#include "cc/output/layer_tree_frame_sink.h"
#include "cc/output/vulkan_in_process_context_provider.h"
@@ -58,6 +57,7 @@
#include "components/viz/client/client_layer_tree_frame_sink.h"
#include "components/viz/client/client_shared_bitmap_manager.h"
#include "components/viz/client/local_surface_id_provider.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
#include "content/child/appcache/appcache_dispatcher.h"
#include "content/child/appcache/appcache_frontend_impl.h"
#include "content/child/blob_storage/blob_message_filter.h"
@@ -825,7 +825,7 @@
std::string image_texture_target_string =
command_line.GetSwitchValueASCII(switches::kContentImageTextureTarget);
buffer_to_texture_target_map_ =
- cc::StringToBufferToTextureTargetMap(image_texture_target_string);
+ viz::StringToBufferToTextureTargetMap(image_texture_target_string);
if (command_line.HasSwitch(switches::kDisableLCDText)) {
is_lcd_text_enabled_ = false;
@@ -1605,7 +1605,7 @@
return is_elastic_overscroll_enabled_;
}
-const cc::BufferToTextureTargetMap&
+const viz::BufferToTextureTargetMap&
RenderThreadImpl::GetBufferToTextureTargetMap() {
return buffer_to_texture_target_map_;
}
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 032c899..db02441 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -248,7 +248,7 @@
bool IsPartialRasterEnabled() override;
bool IsGpuMemoryBufferCompositorResourcesEnabled() override;
bool IsElasticOverscrollEnabled() override;
- const cc::BufferToTextureTargetMap& GetBufferToTextureTargetMap() override;
+ const viz::BufferToTextureTargetMap& GetBufferToTextureTargetMap() override;
scoped_refptr<base::SingleThreadTaskRunner>
GetCompositorMainThreadTaskRunner() override;
scoped_refptr<base::SingleThreadTaskRunner>
@@ -750,7 +750,7 @@
bool is_gpu_memory_buffer_compositor_resources_enabled_;
bool is_partial_raster_enabled_;
bool is_elastic_overscroll_enabled_;
- cc::BufferToTextureTargetMap buffer_to_texture_target_map_;
+ viz::BufferToTextureTargetMap buffer_to_texture_target_map_;
bool is_threaded_animation_enabled_;
bool is_scroll_animator_enabled_;
diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc
index 417613b0..554ece1 100644
--- a/content/renderer/render_thread_impl_browsertest.cc
+++ b/content/renderer/render_thread_impl_browsertest.cc
@@ -20,7 +20,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/threading/thread_task_runner_handle.h"
-#include "cc/output/buffer_to_texture_target_map.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
#include "content/app/mojo/mojo_init.h"
#include "content/common/in_process_child_thread_params.h"
#include "content/common/resource_messages.h"
@@ -215,8 +215,8 @@
cmd->AppendSwitchASCII(switches::kNumRasterThreads, "1");
cmd->AppendSwitchASCII(
switches::kContentImageTextureTarget,
- cc::BufferToTextureTargetMapToString(
- cc::DefaultBufferToTextureTargetMapForTesting()));
+ viz::BufferToTextureTargetMapToString(
+ viz::DefaultBufferToTextureTargetMapForTesting()));
std::unique_ptr<blink::scheduler::RendererScheduler> renderer_scheduler =
blink::scheduler::RendererScheduler::Create();
diff --git a/content/test/DEPS b/content/test/DEPS
index 74d9797..a183ec4 100644
--- a/content/test/DEPS
+++ b/content/test/DEPS
@@ -5,6 +5,7 @@
"+components/network_session_configurator/common",
"+components/scheduler/renderer",
"+components/scheduler/test",
+ "+components/viz/common/resources",
"+cc/blink",
"+chromeos/audio", # For WebRTC tests.
diff --git a/content/test/fake_compositor_dependencies.cc b/content/test/fake_compositor_dependencies.cc
index 4b26ecc..4187c49d 100644
--- a/content/test/fake_compositor_dependencies.cc
+++ b/content/test/fake_compositor_dependencies.cc
@@ -56,7 +56,7 @@
return true;
}
-const cc::BufferToTextureTargetMap&
+const viz::BufferToTextureTargetMap&
FakeCompositorDependencies::GetBufferToTextureTargetMap() {
return buffer_to_texture_target_map_;
}
diff --git a/content/test/fake_compositor_dependencies.h b/content/test/fake_compositor_dependencies.h
index d3b5610..23483de 100644
--- a/content/test/fake_compositor_dependencies.h
+++ b/content/test/fake_compositor_dependencies.h
@@ -7,8 +7,8 @@
#include "base/macros.h"
#include "base/single_thread_task_runner.h"
-#include "cc/output/buffer_to_texture_target_map.h"
#include "cc/test/test_task_graph_runner.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
#include "content/renderer/gpu/compositor_dependencies.h"
#include "third_party/WebKit/public/platform/scheduler/test/fake_renderer_scheduler.h"
@@ -29,7 +29,7 @@
bool IsPartialRasterEnabled() override;
bool IsGpuMemoryBufferCompositorResourcesEnabled() override;
bool IsElasticOverscrollEnabled() override;
- const cc::BufferToTextureTargetMap& GetBufferToTextureTargetMap() override;
+ const viz::BufferToTextureTargetMap& GetBufferToTextureTargetMap() override;
scoped_refptr<base::SingleThreadTaskRunner>
GetCompositorMainThreadTaskRunner() override;
scoped_refptr<base::SingleThreadTaskRunner>
@@ -42,7 +42,7 @@
private:
cc::TestTaskGraphRunner task_graph_runner_;
blink::scheduler::FakeRendererScheduler renderer_scheduler_;
- cc::BufferToTextureTargetMap buffer_to_texture_target_map_;
+ viz::BufferToTextureTargetMap buffer_to_texture_target_map_;
DISALLOW_COPY_AND_ASSIGN(FakeCompositorDependencies);
};
diff --git a/ui/aura/mus/mus_context_factory.cc b/ui/aura/mus/mus_context_factory.cc
index 539350d9..bfe06f3 100644
--- a/ui/aura/mus/mus_context_factory.cc
+++ b/ui/aura/mus/mus_context_factory.cc
@@ -19,8 +19,8 @@
namespace aura {
namespace {
-cc::BufferToTextureTargetMap CreateBufferToTextureTargetMap() {
- cc::BufferToTextureTargetMap image_targets;
+viz::BufferToTextureTargetMap CreateBufferToTextureTargetMap() {
+ viz::BufferToTextureTargetMap image_targets;
for (int usage_idx = 0; usage_idx <= static_cast<int>(gfx::BufferUsage::LAST);
++usage_idx) {
gfx::BufferUsage usage = static_cast<gfx::BufferUsage>(usage_idx);
@@ -96,7 +96,7 @@
return raster_thread_helper_.task_graph_runner();
}
-const cc::ResourceSettings& MusContextFactory::GetResourceSettings() const {
+const viz::ResourceSettings& MusContextFactory::GetResourceSettings() const {
return renderer_settings_.resource_settings;
}
diff --git a/ui/aura/mus/mus_context_factory.h b/ui/aura/mus/mus_context_factory.h
index ea0c5d74..4c84377b 100644
--- a/ui/aura/mus/mus_context_factory.h
+++ b/ui/aura/mus/mus_context_factory.h
@@ -51,7 +51,7 @@
double GetRefreshRate() const override;
gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
cc::TaskGraphRunner* GetTaskGraphRunner() override;
- const cc::ResourceSettings& GetResourceSettings() const override;
+ const viz::ResourceSettings& GetResourceSettings() const override;
void AddObserver(ui::ContextFactoryObserver* observer) override {}
void RemoveObserver(ui::ContextFactoryObserver* observer) override {}
diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn
index 1d2ca0fd..1da128f8 100644
--- a/ui/compositor/BUILD.gn
+++ b/ui/compositor/BUILD.gn
@@ -89,6 +89,7 @@
"//cc/surfaces",
"//cc/surfaces:surface_id",
"//cc/surfaces:surfaces",
+ "//components/viz/common",
"//components/viz/host",
"//gpu/command_buffer/common",
"//skia",
diff --git a/ui/compositor/DEPS b/ui/compositor/DEPS
index 1db43fd..7941025 100644
--- a/ui/compositor/DEPS
+++ b/ui/compositor/DEPS
@@ -2,6 +2,7 @@
"+cc",
"-cc/blink",
"+components/viz/common/quads",
+ "+components/viz/common/resources",
"+components/viz/host",
"+gpu/command_buffer/client/gles2_interface.h",
"+services/ui/public/cpp",
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 513fba2..353b9f9 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -36,6 +36,7 @@
#include "cc/trees/layer_tree_host.h"
#include "cc/trees/layer_tree_settings.h"
#include "components/viz/common/quads/resource_format.h"
+#include "components/viz/common/resources/resource_settings.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/compositor/compositor_observer.h"
#include "ui/compositor/compositor_switches.h"
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index 7a1b0a9..ada9570 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -47,7 +47,6 @@
class LayerTreeFrameSink;
class LayerTreeHost;
class LocalSurfaceId;
-class ResourceSettings;
class TaskGraphRunner;
}
@@ -63,6 +62,7 @@
namespace viz {
class HostFrameSinkManager;
+class ResourceSettings;
}
namespace ui {
@@ -169,7 +169,7 @@
virtual cc::TaskGraphRunner* GetTaskGraphRunner() = 0;
// Gets the renderer settings.
- virtual const cc::ResourceSettings& GetResourceSettings() const = 0;
+ virtual const viz::ResourceSettings& GetResourceSettings() const = 0;
virtual void AddObserver(ContextFactoryObserver* observer) = 0;
diff --git a/ui/compositor/compositor_util.cc b/ui/compositor/compositor_util.cc
index e8464b8..04158b47 100644
--- a/ui/compositor/compositor_util.cc
+++ b/ui/compositor/compositor_util.cc
@@ -14,7 +14,7 @@
namespace ui {
cc::RendererSettings CreateRendererSettings(
- const cc::BufferToTextureTargetMap& image_targets) {
+ const viz::BufferToTextureTargetMap& image_targets) {
cc::RendererSettings renderer_settings;
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
renderer_settings.partial_swap_enabled =
diff --git a/ui/compositor/compositor_util.h b/ui/compositor/compositor_util.h
index 4ff21fd..85d9971 100644
--- a/ui/compositor/compositor_util.h
+++ b/ui/compositor/compositor_util.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "cc/output/buffer_to_texture_target_map.h"
+#include "components/viz/common/resources/buffer_to_texture_target_map.h"
#include "ui/compositor/compositor_export.h"
namespace cc {
@@ -17,7 +17,7 @@
namespace ui {
COMPOSITOR_EXPORT cc::RendererSettings CreateRendererSettings(
- const cc::BufferToTextureTargetMap& image_targets);
+ const viz::BufferToTextureTargetMap& image_targets);
} // namespace ui
diff --git a/ui/compositor/test/fake_context_factory.cc b/ui/compositor/test/fake_context_factory.cc
index 1b396bd..73be3539 100644
--- a/ui/compositor/test/fake_context_factory.cc
+++ b/ui/compositor/test/fake_context_factory.cc
@@ -73,7 +73,7 @@
return &task_graph_runner_;
}
-const cc::ResourceSettings& FakeContextFactory::GetResourceSettings() const {
+const viz::ResourceSettings& FakeContextFactory::GetResourceSettings() const {
return renderer_settings_.resource_settings;
}
diff --git a/ui/compositor/test/fake_context_factory.h b/ui/compositor/test/fake_context_factory.h
index aadc8d6..5761aa2 100644
--- a/ui/compositor/test/fake_context_factory.h
+++ b/ui/compositor/test/fake_context_factory.h
@@ -36,7 +36,7 @@
double GetRefreshRate() const override;
gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
cc::TaskGraphRunner* GetTaskGraphRunner() override;
- const cc::ResourceSettings& GetResourceSettings() const override;
+ const viz::ResourceSettings& GetResourceSettings() const override;
void AddObserver(ui::ContextFactoryObserver* observer) override {}
void RemoveObserver(ui::ContextFactoryObserver* observer) override {}
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index 0693e7e..fde5a18 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -336,7 +336,7 @@
per_compositor_data_[compositor]->display->Resize(size);
}
-const cc::ResourceSettings& InProcessContextFactory::GetResourceSettings()
+const viz::ResourceSettings& InProcessContextFactory::GetResourceSettings()
const {
return renderer_settings_.resource_settings;
}
diff --git a/ui/compositor/test/in_process_context_factory.h b/ui/compositor/test/in_process_context_factory.h
index 2bb2b20..9f52271 100644
--- a/ui/compositor/test/in_process_context_factory.h
+++ b/ui/compositor/test/in_process_context_factory.h
@@ -83,7 +83,7 @@
base::TimeTicks timebase,
base::TimeDelta interval) override {}
void SetOutputIsSecure(ui::Compositor* compositor, bool secure) override {}
- const cc::ResourceSettings& GetResourceSettings() const override;
+ const viz::ResourceSettings& GetResourceSettings() const override;
void AddObserver(ContextFactoryObserver* observer) override;
void RemoveObserver(ContextFactoryObserver* observer) override;
cc::FrameSinkManager* GetFrameSinkManager() override;