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

Unified Diff: ui/ozone/demo/ozone_demo.cc

Issue 1258713002: ozone: unify GpuMemoryBufferFactoryOzoneNativePixmap in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve nits Created 5 years, 5 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: ui/ozone/demo/ozone_demo.cc
diff --git a/ui/ozone/demo/ozone_demo.cc b/ui/ozone/demo/ozone_demo.cc
index bd2d50ae5dd66990d2058f816aa501bcedbceab6..5e55b6bc776b2a8b8ab24221ca9125df43311d7f 100644
--- a/ui/ozone/demo/ozone_demo.cc
+++ b/ui/ozone/demo/ozone_demo.cc
@@ -21,7 +21,6 @@
#include "ui/ozone/demo/gl_renderer.h"
#include "ui/ozone/demo/software_renderer.h"
#include "ui/ozone/demo/surfaceless_gl_renderer.h"
-#include "ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h"
#include "ui/ozone/public/ozone_gpu_test_helper.h"
#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/ozone_switches.h"
@@ -58,9 +57,6 @@ class RendererFactory {
// Helper for applications that do GL on main thread.
ui::OzoneGpuTestHelper gpu_helper_;
- // Used by the surfaceless renderers to allocate buffers.
- ui::GpuMemoryBufferFactoryOzoneNativePixmap buffer_factory_;
-
DISALLOW_COPY_AND_ASSIGN(RendererFactory);
};
@@ -208,8 +204,7 @@ scoped_ptr<ui::Renderer> RendererFactory::CreateRenderer(
case GL:
return make_scoped_ptr(new ui::GlRenderer(widget, size));
case SURFACELESS_GL:
- return make_scoped_ptr(
- new ui::SurfacelessGlRenderer(widget, size, &buffer_factory_));
+ return make_scoped_ptr(new ui::SurfacelessGlRenderer(widget, size));
case SOFTWARE:
return make_scoped_ptr(new ui::SoftwareRenderer(widget, size));
}

Powered by Google App Engine
This is Rietveld 408576698