Possible fix for swapped red and blue channels in browser views

Author: jushar

Client/cefweb/CWebView.cpp

@@ -219,20 +219,40 @@ void CWebView::UpdateTexture()
             // Update changed state
             m_RenderData.changed = false;
 
-            if (m_RenderData.dirtyRects.size() > 0 && m_RenderData.dirtyRects[0].width == m_RenderData.width && m_RenderData.dirtyRects[0].height == m_RenderData.height)
+            if (m_pWebBrowserRenderItem->m_IsARGB)
             {
-                // Update whole texture
-                memcpy(surfaceData, sourceData, m_RenderData.width * m_RenderData.height * 4);
+                if (m_RenderData.dirtyRects.size() > 0 && m_RenderData.dirtyRects[0].width == m_RenderData.width && m_RenderData.dirtyRects[0].height == m_RenderData.height)
+                {
+                    // Update whole texture
+                    memcpy(surfaceData, sourceData, m_RenderData.width * m_RenderData.height * 4);
+                }
+                else
+                {
+                    // Update dirty rects
+                    for (auto& rect : m_RenderData.dirtyRects)
+                    {
+                        for (int y = rect.y; y < rect.y + rect.height; ++y)
+                        {
+                            int index = y * pitch + rect.x * 4;
+                            memcpy(&surfaceData[index], &sourceData[index], rect.width * 4);
+                        }
+                    }
+                }
             }
             else
             {
-                // Update dirty rects
                 for (auto& rect : m_RenderData.dirtyRects)
                 {
                     for (int y = rect.y; y < rect.y + rect.height; ++y)
                     {
-                        int index = y * pitch + rect.x * 4;
-                        memcpy(&surfaceData[index], &sourceData[index], rect.width * 4);
+                        for (int x = rect.x; x < rect.x + rect.width; ++x)
+                        {
+                            int index = y * pitch + x * 4;
+                            const uint32_t sourcePixel = *reinterpret_cast<const std::uint32_t*>(&sourceData[index]);
+
+                            // Convert ABGR to ARGB
+                            *reinterpret_cast<std::uint32_t*>(&surfaceData[index]) = (sourcePixel & 0xFF00FF00) | ((sourcePixel & 0x00FF0000) >> 16) | ((sourcePixel & 0x000000FF) << 16);
+                        }
                     }
                 }
             }
@@ -247,10 +267,24 @@ void CWebView::UpdateTexture()
             auto popupPitch = m_RenderData.popupRect.width * 4;
             for (int y = 0; y < m_RenderData.popupRect.height; ++y)
             {
-                int sourceIndex = y * popupPitch;
-                int destIndex = (y + m_RenderData.popupRect.y) * pitch + m_RenderData.popupRect.x * 4;
+                if (m_pWebBrowserRenderItem->m_IsARGB)
+                {
+                    int sourceIndex = y * popupPitch;
+                    int destIndex = (y + m_RenderData.popupRect.y) * pitch + m_RenderData.popupRect.x * 4;
 
-                memcpy(&surfaceData[destIndex], &m_RenderData.popupBuffer[sourceIndex], popupPitch);
+                    memcpy(&surfaceData[destIndex], &m_RenderData.popupBuffer[sourceIndex], popupPitch);
+                }
+                else
+                {
+                    for (int x = 0; x < m_RenderData.popupRect.width; ++x)
+                    {
+                        int sourceIndex = y * popupPitch + x * 4;
+                        int destIndex = (y + m_RenderData.popupRect.y) * pitch + (m_RenderData.popupRect.x + x) * 4;
+                        const uint32_t sourcePixel = *reinterpret_cast<const std::uint32_t*>(&m_RenderData.popupBuffer[sourceIndex]);
+
+                        *reinterpret_cast<std::uint32_t*>(&surfaceData[destIndex]) = (sourcePixel & 0xFF00FF00) | ((sourcePixel & 0x00FF0000) >> 16) | ((sourcePixel & 0x000000FF) << 16);
+                    }
+                }
             }
         }
 

Client/core/Graphics/CRenderItem.WebBrowser.cpp

@@ -94,7 +94,17 @@ void CWebBrowserItem::CreateUnderlyingData ()
     assert ( !m_pD3DRenderTargetSurface );
     assert ( !m_pD3DTexture );
 
-    D3DXCreateTexture ( m_pDevice, m_uiSizeX, m_uiSizeY, 1, 0, D3DFMT_A8B8G8R8, D3DPOOL_MANAGED, (IDirect3DTexture9**)&m_pD3DTexture );
+    // Check if ABGR format is supported
+    D3DFORMAT textureFormat = D3DFMT_A8R8G8B8;
+    UINT numMipLevels = 1;
+    D3DXCheckTextureRequirements(m_pDevice, &m_uiSizeX, &m_uiSizeY, &numMipLevels, 0, &textureFormat, D3DPOOL_MANAGED);
+    m_IsARGB = textureFormat == D3DFMT_A8R8G8B8;
+
+    if (!m_IsARGB)
+        AddReportLog(9700, "ARGB format not supported", 1);
+
+    // Create texture
+    D3DXCreateTexture(m_pDevice, m_uiSizeX, m_uiSizeY, numMipLevels, 0, textureFormat, D3DPOOL_MANAGED, (IDirect3DTexture9**)&m_pD3DTexture);
 
     // Check texture created
     if ( !m_pD3DTexture )

Client/sdk/core/CRenderItemManagerInterface.h

@@ -542,4 +542,5 @@ class CWebBrowserItem : public CTextureItem
     virtual void    Resize                  (const CVector2D& size);
 
     IDirect3DSurface9*    m_pD3DRenderTargetSurface;
+    bool m_IsARGB = true;
 };