From c9240ccd99eeec39ff0b4a27a4e84d9fdbea74ed Mon Sep 17 00:00:00 2001 From: sotaro Date: Tue, 22 Jun 2021 23:22:50 +0000 Subject: [PATCH] Bug 1717572 - Remove gfxUtils::ConvertBGRAtoRGBA() call in AndroidCompositorWidget::EndRemoteDrawingInRegion() r=lsalzman,gfx-reviewers gfxUtils::ConvertBGRAtoRGBA() could be removed. BGRA->RBGA conversion could be done by DrawTargetSkia::CopySurface() in RenderCompositorSWGL::CommitMappedBuffer(). Though DrawTargetCairo::CopySurface() does not do the conversion. On Android, RenderCompositorSWGL is not expected to be used on release. It is only for testing for now. Differential Revision: https://phabricator.services.mozilla.com/D118449 --- widget/android/AndroidCompositorWidget.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/widget/android/AndroidCompositorWidget.cpp b/widget/android/AndroidCompositorWidget.cpp index a640901cffd6..ecd520d113ca 100644 --- a/widget/android/AndroidCompositorWidget.cpp +++ b/widget/android/AndroidCompositorWidget.cpp @@ -51,9 +51,9 @@ AndroidCompositorWidget::StartRemoteDrawingInRegion( } const int bpp = 4; - gfx::SurfaceFormat format = gfx::SurfaceFormat::B8G8R8A8; + gfx::SurfaceFormat format = gfx::SurfaceFormat::R8G8B8A8; if (mFormat == WINDOW_FORMAT_RGBX_8888) { - format = gfx::SurfaceFormat::B8G8R8X8; + format = gfx::SurfaceFormat::R8G8B8X8; } RefPtr dt = gfx::Factory::CreateDrawTargetForData( @@ -66,10 +66,6 @@ AndroidCompositorWidget::StartRemoteDrawingInRegion( void AndroidCompositorWidget::EndRemoteDrawingInRegion( gfx::DrawTarget* aDrawTarget, const LayoutDeviceIntRegion& aInvalidRegion) { - // XXX Needs convert BGRA to RGBA. RGBA is not supported by sw-wr - const int bpp = 4; - gfxUtils::ConvertBGRAtoRGBA((uint8_t*)mBuffer.bits, - mBuffer.stride * mBuffer.height * bpp); ANativeWindow_unlockAndPost(mNativeWindow); }