| Index: ui/gl/gl_surface_egl.h
|
| diff --git a/ui/gl/gl_surface_egl.h b/ui/gl/gl_surface_egl.h
|
| index b95508f590fa9a9117d9e33b79a15b8ca93022c3..12635e6a4dfd6c022838dbadfe7e3c863dd6d58e 100644
|
| --- a/ui/gl/gl_surface_egl.h
|
| +++ b/ui/gl/gl_surface_egl.h
|
| @@ -11,6 +11,7 @@
|
|
|
| #include <memory>
|
| #include <string>
|
| +#include <vector>
|
|
|
| #include "base/command_line.h"
|
| #include "base/compiler_specific.h"
|
| @@ -26,9 +27,6 @@
|
|
|
| namespace gl {
|
|
|
| -// Get default EGL display for GLSurfaceEGL (differs by platform).
|
| -EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay();
|
| -
|
| // If adding a new type, also add it to EGLDisplayType in
|
| // tools/metrics/histograms/histograms.xml. Don't remove or reorder entries.
|
| enum DisplayType {
|
| @@ -57,9 +55,9 @@ class GL_EXPORT GLSurfaceEGL : public GLSurface {
|
| EGLConfig GetConfig() override;
|
| GLSurface::Format GetFormat() override;
|
|
|
| - static bool InitializeOneOff();
|
| + static bool InitializeOneOff(EGLNativeDisplayType native_display);
|
| static EGLDisplay GetHardwareDisplay();
|
| - static EGLDisplay InitializeDisplay();
|
| + static EGLDisplay InitializeDisplay(EGLNativeDisplayType native_display);
|
| static EGLNativeDisplayType GetNativeDisplay();
|
|
|
| // These aren't particularly tied to surfaces, but since we already
|
|
|