diff options
Diffstat (limited to 'Source/WebCore/bridge/IdentifierRep.cpp')
| -rw-r--r-- | Source/WebCore/bridge/IdentifierRep.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/WebCore/bridge/IdentifierRep.cpp b/Source/WebCore/bridge/IdentifierRep.cpp index 3af7a37fa..303770100 100644 --- a/Source/WebCore/bridge/IdentifierRep.cpp +++ b/Source/WebCore/bridge/IdentifierRep.cpp @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -28,6 +28,7 @@ #include "JSDOMBinding.h" #include <wtf/HashMap.h> +#include <wtf/NeverDestroyed.h> #include <wtf/StdLibExtras.h> #include <wtf/text/WTFString.h> @@ -39,7 +40,7 @@ typedef HashSet<IdentifierRep*> IdentifierSet; static IdentifierSet& identifierSet() { - DEFINE_STATIC_LOCAL(IdentifierSet, identifierSet, ()); + static NeverDestroyed<IdentifierSet> identifierSet; return identifierSet; } @@ -47,7 +48,7 @@ typedef HashMap<int, IdentifierRep*> IntIdentifierMap; static IntIdentifierMap& intIdentifierMap() { - DEFINE_STATIC_LOCAL(IntIdentifierMap, intIdentifierMap, ()); + static NeverDestroyed<IntIdentifierMap> intIdentifierMap; return intIdentifierMap; } @@ -81,7 +82,7 @@ typedef HashMap<RefPtr<StringImpl>, IdentifierRep*> StringIdentifierMap; static StringIdentifierMap& stringIdentifierMap() { - DEFINE_STATIC_LOCAL(StringIdentifierMap, stringIdentifierMap, ()); + static NeverDestroyed<StringIdentifierMap> stringIdentifierMap; return stringIdentifierMap; } |