Bug 297900 – [WebXR] Unify WebXROpaqueFramebuffer and WebXROpaqueFramebufferCocoa

• Status: RESOLVED
• Resolution: FIXED
• Component: WebXR

[Carlos Garcia Campos]

Those are mostly the same except for a few bits that can be easily ifdefed.

[Carlos Garcia Campos]

Pull request: https://github.com/WebKit/WebKit/pull/49881

[Radar WebKit Bug Importer]

<rdar://problem/159662988>

[EWS]

Committed 302027@main (030d681521d7): <https://commits.webkit.org/302027@main>

Reviewed commits have been landed. Closing PR #49881 and removing active labels.

[Adrian Perez]

This broke the Android build, instead of the added ExternalTexture::isNull() method, what we have to do is define an “operator bool()“ for Cocoa: on Android we get the operator from RefPtr<AHardwareBuffer>, for non-Cocoa there was already an operator defined (line 332 of PlatformXR.cpp). The errors are:

/home/aperez/devel/WebKit-Android/Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp:493:35: error: no member named 'isNull' in 'WTF::RefPtr<AHardwareBuffer>'
  493 |     if (!textureData.colorTexture.isNull())
      |          ~~~~~~~~~~~~~~~~~~~~~~~~ ^
/home/aperez/devel/WebKit-Android/Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp:531:49: error: no member named 'isNull' in 'WTF::RefPtr<AHardwareBuffer>'
  531 |         if (layerData.textureData->colorTexture.isNull())
      |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
/home/aperez/devel/WebKit-Android/Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp:540:56: error: no member named 'isNull' in 'WTF::RefPtr<AHardwareBuffer>'
  540 |         if (!layerData.textureData->depthStencilBuffer.isNull()) {
      |              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
3 errors generated.

[Adrian Perez]

Pull request: https://github.com/WebKit/WebKit/pull/52954

[EWS]

Committed 302109@main (af9ccb99d5c4): <https://commits.webkit.org/302109@main>

Reviewed commits have been landed. Closing PR #52954 and removing active labels.