282314 2024-10-29 19:52:06 -0700 Fix errors of platform/graphics/skia/PlatformDisplaySkia.cpp for Windows 2024-10-30 03:16:15 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 fujii fujii webkit-bug-importer oldest_to_newest 2071503 0 fujii 2024-10-29 19:52:06 -0700 C:\webkit\wc\Source\WebCore\platform/graphics/skia/PlatformDisplaySkia.cpp(50,10): fatal error: 'skia/gpu/gl/egl/GrGLMakeEGLInterface.h' file not found 50 | #include <skia/gpu/gl/egl/GrGLMakeEGLInterface.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. C:\webkit\wc\Source\WebCore\platform/graphics/skia/PlatformDisplaySkia.cpp(77,25): error: non-friend class member 'MakeEGL' cannot have a qualified name 77 | GrGLInterfaces::MakeEGL() | ~~~~~~~~~~~~~~~~^ C:\webkit\wc\Source\WebCore\platform/graphics/skia/PlatformDisplaySkia.cpp(77,25): error: a type specifier is required for all declarations C:\webkit\wc\Source\WebCore\platform/graphics/skia/PlatformDisplaySkia.cpp(77,34): error: expected ';' at end of declaration list 77 | GrGLInterfaces::MakeEGL() | ^ | ; C:\webkit\wc\Source\WebCore\platform/graphics/skia/PlatformDisplaySkia.cpp(73,55): error: cannot combine with previous 'type-name' declaration specifier 73 | static NeverDestroyed<sk_sp<const GrGLInterface>> interface { | ^ C:\Program Files (x86)\Windows Kits\10\include\10.0.22621.0\um\combaseapi.h(168,19): note: expanded from macro 'interface' 168 | #define interface __STRUCT__ | ^ C:\Program Files (x86)\Windows Kits\10\include\10.0.22621.0\um\combaseapi.h(167,20): note: expanded from macro '__STRUCT__' 167 | #define __STRUCT__ struct | ^ In file included from C:\webkit\wc\WebKitBuild\Debug\WebCore\DerivedSources\unified-sources\UnifiedSource-3c72abbe-54.cpp:1: C:\webkit\wc\Source\WebCore\platform/graphics/skia/PlatformDisplaySkia.cpp(73,5): error: declaration does not declare anything [-Werror,-Wmissing-declarations] 73 | static NeverDestroyed<sk_sp<const GrGLInterface>> interface { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C:\webkit\wc\Source\WebCore\platform/graphics/skia/PlatformDisplaySkia.cpp(81,12): error: expected expression 81 | return interface.get(); | ^ C:\Program Files (x86)\Windows Kits\10\include\10.0.22621.0\um\combaseapi.h(168,19): note: expanded from macro 'interface' 168 | #define interface __STRUCT__ | ^ C:\Program Files (x86)\Windows Kits\10\include\10.0.22621.0\um\combaseapi.h(167,20): note: expanded from macro '__STRUCT__' 167 | #define __STRUCT__ struct | ^ 6 errors generated. 2071504 1 fujii 2024-10-29 19:56:01 -0700 Pull request: https://github.com/WebKit/WebKit/pull/35928 2071557 2 ews-feeder 2024-10-30 03:15:43 -0700 Committed 285894@main (a7cc63aa47dd): <https://commits.webkit.org/285894@main> Reviewed commits have been landed. Closing PR #35928 and removing active labels. 2071558 3 webkit-bug-importer 2024-10-30 03:16:15 -0700 <rdar://problem/138906247>