Changeset 268446 in webkit

Timestamp:

Oct 14, 2020, 2:18:23 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION: fast/canvas/webgl/context-attributes-alpha.html fails
​https://bugs.webkit.org/show_bug.cgi?id=217697

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2020-10-14
Reviewed by Antti Koivisto.

The original work in "Cocoa: Make WebGLLayer not dependent on
GraphicsContextGLOpenGL" was missing the hunk to initialize
WebGLLayer contentsOpaque. Neither the EWS nor the local testing
used the test case.

No new tests, tested by
fast/canvas/webgl/context-attributes-alpha.html.

• platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:

(WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):

• platform/graphics/cocoa/WebGLLayer.h:
• platform/graphics/cocoa/WebGLLayer.mm:

(-[WebGLLayer initWithClient:devicePixelRatio:contentsOpaque:]):
(-[WebGLLayer initWithClient:devicePixelRatio:]): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm (modified) (1 diff)
• platform/graphics/cocoa/WebGLLayer.h (modified) (1 diff)
• platform/graphics/cocoa/WebGLLayer.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-14  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        REGRESSION: fast/canvas/webgl/context-attributes-alpha.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=217697
+
+        Reviewed by Antti Koivisto.
+
+        The original work in "Cocoa: Make WebGLLayer not dependent on
+        GraphicsContextGLOpenGL" was missing the hunk to initialize
+        WebGLLayer contentsOpaque. Neither the EWS nor the local testing
+        used the test case.
+
+        No new tests, tested by
+        fast/canvas/webgl/context-attributes-alpha.html.
+
+        * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
+        (WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
+        * platform/graphics/cocoa/WebGLLayer.h:
+        * platform/graphics/cocoa/WebGLLayer.mm:
+        (-[WebGLLayer initWithClient:devicePixelRatio:contentsOpaque:]):
+        (-[WebGLLayer initWithClient:devicePixelRatio:]): Deleted.
+
 2020-10-13  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm

@@ -335 +335 @@
     // Create the WebGLLayer
     BEGIN_BLOCK_OBJC_EXCEPTIONS
-        m_webGLLayer = adoptNS([[WebGLLayer alloc] initWithClient:this devicePixelRatio:attrs.devicePixelRatio]);
+        m_webGLLayer = adoptNS([[WebGLLayer alloc] initWithClient:this devicePixelRatio:attrs.devicePixelRatio contentsOpaque:!attrs.alpha]);
 #ifndef NDEBUG
         [m_webGLLayer setName:@"WebGL Layer"];

trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.h

@@ -49 +49 @@
 @interface WebGLLayer : CALayer
 
-- (id)initWithClient:(NakedPtr<WebCore::WebGLLayerClient>)client devicePixelRatio:(float)devicePixelRatio;
+- (id)initWithClient:(NakedPtr<WebCore::WebGLLayerClient>)client devicePixelRatio:(float)devicePixelRatio contentsOpaque:(bool)contentsOpaque;
 
 - (CGImageRef)copyImageSnapshotWithColorSpace:(CGColorSpaceRef)colorSpace;

trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm

@@ -44 +44 @@
 }
 
-- (id)initWithClient:(NakedPtr<WebCore::WebGLLayerClient>)client devicePixelRatio:(float)devicePixelRatio
+- (id)initWithClient:(NakedPtr<WebCore::WebGLLayerClient>)client devicePixelRatio:(float)devicePixelRatio contentsOpaque:(bool)contentsOpaque
 {
     _client = client;
     self = [super init];
     self.transform = CATransform3DIdentity;
+    self.contentsOpaque = contentsOpaque;
     self.contentsScale = devicePixelRatio;
     return self;