<!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>[184545] releases/WebKitGTK/webkit-2.4/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/184545">184545</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-18 23:15:12 -0700 (Mon, 18 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[W32][GTK] Conflict between NO_ERROR from W32API and GraphicsContext3D
https://bugs.webkit.org/show_bug.cgi?id=143768
Patch by Руслан Ижбулатов <lrn1986@gmail.com> on 2015-04-15
Reviewed by Carlos Garcia Campos.
Work around name conflicts (NO_ERROR)
In file included from /mingw/include/_mingw.h:12:0,
from ../webkitgtk-2.4.8/Source/WTF/wtf/Compiler.h:93,
from ../webkitgtk-2.4.8/Source/WTF/wtf/Platform.h:32,
from ../webkitgtk-2.4.8/Source/JavaScriptCore/config.h:30,
from ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:27:
../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp: In member function 'virtual int WebCore::Extensions3DOpenGLCommon::getGraphicsResetStatusARB()':
../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:144:31: error: expected unqualified-id before numeric constant
return GraphicsContext3D::NO_ERROR;
because NO_ERROR is also a macro defined in Windows headers. Ouch.
Also expand this to the (PLATFORM(GTK) && OS(WINDOWS)) combination,
in addition to the workaround for VERSION already present there.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCorehtmlcanvasWebGLRenderingContextcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsGraphicsContext3Dh">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/GraphicsContext3D.h</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicstexmapTextureMapperShaderProgramcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (184544 => 184545)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-19 06:05:16 UTC (rev 184544)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-19 06:15:12 UTC (rev 184545)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-04-15 Руслан Ижбулатов <lrn1986@gmail.com>
</span><span class="cx">
</span><ins>+ [W32][GTK] Conflict between NO_ERROR from W32API and GraphicsContext3D
+ https://bugs.webkit.org/show_bug.cgi?id=143768
+
+ Reviewed by Carlos Garcia Campos.
+
+ Work around name conflicts (NO_ERROR)
+
+ In file included from /mingw/include/_mingw.h:12:0,
+ from ../webkitgtk-2.4.8/Source/WTF/wtf/Compiler.h:93,
+ from ../webkitgtk-2.4.8/Source/WTF/wtf/Platform.h:32,
+ from ../webkitgtk-2.4.8/Source/JavaScriptCore/config.h:30,
+ from ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:27:
+ ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp: In member function 'virtual int WebCore::Extensions3DOpenGLCommon::getGraphicsResetStatusARB()':
+ ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:144:31: error: expected unqualified-id before numeric constant
+ return GraphicsContext3D::NO_ERROR;
+
+ because NO_ERROR is also a macro defined in Windows headers. Ouch.
+ Also expand this to the (PLATFORM(GTK) && OS(WINDOWS)) combination,
+ in addition to the workaround for VERSION already present there.
+
+2015-04-15 Руслан Ижбулатов <lrn1986@gmail.com>
+
</ins><span class="cx"> [W32] Fails to build - missing references to OpenGL context functions
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143769
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (184544 => 184545)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2015-05-19 06:05:16 UTC (rev 184544)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2015-05-19 06:15:12 UTC (rev 184545)
</span><span class="lines">@@ -85,6 +85,14 @@
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(WIN) || (PLATFORM(GTK) && OS(WINDOWS))
+#undef NO_ERROR
+#endif
+
+#if PLATFORM(GTK)
+#undef VERSION
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> const double secondsBetweenRestoreAttempts = 1.0;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsGraphicsContext3Dh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/GraphicsContext3D.h (184544 => 184545)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/GraphicsContext3D.h 2015-05-19 06:05:16 UTC (rev 184544)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/GraphicsContext3D.h 2015-05-19 06:15:12 UTC (rev 184545)
</span><span class="lines">@@ -43,9 +43,11 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // FIXME: Find a better way to avoid the name confliction for NO_ERROR.
</span><del>-#if PLATFORM(WIN)
</del><ins>+#if PLATFORM(WIN) || (PLATFORM(GTK) && OS(WINDOWS))
</ins><span class="cx"> #undef NO_ERROR
</span><del>-#elif PLATFORM(GTK)
</del><ins>+#endif
+
+#if PLATFORM(GTK)
</ins><span class="cx"> // This define is from the X11 headers, but it's used below, so we must undefine it.
</span><span class="cx"> #undef VERSION
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (184544 => 184545)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2015-05-19 06:05:16 UTC (rev 184544)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2015-05-19 06:15:12 UTC (rev 184545)
</span><span class="lines">@@ -49,6 +49,10 @@
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(WIN) || (PLATFORM(GTK) && OS(WINDOWS))
+#undef NO_ERROR
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> Extensions3DOpenGLCommon::Extensions3DOpenGLCommon(GraphicsContext3D* context)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicstexmapTextureMapperShaderProgramcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp (184544 => 184545)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp 2015-05-19 06:05:16 UTC (rev 184544)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp 2015-05-19 06:15:12 UTC (rev 184545)
</span><span class="lines">@@ -29,6 +29,10 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(WIN) || (PLATFORM(GTK) && OS(WINDOWS))
+#undef NO_ERROR
+#endif
+
</ins><span class="cx"> #define STRINGIFY(...) #__VA_ARGS__
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre>
</div>
</div>
</body>
</html>