content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc - Issue 1171513002: Reland of Revert of ozone: Remove singleton pattern for SurfaceFactoryOzone.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1171513002: Reland of 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

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 fa12bf90c4f1661bfa32e688b7b63de0b4074c51..dfc0e38ee0b4b1c8518c922f1289fd658c00fc6a 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(

« no previous file with comments | « content/browser/compositor/software_output_device_ozone.cc ('k') | ui/gl/gl_implementation_ozone.cc » ('j') | ui/ozone/demo/software_renderer.cc » ('J')