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

Unified Diff: ui/ozone/public/surface_factory_ozone.h

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 | « ui/ozone/gpu/ozone_gpu.gyp ('k') | ui/ozone/public/surface_factory_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/public/surface_factory_ozone.h
diff --git a/ui/ozone/public/surface_factory_ozone.h b/ui/ozone/public/surface_factory_ozone.h
index 678976b904bc4f56b3e82ea8e1b125d60325efdf..3a509960976ba9f1881d07da205a382e3b708a8e 100644
--- a/ui/ozone/public/surface_factory_ozone.h
+++ b/ui/ozone/public/surface_factory_ozone.h
@@ -8,10 +8,15 @@
#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
#include "base/native_library.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/overlay_transform.h"
#include "ui/ozone/ozone_base_export.h"
+
+class SkBitmap;
+class SkCanvas;
namespace ui {
@@ -72,6 +77,12 @@
typedef base::Callback<void(base::NativeLibrary)> AddGLLibraryCallback;
typedef base::Callback<void(GLGetProcAddressProc)>
SetGLGetProcAddressProcCallback;
+
+ SurfaceFactoryOzone();
+ virtual ~SurfaceFactoryOzone();
+
+ // Returns the singleton instance.
+ static SurfaceFactoryOzone* GetInstance();
// Returns native platform display handle. This is used to obtain the EGL
// display connection for the native display.
@@ -148,12 +159,8 @@
// such as MAP for zero copy or SCANOUT for display controller.
virtual bool CanCreateNativePixmap(BufferUsage usage);
- protected:
- SurfaceFactoryOzone();
- virtual ~SurfaceFactoryOzone();
-
private:
- DISALLOW_COPY_AND_ASSIGN(SurfaceFactoryOzone);
+ static SurfaceFactoryOzone* impl_; // not owned
};
} // namespace ui
« no previous file with comments | « ui/ozone/gpu/ozone_gpu.gyp ('k') | ui/ozone/public/surface_factory_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698