Commit 532b0aeb authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Avoid the name "interface" since it's a macro in Windows

In Win32 some headers defines "interface" to mean struct which
makes it unsuitable to cross platform code. This instance was
hit in a jumbo experimental build where apparently enough
win32 headers were included in the translation unit.

Bug: 864986
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I1e906a46620378be2ded6a4a4868e2034cc1868b
Reviewed-on: https://chromium-review.googlesource.com/1152735Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#578715}
parent f305dcd3
......@@ -118,12 +118,13 @@ bool SupportsOOPRaster(const gl::GLVersionInfo& gl_info) {
// call in content/gpu/gpu_main.cc?
SkGraphics::Init();
sk_sp<const GrGLInterface> interface(gl::init::CreateGrGLInterface(gl_info));
if (!interface) {
sk_sp<const GrGLInterface> gl_interface(
gl::init::CreateGrGLInterface(gl_info));
if (!gl_interface) {
return false;
}
sk_sp<GrContext> gr_context = GrContext::MakeGL(std::move(interface));
sk_sp<GrContext> gr_context = GrContext::MakeGL(std::move(gl_interface));
if (gr_context) {
// TODO(backer): Stash this GrContext for future use. For now, destroy.
return true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment