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

Unified Diff: services/ui/surfaces/direct_output_surface_ozone.cc

Issue 2280723004: services/ui: Remove unwanted gpu dependency from services/ui/surfaces. (Closed)
Patch Set: . Created 4 years, 4 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 | « services/ui/surfaces/direct_output_surface_ozone.h ('k') | services/ui/surfaces/display_compositor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/surfaces/direct_output_surface_ozone.cc
diff --git a/services/ui/surfaces/direct_output_surface_ozone.cc b/services/ui/surfaces/direct_output_surface_ozone.cc
index 1ba30ea5ae845beb691dded1d0faebaeccf4afc3..c50d963237a7651f653d9b75595ef01f7bd9e545 100644
--- a/services/ui/surfaces/direct_output_surface_ozone.cc
+++ b/services/ui/surfaces/direct_output_surface_ozone.cc
@@ -15,7 +15,6 @@
#include "components/display_compositor/buffer_queue.h"
#include "gpu/command_buffer/client/context_support.h"
#include "gpu/command_buffer/client/gles2_interface.h"
-#include "services/ui/gpu/mus_gpu_memory_buffer_manager.h"
#include "services/ui/surfaces/surfaces_context_provider.h"
#include "ui/display/types/display_snapshot.h"
@@ -27,6 +26,7 @@ DirectOutputSurfaceOzone::DirectOutputSurfaceOzone(
scoped_refptr<SurfacesContextProvider> context_provider,
gfx::AcceleratedWidget widget,
cc::SyntheticBeginFrameSource* synthetic_begin_frame_source,
+ gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
uint32_t target,
uint32_t internalformat)
: cc::OutputSurface(context_provider, nullptr, nullptr),
@@ -37,7 +37,7 @@ DirectOutputSurfaceOzone::DirectOutputSurfaceOzone(
buffer_queue_.reset(
new BufferQueue(context_provider->ContextGL(), target, internalformat,
ui::DisplaySnapshot::PrimaryFormat(), &gl_helper_,
- MusGpuMemoryBufferManager::current(), widget));
+ gpu_memory_buffer_manager, widget));
capabilities_.uses_default_gl_framebuffer = false;
capabilities_.flipped_output_surface = true;
« no previous file with comments | « services/ui/surfaces/direct_output_surface_ozone.h ('k') | services/ui/surfaces/display_compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698