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

Unified Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 634083002: gpu: Compositor management of GpuMemoryBuffer instances. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cc-pre-chromium-image-refactor
Patch Set: rebase Created 6 years, 2 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
« no previous file with comments | « content/content_child.gypi ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index bbc52882caf8d6a5e42909d1ce2c947ab5feae68..e5b3c176743468673df740999503a40e03793a3d 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -28,6 +28,7 @@
#include "cc/output/copy_output_result.h"
#include "cc/resources/single_release_callback.h"
#include "cc/trees/layer_tree_host.h"
+#include "content/child/child_gpu_memory_buffer_manager.h"
#include "content/child/child_shared_bitmap_manager.h"
#include "content/common/content_switches_internal.h"
#include "content/common/gpu/client/context_provider_command_buffer.h"
@@ -527,11 +528,13 @@ void RenderWidgetCompositor::Initialize(cc::LayerTreeSettings settings) {
main_thread_compositor_task_runner(base::MessageLoopProxy::current());
RenderThreadImpl* render_thread = RenderThreadImpl::current();
cc::SharedBitmapManager* shared_bitmap_manager = NULL;
+ cc::GpuMemoryBufferManager* gpu_memory_buffer_manager = NULL;
// render_thread may be NULL in tests.
if (render_thread) {
compositor_message_loop_proxy =
render_thread->compositor_message_loop_proxy();
shared_bitmap_manager = render_thread->shared_bitmap_manager();
+ gpu_memory_buffer_manager = render_thread->gpu_memory_buffer_manager();
main_thread_compositor_task_runner =
render_thread->main_thread_compositor_task_runner();
}
@@ -539,6 +542,7 @@ void RenderWidgetCompositor::Initialize(cc::LayerTreeSettings settings) {
layer_tree_host_ =
cc::LayerTreeHost::CreateThreaded(this,
shared_bitmap_manager,
+ gpu_memory_buffer_manager,
settings,
main_thread_compositor_task_runner,
compositor_message_loop_proxy);
@@ -547,6 +551,7 @@ void RenderWidgetCompositor::Initialize(cc::LayerTreeSettings settings) {
this,
this,
shared_bitmap_manager,
+ gpu_memory_buffer_manager,
settings,
main_thread_compositor_task_runner);
}
« no previous file with comments | « content/content_child.gypi ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698