Changeset 207079 in webkit
- Timestamp:
- Oct 11, 2016 3:36:43 AM (8 years ago)
- Location:
- releases/WebKitGTK/webkit-2.14/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog
r207078 r207079 1 2016-09-16 Michael Catanzaro <mcatanzaro@igalia.com> 2 3 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) 4 https://bugs.webkit.org/show_bug.cgi?id=161800 5 6 Reviewed by Žan Doberšek. 7 8 Speculative fix. These strings are created as static objects on a secondary thread, but all 9 static objects are destroyed in exit handlers on the main thread, and AtomicStrings must 10 always be destroyed on the same thread they are created. 11 12 * platform/graphics/texmap/TextureMapperShaderProgram.h: 13 1 14 2016-09-15 Zalan Bujtas <zalan@apple.com> 2 15 -
releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h
r200451 r207079 27 27 #include "TransformationMatrix.h" 28 28 #include <wtf/HashMap.h> 29 #include <wtf/NeverDestroyed.h> 29 30 #include <wtf/Ref.h> 30 31 #include <wtf/text/AtomicStringHash.h> … … 32 33 namespace WebCore { 33 34 34 #define TEXMAP_DECLARE_VARIABLE(Accessor, Name, Type) GC3Duint Accessor##Location() { static const AtomicString name(Name); return getLocation(name, Type); } 35 #define TEXMAP_DECLARE_VARIABLE(Accessor, Name, Type) \ 36 GC3Duint Accessor##Location() { \ 37 static NeverDestroyed<const AtomicString> name(Name, AtomicString::ConstructFromLiteral); \ 38 return getLocation(name.get(), Type); \ 39 } 40 35 41 #define TEXMAP_DECLARE_UNIFORM(Accessor) TEXMAP_DECLARE_VARIABLE(Accessor, "u_"#Accessor, UniformVariable) 36 42 #define TEXMAP_DECLARE_ATTRIBUTE(Accessor) TEXMAP_DECLARE_VARIABLE(Accessor, "a_"#Accessor, AttribVariable)
Note: See TracChangeset
for help on using the changeset viewer.