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

Unified Diff: content/browser/renderer_host/compositor_impl_android.cc

Issue 2322943003: cc: Move UI Resource management out of LayerTreeHost. (Closed)
Patch Set: format Created 4 years, 3 months 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
Index: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index bfdf2677c8656a18889a40de0c42c43a27233a3c..7263d6ed9cd5cc51546422f4e10b755397b59802 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -39,6 +39,7 @@
#include "cc/output/texture_mailbox_deleter.h"
#include "cc/output/vulkan_in_process_context_provider.h"
#include "cc/raster/single_thread_task_graph_runner.h"
+#include "cc/resources/ui_resource_manager.h"
#include "cc/scheduler/begin_frame_source.h"
#include "cc/surfaces/display.h"
#include "cc/surfaces/display_scheduler.h"
@@ -410,7 +411,7 @@ CompositorImpl::CompositorImpl(CompositorClient* client,
root_window->GetLayer()->AddChild(readback_layer_tree_);
root_window->AttachCompositor(this);
CreateLayerTreeHost();
- resource_manager_.Init(host_.get());
+ resource_manager_.Init(host_->GetUIResourceManager());
}
CompositorImpl::~CompositorImpl() {
@@ -745,12 +746,12 @@ void CompositorImpl::RemoveObserver(VSyncObserver* observer) {
cc::UIResourceId CompositorImpl::CreateUIResource(
cc::UIResourceClient* client) {
TRACE_EVENT0("compositor", "CompositorImpl::CreateUIResource");
- return host_->CreateUIResource(client);
+ return host_->GetUIResourceManager()->CreateUIResource(client);
}
void CompositorImpl::DeleteUIResource(cc::UIResourceId resource_id) {
TRACE_EVENT0("compositor", "CompositorImpl::DeleteUIResource");
- host_->DeleteUIResource(resource_id);
+ host_->GetUIResourceManager()->DeleteUIResource(resource_id);
}
bool CompositorImpl::SupportsETC1NonPowerOfTwo() const {

Powered by Google App Engine
This is Rietveld 408576698