[scenic] Use new path for util libraries
SCN-1283 #comment
Change-Id: Ia4878b7a6028ccebb4007e62155a669b55e0bfdb
diff --git a/examples/ui/lib/BUILD.gn b/examples/ui/lib/BUILD.gn
index f919943..11b8a6e 100644
--- a/examples/ui/lib/BUILD.gn
+++ b/examples/ui/lib/BUILD.gn
@@ -19,6 +19,7 @@
public_deps = [
"//sdk/lib/ui/scenic/cpp",
"//src/lib/fxl",
+ "//src/lib/ui/scenic/cpp",
"//third_party/skia",
]
diff --git a/examples/ui/lib/host_canvas_cycler.cc b/examples/ui/lib/host_canvas_cycler.cc
index dae8bb5..53acbf9 100644
--- a/examples/ui/lib/host_canvas_cycler.cc
+++ b/examples/ui/lib/host_canvas_cycler.cc
@@ -54,7 +54,7 @@
acquired_surface_->flush();
acquired_surface_.reset();
- const scenic::HostImage* image = surface_pool_.GetImage(surface_index_);
+ const scenic_util::HostImage* image = surface_pool_.GetImage(surface_index_);
FXL_DCHECK(image);
content_material_.SetTexture(*image);
diff --git a/examples/ui/lib/host_surfaces.cc b/examples/ui/lib/host_surfaces.cc
index 2c06582..566b498 100644
--- a/examples/ui/lib/host_surfaces.cc
+++ b/examples/ui/lib/host_surfaces.cc
@@ -19,11 +19,11 @@
// us avoid the heap allocation.
class SurfaceContext {
public:
- explicit SurfaceContext(std::shared_ptr<HostData> data)
+ explicit SurfaceContext(std::shared_ptr<scenic_util::HostData> data)
: data_(std::move(data)) {}
private:
- std::shared_ptr<HostData> data_;
+ std::shared_ptr<scenic_util::HostData> data_;
};
void DestroySurfaceContext(void* pixels, void* context) {
@@ -32,19 +32,19 @@
} // namespace
-sk_sp<SkSurface> MakeSkSurface(const HostImage& image) {
+sk_sp<SkSurface> MakeSkSurface(const scenic_util::HostImage& image) {
return MakeSkSurface(image.info(), image.data(), image.memory_offset());
}
sk_sp<SkSurface> MakeSkSurface(const fuchsia::images::ImageInfo& image_info,
- std::shared_ptr<HostData> data,
+ std::shared_ptr<scenic_util::HostData> data,
off_t memory_offset) {
return MakeSkSurface(MakeSkImageInfo(image_info), image_info.stride,
std::move(data), memory_offset);
}
sk_sp<SkSurface> MakeSkSurface(SkImageInfo image_info, size_t row_bytes,
- std::shared_ptr<HostData> data,
+ std::shared_ptr<scenic_util::HostData> data,
off_t memory_offset) {
return SkSurface::MakeRasterDirectReleaseProc(
image_info, static_cast<uint8_t*>(data->ptr()) + memory_offset, row_bytes,
@@ -72,7 +72,7 @@
if (surface_ptrs_[index])
return surface_ptrs_[index];
- const HostImage* image = image_pool_.GetImage(index);
+ const scenic_util::HostImage* image = image_pool_.GetImage(index);
if (!image)
return nullptr;
diff --git a/examples/ui/lib/host_surfaces.h b/examples/ui/lib/host_surfaces.h
index 5e17912..bdb60e6 100644
--- a/examples/ui/lib/host_surfaces.h
+++ b/examples/ui/lib/host_surfaces.h
@@ -5,7 +5,7 @@
#ifndef LIB_UI_SCENIC_SKIA_HOST_SURFACES_H_
#define LIB_UI_SCENIC_SKIA_HOST_SURFACES_H_
-#include "lib/ui/scenic/cpp/host_memory.h"
+#include "src/lib/ui/scenic/cpp/host_memory.h"
#include "third_party/skia/include/core/SkSurface.h"
namespace scenic {
@@ -13,14 +13,14 @@
// Creates a Skia surface backed by host-accessible shared memory associated
// with an image resource.
-sk_sp<SkSurface> MakeSkSurface(const HostImage& image);
+sk_sp<SkSurface> MakeSkSurface(const scenic_util::HostImage& image);
// Creates a Skia surface backed by host-accessible shared memory.
sk_sp<SkSurface> MakeSkSurface(const fuchsia::images::ImageInfo& image_info,
- std::shared_ptr<HostData> data,
+ std::shared_ptr<scenic_util::HostData> data,
off_t memory_offset);
sk_sp<SkSurface> MakeSkSurface(SkImageInfo image_info, size_t row_bytes,
- std::shared_ptr<HostData> data,
+ std::shared_ptr<scenic_util::HostData> data,
off_t memory_offset);
// Represents a pool of Skia surfaces and image resources backed by
@@ -61,7 +61,7 @@
// The |index| must be between 0 and |num_images() - 1|.
// The returned pointer is valid until the image is discarded or the
// pool is reconfigured. Returns nullptr if the pool is not configured.
- const HostImage* GetImage(uint32_t index) {
+ const scenic_util::HostImage* GetImage(uint32_t index) {
return image_pool_.GetImage(index);
}
@@ -70,7 +70,7 @@
void DiscardImage(uint32_t index) { image_pool_.DiscardImage(index); }
private:
- HostImagePool image_pool_;
+ scenic_util::HostImagePool image_pool_;
std::vector<sk_sp<SkSurface>> surface_ptrs_;
};
