summaryrefslogtreecommitdiffstats
path: root/content/common
diff options
context:
space:
mode:
authordongseong.hwang <dongseong.hwang@intel.com>2015-06-04 12:53:54 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-04 19:54:36 +0000
commit48b0a7165bd6c9d889fc6d6959a6e59cf7ef9dc6 (patch)
tree0115b2358279a0d57ffdf8a39fa797b4d21a9ec4 /content/common
parent55acd347c7b081fd34de82fc3a603838eb40524d (diff)
downloadchromium_src-48b0a7165bd6c9d889fc6d6959a6e59cf7ef9dc6.zip
chromium_src-48b0a7165bd6c9d889fc6d6959a6e59cf7ef9dc6.tar.gz
chromium_src-48b0a7165bd6c9d889fc6d6959a6e59cf7ef9dc6.tar.bz2
ozone: Remove singleton pattern for SurfaceFactoryOzone.
OzonePlatform is sigleton already, so it's not necessary for SurfaceFactoryOzone to be singleton. Review URL: https://codereview.chromium.org/1159493010 Cr-Commit-Position: refs/heads/master@{#332889}
Diffstat (limited to 'content/common')
-rw-r--r--content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc6
1 files changed, 4 insertions, 2 deletions
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 fa12bf9..dfc0e38 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,6 +6,7 @@
#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 {
@@ -41,8 +42,9 @@ bool GpuMemoryBufferFactoryOzoneNativeBuffer::
void GpuMemoryBufferFactoryOzoneNativeBuffer::
GetSupportedGpuMemoryBufferConfigurations(
std::vector<Configuration>* configurations) {
- if (!ui::SurfaceFactoryOzone::GetInstance()->CanCreateNativePixmap(
- ui::SurfaceFactoryOzone::SCANOUT))
+ if (!ui::OzonePlatform::GetInstance()
+ ->GetSurfaceFactoryOzone()
+ ->CanCreateNativePixmap(ui::SurfaceFactoryOzone::SCANOUT))
return;
configurations->assign(