Diff
Modified: trunk/Source/WTF/wtf/text/AtomString.cpp (293700 => 293701)
--- trunk/Source/WTF/wtf/text/AtomString.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WTF/wtf/text/AtomString.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -136,9 +136,6 @@
WTF_EXPORT_PRIVATE LazyNeverDestroyed<const AtomString> nullAtomData;
WTF_EXPORT_PRIVATE LazyNeverDestroyed<const AtomString> emptyAtomData;
-WTF_EXPORT_PRIVATE MainThreadLazyNeverDestroyed<const AtomString> starAtomData;
-WTF_EXPORT_PRIVATE MainThreadLazyNeverDestroyed<const AtomString> xmlAtomData;
-WTF_EXPORT_PRIVATE MainThreadLazyNeverDestroyed<const AtomString> xmlnsAtomData;
void AtomString::init()
{
@@ -149,16 +146,6 @@
nullAtomData.construct();
emptyAtomData.construct(AtomString::fromLatin1(""));
-
- // When starting WebThread via StartWebThread function, we have special period between the prologue of StartWebThread and spawning WebThread actually.
- // In this period, `isMainThread()` returns false even if this is called on the main thread since WebThread is now enabled and we are not taking a WebThread lock.
- // This causes assertion hits in MainThreadLazyNeverDestroyed initialization only in WebThread platforms.
- // We bypass this by using constructWithoutAccessCheck, which intentionally skips `isMainThread()` check for construction.
- // In non WebThread environment, we do not lose the assertion coverage since we already have ASSERT(isUIThread()). And ASSERT(isUIThread()) ensures that this
- // is called in system main thread in WebThread platforms.
- starAtomData.constructWithoutAccessCheck("*"_s);
- xmlAtomData.constructWithoutAccessCheck("xml"_s);
- xmlnsAtomData.constructWithoutAccessCheck("xmlns"_s);
});
}
Modified: trunk/Source/WTF/wtf/text/AtomString.h (293700 => 293701)
--- trunk/Source/WTF/wtf/text/AtomString.h 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WTF/wtf/text/AtomString.h 2022-05-03 00:01:12 UTC (rev 293701)
@@ -289,17 +289,8 @@
extern WTF_EXPORT_PRIVATE LazyNeverDestroyed<const AtomString> nullAtomData;
extern WTF_EXPORT_PRIVATE LazyNeverDestroyed<const AtomString> emptyAtomData;
-// Define external global variables for the commonly used atom strings.
-// These are only usable from the main thread.
-extern WTF_EXPORT_PRIVATE MainThreadLazyNeverDestroyed<const AtomString> starAtomData;
-extern WTF_EXPORT_PRIVATE MainThreadLazyNeverDestroyed<const AtomString> xmlAtomData;
-extern WTF_EXPORT_PRIVATE MainThreadLazyNeverDestroyed<const AtomString> xmlnsAtomData;
-
inline const AtomString& nullAtom() { return nullAtomData.get(); }
inline const AtomString& emptyAtom() { return emptyAtomData.get(); }
-inline const AtomString& starAtom() { return starAtomData.get(); }
-inline const AtomString& xmlAtom() { return xmlAtomData.get(); }
-inline const AtomString& xmlnsAtom() { return xmlnsAtomData.get(); }
inline AtomString::AtomString(ASCIILiteral literal)
: m_string(literal.length() ? AtomStringImpl::add(literal.characters(), literal.length()) : Ref { *emptyAtom().impl() })
@@ -383,8 +374,5 @@
using WTF::AtomString;
using WTF::nullAtom;
using WTF::emptyAtom;
-using WTF::starAtom;
-using WTF::xmlAtom;
-using WTF::xmlnsAtom;
#include <wtf/text/StringConcatenate.h>
Modified: trunk/Source/WebCore/css/CSSPageRule.cpp (293700 => 293701)
--- trunk/Source/WebCore/css/CSSPageRule.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/css/CSSPageRule.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -25,6 +25,7 @@
#include "CSSParser.h"
#include "CSSSelector.h"
#include "CSSStyleSheet.h"
+#include "CommonAtomStrings.h"
#include "Document.h"
#include "PropertySetCSSStyleDeclaration.h"
#include "StyleProperties.h"
Modified: trunk/Source/WebCore/css/CSSSelector.cpp (293700 => 293701)
--- trunk/Source/WebCore/css/CSSSelector.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/css/CSSSelector.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -28,6 +28,7 @@
#include "CSSMarkup.h"
#include "CSSSelectorList.h"
+#include "CommonAtomStrings.h"
#include "HTMLNames.h"
#include "RuntimeEnabledFeatures.h"
#include "SelectorPseudoTypeMap.h"
Modified: trunk/Source/WebCore/css/CSSSelectorList.cpp (293700 => 293701)
--- trunk/Source/WebCore/css/CSSSelectorList.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/css/CSSSelectorList.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -28,6 +28,7 @@
#include "CSSSelectorList.h"
#include "CSSParserSelector.h"
+#include "CommonAtomStrings.h"
#include <wtf/text/StringBuilder.h>
namespace WebCore {
Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (293700 => 293701)
--- trunk/Source/WebCore/css/SelectorChecker.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -31,6 +31,7 @@
#include "CSSSelector.h"
#include "CSSSelectorList.h"
+#include "CommonAtomStrings.h"
#include "Document.h"
#include "ElementInlines.h"
#include "ElementRareData.h"
Modified: trunk/Source/WebCore/css/SelectorFilter.cpp (293700 => 293701)
--- trunk/Source/WebCore/css/SelectorFilter.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/css/SelectorFilter.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -30,6 +30,7 @@
#include "SelectorFilter.h"
#include "CSSSelector.h"
+#include "CommonAtomStrings.h"
#include "ElementInlines.h"
#include "HTMLNames.h"
#include "ShadowRoot.h"
Modified: trunk/Source/WebCore/css/StyleSheetContents.cpp (293700 => 293701)
--- trunk/Source/WebCore/css/StyleSheetContents.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/css/StyleSheetContents.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -26,6 +26,7 @@
#include "CSSStyleSheet.h"
#include "CachePolicy.h"
#include "CachedCSSStyleSheet.h"
+#include "CommonAtomStrings.h"
#include "Document.h"
#include "Frame.h"
#include "FrameLoader.h"
Modified: trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp (293700 => 293701)
--- trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -30,6 +30,7 @@
#include "config.h"
#include "CSSSelectorParser.h"
+#include "CommonAtomStrings.h"
#include "RuntimeEnabledFeatures.h"
#include <memory>
#include <wtf/OptionSet.h>
Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (293700 => 293701)
--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -31,6 +31,7 @@
#include "CSSSelector.h"
#include "CSSSelectorList.h"
+#include "CommonAtomStrings.h"
#include "DOMJITHelpers.h"
#include "Element.h"
#include "ElementData.h"
Modified: trunk/Source/WebCore/dom/Attr.cpp (293700 => 293701)
--- trunk/Source/WebCore/dom/Attr.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/dom/Attr.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -24,6 +24,7 @@
#include "Attr.h"
#include "AttributeChangeInvalidation.h"
+#include "CommonAtomStrings.h"
#include "Document.h"
#include "ElementInlines.h"
#include "Event.h"
Modified: trunk/Source/WebCore/dom/Attribute.h (293700 => 293701)
--- trunk/Source/WebCore/dom/Attribute.h 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/dom/Attribute.h 2022-05-03 00:01:12 UTC (rev 293701)
@@ -24,6 +24,7 @@
#pragma once
+#include "CommonAtomStrings.h"
#include "QualifiedName.h"
#include <wtf/Hasher.h>
Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (293700 => 293701)
--- trunk/Source/WebCore/dom/ContainerNode.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -28,6 +28,7 @@
#include "ChildChangeInvalidation.h"
#include "ChildListMutationScope.h"
#include "ClassCollection.h"
+#include "CommonAtomStrings.h"
#include "CommonVM.h"
#include "ContainerNodeAlgorithms.h"
#include "Editor.h"
Modified: trunk/Source/WebCore/dom/Node.cpp (293700 => 293701)
--- trunk/Source/WebCore/dom/Node.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/dom/Node.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -28,6 +28,7 @@
#include "AXObjectCache.h"
#include "Attr.h"
#include "ChildListMutationScope.h"
+#include "CommonAtomStrings.h"
#include "CommonVM.h"
#include "ComposedTreeAncestorIterator.h"
#include "ContainerNodeAlgorithms.h"
Modified: trunk/Source/WebCore/dom/NodeRareData.h (293700 => 293701)
--- trunk/Source/WebCore/dom/NodeRareData.h 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/dom/NodeRareData.h 2022-05-03 00:01:12 UTC (rev 293701)
@@ -22,6 +22,7 @@
#pragma once
#include "ChildNodeList.h"
+#include "CommonAtomStrings.h"
#include "HTMLCollection.h"
#include "MutationObserverRegistration.h"
#include "QualifiedName.h"
Modified: trunk/Source/WebCore/dom/QualifiedName.cpp (293700 => 293701)
--- trunk/Source/WebCore/dom/QualifiedName.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/dom/QualifiedName.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -20,6 +20,7 @@
#include "config.h"
#include "QualifiedName.h"
+#include "CommonAtomStrings.h"
#include "QualifiedNameCache.h"
#include "ThreadGlobalData.h"
#include <wtf/Assertions.h>
Modified: trunk/Source/WebCore/dom/SelectorQuery.cpp (293700 => 293701)
--- trunk/Source/WebCore/dom/SelectorQuery.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/dom/SelectorQuery.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -28,6 +28,7 @@
#include "SelectorQuery.h"
#include "CSSParser.h"
+#include "CommonAtomStrings.h"
#include "ElementIterator.h"
#include "HTMLNames.h"
#include "SelectorChecker.h"
Modified: trunk/Source/WebCore/dom/TagCollection.h (293700 => 293701)
--- trunk/Source/WebCore/dom/TagCollection.h 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/dom/TagCollection.h 2022-05-03 00:01:12 UTC (rev 293701)
@@ -24,6 +24,7 @@
#pragma once
#include "CachedHTMLCollection.h"
+#include "CommonAtomStrings.h"
#include <wtf/text/AtomString.h>
namespace WebCore {
Modified: trunk/Source/WebCore/editing/MarkupAccumulator.cpp (293700 => 293701)
--- trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -29,6 +29,7 @@
#include "CDATASection.h"
#include "Comment.h"
+#include "CommonAtomStrings.h"
#include "DocumentFragment.h"
#include "DocumentType.h"
#include "Editor.h"
Modified: trunk/Source/WebCore/html/LabelableElement.cpp (293700 => 293701)
--- trunk/Source/WebCore/html/LabelableElement.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/html/LabelableElement.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -25,6 +25,7 @@
#include "config.h"
#include "LabelableElement.h"
+#include "CommonAtomStrings.h"
#include "LabelsNodeList.h"
#include "NodeRareData.h"
#include "RenderStyle.h"
Modified: trunk/Source/WebCore/html/LabelsNodeList.cpp (293700 => 293701)
--- trunk/Source/WebCore/html/LabelsNodeList.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/html/LabelsNodeList.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -24,6 +24,7 @@
#include "config.h"
#include "LabelsNodeList.h"
+#include "CommonAtomStrings.h"
#include "HTMLLabelElement.h"
#include "HTMLNames.h"
#include "LabelableElement.h"
Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (293700 => 293701)
--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -27,6 +27,7 @@
#include "config.h"
#include "HTMLTreeBuilder.h"
+#include "CommonAtomStrings.h"
#include "DocumentFragment.h"
#include "HTMLDocument.h"
#include "HTMLDocumentParser.h"
Modified: trunk/Source/WebCore/platform/CommonAtomStrings.h (293700 => 293701)
--- trunk/Source/WebCore/platform/CommonAtomStrings.h 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/platform/CommonAtomStrings.h 2022-05-03 00:01:12 UTC (rev 293701)
@@ -47,6 +47,7 @@
macro(plaintextOnly, "plaintext-only") \
macro(reset, "reset") \
macro(search, "search") \
+ macro(star, "*") \
macro(submit, "submit") \
macro(subtitles, "subtitles") \
macro(tel, "tel") \
@@ -53,7 +54,9 @@
macro(text, "text") \
macro(textPlainContentType, "text/plain") \
macro(true, "true") \
- macro(url, "url")
+ macro(url, "url") \
+ macro(xml, "xml") \
+ macro(xmlns, "xmlns")
#define DECLARE_COMMON_ATOM(atomName, atomValue) \
Modified: trunk/Source/WebCore/style/PageRuleCollector.cpp (293700 => 293701)
--- trunk/Source/WebCore/style/PageRuleCollector.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/style/PageRuleCollector.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -29,6 +29,7 @@
#include "config.h"
#include "PageRuleCollector.h"
+#include "CommonAtomStrings.h"
#include "StyleProperties.h"
#include "StyleRule.h"
#include "UserAgentStyle.h"
Modified: trunk/Source/WebCore/style/RuleData.cpp (293700 => 293701)
--- trunk/Source/WebCore/style/RuleData.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/style/RuleData.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -33,6 +33,7 @@
#include "CSSKeyframesRule.h"
#include "CSSSelector.h"
#include "CSSSelectorList.h"
+#include "CommonAtomStrings.h"
#include "HTMLNames.h"
#include "MediaQueryEvaluator.h"
#include "SecurityOrigin.h"
Modified: trunk/Source/WebCore/style/RuleFeature.h (293700 => 293701)
--- trunk/Source/WebCore/style/RuleFeature.h 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/style/RuleFeature.h 2022-05-03 00:01:12 UTC (rev 293701)
@@ -22,6 +22,7 @@
#pragma once
#include "CSSSelector.h"
+#include "CommonAtomStrings.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
Modified: trunk/Source/WebCore/style/RuleSet.cpp (293700 => 293701)
--- trunk/Source/WebCore/style/RuleSet.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/style/RuleSet.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -33,6 +33,7 @@
#include "CSSKeyframesRule.h"
#include "CSSSelector.h"
#include "CSSSelectorList.h"
+#include "CommonAtomStrings.h"
#include "HTMLNames.h"
#include "MediaQueryEvaluator.h"
#include "RuleSetBuilder.h"
Modified: trunk/Source/WebCore/xml/NativeXPathNSResolver.cpp (293700 => 293701)
--- trunk/Source/WebCore/xml/NativeXPathNSResolver.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/xml/NativeXPathNSResolver.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -26,6 +26,7 @@
#include "config.h"
#include "NativeXPathNSResolver.h"
+#include "CommonAtomStrings.h"
#include "Node.h"
#include "XMLNames.h"
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebCore/xml/XPathStep.cpp (293700 => 293701)
--- trunk/Source/WebCore/xml/XPathStep.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/xml/XPathStep.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -29,6 +29,7 @@
#include "XPathStep.h"
#include "Attr.h"
+#include "CommonAtomStrings.h"
#include "Document.h"
#include "ElementInlines.h"
#include "HTMLElement.h"
Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp (293700 => 293701)
--- trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -28,6 +28,7 @@
#include "CDATASection.h"
#include "Comment.h"
+#include "CommonAtomStrings.h"
#include "Document.h"
#include "DocumentFragment.h"
#include "DocumentType.h"
Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (293700 => 293701)
--- trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2022-05-02 23:33:04 UTC (rev 293700)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2022-05-03 00:01:12 UTC (rev 293701)
@@ -31,6 +31,7 @@
#include "CDATASection.h"
#include "Comment.h"
#include "CachedResourceLoader.h"
+#include "CommonAtomStrings.h"
#include "Document.h"
#include "DocumentFragment.h"
#include "DocumentType.h"