<!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>[189580] 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/189580">189580</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-10 11:47:56 -0700 (Thu, 10 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Static variables in GraphicsContext3DOpenGLCommon should be avoided because of the race condition
https://bugs.webkit.org/show_bug.cgi?id=148957
Patch by Jinyoung Hur <hur.ims@navercorp.com> on 2015-09-10
Reviewed by Dean Jackson.
There is no guarantee that only one thread calls GraphicsContext3D::compileShader() at a time so it would be
better to use a thread local storage variable rather than use a static variable.
No new tests. No behavioural changes.
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::getCurrentNameHashMapForShader):
(WebCore::setCurrentNameHashMapForShader):
(WebCore::nameHashForShader):
(WebCore::GraphicsContext3D::compileShader):
(WebCore::GraphicsContext3D::mappedSymbolName):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189579 => 189580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-10 18:15:45 UTC (rev 189579)
+++ trunk/Source/WebCore/ChangeLog 2015-09-10 18:47:56 UTC (rev 189580)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-09-10 Jinyoung Hur <hur.ims@navercorp.com>
+
+ Static variables in GraphicsContext3DOpenGLCommon should be avoided because of the race condition
+ https://bugs.webkit.org/show_bug.cgi?id=148957
+
+ Reviewed by Dean Jackson.
+
+ There is no guarantee that only one thread calls GraphicsContext3D::compileShader() at a time so it would be
+ better to use a thread local storage variable rather than use a static variable.
+
+ No new tests. No behavioural changes.
+
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ (WebCore::getCurrentNameHashMapForShader):
+ (WebCore::setCurrentNameHashMapForShader):
+ (WebCore::nameHashForShader):
+ (WebCore::GraphicsContext3D::compileShader):
+ (WebCore::GraphicsContext3D::mappedSymbolName):
+
</ins><span class="cx"> 2015-09-10 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Node.appendChild(null) / replaceChild(null, null) / removeChild(null) / insertBefore(null, ref) should throw a TypeError
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (189579 => 189580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2015-09-10 18:15:45 UTC (rev 189579)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2015-09-10 18:47:56 UTC (rev 189580)
</span><span class="lines">@@ -79,8 +79,22 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static ShaderNameHash* currentNameHashMapForShader = nullptr;
</del><ins>+static ThreadSpecific<ShaderNameHash*>& getCurrentNameHashMapForShader()
+{
+ static std::once_flag onceFlag;
+ static ThreadSpecific<ShaderNameHash*>* sharedNameHash;
+ std::call_once(onceFlag, [] {
+ sharedNameHash = new ThreadSpecific<ShaderNameHash*>;
+ });
</ins><span class="cx">
</span><ins>+ return *sharedNameHash;
+}
+
+static void setCurrentNameHashMapForShader(ShaderNameHash* shaderNameHash)
+{
+ *getCurrentNameHashMapForShader() = shaderNameHash;
+}
+
</ins><span class="cx"> // Hash function used by the ANGLE translator/compiler to do
</span><span class="cx"> // symbol name mangling. Since this is a static method, before
</span><span class="cx"> // calling compileShader we set currentNameHashMapForShader
</span><span class="lines">@@ -94,11 +108,10 @@
</span><span class="cx"> CString nameAsCString = CString(name);
</span><span class="cx">
</span><span class="cx"> // Look up name in our local map.
</span><del>- if (currentNameHashMapForShader) {
- ShaderNameHash::iterator result = currentNameHashMapForShader->find(nameAsCString);
- if (result != currentNameHashMapForShader->end())
- return result->value;
- }
</del><ins>+ ShaderNameHash*& currentNameHashMapForShader = *getCurrentNameHashMapForShader();
+ ShaderNameHash::iterator findResult = currentNameHashMapForShader->find(nameAsCString);
+ if (findResult != currentNameHashMapForShader->end())
+ return findResult->value;
</ins><span class="cx">
</span><span class="cx"> unsigned hashValue = nameAsCString.hash();
</span><span class="cx">
</span><span class="lines">@@ -568,14 +581,14 @@
</span><span class="cx">
</span><span class="cx"> if (!nameHashMapForShaders)
</span><span class="cx"> nameHashMapForShaders = std::make_unique<ShaderNameHash>();
</span><del>- currentNameHashMapForShader = nameHashMapForShaders.get();
</del><ins>+ setCurrentNameHashMapForShader(nameHashMapForShaders.get());
</ins><span class="cx"> m_compiler.setResources(ANGLEResources);
</span><span class="cx">
</span><span class="cx"> String translatedShaderSource = m_extensions->getTranslatedShaderSourceANGLE(shader);
</span><span class="cx">
</span><span class="cx"> ANGLEResources.HashFunction = previousHashFunction;
</span><span class="cx"> m_compiler.setResources(ANGLEResources);
</span><del>- currentNameHashMapForShader = nullptr;
</del><ins>+ setCurrentNameHashMapForShader(nullptr);
</ins><span class="cx">
</span><span class="cx"> if (!translatedShaderSource.length())
</span><span class="cx"> return;
</span><span class="lines">@@ -877,11 +890,11 @@
</span><span class="cx"> // and aren't even required to be used in any shader program.
</span><span class="cx"> if (!nameHashMapForShaders)
</span><span class="cx"> nameHashMapForShaders = std::make_unique<ShaderNameHash>();
</span><del>- currentNameHashMapForShader = nameHashMapForShaders.get();
</del><ins>+ setCurrentNameHashMapForShader(nameHashMapForShaders.get());
</ins><span class="cx">
</span><span class="cx"> String generatedName = generateHashedName(name);
</span><span class="cx">
</span><del>- currentNameHashMapForShader = nullptr;
</del><ins>+ setCurrentNameHashMapForShader(nullptr);
</ins><span class="cx">
</span><span class="cx"> m_possiblyUnusedAttributeMap.set(generatedName, name);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>