<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[269388] branches/safari-610-branch/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/269388">269388</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2020-11-04 14:07:07 -0800 (Wed, 04 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/268446">r268446</a>. rdar://problem/70970178

    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.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268446 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari610branchSourceWebCoreChangeLog">branches/safari-610-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari610branchSourceWebCoreplatformgraphicscocoaGraphicsContextGLOpenGLCocoamm">branches/safari-610-branch/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm</a></li>
<li><a href="#branchessafari610branchSourceWebCoreplatformgraphicscocoaWebGLLayerh">branches/safari-610-branch/Source/WebCore/platform/graphics/cocoa/WebGLLayer.h</a></li>
<li><a href="#branchessafari610branchSourceWebCoreplatformgraphicscocoaWebGLLayermm">branches/safari-610-branch/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari610branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-610-branch/Source/WebCore/ChangeLog (269387 => 269388)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610-branch/Source/WebCore/ChangeLog      2020-11-04 22:07:04 UTC (rev 269387)
+++ branches/safari-610-branch/Source/WebCore/ChangeLog 2020-11-04 22:07:07 UTC (rev 269388)
</span><span class="lines">@@ -1,5 +1,54 @@
</span><span class="cx"> 2020-11-04  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r268446. rdar://problem/70970178
+
+    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.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268446 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-11-04  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Cherry-pick r268386. rdar://problem/70970067
</span><span class="cx"> 
</span><span class="cx">     Cocoa: Make WebGLLayer not dependent on  GraphicsContextGLOpenGL
</span></span></pre></div>
<a id="branchessafari610branchSourceWebCoreplatformgraphicscocoaGraphicsContextGLOpenGLCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-610-branch/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm (269387 => 269388)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610-branch/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm        2020-11-04 22:07:04 UTC (rev 269387)
+++ branches/safari-610-branch/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm   2020-11-04 22:07:07 UTC (rev 269388)
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Create the WebGLLayer
</span><span class="cx">     BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><del>-        m_webGLLayer = adoptNS([[WebGLLayer alloc] initWithClient:this devicePixelRatio:attrs.devicePixelRatio]);
</del><ins>+        m_webGLLayer = adoptNS([[WebGLLayer alloc] initWithClient:this devicePixelRatio:attrs.devicePixelRatio contentsOpaque:!attrs.alpha]);
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx">         [m_webGLLayer setName:@"WebGL Layer"];
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari610branchSourceWebCoreplatformgraphicscocoaWebGLLayerh"></a>
<div class="modfile"><h4>Modified: branches/safari-610-branch/Source/WebCore/platform/graphics/cocoa/WebGLLayer.h (269387 => 269388)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610-branch/Source/WebCore/platform/graphics/cocoa/WebGLLayer.h   2020-11-04 22:07:04 UTC (rev 269387)
+++ branches/safari-610-branch/Source/WebCore/platform/graphics/cocoa/WebGLLayer.h      2020-11-04 22:07:07 UTC (rev 269388)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> // the existing binding obtained through the buffer recycle logic.
</span><span class="cx"> @interface WebGLLayer : CALayer
</span><span class="cx"> 
</span><del>-- (id)initWithClient:(NakedPtr<WebCore::WebGLLayerClient>)client devicePixelRatio:(float)devicePixelRatio;
</del><ins>+- (id)initWithClient:(NakedPtr<WebCore::WebGLLayerClient>)client devicePixelRatio:(float)devicePixelRatio contentsOpaque:(bool)contentsOpaque;
</ins><span class="cx"> 
</span><span class="cx"> - (CGImageRef)copyImageSnapshotWithColorSpace:(CGColorSpaceRef)colorSpace;
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari610branchSourceWebCoreplatformgraphicscocoaWebGLLayermm"></a>
<div class="modfile"><h4>Modified: branches/safari-610-branch/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm (269387 => 269388)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610-branch/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm  2020-11-04 22:07:04 UTC (rev 269387)
+++ branches/safari-610-branch/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm     2020-11-04 22:07:07 UTC (rev 269388)
</span><span class="lines">@@ -43,11 +43,12 @@
</span><span class="cx">     BOOL _preparedForDisplay;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (id)initWithClient:(NakedPtr<WebCore::WebGLLayerClient>)client devicePixelRatio:(float)devicePixelRatio
</del><ins>+- (id)initWithClient:(NakedPtr<WebCore::WebGLLayerClient>)client devicePixelRatio:(float)devicePixelRatio contentsOpaque:(bool)contentsOpaque
</ins><span class="cx"> {
</span><span class="cx">     _client = client;
</span><span class="cx">     self = [super init];
</span><span class="cx">     self.transform = CATransform3DIdentity;
</span><ins>+    self.contentsOpaque = contentsOpaque;
</ins><span class="cx">     self.contentsScale = devicePixelRatio;
</span><span class="cx">     return self;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>