Changeset 207079 in webkit

Timestamp:

Oct 11, 2016 3:36:43 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r206061 - ASSERTION FAILED: The string being removed is atomic in the string table of an other thread! iterator != atomicStringTable.end() at Source/WTF/wtf/text/AtomicStringImpl.cpp(453)
​https://bugs.webkit.org/show_bug.cgi?id=161800

Reviewed by Žan Doberšek.

Speculative fix. These strings are created as static objects on a secondary thread, but all
static objects are destroyed in exit handlers on the main thread, and AtomicStrings must
always be destroyed on the same thread they are created.

• platform/graphics/texmap/TextureMapperShaderProgram.h:

Location:

releases/WebKitGTK/webkit-2.14/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapperShaderProgram.h (modified) (2 diffs)

releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-16  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        ASSERTION FAILED: The string being removed is atomic in the string table of an other thread! iterator != atomicStringTable.end() at Source/WTF/wtf/text/AtomicStringImpl.cpp(453)
+        https://bugs.webkit.org/show_bug.cgi?id=161800
+
+        Reviewed by Žan Doberšek.
+
+        Speculative fix. These strings are created as static objects on a secondary thread, but all
+        static objects are destroyed in exit handlers on the main thread, and AtomicStrings must
+        always be destroyed on the same thread they are created.
+
+        * platform/graphics/texmap/TextureMapperShaderProgram.h:
+
 2016-09-15  Zalan Bujtas  <zalan@apple.com>
 

releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h

@@ -27 +27 @@
 #include "TransformationMatrix.h"
 #include <wtf/HashMap.h>
+#include <wtf/NeverDestroyed.h>
 #include <wtf/Ref.h>
 #include <wtf/text/AtomicStringHash.h>
@@ -32 +33 @@
 namespace WebCore {
 
-#define TEXMAP_DECLARE_VARIABLE(Accessor, Name, Type) GC3Duint Accessor##Location() { static const AtomicString name(Name); return getLocation(name, Type); }
+#define TEXMAP_DECLARE_VARIABLE(Accessor, Name, Type) \
+    GC3Duint Accessor##Location() { \
+        static NeverDestroyed<const AtomicString> name(Name, AtomicString::ConstructFromLiteral); \
+        return getLocation(name.get(), Type); \
+    }
+
 #define TEXMAP_DECLARE_UNIFORM(Accessor) TEXMAP_DECLARE_VARIABLE(Accessor, "u_"#Accessor, UniformVariable)
 #define TEXMAP_DECLARE_ATTRIBUTE(Accessor) TEXMAP_DECLARE_VARIABLE(Accessor, "a_"#Accessor, AttribVariable)