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

Unified Diff: content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc

Issue 1167533007: Revert of ozone: Remove singleton pattern for SurfaceFactoryOzone. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/browser/compositor/software_output_device_ozone.cc ('k') | ui/gl/gl_implementation_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
index dfc0e38ee0b4b1c8518c922f1289fd658c00fc6a..fa12bf90c4f1661bfa32e688b7b63de0b4074c51 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
+++ b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
@@ -6,7 +6,6 @@
#include "base/logging.h"
#include "ui/gl/gl_image.h"
-#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/surface_factory_ozone.h"
namespace content {
@@ -42,9 +41,8 @@
void GpuMemoryBufferFactoryOzoneNativeBuffer::
GetSupportedGpuMemoryBufferConfigurations(
std::vector<Configuration>* configurations) {
- if (!ui::OzonePlatform::GetInstance()
- ->GetSurfaceFactoryOzone()
- ->CanCreateNativePixmap(ui::SurfaceFactoryOzone::SCANOUT))
+ if (!ui::SurfaceFactoryOzone::GetInstance()->CanCreateNativePixmap(
+ ui::SurfaceFactoryOzone::SCANOUT))
return;
configurations->assign(
« no previous file with comments | « content/browser/compositor/software_output_device_ozone.cc ('k') | ui/gl/gl_implementation_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698