<!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>[208873] trunk/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/208873">208873</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-11-17 18:41:35 -0800 (Thu, 17 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix WinCairo build after <a href="http://trac.webkit.org/projects/webkit/changeset/208740">r208740</a>
https://bugs.webkit.org/show_bug.cgi?id=164749
* platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
(WebCore::GraphicsContext3D::reshapeFBOs):
(WebCore::GraphicsContext3D::validateAttributes):
(WebCore::GraphicsContext3D::getExtensions):
Use more references instead of pointers, like Myles did in <a href="http://trac.webkit.org/projects/webkit/changeset/208740">r208740</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLEScpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208872 => 208873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-18 02:11:05 UTC (rev 208872)
+++ trunk/Source/WebCore/ChangeLog 2016-11-18 02:41:35 UTC (rev 208873)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-11-17 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Fix WinCairo build after r208740
+ https://bugs.webkit.org/show_bug.cgi?id=164749
+
+ * platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
+ (WebCore::GraphicsContext3D::reshapeFBOs):
+ (WebCore::GraphicsContext3D::validateAttributes):
+ (WebCore::GraphicsContext3D::getExtensions):
+ Use more references instead of pointers, like Myles did in r208740
+
+2016-11-17 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Implement TextDecoder and TextEncoder
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163771
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLEScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (208872 => 208873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2016-11-18 02:11:05 UTC (rev 208872)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2016-11-18 02:41:35 UTC (rev 208873)
</span><span class="lines">@@ -116,19 +116,19 @@
</span><span class="cx"> ::glBindTexture(GL_TEXTURE_2D, 0);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- Extensions3DOpenGLES* extensions = static_cast<Extensions3DOpenGLES*>(getExtensions());
- if (extensions->isImagination() && m_attrs.antialias) {
</del><ins>+ Extensions3DOpenGLES& extensions = static_cast<Extensions3DOpenGLES&>(getExtensions());
+ if (extensions.isImagination() && m_attrs.antialias) {
</ins><span class="cx"> GLint maxSampleCount;
</span><span class="cx"> ::glGetIntegerv(Extensions3D::MAX_SAMPLES_IMG, &maxSampleCount);
</span><span class="cx"> GLint sampleCount = std::min(8, maxSampleCount);
</span><span class="cx">
</span><del>- extensions->framebufferTexture2DMultisampleIMG(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture, 0, sampleCount);
</del><ins>+ extensions.framebufferTexture2DMultisampleIMG(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture, 0, sampleCount);
</ins><span class="cx">
</span><span class="cx"> if (m_attrs.stencil || m_attrs.depth) {
</span><span class="cx"> // Use a 24 bit depth buffer where we know we have it.
</span><span class="cx"> if (supportPackedDepthStencilBuffer) {
</span><span class="cx"> ::glBindRenderbuffer(GL_RENDERBUFFER, m_depthStencilBuffer);
</span><del>- extensions->renderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, GL_DEPTH24_STENCIL8_OES, width, height);
</del><ins>+ extensions.renderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, GL_DEPTH24_STENCIL8_OES, width, height);
</ins><span class="cx"> if (m_attrs.stencil)
</span><span class="cx"> ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilBuffer);
</span><span class="cx"> if (m_attrs.depth)
</span><span class="lines">@@ -136,12 +136,12 @@
</span><span class="cx"> } else {
</span><span class="cx"> if (m_attrs.stencil) {
</span><span class="cx"> ::glBindRenderbuffer(GL_RENDERBUFFER, m_stencilBuffer);
</span><del>- extensions->renderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, GL_STENCIL_INDEX8, width, height);
</del><ins>+ extensions.renderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, GL_STENCIL_INDEX8, width, height);
</ins><span class="cx"> ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_stencilBuffer);
</span><span class="cx"> }
</span><span class="cx"> if (m_attrs.depth) {
</span><span class="cx"> ::glBindRenderbuffer(GL_RENDERBUFFER, m_depthBuffer);
</span><del>- extensions->renderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, GL_DEPTH_COMPONENT16, width, height);
</del><ins>+ extensions.renderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, GL_DEPTH_COMPONENT16, width, height);
</ins><span class="cx"> ::glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_depthBuffer);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -222,11 +222,8 @@
</span><span class="cx"> {
</span><span class="cx"> validateDepthStencil("GL_OES_packed_depth_stencil");
</span><span class="cx">
</span><del>- if (m_attrs.antialias) {
- Extensions3D* extensions = getExtensions();
- if (!extensions->supports("GL_IMG_multisampled_render_to_texture"))
- m_attrs.antialias = false;
- }
</del><ins>+ if (m_attrs.antialias && !getExtensions().supports("GL_IMG_multisampled_render_to_texture"))
+ m_attrs.antialias = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::depthRange(GC3Dclampf zNear, GC3Dclampf zFar)
</span><span class="lines">@@ -241,11 +238,11 @@
</span><span class="cx"> ::glClearDepthf(depth);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Extensions3D* GraphicsContext3D::getExtensions()
</del><ins>+Extensions3D& GraphicsContext3D::getExtensions()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_extensions)
</span><span class="cx"> m_extensions = std::make_unique<Extensions3DOpenGLES>(this, isGLES2Compliant());
</span><del>- return m_extensions.get();
</del><ins>+ return *m_extensions;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>