<!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>[175012] branches/safari-600.2-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/175012">175012</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-10-21 18:50:23 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/174414">r174414</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6002branchSourceWebCoreChangeLog">branches/safari-600.2-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6002branchSourceWebCorehtmlcanvasWebGLRenderingContextcpp">branches/safari-600.2-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#branchessafari6002branchSourceWebCoreplatformgraphicsGraphicsContext3Dh">branches/safari-600.2-branch/Source/WebCore/platform/graphics/GraphicsContext3D.h</a></li>
<li><a href="#branchessafari6002branchSourceWebCoreplatformgraphicsmacWebGLLayerh">branches/safari-600.2-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.h</a></li>
<li><a href="#branchessafari6002branchSourceWebCoreplatformgraphicsmacWebGLLayermm">branches/safari-600.2-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6002branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebCore/ChangeLog (175011 => 175012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/Source/WebCore/ChangeLog 2014-10-22 01:47:15 UTC (rev 175011)
+++ branches/safari-600.2-branch/Source/WebCore/ChangeLog 2014-10-22 01:50:23 UTC (rev 175012)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2014-10-21 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174414
+
+ 2014-10-08 Dean Jackson <dino@apple.com>
+
+ Safari 8 on OSX 10.10 does not run WebGL in Retina HiDPI mode.
+ https://bugs.webkit.org/show_bug.cgi?id=134854
+ <rdar://problem/18465263>
+
+ Reviewed by Tim Horton.
+
+ The NSOpenGLLayer has to have its contentScale property
+ set accordingly when on a retina display. Do this by
+ adding another value to the GraphicsContext3D creation
+ attribute dictionary, representing the device pixel ratio.
+ Then, when we come to draw into the layer, make sure
+ we set our GL viewport to the correct value.
+
+ This is currently untestable because:
+ - we can't just read from the GL buffer as it is always correct
+ - WebGL isn't working in reftests
+ - a layer dump doesn't show the change since it was done in a CALayer subclass.
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::create): Pass the devicePixelRatio into the attribute dictionary.
+ * platform/graphics/GraphicsContext3D.h:
+ (WebCore::GraphicsContext3D::Attributes::Attributes): Add a devicePixelRatio attribute.
+ * platform/graphics/mac/WebGLLayer.h: New property to save us looking up the attributes
+ each frame.
+ * platform/graphics/mac/WebGLLayer.mm:
+ (-[WebGLLayer initWithGraphicsContext3D:]): Store the devicePixelRatio, and set our
+ contents scale appropriately.
+ (-[WebGLLayer drawInCGLContext:pixelFormat:forLayerTime:displayTime:]): Draw into
+ a correctly sized backbuffer.
+ (-[WebGLLayer copyImageSnapshotWithColorSpace:]): Generate an image of the correct size.
+
+2014-10-21 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r173848
</span><span class="cx">
</span><span class="cx"> 2014-09-22 Alexey Proskuryakov <ap@apple.com>
</span></span></pre></div>
<a id="branchessafari6002branchSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (175011 => 175012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-10-22 01:47:15 UTC (rev 175011)
+++ branches/safari-600.2-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-10-22 01:50:23 UTC (rev 175012)
</span><span class="lines">@@ -437,6 +437,9 @@
</span><span class="cx"> if (frame->settings().forceSoftwareWebGLRendering())
</span><span class="cx"> attributes.forceSoftwareRenderer = true;
</span><span class="cx">
</span><ins>+ if (page)
+ attributes.devicePixelRatio = page->deviceScaleFactor();
+
</ins><span class="cx"> if (isPendingPolicyResolution) {
</span><span class="cx"> LOG(WebGL, "Create a WebGL context that looks real, but will require a policy resolution if used.");
</span><span class="cx"> std::unique_ptr<WebGLRenderingContext> renderingContext(new WebGLRenderingContext(canvas, attributes));
</span></span></pre></div>
<a id="branchessafari6002branchSourceWebCoreplatformgraphicsGraphicsContext3Dh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebCore/platform/graphics/GraphicsContext3D.h (175011 => 175012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-10-22 01:47:15 UTC (rev 175011)
+++ branches/safari-600.2-branch/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-10-22 01:50:23 UTC (rev 175012)
</span><span class="lines">@@ -443,6 +443,7 @@
</span><span class="cx"> , preferDiscreteGPU(false)
</span><span class="cx"> , multithreaded(false)
</span><span class="cx"> , forceSoftwareRenderer(false)
</span><ins>+ , devicePixelRatio(1)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -457,6 +458,7 @@
</span><span class="cx"> bool preferDiscreteGPU;
</span><span class="cx"> bool multithreaded;
</span><span class="cx"> bool forceSoftwareRenderer;
</span><ins>+ float devicePixelRatio;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum RenderStyle {
</span></span></pre></div>
<a id="branchessafari6002branchSourceWebCoreplatformgraphicsmacWebGLLayerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.h (175011 => 175012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.h 2014-10-22 01:47:15 UTC (rev 175011)
+++ branches/safari-600.2-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.h 2014-10-22 01:50:23 UTC (rev 175012)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> WebCore::GraphicsContext3D* _context;
</span><ins>+ float _devicePixelRatio;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @property (nonatomic) WebCore::GraphicsContext3D* context;
</span></span></pre></div>
<a id="branchessafari6002branchSourceWebCoreplatformgraphicsmacWebGLLayermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm (175011 => 175012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm 2014-10-22 01:47:15 UTC (rev 175011)
+++ branches/safari-600.2-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm 2014-10-22 01:50:23 UTC (rev 175012)
</span><span class="lines">@@ -48,6 +48,10 @@
</span><span class="cx"> {
</span><span class="cx"> _context = context;
</span><span class="cx"> self = [super init];
</span><ins>+ _devicePixelRatio = context->getContextAttributes().devicePixelRatio;
+#if !PLATFORM(IOS)
+ self.contentsScale = _devicePixelRatio;
+#endif
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -81,7 +85,9 @@
</span><span class="cx"> CGLSetCurrentContext(glContext);
</span><span class="cx">
</span><span class="cx"> CGRect frame = [self frame];
</span><del>-
</del><ins>+ frame.size.width *= _devicePixelRatio;
+ frame.size.height *= _devicePixelRatio;
+
</ins><span class="cx"> // draw the FBO into the layer
</span><span class="cx"> glViewport(0, 0, frame.size.width, frame.size.height);
</span><span class="cx"> glMatrixMode(GL_PROJECTION);
</span><span class="lines">@@ -134,8 +140,8 @@
</span><span class="cx">
</span><span class="cx"> CGRect layerBounds = CGRectIntegral([self bounds]);
</span><span class="cx">
</span><del>- size_t width = layerBounds.size.width;
- size_t height = layerBounds.size.height;
</del><ins>+ size_t width = layerBounds.size.width * _devicePixelRatio;
+ size_t height = layerBounds.size.height * _devicePixelRatio;
</ins><span class="cx">
</span><span class="cx"> size_t rowBytes = (width * 4 + 15) & ~15;
</span><span class="cx"> size_t dataSize = rowBytes * height;
</span></span></pre>
</div>
</div>
</body>
</html>