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

Unified Diff: ui/gl/test/gl_surface_test_support.cc

Issue 2270463002: Add OzoneGLImpl interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 3 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/gl/test/DEPS ('k') | ui/ozone/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/test/gl_surface_test_support.cc
diff --git a/ui/gl/test/gl_surface_test_support.cc b/ui/gl/test/gl_surface_test_support.cc
index aae8fd79d497a7cdfb111c3d4ef8f5184761b0eb..72e074cfabe055253e5140d170f0fa529506b577 100644
--- a/ui/gl/test/gl_surface_test_support.cc
+++ b/ui/gl/test/gl_surface_test_support.cc
@@ -14,6 +14,10 @@
#include "ui/gl/gl_switches.h"
#include "ui/gl/init/gl_factory.h"
+#if defined(USE_OZONE)
+#include "ui/ozone/public/ozone_platform.h"
+#endif
+
#if defined(USE_X11)
#include <X11/Xlib.h>
#include "ui/platform_window/x11/x11_window.h"
@@ -83,6 +87,10 @@ void GLSurfaceTestSupport::InitializeOneOffImplementation(
// static
void GLSurfaceTestSupport::InitializeOneOffWithMockBindings() {
+#if defined(USE_OZONE)
+ // This function skips where Ozone is otherwise initialized.
+ ui::OzonePlatform::InitializeForGPU();
+#endif
InitializeOneOffImplementation(kGLImplementationMockGL, false);
}
« no previous file with comments | « ui/gl/test/DEPS ('k') | ui/ozone/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698