WebKit Bugzilla
Attachment 372205 Details for
Bug 195276
: Rename AtomicString to AtomString
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-195276-20190615175123.patch (text/plain), 2.13 MB, created by
Darin Adler
on 2019-06-15 17:51:28 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Darin Adler
Created:
2019-06-15 17:51:28 PDT
Size:
2.13 MB
patch
obsolete
>Subversion Revision: 246468 >diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog >index b69160bbd2a5852e0875ad425ad3eb33c3e06244..c77202d0dd7dfbe54a50c508c86d2e69b4cb0f4e 100644 >--- a/Source/JavaScriptCore/ChangeLog >+++ b/Source/JavaScriptCore/ChangeLog >@@ -1,3 +1,12 @@ >+2019-06-15 Darin Adler <darin@apple.com> >+ >+ Rename AtomicString to AtomString >+ https://bugs.webkit.org/show_bug.cgi?id=195276 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * many files: Let do-webcore-rename do the renaming. >+ > 2019-06-14 Keith Miller <keith_miller@apple.com> > > Restore PAC based cage. >diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog >index edf2cefd4c57477779414273caccbe94f929a621..04095687771800e7bf2f17cf1efc8ba1e3139068 100644 >--- a/Source/WTF/ChangeLog >+++ b/Source/WTF/ChangeLog >@@ -1,3 +1,16 @@ >+2019-06-15 Darin Adler <darin@apple.com> >+ >+ Rename AtomicString to AtomString >+ https://bugs.webkit.org/show_bug.cgi?id=195276 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * many files: Let do-webcore-rename do the renaming. >+ >+ * wtf/text/AtomString.h: After renaming, added AtomicString as a synonym for >+ now; helps smooth things over with a tiny bit of Apple internal software so >+ we don't have to do this all at once. Can remove it soon. >+ > 2019-06-12 Antoine Quint <graouts@apple.com> > > Show the web page URL when sharing an AR model >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 5c19611fdbdb840c871f874ae474657a0f2fd5a2..2bbdfb64d9d8cf1eeed515023f8e032b57be4031 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,12 @@ >+2019-06-15 Darin Adler <darin@apple.com> >+ >+ Rename AtomicString to AtomString >+ https://bugs.webkit.org/show_bug.cgi?id=195276 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * many files: Let do-webcore-rename do the renaming. >+ > 2019-06-15 Zalan Bujtas <zalan@apple.com> > > [LFC][BFC] Fix available width for non-floating positioned float avoiders. >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 93429247ceb003a0fcd79785fff54873000eb6a3..89236675f77fdbc25aa9928917346096908d56ed 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,12 @@ >+2019-06-15 Darin Adler <darin@apple.com> >+ >+ Rename AtomicString to AtomString >+ https://bugs.webkit.org/show_bug.cgi?id=195276 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * many files: Let do-webcore-rename do the renaming. >+ > 2019-06-15 Ludovico de Nittis <ludovico.denittis@collabora.com> > > [GTK] Stop accessing GdkEvent fields when possible >diff --git a/Source/WebKitLegacy/ios/ChangeLog b/Source/WebKitLegacy/ios/ChangeLog >index 125ddda09e687407f16db66f6e199ced13ec0607..f6328242d5558ec49920e93ed43fdeef298f1493 100644 >--- a/Source/WebKitLegacy/ios/ChangeLog >+++ b/Source/WebKitLegacy/ios/ChangeLog >@@ -1,3 +1,12 @@ >+2019-06-15 Darin Adler <darin@apple.com> >+ >+ Rename AtomicString to AtomString >+ https://bugs.webkit.org/show_bug.cgi?id=195276 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * many files: Let do-webcore-rename do the renaming. >+ > 2019-04-17 Brady Eidson <beidson@apple.com> > > Link clicks in PDFs shouldn't send referrer headers. >diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog >index af518c6014737b0559e98710fae7eacc938e53ea..216844ba94121765aa35e4974d81c357bd3d351f 100644 >--- a/Source/WebKitLegacy/mac/ChangeLog >+++ b/Source/WebKitLegacy/mac/ChangeLog >@@ -1,3 +1,12 @@ >+2019-06-15 Darin Adler <darin@apple.com> >+ >+ Rename AtomicString to AtomString >+ https://bugs.webkit.org/show_bug.cgi?id=195276 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * many files: Let do-webcore-rename do the renaming. >+ > 2019-06-14 Megan Gardner <megan_gardner@apple.com> > > Move Synthetic Editing Commands to behind an experimental feature flag >diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog >index fa31067f6bcaaabd461039f72e87e5e73641efd8..23a7b113de972f9e98cdc7cf7146bc214af17024 100644 >--- a/Source/WebKitLegacy/win/ChangeLog >+++ b/Source/WebKitLegacy/win/ChangeLog >@@ -1,3 +1,12 @@ >+2019-06-15 Darin Adler <darin@apple.com> >+ >+ Rename AtomicString to AtomString >+ https://bugs.webkit.org/show_bug.cgi?id=195276 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * many files: Let do-webcore-rename do the renaming. >+ > 2019-05-31 Don Olmstead <don.olmstead@sony.com> > > [CMake] Add WebKit::WTF target >diff --git a/Source/JavaScriptCore/API/JSClassRef.cpp b/Source/JavaScriptCore/API/JSClassRef.cpp >index d4583d8e16515d614a59c9acc383a3cc111f60ad..f1c9d5702a8aa69044dfb295b471fcfcbc890b6b 100644 >--- a/Source/JavaScriptCore/API/JSClassRef.cpp >+++ b/Source/JavaScriptCore/API/JSClassRef.cpp >@@ -85,19 +85,19 @@ OpaqueJSClass::OpaqueJSClass(const JSClassDefinition* definition, OpaqueJSClass* > OpaqueJSClass::~OpaqueJSClass() > { > // The empty string is shared across threads & is an identifier, in all other cases we should have done a deep copy in className(), below. >- ASSERT(!m_className.length() || !m_className.impl()->isAtomic()); >+ ASSERT(!m_className.length() || !m_className.impl()->isAtom()); > > #ifndef NDEBUG > if (m_staticValues) { > OpaqueJSClassStaticValuesTable::const_iterator end = m_staticValues->end(); > for (OpaqueJSClassStaticValuesTable::const_iterator it = m_staticValues->begin(); it != end; ++it) >- ASSERT(!it->key->isAtomic()); >+ ASSERT(!it->key->isAtom()); > } > > if (m_staticFunctions) { > OpaqueJSClassStaticFunctionsTable::const_iterator end = m_staticFunctions->end(); > for (OpaqueJSClassStaticFunctionsTable::const_iterator it = m_staticFunctions->begin(); it != end; ++it) >- ASSERT(!it->key->isAtomic()); >+ ASSERT(!it->key->isAtom()); > } > #endif > >@@ -131,7 +131,7 @@ OpaqueJSClassContextData::OpaqueJSClassContextData(JSC::VM&, OpaqueJSClass* jsCl > staticValues = std::make_unique<OpaqueJSClassStaticValuesTable>(); > OpaqueJSClassStaticValuesTable::const_iterator end = jsClass->m_staticValues->end(); > for (OpaqueJSClassStaticValuesTable::const_iterator it = jsClass->m_staticValues->begin(); it != end; ++it) { >- ASSERT(!it->key->isAtomic()); >+ ASSERT(!it->key->isAtom()); > String valueName = it->key->isolatedCopy(); > staticValues->add(valueName.impl(), std::make_unique<StaticValueEntry>(it->value->getProperty, it->value->setProperty, it->value->attributes, valueName)); > } >@@ -141,7 +141,7 @@ OpaqueJSClassContextData::OpaqueJSClassContextData(JSC::VM&, OpaqueJSClass* jsCl > staticFunctions = std::make_unique<OpaqueJSClassStaticFunctionsTable>(); > OpaqueJSClassStaticFunctionsTable::const_iterator end = jsClass->m_staticFunctions->end(); > for (OpaqueJSClassStaticFunctionsTable::const_iterator it = jsClass->m_staticFunctions->begin(); it != end; ++it) { >- ASSERT(!it->key->isAtomic()); >+ ASSERT(!it->key->isAtom()); > staticFunctions->add(it->key->isolatedCopy(), std::make_unique<StaticFunctionEntry>(it->value->callAsFunction, it->value->attributes)); > } > } >@@ -157,7 +157,7 @@ OpaqueJSClassContextData& OpaqueJSClass::contextData(ExecState* exec) > > String OpaqueJSClass::className() > { >- // Make a deep copy, so that the caller has no chance to put the original into AtomicStringTable. >+ // Make a deep copy, so that the caller has no chance to put the original into AtomStringTable. > return m_className.isolatedCopy(); > } > >diff --git a/Source/JavaScriptCore/API/JSClassRef.h b/Source/JavaScriptCore/API/JSClassRef.h >index 90c4f539005c82b0e23ab91207699aea4a039a89..0dd0dca54c043895e9e03badb9015fbaef8b29b8 100644 >--- a/Source/JavaScriptCore/API/JSClassRef.h >+++ b/Source/JavaScriptCore/API/JSClassRef.h >@@ -121,7 +121,7 @@ private: > > OpaqueJSClassContextData& contextData(JSC::ExecState*); > >- // Strings in these data members should not be put into any AtomicStringTable. >+ // Strings in these data members should not be put into any AtomStringTable. > String m_className; > std::unique_ptr<OpaqueJSClassStaticValuesTable> m_staticValues; > std::unique_ptr<OpaqueJSClassStaticFunctionsTable> m_staticFunctions; >diff --git a/Source/JavaScriptCore/b3/B3AtomicValue.h b/Source/JavaScriptCore/b3/B3AtomicValue.h >index 085a9e194957b2476fb12f5db2c33d81cd762bbe..9f2b52d7a2761e8e416f8302a966fe07c70deb7f 100644 >--- a/Source/JavaScriptCore/b3/B3AtomicValue.h >+++ b/Source/JavaScriptCore/b3/B3AtomicValue.h >@@ -36,7 +36,7 @@ class JS_EXPORT_PRIVATE AtomicValue : public MemoryValue { > public: > static bool accepts(Kind kind) > { >- return isAtomic(kind.opcode()); >+ return isAtom(kind.opcode()); > } > > ~AtomicValue(); >diff --git a/Source/JavaScriptCore/b3/B3MemoryValue.h b/Source/JavaScriptCore/b3/B3MemoryValue.h >index aac382849666ac61db9da31eefd91bf3f2bd8b96..b998aedc93f77cc7138107a963a9977f6be74bfa 100644 >--- a/Source/JavaScriptCore/b3/B3MemoryValue.h >+++ b/Source/JavaScriptCore/b3/B3MemoryValue.h >@@ -74,7 +74,7 @@ public: > bool isLoad() const { return B3::isLoad(opcode()); } > > bool hasFence() const { return !!fenceRange(); } >- bool isExotic() const { return hasFence() || isAtomic(opcode()); } >+ bool isExotic() const { return hasFence() || isAtom(opcode()); } > > Type accessType() const; > Bank accessBank() const; >diff --git a/Source/JavaScriptCore/b3/B3Opcode.h b/Source/JavaScriptCore/b3/B3Opcode.h >index aadf39b4cd6d86a20c78bfb5a66dcae10e03dd1b..7aa6de35bf40246698f1529931a3fff829cf5674 100644 >--- a/Source/JavaScriptCore/b3/B3Opcode.h >+++ b/Source/JavaScriptCore/b3/B3Opcode.h >@@ -465,7 +465,7 @@ inline bool isLoadStore(Opcode opcode) > } > } > >-inline bool isAtomic(Opcode opcode) >+inline bool isAtom(Opcode opcode) > { > switch (opcode) { > case AtomicWeakCAS: >@@ -510,7 +510,7 @@ inline bool isAtomicXchg(Opcode opcode) > > inline bool isMemoryAccess(Opcode opcode) > { >- return isAtomic(opcode) || isLoadStore(opcode); >+ return isAtom(opcode) || isLoadStore(opcode); > } > > inline Opcode signExtendOpcode(Width width) >diff --git a/Source/JavaScriptCore/bytecode/SpeculatedType.cpp b/Source/JavaScriptCore/bytecode/SpeculatedType.cpp >index 24e54ef7e7d1050905deb3b472bd4a0e2dc737cd..701192f0e204e539013a109042c440333f7bd038 100644 >--- a/Source/JavaScriptCore/bytecode/SpeculatedType.cpp >+++ b/Source/JavaScriptCore/bytecode/SpeculatedType.cpp >@@ -494,7 +494,7 @@ SpeculatedType speculationFromCell(JSCell* cell) > if (cell->isString()) { > JSString* string = jsCast<JSString*>(cell); > if (const StringImpl* impl = string->tryGetValueImpl()) { >- if (impl->isAtomic()) >+ if (impl->isAtom()) > return SpecStringIdent; > } > return SpecString; >diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp >index abe4166c5b86e3220ae73a4a48118023f21f74ca..515b5983f6a1d5805d2fb481ecc0a97cd599d7b9 100644 >--- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp >+++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp >@@ -888,7 +888,7 @@ BytecodeGenerator::BytecodeGenerator(VM& vm, EvalNode* evalNode, UnlinkedEvalCod > Vector<Identifier, 0, UnsafeVectorOverflow> hoistedFunctions; > for (auto& entry : varDeclarations) { > ASSERT(entry.value.isVar()); >- ASSERT(entry.key->isAtomic() || entry.key->isSymbol()); >+ ASSERT(entry.key->isAtom() || entry.key->isSymbol()); > if (entry.value.isSloppyModeHoistingCandidate()) > hoistedFunctions.append(Identifier::fromUid(m_vm, entry.key.get())); > else >diff --git a/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h b/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h >index c6368ee848eddfddf9aea5e02a89f4004ac4b792..2e0d01d874b6596cf3eafa121c69a8221b8cc787 100644 >--- a/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h >+++ b/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h >@@ -3584,7 +3584,7 @@ bool AbstractInterpreter<AbstractStateType>::executeEffects(unsigned clobberLimi > if (constant.isString()) { > JSString* string = asString(constant); > const StringImpl* impl = string->tryGetValueImpl(); >- if (impl && impl->isAtomic()) >+ if (impl && impl->isAtom()) > m_state.setFoundConstants(true); > } > } >diff --git a/Source/JavaScriptCore/dfg/DFGAbstractValue.cpp b/Source/JavaScriptCore/dfg/DFGAbstractValue.cpp >index 1ca9b74e7162efc21082b686371ec3427a972927..19f93b70c104f58dcd142ceb3cdbac0adc8cdc2e 100644 >--- a/Source/JavaScriptCore/dfg/DFGAbstractValue.cpp >+++ b/Source/JavaScriptCore/dfg/DFGAbstractValue.cpp >@@ -379,7 +379,7 @@ void AbstractValue::filterValueByType() > > // We assume that the constant value can produce a narrower type at > // some point. For example, rope JSString produces SpecString, but >- // it produces SpecStringIdent once it is resolved to AtomicStringImpl. >+ // it produces SpecStringIdent once it is resolved to AtomStringImpl. > // We do not make this AbstractValue cleared, but clear the constant > // value if validation fails currently. > m_value = JSValue(); >diff --git a/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp b/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp >index 4a2f1420ef429ceda807876ba27e0abafd18dd36..62b79ffab3843c6ddc68f0880337fa9be25b091e 100644 >--- a/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp >+++ b/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp >@@ -323,7 +323,7 @@ private: > // However, a constant value propagated in DFG is not filtered. > // So here, we check the propagated value is actually an atomic string. > // And if it's not, we just ignore. >- if (impl->isAtomic()) >+ if (impl->isAtom()) > constantUid = static_cast<const UniquedStringImpl*>(impl); > } > } >@@ -675,7 +675,7 @@ private: > if (constant.isString()) { > JSString* string = asString(constant); > const StringImpl* impl = string->tryGetValueImpl(); >- if (impl && impl->isAtomic()) { >+ if (impl && impl->isAtom()) { > unsigned identifierNumber = m_graph.identifiers().ensure(const_cast<UniquedStringImpl*>(static_cast<const UniquedStringImpl*>(impl))); > node->convertToInById(identifierNumber); > changed = true; >diff --git a/Source/JavaScriptCore/dfg/DFGLazyJSValue.cpp b/Source/JavaScriptCore/dfg/DFGLazyJSValue.cpp >index 43bead62ff9be10d6e1af1617a97d96e091281e6..583ee5b3198b9dd7f26cf54b3a9af703df715f6f 100644 >--- a/Source/JavaScriptCore/dfg/DFGLazyJSValue.cpp >+++ b/Source/JavaScriptCore/dfg/DFGLazyJSValue.cpp >@@ -53,7 +53,7 @@ JSValue LazyJSValue::getValue(VM& vm) const > case KnownStringImpl: > return jsString(&vm, u.stringImpl); > case NewStringImpl: >- return jsString(&vm, AtomicStringImpl::add(u.stringImpl)); >+ return jsString(&vm, AtomStringImpl::add(u.stringImpl)); > } > RELEASE_ASSERT_NOT_REACHED(); > return JSValue(); >diff --git a/Source/JavaScriptCore/dfg/DFGOperations.cpp b/Source/JavaScriptCore/dfg/DFGOperations.cpp >index 5cb276f3f19fcf81ebff3efdcd7be0153947e96b..c425ea96e78e71c9d91363f2eedff53233a953ce 100644 >--- a/Source/JavaScriptCore/dfg/DFGOperations.cpp >+++ b/Source/JavaScriptCore/dfg/DFGOperations.cpp >@@ -712,10 +712,10 @@ EncodedJSValue JIT_OPERATION operationGetByVal(ExecState* exec, EncodedJSValue e > } else if (property.isString()) { > Structure& structure = *base->structure(vm); > if (JSCell::canUseFastGetOwnProperty(structure)) { >- RefPtr<AtomicStringImpl> existingAtomicString = asString(property)->toExistingAtomicString(exec); >+ RefPtr<AtomStringImpl> existingAtomString = asString(property)->toExistingAtomString(exec); > RETURN_IF_EXCEPTION(scope, encodedJSValue()); >- if (existingAtomicString) { >- if (JSValue result = base->fastGetOwnProperty(vm, structure, existingAtomicString.get())) >+ if (existingAtomString) { >+ if (JSValue result = base->fastGetOwnProperty(vm, structure, existingAtomString.get())) > return JSValue::encode(result); > } > } >@@ -749,10 +749,10 @@ EncodedJSValue JIT_OPERATION operationGetByValCell(ExecState* exec, JSCell* base > } else if (property.isString()) { > Structure& structure = *base->structure(vm); > if (JSCell::canUseFastGetOwnProperty(structure)) { >- RefPtr<AtomicStringImpl> existingAtomicString = asString(property)->toExistingAtomicString(exec); >+ RefPtr<AtomStringImpl> existingAtomString = asString(property)->toExistingAtomString(exec); > RETURN_IF_EXCEPTION(scope, encodedJSValue()); >- if (existingAtomicString) { >- if (JSValue result = base->fastGetOwnProperty(vm, structure, existingAtomicString.get())) >+ if (existingAtomString) { >+ if (JSValue result = base->fastGetOwnProperty(vm, structure, existingAtomString.get())) > return JSValue::encode(result); > } > } >@@ -1509,10 +1509,10 @@ EncodedJSValue JIT_OPERATION operationGetByValWithThis(ExecState* exec, EncodedJ > if (LIKELY(baseValue.isCell() && subscript.isString())) { > Structure& structure = *baseValue.asCell()->structure(vm); > if (JSCell::canUseFastGetOwnProperty(structure)) { >- RefPtr<AtomicStringImpl> existingAtomicString = asString(subscript)->toExistingAtomicString(exec); >+ RefPtr<AtomStringImpl> existingAtomString = asString(subscript)->toExistingAtomString(exec); > RETURN_IF_EXCEPTION(scope, encodedJSValue()); >- if (existingAtomicString) { >- if (JSValue result = baseValue.asCell()->fastGetOwnProperty(vm, structure, existingAtomicString.get())) >+ if (existingAtomString) { >+ if (JSValue result = baseValue.asCell()->fastGetOwnProperty(vm, structure, existingAtomString.get())) > return JSValue::encode(result); > } > } >diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp >index 9d382cf616d9d32775be9750899d0c9ae853dd8b..75f102bc4fdc63329f2ddfde819de0460644668e 100644 >--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp >+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp >@@ -3923,7 +3923,7 @@ void SpeculativeJIT::compile(Node* node) > RELEASE_ASSERT_NOT_REACHED(); > } > >- // Note that we don't test if the hash is zero here. AtomicStringImpl's can't have a zero >+ // Note that we don't test if the hash is zero here. AtomStringImpl's can't have a zero > // hash, however, a SymbolImpl may. But, because this is a cache, we don't care. We only > // ever load the result from the cache if the cache entry matches what we are querying for. > // So we either get super lucky and use zero for the hash and somehow collide with the entity >diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp >index 2d62faa8c33ac9499f503fdb240476db63a61e92..f3a0b2bc6fcf3c24425ac6d3aa30da265b94b750 100644 >--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp >+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp >@@ -4490,7 +4490,7 @@ void SpeculativeJIT::compile(Node* node) > RELEASE_ASSERT_NOT_REACHED(); > } > >- // Note that we don't test if the hash is zero here. AtomicStringImpl's can't have a zero >+ // Note that we don't test if the hash is zero here. AtomStringImpl's can't have a zero > // hash, however, a SymbolImpl may. But, because this is a cache, we don't care. We only > // ever load the result from the cache if the cache entry matches what we are querying for. > // So we either get super lucky and use zero for the hash and somehow collide with the entity >diff --git a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp >index 24ea97da75939781022d5fa3697cc6c43f1dc1a3..9cb6e8d3de4a73a625f60f13a1a6f1325b923683 100644 >--- a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp >+++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp >@@ -10440,17 +10440,17 @@ private: > switch (m_node->child2().useKind()) { > case StringUse: { > LBasicBlock isNonEmptyString = m_out.newBlock(); >- LBasicBlock isAtomicString = m_out.newBlock(); >+ LBasicBlock isAtomString = m_out.newBlock(); > > keyAsValue = lowString(m_node->child2()); > m_out.branch(isNotRopeString(keyAsValue, m_node->child2()), usually(isNonEmptyString), rarely(slowCase)); > >- lastNext = m_out.appendTo(isNonEmptyString, isAtomicString); >+ lastNext = m_out.appendTo(isNonEmptyString, isAtomString); > uniquedStringImpl = m_out.loadPtr(keyAsValue, m_heaps.JSString_value); > LValue isNotAtomic = m_out.testIsZero32(m_out.load32(uniquedStringImpl, m_heaps.StringImpl_hashAndFlags), m_out.constInt32(StringImpl::flagIsAtomic())); >- m_out.branch(isNotAtomic, rarely(slowCase), usually(isAtomicString)); >+ m_out.branch(isNotAtomic, rarely(slowCase), usually(isAtomString)); > >- m_out.appendTo(isAtomicString, slowCase); >+ m_out.appendTo(isAtomString, slowCase); > break; > } > case SymbolUse: { >@@ -10499,7 +10499,7 @@ private: > > ASSERT(keyAsValue); > >- // Note that we don't test if the hash is zero here. AtomicStringImpl's can't have a zero >+ // Note that we don't test if the hash is zero here. AtomStringImpl's can't have a zero > // hash, however, a SymbolImpl may. But, because this is a cache, we don't care. We only > // ever load the result from the cache if the cache entry matches what we are querying for. > // So we either get super lucky and use zero for the hash and somehow collide with the entity >diff --git a/Source/JavaScriptCore/heap/Heap.cpp b/Source/JavaScriptCore/heap/Heap.cpp >index a85207f12cf603f047881d164cc678274483ffee..d9def176d80d13c5b132ada708919e51ce417774 100644 >--- a/Source/JavaScriptCore/heap/Heap.cpp >+++ b/Source/JavaScriptCore/heap/Heap.cpp >@@ -150,7 +150,7 @@ bool isValidSharedInstanceThreadState(VM* vm) > > bool isValidThreadState(VM* vm) > { >- if (vm->atomicStringTable() != Thread::current().atomicStringTable()) >+ if (vm->atomStringTable() != Thread::current().atomStringTable()) > return false; > > if (vm->isSharedInstance() && !isValidSharedInstanceThreadState(vm)) >@@ -2105,7 +2105,7 @@ Heap::Ticket Heap::requestCollection(GCRequest request) > stopIfNecessary(); > > ASSERT(vm()->currentThreadIsHoldingAPILock()); >- RELEASE_ASSERT(vm()->atomicStringTable() == Thread::current().atomicStringTable()); >+ RELEASE_ASSERT(vm()->atomStringTable() == Thread::current().atomStringTable()); > > LockHolder locker(*m_threadLock); > // We may be able to steal the conn. That only works if the collector is definitely not running >diff --git a/Source/JavaScriptCore/jit/JITOperations.cpp b/Source/JavaScriptCore/jit/JITOperations.cpp >index fbd6d7369b952cd977cc5223a1db8ab9836f96ac..7ba1823586a87800b3f02a96229ccba71f25084e 100644 >--- a/Source/JavaScriptCore/jit/JITOperations.cpp >+++ b/Source/JavaScriptCore/jit/JITOperations.cpp >@@ -1841,12 +1841,12 @@ static JSValue getByVal(ExecState* exec, JSValue baseValue, JSValue subscript, B > if (LIKELY(baseValue.isCell() && subscript.isString())) { > Structure& structure = *baseValue.asCell()->structure(vm); > if (JSCell::canUseFastGetOwnProperty(structure)) { >- RefPtr<AtomicStringImpl> existingAtomicString = asString(subscript)->toExistingAtomicString(exec); >+ RefPtr<AtomStringImpl> existingAtomString = asString(subscript)->toExistingAtomString(exec); > RETURN_IF_EXCEPTION(scope, JSValue()); >- if (existingAtomicString) { >- if (JSValue result = baseValue.asCell()->fastGetOwnProperty(vm, structure, existingAtomicString.get())) { >+ if (existingAtomString) { >+ if (JSValue result = baseValue.asCell()->fastGetOwnProperty(vm, structure, existingAtomString.get())) { > ASSERT(exec->bytecodeOffset()); >- if (byValInfo->stubInfo && byValInfo->cachedId.impl() != existingAtomicString) >+ if (byValInfo->stubInfo && byValInfo->cachedId.impl() != existingAtomString) > byValInfo->tookSlowPath = true; > return result; > } >diff --git a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp >index b3be9d815863d8b822caf59b3ba79410bd6c3eaf..1712378cddb5a88fcbd12e16dda85264129ec363 100644 >--- a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp >+++ b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp >@@ -932,10 +932,10 @@ static ALWAYS_INLINE JSValue getByVal(VM& vm, ExecState* exec, OpGetByVal byteco > if (LIKELY(baseValue.isCell() && subscript.isString())) { > Structure& structure = *baseValue.asCell()->structure(vm); > if (JSCell::canUseFastGetOwnProperty(structure)) { >- RefPtr<AtomicStringImpl> existingAtomicString = asString(subscript)->toExistingAtomicString(exec); >+ RefPtr<AtomStringImpl> existingAtomString = asString(subscript)->toExistingAtomString(exec); > RETURN_IF_EXCEPTION(scope, JSValue()); >- if (existingAtomicString) { >- if (JSValue result = baseValue.asCell()->fastGetOwnProperty(vm, structure, existingAtomicString.get())) >+ if (existingAtomString) { >+ if (JSValue result = baseValue.asCell()->fastGetOwnProperty(vm, structure, existingAtomString.get())) > return result; > } > } >diff --git a/Source/JavaScriptCore/parser/Parser.cpp b/Source/JavaScriptCore/parser/Parser.cpp >index 45ac90801ec032e3271b2861fc287d39fa35ae9b..64b030885e37730004a9744d9ab7d43c4e29da7d 100644 >--- a/Source/JavaScriptCore/parser/Parser.cpp >+++ b/Source/JavaScriptCore/parser/Parser.cpp >@@ -928,7 +928,7 @@ template <class TreeBuilder> TreeDestructuringPattern Parser<LexerType>::createB > { > ASSERT(!name.isNull()); > >- ASSERT(name.impl()->isAtomic() || name.impl()->isSymbol()); >+ ASSERT(name.impl()->isAtom() || name.impl()->isSymbol()); > > switch (kind) { > case DestructuringKind::DestructureToVariables: { >diff --git a/Source/JavaScriptCore/runtime/ArrayPrototype.cpp b/Source/JavaScriptCore/runtime/ArrayPrototype.cpp >index 43eec84cc4596e85742116cd301ca931f2dfd7a1..57a8695b31546fd6b7591ea993d6d65cfdd8c280 100644 >--- a/Source/JavaScriptCore/runtime/ArrayPrototype.cpp >+++ b/Source/JavaScriptCore/runtime/ArrayPrototype.cpp >@@ -686,7 +686,7 @@ static JSValue slowJoin(ExecState& exec, JSObject* thisObject, JSString* separat > // 9.e Increase k by 1.. > for (uint64_t k = 1; k < length; ++k) { > // b. Let element be ? Get(O, ! ToString(k)). >- JSValue element = thisObject->get(&exec, Identifier::fromString(&exec, AtomicString::number(k))); >+ JSValue element = thisObject->get(&exec, Identifier::fromString(&exec, AtomString::number(k))); > RETURN_IF_EXCEPTION(scope, { }); > > // c. If element is undefined or null, let next be the empty String; otherwise, let next be ? ToString(element). >diff --git a/Source/JavaScriptCore/runtime/CachedTypes.cpp b/Source/JavaScriptCore/runtime/CachedTypes.cpp >index 03cf164fbccc011e8c85f017772408b1c1154ebb..fb9510ef8a7c46526b95f093dc0b74f3a025f910 100644 >--- a/Source/JavaScriptCore/runtime/CachedTypes.cpp >+++ b/Source/JavaScriptCore/runtime/CachedTypes.cpp >@@ -43,7 +43,7 @@ > #include <wtf/FastMalloc.h> > #include <wtf/Optional.h> > #include <wtf/UUID.h> >-#include <wtf/text/AtomicStringImpl.h> >+#include <wtf/text/AtomStringImpl.h> > > namespace JSC { > >@@ -681,7 +681,7 @@ class CachedUniquedStringImplBase : public VariableLengthObject<T> { > public: > void encode(Encoder& encoder, const StringImpl& string) > { >- m_isAtomic = string.isAtomic(); >+ m_isAtomic = string.isAtom(); > m_isSymbol = string.isSymbol(); > RefPtr<StringImpl> impl = const_cast<StringImpl*>(&string); > >@@ -717,7 +717,7 @@ public: > { > auto create = [&](const auto* buffer) -> UniquedStringImpl* { > if (!m_isSymbol) >- return AtomicStringImpl::add(buffer, m_length).leakRef(); >+ return AtomStringImpl::add(buffer, m_length).leakRef(); > > Identifier ident = Identifier::fromString(&decoder.vm(), buffer, m_length); > String str = decoder.vm().propertyNames->lookUpPrivateName(ident); >@@ -729,7 +729,7 @@ public: > if (!m_length) { > if (m_isSymbol) > return &SymbolImpl::createNullSymbol().leakRef(); >- return AtomicStringImpl::add("").leakRef(); >+ return AtomStringImpl::add("").leakRef(); > } > > if (m_is8Bit) >diff --git a/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp b/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp >index 29b2022338aac3e88f2a33e2b8937a5832ad90e2..48c7c1a8312f73095d53ee2132f8c3cad2108b9d 100644 >--- a/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp >+++ b/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp >@@ -1149,10 +1149,10 @@ SLOW_PATH_DECL(slow_path_get_by_val_with_this) > if (LIKELY(baseValue.isCell() && subscript.isString())) { > Structure& structure = *baseValue.asCell()->structure(vm); > if (JSCell::canUseFastGetOwnProperty(structure)) { >- RefPtr<AtomicStringImpl> existingAtomicString = asString(subscript)->toExistingAtomicString(exec); >+ RefPtr<AtomStringImpl> existingAtomString = asString(subscript)->toExistingAtomString(exec); > CHECK_EXCEPTION(); >- if (existingAtomicString) { >- if (JSValue result = baseValue.asCell()->fastGetOwnProperty(vm, structure, existingAtomicString.get())) >+ if (existingAtomString) { >+ if (JSValue result = baseValue.asCell()->fastGetOwnProperty(vm, structure, existingAtomString.get())) > RETURN_PROFILED(result); > } > } >diff --git a/Source/JavaScriptCore/runtime/Completion.cpp b/Source/JavaScriptCore/runtime/Completion.cpp >index 7e2aa303192861168332e0a22bbdc09d3f96fee0..dbff178de6b3e8e055e6598d0c255a829e35347b 100644 >--- a/Source/JavaScriptCore/runtime/Completion.cpp >+++ b/Source/JavaScriptCore/runtime/Completion.cpp >@@ -57,7 +57,7 @@ bool checkSyntax(ExecState* exec, const SourceCode& source, JSValue* returnedExc > { > VM& vm = exec->vm(); > JSLockHolder lock(vm); >- RELEASE_ASSERT(vm.atomicStringTable() == Thread::current().atomicStringTable()); >+ RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable()); > > ParserError error; > if (checkSyntaxInternal(vm, source, error)) >@@ -71,7 +71,7 @@ bool checkSyntax(ExecState* exec, const SourceCode& source, JSValue* returnedExc > bool checkSyntax(VM& vm, const SourceCode& source, ParserError& error) > { > JSLockHolder lock(vm); >- RELEASE_ASSERT(vm.atomicStringTable() == Thread::current().atomicStringTable()); >+ RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable()); > return checkSyntaxInternal(vm, source, error); > } > >@@ -79,7 +79,7 @@ bool checkModuleSyntax(ExecState* exec, const SourceCode& source, ParserError& e > { > VM& vm = exec->vm(); > JSLockHolder lock(vm); >- RELEASE_ASSERT(vm.atomicStringTable() == Thread::current().atomicStringTable()); >+ RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable()); > std::unique_ptr<ModuleProgramNode> moduleProgramNode = parse<ModuleProgramNode>( > &vm, source, Identifier(), JSParserBuiltinMode::NotBuiltin, > JSParserStrictMode::Strict, JSParserScriptMode::Module, SourceParseMode::ModuleAnalyzeMode, SuperBinding::NotNeeded, error); >@@ -95,7 +95,7 @@ bool checkModuleSyntax(ExecState* exec, const SourceCode& source, ParserError& e > RefPtr<CachedBytecode> generateProgramBytecode(VM& vm, const SourceCode& source, int fd, BytecodeCacheError& error) > { > JSLockHolder lock(vm); >- RELEASE_ASSERT(vm.atomicStringTable() == Thread::current().atomicStringTable()); >+ RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable()); > > VariableEnvironment variablesUnderTDZ; > JSParserStrictMode strictMode = JSParserStrictMode::NotStrict; >@@ -115,7 +115,7 @@ RefPtr<CachedBytecode> generateProgramBytecode(VM& vm, const SourceCode& source, > RefPtr<CachedBytecode> generateModuleBytecode(VM& vm, const SourceCode& source, int fd, BytecodeCacheError& error) > { > JSLockHolder lock(vm); >- RELEASE_ASSERT(vm.atomicStringTable() == Thread::current().atomicStringTable()); >+ RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable()); > > VariableEnvironment variablesUnderTDZ; > JSParserStrictMode strictMode = JSParserStrictMode::Strict; >@@ -136,7 +136,7 @@ JSValue evaluate(ExecState* exec, const SourceCode& source, JSValue thisValue, N > VM& vm = exec->vm(); > JSLockHolder lock(vm); > auto scope = DECLARE_CATCH_SCOPE(vm); >- RELEASE_ASSERT(vm.atomicStringTable() == Thread::current().atomicStringTable()); >+ RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable()); > RELEASE_ASSERT(!vm.isCollectorBusyOnCurrentThread()); > > CodeProfiling profile(source); >@@ -206,7 +206,7 @@ JSInternalPromise* loadAndEvaluateModule(ExecState* exec, Symbol* moduleId, JSVa > { > VM& vm = exec->vm(); > JSLockHolder lock(vm); >- RELEASE_ASSERT(vm.atomicStringTable() == Thread::current().atomicStringTable()); >+ RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable()); > RELEASE_ASSERT(!vm.isCollectorBusyOnCurrentThread()); > > return vm.vmEntryGlobalObject(exec)->moduleLoader()->loadAndEvaluateModule(exec, moduleId, parameters, scriptFetcher); >@@ -216,7 +216,7 @@ JSInternalPromise* loadAndEvaluateModule(ExecState* exec, const String& moduleNa > { > VM& vm = exec->vm(); > JSLockHolder lock(vm); >- RELEASE_ASSERT(vm.atomicStringTable() == Thread::current().atomicStringTable()); >+ RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable()); > RELEASE_ASSERT(!vm.isCollectorBusyOnCurrentThread()); > > return vm.vmEntryGlobalObject(exec)->moduleLoader()->loadAndEvaluateModule(exec, identifierToJSValue(vm, Identifier::fromString(exec, moduleName)), parameters, scriptFetcher); >@@ -227,7 +227,7 @@ JSInternalPromise* loadAndEvaluateModule(ExecState* exec, const SourceCode& sour > VM& vm = exec->vm(); > JSLockHolder lock(vm); > auto scope = DECLARE_THROW_SCOPE(vm); >- RELEASE_ASSERT(vm.atomicStringTable() == Thread::current().atomicStringTable()); >+ RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable()); > RELEASE_ASSERT(!vm.isCollectorBusyOnCurrentThread()); > > Symbol* key = createSymbolForEntryPointModule(vm); >@@ -245,7 +245,7 @@ JSInternalPromise* loadModule(ExecState* exec, const String& moduleName, JSValue > { > VM& vm = exec->vm(); > JSLockHolder lock(vm); >- RELEASE_ASSERT(vm.atomicStringTable() == Thread::current().atomicStringTable()); >+ RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable()); > RELEASE_ASSERT(!vm.isCollectorBusyOnCurrentThread()); > > return vm.vmEntryGlobalObject(exec)->moduleLoader()->loadModule(exec, identifierToJSValue(vm, Identifier::fromString(exec, moduleName)), parameters, scriptFetcher); >@@ -256,7 +256,7 @@ JSInternalPromise* loadModule(ExecState* exec, const SourceCode& source, JSValue > VM& vm = exec->vm(); > JSLockHolder lock(vm); > auto scope = DECLARE_THROW_SCOPE(vm); >- RELEASE_ASSERT(vm.atomicStringTable() == Thread::current().atomicStringTable()); >+ RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable()); > RELEASE_ASSERT(!vm.isCollectorBusyOnCurrentThread()); > > Symbol* key = createSymbolForEntryPointModule(vm); >@@ -275,7 +275,7 @@ JSValue linkAndEvaluateModule(ExecState* exec, const Identifier& moduleKey, JSVa > { > VM& vm = exec->vm(); > JSLockHolder lock(vm); >- RELEASE_ASSERT(vm.atomicStringTable() == Thread::current().atomicStringTable()); >+ RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable()); > RELEASE_ASSERT(!vm.isCollectorBusyOnCurrentThread()); > > JSGlobalObject* globalObject = vm.vmEntryGlobalObject(exec); >@@ -286,7 +286,7 @@ JSInternalPromise* importModule(ExecState* exec, const Identifier& moduleKey, JS > { > VM& vm = exec->vm(); > JSLockHolder lock(vm); >- RELEASE_ASSERT(vm.atomicStringTable() == Thread::current().atomicStringTable()); >+ RELEASE_ASSERT(vm.atomStringTable() == Thread::current().atomStringTable()); > RELEASE_ASSERT(!vm.isCollectorBusyOnCurrentThread()); > > return vm.vmEntryGlobalObject(exec)->moduleLoader()->requestImportModule(exec, moduleKey, parameters, scriptFetcher); >diff --git a/Source/JavaScriptCore/runtime/Identifier.cpp b/Source/JavaScriptCore/runtime/Identifier.cpp >index 46f79c86ed6ec10db1a7437df317451f9e938ebb..d862873fabb7d4268f58730f4000733757f98da7 100644 >--- a/Source/JavaScriptCore/runtime/Identifier.cpp >+++ b/Source/JavaScriptCore/runtime/Identifier.cpp >@@ -42,7 +42,7 @@ Ref<StringImpl> Identifier::add(VM* vm, const char* c) > if (!c[1]) > return vm->smallStrings.singleCharacterStringRep(c[0]); > >- return *AtomicStringImpl::add(c); >+ return *AtomStringImpl::add(c); > } > > Ref<StringImpl> Identifier::add(ExecState* exec, const char* c) >@@ -61,7 +61,7 @@ Ref<StringImpl> Identifier::add8(VM* vm, const UChar* s, int length) > if (!length) > return *StringImpl::empty(); > >- return *AtomicStringImpl::add(s, length); >+ return *AtomStringImpl::add(s, length); > } > > Identifier Identifier::from(ExecState* exec, unsigned value) >@@ -109,24 +109,24 @@ void Identifier::dump(PrintStream& out) const > > #ifndef NDEBUG > >-void Identifier::checkCurrentAtomicStringTable(VM* vm) >+void Identifier::checkCurrentAtomStringTable(VM* vm) > { > // Check the identifier table accessible through the threadspecific matches the > // vm's identifier table. >- ASSERT_UNUSED(vm, vm->atomicStringTable() == Thread::current().atomicStringTable()); >+ ASSERT_UNUSED(vm, vm->atomStringTable() == Thread::current().atomStringTable()); > } > >-void Identifier::checkCurrentAtomicStringTable(ExecState* exec) >+void Identifier::checkCurrentAtomStringTable(ExecState* exec) > { >- checkCurrentAtomicStringTable(&exec->vm()); >+ checkCurrentAtomStringTable(&exec->vm()); > } > > #else > > // These only exists so that our exports are the same for debug and release builds. > // This would be an RELEASE_ASSERT_NOT_REACHED(), but we're in NDEBUG only code here! >-NO_RETURN_DUE_TO_CRASH void Identifier::checkCurrentAtomicStringTable(VM*) { CRASH(); } >-NO_RETURN_DUE_TO_CRASH void Identifier::checkCurrentAtomicStringTable(ExecState*) { CRASH(); } >+NO_RETURN_DUE_TO_CRASH void Identifier::checkCurrentAtomStringTable(VM*) { CRASH(); } >+NO_RETURN_DUE_TO_CRASH void Identifier::checkCurrentAtomStringTable(ExecState*) { CRASH(); } > > #endif > >diff --git a/Source/JavaScriptCore/runtime/Identifier.h b/Source/JavaScriptCore/runtime/Identifier.h >index fa8d3421c41a2ed2c33100c22b4af6eb9ad1d316..104a147076b39c18d9ea05c50bddb14e16424b93 100644 >--- a/Source/JavaScriptCore/runtime/Identifier.h >+++ b/Source/JavaScriptCore/runtime/Identifier.h >@@ -88,7 +88,7 @@ class Identifier { > public: > Identifier() { } > enum EmptyIdentifierFlag { EmptyIdentifier }; >- Identifier(EmptyIdentifierFlag) : m_string(StringImpl::empty()) { ASSERT(m_string.impl()->isAtomic()); } >+ Identifier(EmptyIdentifierFlag) : m_string(StringImpl::empty()) { ASSERT(m_string.impl()->isAtom()); } > > const String& string() const { return m_string; } > UniquedStringImpl* impl() const { return static_cast<UniquedStringImpl*>(m_string.impl()); } >@@ -117,8 +117,8 @@ public: > static Identifier fromString(VM*, const LChar*, int length); > static Identifier fromString(VM*, const UChar*, int length); > static Identifier fromString(VM*, const String&); >- static Identifier fromString(ExecState*, AtomicStringImpl*); >- static Identifier fromString(ExecState*, const AtomicString&); >+ static Identifier fromString(ExecState*, AtomStringImpl*); >+ static Identifier fromString(ExecState*, const AtomString&); > static Identifier fromString(ExecState*, const String&); > static Identifier fromString(ExecState*, const char*); > static Identifier fromString(VM* vm, const Vector<LChar>& characters) { return fromString(vm, characters.data(), characters.size()); } >@@ -167,14 +167,14 @@ private: > > // Only to be used with string literals. > template<unsigned charactersCount> >- Identifier(VM* vm, const char (&characters)[charactersCount]) : m_string(add(vm, characters)) { ASSERT(m_string.impl()->isAtomic()); } >+ Identifier(VM* vm, const char (&characters)[charactersCount]) : m_string(add(vm, characters)) { ASSERT(m_string.impl()->isAtom()); } > >- Identifier(VM* vm, const LChar* s, int length) : m_string(add(vm, s, length)) { ASSERT(m_string.impl()->isAtomic()); } >- Identifier(VM* vm, const UChar* s, int length) : m_string(add(vm, s, length)) { ASSERT(m_string.impl()->isAtomic()); } >- Identifier(ExecState*, AtomicStringImpl*); >- Identifier(ExecState*, const AtomicString&); >- Identifier(VM* vm, const String& string) : m_string(add(vm, string.impl())) { ASSERT(m_string.impl()->isAtomic()); } >- Identifier(VM* vm, StringImpl* rep) : m_string(add(vm, rep)) { ASSERT(m_string.impl()->isAtomic()); } >+ Identifier(VM* vm, const LChar* s, int length) : m_string(add(vm, s, length)) { ASSERT(m_string.impl()->isAtom()); } >+ Identifier(VM* vm, const UChar* s, int length) : m_string(add(vm, s, length)) { ASSERT(m_string.impl()->isAtom()); } >+ Identifier(ExecState*, AtomStringImpl*); >+ Identifier(ExecState*, const AtomString&); >+ Identifier(VM* vm, const String& string) : m_string(add(vm, string.impl())) { ASSERT(m_string.impl()->isAtom()); } >+ Identifier(VM* vm, StringImpl* rep) : m_string(add(vm, rep)) { ASSERT(m_string.impl()->isAtom()); } > > Identifier(SymbolImpl& uid) > : m_string(&uid) >@@ -195,11 +195,11 @@ private: > static Ref<StringImpl> add(VM*, StringImpl*); > > #ifndef NDEBUG >- JS_EXPORT_PRIVATE static void checkCurrentAtomicStringTable(ExecState*); >- JS_EXPORT_PRIVATE static void checkCurrentAtomicStringTable(VM*); >+ JS_EXPORT_PRIVATE static void checkCurrentAtomStringTable(ExecState*); >+ JS_EXPORT_PRIVATE static void checkCurrentAtomStringTable(VM*); > #else >- JS_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH static void checkCurrentAtomicStringTable(ExecState*); >- JS_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH static void checkCurrentAtomicStringTable(VM*); >+ JS_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH static void checkCurrentAtomStringTable(ExecState*); >+ JS_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH static void checkCurrentAtomStringTable(VM*); > #endif > }; > >@@ -225,7 +225,7 @@ Ref<StringImpl> Identifier::add(VM* vm, const T* s, int length) > if (!length) > return *StringImpl::empty(); > >- return *AtomicStringImpl::add(s, length); >+ return *AtomStringImpl::add(s, length); > } > > inline bool operator==(const Identifier& a, const Identifier& b) >diff --git a/Source/JavaScriptCore/runtime/IdentifierInlines.h b/Source/JavaScriptCore/runtime/IdentifierInlines.h >index 9964cc59c80861d9c2380ebab3e7e2cf1cf8ae09..45b7ec8c2b58b4fc6ccc59ca66809757bc497923 100644 >--- a/Source/JavaScriptCore/runtime/IdentifierInlines.h >+++ b/Source/JavaScriptCore/runtime/IdentifierInlines.h >@@ -31,25 +31,25 @@ > > namespace JSC { > >-inline Identifier::Identifier(ExecState* exec, AtomicStringImpl* string) >+inline Identifier::Identifier(ExecState* exec, AtomStringImpl* string) > : m_string(string) > { > #ifndef NDEBUG >- checkCurrentAtomicStringTable(exec); >+ checkCurrentAtomStringTable(exec); > if (string) >- ASSERT_WITH_MESSAGE(!string->length() || string->isSymbol() || AtomicStringImpl::isInAtomicStringTable(string), "The atomic string comes from an other thread!"); >+ ASSERT_WITH_MESSAGE(!string->length() || string->isSymbol() || AtomStringImpl::isInAtomStringTable(string), "The atomic string comes from an other thread!"); > #else > UNUSED_PARAM(exec); > #endif > } > >-inline Identifier::Identifier(ExecState* exec, const AtomicString& string) >+inline Identifier::Identifier(ExecState* exec, const AtomString& string) > : m_string(string.string()) > { > #ifndef NDEBUG >- checkCurrentAtomicStringTable(exec); >+ checkCurrentAtomStringTable(exec); > if (!string.isNull()) >- ASSERT_WITH_MESSAGE(!string.length() || string.impl()->isSymbol() || AtomicStringImpl::isInAtomicStringTable(string.impl()), "The atomic string comes from an other thread!"); >+ ASSERT_WITH_MESSAGE(!string.length() || string.impl()->isSymbol() || AtomStringImpl::isInAtomStringTable(string.impl()), "The atomic string comes from an other thread!"); > #else > UNUSED_PARAM(exec); > #endif >@@ -58,17 +58,17 @@ inline Identifier::Identifier(ExecState* exec, const AtomicString& string) > inline Ref<StringImpl> Identifier::add(ExecState* exec, StringImpl* r) > { > #ifndef NDEBUG >- checkCurrentAtomicStringTable(exec); >+ checkCurrentAtomStringTable(exec); > #endif > VM& vm = exec->vm(); >- return *AtomicStringImpl::addWithStringTableProvider(vm, r); >+ return *AtomStringImpl::addWithStringTableProvider(vm, r); > } > inline Ref<StringImpl> Identifier::add(VM* vm, StringImpl* r) > { > #ifndef NDEBUG >- checkCurrentAtomicStringTable(vm); >+ checkCurrentAtomStringTable(vm); > #endif >- return *AtomicStringImpl::addWithStringTableProvider(*vm, r); >+ return *AtomStringImpl::addWithStringTableProvider(*vm, r); > } > > inline Identifier Identifier::fromUid(VM* vm, UniquedStringImpl* uid) >@@ -125,19 +125,19 @@ inline Identifier Identifier::fromString(ExecState* exec, const String& string) > return Identifier(&exec->vm(), string.impl()); > } > >-inline Identifier Identifier::fromString(ExecState* exec, AtomicStringImpl* atomicString) >+inline Identifier Identifier::fromString(ExecState* exec, AtomStringImpl* atomString) > { >- return Identifier(exec, atomicString); >+ return Identifier(exec, atomString); > } > >-inline Identifier Identifier::fromString(ExecState* exec, const AtomicString& atomicString) >+inline Identifier Identifier::fromString(ExecState* exec, const AtomString& atomString) > { >- return Identifier(exec, atomicString); >+ return Identifier(exec, atomString); > } > > inline Identifier Identifier::fromString(ExecState* exec, const char* s) > { >- return Identifier(exec, AtomicString(s)); >+ return Identifier(exec, AtomString(s)); > } > > inline JSValue identifierToJSValue(VM& vm, const Identifier& identifier) >diff --git a/Source/JavaScriptCore/runtime/JSCJSValue.cpp b/Source/JavaScriptCore/runtime/JSCJSValue.cpp >index d471e163f3ebea33dddccd223cc6df42445025b8..4e5e6a0aa62da14648e0913c6386f2c4f11932f5 100644 >--- a/Source/JavaScriptCore/runtime/JSCJSValue.cpp >+++ b/Source/JavaScriptCore/runtime/JSCJSValue.cpp >@@ -259,9 +259,9 @@ void JSValue::dumpInContextAssumingStructure( > out.print(" (rope)"); > const StringImpl* impl = string->tryGetValueImpl(); > if (impl) { >- if (impl->isAtomic()) >+ if (impl->isAtom()) > out.print(" (atomic)"); >- if (impl->isAtomic()) >+ if (impl->isAtom()) > out.print(" (identifier)"); > if (impl->isSymbol()) > out.print(" (symbol)"); >diff --git a/Source/JavaScriptCore/runtime/JSLock.cpp b/Source/JavaScriptCore/runtime/JSLock.cpp >index 000969c474614cbee865d24ca1da6b5fba424686..7cc3f69d4afc2e7d52ebcb9739c81d297255c52c 100644 >--- a/Source/JavaScriptCore/runtime/JSLock.cpp >+++ b/Source/JavaScriptCore/runtime/JSLock.cpp >@@ -83,7 +83,7 @@ JSLock::JSLock(VM* vm) > : m_lockCount(0) > , m_lockDropDepth(0) > , m_vm(vm) >- , m_entryAtomicStringTable(nullptr) >+ , m_entryAtomStringTable(nullptr) > { > } > >@@ -130,9 +130,9 @@ void JSLock::didAcquireLock() > return; > > Thread& thread = Thread::current(); >- ASSERT(!m_entryAtomicStringTable); >- m_entryAtomicStringTable = thread.setCurrentAtomicStringTable(m_vm->atomicStringTable()); >- ASSERT(m_entryAtomicStringTable); >+ ASSERT(!m_entryAtomStringTable); >+ m_entryAtomStringTable = thread.setCurrentAtomStringTable(m_vm->atomStringTable()); >+ ASSERT(m_entryAtomStringTable); > > m_vm->setLastStackTop(thread.savedLastStackTop()); > ASSERT(thread.stack().contains(m_vm->lastStackTop())); >@@ -212,9 +212,9 @@ void JSLock::willReleaseLock() > vm->heap.releaseAccess(); > } > >- if (m_entryAtomicStringTable) { >- Thread::current().setCurrentAtomicStringTable(m_entryAtomicStringTable); >- m_entryAtomicStringTable = nullptr; >+ if (m_entryAtomStringTable) { >+ Thread::current().setCurrentAtomStringTable(m_entryAtomStringTable); >+ m_entryAtomStringTable = nullptr; > } > } > >diff --git a/Source/JavaScriptCore/runtime/JSLock.h b/Source/JavaScriptCore/runtime/JSLock.h >index 5277f02c8e112c21f0baa0feb7d4eb0ba053fd6d..f461f820f9e3aa5f1ec86a02113da2296f3330e8 100644 >--- a/Source/JavaScriptCore/runtime/JSLock.h >+++ b/Source/JavaScriptCore/runtime/JSLock.h >@@ -26,7 +26,7 @@ > #include <wtf/Noncopyable.h> > #include <wtf/RefPtr.h> > #include <wtf/Threading.h> >-#include <wtf/text/AtomicStringTable.h> >+#include <wtf/text/AtomStringTable.h> > > namespace JSC { > >@@ -140,7 +140,7 @@ private: > unsigned m_lockDropDepth; > bool m_shouldReleaseHeapAccess; > VM* m_vm; >- AtomicStringTable* m_entryAtomicStringTable; >+ AtomStringTable* m_entryAtomStringTable; > }; > > } // namespace >diff --git a/Source/JavaScriptCore/runtime/JSString.cpp b/Source/JavaScriptCore/runtime/JSString.cpp >index dcaead97ad054a708ca4a3ad985c015f9431c981..255738447a554348f241e34205050607c8e01f65 100644 >--- a/Source/JavaScriptCore/runtime/JSString.cpp >+++ b/Source/JavaScriptCore/runtime/JSString.cpp >@@ -211,7 +211,7 @@ void JSRopeString::resolveRopeInternal16NoSubstring(UChar* buffer) const > ASSERT((buffer + length()) == position); > } > >-AtomicString JSRopeString::resolveRopeToAtomicString(ExecState* exec) const >+AtomString JSRopeString::resolveRopeToAtomString(ExecState* exec) const > { > VM& vm = exec->vm(); > auto scope = DECLARE_THROW_SCOPE(vm); >@@ -219,18 +219,18 @@ AtomicString JSRopeString::resolveRopeToAtomicString(ExecState* exec) const > if (length() > maxLengthForOnStackResolve) { > scope.release(); > return resolveRopeWithFunction(exec, [&] (Ref<StringImpl>&& newImpl) { >- return AtomicStringImpl::add(newImpl.ptr()); >+ return AtomStringImpl::add(newImpl.ptr()); > }); > } > > if (is8Bit()) { > LChar buffer[maxLengthForOnStackResolve]; > resolveRopeInternal8(buffer); >- convertToNonRope(AtomicStringImpl::add(buffer, length())); >+ convertToNonRope(AtomStringImpl::add(buffer, length())); > } else { > UChar buffer[maxLengthForOnStackResolve]; > resolveRopeInternal16(buffer); >- convertToNonRope(AtomicStringImpl::add(buffer, length())); >+ convertToNonRope(AtomStringImpl::add(buffer, length())); > } > > // If we resolved a string that didn't previously exist, notify the heap that we've grown. >@@ -251,36 +251,36 @@ inline void JSRopeString::convertToNonRope(String&& string) const > ASSERT(!JSString::isRope()); > } > >-RefPtr<AtomicStringImpl> JSRopeString::resolveRopeToExistingAtomicString(ExecState* exec) const >+RefPtr<AtomStringImpl> JSRopeString::resolveRopeToExistingAtomString(ExecState* exec) const > { > VM& vm = exec->vm(); > auto scope = DECLARE_THROW_SCOPE(vm); > > if (length() > maxLengthForOnStackResolve) { >- RefPtr<AtomicStringImpl> existingAtomicString; >+ RefPtr<AtomStringImpl> existingAtomString; > resolveRopeWithFunction(exec, [&] (Ref<StringImpl>&& newImpl) -> Ref<StringImpl> { >- existingAtomicString = AtomicStringImpl::lookUp(newImpl.ptr()); >- if (existingAtomicString) >- return makeRef(*existingAtomicString); >+ existingAtomString = AtomStringImpl::lookUp(newImpl.ptr()); >+ if (existingAtomString) >+ return makeRef(*existingAtomString); > return WTFMove(newImpl); > }); > RETURN_IF_EXCEPTION(scope, nullptr); >- return existingAtomicString; >+ return existingAtomString; > } > > if (is8Bit()) { > LChar buffer[maxLengthForOnStackResolve]; > resolveRopeInternal8(buffer); >- if (RefPtr<AtomicStringImpl> existingAtomicString = AtomicStringImpl::lookUp(buffer, length())) { >- convertToNonRope(*existingAtomicString); >- return existingAtomicString; >+ if (RefPtr<AtomStringImpl> existingAtomString = AtomStringImpl::lookUp(buffer, length())) { >+ convertToNonRope(*existingAtomString); >+ return existingAtomString; > } > } else { > UChar buffer[maxLengthForOnStackResolve]; > resolveRopeInternal16(buffer); >- if (RefPtr<AtomicStringImpl> existingAtomicString = AtomicStringImpl::lookUp(buffer, length())) { >- convertToNonRope(*existingAtomicString); >- return existingAtomicString; >+ if (RefPtr<AtomStringImpl> existingAtomString = AtomStringImpl::lookUp(buffer, length())) { >+ convertToNonRope(*existingAtomString); >+ return existingAtomString; > } > } > >diff --git a/Source/JavaScriptCore/runtime/JSString.h b/Source/JavaScriptCore/runtime/JSString.h >index b893e0407828fb00abc0ba575c570e2bbfbd9988..6b5c6effca0b4b7931b5e789908f5314531c6548 100644 >--- a/Source/JavaScriptCore/runtime/JSString.h >+++ b/Source/JavaScriptCore/runtime/JSString.h >@@ -182,8 +182,8 @@ public: > ~JSString(); > > Identifier toIdentifier(ExecState*) const; >- AtomicString toAtomicString(ExecState*) const; >- RefPtr<AtomicStringImpl> toExistingAtomicString(ExecState*) const; >+ AtomString toAtomString(ExecState*) const; >+ RefPtr<AtomStringImpl> toExistingAtomString(ExecState*) const; > > StringViewWithUnderlyingString viewWithUnderlyingString(ExecState*) const; > >@@ -576,8 +576,8 @@ private: > // The rope value will remain a null string in that case. > JS_EXPORT_PRIVATE const String& resolveRope(ExecState* nullOrExecForOOM) const; > template<typename Function> const String& resolveRopeWithFunction(ExecState* nullOrExecForOOM, Function&&) const; >- JS_EXPORT_PRIVATE AtomicString resolveRopeToAtomicString(ExecState*) const; >- JS_EXPORT_PRIVATE RefPtr<AtomicStringImpl> resolveRopeToExistingAtomicString(ExecState*) const; >+ JS_EXPORT_PRIVATE AtomString resolveRopeToAtomString(ExecState*) const; >+ JS_EXPORT_PRIVATE RefPtr<AtomStringImpl> resolveRopeToExistingAtomString(ExecState*) const; > void resolveRopeSlowCase8(LChar*) const; > void resolveRopeSlowCase(UChar*) const; > void outOfMemory(ExecState* nullOrExecForOOM) const; >@@ -735,27 +735,27 @@ inline JSString* jsNontrivialString(VM* vm, String&& s) > > ALWAYS_INLINE Identifier JSString::toIdentifier(ExecState* exec) const > { >- return Identifier::fromString(exec, toAtomicString(exec)); >+ return Identifier::fromString(exec, toAtomString(exec)); > } > >-ALWAYS_INLINE AtomicString JSString::toAtomicString(ExecState* exec) const >+ALWAYS_INLINE AtomString JSString::toAtomString(ExecState* exec) const > { > if (validateDFGDoesGC) > RELEASE_ASSERT(vm()->heap.expectDoesGC()); > if (isRope()) >- return static_cast<const JSRopeString*>(this)->resolveRopeToAtomicString(exec); >- return AtomicString(valueInternal()); >+ return static_cast<const JSRopeString*>(this)->resolveRopeToAtomString(exec); >+ return AtomString(valueInternal()); > } > >-ALWAYS_INLINE RefPtr<AtomicStringImpl> JSString::toExistingAtomicString(ExecState* exec) const >+ALWAYS_INLINE RefPtr<AtomStringImpl> JSString::toExistingAtomString(ExecState* exec) const > { > if (validateDFGDoesGC) > RELEASE_ASSERT(vm()->heap.expectDoesGC()); > if (isRope()) >- return static_cast<const JSRopeString*>(this)->resolveRopeToExistingAtomicString(exec); >- if (valueInternal().impl()->isAtomic()) >- return static_cast<AtomicStringImpl*>(valueInternal().impl()); >- return AtomicStringImpl::lookUp(valueInternal().impl()); >+ return static_cast<const JSRopeString*>(this)->resolveRopeToExistingAtomString(exec); >+ if (valueInternal().impl()->isAtom()) >+ return static_cast<AtomStringImpl*>(valueInternal().impl()); >+ return AtomStringImpl::lookUp(valueInternal().impl()); > } > > inline const String& JSString::value(ExecState* exec) const >diff --git a/Source/JavaScriptCore/runtime/PropertyMapHashTable.h b/Source/JavaScriptCore/runtime/PropertyMapHashTable.h >index 70e9a71d0ddb064cc255b4e3e22a90abdeaf3828..5f078d2a509d2b44200f7a4af3881246cb2d58a7 100644 >--- a/Source/JavaScriptCore/runtime/PropertyMapHashTable.h >+++ b/Source/JavaScriptCore/runtime/PropertyMapHashTable.h >@@ -27,7 +27,7 @@ > #include <wtf/HashTable.h> > #include <wtf/MathExtras.h> > #include <wtf/Vector.h> >-#include <wtf/text/AtomicStringImpl.h> >+#include <wtf/text/AtomStringImpl.h> > > > #define DUMP_PROPERTYMAP_STATS 0 >@@ -288,7 +288,7 @@ inline PropertyTable::const_iterator PropertyTable::end() const > inline PropertyTable::find_iterator PropertyTable::find(const KeyType& key) > { > ASSERT(key); >- ASSERT(key->isAtomic() || key->isSymbol()); >+ ASSERT(key->isAtom() || key->isSymbol()); > unsigned hash = IdentifierRepHash::hash(key); > > #if DUMP_PROPERTYMAP_STATS >@@ -318,7 +318,7 @@ inline PropertyTable::find_iterator PropertyTable::find(const KeyType& key) > inline PropertyTable::ValueType* PropertyTable::get(const KeyType& key) > { > ASSERT(key); >- ASSERT(key->isAtomic() || key->isSymbol()); >+ ASSERT(key->isAtom() || key->isSymbol()); > > if (!m_keyCount) > return nullptr; >diff --git a/Source/JavaScriptCore/runtime/PropertyName.h b/Source/JavaScriptCore/runtime/PropertyName.h >index e90551bcd1b73e5f4e864613a11bf516d921dbad..feb52e6cf0a882c190f5f98e5ecc91fe36aa85b5 100644 >--- a/Source/JavaScriptCore/runtime/PropertyName.h >+++ b/Source/JavaScriptCore/runtime/PropertyName.h >@@ -69,9 +69,9 @@ public: > return m_impl; > } > >- AtomicStringImpl* publicName() const >+ AtomStringImpl* publicName() const > { >- return (!m_impl || m_impl->isSymbol()) ? nullptr : static_cast<AtomicStringImpl*>(m_impl); >+ return (!m_impl || m_impl->isSymbol()) ? nullptr : static_cast<AtomStringImpl*>(m_impl); > } > > void dump(PrintStream& out) const >diff --git a/Source/JavaScriptCore/runtime/SmallStrings.cpp b/Source/JavaScriptCore/runtime/SmallStrings.cpp >index 0b5404f6e52e58d8167f63caf6aebf7b36cdb4de..bfcd0b96bf8ad0a4eee01eefd7651849b0645405 100644 >--- a/Source/JavaScriptCore/runtime/SmallStrings.cpp >+++ b/Source/JavaScriptCore/runtime/SmallStrings.cpp >@@ -51,7 +51,7 @@ void SmallStrings::initializeCommonStrings(VM& vm) > for (unsigned i = 0; i < singleCharacterStringCount; ++i) { > ASSERT(!m_singleCharacterStrings[i]); > const LChar string[] = { static_cast<LChar>(i) }; >- m_singleCharacterStrings[i] = JSString::createHasOtherOwner(vm, AtomicStringImpl::add(string, 1).releaseNonNull()); >+ m_singleCharacterStrings[i] = JSString::createHasOtherOwner(vm, AtomStringImpl::add(string, 1).releaseNonNull()); > ASSERT(m_needsToBeVisited); > } > >@@ -88,12 +88,12 @@ Ref<StringImpl> SmallStrings::singleCharacterStringRep(unsigned char character) > if (LIKELY(m_isInitialized)) > return *const_cast<StringImpl*>(m_singleCharacterStrings[character]->tryGetValueImpl()); > const LChar string[] = { static_cast<LChar>(character) }; >- return AtomicStringImpl::add(string, 1).releaseNonNull(); >+ return AtomStringImpl::add(string, 1).releaseNonNull(); > } > > void SmallStrings::initialize(VM* vm, JSString*& string, const char* value) > { >- string = JSString::create(*vm, AtomicStringImpl::add(value).releaseNonNull()); >+ string = JSString::create(*vm, AtomStringImpl::add(value).releaseNonNull()); > ASSERT(m_needsToBeVisited); > } > >diff --git a/Source/JavaScriptCore/runtime/VM.cpp b/Source/JavaScriptCore/runtime/VM.cpp >index 2861a12dc2ee398c5232f99fbb9c2e9860d4fbac..b1e3ff3954341ee4f114698660b9837f3090bcc9 100644 >--- a/Source/JavaScriptCore/runtime/VM.cpp >+++ b/Source/JavaScriptCore/runtime/VM.cpp >@@ -155,7 +155,7 @@ > #include <wtf/SimpleStats.h> > #include <wtf/StringPrintStream.h> > #include <wtf/Threading.h> >-#include <wtf/text/AtomicStringTable.h> >+#include <wtf/text/AtomStringTable.h> > #include <wtf/text/SymbolRegistry.h> > > #if ENABLE(C_LOOP) >@@ -292,7 +292,7 @@ VM::VM(VMType vmType, HeapType heapType) > , topEntryFrame(nullptr) > , topCallFrame(CallFrame::noCaller()) > , promiseDeferredTimer(std::make_unique<PromiseDeferredTimer>(*this)) >- , m_atomicStringTable(vmType == Default ? Thread::current().atomicStringTable() : new AtomicStringTable) >+ , m_atomStringTable(vmType == Default ? Thread::current().atomStringTable() : new AtomStringTable) > , propertyNames(nullptr) > , emptyList(new ArgList) > , machineCodeBytesPerBytecodeWordForBaselineJIT(std::make_unique<SimpleStats>()) >@@ -329,7 +329,7 @@ VM::VM(VMType vmType, HeapType heapType) > > // Need to be careful to keep everything consistent here > JSLockHolder lock(this); >- AtomicStringTable* existingEntryAtomicStringTable = Thread::current().setCurrentAtomicStringTable(m_atomicStringTable); >+ AtomStringTable* existingEntryAtomStringTable = Thread::current().setCurrentAtomStringTable(m_atomStringTable); > structureStructure.set(*this, Structure::createStructure(*this)); > structureRareDataStructure.set(*this, StructureRareData::createStructure(*this, 0, jsNull())); > stringStructure.set(*this, JSString::createStructure(*this, 0, jsNull())); >@@ -393,7 +393,7 @@ VM::VM(VMType vmType, HeapType heapType) > sentinelSetBucket(); > } > >- Thread::current().setCurrentAtomicStringTable(existingEntryAtomicStringTable); >+ Thread::current().setCurrentAtomStringTable(existingEntryAtomStringTable); > > #if !ENABLE(C_LOOP) > initializeHostCallReturnValue(); // This is needed to convince the linker not to drop host call return support. >@@ -541,7 +541,7 @@ VM::~VM() > > delete propertyNames; > if (vmType != Default) >- delete m_atomicStringTable; >+ delete m_atomStringTable; > > delete clientData; > delete m_regExpCache; >diff --git a/Source/JavaScriptCore/runtime/VM.h b/Source/JavaScriptCore/runtime/VM.h >index eee155c4b297d9229dbaf3fdcc9ab27d9fb0a8a2..566e013f3bb55bac3a41b83bd5e3abf177d366a8 100644 >--- a/Source/JavaScriptCore/runtime/VM.h >+++ b/Source/JavaScriptCore/runtime/VM.h >@@ -554,7 +554,7 @@ public: > JSCell* currentlyDestructingCallbackObject; > const ClassInfo* currentlyDestructingCallbackObjectClassInfo { nullptr }; > >- AtomicStringTable* m_atomicStringTable; >+ AtomStringTable* m_atomStringTable; > WTF::SymbolRegistry m_symbolRegistry; > CommonIdentifiers* propertyNames; > const ArgList* emptyList; >@@ -566,7 +566,7 @@ public: > WeakGCMap<StringImpl*, JSString, PtrHash<StringImpl*>> stringCache; > Strong<JSString> lastCachedString; > >- AtomicStringTable* atomicStringTable() const { return m_atomicStringTable; } >+ AtomStringTable* atomStringTable() const { return m_atomStringTable; } > WTF::SymbolRegistry& symbolRegistry() { return m_symbolRegistry; } > > Structure* setIteratorStructure() >@@ -866,7 +866,7 @@ public: > WatchpointSet* ensureWatchpointSetForImpureProperty(const Identifier&); > void registerWatchpointForImpureProperty(const Identifier&, Watchpoint*); > >- // FIXME: Use AtomicString once it got merged with Identifier. >+ // FIXME: Use AtomString once it got merged with Identifier. > JS_EXPORT_PRIVATE void addImpureProperty(const String&); > > InlineWatchpointSet& primitiveGigacageEnabled() { return m_primitiveGigacageEnabled; } >diff --git a/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.cpp b/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.cpp >index 71909084a3c8f5b468d7820f74b1ffbfd2472a5b..3abbcf5847f94385eda8e50e8b26f229521eaaa7 100644 >--- a/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.cpp >+++ b/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.cpp >@@ -82,7 +82,7 @@ void JSWebAssemblyModule::finishCreation(VM& vm) > for (auto& exp : moduleInformation.exports) { > auto offset = exportSymbolTable->takeNextScopeOffset(NoLockingNecessary); > String field = String::fromUTF8(exp.field); >- exportSymbolTable->set(NoLockingNecessary, AtomicString(field).impl(), SymbolTableEntry(VarOffset(offset))); >+ exportSymbolTable->set(NoLockingNecessary, AtomString(field).impl(), SymbolTableEntry(VarOffset(offset))); > } > > m_exportSymbolTable.set(vm, this, exportSymbolTable); >diff --git a/Source/WTF/WTF.xcodeproj/project.pbxproj b/Source/WTF/WTF.xcodeproj/project.pbxproj >index 26344ac725ac93d02eab93c44e5ecf3e3dafc8dd..077afbfb1dd4c96c0a8e9e8795148d981ffc00dd 100644 >--- a/Source/WTF/WTF.xcodeproj/project.pbxproj >+++ b/Source/WTF/WTF.xcodeproj/project.pbxproj >@@ -79,7 +79,7 @@ > 5CC0EE8A2162BC2200A1A842 /* NSURLExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CC0EE882162BC2200A1A842 /* NSURLExtras.mm */; }; > 5FAD3AE221B9636600BEE178 /* URLHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5FAD3AE121B9636600BEE178 /* URLHelpers.cpp */; }; > 70A993FE1AD7151300FA615B /* SymbolRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70A993FC1AD7151300FA615B /* SymbolRegistry.cpp */; }; >- 70ECA60D1B02426800449739 /* AtomicStringImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70ECA60A1B02426800449739 /* AtomicStringImpl.cpp */; }; >+ 70ECA60D1B02426800449739 /* AtomStringImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70ECA60A1B02426800449739 /* AtomStringImpl.cpp */; }; > 7A05093F1FB9DCC500B33FB8 /* JSONValues.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A05093E1FB9DCC500B33FB8 /* JSONValues.cpp */; }; > 7A6EBA3420746C34004F9C44 /* MachSendRight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A6EBA3320746C34004F9C44 /* MachSendRight.cpp */; }; > 7AF023B52061E17000A8EFD6 /* ProcessPrivilege.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AF023B42061E16F00A8EFD6 /* ProcessPrivilege.cpp */; }; >@@ -91,7 +91,7 @@ > 93B5B44E2213D616004B7AA7 /* HexNumber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B5B44D2213D616004B7AA7 /* HexNumber.cpp */; }; > 93B5B45122171EEA004B7AA7 /* Logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B5B45022171EE9004B7AA7 /* Logger.cpp */; }; > 93F1993E19D7958D00C2390B /* StringView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F1993D19D7958D00C2390B /* StringView.cpp */; }; >- 9BC70F05176C379D00101DEC /* AtomicStringTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BC70F04176C379D00101DEC /* AtomicStringTable.cpp */; }; >+ 9BC70F05176C379D00101DEC /* AtomStringTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BC70F04176C379D00101DEC /* AtomStringTable.cpp */; }; > A32D8FA521FFFAB400780662 /* ThreadingPOSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A32D8FA421FFFAB400780662 /* ThreadingPOSIX.cpp */; }; > A331D95B21F24992009F02AA /* FileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A331D95A21F24992009F02AA /* FileSystem.cpp */; }; > A331D95D21F249E4009F02AA /* FileSystemCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A331D95C21F249E4009F02AA /* FileSystemCF.cpp */; }; >@@ -106,7 +106,7 @@ > A3EE5C4021FFACA200FABD61 /* SchedulePairMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3EE5C3F21FFACA200FABD61 /* SchedulePairMac.mm */; }; > A5BA15F3182433A900A82E69 /* StringCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F2182433A900A82E69 /* StringCocoa.mm */; }; > A5BA15F51824348000A82E69 /* StringImplCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F41824348000A82E69 /* StringImplCocoa.mm */; }; >- A5BA15FA182435A600A82E69 /* AtomicStringImplCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F7182435A600A82E69 /* AtomicStringImplCF.cpp */; }; >+ A5BA15FA182435A600A82E69 /* AtomStringImplCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F7182435A600A82E69 /* AtomStringImplCF.cpp */; }; > A5BA15FB182435A600A82E69 /* StringCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F8182435A600A82E69 /* StringCF.cpp */; }; > A5BA15FC182435A600A82E69 /* StringImplCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F9182435A600A82E69 /* StringImplCF.cpp */; }; > A748745217A0BDAE00FA04CB /* SixCharacterHash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A748744F17A0BDAE00FA04CB /* SixCharacterHash.cpp */; }; >@@ -139,7 +139,7 @@ > A8A47421151A825B004123FF /* SHA1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A47308151A825B004123FF /* SHA1.cpp */; }; > A8A47425151A825B004123FF /* SizeLimits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A4730C151A825B004123FF /* SizeLimits.cpp */; }; > A8A47427151A825B004123FF /* StackBounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A4730E151A825B004123FF /* StackBounds.cpp */; }; >- A8A47435151A825B004123FF /* AtomicString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A4731D151A825B004123FF /* AtomicString.cpp */; }; >+ A8A47435151A825B004123FF /* AtomString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A4731D151A825B004123FF /* AtomString.cpp */; }; > A8A47439151A825B004123FF /* CString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A47321151A825B004123FF /* CString.cpp */; }; > A8A4743C151A825B004123FF /* StringBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A47324151A825B004123FF /* StringBuilder.cpp */; }; > A8A47440151A825B004123FF /* StringImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A47328151A825B004123FF /* StringImpl.cpp */; }; >@@ -398,7 +398,7 @@ > 6541CAF41630DB26006D0DEC /* CopyWTFHeaders.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CopyWTFHeaders.xcconfig; sourceTree = "<group>"; }; > 70A993FC1AD7151300FA615B /* SymbolRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SymbolRegistry.cpp; sourceTree = "<group>"; }; > 70A993FD1AD7151300FA615B /* SymbolRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SymbolRegistry.h; sourceTree = "<group>"; }; >- 70ECA60A1B02426800449739 /* AtomicStringImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomicStringImpl.cpp; sourceTree = "<group>"; }; >+ 70ECA60A1B02426800449739 /* AtomStringImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomStringImpl.cpp; sourceTree = "<group>"; }; > 70ECA60B1B02426800449739 /* SymbolImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SymbolImpl.h; sourceTree = "<group>"; }; > 70ECA60C1B02426800449739 /* UniquedStringImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniquedStringImpl.h; sourceTree = "<group>"; }; > 79038E05224B05A7004C0738 /* SpanningTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpanningTree.h; sourceTree = "<group>"; }; >@@ -446,8 +446,8 @@ > 974CFC8D16A4F327006D5404 /* WeakPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakPtr.h; sourceTree = "<group>"; }; > 996B17841EBA441C007E10EB /* DebugUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugUtilities.h; sourceTree = "<group>"; }; > 9B67F3F12228D5310030DE9C /* WeakHashSet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WeakHashSet.h; sourceTree = "<group>"; }; >- 9BC70F04176C379D00101DEC /* AtomicStringTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomicStringTable.cpp; sourceTree = "<group>"; }; >- 9BD8F40A176C2AD80002D865 /* AtomicStringTable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AtomicStringTable.h; sourceTree = "<group>"; }; >+ 9BC70F04176C379D00101DEC /* AtomStringTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomStringTable.cpp; sourceTree = "<group>"; }; >+ 9BD8F40A176C2AD80002D865 /* AtomStringTable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AtomStringTable.h; sourceTree = "<group>"; }; > 9C67C542589348E285B49699 /* IndexedContainerIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexedContainerIterator.h; sourceTree = "<group>"; }; > A1B89B87221E000F00EB4CEA /* SDKVariant.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = SDKVariant.xcconfig; sourceTree = "<group>"; }; > A30D412C1F0DE0BA00B71954 /* SoftLinking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoftLinking.h; sourceTree = "<group>"; }; >@@ -473,7 +473,7 @@ > A5098B011C16A4F900087797 /* SecuritySPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecuritySPI.h; sourceTree = "<group>"; }; > A5BA15F2182433A900A82E69 /* StringCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StringCocoa.mm; sourceTree = "<group>"; }; > A5BA15F41824348000A82E69 /* StringImplCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StringImplCocoa.mm; sourceTree = "<group>"; }; >- A5BA15F7182435A600A82E69 /* AtomicStringImplCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomicStringImplCF.cpp; sourceTree = "<group>"; }; >+ A5BA15F7182435A600A82E69 /* AtomStringImplCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomStringImplCF.cpp; sourceTree = "<group>"; }; > A5BA15F8182435A600A82E69 /* StringCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringCF.cpp; sourceTree = "<group>"; }; > A5BA15F9182435A600A82E69 /* StringImplCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringImplCF.cpp; sourceTree = "<group>"; }; > A70DA0821799F04D00529A9B /* Insertion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Insertion.h; sourceTree = "<group>"; }; >@@ -589,10 +589,10 @@ > A8A47314151A825B004123FF /* Hasher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Hasher.h; sourceTree = "<group>"; }; > A8A4731A151A825B004123FF /* SetForScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetForScope.h; sourceTree = "<group>"; }; > A8A4731C151A825B004123FF /* ASCIIFastPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASCIIFastPath.h; sourceTree = "<group>"; }; >- A8A4731D151A825B004123FF /* AtomicString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomicString.cpp; sourceTree = "<group>"; }; >- A8A4731E151A825B004123FF /* AtomicString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicString.h; sourceTree = "<group>"; }; >- A8A4731F151A825B004123FF /* AtomicStringHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicStringHash.h; sourceTree = "<group>"; }; >- A8A47320151A825B004123FF /* AtomicStringImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicStringImpl.h; sourceTree = "<group>"; }; >+ A8A4731D151A825B004123FF /* AtomString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomString.cpp; sourceTree = "<group>"; }; >+ A8A4731E151A825B004123FF /* AtomString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomString.h; sourceTree = "<group>"; }; >+ A8A4731F151A825B004123FF /* AtomStringHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomStringHash.h; sourceTree = "<group>"; }; >+ A8A47320151A825B004123FF /* AtomStringImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomStringImpl.h; sourceTree = "<group>"; }; > A8A47321151A825B004123FF /* CString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CString.cpp; sourceTree = "<group>"; }; > A8A47322151A825B004123FF /* CString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CString.h; sourceTree = "<group>"; }; > A8A47323151A825B004123FF /* StringBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringBuffer.h; sourceTree = "<group>"; }; >@@ -842,7 +842,7 @@ > A5BA15F61824359E00A82E69 /* cf */ = { > isa = PBXGroup; > children = ( >- A5BA15F7182435A600A82E69 /* AtomicStringImplCF.cpp */, >+ A5BA15F7182435A600A82E69 /* AtomStringImplCF.cpp */, > A5BA15F8182435A600A82E69 /* StringCF.cpp */, > A5BA15F9182435A600A82E69 /* StringImplCF.cpp */, > 93934BD418A1F16900D0D6A1 /* StringViewCF.cpp */, >@@ -1268,13 +1268,13 @@ > A8A4731C151A825B004123FF /* ASCIIFastPath.h */, > C6F050790D9C432A99085E75 /* ASCIILiteral.cpp */, > 382029E246C84B0099FD6764 /* ASCIILiteral.h */, >- A8A4731D151A825B004123FF /* AtomicString.cpp */, >- A8A4731E151A825B004123FF /* AtomicString.h */, >- A8A4731F151A825B004123FF /* AtomicStringHash.h */, >- 70ECA60A1B02426800449739 /* AtomicStringImpl.cpp */, >- A8A47320151A825B004123FF /* AtomicStringImpl.h */, >- 9BC70F04176C379D00101DEC /* AtomicStringTable.cpp */, >- 9BD8F40A176C2AD80002D865 /* AtomicStringTable.h */, >+ A8A4731D151A825B004123FF /* AtomString.cpp */, >+ A8A4731E151A825B004123FF /* AtomString.h */, >+ A8A4731F151A825B004123FF /* AtomStringHash.h */, >+ 70ECA60A1B02426800449739 /* AtomStringImpl.cpp */, >+ A8A47320151A825B004123FF /* AtomStringImpl.h */, >+ 9BC70F04176C379D00101DEC /* AtomStringTable.cpp */, >+ 9BD8F40A176C2AD80002D865 /* AtomStringTable.h */, > 8134013615B092FD001FF0B8 /* Base64.cpp */, > 8134013715B092FD001FF0B8 /* Base64.h */, > 0F8F2B9B172F2594007DBDA5 /* ConversionMode.h */, >@@ -1503,10 +1503,10 @@ > 4427C5AA21F6D6C300A612A4 /* ASCIICType.cpp in Sources */, > C805EF39E5F14481A96D39FC /* ASCIILiteral.cpp in Sources */, > A8A47386151A825B004123FF /* Assertions.cpp in Sources */, >- A8A47435151A825B004123FF /* AtomicString.cpp in Sources */, >- 70ECA60D1B02426800449739 /* AtomicStringImpl.cpp in Sources */, >- A5BA15FA182435A600A82E69 /* AtomicStringImplCF.cpp in Sources */, >- 9BC70F05176C379D00101DEC /* AtomicStringTable.cpp in Sources */, >+ A8A47435151A825B004123FF /* AtomString.cpp in Sources */, >+ 70ECA60D1B02426800449739 /* AtomStringImpl.cpp in Sources */, >+ A5BA15FA182435A600A82E69 /* AtomStringImplCF.cpp in Sources */, >+ 9BC70F05176C379D00101DEC /* AtomStringTable.cpp in Sources */, > 1469419D16EAB10A0024E146 /* AutodrainedPool.cpp in Sources */, > 0F43D8F11DB5ADDC00108FB6 /* AutomaticThread.cpp in Sources */, > 8134013815B092FD001FF0B8 /* Base64.cpp in Sources */, >diff --git a/Source/WTF/wtf/BloomFilter.h b/Source/WTF/wtf/BloomFilter.h >index eda9210f25ec183a6d24817241bccab6ea9afc55..15d1fdd90e964292a3bd2f35760429c5d05c122a 100644 >--- a/Source/WTF/wtf/BloomFilter.h >+++ b/Source/WTF/wtf/BloomFilter.h >@@ -26,7 +26,7 @@ > #pragma once > > #include <array> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WTF { > >@@ -55,9 +55,9 @@ public: > > void clear(); > >- void add(const AtomicString& string) { add(string.impl()->existingHash()); } >+ void add(const AtomString& string) { add(string.impl()->existingHash()); } > void add(const String& string) { add(string.impl()->hash()); } >- bool mayContain(const AtomicString& string) const { return mayContain(string.impl()->existingHash()); } >+ bool mayContain(const AtomString& string) const { return mayContain(string.impl()->existingHash()); } > bool mayContain(const String& string) const { return mayContain(string.impl()->hash()); } > > private: >@@ -174,12 +174,12 @@ public: > // Otherwise overflowed keys will stick around. > void clear(); > >- void add(const AtomicString& string) { add(string.impl()->existingHash()); } >+ void add(const AtomString& string) { add(string.impl()->existingHash()); } > void add(const String& string) { add(string.impl()->hash()); } >- void remove(const AtomicString& string) { remove(string.impl()->existingHash()); } >+ void remove(const AtomString& string) { remove(string.impl()->existingHash()); } > void remove(const String& string) { remove(string.impl()->hash()); } > >- bool mayContain(const AtomicString& string) const { return mayContain(string.impl()->existingHash()); } >+ bool mayContain(const AtomString& string) const { return mayContain(string.impl()->existingHash()); } > bool mayContain(const String& string) const { return mayContain(string.impl()->hash()); } > > #if !ASSERT_DISABLED >diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt >index 975d87132a53444567ffeb4cb98786ae03874bbc..fe40fe0b37b72d8dbe8021fc8cd169e01a2b463d 100644 >--- a/Source/WTF/wtf/CMakeLists.txt >+++ b/Source/WTF/wtf/CMakeLists.txt >@@ -289,10 +289,10 @@ set(WTF_PUBLIC_HEADERS > > text/ASCIIFastPath.h > text/ASCIILiteral.h >- text/AtomicString.h >- text/AtomicStringHash.h >- text/AtomicStringImpl.h >- text/AtomicStringTable.h >+ text/AtomString.h >+ text/AtomStringHash.h >+ text/AtomStringImpl.h >+ text/AtomStringTable.h > text/Base64.h > text/CString.h > text/ConversionMode.h >@@ -430,9 +430,9 @@ set(WTF_SOURCES > persistence/PersistentEncoder.cpp > > text/ASCIILiteral.cpp >- text/AtomicString.cpp >- text/AtomicStringImpl.cpp >- text/AtomicStringTable.cpp >+ text/AtomString.cpp >+ text/AtomStringImpl.cpp >+ text/AtomStringTable.cpp > text/Base64.cpp > text/CString.cpp > text/ExternalStringImpl.cpp >diff --git a/Source/WTF/wtf/Forward.h b/Source/WTF/wtf/Forward.h >index f6a0c0e5829951a21d69f4a65363600d336dd4b2..f60391259b65def7e96c91213f78853fe73b5150 100644 >--- a/Source/WTF/wtf/Forward.h >+++ b/Source/WTF/wtf/Forward.h >@@ -24,8 +24,8 @@ > > namespace WTF { > >-class AtomicString; >-class AtomicStringImpl; >+class AtomString; >+class AtomStringImpl; > class BinarySemaphore; > class CString; > class CrashOnOverflow; >@@ -87,8 +87,8 @@ template<class, class> class expected; > template<class> class unexpected; > }}} // namespace std::experimental::fundamentals_v3 > >-using WTF::AtomicString; >-using WTF::AtomicStringImpl; >+using WTF::AtomString; >+using WTF::AtomStringImpl; > using WTF::BinarySemaphore; > using WTF::CString; > using WTF::CompletionHandler; >diff --git a/Source/WTF/wtf/Logger.h b/Source/WTF/wtf/Logger.h >index 552f9b63bf7587089a1eed6e61b377c56820a85a..4f5e1a370ec902a9ce69ceef6c5ab03aa96d2761 100644 >--- a/Source/WTF/wtf/Logger.h >+++ b/Source/WTF/wtf/Logger.h >@@ -41,7 +41,7 @@ struct LogArgument { > template<typename U = T> static typename std::enable_if<std::is_enum<U>::value, String>::type toString(U argument) { return String::number(static_cast<typename std::underlying_type<U>::type>(argument)); } > template<typename U = T> static typename std::enable_if<std::is_same<U, float>::value, String>::type toString(float argument) { return String::numberToStringFixedPrecision(argument); } > template<typename U = T> static typename std::enable_if<std::is_same<U, double>::value, String>::type toString(double argument) { return String::numberToStringFixedPrecision(argument); } >- template<typename U = T> static typename std::enable_if<std::is_same<typename std::remove_reference<U>::type, AtomicString>::value, String>::type toString(const AtomicString& argument) { return argument.string(); } >+ template<typename U = T> static typename std::enable_if<std::is_same<typename std::remove_reference<U>::type, AtomString>::value, String>::type toString(const AtomString& argument) { return argument.string(); } > template<typename U = T> static typename std::enable_if<std::is_same<typename std::remove_reference<U>::type, String>::value, String>::type toString(String argument) { return argument; } > template<typename U = T> static typename std::enable_if<std::is_same<typename std::remove_reference<U>::type, StringBuilder*>::value, String>::type toString(StringBuilder* argument) { return argument->toString(); } > template<typename U = T> static typename std::enable_if<std::is_same<U, const char*>::value, String>::type toString(const char* argument) { return String(argument); } >diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake >index e09053bbc41997c58081705ee0a10b44a734c19e..797c5cfe7a5bebe7da2dc8dd9068ddab32c27d53 100644 >--- a/Source/WTF/wtf/PlatformMac.cmake >+++ b/Source/WTF/wtf/PlatformMac.cmake >@@ -69,7 +69,7 @@ list(APPEND WTF_SOURCES > posix/OSAllocatorPOSIX.cpp > posix/ThreadingPOSIX.cpp > >- text/cf/AtomicStringImplCF.cpp >+ text/cf/AtomStringImplCF.cpp > text/cf/StringCF.cpp > text/cf/StringImplCF.cpp > text/cf/StringViewCF.cpp >diff --git a/Source/WTF/wtf/PlatformWin.cmake b/Source/WTF/wtf/PlatformWin.cmake >index c5979d83a4329e120ee0cbd079269e300e6a09ce..9f533faaba75c470b32119e5350de9f07944e4f4 100644 >--- a/Source/WTF/wtf/PlatformWin.cmake >+++ b/Source/WTF/wtf/PlatformWin.cmake >@@ -44,7 +44,7 @@ if (USE_CF) > cf/FileSystemCF.cpp > cf/URLCF.cpp > >- text/cf/AtomicStringImplCF.cpp >+ text/cf/AtomStringImplCF.cpp > text/cf/StringCF.cpp > text/cf/StringImplCF.cpp > text/cf/StringViewCF.cpp >diff --git a/Source/WTF/wtf/PrintStream.h b/Source/WTF/wtf/PrintStream.h >index 5c9fbdb3901d9b7b52b601b5967f65b6745918a8..04b0561bce1d60d30ae3123c6a870d68d2f92d4c 100644 >--- a/Source/WTF/wtf/PrintStream.h >+++ b/Source/WTF/wtf/PrintStream.h >@@ -98,14 +98,14 @@ WTF_EXPORT_PRIVATE void printInternal(PrintStream&, const StringView&); > WTF_EXPORT_PRIVATE void printInternal(PrintStream&, const CString&); > WTF_EXPORT_PRIVATE void printInternal(PrintStream&, const String&); > WTF_EXPORT_PRIVATE void printInternal(PrintStream&, const StringImpl*); >-inline void printInternal(PrintStream& out, const AtomicStringImpl* value) { printInternal(out, bitwise_cast<const StringImpl*>(value)); } >+inline void printInternal(PrintStream& out, const AtomStringImpl* value) { printInternal(out, bitwise_cast<const StringImpl*>(value)); } > inline void printInternal(PrintStream& out, const UniquedStringImpl* value) { printInternal(out, bitwise_cast<const StringImpl*>(value)); } > inline void printInternal(PrintStream& out, const UniquedStringImpl& value) { printInternal(out, &value); } > inline void printInternal(PrintStream& out, char* value) { printInternal(out, static_cast<const char*>(value)); } > inline void printInternal(PrintStream& out, CString& value) { printInternal(out, static_cast<const CString&>(value)); } > inline void printInternal(PrintStream& out, String& value) { printInternal(out, static_cast<const String&>(value)); } > inline void printInternal(PrintStream& out, StringImpl* value) { printInternal(out, static_cast<const StringImpl*>(value)); } >-inline void printInternal(PrintStream& out, AtomicStringImpl* value) { printInternal(out, static_cast<const AtomicStringImpl*>(value)); } >+inline void printInternal(PrintStream& out, AtomStringImpl* value) { printInternal(out, static_cast<const AtomStringImpl*>(value)); } > inline void printInternal(PrintStream& out, UniquedStringImpl* value) { printInternal(out, static_cast<const UniquedStringImpl*>(value)); } > inline void printInternal(PrintStream& out, UniquedStringImpl& value) { printInternal(out, &value); } > WTF_EXPORT_PRIVATE void printInternal(PrintStream&, bool); >diff --git a/Source/WTF/wtf/Threading.cpp b/Source/WTF/wtf/Threading.cpp >index 908bafe63f9ce55698f2bde3160db51a6bd6e3c0..07e7d0f2316949088e498204eee9970075e4a131 100644 >--- a/Source/WTF/wtf/Threading.cpp >+++ b/Source/WTF/wtf/Threading.cpp >@@ -36,7 +36,7 @@ > #include <wtf/ThreadGroup.h> > #include <wtf/ThreadMessage.h> > #include <wtf/ThreadingPrimitives.h> >-#include <wtf/text/AtomicStringTable.h> >+#include <wtf/text/AtomStringTable.h> > #include <wtf/text/StringView.h> > > #if HAVE(QOS_CLASSES) >@@ -111,12 +111,12 @@ void Thread::initializeInThread() > m_stack = StackBounds::currentThreadStackBounds(); > m_savedLastStackTop = stack().origin(); > >- m_currentAtomicStringTable = &m_defaultAtomicStringTable; >+ m_currentAtomStringTable = &m_defaultAtomStringTable; > #if USE(WEB_THREAD) >- // On iOS, one AtomicStringTable is shared between the main UI thread and the WebThread. >+ // On iOS, one AtomStringTable is shared between the main UI thread and the WebThread. > if (isWebThread() || isUIThread()) { >- static NeverDestroyed<AtomicStringTable> sharedStringTable; >- m_currentAtomicStringTable = &sharedStringTable.get(); >+ static NeverDestroyed<AtomStringTable> sharedStringTable; >+ m_currentAtomStringTable = &sharedStringTable.get(); > } > #endif > } >diff --git a/Source/WTF/wtf/Threading.h b/Source/WTF/wtf/Threading.h >index 198a0e54c29252dd6c5a3a81af9c3ffc676cd502..6953f6eeefd4cc179c3266c34e6945df3237cf4b 100644 >--- a/Source/WTF/wtf/Threading.h >+++ b/Source/WTF/wtf/Threading.h >@@ -45,7 +45,7 @@ > #include <wtf/ThreadSafeRefCounted.h> > #include <wtf/Vector.h> > #include <wtf/WordLock.h> >-#include <wtf/text/AtomicStringTable.h> >+#include <wtf/text/AtomStringTable.h> > > #if USE(PTHREADS) && !OS(DARWIN) > #include <signal.h> >@@ -156,16 +156,16 @@ public: > return m_stack; > } > >- AtomicStringTable* atomicStringTable() >+ AtomStringTable* atomStringTable() > { >- return m_currentAtomicStringTable; >+ return m_currentAtomStringTable; > } > >- AtomicStringTable* setCurrentAtomicStringTable(AtomicStringTable* atomicStringTable) >+ AtomStringTable* setCurrentAtomStringTable(AtomStringTable* atomStringTable) > { >- AtomicStringTable* oldAtomicStringTable = m_currentAtomicStringTable; >- m_currentAtomicStringTable = atomicStringTable; >- return oldAtomicStringTable; >+ AtomStringTable* oldAtomStringTable = m_currentAtomStringTable; >+ m_currentAtomStringTable = atomStringTable; >+ return oldAtomStringTable; > } > > #if ENABLE(STACK_STATS) >@@ -301,8 +301,8 @@ protected: > unsigned m_suspendCount { 0 }; > #endif > >- AtomicStringTable* m_currentAtomicStringTable { nullptr }; >- AtomicStringTable m_defaultAtomicStringTable; >+ AtomStringTable* m_currentAtomStringTable { nullptr }; >+ AtomStringTable m_defaultAtomStringTable; > > #if ENABLE(STACK_STATS) > StackStats::PerThreadStats m_stackStats; >diff --git a/Source/WTF/wtf/VectorTraits.h b/Source/WTF/wtf/VectorTraits.h >index 2bf5eee1d2a661901d9488200ff1a47f7f411948..d7838c4e075b3cb614e7f166b86cd3de7d81e99c 100644 >--- a/Source/WTF/wtf/VectorTraits.h >+++ b/Source/WTF/wtf/VectorTraits.h >@@ -28,7 +28,7 @@ > > namespace WTF { > >- class AtomicString; >+ class AtomString; > > template<bool isPod, typename T> > struct VectorTraitsBase; >@@ -71,7 +71,7 @@ namespace WTF { > template<typename P> struct VectorTraits<RefPtr<P>> : SimpleClassVectorTraits { }; > template<typename P> struct VectorTraits<std::unique_ptr<P>> : SimpleClassVectorTraits { }; > template<typename P> struct VectorTraits<Ref<P>> : SimpleClassVectorTraits { }; >- template<> struct VectorTraits<AtomicString> : SimpleClassVectorTraits { }; >+ template<> struct VectorTraits<AtomString> : SimpleClassVectorTraits { }; > > template<typename First, typename Second> > struct VectorTraits<std::pair<First, Second>> >diff --git a/Source/WTF/wtf/persistence/PersistentCoders.cpp b/Source/WTF/wtf/persistence/PersistentCoders.cpp >index 99b2beeacbaa70698950b66cf4a01e79c2b12590..6ea25ea2fd97d9a222f2e0d4180dd283051cc158 100644 >--- a/Source/WTF/wtf/persistence/PersistentCoders.cpp >+++ b/Source/WTF/wtf/persistence/PersistentCoders.cpp >@@ -32,18 +32,18 @@ > namespace WTF { > namespace Persistence { > >-void Coder<AtomicString>::encode(Encoder& encoder, const AtomicString& atomicString) >+void Coder<AtomString>::encode(Encoder& encoder, const AtomString& atomString) > { >- encoder << atomicString.string(); >+ encoder << atomString.string(); > } > >-bool Coder<AtomicString>::decode(Decoder& decoder, AtomicString& atomicString) >+bool Coder<AtomString>::decode(Decoder& decoder, AtomString& atomString) > { > String string; > if (!decoder.decode(string)) > return false; > >- atomicString = string; >+ atomString = string; > return true; > } > >diff --git a/Source/WTF/wtf/persistence/PersistentCoders.h b/Source/WTF/wtf/persistence/PersistentCoders.h >index 933034f9ec6d46f12692d453b1b8db98e7e94224..7ee3c9329401e8cc70df136197961f8658160c88 100644 >--- a/Source/WTF/wtf/persistence/PersistentCoders.h >+++ b/Source/WTF/wtf/persistence/PersistentCoders.h >@@ -282,9 +282,9 @@ template<> struct Coder<WallTime> { > } > }; > >-template<> struct Coder<AtomicString> { >- WTF_EXPORT_PRIVATE static void encode(Encoder&, const AtomicString&); >- WTF_EXPORT_PRIVATE static bool decode(Decoder&, AtomicString&); >+template<> struct Coder<AtomString> { >+ WTF_EXPORT_PRIVATE static void encode(Encoder&, const AtomString&); >+ WTF_EXPORT_PRIVATE static bool decode(Decoder&, AtomString&); > }; > > template<> struct Coder<CString> { >diff --git a/Source/WTF/wtf/text/AtomString.cpp b/Source/WTF/wtf/text/AtomString.cpp >new file mode 100644 >index 0000000000000000000000000000000000000000..05f5c618bf973c6fc2a4ac02de6c156e66477ab5 >--- /dev/null >+++ b/Source/WTF/wtf/text/AtomString.cpp >@@ -0,0 +1,157 @@ >+/* >+ * Copyright (C) 2004-2017 Apple Inc. All rights reserved. >+ * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> >+ * Copyright (C) 2012 Google Inc. All rights reserved. >+ * >+ * This library is free software; you can redistribute it and/or >+ * modify it under the terms of the GNU Library General Public >+ * License as published by the Free Software Foundation; either >+ * version 2 of the License, or (at your option) any later version. >+ * >+ * This library is distributed in the hope that it will be useful, >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ * Library General Public License for more details. >+ * >+ * You should have received a copy of the GNU Library General Public License >+ * along with this library; see the file COPYING.LIB. If not, write to >+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >+ * Boston, MA 02110-1301, USA. >+ * >+ */ >+ >+#include "config.h" >+#include <wtf/text/AtomString.h> >+ >+#include <mutex> >+#include <wtf/MainThread.h> >+#include <wtf/text/IntegerToStringConversion.h> >+ >+#include <wtf/dtoa.h> >+ >+namespace WTF { >+ >+template<AtomString::CaseConvertType type> >+ALWAYS_INLINE AtomString AtomString::convertASCIICase() const >+{ >+ StringImpl* impl = this->impl(); >+ if (UNLIKELY(!impl)) >+ return nullAtom(); >+ >+ // Convert short strings without allocating a new StringImpl, since >+ // there's a good chance these strings are already in the atomic >+ // string table and so no memory allocation will be required. >+ unsigned length; >+ const unsigned localBufferSize = 100; >+ if (impl->is8Bit() && (length = impl->length()) <= localBufferSize) { >+ const LChar* characters = impl->characters8(); >+ unsigned failingIndex; >+ for (unsigned i = 0; i < length; ++i) { >+ if (type == CaseConvertType::Lower ? UNLIKELY(isASCIIUpper(characters[i])) : LIKELY(isASCIILower(characters[i]))) { >+ failingIndex = i; >+ goto SlowPath; >+ } >+ } >+ return *this; >+SlowPath: >+ LChar localBuffer[localBufferSize]; >+ for (unsigned i = 0; i < failingIndex; ++i) >+ localBuffer[i] = characters[i]; >+ for (unsigned i = failingIndex; i < length; ++i) >+ localBuffer[i] = type == CaseConvertType::Lower ? toASCIILower(characters[i]) : toASCIIUpper(characters[i]); >+ return AtomString(localBuffer, length); >+ } >+ >+ Ref<StringImpl> convertedString = type == CaseConvertType::Lower ? impl->convertToASCIILowercase() : impl->convertToASCIIUppercase(); >+ if (LIKELY(convertedString.ptr() == impl)) >+ return *this; >+ >+ AtomString result; >+ result.m_string = AtomStringImpl::add(convertedString.ptr()); >+ return result; >+} >+ >+AtomString AtomString::convertToASCIILowercase() const >+{ >+ return convertASCIICase<CaseConvertType::Lower>(); >+} >+ >+AtomString AtomString::convertToASCIIUppercase() const >+{ >+ return convertASCIICase<CaseConvertType::Upper>(); >+} >+ >+AtomString AtomString::number(int number) >+{ >+ return numberToStringSigned<AtomString>(number); >+} >+ >+AtomString AtomString::number(unsigned number) >+{ >+ return numberToStringUnsigned<AtomString>(number); >+} >+ >+AtomString AtomString::number(unsigned long number) >+{ >+ return numberToStringUnsigned<AtomString>(number); >+} >+ >+AtomString AtomString::number(unsigned long long number) >+{ >+ return numberToStringUnsigned<AtomString>(number); >+} >+ >+AtomString AtomString::number(float number) >+{ >+ NumberToStringBuffer buffer; >+ return numberToString(number, buffer); >+} >+ >+AtomString AtomString::number(double number) >+{ >+ NumberToStringBuffer buffer; >+ return numberToString(number, buffer); >+} >+ >+AtomString AtomString::fromUTF8Internal(const char* start, const char* end) >+{ >+ ASSERT(start); >+ >+ // Caller needs to handle empty string. >+ ASSERT(!end || end > start); >+ ASSERT(end || start[0]); >+ >+ return AtomStringImpl::addUTF8(start, end ? end : start + std::strlen(start)); >+} >+ >+#ifndef NDEBUG >+ >+void AtomString::show() const >+{ >+ m_string.show(); >+} >+ >+#endif >+ >+WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomString> nullAtomData; >+WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomString> emptyAtomData; >+WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomString> starAtomData; >+WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomString> xmlAtomData; >+WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomString> xmlnsAtomData; >+ >+void AtomString::init() >+{ >+ static std::once_flag initializeKey; >+ std::call_once(initializeKey, [] { >+ // Initialization is not thread safe, so this function must be called from the main thread first. >+ ASSERT(isUIThread()); >+ >+ nullAtomData.construct(); >+ emptyAtomData.construct(""); >+ starAtomData.construct("*", AtomString::ConstructFromLiteral); >+ xmlAtomData.construct("xml", AtomString::ConstructFromLiteral); >+ xmlnsAtomData.construct("xmlns", AtomString::ConstructFromLiteral); >+ }); >+} >+ >+} // namespace WTF >diff --git a/Source/WTF/wtf/text/AtomString.h b/Source/WTF/wtf/text/AtomString.h >new file mode 100644 >index 0000000000000000000000000000000000000000..9d43e1fa7284eba14a7c3bcddd3394e63e96eba7 >--- /dev/null >+++ b/Source/WTF/wtf/text/AtomString.h >@@ -0,0 +1,370 @@ >+/* >+ * Copyright (C) 2004-2017 Apple Inc. All rights reserved. >+ * >+ * This library is free software; you can redistribute it and/or >+ * modify it under the terms of the GNU Library General Public >+ * License as published by the Free Software Foundation; either >+ * version 2 of the License, or (at your option) any later version. >+ * >+ * This library is distributed in the hope that it will be useful, >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ * Library General Public License for more details. >+ * >+ * You should have received a copy of the GNU Library General Public License >+ * along with this library; see the file COPYING.LIB. If not, write to >+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >+ * Boston, MA 02110-1301, USA. >+ * >+ */ >+ >+#pragma once >+ >+#include <utility> >+#include <wtf/NeverDestroyed.h> >+#include <wtf/text/AtomStringImpl.h> >+#include <wtf/text/IntegerToStringConversion.h> >+#include <wtf/text/WTFString.h> >+ >+#if OS(WINDOWS) >+#include <wtf/text/win/WCharStringExtras.h> >+#endif >+ >+namespace WTF { >+ >+struct AtomStringHash; >+ >+class AtomString { >+public: >+ WTF_EXPORT_PRIVATE static void init(); >+ >+ AtomString(); >+ AtomString(const LChar*); >+ AtomString(const char*); >+ AtomString(const LChar*, unsigned length); >+ AtomString(const UChar*, unsigned length); >+ AtomString(const UChar*); >+ >+ template<size_t inlineCapacity> >+ explicit AtomString(const Vector<UChar, inlineCapacity>& characters) >+ : m_string(AtomStringImpl::add(characters.data(), characters.size())) >+ { >+ } >+ >+ AtomString(AtomStringImpl*); >+ AtomString(RefPtr<AtomStringImpl>&&); >+ AtomString(const StaticStringImpl*); >+ AtomString(StringImpl*); >+ AtomString(const String&); >+ AtomString(StringImpl* baseString, unsigned start, unsigned length); >+ >+ // FIXME: AtomString doesn’t always have AtomStringImpl, so one of those two names needs to change. >+ AtomString(UniquedStringImpl* uid); >+ >+ enum ConstructFromLiteralTag { ConstructFromLiteral }; >+ AtomString(const char* characters, unsigned length, ConstructFromLiteralTag) >+ : m_string(AtomStringImpl::addLiteral(characters, length)) >+ { >+ } >+ >+ template<unsigned characterCount> ALWAYS_INLINE AtomString(const char (&characters)[characterCount], ConstructFromLiteralTag) >+ : m_string(AtomStringImpl::addLiteral(characters, characterCount - 1)) >+ { >+ COMPILE_ASSERT(characterCount > 1, AtomStringFromLiteralNotEmpty); >+ COMPILE_ASSERT((characterCount - 1 <= ((unsigned(~0) - sizeof(StringImpl)) / sizeof(LChar))), AtomStringFromLiteralCannotOverflow); >+ } >+ >+ // We have to declare the copy constructor and copy assignment operator as well, otherwise >+ // they'll be implicitly deleted by adding the move constructor and move assignment operator. >+ AtomString(const AtomString& other) : m_string(other.m_string) { } >+ AtomString(AtomString&& other) : m_string(WTFMove(other.m_string)) { } >+ AtomString& operator=(const AtomString& other) { m_string = other.m_string; return *this; } >+ AtomString& operator=(AtomString&& other) { m_string = WTFMove(other.m_string); return *this; } >+ >+ // Hash table deleted values, which are only constructed and never copied or destroyed. >+ AtomString(WTF::HashTableDeletedValueType) : m_string(WTF::HashTableDeletedValue) { } >+ bool isHashTableDeletedValue() const { return m_string.isHashTableDeletedValue(); } >+ >+ unsigned existingHash() const { return isNull() ? 0 : impl()->existingHash(); } >+ >+ operator const String&() const { return m_string; } >+ const String& string() const { return m_string; }; >+ >+ AtomStringImpl* impl() const { return static_cast<AtomStringImpl *>(m_string.impl()); } >+ >+ bool is8Bit() const { return m_string.is8Bit(); } >+ const LChar* characters8() const { return m_string.characters8(); } >+ const UChar* characters16() const { return m_string.characters16(); } >+ unsigned length() const { return m_string.length(); } >+ >+ UChar operator[](unsigned int i) const { return m_string[i]; } >+ >+ WTF_EXPORT_PRIVATE static AtomString number(int); >+ WTF_EXPORT_PRIVATE static AtomString number(unsigned); >+ WTF_EXPORT_PRIVATE static AtomString number(unsigned long); >+ WTF_EXPORT_PRIVATE static AtomString number(unsigned long long); >+ WTF_EXPORT_PRIVATE static AtomString number(float); >+ WTF_EXPORT_PRIVATE static AtomString number(double); >+ // If we need more overloads of the number function, we can add all the others that String has, but these seem to do for now. >+ >+ bool contains(UChar character) const { return m_string.contains(character); } >+ bool contains(const LChar* string) const { return m_string.contains(string); } >+ bool contains(const String& string) const { return m_string.contains(string); } >+ bool containsIgnoringASCIICase(const String& string) const { return m_string.containsIgnoringASCIICase(string); } >+ >+ size_t find(UChar character, unsigned start = 0) const { return m_string.find(character, start); } >+ size_t find(const LChar* string, unsigned start = 0) const { return m_string.find(string, start); } >+ size_t find(const String& string, unsigned start = 0) const { return m_string.find(string, start); } >+ size_t findIgnoringASCIICase(const String& string) const { return m_string.findIgnoringASCIICase(string); } >+ size_t findIgnoringASCIICase(const String& string, unsigned startOffset) const { return m_string.findIgnoringASCIICase(string, startOffset); } >+ size_t find(CodeUnitMatchFunction matchFunction, unsigned start = 0) const { return m_string.find(matchFunction, start); } >+ >+ bool startsWith(const String& string) const { return m_string.startsWith(string); } >+ bool startsWithIgnoringASCIICase(const String& string) const { return m_string.startsWithIgnoringASCIICase(string); } >+ bool startsWith(UChar character) const { return m_string.startsWith(character); } >+ template<unsigned matchLength> bool startsWith(const char (&prefix)[matchLength]) const { return m_string.startsWith<matchLength>(prefix); } >+ >+ bool endsWith(const String& string) const { return m_string.endsWith(string); } >+ bool endsWithIgnoringASCIICase(const String& string) const { return m_string.endsWithIgnoringASCIICase(string); } >+ bool endsWith(UChar character) const { return m_string.endsWith(character); } >+ template<unsigned matchLength> bool endsWith(const char (&prefix)[matchLength]) const { return m_string.endsWith<matchLength>(prefix); } >+ >+ WTF_EXPORT_PRIVATE AtomString convertToASCIILowercase() const; >+ WTF_EXPORT_PRIVATE AtomString convertToASCIIUppercase() const; >+ >+ int toInt(bool* ok = 0) const { return m_string.toInt(ok); } >+ double toDouble(bool* ok = 0) const { return m_string.toDouble(ok); } >+ float toFloat(bool* ok = 0) const { return m_string.toFloat(ok); } >+ bool percentage(int& p) const { return m_string.percentage(p); } >+ >+ bool isNull() const { return m_string.isNull(); } >+ bool isEmpty() const { return m_string.isEmpty(); } >+ >+#if USE(CF) >+ AtomString(CFStringRef); >+#endif >+ >+#ifdef __OBJC__ >+ AtomString(NSString*); >+ operator NSString*() const { return m_string; } >+#endif >+ >+#if OS(WINDOWS) && U_ICU_VERSION_MAJOR_NUM >= 59 >+ AtomString(const wchar_t* characters, unsigned length) >+ : AtomString(ucharFrom(characters), length) { } >+ >+ AtomString(const wchar_t* characters) >+ : AtomString(ucharFrom(characters)) { } >+#endif >+ >+ // AtomString::fromUTF8 will return a null string if the input data contains invalid UTF-8 sequences. >+ static AtomString fromUTF8(const char*, size_t); >+ static AtomString fromUTF8(const char*); >+ >+#ifndef NDEBUG >+ void show() const; >+#endif >+ >+private: >+ // The explicit constructors with AtomString::ConstructFromLiteral must be used for literals. >+ AtomString(ASCIILiteral); >+ >+ enum class CaseConvertType { Upper, Lower }; >+ template<CaseConvertType> AtomString convertASCIICase() const; >+ >+ WTF_EXPORT_PRIVATE static AtomString fromUTF8Internal(const char*, const char*); >+ >+ String m_string; >+}; >+ >+using AtomicString = AtomString; >+ >+static_assert(sizeof(AtomString) == sizeof(String), "AtomString and String must be same size!"); >+ >+inline bool operator==(const AtomString& a, const AtomString& b) { return a.impl() == b.impl(); } >+bool operator==(const AtomString&, const LChar*); >+inline bool operator==(const AtomString& a, const char* b) { return WTF::equal(a.impl(), reinterpret_cast<const LChar*>(b)); } >+inline bool operator==(const AtomString& a, const Vector<UChar>& b) { return a.impl() && equal(a.impl(), b.data(), b.size()); } >+inline bool operator==(const AtomString& a, const String& b) { return equal(a.impl(), b.impl()); } >+inline bool operator==(const LChar* a, const AtomString& b) { return b == a; } >+inline bool operator==(const String& a, const AtomString& b) { return equal(a.impl(), b.impl()); } >+inline bool operator==(const Vector<UChar>& a, const AtomString& b) { return b == a; } >+ >+inline bool operator!=(const AtomString& a, const AtomString& b) { return a.impl() != b.impl(); } >+inline bool operator!=(const AtomString& a, const LChar* b) { return !(a == b); } >+inline bool operator!=(const AtomString& a, const char* b) { return !(a == b); } >+inline bool operator!=(const AtomString& a, const String& b) { return !equal(a.impl(), b.impl()); } >+inline bool operator!=(const AtomString& a, const Vector<UChar>& b) { return !(a == b); } >+inline bool operator!=(const LChar* a, const AtomString& b) { return !(b == a); } >+inline bool operator!=(const String& a, const AtomString& b) { return !equal(a.impl(), b.impl()); } >+inline bool operator!=(const Vector<UChar>& a, const AtomString& b) { return !(a == b); } >+ >+bool equalIgnoringASCIICase(const AtomString&, const AtomString&); >+bool equalIgnoringASCIICase(const AtomString&, const String&); >+bool equalIgnoringASCIICase(const String&, const AtomString&); >+bool equalIgnoringASCIICase(const AtomString&, const char*); >+ >+template<unsigned length> bool equalLettersIgnoringASCIICase(const AtomString&, const char (&lowercaseLetters)[length]); >+ >+inline AtomString::AtomString() >+{ >+} >+ >+inline AtomString::AtomString(const LChar* string) >+ : m_string(AtomStringImpl::add(string)) >+{ >+} >+ >+inline AtomString::AtomString(const char* string) >+ : m_string(AtomStringImpl::add(string)) >+{ >+} >+ >+inline AtomString::AtomString(const LChar* string, unsigned length) >+ : m_string(AtomStringImpl::add(string, length)) >+{ >+} >+ >+inline AtomString::AtomString(const UChar* string, unsigned length) >+ : m_string(AtomStringImpl::add(string, length)) >+{ >+} >+ >+inline AtomString::AtomString(const UChar* string) >+ : m_string(AtomStringImpl::add(string)) >+{ >+} >+ >+inline AtomString::AtomString(AtomStringImpl* string) >+ : m_string(string) >+{ >+} >+ >+inline AtomString::AtomString(RefPtr<AtomStringImpl>&& string) >+ : m_string(WTFMove(string)) >+{ >+} >+ >+inline AtomString::AtomString(StringImpl* string) >+ : m_string(AtomStringImpl::add(string)) >+{ >+} >+ >+inline AtomString::AtomString(const StaticStringImpl* string) >+ : m_string(AtomStringImpl::add(string)) >+{ >+} >+ >+inline AtomString::AtomString(const String& string) >+ : m_string(AtomStringImpl::add(string.impl())) >+{ >+} >+ >+inline AtomString::AtomString(StringImpl* baseString, unsigned start, unsigned length) >+ : m_string(AtomStringImpl::add(baseString, start, length)) >+{ >+} >+ >+inline AtomString::AtomString(UniquedStringImpl* uid) >+ : m_string(uid) >+{ >+} >+ >+#if USE(CF) >+ >+inline AtomString::AtomString(CFStringRef string) >+ : m_string(AtomStringImpl::add(string)) >+{ >+} >+ >+#endif >+ >+#ifdef __OBJC__ >+ >+inline AtomString::AtomString(NSString* string) >+ : m_string(AtomStringImpl::add((__bridge CFStringRef)string)) >+{ >+} >+ >+#endif >+ >+// Define external global variables for the commonly used atomic strings. >+// These are only usable from the main thread. >+extern WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomString> nullAtomData; >+extern WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomString> emptyAtomData; >+extern WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomString> starAtomData; >+extern WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomString> xmlAtomData; >+extern WTF_EXPORT_PRIVATE LazyNeverDestroyed<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::fromUTF8(const char* characters, size_t length) >+{ >+ if (!characters) >+ return nullAtom(); >+ if (!length) >+ return emptyAtom(); >+ return fromUTF8Internal(characters, characters + length); >+} >+ >+inline AtomString AtomString::fromUTF8(const char* characters) >+{ >+ if (!characters) >+ return nullAtom(); >+ if (!*characters) >+ return emptyAtom(); >+ return fromUTF8Internal(characters, nullptr); >+} >+ >+// AtomStringHash is the default hash for AtomString >+template<typename T> struct DefaultHash; >+template<> struct DefaultHash<AtomString> { >+ typedef AtomStringHash Hash; >+}; >+ >+template<unsigned length> inline bool equalLettersIgnoringASCIICase(const AtomString& string, const char (&lowercaseLetters)[length]) >+{ >+ return equalLettersIgnoringASCIICase(string.string(), lowercaseLetters); >+} >+ >+inline bool equalIgnoringASCIICase(const AtomString& a, const AtomString& b) >+{ >+ return equalIgnoringASCIICase(a.string(), b.string()); >+} >+ >+inline bool equalIgnoringASCIICase(const AtomString& a, const String& b) >+{ >+ return equalIgnoringASCIICase(a.string(), b); >+} >+ >+inline bool equalIgnoringASCIICase(const String& a, const AtomString& b) >+{ >+ return equalIgnoringASCIICase(a, b.string()); >+} >+ >+inline bool equalIgnoringASCIICase(const AtomString& a, const char* b) >+{ >+ return equalIgnoringASCIICase(a.string(), b); >+} >+ >+template<> struct IntegerToStringConversionTrait<AtomString> { >+ using ReturnType = AtomString; >+ using AdditionalArgumentType = void; >+ static AtomString flush(LChar* characters, unsigned length, void*) { return { characters, length }; } >+}; >+ >+} // namespace WTF >+ >+using WTF::AtomString; >+using WTF::AtomicString; >+using WTF::nullAtom; >+using WTF::emptyAtom; >+using WTF::starAtom; >+using WTF::xmlAtom; >+using WTF::xmlnsAtom; >+ >+#include <wtf/text/StringConcatenate.h> >diff --git a/Source/WTF/wtf/text/AtomStringHash.h b/Source/WTF/wtf/text/AtomStringHash.h >new file mode 100644 >index 0000000000000000000000000000000000000000..04f5908cc1cc634856a4829bf8458087081bbc98 >--- /dev/null >+++ b/Source/WTF/wtf/text/AtomStringHash.h >@@ -0,0 +1,68 @@ >+/* >+ * Copyright (C) 2008 Apple Inc. All rights reserved. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * notice, this list of conditions and the following disclaimer in the >+ * documentation and/or other materials provided with the distribution. >+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of >+ * its contributors may be used to endorse or promote products derived >+ * from this software without specific prior written permission. >+ * >+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND >+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT >+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF >+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#pragma once >+ >+#include <wtf/text/AtomString.h> >+#include <wtf/HashTraits.h> >+ >+namespace WTF { >+ >+ struct AtomStringHash { >+ static unsigned hash(const AtomString& key) >+ { >+ return key.impl()->existingHash(); >+ } >+ >+ static bool equal(const AtomString& a, const AtomString& b) >+ { >+ return a == b; >+ } >+ >+ static const bool safeToCompareToEmptyOrDeleted = false; >+ }; >+ >+ template<> struct HashTraits<WTF::AtomString> : SimpleClassHashTraits<WTF::AtomString> { >+ static const bool hasIsEmptyValueFunction = true; >+ static bool isEmptyValue(const AtomString& value) >+ { >+ return value.isNull(); >+ } >+ >+ static void customDeleteBucket(AtomString& value) >+ { >+ // See unique_ptr's customDeleteBucket() for an explanation. >+ ASSERT(!isDeletedValue(value)); >+ AtomString valueToBeDestroyed = WTFMove(value); >+ constructDeletedValue(value); >+ } >+ }; >+ >+} >+ >+using WTF::AtomStringHash; >diff --git a/Source/WTF/wtf/text/AtomStringImpl.cpp b/Source/WTF/wtf/text/AtomStringImpl.cpp >new file mode 100644 >index 0000000000000000000000000000000000000000..87a64eeab25aa74dc0b91907b2c8448b95d1fc9c >--- /dev/null >+++ b/Source/WTF/wtf/text/AtomStringImpl.cpp >@@ -0,0 +1,553 @@ >+/* >+ * Copyright (C) 2004-2008, 2013-2014 Apple Inc. All rights reserved. >+ * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> >+ * Copyright (C) 2012 Google Inc. All rights reserved. >+ * Copyright (C) 2015 Yusuke Suzuki<utatane.tea@gmail.com>. All rights reserved. >+ * >+ * This library is free software; you can redistribute it and/or >+ * modify it under the terms of the GNU Library General Public >+ * License as published by the Free Software Foundation; either >+ * version 2 of the License, or (at your option) any later version. >+ * >+ * This library is distributed in the hope that it will be useful, >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ * Library General Public License for more details. >+ * >+ * You should have received a copy of the GNU Library General Public License >+ * along with this library; see the file COPYING.LIB. If not, write to >+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >+ * Boston, MA 02110-1301, USA. >+ * >+ */ >+ >+#include "config.h" >+#include <wtf/text/AtomStringImpl.h> >+ >+#include <wtf/CommaPrinter.h> >+#include <wtf/DataLog.h> >+#include <wtf/HashSet.h> >+#include <wtf/StringPrintStream.h> >+#include <wtf/Threading.h> >+#include <wtf/text/AtomStringTable.h> >+#include <wtf/text/IntegerToStringConversion.h> >+#include <wtf/text/StringHash.h> >+#include <wtf/unicode/UTF8Conversion.h> >+ >+#if USE(WEB_THREAD) >+#include <wtf/Lock.h> >+#endif >+ >+namespace WTF { >+ >+using namespace Unicode; >+ >+#if USE(WEB_THREAD) >+ >+class AtomStringTableLocker : public LockHolder { >+ WTF_MAKE_NONCOPYABLE(AtomStringTableLocker); >+ >+ static Lock s_stringTableLock; >+public: >+ AtomStringTableLocker() >+ : LockHolder(&s_stringTableLock) >+ { >+ } >+}; >+ >+Lock AtomStringTableLocker::s_stringTableLock; >+ >+#else >+ >+class AtomStringTableLocker { >+ WTF_MAKE_NONCOPYABLE(AtomStringTableLocker); >+public: >+ AtomStringTableLocker() { } >+}; >+ >+#endif // USE(WEB_THREAD) >+ >+using StringTableImpl = HashSet<StringImpl*>; >+ >+static ALWAYS_INLINE StringTableImpl& stringTable() >+{ >+ return Thread::current().atomStringTable()->table(); >+} >+ >+template<typename T, typename HashTranslator> >+static inline Ref<AtomStringImpl> addToStringTable(AtomStringTableLocker&, StringTableImpl& atomStringTable, const T& value) >+{ >+ auto addResult = atomStringTable.add<HashTranslator>(value); >+ >+ // If the string is newly-translated, then we need to adopt it. >+ // The boolean in the pair tells us if that is so. >+ if (addResult.isNewEntry) >+ return adoptRef(static_cast<AtomStringImpl&>(**addResult.iterator)); >+ return *static_cast<AtomStringImpl*>(*addResult.iterator); >+} >+ >+template<typename T, typename HashTranslator> >+static inline Ref<AtomStringImpl> addToStringTable(const T& value) >+{ >+ AtomStringTableLocker locker; >+ return addToStringTable<T, HashTranslator>(locker, stringTable(), value); >+} >+ >+struct CStringTranslator { >+ static unsigned hash(const LChar* characters) >+ { >+ return StringHasher::computeHashAndMaskTop8Bits(characters); >+ } >+ >+ static inline bool equal(StringImpl* str, const LChar* characters) >+ { >+ return WTF::equal(str, characters); >+ } >+ >+ static void translate(StringImpl*& location, const LChar* const& characters, unsigned hash) >+ { >+ location = &StringImpl::create(characters).leakRef(); >+ location->setHash(hash); >+ location->setIsAtomic(true); >+ } >+}; >+ >+RefPtr<AtomStringImpl> AtomStringImpl::add(const LChar* characters) >+{ >+ if (!characters) >+ return nullptr; >+ if (!*characters) >+ return static_cast<AtomStringImpl*>(StringImpl::empty()); >+ >+ return addToStringTable<const LChar*, CStringTranslator>(characters); >+} >+ >+template<typename CharacterType> >+struct HashTranslatorCharBuffer { >+ const CharacterType* characters; >+ unsigned length; >+ unsigned hash; >+ >+ HashTranslatorCharBuffer(const CharacterType* characters, unsigned length) >+ : characters(characters) >+ , length(length) >+ , hash(StringHasher::computeHashAndMaskTop8Bits(characters, length)) >+ { >+ } >+ >+ HashTranslatorCharBuffer(const CharacterType* characters, unsigned length, unsigned hash) >+ : characters(characters) >+ , length(length) >+ , hash(hash) >+ { >+ } >+}; >+ >+using UCharBuffer = HashTranslatorCharBuffer<UChar>; >+struct UCharBufferTranslator { >+ static unsigned hash(const UCharBuffer& buf) >+ { >+ return buf.hash; >+ } >+ >+ static bool equal(StringImpl* const& str, const UCharBuffer& buf) >+ { >+ return WTF::equal(str, buf.characters, buf.length); >+ } >+ >+ static void translate(StringImpl*& location, const UCharBuffer& buf, unsigned hash) >+ { >+ location = &StringImpl::create8BitIfPossible(buf.characters, buf.length).leakRef(); >+ location->setHash(hash); >+ location->setIsAtomic(true); >+ } >+}; >+ >+struct HashAndUTF8Characters { >+ unsigned hash; >+ const char* characters; >+ unsigned length; >+ unsigned utf16Length; >+}; >+ >+struct HashAndUTF8CharactersTranslator { >+ static unsigned hash(const HashAndUTF8Characters& buffer) >+ { >+ return buffer.hash; >+ } >+ >+ static bool equal(StringImpl* const& string, const HashAndUTF8Characters& buffer) >+ { >+ if (buffer.utf16Length != string->length()) >+ return false; >+ >+ // If buffer contains only ASCII characters UTF-8 and UTF16 length are the same. >+ if (buffer.utf16Length != buffer.length) { >+ if (string->is8Bit()) >+ return equalLatin1WithUTF8(string->characters8(), buffer.characters, buffer.characters + buffer.length); >+ >+ return equalUTF16WithUTF8(string->characters16(), buffer.characters, buffer.characters + buffer.length); >+ } >+ >+ if (string->is8Bit()) { >+ const LChar* stringCharacters = string->characters8(); >+ >+ for (unsigned i = 0; i < buffer.length; ++i) { >+ ASSERT(isASCII(buffer.characters[i])); >+ if (stringCharacters[i] != buffer.characters[i]) >+ return false; >+ } >+ >+ return true; >+ } >+ >+ const UChar* stringCharacters = string->characters16(); >+ >+ for (unsigned i = 0; i < buffer.length; ++i) { >+ ASSERT(isASCII(buffer.characters[i])); >+ if (stringCharacters[i] != buffer.characters[i]) >+ return false; >+ } >+ >+ return true; >+ } >+ >+ static void translate(StringImpl*& location, const HashAndUTF8Characters& buffer, unsigned hash) >+ { >+ UChar* target; >+ auto newString = StringImpl::createUninitialized(buffer.utf16Length, target); >+ >+ bool isAllASCII; >+ const char* source = buffer.characters; >+ if (!convertUTF8ToUTF16(source, source + buffer.length, &target, target + buffer.utf16Length, &isAllASCII)) >+ ASSERT_NOT_REACHED(); >+ >+ if (isAllASCII) >+ newString = StringImpl::create(buffer.characters, buffer.length); >+ >+ location = &newString.leakRef(); >+ location->setHash(hash); >+ location->setIsAtomic(true); >+ } >+}; >+ >+RefPtr<AtomStringImpl> AtomStringImpl::add(const UChar* characters, unsigned length) >+{ >+ if (!characters) >+ return nullptr; >+ >+ if (!length) >+ return static_cast<AtomStringImpl*>(StringImpl::empty()); >+ >+ UCharBuffer buffer { characters, length }; >+ return addToStringTable<UCharBuffer, UCharBufferTranslator>(buffer); >+} >+ >+RefPtr<AtomStringImpl> AtomStringImpl::add(const UChar* characters) >+{ >+ if (!characters) >+ return nullptr; >+ >+ unsigned length = 0; >+ while (characters[length] != UChar(0)) >+ ++length; >+ >+ if (!length) >+ return static_cast<AtomStringImpl*>(StringImpl::empty()); >+ >+ UCharBuffer buffer { characters, length }; >+ return addToStringTable<UCharBuffer, UCharBufferTranslator>(buffer); >+} >+ >+struct SubstringLocation { >+ StringImpl* baseString; >+ unsigned start; >+ unsigned length; >+}; >+ >+struct SubstringTranslator { >+ static void translate(StringImpl*& location, const SubstringLocation& buffer, unsigned hash) >+ { >+ location = &StringImpl::createSubstringSharingImpl(*buffer.baseString, buffer.start, buffer.length).leakRef(); >+ location->setHash(hash); >+ location->setIsAtomic(true); >+ } >+}; >+ >+struct SubstringTranslator8 : SubstringTranslator { >+ static unsigned hash(const SubstringLocation& buffer) >+ { >+ return StringHasher::computeHashAndMaskTop8Bits(buffer.baseString->characters8() + buffer.start, buffer.length); >+ } >+ >+ static bool equal(StringImpl* const& string, const SubstringLocation& buffer) >+ { >+ return WTF::equal(string, buffer.baseString->characters8() + buffer.start, buffer.length); >+ } >+}; >+ >+struct SubstringTranslator16 : SubstringTranslator { >+ static unsigned hash(const SubstringLocation& buffer) >+ { >+ return StringHasher::computeHashAndMaskTop8Bits(buffer.baseString->characters16() + buffer.start, buffer.length); >+ } >+ >+ static bool equal(StringImpl* const& string, const SubstringLocation& buffer) >+ { >+ return WTF::equal(string, buffer.baseString->characters16() + buffer.start, buffer.length); >+ } >+}; >+ >+RefPtr<AtomStringImpl> AtomStringImpl::add(StringImpl* baseString, unsigned start, unsigned length) >+{ >+ if (!baseString) >+ return nullptr; >+ >+ if (!length || start >= baseString->length()) >+ return static_cast<AtomStringImpl*>(StringImpl::empty()); >+ >+ unsigned maxLength = baseString->length() - start; >+ if (length >= maxLength) { >+ if (!start) >+ return add(baseString); >+ length = maxLength; >+ } >+ >+ SubstringLocation buffer = { baseString, start, length }; >+ if (baseString->is8Bit()) >+ return addToStringTable<SubstringLocation, SubstringTranslator8>(buffer); >+ return addToStringTable<SubstringLocation, SubstringTranslator16>(buffer); >+} >+ >+using LCharBuffer = HashTranslatorCharBuffer<LChar>; >+struct LCharBufferTranslator { >+ static unsigned hash(const LCharBuffer& buf) >+ { >+ return buf.hash; >+ } >+ >+ static bool equal(StringImpl* const& str, const LCharBuffer& buf) >+ { >+ return WTF::equal(str, buf.characters, buf.length); >+ } >+ >+ static void translate(StringImpl*& location, const LCharBuffer& buf, unsigned hash) >+ { >+ location = &StringImpl::create(buf.characters, buf.length).leakRef(); >+ location->setHash(hash); >+ location->setIsAtomic(true); >+ } >+}; >+ >+template<typename CharType> >+struct BufferFromStaticDataTranslator { >+ using Buffer = HashTranslatorCharBuffer<CharType>; >+ static unsigned hash(const Buffer& buf) >+ { >+ return buf.hash; >+ } >+ >+ static bool equal(StringImpl* const& str, const Buffer& buf) >+ { >+ return WTF::equal(str, buf.characters, buf.length); >+ } >+ >+ static void translate(StringImpl*& location, const Buffer& buf, unsigned hash) >+ { >+ location = &StringImpl::createWithoutCopying(buf.characters, buf.length).leakRef(); >+ location->setHash(hash); >+ location->setIsAtomic(true); >+ } >+}; >+ >+RefPtr<AtomStringImpl> AtomStringImpl::add(const LChar* characters, unsigned length) >+{ >+ if (!characters) >+ return nullptr; >+ >+ if (!length) >+ return static_cast<AtomStringImpl*>(StringImpl::empty()); >+ >+ LCharBuffer buffer { characters, length }; >+ return addToStringTable<LCharBuffer, LCharBufferTranslator>(buffer); >+} >+ >+Ref<AtomStringImpl> AtomStringImpl::addLiteral(const char* characters, unsigned length) >+{ >+ ASSERT(characters); >+ ASSERT(length); >+ >+ LCharBuffer buffer { reinterpret_cast<const LChar*>(characters), length }; >+ return addToStringTable<LCharBuffer, BufferFromStaticDataTranslator<LChar>>(buffer); >+} >+ >+static Ref<AtomStringImpl> addSymbol(AtomStringTableLocker& locker, StringTableImpl& atomStringTable, StringImpl& base) >+{ >+ ASSERT(base.length()); >+ ASSERT(base.isSymbol()); >+ >+ SubstringLocation buffer = { &base, 0, base.length() }; >+ if (base.is8Bit()) >+ return addToStringTable<SubstringLocation, SubstringTranslator8>(locker, atomStringTable, buffer); >+ return addToStringTable<SubstringLocation, SubstringTranslator16>(locker, atomStringTable, buffer); >+} >+ >+static inline Ref<AtomStringImpl> addSymbol(StringImpl& base) >+{ >+ AtomStringTableLocker locker; >+ return addSymbol(locker, stringTable(), base); >+} >+ >+static Ref<AtomStringImpl> addStatic(AtomStringTableLocker& locker, StringTableImpl& atomStringTable, const StringImpl& base) >+{ >+ ASSERT(base.length()); >+ ASSERT(base.isStatic()); >+ >+ if (base.is8Bit()) { >+ LCharBuffer buffer { base.characters8(), base.length(), base.hash() }; >+ return addToStringTable<LCharBuffer, BufferFromStaticDataTranslator<LChar>>(locker, atomStringTable, buffer); >+ } >+ UCharBuffer buffer { base.characters16(), base.length(), base.hash() }; >+ return addToStringTable<UCharBuffer, BufferFromStaticDataTranslator<UChar>>(locker, atomStringTable, buffer); >+} >+ >+static inline Ref<AtomStringImpl> addStatic(const StringImpl& base) >+{ >+ AtomStringTableLocker locker; >+ return addStatic(locker, stringTable(), base); >+} >+ >+RefPtr<AtomStringImpl> AtomStringImpl::add(const StaticStringImpl* string) >+{ >+ auto s = reinterpret_cast<const StringImpl*>(string); >+ ASSERT(s->isStatic()); >+ return addStatic(*s); >+} >+ >+Ref<AtomStringImpl> AtomStringImpl::addSlowCase(StringImpl& string) >+{ >+ // This check is necessary for null symbols. >+ // Their length is zero, but they are not AtomStringImpl. >+ if (!string.length()) >+ return *static_cast<AtomStringImpl*>(StringImpl::empty()); >+ >+ if (string.isStatic()) >+ return addStatic(string); >+ >+ if (string.isSymbol()) >+ return addSymbol(string); >+ >+ ASSERT_WITH_MESSAGE(!string.isAtom(), "AtomStringImpl should not hit the slow case if the string is already atomic."); >+ >+ AtomStringTableLocker locker; >+ auto addResult = stringTable().add(&string); >+ >+ if (addResult.isNewEntry) { >+ ASSERT(*addResult.iterator == &string); >+ string.setIsAtomic(true); >+ } >+ >+ return *static_cast<AtomStringImpl*>(*addResult.iterator); >+} >+ >+Ref<AtomStringImpl> AtomStringImpl::addSlowCase(AtomStringTable& stringTable, StringImpl& string) >+{ >+ // This check is necessary for null symbols. >+ // Their length is zero, but they are not AtomStringImpl. >+ if (!string.length()) >+ return *static_cast<AtomStringImpl*>(StringImpl::empty()); >+ >+ if (string.isStatic()) { >+ AtomStringTableLocker locker; >+ return addStatic(locker, stringTable.table(), string); >+ } >+ >+ if (string.isSymbol()) { >+ AtomStringTableLocker locker; >+ return addSymbol(locker, stringTable.table(), string); >+ } >+ >+ ASSERT_WITH_MESSAGE(!string.isAtom(), "AtomStringImpl should not hit the slow case if the string is already atomic."); >+ >+ AtomStringTableLocker locker; >+ auto addResult = stringTable.table().add(&string); >+ >+ if (addResult.isNewEntry) { >+ ASSERT(*addResult.iterator == &string); >+ string.setIsAtomic(true); >+ } >+ >+ return *static_cast<AtomStringImpl*>(*addResult.iterator); >+} >+ >+void AtomStringImpl::remove(AtomStringImpl* string) >+{ >+ ASSERT(string->isAtom()); >+ AtomStringTableLocker locker; >+ auto& atomStringTable = stringTable(); >+ auto iterator = atomStringTable.find(string); >+ ASSERT_WITH_MESSAGE(iterator != atomStringTable.end(), "The string being removed is atomic in the string table of an other thread!"); >+ ASSERT(string == *iterator); >+ atomStringTable.remove(iterator); >+} >+ >+RefPtr<AtomStringImpl> AtomStringImpl::lookUpSlowCase(StringImpl& string) >+{ >+ ASSERT_WITH_MESSAGE(!string.isAtom(), "AtomicStringImpls should return from the fast case."); >+ >+ if (!string.length()) >+ return static_cast<AtomStringImpl*>(StringImpl::empty()); >+ >+ AtomStringTableLocker locker; >+ auto& atomStringTable = stringTable(); >+ auto iterator = atomStringTable.find(&string); >+ if (iterator != atomStringTable.end()) >+ return static_cast<AtomStringImpl*>(*iterator); >+ return nullptr; >+} >+ >+RefPtr<AtomStringImpl> AtomStringImpl::addUTF8(const char* charactersStart, const char* charactersEnd) >+{ >+ HashAndUTF8Characters buffer; >+ buffer.characters = charactersStart; >+ buffer.hash = calculateStringHashAndLengthFromUTF8MaskingTop8Bits(charactersStart, charactersEnd, buffer.length, buffer.utf16Length); >+ >+ if (!buffer.hash) >+ return nullptr; >+ >+ return addToStringTable<HashAndUTF8Characters, HashAndUTF8CharactersTranslator>(buffer); >+} >+ >+RefPtr<AtomStringImpl> AtomStringImpl::lookUp(const LChar* characters, unsigned length) >+{ >+ AtomStringTableLocker locker; >+ auto& table = stringTable(); >+ >+ LCharBuffer buffer = { characters, length }; >+ auto iterator = table.find<LCharBufferTranslator>(buffer); >+ if (iterator != table.end()) >+ return static_cast<AtomStringImpl*>(*iterator); >+ return nullptr; >+} >+ >+RefPtr<AtomStringImpl> AtomStringImpl::lookUp(const UChar* characters, unsigned length) >+{ >+ AtomStringTableLocker locker; >+ auto& table = stringTable(); >+ >+ UCharBuffer buffer { characters, length }; >+ auto iterator = table.find<UCharBufferTranslator>(buffer); >+ if (iterator != table.end()) >+ return static_cast<AtomStringImpl*>(*iterator); >+ return nullptr; >+} >+ >+#if !ASSERT_DISABLED >+bool AtomStringImpl::isInAtomStringTable(StringImpl* string) >+{ >+ AtomStringTableLocker locker; >+ return stringTable().contains(string); >+} >+#endif >+ >+} // namespace WTF >diff --git a/Source/WTF/wtf/text/AtomStringImpl.h b/Source/WTF/wtf/text/AtomStringImpl.h >new file mode 100644 >index 0000000000000000000000000000000000000000..3466a91bfabb25099826ec7e8033391a5b5419cd >--- /dev/null >+++ b/Source/WTF/wtf/text/AtomStringImpl.h >@@ -0,0 +1,123 @@ >+/* >+ * Copyright (C) 2006 Apple Inc. >+ * >+ * This library is free software; you can redistribute it and/or >+ * modify it under the terms of the GNU Library General Public >+ * License as published by the Free Software Foundation; either >+ * version 2 of the License, or (at your option) any later version. >+ * >+ * This library is distributed in the hope that it will be useful, >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ * Library General Public License for more details. >+ * >+ * You should have received a copy of the GNU Library General Public License >+ * along with this library; see the file COPYING.LIB. If not, write to >+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >+ * Boston, MA 02110-1301, USA. >+ * >+ */ >+ >+#pragma once >+ >+#include <wtf/text/UniquedStringImpl.h> >+ >+namespace WTF { >+ >+class AtomStringTable; >+ >+class AtomStringImpl : public UniquedStringImpl { >+public: >+ WTF_EXPORT_PRIVATE static RefPtr<AtomStringImpl> lookUp(const LChar*, unsigned length); >+ WTF_EXPORT_PRIVATE static RefPtr<AtomStringImpl> lookUp(const UChar*, unsigned length); >+ static RefPtr<AtomStringImpl> lookUp(StringImpl* string) >+ { >+ if (!string || string->isAtom()) >+ return static_cast<AtomStringImpl*>(string); >+ return lookUpSlowCase(*string); >+ } >+ >+ static void remove(AtomStringImpl*); >+ >+ WTF_EXPORT_PRIVATE static RefPtr<AtomStringImpl> add(const LChar*); >+ ALWAYS_INLINE static RefPtr<AtomStringImpl> add(const char* s) { return add(reinterpret_cast<const LChar*>(s)); }; >+ WTF_EXPORT_PRIVATE static RefPtr<AtomStringImpl> add(const LChar*, unsigned length); >+ WTF_EXPORT_PRIVATE static RefPtr<AtomStringImpl> add(const UChar*, unsigned length); >+ ALWAYS_INLINE static RefPtr<AtomStringImpl> add(const char* s, unsigned length) { return add(reinterpret_cast<const LChar*>(s), length); }; >+ WTF_EXPORT_PRIVATE static RefPtr<AtomStringImpl> add(const UChar*); >+ WTF_EXPORT_PRIVATE static RefPtr<AtomStringImpl> add(StringImpl*, unsigned offset, unsigned length); >+ ALWAYS_INLINE static RefPtr<AtomStringImpl> add(StringImpl* string) >+ { >+ if (!string) >+ return static_cast<AtomStringImpl*>(string); >+ return add(*string); >+ } >+ WTF_EXPORT_PRIVATE static RefPtr<AtomStringImpl> add(const StaticStringImpl*); >+ WTF_EXPORT_PRIVATE static Ref<AtomStringImpl> addLiteral(const char* characters, unsigned length); >+ >+ // Returns null if the input data contains an invalid UTF-8 sequence. >+ static RefPtr<AtomStringImpl> addUTF8(const char* start, const char* end); >+ >+#if USE(CF) >+ WTF_EXPORT_PRIVATE static RefPtr<AtomStringImpl> add(CFStringRef); >+#endif >+ >+ template<typename StringTableProvider> >+ ALWAYS_INLINE static RefPtr<AtomStringImpl> addWithStringTableProvider(StringTableProvider& stringTableProvider, StringImpl* string) >+ { >+ if (!string) >+ return nullptr; >+ return add(*stringTableProvider.atomStringTable(), *string); >+ } >+ >+#if !ASSERT_DISABLED >+ WTF_EXPORT_PRIVATE static bool isInAtomStringTable(StringImpl*); >+#endif >+ >+private: >+ AtomStringImpl() = delete; >+ >+ ALWAYS_INLINE static Ref<AtomStringImpl> add(StringImpl& string) >+ { >+ if (string.isAtom()) { >+ ASSERT_WITH_MESSAGE(!string.length() || isInAtomStringTable(&string), "The atomic string comes from an other thread!"); >+ return static_cast<AtomStringImpl&>(string); >+ } >+ return addSlowCase(string); >+ } >+ >+ ALWAYS_INLINE static Ref<AtomStringImpl> add(AtomStringTable& stringTable, StringImpl& string) >+ { >+ if (string.isAtom()) { >+ ASSERT_WITH_MESSAGE(!string.length() || isInAtomStringTable(&string), "The atomic string comes from an other thread!"); >+ return static_cast<AtomStringImpl&>(string); >+ } >+ return addSlowCase(stringTable, string); >+ } >+ >+ WTF_EXPORT_PRIVATE static Ref<AtomStringImpl> addSlowCase(StringImpl&); >+ WTF_EXPORT_PRIVATE static Ref<AtomStringImpl> addSlowCase(AtomStringTable&, StringImpl&); >+ >+ WTF_EXPORT_PRIVATE static RefPtr<AtomStringImpl> lookUpSlowCase(StringImpl&); >+}; >+ >+#if !ASSERT_DISABLED >+// AtomicStringImpls created from StaticStringImpl will ASSERT >+// in the generic ValueCheck<T>::checkConsistency >+// as they are not allocated by fastMalloc. >+// We don't currently have any way to detect that case >+// so we ignore the consistency check for all AtomicStringImpls*. >+template<> struct >+ValueCheck<AtomStringImpl*> { >+ static void checkConsistency(const AtomStringImpl*) { } >+}; >+ >+template<> struct >+ValueCheck<const AtomStringImpl*> { >+ static void checkConsistency(const AtomStringImpl*) { } >+}; >+#endif >+ >+} >+ >+using WTF::AtomStringImpl; >diff --git a/Source/WTF/wtf/text/AtomStringTable.cpp b/Source/WTF/wtf/text/AtomStringTable.cpp >new file mode 100644 >index 0000000000000000000000000000000000000000..9812ac229f5d4c4a6933e19f31cedba76d98cb2d >--- /dev/null >+++ b/Source/WTF/wtf/text/AtomStringTable.cpp >@@ -0,0 +1,38 @@ >+/* >+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2013 Apple Inc. All rights reserved. >+ * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> >+ * Copyright (C) 2012 Google Inc. All rights reserved. >+ * >+ * This library is free software; you can redistribute it and/or >+ * modify it under the terms of the GNU Library General Public >+ * License as published by the Free Software Foundation; either >+ * version 2 of the License, or (at your option) any later version. >+ * >+ * This library is distributed in the hope that it will be useful, >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ * Library General Public License for more details. >+ * >+ * You should have received a copy of the GNU Library General Public License >+ * along with this library; see the file COPYING.LIB. If not, write to >+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >+ * Boston, MA 02110-1301, USA. >+ * >+ */ >+ >+#include "config.h" >+#include <wtf/text/AtomStringTable.h> >+ >+#include <wtf/HashSet.h> >+#include <wtf/MainThread.h> >+#include <wtf/Threading.h> >+ >+namespace WTF { >+ >+AtomStringTable::~AtomStringTable() >+{ >+ for (auto* string : m_table) >+ string->setIsAtomic(false); >+} >+ >+} >diff --git a/Source/WTF/wtf/text/AtomStringTable.h b/Source/WTF/wtf/text/AtomStringTable.h >new file mode 100644 >index 0000000000000000000000000000000000000000..24c60b1fb2d7e8fb8942e6503393e4847169569c >--- /dev/null >+++ b/Source/WTF/wtf/text/AtomStringTable.h >@@ -0,0 +1,44 @@ >+/* >+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2013 Apple Inc. All rights reserved. >+ * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> >+ * Copyright (C) 2012 Google Inc. All rights reserved. >+ * >+ * This library is free software; you can redistribute it and/or >+ * modify it under the terms of the GNU Library General Public >+ * License as published by the Free Software Foundation; either >+ * version 2 of the License, or (at your option) any later version. >+ * >+ * This library is distributed in the hope that it will be useful, >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ * Library General Public License for more details. >+ * >+ * You should have received a copy of the GNU Library General Public License >+ * along with this library; see the file COPYING.LIB. If not, write to >+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >+ * Boston, MA 02110-1301, USA. >+ * >+ */ >+ >+#pragma once >+ >+#include <wtf/HashSet.h> >+#include <wtf/text/StringImpl.h> >+ >+namespace WTF { >+ >+class StringImpl; >+ >+class AtomStringTable { >+ WTF_MAKE_FAST_ALLOCATED; >+public: >+ WTF_EXPORT_PRIVATE ~AtomStringTable(); >+ >+ HashSet<StringImpl*>& table() { return m_table; } >+ >+private: >+ HashSet<StringImpl*> m_table; >+}; >+ >+} >+using WTF::AtomStringTable; >diff --git a/Source/WTF/wtf/text/AtomicString.cpp b/Source/WTF/wtf/text/AtomicString.cpp >deleted file mode 100644 >index ffdca7f9a76c0ca6df7c7a6d9c3912e7a57daad1..0000000000000000000000000000000000000000 >--- a/Source/WTF/wtf/text/AtomicString.cpp >+++ /dev/null >@@ -1,157 +0,0 @@ >-/* >- * Copyright (C) 2004-2017 Apple Inc. All rights reserved. >- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> >- * Copyright (C) 2012 Google Inc. All rights reserved. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- * >- */ >- >-#include "config.h" >-#include <wtf/text/AtomicString.h> >- >-#include <mutex> >-#include <wtf/MainThread.h> >-#include <wtf/text/IntegerToStringConversion.h> >- >-#include <wtf/dtoa.h> >- >-namespace WTF { >- >-template<AtomicString::CaseConvertType type> >-ALWAYS_INLINE AtomicString AtomicString::convertASCIICase() const >-{ >- StringImpl* impl = this->impl(); >- if (UNLIKELY(!impl)) >- return nullAtom(); >- >- // Convert short strings without allocating a new StringImpl, since >- // there's a good chance these strings are already in the atomic >- // string table and so no memory allocation will be required. >- unsigned length; >- const unsigned localBufferSize = 100; >- if (impl->is8Bit() && (length = impl->length()) <= localBufferSize) { >- const LChar* characters = impl->characters8(); >- unsigned failingIndex; >- for (unsigned i = 0; i < length; ++i) { >- if (type == CaseConvertType::Lower ? UNLIKELY(isASCIIUpper(characters[i])) : LIKELY(isASCIILower(characters[i]))) { >- failingIndex = i; >- goto SlowPath; >- } >- } >- return *this; >-SlowPath: >- LChar localBuffer[localBufferSize]; >- for (unsigned i = 0; i < failingIndex; ++i) >- localBuffer[i] = characters[i]; >- for (unsigned i = failingIndex; i < length; ++i) >- localBuffer[i] = type == CaseConvertType::Lower ? toASCIILower(characters[i]) : toASCIIUpper(characters[i]); >- return AtomicString(localBuffer, length); >- } >- >- Ref<StringImpl> convertedString = type == CaseConvertType::Lower ? impl->convertToASCIILowercase() : impl->convertToASCIIUppercase(); >- if (LIKELY(convertedString.ptr() == impl)) >- return *this; >- >- AtomicString result; >- result.m_string = AtomicStringImpl::add(convertedString.ptr()); >- return result; >-} >- >-AtomicString AtomicString::convertToASCIILowercase() const >-{ >- return convertASCIICase<CaseConvertType::Lower>(); >-} >- >-AtomicString AtomicString::convertToASCIIUppercase() const >-{ >- return convertASCIICase<CaseConvertType::Upper>(); >-} >- >-AtomicString AtomicString::number(int number) >-{ >- return numberToStringSigned<AtomicString>(number); >-} >- >-AtomicString AtomicString::number(unsigned number) >-{ >- return numberToStringUnsigned<AtomicString>(number); >-} >- >-AtomicString AtomicString::number(unsigned long number) >-{ >- return numberToStringUnsigned<AtomicString>(number); >-} >- >-AtomicString AtomicString::number(unsigned long long number) >-{ >- return numberToStringUnsigned<AtomicString>(number); >-} >- >-AtomicString AtomicString::number(float number) >-{ >- NumberToStringBuffer buffer; >- return numberToString(number, buffer); >-} >- >-AtomicString AtomicString::number(double number) >-{ >- NumberToStringBuffer buffer; >- return numberToString(number, buffer); >-} >- >-AtomicString AtomicString::fromUTF8Internal(const char* start, const char* end) >-{ >- ASSERT(start); >- >- // Caller needs to handle empty string. >- ASSERT(!end || end > start); >- ASSERT(end || start[0]); >- >- return AtomicStringImpl::addUTF8(start, end ? end : start + std::strlen(start)); >-} >- >-#ifndef NDEBUG >- >-void AtomicString::show() const >-{ >- m_string.show(); >-} >- >-#endif >- >-WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomicString> nullAtomData; >-WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomicString> emptyAtomData; >-WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomicString> starAtomData; >-WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomicString> xmlAtomData; >-WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomicString> xmlnsAtomData; >- >-void AtomicString::init() >-{ >- static std::once_flag initializeKey; >- std::call_once(initializeKey, [] { >- // Initialization is not thread safe, so this function must be called from the main thread first. >- ASSERT(isUIThread()); >- >- nullAtomData.construct(); >- emptyAtomData.construct(""); >- starAtomData.construct("*", AtomicString::ConstructFromLiteral); >- xmlAtomData.construct("xml", AtomicString::ConstructFromLiteral); >- xmlnsAtomData.construct("xmlns", AtomicString::ConstructFromLiteral); >- }); >-} >- >-} // namespace WTF >diff --git a/Source/WTF/wtf/text/AtomicString.h b/Source/WTF/wtf/text/AtomicString.h >deleted file mode 100644 >index 12d0f6f81c13a7e0d482cd82062a6cf7974e5dab..0000000000000000000000000000000000000000 >--- a/Source/WTF/wtf/text/AtomicString.h >+++ /dev/null >@@ -1,377 +0,0 @@ >-/* >- * Copyright (C) 2004-2017 Apple Inc. All rights reserved. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- * >- */ >- >-#pragma once >- >-#include <utility> >-#include <wtf/NeverDestroyed.h> >-#include <wtf/text/AtomicStringImpl.h> >-#include <wtf/text/IntegerToStringConversion.h> >-#include <wtf/text/WTFString.h> >- >-#if OS(WINDOWS) >-#include <wtf/text/win/WCharStringExtras.h> >-#endif >- >-// Define 'NO_IMPLICIT_ATOMICSTRING' before including this header, >-// to disallow (expensive) implicit String-->AtomicString conversions. >-#ifdef NO_IMPLICIT_ATOMICSTRING >-#define ATOMICSTRING_CONVERSION explicit >-#else >-#define ATOMICSTRING_CONVERSION >-#endif >- >-namespace WTF { >- >-struct AtomicStringHash; >- >-class AtomicString { >-public: >- WTF_EXPORT_PRIVATE static void init(); >- >- AtomicString(); >- AtomicString(const LChar*); >- AtomicString(const char*); >- AtomicString(const LChar*, unsigned length); >- AtomicString(const UChar*, unsigned length); >- AtomicString(const UChar*); >- >- template<size_t inlineCapacity> >- explicit AtomicString(const Vector<UChar, inlineCapacity>& characters) >- : m_string(AtomicStringImpl::add(characters.data(), characters.size())) >- { >- } >- >- AtomicString(AtomicStringImpl*); >- AtomicString(RefPtr<AtomicStringImpl>&&); >- AtomicString(const StaticStringImpl*); >- ATOMICSTRING_CONVERSION AtomicString(StringImpl*); >- ATOMICSTRING_CONVERSION AtomicString(const String&); >- AtomicString(StringImpl* baseString, unsigned start, unsigned length); >- >- // FIXME: AtomicString doesn’t always have AtomicStringImpl, so one of those two names needs to change.. >- AtomicString(UniquedStringImpl* uid); >- >- enum ConstructFromLiteralTag { ConstructFromLiteral }; >- AtomicString(const char* characters, unsigned length, ConstructFromLiteralTag) >- : m_string(AtomicStringImpl::addLiteral(characters, length)) >- { >- } >- >- template<unsigned characterCount> ALWAYS_INLINE AtomicString(const char (&characters)[characterCount], ConstructFromLiteralTag) >- : m_string(AtomicStringImpl::addLiteral(characters, characterCount - 1)) >- { >- COMPILE_ASSERT(characterCount > 1, AtomicStringFromLiteralNotEmpty); >- COMPILE_ASSERT((characterCount - 1 <= ((unsigned(~0) - sizeof(StringImpl)) / sizeof(LChar))), AtomicStringFromLiteralCannotOverflow); >- } >- >- // We have to declare the copy constructor and copy assignment operator as well, otherwise >- // they'll be implicitly deleted by adding the move constructor and move assignment operator. >- AtomicString(const AtomicString& other) : m_string(other.m_string) { } >- AtomicString(AtomicString&& other) : m_string(WTFMove(other.m_string)) { } >- AtomicString& operator=(const AtomicString& other) { m_string = other.m_string; return *this; } >- AtomicString& operator=(AtomicString&& other) { m_string = WTFMove(other.m_string); return *this; } >- >- // Hash table deleted values, which are only constructed and never copied or destroyed. >- AtomicString(WTF::HashTableDeletedValueType) : m_string(WTF::HashTableDeletedValue) { } >- bool isHashTableDeletedValue() const { return m_string.isHashTableDeletedValue(); } >- >- unsigned existingHash() const { return isNull() ? 0 : impl()->existingHash(); } >- >- operator const String&() const { return m_string; } >- const String& string() const { return m_string; }; >- >- AtomicStringImpl* impl() const { return static_cast<AtomicStringImpl *>(m_string.impl()); } >- >- bool is8Bit() const { return m_string.is8Bit(); } >- const LChar* characters8() const { return m_string.characters8(); } >- const UChar* characters16() const { return m_string.characters16(); } >- unsigned length() const { return m_string.length(); } >- >- UChar operator[](unsigned int i) const { return m_string[i]; } >- >- WTF_EXPORT_PRIVATE static AtomicString number(int); >- WTF_EXPORT_PRIVATE static AtomicString number(unsigned); >- WTF_EXPORT_PRIVATE static AtomicString number(unsigned long); >- WTF_EXPORT_PRIVATE static AtomicString number(unsigned long long); >- WTF_EXPORT_PRIVATE static AtomicString number(float); >- WTF_EXPORT_PRIVATE static AtomicString number(double); >- // If we need more overloads of the number function, we can add all the others that String has, but these seem to do for now. >- >- bool contains(UChar character) const { return m_string.contains(character); } >- bool contains(const LChar* string) const { return m_string.contains(string); } >- bool contains(const String& string) const { return m_string.contains(string); } >- bool containsIgnoringASCIICase(const String& string) const { return m_string.containsIgnoringASCIICase(string); } >- >- size_t find(UChar character, unsigned start = 0) const { return m_string.find(character, start); } >- size_t find(const LChar* string, unsigned start = 0) const { return m_string.find(string, start); } >- size_t find(const String& string, unsigned start = 0) const { return m_string.find(string, start); } >- size_t findIgnoringASCIICase(const String& string) const { return m_string.findIgnoringASCIICase(string); } >- size_t findIgnoringASCIICase(const String& string, unsigned startOffset) const { return m_string.findIgnoringASCIICase(string, startOffset); } >- size_t find(CodeUnitMatchFunction matchFunction, unsigned start = 0) const { return m_string.find(matchFunction, start); } >- >- bool startsWith(const String& string) const { return m_string.startsWith(string); } >- bool startsWithIgnoringASCIICase(const String& string) const { return m_string.startsWithIgnoringASCIICase(string); } >- bool startsWith(UChar character) const { return m_string.startsWith(character); } >- template<unsigned matchLength> bool startsWith(const char (&prefix)[matchLength]) const { return m_string.startsWith<matchLength>(prefix); } >- >- bool endsWith(const String& string) const { return m_string.endsWith(string); } >- bool endsWithIgnoringASCIICase(const String& string) const { return m_string.endsWithIgnoringASCIICase(string); } >- bool endsWith(UChar character) const { return m_string.endsWith(character); } >- template<unsigned matchLength> bool endsWith(const char (&prefix)[matchLength]) const { return m_string.endsWith<matchLength>(prefix); } >- >- WTF_EXPORT_PRIVATE AtomicString convertToASCIILowercase() const; >- WTF_EXPORT_PRIVATE AtomicString convertToASCIIUppercase() const; >- >- int toInt(bool* ok = 0) const { return m_string.toInt(ok); } >- double toDouble(bool* ok = 0) const { return m_string.toDouble(ok); } >- float toFloat(bool* ok = 0) const { return m_string.toFloat(ok); } >- bool percentage(int& p) const { return m_string.percentage(p); } >- >- bool isNull() const { return m_string.isNull(); } >- bool isEmpty() const { return m_string.isEmpty(); } >- >-#if USE(CF) >- AtomicString(CFStringRef); >-#endif >- >-#ifdef __OBJC__ >- AtomicString(NSString*); >- operator NSString*() const { return m_string; } >-#endif >- >-#if OS(WINDOWS) && U_ICU_VERSION_MAJOR_NUM >= 59 >- AtomicString(const wchar_t* characters, unsigned length) >- : AtomicString(ucharFrom(characters), length) { } >- >- AtomicString(const wchar_t* characters) >- : AtomicString(ucharFrom(characters)) { } >-#endif >- >- // AtomicString::fromUTF8 will return a null string if the input data contains invalid UTF-8 sequences. >- static AtomicString fromUTF8(const char*, size_t); >- static AtomicString fromUTF8(const char*); >- >-#ifndef NDEBUG >- void show() const; >-#endif >- >-private: >- // The explicit constructors with AtomicString::ConstructFromLiteral must be used for literals. >- AtomicString(ASCIILiteral); >- >- enum class CaseConvertType { Upper, Lower }; >- template<CaseConvertType> AtomicString convertASCIICase() const; >- >- WTF_EXPORT_PRIVATE static AtomicString fromUTF8Internal(const char*, const char*); >- >- String m_string; >-}; >- >-static_assert(sizeof(AtomicString) == sizeof(String), "AtomicString and String must be same size!"); >- >-inline bool operator==(const AtomicString& a, const AtomicString& b) { return a.impl() == b.impl(); } >-bool operator==(const AtomicString&, const LChar*); >-inline bool operator==(const AtomicString& a, const char* b) { return WTF::equal(a.impl(), reinterpret_cast<const LChar*>(b)); } >-inline bool operator==(const AtomicString& a, const Vector<UChar>& b) { return a.impl() && equal(a.impl(), b.data(), b.size()); } >-inline bool operator==(const AtomicString& a, const String& b) { return equal(a.impl(), b.impl()); } >-inline bool operator==(const LChar* a, const AtomicString& b) { return b == a; } >-inline bool operator==(const String& a, const AtomicString& b) { return equal(a.impl(), b.impl()); } >-inline bool operator==(const Vector<UChar>& a, const AtomicString& b) { return b == a; } >- >-inline bool operator!=(const AtomicString& a, const AtomicString& b) { return a.impl() != b.impl(); } >-inline bool operator!=(const AtomicString& a, const LChar* b) { return !(a == b); } >-inline bool operator!=(const AtomicString& a, const char* b) { return !(a == b); } >-inline bool operator!=(const AtomicString& a, const String& b) { return !equal(a.impl(), b.impl()); } >-inline bool operator!=(const AtomicString& a, const Vector<UChar>& b) { return !(a == b); } >-inline bool operator!=(const LChar* a, const AtomicString& b) { return !(b == a); } >-inline bool operator!=(const String& a, const AtomicString& b) { return !equal(a.impl(), b.impl()); } >-inline bool operator!=(const Vector<UChar>& a, const AtomicString& b) { return !(a == b); } >- >-bool equalIgnoringASCIICase(const AtomicString&, const AtomicString&); >-bool equalIgnoringASCIICase(const AtomicString&, const String&); >-bool equalIgnoringASCIICase(const String&, const AtomicString&); >-bool equalIgnoringASCIICase(const AtomicString&, const char*); >- >-template<unsigned length> bool equalLettersIgnoringASCIICase(const AtomicString&, const char (&lowercaseLetters)[length]); >- >-inline AtomicString::AtomicString() >-{ >-} >- >-inline AtomicString::AtomicString(const LChar* string) >- : m_string(AtomicStringImpl::add(string)) >-{ >-} >- >-inline AtomicString::AtomicString(const char* string) >- : m_string(AtomicStringImpl::add(string)) >-{ >-} >- >-inline AtomicString::AtomicString(const LChar* string, unsigned length) >- : m_string(AtomicStringImpl::add(string, length)) >-{ >-} >- >-inline AtomicString::AtomicString(const UChar* string, unsigned length) >- : m_string(AtomicStringImpl::add(string, length)) >-{ >-} >- >-inline AtomicString::AtomicString(const UChar* string) >- : m_string(AtomicStringImpl::add(string)) >-{ >-} >- >-inline AtomicString::AtomicString(AtomicStringImpl* string) >- : m_string(string) >-{ >-} >- >-inline AtomicString::AtomicString(RefPtr<AtomicStringImpl>&& string) >- : m_string(WTFMove(string)) >-{ >-} >- >-inline AtomicString::AtomicString(StringImpl* string) >- : m_string(AtomicStringImpl::add(string)) >-{ >-} >- >-inline AtomicString::AtomicString(const StaticStringImpl* string) >- : m_string(AtomicStringImpl::add(string)) >-{ >-} >- >-inline AtomicString::AtomicString(const String& string) >- : m_string(AtomicStringImpl::add(string.impl())) >-{ >-} >- >-inline AtomicString::AtomicString(StringImpl* baseString, unsigned start, unsigned length) >- : m_string(AtomicStringImpl::add(baseString, start, length)) >-{ >-} >- >-inline AtomicString::AtomicString(UniquedStringImpl* uid) >- : m_string(uid) >-{ >-} >- >-#if USE(CF) >- >-inline AtomicString::AtomicString(CFStringRef string) >- : m_string(AtomicStringImpl::add(string)) >-{ >-} >- >-#endif >- >-#ifdef __OBJC__ >- >-inline AtomicString::AtomicString(NSString* string) >- : m_string(AtomicStringImpl::add((__bridge CFStringRef)string)) >-{ >-} >- >-#endif >- >-// Define external global variables for the commonly used atomic strings. >-// These are only usable from the main thread. >-extern WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomicString> nullAtomData; >-extern WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomicString> emptyAtomData; >-extern WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomicString> starAtomData; >-extern WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomicString> xmlAtomData; >-extern WTF_EXPORT_PRIVATE LazyNeverDestroyed<AtomicString> xmlnsAtomData; >- >-inline const AtomicString& nullAtom() { return nullAtomData.get(); } >-inline const AtomicString& emptyAtom() { return emptyAtomData.get(); } >-inline const AtomicString& starAtom() { return starAtomData.get(); } >-inline const AtomicString& xmlAtom() { return xmlAtomData.get(); } >-inline const AtomicString& xmlnsAtom() { return xmlnsAtomData.get(); } >- >-inline AtomicString AtomicString::fromUTF8(const char* characters, size_t length) >-{ >- if (!characters) >- return nullAtom(); >- if (!length) >- return emptyAtom(); >- return fromUTF8Internal(characters, characters + length); >-} >- >-inline AtomicString AtomicString::fromUTF8(const char* characters) >-{ >- if (!characters) >- return nullAtom(); >- if (!*characters) >- return emptyAtom(); >- return fromUTF8Internal(characters, nullptr); >-} >- >-// AtomicStringHash is the default hash for AtomicString >-template<typename T> struct DefaultHash; >-template<> struct DefaultHash<AtomicString> { >- typedef AtomicStringHash Hash; >-}; >- >-template<unsigned length> inline bool equalLettersIgnoringASCIICase(const AtomicString& string, const char (&lowercaseLetters)[length]) >-{ >- return equalLettersIgnoringASCIICase(string.string(), lowercaseLetters); >-} >- >-inline bool equalIgnoringASCIICase(const AtomicString& a, const AtomicString& b) >-{ >- return equalIgnoringASCIICase(a.string(), b.string()); >-} >- >-inline bool equalIgnoringASCIICase(const AtomicString& a, const String& b) >-{ >- return equalIgnoringASCIICase(a.string(), b); >-} >- >-inline bool equalIgnoringASCIICase(const String& a, const AtomicString& b) >-{ >- return equalIgnoringASCIICase(a, b.string()); >-} >- >-inline bool equalIgnoringASCIICase(const AtomicString& a, const char* b) >-{ >- return equalIgnoringASCIICase(a.string(), b); >-} >- >-template<> struct IntegerToStringConversionTrait<AtomicString> { >- using ReturnType = AtomicString; >- using AdditionalArgumentType = void; >- static AtomicString flush(LChar* characters, unsigned length, void*) { return { characters, length }; } >-}; >- >-} // namespace WTF >- >-#ifndef ATOMICSTRING_HIDE_GLOBALS >-using WTF::AtomicString; >-using WTF::nullAtom; >-using WTF::emptyAtom; >-using WTF::starAtom; >-using WTF::xmlAtom; >-using WTF::xmlnsAtom; >-#endif >- >-#include <wtf/text/StringConcatenate.h> >diff --git a/Source/WTF/wtf/text/AtomicStringHash.h b/Source/WTF/wtf/text/AtomicStringHash.h >deleted file mode 100644 >index f2b7d2e165d0640659acfa2ae65a288ee15bf516..0000000000000000000000000000000000000000 >--- a/Source/WTF/wtf/text/AtomicStringHash.h >+++ /dev/null >@@ -1,68 +0,0 @@ >-/* >- * Copyright (C) 2008 Apple Inc. All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution. >- * 3. Neither the name of Apple Inc. ("Apple") nor the names of >- * its contributors may be used to endorse or promote products derived >- * from this software without specific prior written permission. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND >- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT >- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF >- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >- */ >- >-#pragma once >- >-#include <wtf/text/AtomicString.h> >-#include <wtf/HashTraits.h> >- >-namespace WTF { >- >- struct AtomicStringHash { >- static unsigned hash(const AtomicString& key) >- { >- return key.impl()->existingHash(); >- } >- >- static bool equal(const AtomicString& a, const AtomicString& b) >- { >- return a == b; >- } >- >- static const bool safeToCompareToEmptyOrDeleted = false; >- }; >- >- template<> struct HashTraits<WTF::AtomicString> : SimpleClassHashTraits<WTF::AtomicString> { >- static const bool hasIsEmptyValueFunction = true; >- static bool isEmptyValue(const AtomicString& value) >- { >- return value.isNull(); >- } >- >- static void customDeleteBucket(AtomicString& value) >- { >- // See unique_ptr's customDeleteBucket() for an explanation. >- ASSERT(!isDeletedValue(value)); >- AtomicString valueToBeDestroyed = WTFMove(value); >- constructDeletedValue(value); >- } >- }; >- >-} >- >-using WTF::AtomicStringHash; >diff --git a/Source/WTF/wtf/text/AtomicStringImpl.cpp b/Source/WTF/wtf/text/AtomicStringImpl.cpp >deleted file mode 100644 >index 601feb5fd33130bec46050236e2ec41d809c4fef..0000000000000000000000000000000000000000 >--- a/Source/WTF/wtf/text/AtomicStringImpl.cpp >+++ /dev/null >@@ -1,553 +0,0 @@ >-/* >- * Copyright (C) 2004-2008, 2013-2014 Apple Inc. All rights reserved. >- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> >- * Copyright (C) 2012 Google Inc. All rights reserved. >- * Copyright (C) 2015 Yusuke Suzuki<utatane.tea@gmail.com>. All rights reserved. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- * >- */ >- >-#include "config.h" >-#include <wtf/text/AtomicStringImpl.h> >- >-#include <wtf/CommaPrinter.h> >-#include <wtf/DataLog.h> >-#include <wtf/HashSet.h> >-#include <wtf/StringPrintStream.h> >-#include <wtf/Threading.h> >-#include <wtf/text/AtomicStringTable.h> >-#include <wtf/text/IntegerToStringConversion.h> >-#include <wtf/text/StringHash.h> >-#include <wtf/unicode/UTF8Conversion.h> >- >-#if USE(WEB_THREAD) >-#include <wtf/Lock.h> >-#endif >- >-namespace WTF { >- >-using namespace Unicode; >- >-#if USE(WEB_THREAD) >- >-class AtomicStringTableLocker : public LockHolder { >- WTF_MAKE_NONCOPYABLE(AtomicStringTableLocker); >- >- static Lock s_stringTableLock; >-public: >- AtomicStringTableLocker() >- : LockHolder(&s_stringTableLock) >- { >- } >-}; >- >-Lock AtomicStringTableLocker::s_stringTableLock; >- >-#else >- >-class AtomicStringTableLocker { >- WTF_MAKE_NONCOPYABLE(AtomicStringTableLocker); >-public: >- AtomicStringTableLocker() { } >-}; >- >-#endif // USE(WEB_THREAD) >- >-using StringTableImpl = HashSet<StringImpl*>; >- >-static ALWAYS_INLINE StringTableImpl& stringTable() >-{ >- return Thread::current().atomicStringTable()->table(); >-} >- >-template<typename T, typename HashTranslator> >-static inline Ref<AtomicStringImpl> addToStringTable(AtomicStringTableLocker&, StringTableImpl& atomicStringTable, const T& value) >-{ >- auto addResult = atomicStringTable.add<HashTranslator>(value); >- >- // If the string is newly-translated, then we need to adopt it. >- // The boolean in the pair tells us if that is so. >- if (addResult.isNewEntry) >- return adoptRef(static_cast<AtomicStringImpl&>(**addResult.iterator)); >- return *static_cast<AtomicStringImpl*>(*addResult.iterator); >-} >- >-template<typename T, typename HashTranslator> >-static inline Ref<AtomicStringImpl> addToStringTable(const T& value) >-{ >- AtomicStringTableLocker locker; >- return addToStringTable<T, HashTranslator>(locker, stringTable(), value); >-} >- >-struct CStringTranslator { >- static unsigned hash(const LChar* characters) >- { >- return StringHasher::computeHashAndMaskTop8Bits(characters); >- } >- >- static inline bool equal(StringImpl* str, const LChar* characters) >- { >- return WTF::equal(str, characters); >- } >- >- static void translate(StringImpl*& location, const LChar* const& characters, unsigned hash) >- { >- location = &StringImpl::create(characters).leakRef(); >- location->setHash(hash); >- location->setIsAtomic(true); >- } >-}; >- >-RefPtr<AtomicStringImpl> AtomicStringImpl::add(const LChar* characters) >-{ >- if (!characters) >- return nullptr; >- if (!*characters) >- return static_cast<AtomicStringImpl*>(StringImpl::empty()); >- >- return addToStringTable<const LChar*, CStringTranslator>(characters); >-} >- >-template<typename CharacterType> >-struct HashTranslatorCharBuffer { >- const CharacterType* characters; >- unsigned length; >- unsigned hash; >- >- HashTranslatorCharBuffer(const CharacterType* characters, unsigned length) >- : characters(characters) >- , length(length) >- , hash(StringHasher::computeHashAndMaskTop8Bits(characters, length)) >- { >- } >- >- HashTranslatorCharBuffer(const CharacterType* characters, unsigned length, unsigned hash) >- : characters(characters) >- , length(length) >- , hash(hash) >- { >- } >-}; >- >-using UCharBuffer = HashTranslatorCharBuffer<UChar>; >-struct UCharBufferTranslator { >- static unsigned hash(const UCharBuffer& buf) >- { >- return buf.hash; >- } >- >- static bool equal(StringImpl* const& str, const UCharBuffer& buf) >- { >- return WTF::equal(str, buf.characters, buf.length); >- } >- >- static void translate(StringImpl*& location, const UCharBuffer& buf, unsigned hash) >- { >- location = &StringImpl::create8BitIfPossible(buf.characters, buf.length).leakRef(); >- location->setHash(hash); >- location->setIsAtomic(true); >- } >-}; >- >-struct HashAndUTF8Characters { >- unsigned hash; >- const char* characters; >- unsigned length; >- unsigned utf16Length; >-}; >- >-struct HashAndUTF8CharactersTranslator { >- static unsigned hash(const HashAndUTF8Characters& buffer) >- { >- return buffer.hash; >- } >- >- static bool equal(StringImpl* const& string, const HashAndUTF8Characters& buffer) >- { >- if (buffer.utf16Length != string->length()) >- return false; >- >- // If buffer contains only ASCII characters UTF-8 and UTF16 length are the same. >- if (buffer.utf16Length != buffer.length) { >- if (string->is8Bit()) >- return equalLatin1WithUTF8(string->characters8(), buffer.characters, buffer.characters + buffer.length); >- >- return equalUTF16WithUTF8(string->characters16(), buffer.characters, buffer.characters + buffer.length); >- } >- >- if (string->is8Bit()) { >- const LChar* stringCharacters = string->characters8(); >- >- for (unsigned i = 0; i < buffer.length; ++i) { >- ASSERT(isASCII(buffer.characters[i])); >- if (stringCharacters[i] != buffer.characters[i]) >- return false; >- } >- >- return true; >- } >- >- const UChar* stringCharacters = string->characters16(); >- >- for (unsigned i = 0; i < buffer.length; ++i) { >- ASSERT(isASCII(buffer.characters[i])); >- if (stringCharacters[i] != buffer.characters[i]) >- return false; >- } >- >- return true; >- } >- >- static void translate(StringImpl*& location, const HashAndUTF8Characters& buffer, unsigned hash) >- { >- UChar* target; >- auto newString = StringImpl::createUninitialized(buffer.utf16Length, target); >- >- bool isAllASCII; >- const char* source = buffer.characters; >- if (!convertUTF8ToUTF16(source, source + buffer.length, &target, target + buffer.utf16Length, &isAllASCII)) >- ASSERT_NOT_REACHED(); >- >- if (isAllASCII) >- newString = StringImpl::create(buffer.characters, buffer.length); >- >- location = &newString.leakRef(); >- location->setHash(hash); >- location->setIsAtomic(true); >- } >-}; >- >-RefPtr<AtomicStringImpl> AtomicStringImpl::add(const UChar* characters, unsigned length) >-{ >- if (!characters) >- return nullptr; >- >- if (!length) >- return static_cast<AtomicStringImpl*>(StringImpl::empty()); >- >- UCharBuffer buffer { characters, length }; >- return addToStringTable<UCharBuffer, UCharBufferTranslator>(buffer); >-} >- >-RefPtr<AtomicStringImpl> AtomicStringImpl::add(const UChar* characters) >-{ >- if (!characters) >- return nullptr; >- >- unsigned length = 0; >- while (characters[length] != UChar(0)) >- ++length; >- >- if (!length) >- return static_cast<AtomicStringImpl*>(StringImpl::empty()); >- >- UCharBuffer buffer { characters, length }; >- return addToStringTable<UCharBuffer, UCharBufferTranslator>(buffer); >-} >- >-struct SubstringLocation { >- StringImpl* baseString; >- unsigned start; >- unsigned length; >-}; >- >-struct SubstringTranslator { >- static void translate(StringImpl*& location, const SubstringLocation& buffer, unsigned hash) >- { >- location = &StringImpl::createSubstringSharingImpl(*buffer.baseString, buffer.start, buffer.length).leakRef(); >- location->setHash(hash); >- location->setIsAtomic(true); >- } >-}; >- >-struct SubstringTranslator8 : SubstringTranslator { >- static unsigned hash(const SubstringLocation& buffer) >- { >- return StringHasher::computeHashAndMaskTop8Bits(buffer.baseString->characters8() + buffer.start, buffer.length); >- } >- >- static bool equal(StringImpl* const& string, const SubstringLocation& buffer) >- { >- return WTF::equal(string, buffer.baseString->characters8() + buffer.start, buffer.length); >- } >-}; >- >-struct SubstringTranslator16 : SubstringTranslator { >- static unsigned hash(const SubstringLocation& buffer) >- { >- return StringHasher::computeHashAndMaskTop8Bits(buffer.baseString->characters16() + buffer.start, buffer.length); >- } >- >- static bool equal(StringImpl* const& string, const SubstringLocation& buffer) >- { >- return WTF::equal(string, buffer.baseString->characters16() + buffer.start, buffer.length); >- } >-}; >- >-RefPtr<AtomicStringImpl> AtomicStringImpl::add(StringImpl* baseString, unsigned start, unsigned length) >-{ >- if (!baseString) >- return nullptr; >- >- if (!length || start >= baseString->length()) >- return static_cast<AtomicStringImpl*>(StringImpl::empty()); >- >- unsigned maxLength = baseString->length() - start; >- if (length >= maxLength) { >- if (!start) >- return add(baseString); >- length = maxLength; >- } >- >- SubstringLocation buffer = { baseString, start, length }; >- if (baseString->is8Bit()) >- return addToStringTable<SubstringLocation, SubstringTranslator8>(buffer); >- return addToStringTable<SubstringLocation, SubstringTranslator16>(buffer); >-} >- >-using LCharBuffer = HashTranslatorCharBuffer<LChar>; >-struct LCharBufferTranslator { >- static unsigned hash(const LCharBuffer& buf) >- { >- return buf.hash; >- } >- >- static bool equal(StringImpl* const& str, const LCharBuffer& buf) >- { >- return WTF::equal(str, buf.characters, buf.length); >- } >- >- static void translate(StringImpl*& location, const LCharBuffer& buf, unsigned hash) >- { >- location = &StringImpl::create(buf.characters, buf.length).leakRef(); >- location->setHash(hash); >- location->setIsAtomic(true); >- } >-}; >- >-template<typename CharType> >-struct BufferFromStaticDataTranslator { >- using Buffer = HashTranslatorCharBuffer<CharType>; >- static unsigned hash(const Buffer& buf) >- { >- return buf.hash; >- } >- >- static bool equal(StringImpl* const& str, const Buffer& buf) >- { >- return WTF::equal(str, buf.characters, buf.length); >- } >- >- static void translate(StringImpl*& location, const Buffer& buf, unsigned hash) >- { >- location = &StringImpl::createWithoutCopying(buf.characters, buf.length).leakRef(); >- location->setHash(hash); >- location->setIsAtomic(true); >- } >-}; >- >-RefPtr<AtomicStringImpl> AtomicStringImpl::add(const LChar* characters, unsigned length) >-{ >- if (!characters) >- return nullptr; >- >- if (!length) >- return static_cast<AtomicStringImpl*>(StringImpl::empty()); >- >- LCharBuffer buffer { characters, length }; >- return addToStringTable<LCharBuffer, LCharBufferTranslator>(buffer); >-} >- >-Ref<AtomicStringImpl> AtomicStringImpl::addLiteral(const char* characters, unsigned length) >-{ >- ASSERT(characters); >- ASSERT(length); >- >- LCharBuffer buffer { reinterpret_cast<const LChar*>(characters), length }; >- return addToStringTable<LCharBuffer, BufferFromStaticDataTranslator<LChar>>(buffer); >-} >- >-static Ref<AtomicStringImpl> addSymbol(AtomicStringTableLocker& locker, StringTableImpl& atomicStringTable, StringImpl& base) >-{ >- ASSERT(base.length()); >- ASSERT(base.isSymbol()); >- >- SubstringLocation buffer = { &base, 0, base.length() }; >- if (base.is8Bit()) >- return addToStringTable<SubstringLocation, SubstringTranslator8>(locker, atomicStringTable, buffer); >- return addToStringTable<SubstringLocation, SubstringTranslator16>(locker, atomicStringTable, buffer); >-} >- >-static inline Ref<AtomicStringImpl> addSymbol(StringImpl& base) >-{ >- AtomicStringTableLocker locker; >- return addSymbol(locker, stringTable(), base); >-} >- >-static Ref<AtomicStringImpl> addStatic(AtomicStringTableLocker& locker, StringTableImpl& atomicStringTable, const StringImpl& base) >-{ >- ASSERT(base.length()); >- ASSERT(base.isStatic()); >- >- if (base.is8Bit()) { >- LCharBuffer buffer { base.characters8(), base.length(), base.hash() }; >- return addToStringTable<LCharBuffer, BufferFromStaticDataTranslator<LChar>>(locker, atomicStringTable, buffer); >- } >- UCharBuffer buffer { base.characters16(), base.length(), base.hash() }; >- return addToStringTable<UCharBuffer, BufferFromStaticDataTranslator<UChar>>(locker, atomicStringTable, buffer); >-} >- >-static inline Ref<AtomicStringImpl> addStatic(const StringImpl& base) >-{ >- AtomicStringTableLocker locker; >- return addStatic(locker, stringTable(), base); >-} >- >-RefPtr<AtomicStringImpl> AtomicStringImpl::add(const StaticStringImpl* string) >-{ >- auto s = reinterpret_cast<const StringImpl*>(string); >- ASSERT(s->isStatic()); >- return addStatic(*s); >-} >- >-Ref<AtomicStringImpl> AtomicStringImpl::addSlowCase(StringImpl& string) >-{ >- // This check is necessary for null symbols. >- // Their length is zero, but they are not AtomicStringImpl. >- if (!string.length()) >- return *static_cast<AtomicStringImpl*>(StringImpl::empty()); >- >- if (string.isStatic()) >- return addStatic(string); >- >- if (string.isSymbol()) >- return addSymbol(string); >- >- ASSERT_WITH_MESSAGE(!string.isAtomic(), "AtomicStringImpl should not hit the slow case if the string is already atomic."); >- >- AtomicStringTableLocker locker; >- auto addResult = stringTable().add(&string); >- >- if (addResult.isNewEntry) { >- ASSERT(*addResult.iterator == &string); >- string.setIsAtomic(true); >- } >- >- return *static_cast<AtomicStringImpl*>(*addResult.iterator); >-} >- >-Ref<AtomicStringImpl> AtomicStringImpl::addSlowCase(AtomicStringTable& stringTable, StringImpl& string) >-{ >- // This check is necessary for null symbols. >- // Their length is zero, but they are not AtomicStringImpl. >- if (!string.length()) >- return *static_cast<AtomicStringImpl*>(StringImpl::empty()); >- >- if (string.isStatic()) { >- AtomicStringTableLocker locker; >- return addStatic(locker, stringTable.table(), string); >- } >- >- if (string.isSymbol()) { >- AtomicStringTableLocker locker; >- return addSymbol(locker, stringTable.table(), string); >- } >- >- ASSERT_WITH_MESSAGE(!string.isAtomic(), "AtomicStringImpl should not hit the slow case if the string is already atomic."); >- >- AtomicStringTableLocker locker; >- auto addResult = stringTable.table().add(&string); >- >- if (addResult.isNewEntry) { >- ASSERT(*addResult.iterator == &string); >- string.setIsAtomic(true); >- } >- >- return *static_cast<AtomicStringImpl*>(*addResult.iterator); >-} >- >-void AtomicStringImpl::remove(AtomicStringImpl* string) >-{ >- ASSERT(string->isAtomic()); >- AtomicStringTableLocker locker; >- auto& atomicStringTable = stringTable(); >- auto iterator = atomicStringTable.find(string); >- ASSERT_WITH_MESSAGE(iterator != atomicStringTable.end(), "The string being removed is atomic in the string table of an other thread!"); >- ASSERT(string == *iterator); >- atomicStringTable.remove(iterator); >-} >- >-RefPtr<AtomicStringImpl> AtomicStringImpl::lookUpSlowCase(StringImpl& string) >-{ >- ASSERT_WITH_MESSAGE(!string.isAtomic(), "AtomicStringImpls should return from the fast case."); >- >- if (!string.length()) >- return static_cast<AtomicStringImpl*>(StringImpl::empty()); >- >- AtomicStringTableLocker locker; >- auto& atomicStringTable = stringTable(); >- auto iterator = atomicStringTable.find(&string); >- if (iterator != atomicStringTable.end()) >- return static_cast<AtomicStringImpl*>(*iterator); >- return nullptr; >-} >- >-RefPtr<AtomicStringImpl> AtomicStringImpl::addUTF8(const char* charactersStart, const char* charactersEnd) >-{ >- HashAndUTF8Characters buffer; >- buffer.characters = charactersStart; >- buffer.hash = calculateStringHashAndLengthFromUTF8MaskingTop8Bits(charactersStart, charactersEnd, buffer.length, buffer.utf16Length); >- >- if (!buffer.hash) >- return nullptr; >- >- return addToStringTable<HashAndUTF8Characters, HashAndUTF8CharactersTranslator>(buffer); >-} >- >-RefPtr<AtomicStringImpl> AtomicStringImpl::lookUp(const LChar* characters, unsigned length) >-{ >- AtomicStringTableLocker locker; >- auto& table = stringTable(); >- >- LCharBuffer buffer = { characters, length }; >- auto iterator = table.find<LCharBufferTranslator>(buffer); >- if (iterator != table.end()) >- return static_cast<AtomicStringImpl*>(*iterator); >- return nullptr; >-} >- >-RefPtr<AtomicStringImpl> AtomicStringImpl::lookUp(const UChar* characters, unsigned length) >-{ >- AtomicStringTableLocker locker; >- auto& table = stringTable(); >- >- UCharBuffer buffer { characters, length }; >- auto iterator = table.find<UCharBufferTranslator>(buffer); >- if (iterator != table.end()) >- return static_cast<AtomicStringImpl*>(*iterator); >- return nullptr; >-} >- >-#if !ASSERT_DISABLED >-bool AtomicStringImpl::isInAtomicStringTable(StringImpl* string) >-{ >- AtomicStringTableLocker locker; >- return stringTable().contains(string); >-} >-#endif >- >-} // namespace WTF >diff --git a/Source/WTF/wtf/text/AtomicStringImpl.h b/Source/WTF/wtf/text/AtomicStringImpl.h >deleted file mode 100644 >index 36a04f4c4b8c8c1518b18796168289df8a384ff2..0000000000000000000000000000000000000000 >--- a/Source/WTF/wtf/text/AtomicStringImpl.h >+++ /dev/null >@@ -1,123 +0,0 @@ >-/* >- * Copyright (C) 2006 Apple Inc. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- * >- */ >- >-#pragma once >- >-#include <wtf/text/UniquedStringImpl.h> >- >-namespace WTF { >- >-class AtomicStringTable; >- >-class AtomicStringImpl : public UniquedStringImpl { >-public: >- WTF_EXPORT_PRIVATE static RefPtr<AtomicStringImpl> lookUp(const LChar*, unsigned length); >- WTF_EXPORT_PRIVATE static RefPtr<AtomicStringImpl> lookUp(const UChar*, unsigned length); >- static RefPtr<AtomicStringImpl> lookUp(StringImpl* string) >- { >- if (!string || string->isAtomic()) >- return static_cast<AtomicStringImpl*>(string); >- return lookUpSlowCase(*string); >- } >- >- static void remove(AtomicStringImpl*); >- >- WTF_EXPORT_PRIVATE static RefPtr<AtomicStringImpl> add(const LChar*); >- ALWAYS_INLINE static RefPtr<AtomicStringImpl> add(const char* s) { return add(reinterpret_cast<const LChar*>(s)); }; >- WTF_EXPORT_PRIVATE static RefPtr<AtomicStringImpl> add(const LChar*, unsigned length); >- WTF_EXPORT_PRIVATE static RefPtr<AtomicStringImpl> add(const UChar*, unsigned length); >- ALWAYS_INLINE static RefPtr<AtomicStringImpl> add(const char* s, unsigned length) { return add(reinterpret_cast<const LChar*>(s), length); }; >- WTF_EXPORT_PRIVATE static RefPtr<AtomicStringImpl> add(const UChar*); >- WTF_EXPORT_PRIVATE static RefPtr<AtomicStringImpl> add(StringImpl*, unsigned offset, unsigned length); >- ALWAYS_INLINE static RefPtr<AtomicStringImpl> add(StringImpl* string) >- { >- if (!string) >- return static_cast<AtomicStringImpl*>(string); >- return add(*string); >- } >- WTF_EXPORT_PRIVATE static RefPtr<AtomicStringImpl> add(const StaticStringImpl*); >- WTF_EXPORT_PRIVATE static Ref<AtomicStringImpl> addLiteral(const char* characters, unsigned length); >- >- // Returns null if the input data contains an invalid UTF-8 sequence. >- static RefPtr<AtomicStringImpl> addUTF8(const char* start, const char* end); >- >-#if USE(CF) >- WTF_EXPORT_PRIVATE static RefPtr<AtomicStringImpl> add(CFStringRef); >-#endif >- >- template<typename StringTableProvider> >- ALWAYS_INLINE static RefPtr<AtomicStringImpl> addWithStringTableProvider(StringTableProvider& stringTableProvider, StringImpl* string) >- { >- if (!string) >- return nullptr; >- return add(*stringTableProvider.atomicStringTable(), *string); >- } >- >-#if !ASSERT_DISABLED >- WTF_EXPORT_PRIVATE static bool isInAtomicStringTable(StringImpl*); >-#endif >- >-private: >- AtomicStringImpl() = delete; >- >- ALWAYS_INLINE static Ref<AtomicStringImpl> add(StringImpl& string) >- { >- if (string.isAtomic()) { >- ASSERT_WITH_MESSAGE(!string.length() || isInAtomicStringTable(&string), "The atomic string comes from an other thread!"); >- return static_cast<AtomicStringImpl&>(string); >- } >- return addSlowCase(string); >- } >- >- ALWAYS_INLINE static Ref<AtomicStringImpl> add(AtomicStringTable& stringTable, StringImpl& string) >- { >- if (string.isAtomic()) { >- ASSERT_WITH_MESSAGE(!string.length() || isInAtomicStringTable(&string), "The atomic string comes from an other thread!"); >- return static_cast<AtomicStringImpl&>(string); >- } >- return addSlowCase(stringTable, string); >- } >- >- WTF_EXPORT_PRIVATE static Ref<AtomicStringImpl> addSlowCase(StringImpl&); >- WTF_EXPORT_PRIVATE static Ref<AtomicStringImpl> addSlowCase(AtomicStringTable&, StringImpl&); >- >- WTF_EXPORT_PRIVATE static RefPtr<AtomicStringImpl> lookUpSlowCase(StringImpl&); >-}; >- >-#if !ASSERT_DISABLED >-// AtomicStringImpls created from StaticStringImpl will ASSERT >-// in the generic ValueCheck<T>::checkConsistency >-// as they are not allocated by fastMalloc. >-// We don't currently have any way to detect that case >-// so we ignore the consistency check for all AtomicStringImpls*. >-template<> struct >-ValueCheck<AtomicStringImpl*> { >- static void checkConsistency(const AtomicStringImpl*) { } >-}; >- >-template<> struct >-ValueCheck<const AtomicStringImpl*> { >- static void checkConsistency(const AtomicStringImpl*) { } >-}; >-#endif >- >-} >- >-using WTF::AtomicStringImpl; >diff --git a/Source/WTF/wtf/text/AtomicStringTable.cpp b/Source/WTF/wtf/text/AtomicStringTable.cpp >deleted file mode 100644 >index 420789f150d4b2d26366e8ad49159aea14115f85..0000000000000000000000000000000000000000 >--- a/Source/WTF/wtf/text/AtomicStringTable.cpp >+++ /dev/null >@@ -1,38 +0,0 @@ >-/* >- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2013 Apple Inc. All rights reserved. >- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> >- * Copyright (C) 2012 Google Inc. All rights reserved. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- * >- */ >- >-#include "config.h" >-#include <wtf/text/AtomicStringTable.h> >- >-#include <wtf/HashSet.h> >-#include <wtf/MainThread.h> >-#include <wtf/Threading.h> >- >-namespace WTF { >- >-AtomicStringTable::~AtomicStringTable() >-{ >- for (auto* string : m_table) >- string->setIsAtomic(false); >-} >- >-} >diff --git a/Source/WTF/wtf/text/AtomicStringTable.h b/Source/WTF/wtf/text/AtomicStringTable.h >deleted file mode 100644 >index 2993070783370f61d5cde4527ed5cdca601f22e8..0000000000000000000000000000000000000000 >--- a/Source/WTF/wtf/text/AtomicStringTable.h >+++ /dev/null >@@ -1,44 +0,0 @@ >-/* >- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2013 Apple Inc. All rights reserved. >- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> >- * Copyright (C) 2012 Google Inc. All rights reserved. >- * >- * This library is free software; you can redistribute it and/or >- * modify it under the terms of the GNU Library General Public >- * License as published by the Free Software Foundation; either >- * version 2 of the License, or (at your option) any later version. >- * >- * This library is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- * Library General Public License for more details. >- * >- * You should have received a copy of the GNU Library General Public License >- * along with this library; see the file COPYING.LIB. If not, write to >- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, >- * Boston, MA 02110-1301, USA. >- * >- */ >- >-#pragma once >- >-#include <wtf/HashSet.h> >-#include <wtf/text/StringImpl.h> >- >-namespace WTF { >- >-class StringImpl; >- >-class AtomicStringTable { >- WTF_MAKE_FAST_ALLOCATED; >-public: >- WTF_EXPORT_PRIVATE ~AtomicStringTable(); >- >- HashSet<StringImpl*>& table() { return m_table; } >- >-private: >- HashSet<StringImpl*> m_table; >-}; >- >-} >-using WTF::AtomicStringTable; >diff --git a/Source/WTF/wtf/text/LineBreakIteratorPoolICU.h b/Source/WTF/wtf/text/LineBreakIteratorPoolICU.h >index 8e89c3116edbcfb2641eb0064ae0bb9d9222838f..2f678d1fcf28eecfa72f027a273e345b67002c55 100644 >--- a/Source/WTF/wtf/text/LineBreakIteratorPoolICU.h >+++ b/Source/WTF/wtf/text/LineBreakIteratorPoolICU.h >@@ -29,7 +29,7 @@ > #include <wtf/HashMap.h> > #include <wtf/NeverDestroyed.h> > #include <wtf/ThreadSpecific.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WTF { > >@@ -44,9 +44,9 @@ public: > return *pool.get(); > } > >- static AtomicString makeLocaleWithBreakKeyword(const AtomicString& locale, LineBreakIteratorMode mode) >+ static AtomString makeLocaleWithBreakKeyword(const AtomString& locale, LineBreakIteratorMode mode) > { >- // The uloc functions model locales as char*, so we have to downconvert our AtomicString. >+ // The uloc functions model locales as char*, so we have to downconvert our AtomString. > auto utf8Locale = locale.string().utf8(); > if (!utf8Locale.length()) > return locale; >@@ -72,7 +72,7 @@ public: > UErrorCode status = U_ZERO_ERROR; > int32_t lengthNeeded = uloc_setKeywordValue("lb", keywordValue, scratchBuffer.data(), scratchBuffer.size(), &status); > if (U_SUCCESS(status)) >- return AtomicString::fromUTF8(scratchBuffer.data(), lengthNeeded); >+ return AtomString::fromUTF8(scratchBuffer.data(), lengthNeeded); > if (status == U_BUFFER_OVERFLOW_ERROR) { > scratchBuffer.grow(lengthNeeded + 1); > memset(scratchBuffer.data() + utf8Locale.length(), 0, scratchBuffer.size() - utf8Locale.length()); >@@ -80,12 +80,12 @@ public: > int32_t lengthNeeded2 = uloc_setKeywordValue("lb", keywordValue, scratchBuffer.data(), scratchBuffer.size(), &status); > if (!U_SUCCESS(status) || lengthNeeded != lengthNeeded2) > return locale; >- return AtomicString::fromUTF8(scratchBuffer.data(), lengthNeeded); >+ return AtomString::fromUTF8(scratchBuffer.data(), lengthNeeded); > } > return locale; > } > >- UBreakIterator* take(const AtomicString& locale, LineBreakIteratorMode mode) >+ UBreakIterator* take(const AtomString& locale, LineBreakIteratorMode mode) > { > auto localeWithOptionalBreakKeyword = makeLocaleWithBreakKeyword(locale, mode); > >@@ -122,8 +122,8 @@ public: > private: > static constexpr size_t capacity = 4; > >- Vector<std::pair<AtomicString, UBreakIterator*>, capacity> m_pool; >- HashMap<UBreakIterator*, AtomicString> m_vendedIterators; >+ Vector<std::pair<AtomString, UBreakIterator*>, capacity> m_pool; >+ HashMap<UBreakIterator*, AtomString> m_vendedIterators; > > friend WTF::ThreadSpecific<LineBreakIteratorPool>::operator LineBreakIteratorPool*(); > }; >diff --git a/Source/WTF/wtf/text/StringBuilder.h b/Source/WTF/wtf/text/StringBuilder.h >index fe4c5320ceb3f1d28a04f59283996b92bbc1e51e..c36f01f6cf5af157440994c8e4cd743f2dd64f43 100644 >--- a/Source/WTF/wtf/text/StringBuilder.h >+++ b/Source/WTF/wtf/text/StringBuilder.h >@@ -27,7 +27,7 @@ > #pragma once > > #include <wtf/CheckedArithmetic.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/IntegerToStringConversion.h> > #include <wtf/text/StringView.h> > #include <wtf/text/WTFString.h> >@@ -72,9 +72,9 @@ public: > > ALWAYS_INLINE void append(const char* characters, unsigned length) { append(reinterpret_cast<const LChar*>(characters), length); } > >- void append(const AtomicString& atomicString) >+ void append(const AtomString& atomString) > { >- append(atomicString.string()); >+ append(atomString.string()); > } > > void append(const String& string) >@@ -252,24 +252,24 @@ public: > return m_string; > } > >- AtomicString toAtomicString() const >+ AtomString toAtomString() const > { > RELEASE_ASSERT(!hasOverflowed()); > if (!m_length) > return emptyAtom(); > >- // If the buffer is sufficiently over-allocated, make a new AtomicString from a copy so its buffer is not so large. >+ // If the buffer is sufficiently over-allocated, make a new AtomString from a copy so its buffer is not so large. > if (canShrink()) { > if (is8Bit()) >- return AtomicString(characters8(), length()); >- return AtomicString(characters16(), length()); >+ return AtomString(characters8(), length()); >+ return AtomString(characters16(), length()); > } > > if (!m_string.isNull()) >- return AtomicString(m_string); >+ return AtomString(m_string); > > ASSERT(m_buffer); >- return AtomicString(m_buffer.get(), 0, m_length.unsafeGet()); >+ return AtomString(m_buffer.get(), 0, m_length.unsafeGet()); > } > > unsigned length() const >diff --git a/Source/WTF/wtf/text/StringConcatenate.h b/Source/WTF/wtf/text/StringConcatenate.h >index c5d020181842c26013bd4879e774a3bf1c8d172c..c8cba0723530ee4762fb727b80a1231a59ff9490 100644 >--- a/Source/WTF/wtf/text/StringConcatenate.h >+++ b/Source/WTF/wtf/text/StringConcatenate.h >@@ -27,7 +27,7 @@ > > #include <cstring> > #include <wtf/CheckedArithmetic.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/StringView.h> > > // This macro is helpful for testing how many intermediate Strings are created while evaluating an >@@ -189,9 +189,9 @@ private: > const String& m_string; > }; > >-template<> class StringTypeAdapter<AtomicString, void> : public StringTypeAdapter<String, void> { >+template<> class StringTypeAdapter<AtomString, void> : public StringTypeAdapter<String, void> { > public: >- StringTypeAdapter(const AtomicString& string) >+ StringTypeAdapter(const AtomString& string) > : StringTypeAdapter<String, void> { string.string() } > { > } >diff --git a/Source/WTF/wtf/text/StringHash.h b/Source/WTF/wtf/text/StringHash.h >index 9ee6838d55fa0ea553f4710e2497670ac524bc8e..02b7f3798026cb6a73a129fc7e3846faea81e643 100644 >--- a/Source/WTF/wtf/text/StringHash.h >+++ b/Source/WTF/wtf/text/StringHash.h >@@ -22,7 +22,7 @@ > #pragma once > > #include <wtf/HashTraits.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/StringHasher.h> > > namespace WTF { >@@ -139,7 +139,7 @@ namespace WTF { > { > return hash(key.impl()); > } >- static unsigned hash(const AtomicString& key) >+ static unsigned hash(const AtomString& key) > { > return hash(key.impl()); > } >@@ -147,7 +147,7 @@ namespace WTF { > { > return equal(a.impl(), b.impl()); > } >- static bool equal(const AtomicString& a, const AtomicString& b) >+ static bool equal(const AtomString& a, const AtomString& b) > { > // FIXME: Is the "a == b" here a helpful optimization? > // It makes all cases where the strings are not identical slightly slower. >diff --git a/Source/WTF/wtf/text/StringImpl.cpp b/Source/WTF/wtf/text/StringImpl.cpp >index 0d80c32c7485d8f9c62934bb36efddefa475dde4..3f60781f7f1d7937ae69dfdd90984018b40a6108 100644 >--- a/Source/WTF/wtf/text/StringImpl.cpp >+++ b/Source/WTF/wtf/text/StringImpl.cpp >@@ -27,7 +27,7 @@ > > #include <wtf/ProcessID.h> > #include <wtf/StdLibExtras.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/CString.h> > #include <wtf/text/ExternalStringImpl.h> > #include <wtf/text/StringBuffer.h> >@@ -112,10 +112,10 @@ StringImpl::~StringImpl() > > STRING_STATS_REMOVE_STRING(*this); > >- if (isAtomic()) { >+ if (isAtom()) { > ASSERT(!isSymbol()); > if (length()) >- AtomicStringImpl::remove(static_cast<AtomicStringImpl*>(this)); >+ AtomStringImpl::remove(static_cast<AtomStringImpl*>(this)); > } else if (isSymbol()) { > auto& symbol = static_cast<SymbolImpl&>(*this); > auto* symbolRegistry = symbol.symbolRegistry(); >@@ -518,7 +518,7 @@ upconvert: > return newImpl; > } > >-static inline bool needsTurkishCasingRules(const AtomicString& localeIdentifier) >+static inline bool needsTurkishCasingRules(const AtomString& localeIdentifier) > { > // Either "tr" or "az" locale, with case sensitive comparison and allowing for an ignored subtag. > UChar first = localeIdentifier[0]; >@@ -528,7 +528,7 @@ static inline bool needsTurkishCasingRules(const AtomicString& localeIdentifier) > && (localeIdentifier.length() == 2 || localeIdentifier[2] == '-'); > } > >-Ref<StringImpl> StringImpl::convertToLowercaseWithLocale(const AtomicString& localeIdentifier) >+Ref<StringImpl> StringImpl::convertToLowercaseWithLocale(const AtomString& localeIdentifier) > { > // Use the more-optimized code path most of the time. > // Assuming here that the only locale-specific lowercasing is the Turkish casing rules. >@@ -564,7 +564,7 @@ Ref<StringImpl> StringImpl::convertToLowercaseWithLocale(const AtomicString& loc > return newString; > } > >-Ref<StringImpl> StringImpl::convertToUppercaseWithLocale(const AtomicString& localeIdentifier) >+Ref<StringImpl> StringImpl::convertToUppercaseWithLocale(const AtomString& localeIdentifier) > { > // Use the more-optimized code path most of the time. > // Assuming here that the only locale-specific lowercasing is the Turkish casing rules, >diff --git a/Source/WTF/wtf/text/StringImpl.h b/Source/WTF/wtf/text/StringImpl.h >index e564648c543cd823de8f223c4237cc9269519304..d79c557966ca5d15a430e3baa805bb95d4b7de06 100644 >--- a/Source/WTF/wtf/text/StringImpl.h >+++ b/Source/WTF/wtf/text/StringImpl.h >@@ -168,7 +168,7 @@ protected: > class StringImpl : private StringImplShape { > WTF_MAKE_NONCOPYABLE(StringImpl); WTF_MAKE_FAST_ALLOCATED; > >- friend class AtomicStringImpl; >+ friend class AtomStringImpl; > friend class JSC::LLInt::Data; > friend class JSC::LLIntOffsetsExtractor; > friend class PrivateSymbolImpl; >@@ -292,7 +292,7 @@ public: > WTF_EXPORT_PRIVATE size_t sizeInBytes() const; > > bool isSymbol() const { return m_hashAndFlags & s_hashFlagStringKindIsSymbol; } >- bool isAtomic() const { return m_hashAndFlags & s_hashFlagStringKindIsAtomic; } >+ bool isAtom() const { return m_hashAndFlags & s_hashFlagStringKindIsAtomic; } > void setIsAtomic(bool); > > bool isExternal() const { return bufferOwnership() == BufferExternal; } >@@ -412,8 +412,8 @@ public: > WTF_EXPORT_PRIVATE Ref<StringImpl> convertToLowercaseWithoutLocale(); > WTF_EXPORT_PRIVATE Ref<StringImpl> convertToLowercaseWithoutLocaleStartingAtFailingIndex8Bit(unsigned); > WTF_EXPORT_PRIVATE Ref<StringImpl> convertToUppercaseWithoutLocale(); >- WTF_EXPORT_PRIVATE Ref<StringImpl> convertToLowercaseWithLocale(const AtomicString& localeIdentifier); >- WTF_EXPORT_PRIVATE Ref<StringImpl> convertToUppercaseWithLocale(const AtomicString& localeIdentifier); >+ WTF_EXPORT_PRIVATE Ref<StringImpl> convertToLowercaseWithLocale(const AtomString& localeIdentifier); >+ WTF_EXPORT_PRIVATE Ref<StringImpl> convertToUppercaseWithLocale(const AtomString& localeIdentifier); > > Ref<StringImpl> foldCase(); > >@@ -1031,11 +1031,11 @@ inline size_t StringImpl::costDuringGC() > return divideRoundedUp(result, refCount()); > } > >-inline void StringImpl::setIsAtomic(bool isAtomic) >+inline void StringImpl::setIsAtomic(bool isAtom) > { > ASSERT(!isStatic()); > ASSERT(!isSymbol()); >- if (isAtomic) >+ if (isAtom) > m_hashAndFlags |= s_hashFlagStringKindIsAtomic; > else > m_hashAndFlags &= ~s_hashFlagStringKindIsAtomic; >diff --git a/Source/WTF/wtf/text/StringOperators.h b/Source/WTF/wtf/text/StringOperators.h >index 743ee9f84ee0da1405de97955908bc061684f98f..78621ff2fe98a0003678de4dc8bad8166768acc4 100644 >--- a/Source/WTF/wtf/text/StringOperators.h >+++ b/Source/WTF/wtf/text/StringOperators.h >@@ -39,7 +39,7 @@ public: > return result; > } > >- operator AtomicString() const >+ operator AtomString() const > { > return operator String(); > } >@@ -101,9 +101,9 @@ inline StringAppend<const char*, String> operator+(const char* string1, const St > return StringAppend<const char*, String>(string1, string2); > } > >-inline StringAppend<const char*, AtomicString> operator+(const char* string1, const AtomicString& string2) >+inline StringAppend<const char*, AtomString> operator+(const char* string1, const AtomString& string2) > { >- return StringAppend<const char*, AtomicString>(string1, string2); >+ return StringAppend<const char*, AtomString>(string1, string2); > } > > template<typename T, typename = std::enable_if_t<std::is_same<std::decay_t<T>, StringView>::value>> >@@ -123,9 +123,9 @@ inline StringAppend<const UChar*, String> operator+(const UChar* string1, const > return StringAppend<const UChar*, String>(string1, string2); > } > >-inline StringAppend<const UChar*, AtomicString> operator+(const UChar* string1, const AtomicString& string2) >+inline StringAppend<const UChar*, AtomString> operator+(const UChar* string1, const AtomString& string2) > { >- return StringAppend<const UChar*, AtomicString>(string1, string2); >+ return StringAppend<const UChar*, AtomString>(string1, string2); > } > > template<typename T, typename = std::enable_if_t<std::is_same<std::decay_t<T>, StringView>::value>> >@@ -145,9 +145,9 @@ inline StringAppend<ASCIILiteral, String> operator+(const ASCIILiteral& string1, > return StringAppend<ASCIILiteral, String>(string1, string2); > } > >-inline StringAppend<ASCIILiteral, AtomicString> operator+(const ASCIILiteral& string1, const AtomicString& string2) >+inline StringAppend<ASCIILiteral, AtomString> operator+(const ASCIILiteral& string1, const AtomString& string2) > { >- return StringAppend<ASCIILiteral, AtomicString>(string1, string2); >+ return StringAppend<ASCIILiteral, AtomString>(string1, string2); > } > > template<typename T, typename = std::enable_if_t<std::is_same<std::decay_t<T>, StringView>::value>> >diff --git a/Source/WTF/wtf/text/StringView.h b/Source/WTF/wtf/text/StringView.h >index 64102bfaa805cb0c638f548612e469018a1b2687..68886f66cf92743e9541dc271ebc1c49776e8a6e 100644 >--- a/Source/WTF/wtf/text/StringView.h >+++ b/Source/WTF/wtf/text/StringView.h >@@ -59,7 +59,7 @@ public: > StringView& operator=(const StringView&); > #endif > >- StringView(const AtomicString&); >+ StringView(const AtomString&); > StringView(const String&); > StringView(const StringImpl&); > StringView(const StringImpl*); >@@ -92,8 +92,8 @@ public: > > String toString() const; > String toStringWithoutCopying() const; >- AtomicString toAtomicString() const; >- RefPtr<AtomicStringImpl> toExistingAtomicString() const; >+ AtomString toAtomString() const; >+ RefPtr<AtomStringImpl> toExistingAtomString() const; > > #if USE(CF) > // This function converts null strings to empty strings. >@@ -223,7 +223,7 @@ WTF_EXPORT_PRIVATE String normalizedNFC(const String&); > > } > >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/WTFString.h> > > namespace WTF { >@@ -362,8 +362,8 @@ inline StringView::StringView(const String& string) > initialize(string.characters16(), string.length()); > } > >-inline StringView::StringView(const AtomicString& atomicString) >- : StringView(atomicString.string()) >+inline StringView::StringView(const AtomString& atomString) >+ : StringView(atomString.string()) > { > } > >@@ -504,18 +504,18 @@ inline String StringView::toString() const > return String(characters16(), m_length); > } > >-inline AtomicString StringView::toAtomicString() const >+inline AtomString StringView::toAtomString() const > { > if (is8Bit()) >- return AtomicString(characters8(), m_length); >- return AtomicString(characters16(), m_length); >+ return AtomString(characters8(), m_length); >+ return AtomString(characters16(), m_length); > } > >-inline RefPtr<AtomicStringImpl> StringView::toExistingAtomicString() const >+inline RefPtr<AtomStringImpl> StringView::toExistingAtomString() const > { > if (is8Bit()) >- return AtomicStringImpl::lookUp(characters8(), m_length); >- return AtomicStringImpl::lookUp(characters16(), m_length); >+ return AtomStringImpl::lookUp(characters8(), m_length); >+ return AtomStringImpl::lookUp(characters16(), m_length); > } > > inline float StringView::toFloat(bool& isValid) const >diff --git a/Source/WTF/wtf/text/TextBreakIterator.cpp b/Source/WTF/wtf/text/TextBreakIterator.cpp >index acf6844b06958ffabb8c5af6419a4d2bc85e76ce..b2a1e591830300efdeea185912c8d4f524a7d5d8 100644 >--- a/Source/WTF/wtf/text/TextBreakIterator.cpp >+++ b/Source/WTF/wtf/text/TextBreakIterator.cpp >@@ -35,7 +35,7 @@ namespace WTF { > > #if !PLATFORM(MAC) && !PLATFORM(IOS_FAMILY) > >-static Variant<TextBreakIteratorICU, TextBreakIteratorPlatform> mapModeToBackingIterator(StringView string, TextBreakIterator::Mode mode, const AtomicString& locale) >+static Variant<TextBreakIteratorICU, TextBreakIteratorPlatform> mapModeToBackingIterator(StringView string, TextBreakIterator::Mode mode, const AtomString& locale) > { > switch (mode) { > case TextBreakIterator::Mode::Line: >@@ -50,7 +50,7 @@ static Variant<TextBreakIteratorICU, TextBreakIteratorPlatform> mapModeToBacking > } > } > >-TextBreakIterator::TextBreakIterator(StringView string, Mode mode, const AtomicString& locale) >+TextBreakIterator::TextBreakIterator(StringView string, Mode mode, const AtomString& locale) > : m_backing(mapModeToBackingIterator(string, mode, locale)) > , m_mode(mode) > , m_locale(locale) >@@ -171,7 +171,7 @@ UBreakIterator* sentenceBreakIterator(StringView string) > return setTextForIterator(*staticSentenceBreakIterator, string); > } > >-UBreakIterator* acquireLineBreakIterator(StringView string, const AtomicString& locale, const UChar* priorContext, unsigned priorContextLength, LineBreakIteratorMode mode) >+UBreakIterator* acquireLineBreakIterator(StringView string, const AtomString& locale, const UChar* priorContext, unsigned priorContextLength, LineBreakIteratorMode mode) > { > UBreakIterator* iterator = LineBreakIteratorPool::sharedPool().take(locale, mode); > if (!iterator) >@@ -187,7 +187,7 @@ void releaseLineBreakIterator(UBreakIterator* iterator) > LineBreakIteratorPool::sharedPool().put(iterator); > } > >-UBreakIterator* openLineBreakIterator(const AtomicString& locale) >+UBreakIterator* openLineBreakIterator(const AtomString& locale) > { > bool localeIsEmpty = locale.isEmpty(); > UErrorCode openStatus = U_ZERO_ERROR; >diff --git a/Source/WTF/wtf/text/TextBreakIterator.h b/Source/WTF/wtf/text/TextBreakIterator.h >index 902232fb1c333f183b3f159d5aae2df3bb3607a1..1af10521ccf12fc3f3b2510c696e7a67cc434926 100644 >--- a/Source/WTF/wtf/text/TextBreakIterator.h >+++ b/Source/WTF/wtf/text/TextBreakIterator.h >@@ -81,7 +81,7 @@ private: > friend class TextBreakIteratorCache; > > // Use CachedTextBreakIterator instead of constructing one of these directly. >- WTF_EXPORT TextBreakIterator(StringView, Mode, const AtomicString& locale); >+ WTF_EXPORT TextBreakIterator(StringView, Mode, const AtomString& locale); > > void setText(StringView string) > { >@@ -95,14 +95,14 @@ private: > return m_mode; > } > >- const AtomicString& locale() const >+ const AtomString& locale() const > { > return m_locale; > } > > Variant<TextBreakIteratorICU, TextBreakIteratorPlatform> m_backing; > Mode m_mode; >- AtomicString m_locale; >+ AtomString m_locale; > }; > > class CachedTextBreakIterator; >@@ -124,7 +124,7 @@ private: > TextBreakIteratorCache& operator=(const TextBreakIteratorCache&) = delete; > TextBreakIteratorCache& operator=(TextBreakIteratorCache&&) = delete; > >- TextBreakIterator take(StringView string, TextBreakIterator::Mode mode, const AtomicString& locale) >+ TextBreakIterator take(StringView string, TextBreakIterator::Mode mode, const AtomString& locale) > { > auto iter = std::find_if(m_unused.begin(), m_unused.end(), [&](TextBreakIterator& candidate) { > return candidate.mode() == mode && candidate.locale() == locale; >@@ -157,7 +157,7 @@ private: > // RAII for TextBreakIterator and TextBreakIteratorCache. > class CachedTextBreakIterator { > public: >- CachedTextBreakIterator(StringView string, TextBreakIterator::Mode mode, const AtomicString& locale) >+ CachedTextBreakIterator(StringView string, TextBreakIterator::Mode mode, const AtomString& locale) > : m_backing(TextBreakIteratorCache::singleton().take(string, mode, locale)) > { > } >@@ -199,9 +199,9 @@ enum class LineBreakIteratorMode { Default, Loose, Normal, Strict }; > WTF_EXPORT_PRIVATE UBreakIterator* wordBreakIterator(StringView); > WTF_EXPORT_PRIVATE UBreakIterator* sentenceBreakIterator(StringView); > >-WTF_EXPORT_PRIVATE UBreakIterator* acquireLineBreakIterator(StringView, const AtomicString& locale, const UChar* priorContext, unsigned priorContextLength, LineBreakIteratorMode); >+WTF_EXPORT_PRIVATE UBreakIterator* acquireLineBreakIterator(StringView, const AtomString& locale, const UChar* priorContext, unsigned priorContextLength, LineBreakIteratorMode); > WTF_EXPORT_PRIVATE void releaseLineBreakIterator(UBreakIterator*); >-UBreakIterator* openLineBreakIterator(const AtomicString& locale); >+UBreakIterator* openLineBreakIterator(const AtomString& locale); > void closeLineBreakIterator(UBreakIterator*&); > > WTF_EXPORT_PRIVATE bool isWordTextBreak(UBreakIterator*); >@@ -213,7 +213,7 @@ public: > resetPriorContext(); > } > >- explicit LazyLineBreakIterator(StringView stringView, const AtomicString& locale = AtomicString(), LineBreakIteratorMode mode = LineBreakIteratorMode::Default) >+ explicit LazyLineBreakIterator(StringView stringView, const AtomString& locale = AtomString(), LineBreakIteratorMode mode = LineBreakIteratorMode::Default) > : m_stringView(stringView) > , m_locale(locale) > , m_mode(mode) >@@ -293,7 +293,7 @@ public: > return m_iterator; > } > >- void resetStringAndReleaseIterator(StringView stringView, const AtomicString& locale, LineBreakIteratorMode mode) >+ void resetStringAndReleaseIterator(StringView stringView, const AtomString& locale, LineBreakIteratorMode mode) > { > if (m_iterator) > releaseLineBreakIterator(m_iterator); >@@ -308,7 +308,7 @@ public: > private: > static constexpr unsigned priorContextCapacity = 2; > StringView m_stringView; >- AtomicString m_locale; >+ AtomString m_locale; > UBreakIterator* m_iterator { nullptr }; > const UChar* m_cachedPriorContext { nullptr }; > LineBreakIteratorMode m_mode { LineBreakIteratorMode::Default }; >diff --git a/Source/WTF/wtf/text/WTFString.cpp b/Source/WTF/wtf/text/WTFString.cpp >index e5c18fe4c36f59d97203d9270f6f2a208b1e2764..43de3d076059f8074b74876ef77f683904b6a0b4 100644 >--- a/Source/WTF/wtf/text/WTFString.cpp >+++ b/Source/WTF/wtf/text/WTFString.cpp >@@ -356,13 +356,13 @@ String String::convertToUppercaseWithoutLocale() const > return m_impl ? m_impl->convertToUppercaseWithoutLocale() : String { }; > } > >-String String::convertToLowercaseWithLocale(const AtomicString& localeIdentifier) const >+String String::convertToLowercaseWithLocale(const AtomString& localeIdentifier) const > { > // FIXME: Should this function, and the many others like it, be inlined? > return m_impl ? m_impl->convertToLowercaseWithLocale(localeIdentifier) : String { }; > } > >-String String::convertToUppercaseWithLocale(const AtomicString& localeIdentifier) const >+String String::convertToUppercaseWithLocale(const AtomString& localeIdentifier) const > { > // FIXME: Should this function, and the many others like it, be inlined? > return m_impl ? m_impl->convertToUppercaseWithLocale(localeIdentifier) : String { }; >@@ -649,8 +649,8 @@ String String::isolatedCopy() && > bool String::isSafeToSendToAnotherThread() const > { > // AtomicStrings are not safe to send between threads as ~StringImpl() >- // will try to remove them from the wrong AtomicStringTable. >- return isEmpty() || (m_impl->hasOneRef() && !m_impl->isAtomic()); >+ // will try to remove them from the wrong AtomStringTable. >+ return isEmpty() || (m_impl->hasOneRef() && !m_impl->isAtom()); > } > > template<bool allowEmptyEntries> >diff --git a/Source/WTF/wtf/text/WTFString.h b/Source/WTF/wtf/text/WTFString.h >index 9a753adb6123da4c4f1eb8fab9912e146d37b363..0dd1567b0632f894fa0527ca67fce8166ba58852 100644 >--- a/Source/WTF/wtf/text/WTFString.h >+++ b/Source/WTF/wtf/text/WTFString.h >@@ -114,8 +114,8 @@ public: > String(Ref<StringImpl>&&); > String(RefPtr<StringImpl>&&); > >- String(Ref<AtomicStringImpl>&&); >- String(RefPtr<AtomicStringImpl>&&); >+ String(Ref<AtomStringImpl>&&); >+ String(RefPtr<AtomStringImpl>&&); > > String(StaticStringImpl&); > String(StaticStringImpl*); >@@ -250,8 +250,8 @@ public: > WTF_EXPORT_PRIVATE String convertToLowercaseWithoutLocale() const; > WTF_EXPORT_PRIVATE String convertToLowercaseWithoutLocaleStartingAtFailingIndex8Bit(unsigned) const; > WTF_EXPORT_PRIVATE String convertToUppercaseWithoutLocale() const; >- WTF_EXPORT_PRIVATE String convertToLowercaseWithLocale(const AtomicString& localeIdentifier) const; >- WTF_EXPORT_PRIVATE String convertToUppercaseWithLocale(const AtomicString& localeIdentifier) const; >+ WTF_EXPORT_PRIVATE String convertToLowercaseWithLocale(const AtomString& localeIdentifier) const; >+ WTF_EXPORT_PRIVATE String convertToUppercaseWithLocale(const AtomString& localeIdentifier) const; > > WTF_EXPORT_PRIVATE String stripWhiteSpace() const; > WTF_EXPORT_PRIVATE String simplifyWhiteSpace() const; >@@ -475,12 +475,12 @@ inline String::String(RefPtr<StringImpl>&& string) > { > } > >-inline String::String(Ref<AtomicStringImpl>&& string) >+inline String::String(Ref<AtomStringImpl>&& string) > : m_impl(WTFMove(string)) > { > } > >-inline String::String(RefPtr<AtomicStringImpl>&& string) >+inline String::String(RefPtr<AtomStringImpl>&& string) > : m_impl(WTFMove(string)) > { > } >@@ -679,4 +679,4 @@ using WTF::isAllSpecialCharacters; > using WTF::isSpaceOrNewline; > using WTF::reverseFind; > >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> >diff --git a/Source/WTF/wtf/text/cf/AtomStringImplCF.cpp b/Source/WTF/wtf/text/cf/AtomStringImplCF.cpp >new file mode 100644 >index 0000000000000000000000000000000000000000..0231a9a05fc6d9016d9f3aaee7ae378cbafa3177 >--- /dev/null >+++ b/Source/WTF/wtf/text/cf/AtomStringImplCF.cpp >@@ -0,0 +1,56 @@ >+/* >+ * Copyright (C) 2012 Apple Inc. All rights reserved. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 PROFITS; OR BUSINESS >+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >+ * THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#include "config.h" >+#include <wtf/text/AtomStringImpl.h> >+ >+#if USE(CF) >+ >+#include <CoreFoundation/CoreFoundation.h> >+#include <wtf/text/CString.h> >+ >+namespace WTF { >+ >+RefPtr<AtomStringImpl> AtomStringImpl::add(CFStringRef string) >+{ >+ if (!string) >+ return nullptr; >+ >+ CFIndex length = CFStringGetLength(string); >+ >+ if (const LChar* ptr = reinterpret_cast<const LChar*>(CFStringGetCStringPtr(string, kCFStringEncodingISOLatin1))) >+ return add(ptr, length); >+ >+ if (const UniChar* ptr = CFStringGetCharactersPtr(string)) >+ return add(reinterpret_cast<const UChar*>(ptr), length); >+ >+ Vector<UniChar, 1024> ucharBuffer(length); >+ CFStringGetCharacters(string, CFRangeMake(0, length), ucharBuffer.data()); >+ return add(reinterpret_cast<const UChar*>(ucharBuffer.data()), length); >+} >+ >+} // namespace WTF >+ >+#endif // USE(CF) >diff --git a/Source/WTF/wtf/text/cf/AtomicStringImplCF.cpp b/Source/WTF/wtf/text/cf/AtomicStringImplCF.cpp >deleted file mode 100644 >index 4a3f15dae49847aa8ff28dc3a776b675c51f90c7..0000000000000000000000000000000000000000 >--- a/Source/WTF/wtf/text/cf/AtomicStringImplCF.cpp >+++ /dev/null >@@ -1,56 +0,0 @@ >-/* >- * Copyright (C) 2012 Apple Inc. All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 PROFITS; OR BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >- * THE POSSIBILITY OF SUCH DAMAGE. >- */ >- >-#include "config.h" >-#include <wtf/text/AtomicStringImpl.h> >- >-#if USE(CF) >- >-#include <CoreFoundation/CoreFoundation.h> >-#include <wtf/text/CString.h> >- >-namespace WTF { >- >-RefPtr<AtomicStringImpl> AtomicStringImpl::add(CFStringRef string) >-{ >- if (!string) >- return nullptr; >- >- CFIndex length = CFStringGetLength(string); >- >- if (const LChar* ptr = reinterpret_cast<const LChar*>(CFStringGetCStringPtr(string, kCFStringEncodingISOLatin1))) >- return add(ptr, length); >- >- if (const UniChar* ptr = CFStringGetCharactersPtr(string)) >- return add(reinterpret_cast<const UChar*>(ptr), length); >- >- Vector<UniChar, 1024> ucharBuffer(length); >- CFStringGetCharacters(string, CFRangeMake(0, length), ucharBuffer.data()); >- return add(reinterpret_cast<const UChar*>(ucharBuffer.data()), length); >-} >- >-} // namespace WTF >- >-#endif // USE(CF) >diff --git a/Source/WTF/wtf/text/cocoa/TextBreakIteratorInternalICUCocoa.cpp b/Source/WTF/wtf/text/cocoa/TextBreakIteratorInternalICUCocoa.cpp >index 6f63df9b408011c32a812ab6d063c7d09e44c41b..e99af37e699710e4d3a81e0ad8142b15068530e4 100644 >--- a/Source/WTF/wtf/text/cocoa/TextBreakIteratorInternalICUCocoa.cpp >+++ b/Source/WTF/wtf/text/cocoa/TextBreakIteratorInternalICUCocoa.cpp >@@ -26,7 +26,7 @@ > > namespace WTF { > >-static Variant<TextBreakIteratorICU, TextBreakIteratorPlatform> mapModeToBackingIterator(StringView string, TextBreakIterator::Mode mode, const AtomicString& locale) >+static Variant<TextBreakIteratorICU, TextBreakIteratorPlatform> mapModeToBackingIterator(StringView string, TextBreakIterator::Mode mode, const AtomString& locale) > { > switch (mode) { > case TextBreakIterator::Mode::Line: >@@ -38,7 +38,7 @@ static Variant<TextBreakIteratorICU, TextBreakIteratorPlatform> mapModeToBacking > } > } > >-TextBreakIterator::TextBreakIterator(StringView string, Mode mode, const AtomicString& locale) >+TextBreakIterator::TextBreakIterator(StringView string, Mode mode, const AtomString& locale) > : m_backing(mapModeToBackingIterator(string, mode, locale)) > , m_mode(mode) > , m_locale(locale) >diff --git a/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp b/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp >index 2a3e09223e0c8d6328d1eeedb652512ca5b56608..e29cad0d1b2c10db2a12a4da58a04261f67f878b 100644 >--- a/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp >+++ b/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp >@@ -32,21 +32,21 @@ > > namespace WebCore { > >-static const AtomicString& stringForPlaybackTargetAvailability(bool available) >+static const AtomString& stringForPlaybackTargetAvailability(bool available) > { >- static NeverDestroyed<AtomicString> availableString("available", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> notAvailableString("not-available", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> availableString("available", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> notAvailableString("not-available", AtomString::ConstructFromLiteral); > > return available ? availableString : notAvailableString; > } > >-WebKitPlaybackTargetAvailabilityEvent::WebKitPlaybackTargetAvailabilityEvent(const AtomicString& eventType, bool available) >+WebKitPlaybackTargetAvailabilityEvent::WebKitPlaybackTargetAvailabilityEvent(const AtomString& eventType, bool available) > : Event(eventType, CanBubble::No, IsCancelable::No) > , m_availability(stringForPlaybackTargetAvailability(available)) > { > } > >-WebKitPlaybackTargetAvailabilityEvent::WebKitPlaybackTargetAvailabilityEvent(const AtomicString& eventType, const Init& initializer, IsTrusted isTrusted) >+WebKitPlaybackTargetAvailabilityEvent::WebKitPlaybackTargetAvailabilityEvent(const AtomString& eventType, const Init& initializer, IsTrusted isTrusted) > : Event(eventType, initializer, isTrusted) > , m_availability(initializer.availability) > { >diff --git a/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h b/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h >index 36cb6d1a3c06ce13e508f567a0720afa84f17d45..0ad355ea2b062fcb65d2a90b61685349ccc10cd3 100644 >--- a/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h >+++ b/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h >@@ -34,7 +34,7 @@ namespace WebCore { > class WebKitPlaybackTargetAvailabilityEvent : public Event { > public: > >- static Ref<WebKitPlaybackTargetAvailabilityEvent> create(const AtomicString& eventType, bool available) >+ static Ref<WebKitPlaybackTargetAvailabilityEvent> create(const AtomString& eventType, bool available) > { > return adoptRef(*new WebKitPlaybackTargetAvailabilityEvent(eventType, available)); > } >@@ -43,7 +43,7 @@ public: > String availability; > }; > >- static Ref<WebKitPlaybackTargetAvailabilityEvent> create(const AtomicString& eventType, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<WebKitPlaybackTargetAvailabilityEvent> create(const AtomString& eventType, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new WebKitPlaybackTargetAvailabilityEvent(eventType, initializer, isTrusted)); > } >@@ -53,8 +53,8 @@ public: > EventInterface eventInterface() const override { return WebKitPlaybackTargetAvailabilityEventInterfaceType; } > > private: >- explicit WebKitPlaybackTargetAvailabilityEvent(const AtomicString& eventType, bool available); >- WebKitPlaybackTargetAvailabilityEvent(const AtomicString& eventType, const Init&, IsTrusted); >+ explicit WebKitPlaybackTargetAvailabilityEvent(const AtomString& eventType, bool available); >+ WebKitPlaybackTargetAvailabilityEvent(const AtomString& eventType, const Init&, IsTrusted); > > String m_availability; > }; >diff --git a/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizedEvent.cpp b/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizedEvent.cpp >index b797070000d3598f27bddfae77efe433a129d2ba..df48375fb1c93ea884e190abb41200c10f446889 100644 >--- a/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizedEvent.cpp >+++ b/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizedEvent.cpp >@@ -32,7 +32,7 @@ > > namespace WebCore { > >-ApplePayPaymentAuthorizedEvent::ApplePayPaymentAuthorizedEvent(const AtomicString& type, unsigned version, const Payment& payment) >+ApplePayPaymentAuthorizedEvent::ApplePayPaymentAuthorizedEvent(const AtomString& type, unsigned version, const Payment& payment) > : Event(type, CanBubble::No, IsCancelable::No) > , m_payment(payment.toApplePayPayment(version)) > { >diff --git a/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizedEvent.h b/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizedEvent.h >index 2bc032dca5901524520ca9439657067082f7ab00..085d836903d3d3d8c807d7b76a4213944e845303 100644 >--- a/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizedEvent.h >+++ b/Source/WebCore/Modules/applepay/ApplePayPaymentAuthorizedEvent.h >@@ -36,7 +36,7 @@ class Payment; > > class ApplePayPaymentAuthorizedEvent final : public Event { > public: >- static Ref<ApplePayPaymentAuthorizedEvent> create(const AtomicString& type, unsigned version, const Payment& payment) >+ static Ref<ApplePayPaymentAuthorizedEvent> create(const AtomString& type, unsigned version, const Payment& payment) > { > return adoptRef(*new ApplePayPaymentAuthorizedEvent(type, version, payment)); > } >@@ -46,7 +46,7 @@ public: > const ApplePayPayment& payment() const { return m_payment; } > > private: >- ApplePayPaymentAuthorizedEvent(const AtomicString& type, unsigned version, const Payment&); >+ ApplePayPaymentAuthorizedEvent(const AtomString& type, unsigned version, const Payment&); > > // Event. > EventInterface eventInterface() const override; >diff --git a/Source/WebCore/Modules/applepay/ApplePayPaymentMethodSelectedEvent.cpp b/Source/WebCore/Modules/applepay/ApplePayPaymentMethodSelectedEvent.cpp >index 8126e85cd8409f1e7f95f10fe75b264db960f7dc..450e91c5e861cf6e241cb4872525b3d364c43067 100644 >--- a/Source/WebCore/Modules/applepay/ApplePayPaymentMethodSelectedEvent.cpp >+++ b/Source/WebCore/Modules/applepay/ApplePayPaymentMethodSelectedEvent.cpp >@@ -32,7 +32,7 @@ > > namespace WebCore { > >-ApplePayPaymentMethodSelectedEvent::ApplePayPaymentMethodSelectedEvent(const AtomicString& type, const PaymentMethod& paymentMethod) >+ApplePayPaymentMethodSelectedEvent::ApplePayPaymentMethodSelectedEvent(const AtomString& type, const PaymentMethod& paymentMethod) > : Event(type, CanBubble::No, IsCancelable::No) > , m_paymentMethod(paymentMethod.toApplePayPaymentMethod()) > { >diff --git a/Source/WebCore/Modules/applepay/ApplePayPaymentMethodSelectedEvent.h b/Source/WebCore/Modules/applepay/ApplePayPaymentMethodSelectedEvent.h >index 3ac1a3c41fc8d05f55b6c5e860a2733227049ce0..81a2a4edaf55309a52be51af29042015bfd95734 100644 >--- a/Source/WebCore/Modules/applepay/ApplePayPaymentMethodSelectedEvent.h >+++ b/Source/WebCore/Modules/applepay/ApplePayPaymentMethodSelectedEvent.h >@@ -36,7 +36,7 @@ class PaymentMethod; > > class ApplePayPaymentMethodSelectedEvent : public Event { > public: >- static Ref<ApplePayPaymentMethodSelectedEvent> create(const AtomicString& type, const PaymentMethod& paymentMethod) >+ static Ref<ApplePayPaymentMethodSelectedEvent> create(const AtomString& type, const PaymentMethod& paymentMethod) > { > return adoptRef(*new ApplePayPaymentMethodSelectedEvent(type, paymentMethod)); > } >@@ -46,7 +46,7 @@ public: > const ApplePayPaymentMethod& paymentMethod() { return m_paymentMethod; } > > protected: >- ApplePayPaymentMethodSelectedEvent(const AtomicString& type, const PaymentMethod&); >+ ApplePayPaymentMethodSelectedEvent(const AtomString& type, const PaymentMethod&); > > // Event. > EventInterface eventInterface() const override; >diff --git a/Source/WebCore/Modules/applepay/ApplePayShippingContactSelectedEvent.cpp b/Source/WebCore/Modules/applepay/ApplePayShippingContactSelectedEvent.cpp >index eca02d7e43f7179ca72f101384224998f5e3b5c4..feea0d1ee675855758d74be61cd48f469064a4a1 100644 >--- a/Source/WebCore/Modules/applepay/ApplePayShippingContactSelectedEvent.cpp >+++ b/Source/WebCore/Modules/applepay/ApplePayShippingContactSelectedEvent.cpp >@@ -32,7 +32,7 @@ > > namespace WebCore { > >-ApplePayShippingContactSelectedEvent::ApplePayShippingContactSelectedEvent(const AtomicString& type, unsigned version, const PaymentContact& shippingContact) >+ApplePayShippingContactSelectedEvent::ApplePayShippingContactSelectedEvent(const AtomString& type, unsigned version, const PaymentContact& shippingContact) > : Event(type, CanBubble::No, IsCancelable::No) > , m_shippingContact(shippingContact.toApplePayPaymentContact(version)) > { >diff --git a/Source/WebCore/Modules/applepay/ApplePayShippingContactSelectedEvent.h b/Source/WebCore/Modules/applepay/ApplePayShippingContactSelectedEvent.h >index 253efd9934d154af9bdc349bd11c5a11fb33e250..19a153db3a7f3d58749b354444fc1467dd270a7b 100644 >--- a/Source/WebCore/Modules/applepay/ApplePayShippingContactSelectedEvent.h >+++ b/Source/WebCore/Modules/applepay/ApplePayShippingContactSelectedEvent.h >@@ -36,7 +36,7 @@ class PaymentContact; > > class ApplePayShippingContactSelectedEvent final : public Event { > public: >- static Ref<ApplePayShippingContactSelectedEvent> create(const AtomicString& type, unsigned version, const PaymentContact& shippingContact) >+ static Ref<ApplePayShippingContactSelectedEvent> create(const AtomString& type, unsigned version, const PaymentContact& shippingContact) > { > return adoptRef(*new ApplePayShippingContactSelectedEvent(type, version, shippingContact)); > } >@@ -46,7 +46,7 @@ public: > const ApplePayPaymentContact& shippingContact() const { return m_shippingContact; } > > private: >- ApplePayShippingContactSelectedEvent(const AtomicString& type, unsigned version, const PaymentContact&); >+ ApplePayShippingContactSelectedEvent(const AtomString& type, unsigned version, const PaymentContact&); > > // Event. > EventInterface eventInterface() const override; >diff --git a/Source/WebCore/Modules/applepay/ApplePayShippingMethodSelectedEvent.cpp b/Source/WebCore/Modules/applepay/ApplePayShippingMethodSelectedEvent.cpp >index d6304b92da0dd3f49fcf7cb6ec47bb602ce85bb4..b8e7d5cb94390837c46c9e6c1f4f06261e6ad185 100644 >--- a/Source/WebCore/Modules/applepay/ApplePayShippingMethodSelectedEvent.cpp >+++ b/Source/WebCore/Modules/applepay/ApplePayShippingMethodSelectedEvent.cpp >@@ -43,7 +43,7 @@ static inline ApplePayShippingMethod convert(const ApplePaySessionPaymentRequest > return convertedMethod; > } > >-ApplePayShippingMethodSelectedEvent::ApplePayShippingMethodSelectedEvent(const AtomicString& type, const ApplePaySessionPaymentRequest::ShippingMethod& shippingMethod) >+ApplePayShippingMethodSelectedEvent::ApplePayShippingMethodSelectedEvent(const AtomString& type, const ApplePaySessionPaymentRequest::ShippingMethod& shippingMethod) > : Event(type, CanBubble::No, IsCancelable::No) > , m_shippingMethod(convert(shippingMethod)) > { >diff --git a/Source/WebCore/Modules/applepay/ApplePayShippingMethodSelectedEvent.h b/Source/WebCore/Modules/applepay/ApplePayShippingMethodSelectedEvent.h >index ec1c64eef2056cc21153bd6f257ba59f318b6b00..17bf1dfa83e6ca512a6bc718a62fc4563ea99125 100644 >--- a/Source/WebCore/Modules/applepay/ApplePayShippingMethodSelectedEvent.h >+++ b/Source/WebCore/Modules/applepay/ApplePayShippingMethodSelectedEvent.h >@@ -35,7 +35,7 @@ namespace WebCore { > > class ApplePayShippingMethodSelectedEvent final : public Event { > public: >- static Ref<ApplePayShippingMethodSelectedEvent> create(const AtomicString& type, const ApplePaySessionPaymentRequest::ShippingMethod& shippingMethod) >+ static Ref<ApplePayShippingMethodSelectedEvent> create(const AtomString& type, const ApplePaySessionPaymentRequest::ShippingMethod& shippingMethod) > { > return adoptRef(*new ApplePayShippingMethodSelectedEvent(type, shippingMethod)); > } >@@ -45,7 +45,7 @@ public: > const ApplePayShippingMethod& shippingMethod() const { return m_shippingMethod; } > > private: >- ApplePayShippingMethodSelectedEvent(const AtomicString& type, const ApplePaySessionPaymentRequest::ShippingMethod&); >+ ApplePayShippingMethodSelectedEvent(const AtomString& type, const ApplePaySessionPaymentRequest::ShippingMethod&); > > // Event. > EventInterface eventInterface() const override; >diff --git a/Source/WebCore/Modules/applepay/ApplePayValidateMerchantEvent.cpp b/Source/WebCore/Modules/applepay/ApplePayValidateMerchantEvent.cpp >index b164b14b27fee86fc20dd5f1d8b90a2dc1ae93d5..f6bd722b05cc6e42e8e11721698bfc992bd107ea 100644 >--- a/Source/WebCore/Modules/applepay/ApplePayValidateMerchantEvent.cpp >+++ b/Source/WebCore/Modules/applepay/ApplePayValidateMerchantEvent.cpp >@@ -30,7 +30,7 @@ > > namespace WebCore { > >-ApplePayValidateMerchantEvent::ApplePayValidateMerchantEvent(const AtomicString& type, URL&& validationURL) >+ApplePayValidateMerchantEvent::ApplePayValidateMerchantEvent(const AtomString& type, URL&& validationURL) > : Event(type, CanBubble::No, IsCancelable::No) > , m_validationURL(WTFMove(validationURL)) > { >diff --git a/Source/WebCore/Modules/applepay/ApplePayValidateMerchantEvent.h b/Source/WebCore/Modules/applepay/ApplePayValidateMerchantEvent.h >index 3aa22f5b82d6c2c180ece814585d8510894b1b4f..11d357e5915717eddec95cc9697850857de025c8 100644 >--- a/Source/WebCore/Modules/applepay/ApplePayValidateMerchantEvent.h >+++ b/Source/WebCore/Modules/applepay/ApplePayValidateMerchantEvent.h >@@ -34,7 +34,7 @@ namespace WebCore { > > class ApplePayValidateMerchantEvent : public Event { > public: >- static Ref<ApplePayValidateMerchantEvent> create(const AtomicString& type, URL&& validationURL) >+ static Ref<ApplePayValidateMerchantEvent> create(const AtomString& type, URL&& validationURL) > { > return adoptRef(*new ApplePayValidateMerchantEvent(type, WTFMove(validationURL))); > } >@@ -44,7 +44,7 @@ public: > const String& validationURL() const { return m_validationURL.string(); } > > protected: >- ApplePayValidateMerchantEvent(const AtomicString& type, URL&& validationURL); >+ ApplePayValidateMerchantEvent(const AtomString& type, URL&& validationURL); > > // Event. > EventInterface eventInterface() const override; >diff --git a/Source/WebCore/Modules/encryptedmedia/CDM.cpp b/Source/WebCore/Modules/encryptedmedia/CDM.cpp >index ac066bd959709174da2700e980ddfdf7af8e9fb9..6038add838aab264036932201164e3667150a25e 100644 >--- a/Source/WebCore/Modules/encryptedmedia/CDM.cpp >+++ b/Source/WebCore/Modules/encryptedmedia/CDM.cpp >@@ -609,17 +609,17 @@ bool CDM::supportsSessions() const > return m_private && m_private->supportsSessions(); > } > >-bool CDM::supportsInitDataType(const AtomicString& initDataType) const >+bool CDM::supportsInitDataType(const AtomString& initDataType) const > { > return m_private && m_private->supportsInitDataType(initDataType); > } > >-RefPtr<SharedBuffer> CDM::sanitizeInitData(const AtomicString& initDataType, const SharedBuffer& initData) >+RefPtr<SharedBuffer> CDM::sanitizeInitData(const AtomString& initDataType, const SharedBuffer& initData) > { > return InitDataRegistry::shared().sanitizeInitData(initDataType, initData); > } > >-bool CDM::supportsInitData(const AtomicString& initDataType, const SharedBuffer& initData) >+bool CDM::supportsInitData(const AtomString& initDataType, const SharedBuffer& initData) > { > return m_private && m_private->supportsInitData(initDataType, initData); > } >diff --git a/Source/WebCore/Modules/encryptedmedia/CDM.h b/Source/WebCore/Modules/encryptedmedia/CDM.h >index 2e7fa187b4e67ad06e516ea3f54ad44554c5548b..ae98325f6ad11ff79ac6d174c6edaa8bd45c9d30 100644 >--- a/Source/WebCore/Modules/encryptedmedia/CDM.h >+++ b/Source/WebCore/Modules/encryptedmedia/CDM.h >@@ -66,10 +66,10 @@ public: > RefPtr<CDMInstance> createInstance(); > bool supportsServerCertificates() const; > bool supportsSessions() const; >- bool supportsInitDataType(const AtomicString&) const; >+ bool supportsInitDataType(const AtomString&) const; > >- RefPtr<SharedBuffer> sanitizeInitData(const AtomicString& initDataType, const SharedBuffer&); >- bool supportsInitData(const AtomicString& initDataType, const SharedBuffer&); >+ RefPtr<SharedBuffer> sanitizeInitData(const AtomString& initDataType, const SharedBuffer&); >+ bool supportsInitData(const AtomString& initDataType, const SharedBuffer&); > > RefPtr<SharedBuffer> sanitizeResponse(const SharedBuffer&); > >diff --git a/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp b/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp >index 3b2f81d6d3796dea63fe1fcab7c302697b9a1870..4bf71494d9b79df1f0e20405693e561c0c70ccd8 100644 >--- a/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp >+++ b/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp >@@ -206,7 +206,7 @@ InitDataRegistry::InitDataRegistry() > > InitDataRegistry::~InitDataRegistry() = default; > >-RefPtr<SharedBuffer> InitDataRegistry::sanitizeInitData(const AtomicString& initDataType, const SharedBuffer& buffer) >+RefPtr<SharedBuffer> InitDataRegistry::sanitizeInitData(const AtomString& initDataType, const SharedBuffer& buffer) > { > auto iter = m_types.find(initDataType); > if (iter == m_types.end() || !iter->value.sanitizeInitData) >@@ -214,7 +214,7 @@ RefPtr<SharedBuffer> InitDataRegistry::sanitizeInitData(const AtomicString& init > return iter->value.sanitizeInitData(buffer); > } > >-Optional<Vector<Ref<SharedBuffer>>> InitDataRegistry::extractKeyIDs(const AtomicString& initDataType, const SharedBuffer& buffer) >+Optional<Vector<Ref<SharedBuffer>>> InitDataRegistry::extractKeyIDs(const AtomString& initDataType, const SharedBuffer& buffer) > { > auto iter = m_types.find(initDataType); > if (iter == m_types.end() || !iter->value.sanitizeInitData) >@@ -222,7 +222,7 @@ Optional<Vector<Ref<SharedBuffer>>> InitDataRegistry::extractKeyIDs(const Atomic > return iter->value.extractKeyIDs(buffer); > } > >-void InitDataRegistry::registerInitDataType(const AtomicString& initDataType, InitDataTypeCallbacks&& callbacks) >+void InitDataRegistry::registerInitDataType(const AtomString& initDataType, InitDataTypeCallbacks&& callbacks) > { > ASSERT(!m_types.contains(initDataType)); > m_types.set(initDataType, WTFMove(callbacks)); >diff --git a/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.h b/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.h >index 054d3770e47538f0616647955e6ea977d6a07454..1f7930b99d20c3fd5ed47673bf6ed45b086c8416 100644 >--- a/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.h >+++ b/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.h >@@ -33,8 +33,8 @@ > #include <wtf/Ref.h> > #include <wtf/RefPtr.h> > #include <wtf/Vector.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -45,8 +45,8 @@ public: > WEBCORE_EXPORT static InitDataRegistry& shared(); > friend class NeverDestroyed<InitDataRegistry>; > >- RefPtr<SharedBuffer> sanitizeInitData(const AtomicString& initDataType, const SharedBuffer&); >- WEBCORE_EXPORT Optional<Vector<Ref<SharedBuffer>>> extractKeyIDs(const AtomicString& initDataType, const SharedBuffer&); >+ RefPtr<SharedBuffer> sanitizeInitData(const AtomString& initDataType, const SharedBuffer&); >+ WEBCORE_EXPORT Optional<Vector<Ref<SharedBuffer>>> extractKeyIDs(const AtomString& initDataType, const SharedBuffer&); > > struct InitDataTypeCallbacks { > using SanitizeInitDataCallback = Function<RefPtr<SharedBuffer>(const SharedBuffer&)>; >@@ -55,13 +55,13 @@ public: > SanitizeInitDataCallback sanitizeInitData; > ExtractKeyIDsCallback extractKeyIDs; > }; >- void registerInitDataType(const AtomicString& initDataType, InitDataTypeCallbacks&&); >+ void registerInitDataType(const AtomString& initDataType, InitDataTypeCallbacks&&); > > private: > InitDataRegistry(); > ~InitDataRegistry(); > >- HashMap<AtomicString, InitDataTypeCallbacks> m_types; >+ HashMap<AtomString, InitDataTypeCallbacks> m_types; > }; > > } >diff --git a/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.cpp b/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.cpp >index 2b39ec4bfeb43881aa8aa522909bbf5e09f96ebd..ff3252a0fd840ca2d1710d90f2d6f9d9877ef9e3 100644 >--- a/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.cpp >+++ b/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.cpp >@@ -33,7 +33,7 @@ > > namespace WebCore { > >-MediaKeyMessageEvent::MediaKeyMessageEvent(const AtomicString& type, const MediaKeyMessageEvent::Init& initializer, IsTrusted isTrusted) >+MediaKeyMessageEvent::MediaKeyMessageEvent(const AtomString& type, const MediaKeyMessageEvent::Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_messageType(initializer.messageType) > , m_message(initializer.message) >diff --git a/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.h b/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.h >index 51932217a9f48ac2b2b2de7512b161c9e77ffe9a..93f30604d6d8b655223018f44285ac4320eefe58 100644 >--- a/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.h >+++ b/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.h >@@ -44,7 +44,7 @@ public: > > virtual ~MediaKeyMessageEvent(); > >- static Ref<MediaKeyMessageEvent> create(const AtomicString& type, const MediaKeyMessageEventInit& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<MediaKeyMessageEvent> create(const AtomString& type, const MediaKeyMessageEventInit& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new MediaKeyMessageEvent(type, initializer, isTrusted)); > } >@@ -53,7 +53,7 @@ public: > RefPtr<JSC::ArrayBuffer> message() const { return m_message; } > > private: >- MediaKeyMessageEvent(const AtomicString&, const MediaKeyMessageEventInit&, IsTrusted); >+ MediaKeyMessageEvent(const AtomString&, const MediaKeyMessageEventInit&, IsTrusted); > > // Event > EventInterface eventInterface() const override; >diff --git a/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp b/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp >index 612a2bdf7ee8d4732068fa21de6fd947d7d17835..720fc74d9498dc9b4d75e936f34a4984e1f61737 100644 >--- a/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp >+++ b/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp >@@ -118,7 +118,7 @@ Ref<MediaKeyStatusMap> MediaKeySession::keyStatuses() const > return m_keyStatuses.copyRef(); > } > >-void MediaKeySession::generateRequest(const AtomicString& initDataType, const BufferSource& initData, Ref<DeferredPromise>&& promise) >+void MediaKeySession::generateRequest(const AtomString& initDataType, const BufferSource& initData, Ref<DeferredPromise>&& promise) > { > // https://w3c.github.io/encrypted-media/#dom-mediakeysession-generaterequest > // W3C Editor's Draft 09 November 2016 >diff --git a/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h b/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h >index ded2dde106b74332cf38a0af32ce6e84d0ef32af..be8c0dd6bd38c6a11bcd9bc5ca95ff1bc3e44dc8 100644 >--- a/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h >+++ b/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h >@@ -67,7 +67,7 @@ public: > double expiration() const; > Ref<MediaKeyStatusMap> keyStatuses() const; > >- void generateRequest(const AtomicString&, const BufferSource&, Ref<DeferredPromise>&&); >+ void generateRequest(const AtomString&, const BufferSource&, Ref<DeferredPromise>&&); > void load(const String&, Ref<DeferredPromise>&&); > void update(const BufferSource&, Ref<DeferredPromise>&&); > void close(Ref<DeferredPromise>&&); >diff --git a/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.cpp b/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.cpp >index 84113f58298202379ecc6fd64bd8e5dabf593aca..424cc280fb56d959daf1451b8634b947972aa2f2 100644 >--- a/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.cpp >+++ b/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.cpp >@@ -32,7 +32,7 @@ > > namespace WebCore { > >-WebKitMediaKeyMessageEvent::WebKitMediaKeyMessageEvent(const AtomicString& type, Uint8Array* message, const String& destinationURL) >+WebKitMediaKeyMessageEvent::WebKitMediaKeyMessageEvent(const AtomString& type, Uint8Array* message, const String& destinationURL) > : Event(type, CanBubble::No, IsCancelable::No) > , m_message(message) > , m_destinationURL(destinationURL) >@@ -40,7 +40,7 @@ WebKitMediaKeyMessageEvent::WebKitMediaKeyMessageEvent(const AtomicString& type, > } > > >-WebKitMediaKeyMessageEvent::WebKitMediaKeyMessageEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+WebKitMediaKeyMessageEvent::WebKitMediaKeyMessageEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_message(initializer.message) > , m_destinationURL(initializer.destinationURL) >diff --git a/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.h b/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.h >index 51946f213ed34c80f18ea0bcfd3ea44dcb855d0f..c262e4d5a11759348f94ece40da0379320ed195b 100644 >--- a/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.h >+++ b/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.h >@@ -37,7 +37,7 @@ class WebKitMediaKeyMessageEvent : public Event { > public: > virtual ~WebKitMediaKeyMessageEvent(); > >- static Ref<WebKitMediaKeyMessageEvent> create(const AtomicString& type, Uint8Array* message, const String& destinationURL) >+ static Ref<WebKitMediaKeyMessageEvent> create(const AtomString& type, Uint8Array* message, const String& destinationURL) > { > return adoptRef(*new WebKitMediaKeyMessageEvent(type, message, destinationURL)); > } >@@ -47,7 +47,7 @@ public: > String destinationURL; > }; > >- static Ref<WebKitMediaKeyMessageEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<WebKitMediaKeyMessageEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new WebKitMediaKeyMessageEvent(type, initializer, isTrusted)); > } >@@ -58,8 +58,8 @@ public: > String destinationURL() const { return m_destinationURL; } > > private: >- WebKitMediaKeyMessageEvent(const AtomicString& type, Uint8Array* message, const String& destinationURL); >- WebKitMediaKeyMessageEvent(const AtomicString& type, const Init&, IsTrusted); >+ WebKitMediaKeyMessageEvent(const AtomString& type, Uint8Array* message, const String& destinationURL); >+ WebKitMediaKeyMessageEvent(const AtomString& type, const Init&, IsTrusted); > > RefPtr<Uint8Array> m_message; > String m_destinationURL; >diff --git a/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.cpp b/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.cpp >index 4bab062df36dea6c03d35bf86bb7975ae658de05..4868bbc580e9acf0cce12b79bf81aecef32cb30f 100644 >--- a/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.cpp >+++ b/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.cpp >@@ -32,13 +32,13 @@ > > namespace WebCore { > >-WebKitMediaKeyNeededEvent::WebKitMediaKeyNeededEvent(const AtomicString& type, Uint8Array* initData) >+WebKitMediaKeyNeededEvent::WebKitMediaKeyNeededEvent(const AtomString& type, Uint8Array* initData) > : Event(type, CanBubble::No, IsCancelable::No) > , m_initData(initData) > { > } > >-WebKitMediaKeyNeededEvent::WebKitMediaKeyNeededEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+WebKitMediaKeyNeededEvent::WebKitMediaKeyNeededEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_initData(initializer.initData) > { >diff --git a/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.h b/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.h >index de487d5dfa5c5505c83446e08d8611c9acc40c1f..b1dd45a4c703e9175b7a09f9d7c2a3ef1ec9e4a3 100644 >--- a/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.h >+++ b/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.h >@@ -36,7 +36,7 @@ class WebKitMediaKeyNeededEvent : public Event { > public: > virtual ~WebKitMediaKeyNeededEvent(); > >- static Ref<WebKitMediaKeyNeededEvent> create(const AtomicString& type, Uint8Array* initData) >+ static Ref<WebKitMediaKeyNeededEvent> create(const AtomString& type, Uint8Array* initData) > { > return adoptRef(*new WebKitMediaKeyNeededEvent(type, initData)); > } >@@ -45,7 +45,7 @@ public: > RefPtr<Uint8Array> initData; > }; > >- static Ref<WebKitMediaKeyNeededEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<WebKitMediaKeyNeededEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new WebKitMediaKeyNeededEvent(type, initializer, isTrusted)); > } >@@ -55,8 +55,8 @@ public: > Uint8Array* initData() const { return m_initData.get(); } > > private: >- WebKitMediaKeyNeededEvent(const AtomicString& type, Uint8Array* initData); >- WebKitMediaKeyNeededEvent(const AtomicString& type, const Init&, IsTrusted); >+ WebKitMediaKeyNeededEvent(const AtomString& type, Uint8Array* initData); >+ WebKitMediaKeyNeededEvent(const AtomString& type, const Init&, IsTrusted); > > RefPtr<Uint8Array> m_initData; > }; >diff --git a/Source/WebCore/Modules/gamepad/GamepadEvent.cpp b/Source/WebCore/Modules/gamepad/GamepadEvent.cpp >index 68341943361b76f2c2f557581e9cb60e40549037..42498fdef5491826874991918fb431524023b00e 100644 >--- a/Source/WebCore/Modules/gamepad/GamepadEvent.cpp >+++ b/Source/WebCore/Modules/gamepad/GamepadEvent.cpp >@@ -29,13 +29,13 @@ > > namespace WebCore { > >-GamepadEvent::GamepadEvent(const AtomicString& eventType, Gamepad& gamepad) >+GamepadEvent::GamepadEvent(const AtomString& eventType, Gamepad& gamepad) > : Event(eventType, CanBubble::No, IsCancelable::No) > , m_gamepad(&gamepad) > { > } > >-GamepadEvent::GamepadEvent(const AtomicString& eventType, const Init& initializer, IsTrusted isTrusted) >+GamepadEvent::GamepadEvent(const AtomString& eventType, const Init& initializer, IsTrusted isTrusted) > : Event(eventType, initializer, isTrusted) > , m_gamepad(initializer.gamepad) > { >diff --git a/Source/WebCore/Modules/gamepad/GamepadEvent.h b/Source/WebCore/Modules/gamepad/GamepadEvent.h >index 6d50778e58855f3f2965a6ee455e86271786214b..03efd5f0375dff6f489ae96b4ad78e2ae13a4021 100644 >--- a/Source/WebCore/Modules/gamepad/GamepadEvent.h >+++ b/Source/WebCore/Modules/gamepad/GamepadEvent.h >@@ -37,7 +37,7 @@ class GamepadEvent : public Event { > public: > ~GamepadEvent() = default; > >- static Ref<GamepadEvent> create(const AtomicString& eventType, Gamepad& gamepad) >+ static Ref<GamepadEvent> create(const AtomString& eventType, Gamepad& gamepad) > { > return adoptRef(*new GamepadEvent(eventType, gamepad)); > } >@@ -46,7 +46,7 @@ public: > RefPtr<Gamepad> gamepad; > }; > >- static Ref<GamepadEvent> create(const AtomicString& eventType, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<GamepadEvent> create(const AtomString& eventType, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new GamepadEvent(eventType, initializer, isTrusted)); > } >@@ -56,8 +56,8 @@ public: > EventInterface eventInterface() const override { return GamepadEventInterfaceType; } > > private: >- explicit GamepadEvent(const AtomicString& eventType, Gamepad&); >- GamepadEvent(const AtomicString& eventType, const Init&, IsTrusted); >+ explicit GamepadEvent(const AtomString& eventType, Gamepad&); >+ GamepadEvent(const AtomString& eventType, const Init&, IsTrusted); > > RefPtr<Gamepad> m_gamepad; > }; >diff --git a/Source/WebCore/Modules/gamepad/GamepadManager.h b/Source/WebCore/Modules/gamepad/GamepadManager.h >index 8bad72d83666227cd970ced2a166ba92dc121224..45e812adc543a14e71bab29733ec5fee2999a4e3 100644 >--- a/Source/WebCore/Modules/gamepad/GamepadManager.h >+++ b/Source/WebCore/Modules/gamepad/GamepadManager.h >@@ -30,7 +30,7 @@ > #include "GamepadProviderClient.h" > #include <wtf/HashSet.h> > #include <wtf/NeverDestroyed.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -57,7 +57,7 @@ private: > GamepadManager(); > > void makeGamepadVisible(PlatformGamepad&, HashSet<NavigatorGamepad*>&, HashSet<DOMWindow*>&); >- void dispatchGamepadEvent(const WTF::AtomicString& eventName, PlatformGamepad&); >+ void dispatchGamepadEvent(const WTF::AtomString& eventName, PlatformGamepad&); > > void maybeStartMonitoringGamepads(); > void maybeStopMonitoringGamepads(); >diff --git a/Source/WebCore/Modules/indexeddb/IDBRequestCompletionEvent.cpp b/Source/WebCore/Modules/indexeddb/IDBRequestCompletionEvent.cpp >index b972004efc5ca21a3867546b62d9ebb29ac3b5df..c96f9adeb24603b19ac3dd6158445094e1ea64ce 100644 >--- a/Source/WebCore/Modules/indexeddb/IDBRequestCompletionEvent.cpp >+++ b/Source/WebCore/Modules/indexeddb/IDBRequestCompletionEvent.cpp >@@ -30,7 +30,7 @@ > > namespace WebCore { > >-IDBRequestCompletionEvent::IDBRequestCompletionEvent(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, IDBRequest& request) >+IDBRequestCompletionEvent::IDBRequestCompletionEvent(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, IDBRequest& request) > : Event(type, canBubble, cancelable) > , m_request(request) > { >diff --git a/Source/WebCore/Modules/indexeddb/IDBRequestCompletionEvent.h b/Source/WebCore/Modules/indexeddb/IDBRequestCompletionEvent.h >index 32101eaca4908816786433fa6d0efa8e2b36c452..80fb18e769e6795eb5f089356c1486d0a2bc2bfe 100644 >--- a/Source/WebCore/Modules/indexeddb/IDBRequestCompletionEvent.h >+++ b/Source/WebCore/Modules/indexeddb/IDBRequestCompletionEvent.h >@@ -34,13 +34,13 @@ namespace WebCore { > > class IDBRequestCompletionEvent : public Event { > public: >- static Ref<Event> create(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, IDBRequest& request) >+ static Ref<Event> create(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, IDBRequest& request) > { > return adoptRef(*new IDBRequestCompletionEvent(type, canBubble, cancelable, request)); > } > > private: >- IDBRequestCompletionEvent(const AtomicString& type, CanBubble, IsCancelable, IDBRequest&); >+ IDBRequestCompletionEvent(const AtomString& type, CanBubble, IsCancelable, IDBRequest&); > > Ref<IDBRequest> m_request; > }; >diff --git a/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.cpp b/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.cpp >index b6c5a86300e7a077319df0f818bd78fa29d209fa..005556b1d30f1c4d1d7de5ea78093a0979d0ede5 100644 >--- a/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.cpp >+++ b/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.cpp >@@ -30,7 +30,7 @@ > > namespace WebCore { > >-IDBVersionChangeEvent::IDBVersionChangeEvent(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion, const AtomicString& name) >+IDBVersionChangeEvent::IDBVersionChangeEvent(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion, const AtomString& name) > : Event(name, CanBubble::No, IsCancelable::No) > , m_requestIdentifier(requestIdentifier) > , m_oldVersion(oldVersion) >@@ -41,7 +41,7 @@ IDBVersionChangeEvent::IDBVersionChangeEvent(const IDBResourceIdentifier& reques > m_newVersion = WTF::nullopt; > } > >-IDBVersionChangeEvent::IDBVersionChangeEvent(const AtomicString& name, const Init& init, IsTrusted isTrusted) >+IDBVersionChangeEvent::IDBVersionChangeEvent(const AtomString& name, const Init& init, IsTrusted isTrusted) > : Event(name, init, isTrusted) > , m_oldVersion(init.oldVersion) > , m_newVersion(init.newVersion) >diff --git a/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.h b/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.h >index e9218eba1626092194008de02185c0b3806340cf..433059d3f538b1762ce738253894591fc8011f09 100644 >--- a/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.h >+++ b/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.h >@@ -35,12 +35,12 @@ namespace WebCore { > > class IDBVersionChangeEvent final : public Event { > public: >- static Ref<IDBVersionChangeEvent> create(uint64_t oldVersion, uint64_t newVersion, const AtomicString& eventType) >+ static Ref<IDBVersionChangeEvent> create(uint64_t oldVersion, uint64_t newVersion, const AtomString& eventType) > { > return adoptRef(*new IDBVersionChangeEvent(IDBResourceIdentifier::emptyValue(), oldVersion, newVersion, eventType)); > } > >- static Ref<IDBVersionChangeEvent> create(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion, const AtomicString& eventType) >+ static Ref<IDBVersionChangeEvent> create(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion, const AtomString& eventType) > { > return adoptRef(*new IDBVersionChangeEvent(requestIdentifier, oldVersion, newVersion, eventType)); > } >@@ -50,7 +50,7 @@ public: > Optional<uint64_t> newVersion; > }; > >- static Ref<IDBVersionChangeEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<IDBVersionChangeEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new IDBVersionChangeEvent(type, initializer, isTrusted)); > } >@@ -63,8 +63,8 @@ public: > Optional<uint64_t> newVersion() const { return m_newVersion; } > > private: >- IDBVersionChangeEvent(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion, const AtomicString& eventType); >- IDBVersionChangeEvent(const AtomicString&, const Init&, IsTrusted); >+ IDBVersionChangeEvent(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion, const AtomString& eventType); >+ IDBVersionChangeEvent(const AtomString&, const Init&, IsTrusted); > > EventInterface eventInterface() const; > >diff --git a/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp b/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp >index d01e013eddd3d7fd1cd55b03e9485a10fef162a3..10ff72fbb3dd54dd87e2f22278e7deb52c913be7 100644 >--- a/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp >+++ b/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp >@@ -44,27 +44,27 @@ > > namespace WebCore { > >-const AtomicString& MediaControlsHost::automaticKeyword() >+const AtomString& MediaControlsHost::automaticKeyword() > { >- static NeverDestroyed<const AtomicString> automatic("automatic", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> automatic("automatic", AtomString::ConstructFromLiteral); > return automatic; > } > >-const AtomicString& MediaControlsHost::forcedOnlyKeyword() >+const AtomString& MediaControlsHost::forcedOnlyKeyword() > { >- static NeverDestroyed<const AtomicString> forcedOn("forced-only", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> forcedOn("forced-only", AtomString::ConstructFromLiteral); > return forcedOn; > } > >-const AtomicString& MediaControlsHost::alwaysOnKeyword() >+const AtomString& MediaControlsHost::alwaysOnKeyword() > { >- static NeverDestroyed<const AtomicString> alwaysOn("always-on", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> alwaysOn("always-on", AtomString::ConstructFromLiteral); > return alwaysOn; > } > >-const AtomicString& MediaControlsHost::manualKeyword() >+const AtomString& MediaControlsHost::manualKeyword() > { >- static NeverDestroyed<const AtomicString> alwaysOn("manual", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> alwaysOn("manual", AtomString::ConstructFromLiteral); > return alwaysOn; > } > >@@ -124,7 +124,7 @@ TextTrack* MediaControlsHost::captionMenuAutomaticItem() > return TextTrack::captionMenuAutomaticItem(); > } > >-AtomicString MediaControlsHost::captionDisplayMode() const >+AtomString MediaControlsHost::captionDisplayMode() const > { > Page* page = m_mediaElement->document().page(); > if (!page) >diff --git a/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h b/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h >index 2f51ad2b69d1a9c013a606becc6f56b9f46a4833..ef5d0572ad4ac00f5b76a12dec379f1f284471e5 100644 >--- a/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h >+++ b/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h >@@ -47,10 +47,10 @@ public: > static Ref<MediaControlsHost> create(HTMLMediaElement*); > ~MediaControlsHost(); > >- static const AtomicString& automaticKeyword(); >- static const AtomicString& forcedOnlyKeyword(); >- static const AtomicString& alwaysOnKeyword(); >- static const AtomicString& manualKeyword(); >+ static const AtomString& automaticKeyword(); >+ static const AtomString& forcedOnlyKeyword(); >+ static const AtomString& alwaysOnKeyword(); >+ static const AtomString& manualKeyword(); > > Vector<RefPtr<TextTrack>> sortedTrackListForMenu(TextTrackList&); > Vector<RefPtr<AudioTrack>> sortedTrackListForMenu(AudioTrackList&); >@@ -60,7 +60,7 @@ public: > > TextTrack* captionMenuOffItem(); > TextTrack* captionMenuAutomaticItem(); >- AtomicString captionDisplayMode() const; >+ AtomString captionDisplayMode() const; > void setSelectedTextTrack(TextTrack*); > Element* textTrackContainer(); > void updateTextTrackContainer(); >diff --git a/Source/WebCore/Modules/mediarecorder/BlobEvent.cpp b/Source/WebCore/Modules/mediarecorder/BlobEvent.cpp >index 3d9afa347e60c668715771685c10c5f42344fc46..b51798a70d63083a7bc48f6a957be66186c70a97 100644 >--- a/Source/WebCore/Modules/mediarecorder/BlobEvent.cpp >+++ b/Source/WebCore/Modules/mediarecorder/BlobEvent.cpp >@@ -32,23 +32,23 @@ > > namespace WebCore { > >-Ref<BlobEvent> BlobEvent::create(const AtomicString& type, Init&& init, IsTrusted isTrusted) >+Ref<BlobEvent> BlobEvent::create(const AtomString& type, Init&& init, IsTrusted isTrusted) > { > return adoptRef(*new BlobEvent(type, WTFMove(init), isTrusted)); > } > >-Ref<BlobEvent> BlobEvent::create(const AtomicString& type, CanBubble canBubble, IsCancelable isCancelable, Ref<Blob>&& data) >+Ref<BlobEvent> BlobEvent::create(const AtomString& type, CanBubble canBubble, IsCancelable isCancelable, Ref<Blob>&& data) > { > return adoptRef(*new BlobEvent(type, canBubble, isCancelable, WTFMove(data))); > } > >-BlobEvent::BlobEvent(const AtomicString& type, Init&& init, IsTrusted isTrusted) >+BlobEvent::BlobEvent(const AtomString& type, Init&& init, IsTrusted isTrusted) > : Event(type, init, isTrusted) > , m_blob(init.data.releaseNonNull()) > { > } > >-BlobEvent::BlobEvent(const AtomicString& type, CanBubble canBubble, IsCancelable isCancelable, Ref<Blob>&& data) >+BlobEvent::BlobEvent(const AtomString& type, CanBubble canBubble, IsCancelable isCancelable, Ref<Blob>&& data) > : Event(type, canBubble, isCancelable) > , m_blob(WTFMove(data)) > { >diff --git a/Source/WebCore/Modules/mediarecorder/BlobEvent.h b/Source/WebCore/Modules/mediarecorder/BlobEvent.h >index b63ad33d3602147babc30e299a362f5f36c9d0e8..54784f6f4af671481ea04a7bdc8c8a1f64555337 100644 >--- a/Source/WebCore/Modules/mediarecorder/BlobEvent.h >+++ b/Source/WebCore/Modules/mediarecorder/BlobEvent.h >@@ -39,14 +39,14 @@ public: > double timecode; > }; > >- static Ref<BlobEvent> create(const AtomicString&, Init&&, IsTrusted = IsTrusted::No); >- static Ref<BlobEvent> create(const AtomicString&, CanBubble, IsCancelable, Ref<Blob>&&); >+ static Ref<BlobEvent> create(const AtomString&, Init&&, IsTrusted = IsTrusted::No); >+ static Ref<BlobEvent> create(const AtomString&, CanBubble, IsCancelable, Ref<Blob>&&); > > Blob& data() const { return m_blob.get(); } > > private: >- BlobEvent(const AtomicString&, Init&&, IsTrusted); >- BlobEvent(const AtomicString&, CanBubble, IsCancelable, Ref<Blob>&&); >+ BlobEvent(const AtomString&, Init&&, IsTrusted); >+ BlobEvent(const AtomString&, CanBubble, IsCancelable, Ref<Blob>&&); > > // Event > EventInterface eventInterface() const final; >diff --git a/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.cpp b/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.cpp >index f422ae808260b0e9eacb42225c3e73ba039675df..64f13cbd7ae2372df29dd3227a2d1b43f89389f4 100644 >--- a/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.cpp >+++ b/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.cpp >@@ -33,24 +33,24 @@ > namespace WebCore { > > >-Ref<MediaRecorderErrorEvent> MediaRecorderErrorEvent::create(const AtomicString& type, Exception&& exception) >+Ref<MediaRecorderErrorEvent> MediaRecorderErrorEvent::create(const AtomString& type, Exception&& exception) > { > return adoptRef(*new MediaRecorderErrorEvent(type, WTFMove(exception))); > } > >-Ref<MediaRecorderErrorEvent> MediaRecorderErrorEvent::create(const AtomicString& type, Init&& init, IsTrusted isTrusted) >+Ref<MediaRecorderErrorEvent> MediaRecorderErrorEvent::create(const AtomString& type, Init&& init, IsTrusted isTrusted) > { > auto domError = init.error.releaseNonNull(); > return adoptRef(*new MediaRecorderErrorEvent(type, WTFMove(init), WTFMove(domError), isTrusted)); > } > >-MediaRecorderErrorEvent::MediaRecorderErrorEvent(const AtomicString& type, Init&& init, Ref<DOMException>&& exception, IsTrusted isTrusted) >+MediaRecorderErrorEvent::MediaRecorderErrorEvent(const AtomString& type, Init&& init, Ref<DOMException>&& exception, IsTrusted isTrusted) > : Event(type, WTFMove(init), isTrusted) > , m_domError(WTFMove(exception)) > { > } > >-MediaRecorderErrorEvent::MediaRecorderErrorEvent(const AtomicString& type, Exception&& exception) >+MediaRecorderErrorEvent::MediaRecorderErrorEvent(const AtomString& type, Exception&& exception) > : Event(type, Event::CanBubble::No, Event::IsCancelable::No) > , m_domError(DOMException::create(exception)) > { >diff --git a/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.h b/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.h >index 891c3a30c32fd3efdd3af0d3faffdbe1cd0e7779..07fca2faf92c565806f2b4a8764e3c2bd5c3880f 100644 >--- a/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.h >+++ b/Source/WebCore/Modules/mediarecorder/MediaRecorderErrorEvent.h >@@ -37,14 +37,14 @@ public: > RefPtr<DOMException> error; > }; > >- static Ref<MediaRecorderErrorEvent> create(const AtomicString&, Init&&, IsTrusted = IsTrusted::No); >- static Ref<MediaRecorderErrorEvent> create(const AtomicString&, Exception&&); >+ static Ref<MediaRecorderErrorEvent> create(const AtomString&, Init&&, IsTrusted = IsTrusted::No); >+ static Ref<MediaRecorderErrorEvent> create(const AtomString&, Exception&&); > > DOMException& error() const { return m_domError.get(); } > > private: >- MediaRecorderErrorEvent(const AtomicString&, Init&&, Ref<DOMException>&&, IsTrusted); >- MediaRecorderErrorEvent(const AtomicString&, Exception&&); >+ MediaRecorderErrorEvent(const AtomString&, Init&&, Ref<DOMException>&&, IsTrusted); >+ MediaRecorderErrorEvent(const AtomString&, Exception&&); > > // Event > EventInterface eventInterface() const override; >diff --git a/Source/WebCore/Modules/mediasource/MediaSource.cpp b/Source/WebCore/Modules/mediasource/MediaSource.cpp >index 7e9363d5fae90d2c199c704215e4984b1864c292..d417a12169111215d542291e03c59d5d6e7eb3f4 100644 >--- a/Source/WebCore/Modules/mediasource/MediaSource.cpp >+++ b/Source/WebCore/Modules/mediasource/MediaSource.cpp >@@ -1073,7 +1073,7 @@ ExceptionOr<Ref<SourceBufferPrivate>> MediaSource::createSourceBufferPrivate(con > return Exception { QuotaExceededError }; > } > >-void MediaSource::scheduleEvent(const AtomicString& eventName) >+void MediaSource::scheduleEvent(const AtomString& eventName) > { > DEBUG_LOG(LOGIDENTIFIER, "scheduling '", eventName, "'"); > >diff --git a/Source/WebCore/Modules/mediasource/MediaSource.h b/Source/WebCore/Modules/mediasource/MediaSource.h >index f2ae440a820f2c8b1f77ac21e58bdf6206e4e2b0..fdc647b7acbf732c50cbee3ac1c023f81e5d09c1 100644 >--- a/Source/WebCore/Modules/mediasource/MediaSource.h >+++ b/Source/WebCore/Modules/mediasource/MediaSource.h >@@ -147,7 +147,7 @@ private: > Vector<PlatformTimeRanges> activeRanges() const; > > ExceptionOr<Ref<SourceBufferPrivate>> createSourceBufferPrivate(const ContentType&); >- void scheduleEvent(const AtomicString& eventName); >+ void scheduleEvent(const AtomString& eventName); > > bool hasBufferedTime(const MediaTime&); > bool hasCurrentTime(); >diff --git a/Source/WebCore/Modules/mediasource/SourceBuffer.cpp b/Source/WebCore/Modules/mediasource/SourceBuffer.cpp >index aa8006e3c3872cc04c5615f29eefc1432ed73710..0bfbb0ac9cb4695c3231e05f744ff971b58532fa 100644 >--- a/Source/WebCore/Modules/mediasource/SourceBuffer.cpp >+++ b/Source/WebCore/Modules/mediasource/SourceBuffer.cpp >@@ -481,7 +481,7 @@ void SourceBuffer::seekToTime(const MediaTime& time) > > for (auto& trackBufferPair : m_trackBufferMap) { > TrackBuffer& trackBuffer = trackBufferPair.value; >- const AtomicString& trackID = trackBufferPair.key; >+ const AtomString& trackID = trackBufferPair.key; > > trackBuffer.needsReenqueueing = true; > reenqueueMediaForTime(trackBuffer, trackID, time); >@@ -570,7 +570,7 @@ bool SourceBuffer::isRemoved() const > return !m_source; > } > >-void SourceBuffer::scheduleEvent(const AtomicString& eventName) >+void SourceBuffer::scheduleEvent(const AtomString& eventName) > { > auto event = Event::create(eventName, Event::CanBubble::No, Event::IsCancelable::No); > event->setTarget(this); >@@ -703,7 +703,7 @@ void SourceBuffer::sourceBufferPrivateAppendComplete(AppendResult result) > MediaTime currentMediaTime = m_source->currentTime(); > for (auto& trackBufferPair : m_trackBufferMap) { > TrackBuffer& trackBuffer = trackBufferPair.value; >- const AtomicString& trackID = trackBufferPair.key; >+ const AtomString& trackID = trackBufferPair.key; > > if (trackBuffer.needsReenqueueing) { > DEBUG_LOG(LOGIDENTIFIER, "reenqueuing at time ", currentMediaTime); >@@ -1508,7 +1508,7 @@ void SourceBuffer::sourceBufferPrivateDidReceiveSample(MediaSample& sample) > > // NOTE: this is out-of-order, but we need TrackBuffer to be able to cache the results of timestamp offset rounding > // 1.5 Let track buffer equal the track buffer that the coded frame will be added to. >- AtomicString trackID = sample.trackID(); >+ AtomString trackID = sample.trackID(); > auto it = m_trackBufferMap.find(trackID); > if (it == m_trackBufferMap.end()) { > // The client managed to append a sample with a trackID not present in the initialization >@@ -1976,7 +1976,7 @@ void SourceBuffer::textTrackKindChanged(TextTrack& track) > m_source->mediaElement()->textTrackKindChanged(track); > } > >-void SourceBuffer::sourceBufferPrivateReenqueSamples(const AtomicString& trackID) >+void SourceBuffer::sourceBufferPrivateReenqueSamples(const AtomString& trackID) > { > if (isRemoved()) > return; >@@ -1991,7 +1991,7 @@ void SourceBuffer::sourceBufferPrivateReenqueSamples(const AtomicString& trackID > reenqueueMediaForTime(trackBuffer, trackID, m_source->currentTime()); > } > >-void SourceBuffer::sourceBufferPrivateDidBecomeReadyForMoreSamples(const AtomicString& trackID) >+void SourceBuffer::sourceBufferPrivateDidBecomeReadyForMoreSamples(const AtomString& trackID) > { > if (isRemoved()) > return; >@@ -2006,7 +2006,7 @@ void SourceBuffer::sourceBufferPrivateDidBecomeReadyForMoreSamples(const AtomicS > provideMediaData(trackBuffer, trackID); > } > >-void SourceBuffer::provideMediaData(TrackBuffer& trackBuffer, const AtomicString& trackID) >+void SourceBuffer::provideMediaData(TrackBuffer& trackBuffer, const AtomString& trackID) > { > if (m_source->isSeeking()) > return; >@@ -2058,7 +2058,7 @@ void SourceBuffer::provideMediaData(TrackBuffer& trackBuffer, const AtomicString > trySignalAllSamplesInTrackEnqueued(trackID); > } > >-void SourceBuffer::trySignalAllSamplesInTrackEnqueued(const AtomicString& trackID) >+void SourceBuffer::trySignalAllSamplesInTrackEnqueued(const AtomString& trackID) > { > if (m_source->isEnded() && m_trackBufferMap.get(trackID).decodeQueue.empty()) { > DEBUG_LOG(LOGIDENTIFIER, "enqueued all samples from track ", trackID); >@@ -2068,11 +2068,11 @@ void SourceBuffer::trySignalAllSamplesInTrackEnqueued(const AtomicString& trackI > > void SourceBuffer::trySignalAllSamplesEnqueued() > { >- for (const AtomicString& trackID : m_trackBufferMap.keys()) >+ for (const AtomString& trackID : m_trackBufferMap.keys()) > trySignalAllSamplesInTrackEnqueued(trackID); > } > >-void SourceBuffer::reenqueueMediaForTime(TrackBuffer& trackBuffer, const AtomicString& trackID, const MediaTime& time) >+void SourceBuffer::reenqueueMediaForTime(TrackBuffer& trackBuffer, const AtomString& trackID, const MediaTime& time) > { > m_private->flush(trackID); > trackBuffer.decodeQueue.clear(); >@@ -2242,7 +2242,7 @@ void SourceBuffer::reportExtraMemoryAllocated() > scriptExecutionContext()->vm().heap.deprecatedReportExtraMemory(extraMemoryCostDelta); > } > >-Vector<String> SourceBuffer::bufferedSamplesForTrackID(const AtomicString& trackID) >+Vector<String> SourceBuffer::bufferedSamplesForTrackID(const AtomString& trackID) > { > auto it = m_trackBufferMap.find(trackID); > if (it == m_trackBufferMap.end()) >@@ -2256,7 +2256,7 @@ Vector<String> SourceBuffer::bufferedSamplesForTrackID(const AtomicString& track > return sampleDescriptions; > } > >-Vector<String> SourceBuffer::enqueuedSamplesForTrackID(const AtomicString& trackID) >+Vector<String> SourceBuffer::enqueuedSamplesForTrackID(const AtomString& trackID) > { > return m_private->enqueuedSamplesForTrackID(trackID); > } >diff --git a/Source/WebCore/Modules/mediasource/SourceBuffer.h b/Source/WebCore/Modules/mediasource/SourceBuffer.h >index 25050db4f3152327595d46834dc9e8c5261b8118..313d07ccf9255d9a761e32ea4a6380b60a393eed 100644 >--- a/Source/WebCore/Modules/mediasource/SourceBuffer.h >+++ b/Source/WebCore/Modules/mediasource/SourceBuffer.h >@@ -154,8 +154,8 @@ private: > void sourceBufferPrivateDidReceiveSample(MediaSample&) final; > bool sourceBufferPrivateHasAudio() const final; > bool sourceBufferPrivateHasVideo() const final; >- void sourceBufferPrivateReenqueSamples(const AtomicString& trackID) final; >- void sourceBufferPrivateDidBecomeReadyForMoreSamples(const AtomicString& trackID) final; >+ void sourceBufferPrivateReenqueSamples(const AtomString& trackID) final; >+ void sourceBufferPrivateDidBecomeReadyForMoreSamples(const AtomString& trackID) final; > MediaTime sourceBufferPrivateFastSeekTimeForMediaTime(const MediaTime&, const MediaTime& negativeThreshold, const MediaTime& positiveThreshold) final; > void sourceBufferPrivateAppendComplete(AppendResult) final; > void sourceBufferPrivateDidReceiveRenderingError(int errorCode) final; >@@ -173,7 +173,7 @@ private: > EventTargetInterface eventTargetInterface() const final { return SourceBufferEventTargetInterfaceType; } > > bool isRemoved() const; >- void scheduleEvent(const AtomicString& eventName); >+ void scheduleEvent(const AtomString& eventName); > > ExceptionOr<void> appendBufferInternal(const unsigned char*, unsigned); > void appendBufferTimerFired(); >@@ -183,8 +183,8 @@ private: > > bool validateInitializationSegment(const InitializationSegment&); > >- void reenqueueMediaForTime(TrackBuffer&, const AtomicString& trackID, const MediaTime&); >- void provideMediaData(TrackBuffer&, const AtomicString& trackID); >+ void reenqueueMediaForTime(TrackBuffer&, const AtomString& trackID, const MediaTime&); >+ void provideMediaData(TrackBuffer&, const AtomString& trackID); > void didDropSample(); > void evictCodedFrames(size_t newDataSize); > size_t maximumBufferSize() const; >@@ -205,11 +205,11 @@ private: > > void rangeRemoval(const MediaTime&, const MediaTime&); > >- void trySignalAllSamplesInTrackEnqueued(const AtomicString&); >+ void trySignalAllSamplesInTrackEnqueued(const AtomString&); > > friend class Internals; >- WEBCORE_EXPORT Vector<String> bufferedSamplesForTrackID(const AtomicString&); >- WEBCORE_EXPORT Vector<String> enqueuedSamplesForTrackID(const AtomicString&); >+ WEBCORE_EXPORT Vector<String> bufferedSamplesForTrackID(const AtomString&); >+ WEBCORE_EXPORT Vector<String> enqueuedSamplesForTrackID(const AtomString&); > > Ref<SourceBufferPrivate> m_private; > MediaSource* m_source; >@@ -223,9 +223,9 @@ private: > RefPtr<AudioTrackList> m_audioTracks; > RefPtr<TextTrackList> m_textTracks; > >- Vector<AtomicString> m_videoCodecs; >- Vector<AtomicString> m_audioCodecs; >- Vector<AtomicString> m_textCodecs; >+ Vector<AtomString> m_videoCodecs; >+ Vector<AtomString> m_audioCodecs; >+ Vector<AtomString> m_textCodecs; > > MediaTime m_timestampOffset; > MediaTime m_appendWindowStart; >@@ -234,7 +234,7 @@ private: > MediaTime m_groupStartTimestamp; > MediaTime m_groupEndTimestamp; > >- HashMap<AtomicString, TrackBuffer> m_trackBufferMap; >+ HashMap<AtomString, TrackBuffer> m_trackBufferMap; > RefPtr<TimeRanges> m_buffered; > bool m_bufferedDirty { true }; > >diff --git a/Source/WebCore/Modules/mediasource/SourceBufferList.cpp b/Source/WebCore/Modules/mediasource/SourceBufferList.cpp >index 2966c97f9219aa1bdd95ab3c718bb533d5fd1a68..6782246fd4c50b1315e1d9045ba4add9840f96a5 100644 >--- a/Source/WebCore/Modules/mediasource/SourceBufferList.cpp >+++ b/Source/WebCore/Modules/mediasource/SourceBufferList.cpp >@@ -93,7 +93,7 @@ void SourceBufferList::swap(Vector<RefPtr<SourceBuffer>>& other) > scheduleEvent(eventNames().removesourcebufferEvent); > } > >-void SourceBufferList::scheduleEvent(const AtomicString& eventName) >+void SourceBufferList::scheduleEvent(const AtomString& eventName) > { > auto event = Event::create(eventName, Event::CanBubble::No, Event::IsCancelable::No); > event->setTarget(this); >diff --git a/Source/WebCore/Modules/mediasource/SourceBufferList.h b/Source/WebCore/Modules/mediasource/SourceBufferList.h >index 22f7b14359a9be0ee4293491e32fbbd3da2781cd..f83c1843221acb231f5426a7a32eb0b22914a36f 100644 >--- a/Source/WebCore/Modules/mediasource/SourceBufferList.h >+++ b/Source/WebCore/Modules/mediasource/SourceBufferList.h >@@ -73,7 +73,7 @@ public: > private: > explicit SourceBufferList(ScriptExecutionContext*); > >- void scheduleEvent(const AtomicString&); >+ void scheduleEvent(const AtomString&); > > void refEventTarget() override { ref(); } > void derefEventTarget() override { deref(); } >diff --git a/Source/WebCore/Modules/mediastream/MediaDevices.cpp b/Source/WebCore/Modules/mediastream/MediaDevices.cpp >index 52e5fd89f39601298d8da1dd8846969d173c2075..4bd7a9d7ccb993ca114b91aebe7aac89b5f30190 100644 >--- a/Source/WebCore/Modules/mediastream/MediaDevices.cpp >+++ b/Source/WebCore/Modules/mediastream/MediaDevices.cpp >@@ -177,7 +177,7 @@ bool MediaDevices::canSuspendForDocumentSuspension() const > return true; > } > >-bool MediaDevices::addEventListener(const AtomicString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) >+bool MediaDevices::addEventListener(const AtomString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) > { > if (!m_listeningForDeviceChanges && eventType == eventNames().devicechangeEvent) { > auto* document = this->document(); >diff --git a/Source/WebCore/Modules/mediastream/MediaDevices.h b/Source/WebCore/Modules/mediastream/MediaDevices.h >index a5279a4e78586723bc7d884333962f1424bedfb6..de3da08bd0eaa6ab6cfca253af9bc706b7a49c35 100644 >--- a/Source/WebCore/Modules/mediastream/MediaDevices.h >+++ b/Source/WebCore/Modules/mediastream/MediaDevices.h >@@ -89,7 +89,7 @@ private: > explicit MediaDevices(Document&); > > void scheduledEventTimerFired(); >- bool addEventListener(const AtomicString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) override; >+ bool addEventListener(const AtomString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) override; > > friend class JSMediaDevicesOwner; > >diff --git a/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp b/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp >index e7a090f07af5aed60c7a4e1e8bcca909692a3c9e..aa51679be9a199df38486887c23d1423f4ad7d7a 100644 >--- a/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp >+++ b/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp >@@ -81,10 +81,10 @@ MediaStreamTrack::~MediaStreamTrack() > document->removeAudioProducer(*this); > } > >-const AtomicString& MediaStreamTrack::kind() const >+const AtomString& MediaStreamTrack::kind() const > { >- static NeverDestroyed<AtomicString> audioKind("audio", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> videoKind("video", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> audioKind("audio", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> videoKind("video", AtomString::ConstructFromLiteral); > > if (m_private->type() == RealtimeMediaSource::Type::Audio) > return audioKind; >@@ -101,13 +101,13 @@ const String& MediaStreamTrack::label() const > return m_private->label(); > } > >-const AtomicString& MediaStreamTrack::contentHint() const >+const AtomString& MediaStreamTrack::contentHint() const > { >- static NeverDestroyed<const AtomicString> speechHint("speech", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> musicHint("music", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> detailHint("detail", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> textHint("text", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> motionHint("motion", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> speechHint("speech", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> musicHint("music", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> detailHint("detail", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> textHint("text", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> motionHint("motion", AtomString::ConstructFromLiteral); > > switch (m_private->contentHint()) { > case MediaStreamTrackPrivate::HintValue::Empty: >@@ -459,7 +459,7 @@ void MediaStreamTrack::trackMutedChanged(MediaStreamTrackPrivate&) > return; > > m_eventTaskQueue.enqueueTask([this, muted = this->muted()] { >- AtomicString eventType = muted ? eventNames().muteEvent : eventNames().unmuteEvent; >+ AtomString eventType = muted ? eventNames().muteEvent : eventNames().unmuteEvent; > dispatchEvent(Event::create(eventType, Event::CanBubble::No, Event::IsCancelable::No)); > }); > >diff --git a/Source/WebCore/Modules/mediastream/MediaStreamTrack.h b/Source/WebCore/Modules/mediastream/MediaStreamTrack.h >index 02f1e794da58fa92b7793d4083974d22e48dbe16..9bf38b7643c20f228ba25449ab8d871d6ebff4d5 100644 >--- a/Source/WebCore/Modules/mediastream/MediaStreamTrack.h >+++ b/Source/WebCore/Modules/mediastream/MediaStreamTrack.h >@@ -70,11 +70,11 @@ public: > > virtual bool isCanvas() const { return false; } > >- const AtomicString& kind() const; >+ const AtomString& kind() const; > WEBCORE_EXPORT const String& id() const; > const String& label() const; > >- const AtomicString& contentHint() const; >+ const AtomString& contentHint() const; > void setContentHint(const String&); > > bool enabled() const; >diff --git a/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.cpp b/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.cpp >index 67c45cdeb4c804c792cb9277ce18bb240fa0354b..3f44d9c28fa5997590830a1f4ea83c412040097a 100644 >--- a/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.cpp >+++ b/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.cpp >@@ -31,23 +31,23 @@ > > namespace WebCore { > >-Ref<MediaStreamTrackEvent> MediaStreamTrackEvent::create(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, RefPtr<MediaStreamTrack>&& track) >+Ref<MediaStreamTrackEvent> MediaStreamTrackEvent::create(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, RefPtr<MediaStreamTrack>&& track) > { > return adoptRef(*new MediaStreamTrackEvent(type, canBubble, cancelable, WTFMove(track))); > } > >-Ref<MediaStreamTrackEvent> MediaStreamTrackEvent::create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+Ref<MediaStreamTrackEvent> MediaStreamTrackEvent::create(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > { > return adoptRef(*new MediaStreamTrackEvent(type, initializer, isTrusted)); > } > >-MediaStreamTrackEvent::MediaStreamTrackEvent(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, RefPtr<MediaStreamTrack>&& track) >+MediaStreamTrackEvent::MediaStreamTrackEvent(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, RefPtr<MediaStreamTrack>&& track) > : Event(type, canBubble, cancelable) > , m_track(WTFMove(track)) > { > } > >-MediaStreamTrackEvent::MediaStreamTrackEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+MediaStreamTrackEvent::MediaStreamTrackEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_track(initializer.track) > { >diff --git a/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.h b/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.h >index d155daeb1e13a4de29fd907243618cc438eaeea7..7d89f9aedeceee87d79a0ea89fbae89854246885 100644 >--- a/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.h >+++ b/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.h >@@ -27,7 +27,7 @@ > #if ENABLE(MEDIA_STREAM) > > #include "Event.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -37,12 +37,12 @@ class MediaStreamTrackEvent : public Event { > public: > virtual ~MediaStreamTrackEvent(); > >- static Ref<MediaStreamTrackEvent> create(const AtomicString& type, CanBubble, IsCancelable, RefPtr<MediaStreamTrack>&&); >+ static Ref<MediaStreamTrackEvent> create(const AtomString& type, CanBubble, IsCancelable, RefPtr<MediaStreamTrack>&&); > > struct Init : EventInit { > RefPtr<MediaStreamTrack> track; > }; >- static Ref<MediaStreamTrackEvent> create(const AtomicString& type, const Init&, IsTrusted = IsTrusted::No); >+ static Ref<MediaStreamTrackEvent> create(const AtomString& type, const Init&, IsTrusted = IsTrusted::No); > > MediaStreamTrack* track() const; > >@@ -50,8 +50,8 @@ public: > EventInterface eventInterface() const override; > > private: >- MediaStreamTrackEvent(const AtomicString& type, CanBubble, IsCancelable, RefPtr<MediaStreamTrack>&&); >- MediaStreamTrackEvent(const AtomicString& type, const Init&, IsTrusted); >+ MediaStreamTrackEvent(const AtomString& type, CanBubble, IsCancelable, RefPtr<MediaStreamTrack>&&); >+ MediaStreamTrackEvent(const AtomString& type, const Init&, IsTrusted); > > RefPtr<MediaStreamTrack> m_track; > }; >diff --git a/Source/WebCore/Modules/mediastream/OverconstrainedErrorEvent.h b/Source/WebCore/Modules/mediastream/OverconstrainedErrorEvent.h >index c804e2a2e903ec5d507b41a131e5796870369052..8f71e036f587f394530322b6b39b5d960100e763 100644 >--- a/Source/WebCore/Modules/mediastream/OverconstrainedErrorEvent.h >+++ b/Source/WebCore/Modules/mediastream/OverconstrainedErrorEvent.h >@@ -32,7 +32,7 @@ > > #include "Event.h" > #include "OverconstrainedError.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -40,7 +40,7 @@ class OverconstrainedErrorEvent : public Event { > public: > virtual ~OverconstrainedErrorEvent() = default; > >- static Ref<OverconstrainedErrorEvent> create(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, OverconstrainedError* error) >+ static Ref<OverconstrainedErrorEvent> create(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, OverconstrainedError* error) > { > return adoptRef(*new OverconstrainedErrorEvent(type, canBubble, cancelable, error)); > } >@@ -49,7 +49,7 @@ public: > RefPtr<OverconstrainedError> error; > }; > >- static Ref<OverconstrainedErrorEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<OverconstrainedErrorEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new OverconstrainedErrorEvent(type, initializer, isTrusted)); > } >@@ -58,12 +58,12 @@ public: > EventInterface eventInterface() const override { return OverconstrainedErrorEventInterfaceType; } > > private: >- explicit OverconstrainedErrorEvent(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, OverconstrainedError* error) >+ explicit OverconstrainedErrorEvent(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, OverconstrainedError* error) > : Event(type, canBubble, cancelable) > , m_error(error) > { > } >- OverconstrainedErrorEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+ OverconstrainedErrorEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_error(initializer.error) > { >diff --git a/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.cpp b/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.cpp >index b067d126157c9eddd3e57330f51271e89f191bbd..4035dbf723aca63e448b0866716251219a8cd918 100644 >--- a/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.cpp >+++ b/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.cpp >@@ -37,7 +37,7 @@ Ref<RTCDTMFToneChangeEvent> RTCDTMFToneChangeEvent::create(const String& tone) > return adoptRef(*new RTCDTMFToneChangeEvent(tone)); > } > >-Ref<RTCDTMFToneChangeEvent> RTCDTMFToneChangeEvent::create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+Ref<RTCDTMFToneChangeEvent> RTCDTMFToneChangeEvent::create(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > { > return adoptRef(*new RTCDTMFToneChangeEvent(type, initializer, isTrusted)); > } >@@ -48,7 +48,7 @@ RTCDTMFToneChangeEvent::RTCDTMFToneChangeEvent(const String& tone) > { > } > >-RTCDTMFToneChangeEvent::RTCDTMFToneChangeEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+RTCDTMFToneChangeEvent::RTCDTMFToneChangeEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_tone(initializer.tone) > { >diff --git a/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.h b/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.h >index c8d6b281142781d47be15cc90c57767188d7994d..b037d63a54b014e1d846a9952df9232275e2577f 100644 >--- a/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.h >+++ b/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.h >@@ -28,7 +28,7 @@ > #if ENABLE(WEB_RTC_DTMF) > > #include "Event.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -42,7 +42,7 @@ public: > String tone; > }; > >- static Ref<RTCDTMFToneChangeEvent> create(const AtomicString& type, const Init&, IsTrusted = IsTrusted::No); >+ static Ref<RTCDTMFToneChangeEvent> create(const AtomString& type, const Init&, IsTrusted = IsTrusted::No); > > const String& tone() const; > >@@ -50,7 +50,7 @@ public: > > private: > explicit RTCDTMFToneChangeEvent(const String& tone); >- RTCDTMFToneChangeEvent(const AtomicString& type, const Init&, IsTrusted); >+ RTCDTMFToneChangeEvent(const AtomString& type, const Init&, IsTrusted); > > String m_tone; > }; >diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp b/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp >index b62c44fd876ed263a39159db232fbfe3dca3abad..754e468c92156e973bcdfb461ac53f6dd5555d67 100644 >--- a/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp >+++ b/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp >@@ -44,15 +44,15 @@ namespace WebCore { > > WTF_MAKE_ISO_ALLOCATED_IMPL(RTCDataChannel); > >-static const AtomicString& blobKeyword() >+static const AtomString& blobKeyword() > { >- static NeverDestroyed<AtomicString> blob("blob", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> blob("blob", AtomString::ConstructFromLiteral); > return blob; > } > >-static const AtomicString& arraybufferKeyword() >+static const AtomString& arraybufferKeyword() > { >- static NeverDestroyed<AtomicString> arraybuffer("arraybuffer", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> arraybuffer("arraybuffer", AtomString::ConstructFromLiteral); > return arraybuffer; > } > >@@ -83,7 +83,7 @@ size_t RTCDataChannel::bufferedAmount() const > return m_handler->bufferedAmount(); > } > >-const AtomicString& RTCDataChannel::binaryType() const >+const AtomString& RTCDataChannel::binaryType() const > { > switch (m_binaryType) { > case BinaryType::Blob: >@@ -96,7 +96,7 @@ const AtomicString& RTCDataChannel::binaryType() const > return emptyAtom(); > } > >-ExceptionOr<void> RTCDataChannel::setBinaryType(const AtomicString& binaryType) >+ExceptionOr<void> RTCDataChannel::setBinaryType(const AtomString& binaryType) > { > if (binaryType == blobKeyword()) { > m_binaryType = BinaryType::Blob; >diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannel.h b/Source/WebCore/Modules/mediastream/RTCDataChannel.h >index 0d6436d49dfad82a11a9ab1ed392f4376575d81d..bdcf9e186c5072f605526dfb1fb48c36b5ac719e 100644 >--- a/Source/WebCore/Modules/mediastream/RTCDataChannel.h >+++ b/Source/WebCore/Modules/mediastream/RTCDataChannel.h >@@ -64,8 +64,8 @@ public: > size_t bufferedAmountLowThreshold() const { return m_bufferedAmountLowThreshold; } > void setBufferedAmountLowThreshold(size_t value) { m_bufferedAmountLowThreshold = value; } > >- const AtomicString& binaryType() const; >- ExceptionOr<void> setBinaryType(const AtomicString&); >+ const AtomString& binaryType() const; >+ ExceptionOr<void> setBinaryType(const AtomString&); > > ExceptionOr<void> send(const String&); > ExceptionOr<void> send(JSC::ArrayBuffer&); >diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.cpp b/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.cpp >index d72fb7a9160754a4d46a9639e67e28bbb6073aa1..9180581b6a7f3cfae0bc11add60eb7e6cb1c4c97 100644 >--- a/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.cpp >+++ b/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.cpp >@@ -32,23 +32,23 @@ > > namespace WebCore { > >-Ref<RTCDataChannelEvent> RTCDataChannelEvent::create(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, Ref<RTCDataChannel>&& channel) >+Ref<RTCDataChannelEvent> RTCDataChannelEvent::create(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, Ref<RTCDataChannel>&& channel) > { > return adoptRef(*new RTCDataChannelEvent(type, canBubble, cancelable, WTFMove(channel))); > } > >-Ref<RTCDataChannelEvent> RTCDataChannelEvent::create(const AtomicString& type, Init&& initializer, IsTrusted isTrusted) >+Ref<RTCDataChannelEvent> RTCDataChannelEvent::create(const AtomString& type, Init&& initializer, IsTrusted isTrusted) > { > return adoptRef(*new RTCDataChannelEvent(type, WTFMove(initializer), isTrusted)); > } > >-RTCDataChannelEvent::RTCDataChannelEvent(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, Ref<RTCDataChannel>&& channel) >+RTCDataChannelEvent::RTCDataChannelEvent(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, Ref<RTCDataChannel>&& channel) > : Event(type, canBubble, cancelable) > , m_channel(WTFMove(channel)) > { > } > >-RTCDataChannelEvent::RTCDataChannelEvent(const AtomicString& type, Init&& initializer, IsTrusted isTrusted) >+RTCDataChannelEvent::RTCDataChannelEvent(const AtomString& type, Init&& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_channel(initializer.channel.releaseNonNull()) > { >diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.h b/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.h >index 49b24c7ecc6d8af42da087a39a5051e5e1a4282e..e71674716308a9495af5b1f048879fde1b2839a0 100644 >--- a/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.h >+++ b/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.h >@@ -29,7 +29,7 @@ > > #include "Event.h" > #include "RTCDataChannel.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -39,16 +39,16 @@ public: > RefPtr<RTCDataChannel> channel; > }; > >- static Ref<RTCDataChannelEvent> create(const AtomicString& type, CanBubble, IsCancelable, Ref<RTCDataChannel>&&); >- static Ref<RTCDataChannelEvent> create(const AtomicString& type, Init&&, IsTrusted = IsTrusted::No); >+ static Ref<RTCDataChannelEvent> create(const AtomString& type, CanBubble, IsCancelable, Ref<RTCDataChannel>&&); >+ static Ref<RTCDataChannelEvent> create(const AtomString& type, Init&&, IsTrusted = IsTrusted::No); > > RTCDataChannel& channel(); > > virtual EventInterface eventInterface() const; > > private: >- RTCDataChannelEvent(const AtomicString& type, CanBubble, IsCancelable, Ref<RTCDataChannel>&&); >- RTCDataChannelEvent(const AtomicString& type, Init&&, IsTrusted); >+ RTCDataChannelEvent(const AtomString& type, CanBubble, IsCancelable, Ref<RTCDataChannel>&&); >+ RTCDataChannelEvent(const AtomString& type, Init&&, IsTrusted); > > Ref<RTCDataChannel> m_channel; > }; >diff --git a/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.cpp b/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.cpp >index 536ab5124bf5a8872804b865ac08ba6c3ec90fde..fa676e2856d4457a425fe50851d6b10c19c9dfb4 100644 >--- a/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.cpp >+++ b/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.cpp >@@ -37,13 +37,13 @@ Ref<RTCPeerConnectionIceEvent> RTCPeerConnectionIceEvent::create(CanBubble canBu > return adoptRef(*new RTCPeerConnectionIceEvent(eventNames().icecandidateEvent, canBubble, cancelable, WTFMove(candidate), WTFMove(serverURL))); > } > >-Ref<RTCPeerConnectionIceEvent> RTCPeerConnectionIceEvent::create(const AtomicString& type, Init&& init) >+Ref<RTCPeerConnectionIceEvent> RTCPeerConnectionIceEvent::create(const AtomString& type, Init&& init) > { > return adoptRef(*new RTCPeerConnectionIceEvent(type, init.bubbles ? CanBubble::Yes : CanBubble::No, > init.cancelable ? IsCancelable::Yes : IsCancelable::No, WTFMove(init.candidate), WTFMove(init.url))); > } > >-RTCPeerConnectionIceEvent::RTCPeerConnectionIceEvent(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, RefPtr<RTCIceCandidate>&& candidate, String&& serverURL) >+RTCPeerConnectionIceEvent::RTCPeerConnectionIceEvent(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, RefPtr<RTCIceCandidate>&& candidate, String&& serverURL) > : Event(type, canBubble, cancelable) > , m_candidate(WTFMove(candidate)) > , m_url(WTFMove(serverURL)) >diff --git a/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.h b/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.h >index 5f69d8ea7f7489fffc9769303a50ce0affa00596..992e681a93ced633b25d44acea65c4afaf0cb4ae 100644 >--- a/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.h >+++ b/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.h >@@ -27,7 +27,7 @@ > #if ENABLE(WEB_RTC) > > #include "Event.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > class RTCIceCandidate; >@@ -41,7 +41,7 @@ public: > String url; > }; > >- static Ref<RTCPeerConnectionIceEvent> create(const AtomicString& type, Init&&); >+ static Ref<RTCPeerConnectionIceEvent> create(const AtomString& type, Init&&); > static Ref<RTCPeerConnectionIceEvent> create(CanBubble, IsCancelable, RefPtr<RTCIceCandidate>&&, String&& serverURL); > > RTCIceCandidate* candidate() const; >@@ -50,7 +50,7 @@ public: > virtual EventInterface eventInterface() const; > > private: >- RTCPeerConnectionIceEvent(const AtomicString& type, CanBubble, IsCancelable, RefPtr<RTCIceCandidate>&&, String&& serverURL); >+ RTCPeerConnectionIceEvent(const AtomString& type, CanBubble, IsCancelable, RefPtr<RTCIceCandidate>&&, String&& serverURL); > > RefPtr<RTCIceCandidate> m_candidate; > String m_url; >diff --git a/Source/WebCore/Modules/mediastream/RTCTrackEvent.cpp b/Source/WebCore/Modules/mediastream/RTCTrackEvent.cpp >index d4f3355a72b615956ba74cc9ac7096850ac83ace..67c926b14ba81d9ed73f4a647149191d99068760 100644 >--- a/Source/WebCore/Modules/mediastream/RTCTrackEvent.cpp >+++ b/Source/WebCore/Modules/mediastream/RTCTrackEvent.cpp >@@ -39,17 +39,17 @@ > > namespace WebCore { > >-Ref<RTCTrackEvent> RTCTrackEvent::create(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, RefPtr<RTCRtpReceiver>&& receiver, RefPtr<MediaStreamTrack>&& track, Vector<RefPtr<MediaStream>>&& streams, RefPtr<RTCRtpTransceiver>&& transceiver) >+Ref<RTCTrackEvent> RTCTrackEvent::create(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, RefPtr<RTCRtpReceiver>&& receiver, RefPtr<MediaStreamTrack>&& track, Vector<RefPtr<MediaStream>>&& streams, RefPtr<RTCRtpTransceiver>&& transceiver) > { > return adoptRef(*new RTCTrackEvent(type, canBubble, cancelable, WTFMove(receiver), WTFMove(track), WTFMove(streams), WTFMove(transceiver))); > } > >-Ref<RTCTrackEvent> RTCTrackEvent::create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+Ref<RTCTrackEvent> RTCTrackEvent::create(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > { > return adoptRef(*new RTCTrackEvent(type, initializer, isTrusted)); > } > >-RTCTrackEvent::RTCTrackEvent(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, RefPtr<RTCRtpReceiver>&& receiver, RefPtr<MediaStreamTrack>&& track, Vector<RefPtr<MediaStream>>&& streams, RefPtr<RTCRtpTransceiver>&& transceiver) >+RTCTrackEvent::RTCTrackEvent(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, RefPtr<RTCRtpReceiver>&& receiver, RefPtr<MediaStreamTrack>&& track, Vector<RefPtr<MediaStream>>&& streams, RefPtr<RTCRtpTransceiver>&& transceiver) > : Event(type, canBubble, cancelable) > , m_receiver(WTFMove(receiver)) > , m_track(WTFMove(track)) >@@ -58,7 +58,7 @@ RTCTrackEvent::RTCTrackEvent(const AtomicString& type, CanBubble canBubble, IsCa > { > } > >-RTCTrackEvent::RTCTrackEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+RTCTrackEvent::RTCTrackEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_receiver(initializer.receiver) > , m_track(initializer.track) >diff --git a/Source/WebCore/Modules/mediastream/RTCTrackEvent.h b/Source/WebCore/Modules/mediastream/RTCTrackEvent.h >index 13251cde8f82bc1279d65a512a0cf16bc3cb2692..3739e49d24ed62d97f7bff999b1177e781b6a993 100644 >--- a/Source/WebCore/Modules/mediastream/RTCTrackEvent.h >+++ b/Source/WebCore/Modules/mediastream/RTCTrackEvent.h >@@ -33,7 +33,7 @@ > #if ENABLE(WEB_RTC) > > #include "Event.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -46,7 +46,7 @@ typedef Vector<RefPtr<MediaStream>> MediaStreamArray; > > class RTCTrackEvent : public Event { > public: >- static Ref<RTCTrackEvent> create(const AtomicString& type, CanBubble, IsCancelable, RefPtr<RTCRtpReceiver>&&, RefPtr<MediaStreamTrack>&&, MediaStreamArray&&, RefPtr<RTCRtpTransceiver>&&); >+ static Ref<RTCTrackEvent> create(const AtomString& type, CanBubble, IsCancelable, RefPtr<RTCRtpReceiver>&&, RefPtr<MediaStreamTrack>&&, MediaStreamArray&&, RefPtr<RTCRtpTransceiver>&&); > > struct Init : EventInit { > RefPtr<RTCRtpReceiver> receiver; >@@ -54,7 +54,7 @@ public: > MediaStreamArray streams; > RefPtr<RTCRtpTransceiver> transceiver; > }; >- static Ref<RTCTrackEvent> create(const AtomicString& type, const Init&, IsTrusted = IsTrusted::No); >+ static Ref<RTCTrackEvent> create(const AtomString& type, const Init&, IsTrusted = IsTrusted::No); > > RTCRtpReceiver* receiver() const { return m_receiver.get(); } > MediaStreamTrack* track() const { return m_track.get(); } >@@ -64,8 +64,8 @@ public: > virtual EventInterface eventInterface() const { return RTCTrackEventInterfaceType; } > > private: >- RTCTrackEvent(const AtomicString& type, CanBubble, IsCancelable, RefPtr<RTCRtpReceiver>&&, RefPtr<MediaStreamTrack>&&, MediaStreamArray&&, RefPtr<RTCRtpTransceiver>&&); >- RTCTrackEvent(const AtomicString& type, const Init&, IsTrusted); >+ RTCTrackEvent(const AtomString& type, CanBubble, IsCancelable, RefPtr<RTCRtpReceiver>&&, RefPtr<MediaStreamTrack>&&, MediaStreamArray&&, RefPtr<RTCRtpTransceiver>&&); >+ RTCTrackEvent(const AtomString& type, const Init&, IsTrusted); > > RefPtr<RTCRtpReceiver> m_receiver; > RefPtr<MediaStreamTrack> m_track; >diff --git a/Source/WebCore/Modules/paymentrequest/MerchantValidationEvent.cpp b/Source/WebCore/Modules/paymentrequest/MerchantValidationEvent.cpp >index 32a3b6f1ad64b1001580add3a995c4a403400661..90215aa67c2c61a1cad8ee9a34d34f686d0f4614 100644 >--- a/Source/WebCore/Modules/paymentrequest/MerchantValidationEvent.cpp >+++ b/Source/WebCore/Modules/paymentrequest/MerchantValidationEvent.cpp >@@ -33,12 +33,12 @@ > > namespace WebCore { > >-Ref<MerchantValidationEvent> MerchantValidationEvent::create(const AtomicString& type, const String& methodName, URL&& validationURL) >+Ref<MerchantValidationEvent> MerchantValidationEvent::create(const AtomString& type, const String& methodName, URL&& validationURL) > { > return adoptRef(*new MerchantValidationEvent(type, methodName, WTFMove(validationURL))); > } > >-ExceptionOr<Ref<MerchantValidationEvent>> MerchantValidationEvent::create(Document& document, const AtomicString& type, Init&& eventInit) >+ExceptionOr<Ref<MerchantValidationEvent>> MerchantValidationEvent::create(Document& document, const AtomString& type, Init&& eventInit) > { > URL validationURL { document.url(), eventInit.validationURL }; > if (!validationURL.isValid()) >@@ -54,7 +54,7 @@ ExceptionOr<Ref<MerchantValidationEvent>> MerchantValidationEvent::create(Docume > return adoptRef(*new MerchantValidationEvent(type, WTFMove(methodName), WTFMove(validationURL), WTFMove(eventInit))); > } > >-MerchantValidationEvent::MerchantValidationEvent(const AtomicString& type, const String& methodName, URL&& validationURL) >+MerchantValidationEvent::MerchantValidationEvent(const AtomString& type, const String& methodName, URL&& validationURL) > : Event { type, Event::CanBubble::No, Event::IsCancelable::No } > , m_methodName { methodName } > , m_validationURL { WTFMove(validationURL) } >@@ -63,7 +63,7 @@ MerchantValidationEvent::MerchantValidationEvent(const AtomicString& type, const > ASSERT(m_validationURL.isValid()); > } > >-MerchantValidationEvent::MerchantValidationEvent(const AtomicString& type, String&& methodName, URL&& validationURL, Init&& eventInit) >+MerchantValidationEvent::MerchantValidationEvent(const AtomString& type, String&& methodName, URL&& validationURL, Init&& eventInit) > : Event { type, WTFMove(eventInit), IsTrusted::No } > , m_methodName { WTFMove(methodName) } > , m_validationURL { WTFMove(validationURL) } >diff --git a/Source/WebCore/Modules/paymentrequest/MerchantValidationEvent.h b/Source/WebCore/Modules/paymentrequest/MerchantValidationEvent.h >index 29fffbf20b285f8f5e0e619d0871dd6495265d41..e2b1bd7a7cc04481825a31f1cbf2aed15ffcfbda 100644 >--- a/Source/WebCore/Modules/paymentrequest/MerchantValidationEvent.h >+++ b/Source/WebCore/Modules/paymentrequest/MerchantValidationEvent.h >@@ -42,16 +42,16 @@ public: > String validationURL; > }; > >- static Ref<MerchantValidationEvent> create(const AtomicString& type, const String& methodName, URL&& validationURL); >- static ExceptionOr<Ref<MerchantValidationEvent>> create(Document&, const AtomicString& type, Init&&); >+ static Ref<MerchantValidationEvent> create(const AtomString& type, const String& methodName, URL&& validationURL); >+ static ExceptionOr<Ref<MerchantValidationEvent>> create(Document&, const AtomString& type, Init&&); > > const String& methodName() const { return m_methodName; } > const String& validationURL() const { return m_validationURL.string(); } > ExceptionOr<void> complete(Ref<DOMPromise>&&); > > private: >- MerchantValidationEvent(const AtomicString& type, const String& methodName, URL&& validationURL); >- MerchantValidationEvent(const AtomicString& type, String&& methodName, URL&& validationURL, Init&&); >+ MerchantValidationEvent(const AtomString& type, const String& methodName, URL&& validationURL); >+ MerchantValidationEvent(const AtomString& type, String&& methodName, URL&& validationURL, Init&&); > > // Event > EventInterface eventInterface() const final; >diff --git a/Source/WebCore/Modules/paymentrequest/PaymentMethodChangeEvent.cpp b/Source/WebCore/Modules/paymentrequest/PaymentMethodChangeEvent.cpp >index 62d405cfadf20264e634f66abb550d64cde3b8f4..8736416628158b22b09478d8eb7041c6ca5f80d8 100644 >--- a/Source/WebCore/Modules/paymentrequest/PaymentMethodChangeEvent.cpp >+++ b/Source/WebCore/Modules/paymentrequest/PaymentMethodChangeEvent.cpp >@@ -35,14 +35,14 @@ EventInterface PaymentMethodChangeEvent::eventInterface() const > return PaymentMethodChangeEventInterfaceType; > } > >-PaymentMethodChangeEvent::PaymentMethodChangeEvent(const AtomicString& type, Init&& eventInit) >+PaymentMethodChangeEvent::PaymentMethodChangeEvent(const AtomString& type, Init&& eventInit) > : PaymentRequestUpdateEvent { type, eventInit } > , m_methodName { WTFMove(eventInit.methodName) } > , m_methodDetails { JSValueInWrappedObject { eventInit.methodDetails.get() } } > { > } > >-PaymentMethodChangeEvent::PaymentMethodChangeEvent(const AtomicString& type, const String& methodName, MethodDetailsFunction&& methodDetailsFunction) >+PaymentMethodChangeEvent::PaymentMethodChangeEvent(const AtomString& type, const String& methodName, MethodDetailsFunction&& methodDetailsFunction) > : PaymentRequestUpdateEvent { type } > , m_methodName { methodName } > , m_methodDetails { WTFMove(methodDetailsFunction) } >diff --git a/Source/WebCore/Modules/paymentrequest/PaymentMethodChangeEvent.h b/Source/WebCore/Modules/paymentrequest/PaymentMethodChangeEvent.h >index 92f5a783b769d921478da23e93a73d15fcc5be6b..82e331704206f7e3d38bc2983a0088c21eed6481 100644 >--- a/Source/WebCore/Modules/paymentrequest/PaymentMethodChangeEvent.h >+++ b/Source/WebCore/Modules/paymentrequest/PaymentMethodChangeEvent.h >@@ -62,8 +62,8 @@ public: > }; > > private: >- PaymentMethodChangeEvent(const AtomicString& type, Init&&); >- PaymentMethodChangeEvent(const AtomicString& type, const String& methodName, MethodDetailsFunction&&); >+ PaymentMethodChangeEvent(const AtomString& type, Init&&); >+ PaymentMethodChangeEvent(const AtomString& type, const String& methodName, MethodDetailsFunction&&); > > String m_methodName; > MethodDetailsType m_methodDetails; >diff --git a/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.cpp b/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.cpp >index a0d7d783f8b8ae255536e222326d764a44e7199a..871559c9d11575c177e6649b405b92f39ae13270 100644 >--- a/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.cpp >+++ b/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.cpp >@@ -33,13 +33,13 @@ > > namespace WebCore { > >-PaymentRequestUpdateEvent::PaymentRequestUpdateEvent(const AtomicString& type, const PaymentRequestUpdateEventInit& eventInit) >+PaymentRequestUpdateEvent::PaymentRequestUpdateEvent(const AtomString& type, const PaymentRequestUpdateEventInit& eventInit) > : Event { type, eventInit, IsTrusted::No } > { > ASSERT(!isTrusted()); > } > >-PaymentRequestUpdateEvent::PaymentRequestUpdateEvent(const AtomicString& type) >+PaymentRequestUpdateEvent::PaymentRequestUpdateEvent(const AtomString& type) > : Event { type, CanBubble::No, IsCancelable::No } > { > ASSERT(isTrusted()); >diff --git a/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.h b/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.h >index 1e7909bd648628557c080cce082d39424999b13f..4a0acd3c078b2b5b76856ad600e0095c2cf4569b 100644 >--- a/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.h >+++ b/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.h >@@ -45,8 +45,8 @@ public: > ExceptionOr<void> updateWith(Ref<DOMPromise>&&); > > protected: >- explicit PaymentRequestUpdateEvent(const AtomicString& type); >- PaymentRequestUpdateEvent(const AtomicString& type, const PaymentRequestUpdateEventInit&); >+ explicit PaymentRequestUpdateEvent(const AtomString& type); >+ PaymentRequestUpdateEvent(const AtomString& type, const PaymentRequestUpdateEventInit&); > > // Event > EventInterface eventInterface() const override; >diff --git a/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp b/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp >index 5187adfbed0912fcc8a7cfd064b8ec12ee9b9925..ba95bf5181a20ac019fb3f0fb09ff6578aa48805 100644 >--- a/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp >+++ b/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp >@@ -85,19 +85,19 @@ bool YouTubePluginReplacement::installReplacement(ShadowRoot& root) > > auto iframeElement = HTMLIFrameElement::create(HTMLNames::iframeTag, m_parentElement->document()); > if (m_attributes.contains("width")) >- iframeElement->setAttributeWithoutSynchronization(HTMLNames::widthAttr, AtomicString("100%", AtomicString::ConstructFromLiteral)); >+ iframeElement->setAttributeWithoutSynchronization(HTMLNames::widthAttr, AtomString("100%", AtomString::ConstructFromLiteral)); > > const auto& heightValue = m_attributes.find("height"); > if (heightValue != m_attributes.end()) { >- iframeElement->setAttribute(HTMLNames::styleAttr, AtomicString("max-height: 100%", AtomicString::ConstructFromLiteral)); >+ iframeElement->setAttribute(HTMLNames::styleAttr, AtomString("max-height: 100%", AtomString::ConstructFromLiteral)); > iframeElement->setAttributeWithoutSynchronization(HTMLNames::heightAttr, heightValue->value); > } > > iframeElement->setAttributeWithoutSynchronization(HTMLNames::srcAttr, youTubeURL(m_attributes.get("src"))); >- iframeElement->setAttributeWithoutSynchronization(HTMLNames::frameborderAttr, AtomicString("0", AtomicString::ConstructFromLiteral)); >+ iframeElement->setAttributeWithoutSynchronization(HTMLNames::frameborderAttr, AtomString("0", AtomString::ConstructFromLiteral)); > > // Disable frame flattening for this iframe. >- iframeElement->setAttributeWithoutSynchronization(HTMLNames::scrollingAttr, AtomicString("no", AtomicString::ConstructFromLiteral)); >+ iframeElement->setAttributeWithoutSynchronization(HTMLNames::scrollingAttr, AtomString("no", AtomString::ConstructFromLiteral)); > m_embedShadowElement->appendChild(iframeElement); > > return true; >diff --git a/Source/WebCore/Modules/speech/SpeechSynthesis.cpp b/Source/WebCore/Modules/speech/SpeechSynthesis.cpp >index ba63a7890dfc86ec062cde66d7ba50d5585d7c0b..32b65d820ac3458e2ac7d2e8676ecbec65ebb6b9 100644 >--- a/Source/WebCore/Modules/speech/SpeechSynthesis.cpp >+++ b/Source/WebCore/Modules/speech/SpeechSynthesis.cpp >@@ -180,7 +180,7 @@ void SpeechSynthesis::resume() > } > } > >-void SpeechSynthesis::fireEvent(const AtomicString& type, SpeechSynthesisUtterance& utterance, unsigned long charIndex, const String& name) >+void SpeechSynthesis::fireEvent(const AtomString& type, SpeechSynthesisUtterance& utterance, unsigned long charIndex, const String& name) > { > utterance.dispatchEvent(SpeechSynthesisEvent::create(type, charIndex, (MonotonicTime::now() - utterance.startTime()).seconds(), name)); > } >diff --git a/Source/WebCore/Modules/speech/SpeechSynthesis.h b/Source/WebCore/Modules/speech/SpeechSynthesis.h >index 4a315941188672a8681e287150a0e1ad1768a325..13315e6d6b0ed296d25677554d5fd5fa0588755a 100644 >--- a/Source/WebCore/Modules/speech/SpeechSynthesis.h >+++ b/Source/WebCore/Modules/speech/SpeechSynthesis.h >@@ -81,7 +81,7 @@ private: > > void startSpeakingImmediately(SpeechSynthesisUtterance&); > void handleSpeakingCompleted(SpeechSynthesisUtterance&, bool errorOccurred); >- void fireEvent(const AtomicString& type, SpeechSynthesisUtterance&, unsigned long charIndex, const String& name); >+ void fireEvent(const AtomString& type, SpeechSynthesisUtterance&, unsigned long charIndex, const String& name); > > #if PLATFORM(IOS_FAMILY) > // Restrictions to change default behaviors. >diff --git a/Source/WebCore/Modules/speech/SpeechSynthesisEvent.cpp b/Source/WebCore/Modules/speech/SpeechSynthesisEvent.cpp >index f2fe025cd9cb83f344757745bc1ba870febe8119..fb208db361a852394ab6125eff5757fde4ec1d0a 100644 >--- a/Source/WebCore/Modules/speech/SpeechSynthesisEvent.cpp >+++ b/Source/WebCore/Modules/speech/SpeechSynthesisEvent.cpp >@@ -30,12 +30,12 @@ > > namespace WebCore { > >-Ref<SpeechSynthesisEvent> SpeechSynthesisEvent::create(const AtomicString& type, unsigned charIndex, float elapsedTime, const String& name) >+Ref<SpeechSynthesisEvent> SpeechSynthesisEvent::create(const AtomString& type, unsigned charIndex, float elapsedTime, const String& name) > { > return adoptRef(*new SpeechSynthesisEvent(type, charIndex, elapsedTime, name)); > } > >-SpeechSynthesisEvent::SpeechSynthesisEvent(const AtomicString& type, unsigned charIndex, float elapsedTime, const String& name) >+SpeechSynthesisEvent::SpeechSynthesisEvent(const AtomString& type, unsigned charIndex, float elapsedTime, const String& name) > : Event(type, CanBubble::No, IsCancelable::No) > , m_charIndex(charIndex) > , m_elapsedTime(elapsedTime) >diff --git a/Source/WebCore/Modules/speech/SpeechSynthesisEvent.h b/Source/WebCore/Modules/speech/SpeechSynthesisEvent.h >index 6e7204b2bd0792858c02e12a504164ed5648c3c3..2094fc19c914742bbbc4b42673f484da7ff22f5f 100644 >--- a/Source/WebCore/Modules/speech/SpeechSynthesisEvent.h >+++ b/Source/WebCore/Modules/speech/SpeechSynthesisEvent.h >@@ -33,7 +33,7 @@ namespace WebCore { > > class SpeechSynthesisEvent : public Event { > public: >- static Ref<SpeechSynthesisEvent> create(const AtomicString& type, unsigned charIndex, float elapsedTime, const String& name); >+ static Ref<SpeechSynthesisEvent> create(const AtomString& type, unsigned charIndex, float elapsedTime, const String& name); > > unsigned long charIndex() const { return m_charIndex; } > float elapsedTime() const { return m_elapsedTime; } >@@ -42,7 +42,7 @@ public: > virtual EventInterface eventInterface() const { return SpeechSynthesisEventInterfaceType; } > > private: >- SpeechSynthesisEvent(const AtomicString& type, unsigned charIndex, float elapsedTime, const String& name); >+ SpeechSynthesisEvent(const AtomString& type, unsigned charIndex, float elapsedTime, const String& name); > > unsigned long m_charIndex; > float m_elapsedTime; >diff --git a/Source/WebCore/Modules/webaudio/AudioContext.h b/Source/WebCore/Modules/webaudio/AudioContext.h >index cf3464e6eef66cb85c483be63ec4d19df7a3d6fc..f21a8b4e1b93952ee82e063c7d73fa357bbe8574 100644 >--- a/Source/WebCore/Modules/webaudio/AudioContext.h >+++ b/Source/WebCore/Modules/webaudio/AudioContext.h >@@ -46,7 +46,7 @@ > #include <wtf/ThreadSafeRefCounted.h> > #include <wtf/Threading.h> > #include <wtf/Vector.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >diff --git a/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp b/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp >index 9eed877c264a5b3f11eedc885c1ceea49324e139..135895804e31421219d29e980dbb4208c1d74a1f 100644 >--- a/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp >+++ b/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp >@@ -184,7 +184,7 @@ void AudioScheduledSourceNode::finish() > }); > } > >-bool AudioScheduledSourceNode::addEventListener(const AtomicString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) >+bool AudioScheduledSourceNode::addEventListener(const AtomString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) > { > bool success = AudioNode::addEventListener(eventType, WTFMove(listener), options); > if (success && eventType == eventNames().endedEvent) >@@ -192,7 +192,7 @@ bool AudioScheduledSourceNode::addEventListener(const AtomicString& eventType, R > return success; > } > >-bool AudioScheduledSourceNode::removeEventListener(const AtomicString& eventType, EventListener& listener, const ListenerOptions& options) >+bool AudioScheduledSourceNode::removeEventListener(const AtomString& eventType, EventListener& listener, const ListenerOptions& options) > { > bool success = AudioNode::removeEventListener(eventType, listener, options); > if (success && eventType == eventNames().endedEvent) >diff --git a/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.h b/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.h >index 2e9c2e04fc79a3dc9278ef029cd784553764f2ec..0d5622a707b6af099ecc9c7ed18bcc5650e133fe 100644 >--- a/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.h >+++ b/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.h >@@ -88,8 +88,8 @@ protected: > static const double UnknownTime; > > private: >- bool addEventListener(const AtomicString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) override; >- bool removeEventListener(const AtomicString& eventType, EventListener&, const ListenerOptions&) override; >+ bool addEventListener(const AtomString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) override; >+ bool removeEventListener(const AtomString& eventType, EventListener&, const ListenerOptions&) override; > void removeAllEventListeners() override; > }; > >diff --git a/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp b/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp >index d5ebd1f922ab163572bbd3b198aedd6f3236bdee..d59decf99516f6d01af9c1d9fdbf1d0b1019e40f 100644 >--- a/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp >+++ b/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp >@@ -256,7 +256,7 @@ double ScriptProcessorNode::latencyTime() const > return std::numeric_limits<double>::infinity(); > } > >-bool ScriptProcessorNode::addEventListener(const AtomicString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) >+bool ScriptProcessorNode::addEventListener(const AtomString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) > { > bool success = AudioNode::addEventListener(eventType, WTFMove(listener), options); > if (success && eventType == eventNames().audioprocessEvent) >@@ -264,7 +264,7 @@ bool ScriptProcessorNode::addEventListener(const AtomicString& eventType, Ref<Ev > return success; > } > >-bool ScriptProcessorNode::removeEventListener(const AtomicString& eventType, EventListener& listener, const ListenerOptions& options) >+bool ScriptProcessorNode::removeEventListener(const AtomString& eventType, EventListener& listener, const ListenerOptions& options) > { > bool success = AudioNode::removeEventListener(eventType, listener, options); > if (success && eventType == eventNames().audioprocessEvent) >diff --git a/Source/WebCore/Modules/webaudio/ScriptProcessorNode.h b/Source/WebCore/Modules/webaudio/ScriptProcessorNode.h >index 98e1f0a4773467d926deee01bf28abb2148bd645..80e1aff54fb259745452806e72063e55ee5ffafc 100644 >--- a/Source/WebCore/Modules/webaudio/ScriptProcessorNode.h >+++ b/Source/WebCore/Modules/webaudio/ScriptProcessorNode.h >@@ -71,8 +71,8 @@ private: > > void fireProcessEvent(); > >- bool addEventListener(const AtomicString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) override; >- bool removeEventListener(const AtomicString& eventType, EventListener&, const ListenerOptions&) override; >+ bool addEventListener(const AtomString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) override; >+ bool removeEventListener(const AtomString& eventType, EventListener&, const ListenerOptions&) override; > void removeAllEventListeners() override; > > // Double buffering >diff --git a/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLNativeTypeDeclaration.h b/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLNativeTypeDeclaration.h >index 3ae6ed6475b6c24880844bbfcbc26b59657d6248..fbd4ffbc6817a37393f66f9f6188d7c79e1ec69d 100644 >--- a/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLNativeTypeDeclaration.h >+++ b/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLNativeTypeDeclaration.h >@@ -59,7 +59,7 @@ public: > bool isInt() const { return m_isInt; } > bool isNumber() const { return m_isNumber; } > bool isFloating() const { return m_isFloating; } >- bool isAtomic() const { return m_isAtomic; } >+ bool isAtom() const { return m_isAtomic; } > bool isVector() const { return m_isVector; } > bool isMatrix() const { return m_isMatrix; } > bool isTexture() const { return m_isTexture; } >diff --git a/Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLNativeFunctionWriter.cpp b/Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLNativeFunctionWriter.cpp >index aba39d5e998dc77efb86bd2e05f9c259e1a26ab9..0ed12d2fbbc8950f6709bb46020c157648af4f95 100644 >--- a/Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLNativeFunctionWriter.cpp >+++ b/Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLNativeFunctionWriter.cpp >@@ -102,7 +102,7 @@ String writeNativeFunction(AST::NativeFunctionDeclaration& nativeFunctionDeclara > auto& parameterNamedType = downcast<AST::NamedType>(parameterType); > if (is<AST::NativeTypeDeclaration>(parameterNamedType)) { > auto& parameterNativeTypeDeclaration = downcast<AST::NativeTypeDeclaration>(parameterNamedType); >- if (parameterNativeTypeDeclaration.isAtomic()) { >+ if (parameterNativeTypeDeclaration.isAtom()) { > stringBuilder.append(makeString(metalReturnName, ' ', outputFunctionName, '(', metalParameterName, " x) {\n")); > stringBuilder.append(" return atomic_load_explicit(&x, memory_order_relaxed);\n"); > stringBuilder.append("}\n"); >diff --git a/Source/WebCore/Modules/webgpu/WHLSL/WHLSLSynthesizeConstructors.cpp b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLSynthesizeConstructors.cpp >index f2850622c67afca1607022d81f4773c593a0203c..65240dcf104f37f9a055a3c1ffd39618cc2c4d65 100644 >--- a/Source/WebCore/Modules/webgpu/WHLSL/WHLSLSynthesizeConstructors.cpp >+++ b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLSynthesizeConstructors.cpp >@@ -124,7 +124,7 @@ bool synthesizeConstructors(Program& program) > for (auto& namedType : namedTypes) { > if (matches(namedType, program.intrinsics().voidType())) > continue; >- if (is<AST::NativeTypeDeclaration>(static_cast<AST::NamedType&>(namedType)) && downcast<AST::NativeTypeDeclaration>(static_cast<AST::NamedType&>(namedType)).isAtomic()) >+ if (is<AST::NativeTypeDeclaration>(static_cast<AST::NamedType&>(namedType)) && downcast<AST::NativeTypeDeclaration>(static_cast<AST::NamedType&>(namedType)).isAtom()) > continue; > > auto variableDeclaration = makeUniqueRef<AST::VariableDeclaration>(Lexer::Token(namedType.get().origin()), AST::Qualifiers(), UniqueRef<AST::UnnamedType>(AST::TypeReference::wrap(Lexer::Token(namedType.get().origin()), namedType.get())), String(), WTF::nullopt, WTF::nullopt); >diff --git a/Source/WebCore/Modules/websockets/CloseEvent.h b/Source/WebCore/Modules/websockets/CloseEvent.h >index bc1a0c488bbf22f6ab74fa0485083e13ed2d9f85..d7285c444756539941cba172e5f3d17bb7a28542 100644 >--- a/Source/WebCore/Modules/websockets/CloseEvent.h >+++ b/Source/WebCore/Modules/websockets/CloseEvent.h >@@ -48,7 +48,7 @@ public: > String reason; > }; > >- static Ref<CloseEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<CloseEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new CloseEvent(type, initializer, isTrusted)); > } >@@ -69,7 +69,7 @@ private: > { > } > >- CloseEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+ CloseEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_wasClean(initializer.wasClean) > , m_code(initializer.code) >diff --git a/Source/WebCore/Modules/webvr/VRDisplayEvent.cpp b/Source/WebCore/Modules/webvr/VRDisplayEvent.cpp >index 9b74c184c330d957641ea6cc2ffed9d40ae9b14f..7f14d1cdcf44a365140f11cdb743c644e44b8ca5 100644 >--- a/Source/WebCore/Modules/webvr/VRDisplayEvent.cpp >+++ b/Source/WebCore/Modules/webvr/VRDisplayEvent.cpp >@@ -29,14 +29,14 @@ > > namespace WebCore { > >-VRDisplayEvent::VRDisplayEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+VRDisplayEvent::VRDisplayEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_display(initializer.display) > , m_reason(initializer.reason) > { > } > >-VRDisplayEvent::VRDisplayEvent(const AtomicString& name, const RefPtr<VRDisplay>& display, Optional<VRDisplayEventReason>&& reason) >+VRDisplayEvent::VRDisplayEvent(const AtomString& name, const RefPtr<VRDisplay>& display, Optional<VRDisplayEventReason>&& reason) > : Event(name, CanBubble::No, IsCancelable::No) > , m_display(display) > , m_reason(WTFMove(reason)) >diff --git a/Source/WebCore/Modules/webvr/VRDisplayEvent.h b/Source/WebCore/Modules/webvr/VRDisplayEvent.h >index 21ccb889be37267ca6b866920a13fcbc5697dacb..f78d44ed8fefb28d3e2403b5454f10eb092b7784 100644 >--- a/Source/WebCore/Modules/webvr/VRDisplayEvent.h >+++ b/Source/WebCore/Modules/webvr/VRDisplayEvent.h >@@ -32,7 +32,7 @@ namespace WebCore { > > class VRDisplayEvent final : public Event { > public: >- static Ref<VRDisplayEvent> create(const AtomicString& type, const RefPtr<VRDisplay>& display, Optional<VRDisplayEventReason>&& reason) >+ static Ref<VRDisplayEvent> create(const AtomString& type, const RefPtr<VRDisplay>& display, Optional<VRDisplayEventReason>&& reason) > { > return adoptRef(*new VRDisplayEvent(type, display, WTFMove(reason))); > } >@@ -42,7 +42,7 @@ public: > Optional<VRDisplayEventReason> reason; > }; > >- static Ref<VRDisplayEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<VRDisplayEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new VRDisplayEvent(type, initializer, isTrusted)); > } >@@ -53,8 +53,8 @@ public: > const Optional<VRDisplayEventReason>& reason() const { return m_reason; } > > private: >- VRDisplayEvent(const AtomicString&, const Init&, IsTrusted); >- VRDisplayEvent(const AtomicString&, const RefPtr<VRDisplay>&, Optional<VRDisplayEventReason>&&); >+ VRDisplayEvent(const AtomString&, const Init&, IsTrusted); >+ VRDisplayEvent(const AtomString&, const RefPtr<VRDisplay>&, Optional<VRDisplayEventReason>&&); > > // Event > EventInterface eventInterface() const override; >diff --git a/Source/WebCore/WebCorePrefix.h b/Source/WebCore/WebCorePrefix.h >index c5a68ffc2ef24189562d4b2a40915599568546d9..782a8476ca2c8b562a9227df9b738f9aada8826c 100644 >--- a/Source/WebCore/WebCorePrefix.h >+++ b/Source/WebCore/WebCorePrefix.h >@@ -171,7 +171,7 @@ > #import <wtf/FastMalloc.h> > #import <wtf/Optional.h> > #import <wtf/StdLibExtras.h> >-#import <wtf/text/AtomicString.h> >+#import <wtf/text/AtomString.h> > #import <wtf/text/WTFString.h> > #endif > >diff --git a/Source/WebCore/accessibility/AXObjectCache.cpp b/Source/WebCore/accessibility/AXObjectCache.cpp >index a0e1a4e7156aba3d4876b6e707b644c8b3e7dd25..3c8cd97109475709422bdab2556d14d673bfe722 100644 >--- a/Source/WebCore/accessibility/AXObjectCache.cpp >+++ b/Source/WebCore/accessibility/AXObjectCache.cpp >@@ -851,7 +851,7 @@ void AXObjectCache::handleLiveRegionCreated(Node* node) > Element* element = downcast<Element>(node); > String liveRegionStatus = element->attributeWithoutSynchronization(aria_liveAttr); > if (liveRegionStatus.isEmpty()) { >- const AtomicString& ariaRole = element->attributeWithoutSynchronization(roleAttr); >+ const AtomString& ariaRole = element->attributeWithoutSynchronization(roleAttr); > if (!ariaRole.isEmpty()) > liveRegionStatus = AccessibilityObject::defaultLiveRegionStatusForRole(AccessibilityObject::ariaRoleToWebCoreRole(ariaRole)); > } >@@ -3039,7 +3039,7 @@ bool isNodeAriaVisible(Node* node) > bool ariaHiddenFalsePresent = false; > for (Node* testNode = node; testNode; testNode = testNode->parentNode()) { > if (is<Element>(*testNode)) { >- const AtomicString& ariaHiddenValue = downcast<Element>(*testNode).attributeWithoutSynchronization(aria_hiddenAttr); >+ const AtomString& ariaHiddenValue = downcast<Element>(*testNode).attributeWithoutSynchronization(aria_hiddenAttr); > if (equalLettersIgnoringASCIICase(ariaHiddenValue, "true")) > return false; > >diff --git a/Source/WebCore/accessibility/AccessibilityARIAGrid.cpp b/Source/WebCore/accessibility/AccessibilityARIAGrid.cpp >index c94ddfcf16e4d852edfa6e20142376af4c8f632c..d730988f897ecfa49abb90d33e712d60ede8529e 100644 >--- a/Source/WebCore/accessibility/AccessibilityARIAGrid.cpp >+++ b/Source/WebCore/accessibility/AccessibilityARIAGrid.cpp >@@ -81,7 +81,7 @@ bool AccessibilityARIAGrid::addTableCellChild(AccessibilityObject* child, HashSe > > bool AccessibilityARIAGrid::isMultiSelectable() const > { >- const AtomicString& ariaMultiSelectable = getAttribute(HTMLNames::aria_multiselectableAttr); >+ const AtomString& ariaMultiSelectable = getAttribute(HTMLNames::aria_multiselectableAttr); > return !equalLettersIgnoringASCIICase(ariaMultiSelectable, "false"); > } > >diff --git a/Source/WebCore/accessibility/AccessibilityImageMapLink.cpp b/Source/WebCore/accessibility/AccessibilityImageMapLink.cpp >index e3033508c85fd1145b4f6fc28892b7bae3740029..c557978707b71d709d25986b40332695507262ec 100644 >--- a/Source/WebCore/accessibility/AccessibilityImageMapLink.cpp >+++ b/Source/WebCore/accessibility/AccessibilityImageMapLink.cpp >@@ -68,7 +68,7 @@ AccessibilityRole AccessibilityImageMapLink::roleValue() const > if (!m_areaElement) > return AccessibilityRole::WebCoreLink; > >- const AtomicString& ariaRole = getAttribute(roleAttr); >+ const AtomString& ariaRole = getAttribute(roleAttr); > if (!ariaRole.isEmpty()) > return AccessibilityObject::ariaRoleToWebCoreRole(ariaRole); > >@@ -99,21 +99,21 @@ void AccessibilityImageMapLink::accessibilityText(Vector<AccessibilityText>& tex > if (!description.isEmpty()) > textOrder.append(AccessibilityText(description, AccessibilityTextSource::Alternative)); > >- const AtomicString& titleText = getAttribute(titleAttr); >+ const AtomString& titleText = getAttribute(titleAttr); > if (!titleText.isEmpty()) > textOrder.append(AccessibilityText(titleText, AccessibilityTextSource::TitleTag)); > >- const AtomicString& summary = getAttribute(summaryAttr); >+ const AtomString& summary = getAttribute(summaryAttr); > if (!summary.isEmpty()) > textOrder.append(AccessibilityText(summary, AccessibilityTextSource::Summary)); > } > > String AccessibilityImageMapLink::accessibilityDescription() const > { >- const AtomicString& ariaLabel = getAttribute(aria_labelAttr); >+ const AtomString& ariaLabel = getAttribute(aria_labelAttr); > if (!ariaLabel.isEmpty()) > return ariaLabel; >- const AtomicString& alt = getAttribute(altAttr); >+ const AtomString& alt = getAttribute(altAttr); > if (!alt.isEmpty()) > return alt; > >@@ -122,10 +122,10 @@ String AccessibilityImageMapLink::accessibilityDescription() const > > String AccessibilityImageMapLink::title() const > { >- const AtomicString& title = getAttribute(titleAttr); >+ const AtomString& title = getAttribute(titleAttr); > if (!title.isEmpty()) > return title; >- const AtomicString& summary = getAttribute(summaryAttr); >+ const AtomString& summary = getAttribute(summaryAttr); > if (!summary.isEmpty()) > return summary; > >diff --git a/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp b/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp >index 417d624d1399524f8d0839b88d94231e4db4ad2d..3bda2e5bccad0402682829c907b59e85c6800d32 100644 >--- a/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp >+++ b/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp >@@ -141,7 +141,7 @@ String AccessibilityListBoxOption::stringValue() const > if (!m_optionElement) > return String(); > >- const AtomicString& ariaLabel = getAttribute(aria_labelAttr); >+ const AtomString& ariaLabel = getAttribute(aria_labelAttr); > if (!ariaLabel.isNull()) > return ariaLabel; > >diff --git a/Source/WebCore/accessibility/AccessibilityMediaControls.h b/Source/WebCore/accessibility/AccessibilityMediaControls.h >index 148f076729c18c6b9d6c1ee99138fd26cb1f1ce1..c985fddd3db75b8a84c7e25833e00995766d5948 100644 >--- a/Source/WebCore/accessibility/AccessibilityMediaControls.h >+++ b/Source/WebCore/accessibility/AccessibilityMediaControls.h >@@ -64,7 +64,7 @@ public: > > String helpText() const override; > String valueDescription() const override; >- const AtomicString& getAttribute(const QualifiedName& attribute) const; >+ const AtomString& getAttribute(const QualifiedName& attribute) const; > > private: > explicit AccessibilityMediaTimeline(RenderObject*); >diff --git a/Source/WebCore/accessibility/AccessibilityNodeObject.cpp b/Source/WebCore/accessibility/AccessibilityNodeObject.cpp >index 137c8585e8a8801361798e1d937dc0efe88fb641..a2d327f8cf17808caf25a6805a488e88f8d4e5bf 100644 >--- a/Source/WebCore/accessibility/AccessibilityNodeObject.cpp >+++ b/Source/WebCore/accessibility/AccessibilityNodeObject.cpp >@@ -488,7 +488,7 @@ bool AccessibilityNodeObject::isSearchField() const > // but it will catch google.com for example. > > // Check the node name of the input type, sometimes it's "search". >- const AtomicString& nameAttribute = getAttribute(nameAttr); >+ const AtomString& nameAttribute = getAttribute(nameAttr); > if (nameAttribute.containsIgnoringASCIICase("search")) > return true; > >@@ -633,7 +633,7 @@ bool AccessibilityNodeObject::isEnabled() const > { > // ARIA says that the disabled status applies to the current element and all descendant elements. > for (AccessibilityObject* object = const_cast<AccessibilityNodeObject*>(this); object; object = object->parentObject()) { >- const AtomicString& disabledStatus = object->getAttribute(aria_disabledAttr); >+ const AtomString& disabledStatus = object->getAttribute(aria_disabledAttr); > if (equalLettersIgnoringASCIICase(disabledStatus, "true")) > return false; > if (equalLettersIgnoringASCIICase(disabledStatus, "false")) >@@ -712,7 +712,7 @@ bool AccessibilityNodeObject::isHovered() const > > bool AccessibilityNodeObject::isMultiSelectable() const > { >- const AtomicString& ariaMultiSelectable = getAttribute(aria_multiselectableAttr); >+ const AtomString& ariaMultiSelectable = getAttribute(aria_multiselectableAttr); > if (equalLettersIgnoringASCIICase(ariaMultiSelectable, "true")) > return true; > if (equalLettersIgnoringASCIICase(ariaMultiSelectable, "false")) >@@ -724,7 +724,7 @@ bool AccessibilityNodeObject::isMultiSelectable() const > bool AccessibilityNodeObject::isRequired() const > { > // Explicit aria-required values should trump native required attributes. >- const AtomicString& requiredValue = getAttribute(aria_requiredAttr); >+ const AtomString& requiredValue = getAttribute(aria_requiredAttr); > if (equalLettersIgnoringASCIICase(requiredValue, "true")) > return true; > if (equalLettersIgnoringASCIICase(requiredValue, "false")) >@@ -1173,7 +1173,7 @@ HTMLLabelElement* AccessibilityNodeObject::labelForElement(Element* element) con > if (!is<HTMLElement>(*element) || !downcast<HTMLElement>(*element).isLabelable()) > return nullptr; > >- const AtomicString& id = element->getIdAttribute(); >+ const AtomString& id = element->getIdAttribute(); > if (!id.isEmpty()) { > if (HTMLLabelElement* label = element->treeScope().labelElementForId(id)) > return label; >@@ -1188,7 +1188,7 @@ String AccessibilityNodeObject::ariaAccessibilityDescription() const > if (!ariaLabeledBy.isEmpty()) > return ariaLabeledBy; > >- const AtomicString& ariaLabel = getAttribute(aria_labelAttr); >+ const AtomString& ariaLabel = getAttribute(aria_labelAttr); > if (!ariaLabel.isEmpty()) > return ariaLabel; > >@@ -1334,7 +1334,7 @@ void AccessibilityNodeObject::alternativeText(Vector<AccessibilityText>& textOrd > > ariaLabeledByText(textOrder); > >- const AtomicString& ariaLabel = getAttribute(aria_labelAttr); >+ const AtomString& ariaLabel = getAttribute(aria_labelAttr); > if (!ariaLabel.isEmpty()) > textOrder.append(AccessibilityText(ariaLabel, AccessibilityTextSource::Alternative)); > >@@ -1350,7 +1350,7 @@ void AccessibilityNodeObject::alternativeText(Vector<AccessibilityText>& textOrd > } > // Images should use alt as long as the attribute is present, even if empty. > // Otherwise, it should fallback to other methods, like the title attribute. >- const AtomicString& alt = getAttribute(altAttr); >+ const AtomString& alt = getAttribute(altAttr); > if (!alt.isEmpty()) > textOrder.append(AccessibilityText(alt, AccessibilityTextSource::Alternative)); > } >@@ -1455,7 +1455,7 @@ void AccessibilityNodeObject::visibleText(Vector<AccessibilityText>& textOrder) > > void AccessibilityNodeObject::helpText(Vector<AccessibilityText>& textOrder) const > { >- const AtomicString& ariaHelp = getAttribute(aria_helpAttr); >+ const AtomString& ariaHelp = getAttribute(aria_helpAttr); > if (!ariaHelp.isEmpty()) > textOrder.append(AccessibilityText(ariaHelp, AccessibilityTextSource::Help)); > >@@ -1472,7 +1472,7 @@ void AccessibilityNodeObject::helpText(Vector<AccessibilityText>& textOrder) con > } > > // Summary attribute used as help text on tables. >- const AtomicString& summary = getAttribute(summaryAttr); >+ const AtomString& summary = getAttribute(summaryAttr); > if (!summary.isEmpty()) > textOrder.append(AccessibilityText(summary, AccessibilityTextSource::Summary)); > >@@ -1481,7 +1481,7 @@ void AccessibilityNodeObject::helpText(Vector<AccessibilityText>& textOrder) con > // descriptive text. This is problematic in the case of meters because the HTML spec suggests authors > // can expose units through this attribute. Therefore, if the element is a meter, change its source > // type to AccessibilityTextSource::Help. >- const AtomicString& title = getAttribute(titleAttr); >+ const AtomString& title = getAttribute(titleAttr); > if (!title.isEmpty()) { > if (!isMeter() && !roleIgnoresTitle()) > textOrder.append(AccessibilityText(title, AccessibilityTextSource::TitleTag)); >@@ -1539,14 +1539,14 @@ String AccessibilityNodeObject::alternativeTextForWebArea() const > > // Check if the HTML element has an aria-label for the webpage. > if (Element* documentElement = document->documentElement()) { >- const AtomicString& ariaLabel = documentElement->attributeWithoutSynchronization(aria_labelAttr); >+ const AtomString& ariaLabel = documentElement->attributeWithoutSynchronization(aria_labelAttr); > if (!ariaLabel.isEmpty()) > return ariaLabel; > } > > if (auto* owner = document->ownerElement()) { > if (owner->hasTagName(frameTag) || owner->hasTagName(iframeTag)) { >- const AtomicString& title = owner->attributeWithoutSynchronization(titleAttr); >+ const AtomString& title = owner->attributeWithoutSynchronization(titleAttr); > if (!title.isEmpty()) > return title; > } >@@ -1576,7 +1576,7 @@ String AccessibilityNodeObject::accessibilityDescription() const > if (usesAltTagForTextComputation()) { > // Images should use alt as long as the attribute is present, even if empty. > // Otherwise, it should fallback to other methods, like the title attribute. >- const AtomicString& alt = getAttribute(altAttr); >+ const AtomString& alt = getAttribute(altAttr); > if (!alt.isNull()) > return alt; > } >@@ -1619,7 +1619,7 @@ String AccessibilityNodeObject::helpText() const > if (!node) > return String(); > >- const AtomicString& ariaHelp = getAttribute(aria_helpAttr); >+ const AtomString& ariaHelp = getAttribute(aria_helpAttr); > if (!ariaHelp.isEmpty()) > return ariaHelp; > >@@ -1631,12 +1631,12 @@ String AccessibilityNodeObject::helpText() const > for (Node* ancestor = node; ancestor; ancestor = ancestor->parentNode()) { > if (is<HTMLElement>(*ancestor)) { > HTMLElement& element = downcast<HTMLElement>(*ancestor); >- const AtomicString& summary = element.getAttribute(summaryAttr); >+ const AtomString& summary = element.getAttribute(summaryAttr); > if (!summary.isEmpty()) > return summary; > > // The title attribute should be used as help text unless it is already being used as descriptive text. >- const AtomicString& title = element.getAttribute(titleAttr); >+ const AtomString& title = element.getAttribute(titleAttr); > if (!title.isEmpty() && description != title) > return title; > } >@@ -1662,7 +1662,7 @@ unsigned AccessibilityNodeObject::hierarchicalLevel() const > if (!is<Element>(node)) > return 0; > Element& element = downcast<Element>(*node); >- const AtomicString& ariaLevel = element.attributeWithoutSynchronization(aria_levelAttr); >+ const AtomString& ariaLevel = element.attributeWithoutSynchronization(aria_levelAttr); > if (!ariaLevel.isEmpty()) > return ariaLevel.toInt(); > >@@ -1930,7 +1930,7 @@ String AccessibilityNodeObject::stringValue() const > int selectedIndex = selectElement.selectedIndex(); > const Vector<HTMLElement*>& listItems = selectElement.listItems(); > if (selectedIndex >= 0 && static_cast<size_t>(selectedIndex) < listItems.size()) { >- const AtomicString& overriddenDescription = listItems[selectedIndex]->attributeWithoutSynchronization(aria_labelAttr); >+ const AtomString& overriddenDescription = listItems[selectedIndex]->attributeWithoutSynchronization(aria_labelAttr); > if (!overriddenDescription.isNull()) > return overriddenDescription; > } >@@ -1978,11 +1978,11 @@ static String accessibleNameForNode(Node* node, Node* labelledbyNode) > return String(); > > Element& element = downcast<Element>(*node); >- const AtomicString& ariaLabel = element.attributeWithoutSynchronization(aria_labelAttr); >+ const AtomString& ariaLabel = element.attributeWithoutSynchronization(aria_labelAttr); > if (!ariaLabel.isEmpty()) > return ariaLabel; > >- const AtomicString& alt = element.attributeWithoutSynchronization(altAttr); >+ const AtomString& alt = element.attributeWithoutSynchronization(altAttr); > if (!alt.isEmpty()) > return alt; > >@@ -2031,7 +2031,7 @@ static String accessibleNameForNode(Node* node, Node* labelledbyNode) > if (!text.isEmpty()) > return text; > >- const AtomicString& title = element.attributeWithoutSynchronization(titleAttr); >+ const AtomString& title = element.attributeWithoutSynchronization(titleAttr); > if (!title.isEmpty()) > return title; > >@@ -2191,7 +2191,7 @@ bool AccessibilityNodeObject::canSetValueAttribute() const > > AccessibilityRole AccessibilityNodeObject::determineAriaRoleAttribute() const > { >- const AtomicString& ariaRole = getAttribute(roleAttr); >+ const AtomString& ariaRole = getAttribute(roleAttr); > if (ariaRole.isNull() || ariaRole.isEmpty()) > return AccessibilityRole::Unknown; > >diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp >index 56cb15bbe8af159274a417449515d24c32e00f15..89603df71b995b9ed14947649992ddffc328f425 100644 >--- a/Source/WebCore/accessibility/AccessibilityObject.cpp >+++ b/Source/WebCore/accessibility/AccessibilityObject.cpp >@@ -1142,7 +1142,7 @@ Document* AccessibilityObject::topDocument() const > > String AccessibilityObject::language() const > { >- const AtomicString& lang = getAttribute(langAttr); >+ const AtomString& lang = getAttribute(langAttr); > if (!lang.isEmpty()) > return lang; > >@@ -1768,7 +1768,7 @@ bool AccessibilityObject::supportsAutoComplete() const > > String AccessibilityObject::autoCompleteValue() const > { >- const AtomicString& autoComplete = getAttribute(aria_autocompleteAttr); >+ const AtomString& autoComplete = getAttribute(aria_autocompleteAttr); > if (equalLettersIgnoringASCIICase(autoComplete, "inline") > || equalLettersIgnoringASCIICase(autoComplete, "list") > || equalLettersIgnoringASCIICase(autoComplete, "both")) >@@ -1782,7 +1782,7 @@ bool AccessibilityObject::contentEditableAttributeIsEnabled(Element* element) > if (!element) > return false; > >- const AtomicString& contentEditableValue = element->attributeWithoutSynchronization(contenteditableAttr); >+ const AtomString& contentEditableValue = element->attributeWithoutSynchronization(contenteditableAttr); > if (contentEditableValue.isNull()) > return false; > >@@ -2241,7 +2241,7 @@ bool AccessibilityObject::hasAttribute(const QualifiedName& attribute) const > return downcast<Element>(*node).hasAttributeWithoutSynchronization(attribute); > } > >-const AtomicString& AccessibilityObject::getAttribute(const QualifiedName& attribute) const >+const AtomString& AccessibilityObject::getAttribute(const QualifiedName& attribute) const > { > if (auto* element = this->element()) > return element->attributeWithoutSynchronization(attribute); >@@ -2576,12 +2576,12 @@ bool AccessibilityObject::supportsDatetimeAttribute() const > return hasTagName(insTag) || hasTagName(delTag) || hasTagName(timeTag); > } > >-const AtomicString& AccessibilityObject::datetimeAttributeValue() const >+const AtomString& AccessibilityObject::datetimeAttributeValue() const > { > return getAttribute(datetimeAttr); > } > >-const AtomicString& AccessibilityObject::linkRelValue() const >+const AtomString& AccessibilityObject::linkRelValue() const > { > return getAttribute(relAttr); > } >@@ -2633,11 +2633,11 @@ bool AccessibilityObject::isValueAutofilled() const > > const String AccessibilityObject::placeholderValue() const > { >- const AtomicString& placeholder = getAttribute(placeholderAttr); >+ const AtomString& placeholder = getAttribute(placeholderAttr); > if (!placeholder.isEmpty()) > return placeholder; > >- const AtomicString& ariaPlaceholder = getAttribute(aria_placeholderAttr); >+ const AtomString& ariaPlaceholder = getAttribute(aria_placeholderAttr); > if (!ariaPlaceholder.isEmpty()) > return ariaPlaceholder; > >@@ -2679,14 +2679,14 @@ bool AccessibilityObject::supportsARIAAttributes() const > || hasAttribute(aria_relevantAttr); > } > >-bool AccessibilityObject::liveRegionStatusIsEnabled(const AtomicString& liveRegionStatus) >+bool AccessibilityObject::liveRegionStatusIsEnabled(const AtomString& liveRegionStatus) > { > return equalLettersIgnoringASCIICase(liveRegionStatus, "polite") || equalLettersIgnoringASCIICase(liveRegionStatus, "assertive"); > } > > bool AccessibilityObject::supportsLiveRegion(bool excludeIfOff) const > { >- const AtomicString& liveRegionStatusValue = liveRegionStatus(); >+ const AtomString& liveRegionStatusValue = liveRegionStatus(); > return excludeIfOff ? liveRegionStatusIsEnabled(liveRegionStatusValue) : !liveRegionStatusValue.isEmpty(); > } > >@@ -2729,7 +2729,7 @@ AccessibilitySortDirection AccessibilityObject::sortDirection() const > if (role != AccessibilityRole::RowHeader && role != AccessibilityRole::ColumnHeader) > return AccessibilitySortDirection::Invalid; > >- const AtomicString& sortAttribute = getAttribute(aria_sortAttr); >+ const AtomString& sortAttribute = getAttribute(aria_sortAttr); > if (equalLettersIgnoringASCIICase(sortAttribute, "ascending")) > return AccessibilitySortDirection::Ascending; > if (equalLettersIgnoringASCIICase(sortAttribute, "descending")) >@@ -2757,7 +2757,7 @@ bool AccessibilityObject::supportsHasPopup() const > > String AccessibilityObject::hasPopupValue() const > { >- const AtomicString& hasPopup = getAttribute(aria_haspopupAttr); >+ const AtomString& hasPopup = getAttribute(aria_haspopupAttr); > if (equalLettersIgnoringASCIICase(hasPopup, "true") > || equalLettersIgnoringASCIICase(hasPopup, "dialog") > || equalLettersIgnoringASCIICase(hasPopup, "grid") >@@ -2796,7 +2796,7 @@ int AccessibilityObject::posInSet() const > return getAttribute(aria_posinsetAttr).toInt(); > } > >-const AtomicString& AccessibilityObject::identifierAttribute() const >+const AtomString& AccessibilityObject::identifierAttribute() const > { > return getAttribute(idAttr); > } >@@ -2816,14 +2816,14 @@ void AccessibilityObject::classList(Vector<String>& classList) const > > bool AccessibilityObject::supportsPressed() const > { >- const AtomicString& expanded = getAttribute(aria_pressedAttr); >+ const AtomString& expanded = getAttribute(aria_pressedAttr); > return equalLettersIgnoringASCIICase(expanded, "true") || equalLettersIgnoringASCIICase(expanded, "false"); > } > > bool AccessibilityObject::supportsExpanded() const > { > // Undefined values should not result in this attribute being exposed to ATs according to ARIA. >- const AtomicString& expanded = getAttribute(aria_expandedAttr); >+ const AtomString& expanded = getAttribute(aria_expandedAttr); > if (equalLettersIgnoringASCIICase(expanded, "true") || equalLettersIgnoringASCIICase(expanded, "false")) > return true; > switch (roleValue()) { >@@ -2876,7 +2876,7 @@ AccessibilityButtonState AccessibilityObject::checkboxOrRadioValue() const > // If it's a toggle button, the aria-pressed attribute is consulted. > > if (isToggleButton()) { >- const AtomicString& ariaPressed = getAttribute(aria_pressedAttr); >+ const AtomString& ariaPressed = getAttribute(aria_pressedAttr); > if (equalLettersIgnoringASCIICase(ariaPressed, "true")) > return AccessibilityButtonState::On; > if (equalLettersIgnoringASCIICase(ariaPressed, "mixed")) >@@ -2884,7 +2884,7 @@ AccessibilityButtonState AccessibilityObject::checkboxOrRadioValue() const > return AccessibilityButtonState::Off; > } > >- const AtomicString& result = getAttribute(aria_checkedAttr); >+ const AtomString& result = getAttribute(aria_checkedAttr); > if (equalLettersIgnoringASCIICase(result, "true")) > return AccessibilityButtonState::On; > if (equalLettersIgnoringASCIICase(result, "mixed")) { >@@ -3396,7 +3396,7 @@ void AccessibilityObject::elementsFromAttribute(Vector<Element*>& elements, cons > > TreeScope& treeScope = node->treeScope(); > >- const AtomicString& idList = getAttribute(attribute); >+ const AtomString& idList = getAttribute(attribute); > if (idList.isEmpty()) > return; > >@@ -3552,7 +3552,7 @@ void AccessibilityObject::ariaElementsReferencedByAttribute(AccessibilityChildre > return; > > for (auto& element : descendantsOfType<Element>(node()->treeScope().rootNode())) { >- const AtomicString& idList = element.attributeWithoutSynchronization(attribute); >+ const AtomString& idList = element.attributeWithoutSynchronization(attribute); > if (!SpaceSplitString(idList, false).contains(id)) > continue; > >diff --git a/Source/WebCore/accessibility/AccessibilityObject.h b/Source/WebCore/accessibility/AccessibilityObject.h >index c2a1bb4ecca73249a8e2f184b641ac018acdf03c..b59b7d5b635967fd0fa192a59660a4eb342eb718 100644 >--- a/Source/WebCore/accessibility/AccessibilityObject.h >+++ b/Source/WebCore/accessibility/AccessibilityObject.h >@@ -496,7 +496,7 @@ public: > bool hasHighlighting() const; > > bool supportsDatetimeAttribute() const; >- const AtomicString& datetimeAttributeValue() const; >+ const AtomString& datetimeAttributeValue() const; > > virtual bool canSetFocusAttribute() const { return false; } > virtual bool canSetTextRangeAttributes() const { return false; } >@@ -563,8 +563,8 @@ public: > AccessibilitySortDirection sortDirection() const; > virtual bool canvasHasFallbackContent() const { return false; } > bool supportsRangeValue() const; >- const AtomicString& identifierAttribute() const; >- const AtomicString& linkRelValue() const; >+ const AtomString& identifierAttribute() const; >+ const AtomString& linkRelValue() const; > void classList(Vector<String>&) const; > virtual String roleDescription() const; > AccessibilityCurrentState currentState() const; >@@ -640,7 +640,7 @@ public: > String computedLabel(); > > // A programmatic way to set a name on an AccessibleObject. >- virtual void setAccessibleName(const AtomicString&) { } >+ virtual void setAccessibleName(const AtomString&) { } > virtual bool hasAttributesRequiredForInclusion() const; > > // Accessibility Text - (To be deprecated). >@@ -695,7 +695,7 @@ public: > virtual URL url() const { return URL(); } > virtual VisibleSelection selection() const { return VisibleSelection(); } > virtual String selectedText() const { return String(); } >- virtual const AtomicString& accessKey() const { return nullAtom(); } >+ virtual const AtomString& accessKey() const { return nullAtom(); } > const String& actionVerb() const; > virtual Widget* widget() const { return nullptr; } > virtual Widget* widgetForAttachmentView() const { return nullptr; } >@@ -766,7 +766,7 @@ public: > > WEBCORE_EXPORT static AccessibilityRole ariaRoleToWebCoreRole(const String&); > bool hasAttribute(const QualifiedName&) const; >- const AtomicString& getAttribute(const QualifiedName&) const; >+ const AtomString& getAttribute(const QualifiedName&) const; > bool hasTagName(const QualifiedName&) const; > > virtual VisiblePositionRange visiblePositionRange() const { return VisiblePositionRange(); } >@@ -859,7 +859,7 @@ public: > virtual bool liveRegionAtomic() const { return false; } > virtual bool isBusy() const { return false; } > static const String defaultLiveRegionStatusForRole(AccessibilityRole); >- static bool liveRegionStatusIsEnabled(const AtomicString&); >+ static bool liveRegionStatusIsEnabled(const AtomString&); > static bool contentEditableAttributeIsEnabled(Element*); > bool hasContentEditableAttributeSet() const; > >diff --git a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp b/Source/WebCore/accessibility/AccessibilityRenderObject.cpp >index 565500997d4d1433a5383dd12725a82f8a6083b8..edbdb81ee412eaf7a3a2e41ea30dfbf8969ee9a4 100644 >--- a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp >+++ b/Source/WebCore/accessibility/AccessibilityRenderObject.cpp >@@ -579,7 +579,7 @@ String AccessibilityRenderObject::helpText() const > if (!m_renderer) > return String(); > >- const AtomicString& ariaHelp = getAttribute(aria_helpAttr); >+ const AtomString& ariaHelp = getAttribute(aria_helpAttr); > if (!ariaHelp.isEmpty()) > return ariaHelp; > >@@ -591,12 +591,12 @@ String AccessibilityRenderObject::helpText() const > for (RenderObject* ancestor = renderer(); ancestor; ancestor = ancestor->parent()) { > if (is<HTMLElement>(ancestor->node())) { > HTMLElement& element = downcast<HTMLElement>(*ancestor->node()); >- const AtomicString& summary = element.getAttribute(summaryAttr); >+ const AtomString& summary = element.getAttribute(summaryAttr); > if (!summary.isEmpty()) > return summary; > > // The title attribute should be used as help text unless it is already being used as descriptive text. >- const AtomicString& title = element.getAttribute(titleAttr); >+ const AtomString& title = element.getAttribute(titleAttr); > if (!title.isEmpty() && description != title) > return title; > } >@@ -749,7 +749,7 @@ String AccessibilityRenderObject::stringValue() const > int selectedIndex = selectElement.selectedIndex(); > const Vector<HTMLElement*>& listItems = selectElement.listItems(); > if (selectedIndex >= 0 && static_cast<size_t>(selectedIndex) < listItems.size()) { >- const AtomicString& overriddenDescription = listItems[selectedIndex]->attributeWithoutSynchronization(aria_labelAttr); >+ const AtomString& overriddenDescription = listItems[selectedIndex]->attributeWithoutSynchronization(aria_labelAttr); > if (!overriddenDescription.isNull()) > return overriddenDescription; > } >@@ -1037,13 +1037,13 @@ bool AccessibilityRenderObject::hasPopup() const > > bool AccessibilityRenderObject::supportsARIADropping() const > { >- const AtomicString& dropEffect = getAttribute(aria_dropeffectAttr); >+ const AtomString& dropEffect = getAttribute(aria_dropeffectAttr); > return !dropEffect.isEmpty(); > } > > bool AccessibilityRenderObject::supportsARIADragging() const > { >- const AtomicString& grabbed = getAttribute(aria_grabbedAttr); >+ const AtomString& grabbed = getAttribute(aria_grabbedAttr); > return equalLettersIgnoringASCIICase(grabbed, "true") || equalLettersIgnoringASCIICase(grabbed, "false"); > } > >@@ -1054,7 +1054,7 @@ bool AccessibilityRenderObject::isARIAGrabbed() > > Vector<String> AccessibilityRenderObject::determineARIADropEffects() > { >- const AtomicString& dropEffects = getAttribute(aria_dropeffectAttr); >+ const AtomString& dropEffects = getAttribute(aria_dropeffectAttr); > if (dropEffects.isEmpty()) { > return { }; > } >@@ -1566,7 +1566,7 @@ String AccessibilityRenderObject::selectedText() const > return doAXStringForRange(documentBasedSelectedTextRange()); > } > >-const AtomicString& AccessibilityRenderObject::accessKey() const >+const AtomString& AccessibilityRenderObject::accessKey() const > { > Node* node = m_renderer->node(); > if (!is<Element>(node)) >@@ -1848,7 +1848,7 @@ bool AccessibilityRenderObject::supportsARIAOwns() const > { > if (!m_renderer) > return false; >- const AtomicString& ariaOwns = getAttribute(aria_ownsAttr); >+ const AtomString& ariaOwns = getAttribute(aria_ownsAttr); > > return !ariaOwns.isEmpty(); > } >@@ -2511,7 +2511,7 @@ AccessibilityObject* AccessibilityRenderObject::activeDescendant() const > if (!m_renderer) > return nullptr; > >- const AtomicString& activeDescendantAttrStr = getAttribute(aria_activedescendantAttr); >+ const AtomString& activeDescendantAttrStr = getAttribute(aria_activedescendantAttr); > if (activeDescendantAttrStr.isNull() || activeDescendantAttrStr.isEmpty()) > return nullptr; > Element* element = this->element(); >@@ -2961,7 +2961,7 @@ AccessibilityRole AccessibilityRenderObject::determineAccessibilityRole() > > AccessibilityOrientation AccessibilityRenderObject::orientation() const > { >- const AtomicString& ariaOrientation = getAttribute(aria_orientationAttr); >+ const AtomString& ariaOrientation = getAttribute(aria_orientationAttr); > if (equalLettersIgnoringASCIICase(ariaOrientation, "horizontal")) > return AccessibilityOrientation::Horizontal; > if (equalLettersIgnoringASCIICase(ariaOrientation, "vertical")) >@@ -3062,7 +3062,7 @@ bool AccessibilityRenderObject::canSetExpandedAttribute() const > return true; > > // An object can be expanded if it aria-expanded is true or false. >- const AtomicString& expanded = getAttribute(aria_expandedAttr); >+ const AtomString& expanded = getAttribute(aria_expandedAttr); > if (equalLettersIgnoringASCIICase(expanded, "true") || equalLettersIgnoringASCIICase(expanded, "false")) > return true; > return false; >@@ -3380,7 +3380,7 @@ bool AccessibilityRenderObject::canHaveChildren() const > > const String AccessibilityRenderObject::liveRegionStatus() const > { >- const AtomicString& liveRegionStatus = getAttribute(aria_liveAttr); >+ const AtomString& liveRegionStatus = getAttribute(aria_liveAttr); > // These roles have implicit live region status. > if (liveRegionStatus.isEmpty()) > return defaultLiveRegionStatusForRole(roleValue()); >@@ -3390,8 +3390,8 @@ const String AccessibilityRenderObject::liveRegionStatus() const > > const String AccessibilityRenderObject::liveRegionRelevant() const > { >- static NeverDestroyed<const AtomicString> defaultLiveRegionRelevant("additions text", AtomicString::ConstructFromLiteral); >- const AtomicString& relevant = getAttribute(aria_relevantAttr); >+ static NeverDestroyed<const AtomString> defaultLiveRegionRelevant("additions text", AtomString::ConstructFromLiteral); >+ const AtomString& relevant = getAttribute(aria_relevantAttr); > > // Default aria-relevant = "additions text". > if (relevant.isEmpty()) >@@ -3402,7 +3402,7 @@ const String AccessibilityRenderObject::liveRegionRelevant() const > > bool AccessibilityRenderObject::liveRegionAtomic() const > { >- const AtomicString& atomic = getAttribute(aria_atomicAttr); >+ const AtomString& atomic = getAttribute(aria_atomicAttr); > if (equalLettersIgnoringASCIICase(atomic, "true")) > return true; > if (equalLettersIgnoringASCIICase(atomic, "false")) >@@ -3600,7 +3600,7 @@ const String& AccessibilityRenderObject::actionVerb() const > #endif > } > >-void AccessibilityRenderObject::setAccessibleName(const AtomicString& name) >+void AccessibilityRenderObject::setAccessibleName(const AtomString& name) > { > // Setting the accessible name can store the value in the DOM > if (!m_renderer) >diff --git a/Source/WebCore/accessibility/AccessibilityRenderObject.h b/Source/WebCore/accessibility/AccessibilityRenderObject.h >index b12039abea50a8447a9e91acc68966572e754742..0b19da52abe6c1f15872980b274e5dd4aae02bfc 100644 >--- a/Source/WebCore/accessibility/AccessibilityRenderObject.h >+++ b/Source/WebCore/accessibility/AccessibilityRenderObject.h >@@ -80,7 +80,7 @@ public: > bool canSetTextRangeAttributes() const override; > bool canSetExpandedAttribute() const override; > >- void setAccessibleName(const AtomicString&) override; >+ void setAccessibleName(const AtomString&) override; > > // Provides common logic used by all elements when determining isIgnored. > AccessibilityObjectInclusion defaultObjectInclusion() const override; >@@ -134,7 +134,7 @@ public: > String text() const override; > int textLength() const override; > String selectedText() const override; >- const AtomicString& accessKey() const override; >+ const AtomString& accessKey() const override; > virtual const String& actionVerb() const; > Widget* widget() const override; > Widget* widgetForAttachmentView() const override; >diff --git a/Source/WebCore/accessibility/AccessibilitySVGElement.cpp b/Source/WebCore/accessibility/AccessibilitySVGElement.cpp >index 9eb4e92fa56babd5d30e583370a68d977322d704..b06688635e6ef0ed79cbd4c59f23b308c982ae28 100644 >--- a/Source/WebCore/accessibility/AccessibilitySVGElement.cpp >+++ b/Source/WebCore/accessibility/AccessibilitySVGElement.cpp >@@ -157,7 +157,7 @@ String AccessibilitySVGElement::accessibilityDescription() const > // listed as a supported attribute of the 'image' element in the SVG spec: > // https://www.w3.org/TR/SVG/struct.html#ImageElement > if (m_renderer->isSVGImage()) { >- const AtomicString& alt = getAttribute(HTMLNames::altAttr); >+ const AtomString& alt = getAttribute(HTMLNames::altAttr); > if (!alt.isNull()) > return alt; > } >diff --git a/Source/WebCore/accessibility/AccessibilitySlider.cpp b/Source/WebCore/accessibility/AccessibilitySlider.cpp >index 12229dc06625a8143882acf50a2110b97dba7e23..b3ff0a975108f1383a9682fe02c16c69095f67d3 100644 >--- a/Source/WebCore/accessibility/AccessibilitySlider.cpp >+++ b/Source/WebCore/accessibility/AccessibilitySlider.cpp >@@ -95,7 +95,7 @@ void AccessibilitySlider::addChildren() > m_children.append(&thumb); > } > >-const AtomicString& AccessibilitySlider::getAttribute(const QualifiedName& attribute) const >+const AtomString& AccessibilitySlider::getAttribute(const QualifiedName& attribute) const > { > return inputElement()->getAttribute(attribute); > } >diff --git a/Source/WebCore/accessibility/AccessibilitySlider.h b/Source/WebCore/accessibility/AccessibilitySlider.h >index f1c78c1eac1ee03cdc951f929187f2fcc20f68da..469d21701bec53af19d97bf45e0eee1bdc226c45 100644 >--- a/Source/WebCore/accessibility/AccessibilitySlider.h >+++ b/Source/WebCore/accessibility/AccessibilitySlider.h >@@ -55,7 +55,7 @@ private: > void addChildren() override; > > bool canSetValueAttribute() const override { return true; } >- const AtomicString& getAttribute(const QualifiedName& attribute) const; >+ const AtomString& getAttribute(const QualifiedName& attribute) const; > > void setValue(const String&) override; > float valueForRange() const override; >diff --git a/Source/WebCore/accessibility/AccessibilityTable.cpp b/Source/WebCore/accessibility/AccessibilityTable.cpp >index 9df9d276b46573c2df450746d46abafabda1b375..f5bf5b2f60ff857c8a6de925a0bd30f7cd86fe01 100644 >--- a/Source/WebCore/accessibility/AccessibilityTable.cpp >+++ b/Source/WebCore/accessibility/AccessibilityTable.cpp >@@ -700,7 +700,7 @@ String AccessibilityTable::title() const > > int AccessibilityTable::axColumnCount() const > { >- const AtomicString& colCountValue = getAttribute(aria_colcountAttr); >+ const AtomString& colCountValue = getAttribute(aria_colcountAttr); > int colCountInt = colCountValue.toInt(); > // The ARIA spec states, "Authors must set the value of aria-colcount to an integer equal to the > // number of columns in the full table. If the total number of columns is unknown, authors must >@@ -714,7 +714,7 @@ int AccessibilityTable::axColumnCount() const > > int AccessibilityTable::axRowCount() const > { >- const AtomicString& rowCountValue = getAttribute(aria_rowcountAttr); >+ const AtomString& rowCountValue = getAttribute(aria_rowcountAttr); > int rowCountInt = rowCountValue.toInt(); > // The ARIA spec states, "Authors must set the value of aria-rowcount to an integer equal to the > // number of rows in the full table. If the total number of rows is unknown, authors must set >diff --git a/Source/WebCore/accessibility/AccessibilityTableCell.cpp b/Source/WebCore/accessibility/AccessibilityTableCell.cpp >index f29e3bf026e355ffff3dd751d6ded56ac7bccfc8..9bbad11296e5e1c70593725b629846fa956b4400 100644 >--- a/Source/WebCore/accessibility/AccessibilityTableCell.cpp >+++ b/Source/WebCore/accessibility/AccessibilityTableCell.cpp >@@ -148,7 +148,7 @@ bool AccessibilityTableCell::isTableHeaderCell() const > > bool AccessibilityTableCell::isColumnHeaderCell() const > { >- const AtomicString& scope = getAttribute(scopeAttr); >+ const AtomString& scope = getAttribute(scopeAttr); > if (scope == "col" || scope == "colgroup") > return true; > if (scope == "row" || scope == "rowgroup") >@@ -177,7 +177,7 @@ bool AccessibilityTableCell::isColumnHeaderCell() const > > bool AccessibilityTableCell::isRowHeaderCell() const > { >- const AtomicString& scope = getAttribute(scopeAttr); >+ const AtomString& scope = getAttribute(scopeAttr); > if (scope == "row" || scope == "rowgroup") > return true; > if (scope == "col" || scope == "colgroup") >@@ -269,7 +269,7 @@ void AccessibilityTableCell::columnHeaders(AccessibilityChildrenVector& headers) > std::pair<unsigned, unsigned> childRowRange; > tableCell->rowIndexRange(childRowRange); > >- const AtomicString& scope = tableCell->getAttribute(scopeAttr); >+ const AtomString& scope = tableCell->getAttribute(scopeAttr); > if (scope == "colgroup" && isTableCellInSameColGroup(tableCell)) > headers.append(tableCell); > else if (tableCell->isColumnHeaderCell()) >@@ -294,7 +294,7 @@ void AccessibilityTableCell::rowHeaders(AccessibilityChildrenVector& headers) > if (!tableCell || tableCell == this || headers.contains(tableCell)) > continue; > >- const AtomicString& scope = tableCell->getAttribute(scopeAttr); >+ const AtomString& scope = tableCell->getAttribute(scopeAttr); > if (scope == "rowgroup" && isTableCellInSameRowGroup(tableCell)) > headers.append(tableCell); > else if (tableCell->isRowHeaderCell()) >@@ -385,7 +385,7 @@ AccessibilityObject* AccessibilityTableCell::titleUIElement() const > > int AccessibilityTableCell::axColumnIndex() const > { >- const AtomicString& colIndexValue = getAttribute(aria_colindexAttr); >+ const AtomString& colIndexValue = getAttribute(aria_colindexAttr); > if (colIndexValue.toInt() >= 1) > return colIndexValue.toInt(); > >@@ -403,7 +403,7 @@ int AccessibilityTableCell::axRowIndex() const > { > // ARIA 1.1: Authors should place aria-rowindex on each row. Authors may also place > // aria-rowindex on all of the children or owned elements of each row. >- const AtomicString& rowIndexValue = getAttribute(aria_rowindexAttr); >+ const AtomString& rowIndexValue = getAttribute(aria_rowindexAttr); > if (rowIndexValue.toInt() >= 1) > return rowIndexValue.toInt(); > >@@ -420,7 +420,7 @@ int AccessibilityTableCell::axColumnSpan() const > if (hasAttribute(colspanAttr)) > return -1; > >- const AtomicString& colSpanValue = getAttribute(aria_colspanAttr); >+ const AtomString& colSpanValue = getAttribute(aria_colspanAttr); > // ARIA 1.1: Authors must set the value of aria-colspan to an integer greater than or equal to 1. > if (colSpanValue.toInt() >= 1) > return colSpanValue.toInt(); >@@ -435,7 +435,7 @@ int AccessibilityTableCell::axRowSpan() const > if (hasAttribute(rowspanAttr)) > return -1; > >- const AtomicString& rowSpanValue = getAttribute(aria_rowspanAttr); >+ const AtomString& rowSpanValue = getAttribute(aria_rowspanAttr); > > // ARIA 1.1: Authors must set the value of aria-rowspan to an integer greater than or equal to 0. > // Setting the value to 0 indicates that the cell or gridcell is to span all the remaining rows in the row group. >diff --git a/Source/WebCore/accessibility/AccessibilityTableRow.cpp b/Source/WebCore/accessibility/AccessibilityTableRow.cpp >index 335a89fb816df56e260f7ecf79be9a2d96aef3a7..bb9d9e04c4df486adb756c33adef1da05599327f 100644 >--- a/Source/WebCore/accessibility/AccessibilityTableRow.cpp >+++ b/Source/WebCore/accessibility/AccessibilityTableRow.cpp >@@ -169,7 +169,7 @@ void AccessibilityTableRow::addChildren() > > int AccessibilityTableRow::axColumnIndex() const > { >- const AtomicString& colIndexValue = getAttribute(aria_colindexAttr); >+ const AtomString& colIndexValue = getAttribute(aria_colindexAttr); > if (colIndexValue.toInt() >= 1) > return colIndexValue.toInt(); > >@@ -178,7 +178,7 @@ int AccessibilityTableRow::axColumnIndex() const > > int AccessibilityTableRow::axRowIndex() const > { >- const AtomicString& rowIndexValue = getAttribute(aria_rowindexAttr); >+ const AtomString& rowIndexValue = getAttribute(aria_rowindexAttr); > if (rowIndexValue.toInt() >= 1) > return rowIndexValue.toInt(); > >diff --git a/Source/WebCore/accessibility/AccessibleSetValueEvent.cpp b/Source/WebCore/accessibility/AccessibleSetValueEvent.cpp >index 0f81afb25e6da07924f0540d8fcd748d88ee2fb5..dfde5fc0d10f88bd4298dfd3455458030c1d3239 100644 >--- a/Source/WebCore/accessibility/AccessibleSetValueEvent.cpp >+++ b/Source/WebCore/accessibility/AccessibleSetValueEvent.cpp >@@ -28,7 +28,7 @@ > > namespace WebCore { > >-AccessibleSetValueEvent::AccessibleSetValueEvent(const AtomicString& type, const AtomicString& value) >+AccessibleSetValueEvent::AccessibleSetValueEvent(const AtomString& type, const AtomString& value) > : Event(type, CanBubble::Yes, IsCancelable::Yes) > , m_value(value) > { >diff --git a/Source/WebCore/accessibility/AccessibleSetValueEvent.h b/Source/WebCore/accessibility/AccessibleSetValueEvent.h >index 02233c1bdebe9caf8fb3dfeff44b9ff52986388e..57e8045dece036a9f8451e05b0cfec0f195fcf74 100644 >--- a/Source/WebCore/accessibility/AccessibleSetValueEvent.h >+++ b/Source/WebCore/accessibility/AccessibleSetValueEvent.h >@@ -31,23 +31,23 @@ namespace WebCore { > > class AccessibleSetValueEvent : public Event { > public: >- static Ref<AccessibleSetValueEvent> create(const AtomicString& type, const AtomicString& value) >+ static Ref<AccessibleSetValueEvent> create(const AtomString& type, const AtomString& value) > { > return adoptRef(*new AccessibleSetValueEvent(type, value)); > } > > virtual ~AccessibleSetValueEvent(); > >- const AtomicString& value() const { return m_value; } >+ const AtomString& value() const { return m_value; } > > protected: >- AccessibleSetValueEvent(const AtomicString& type, const AtomicString& value); >+ AccessibleSetValueEvent(const AtomString& type, const AtomString& value); > > // Event. > EventInterface eventInterface() const override { return AccessibleSetValueEventInterfaceType; } > > private: >- const AtomicString m_value; >+ const AtomString m_value; > }; > > } >diff --git a/Source/WebCore/accessibility/atk/WebKitAccessible.cpp b/Source/WebCore/accessibility/atk/WebKitAccessible.cpp >index 63b0382892a492f3f2f87e740d503b20d29462c5..9c77a04a4ce9a0440daaa0036786c0d19503d0a2 100644 >--- a/Source/WebCore/accessibility/atk/WebKitAccessible.cpp >+++ b/Source/WebCore/accessibility/atk/WebKitAccessible.cpp >@@ -532,14 +532,14 @@ static AtkAttributeSet* webkitAccessibleGetAttributes(AtkObject* object) > if (auto liveContainer = coreObject->liveRegionAncestor(false)) { > String liveStatus = liveContainer->liveRegionStatus(); > String relevant = liveContainer->liveRegionRelevant(); >- bool isAtomic = liveContainer->liveRegionAtomic(); >+ bool isAtom = liveContainer->liveRegionAtomic(); > String liveRole = roleString.isEmpty() ? computedRoleString : roleString; > > // According to the Core AAM, we need to expose the above properties with "container-" prefixed > // object attributes regardless of whether the container is this object, or an ancestor of it. > attributeSet = addToAtkAttributeSet(attributeSet, "container-live", liveStatus.utf8().data()); > attributeSet = addToAtkAttributeSet(attributeSet, "container-relevant", relevant.utf8().data()); >- if (isAtomic) >+ if (isAtom) > attributeSet = addToAtkAttributeSet(attributeSet, "container-atomic", "true"); > if (!liveRole.isEmpty()) > attributeSet = addToAtkAttributeSet(attributeSet, "container-live-role", liveRole.utf8().data()); >@@ -549,9 +549,9 @@ static AtkAttributeSet* webkitAccessibleGetAttributes(AtkObject* object) > if (liveContainer == coreObject) { > attributeSet = addToAtkAttributeSet(attributeSet, "live", liveStatus.utf8().data()); > attributeSet = addToAtkAttributeSet(attributeSet, "relevant", relevant.utf8().data()); >- if (isAtomic) >+ if (isAtom) > attributeSet = addToAtkAttributeSet(attributeSet, "atomic", "true"); >- } else if (!isAtomic && coreObject->liveRegionAtomic()) >+ } else if (!isAtom && coreObject->liveRegionAtomic()) > attributeSet = addToAtkAttributeSet(attributeSet, "atomic", "true"); > } > >@@ -566,7 +566,7 @@ static AtkAttributeSet* webkitAccessibleGetAttributes(AtkObject* object) > attributeSet = addToAtkAttributeSet(attributeSet, "grabbed", "false"); > > // The Core AAM states the author-provided value should be exposed as-is. >- const AtomicString& keyShortcuts = coreObject->keyShortcutsValue(); >+ const AtomString& keyShortcuts = coreObject->keyShortcutsValue(); > if (!keyShortcuts.isEmpty()) > attributeSet = addToAtkAttributeSet(attributeSet, "keyshortcuts", keyShortcuts.string().utf8().data()); > >diff --git a/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp b/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp >index a2f5936b716efcb70b392490c8f56d27936d27b9..3f89ce646532bb2fc570d41102d285607897e5f3 100644 >--- a/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp >+++ b/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp >@@ -43,7 +43,7 @@ > #include "TextIterator.h" > #include "VisibleSelection.h" > >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/CString.h> > > using namespace WebCore; >diff --git a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm >index 0e0dcc45d597872c36c4cdca2918674cb5ba846d..f43203834bf60b8711ee2d0a1dac202bdf3b470e 100644 >--- a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm >+++ b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm >@@ -2433,7 +2433,7 @@ - (NSString*)roleDescription > return [[self attachmentView] accessibilityAttributeValue:NSAccessibilityRoleDescriptionAttribute]; > ALLOW_DEPRECATED_DECLARATIONS_END > >- const AtomicString& overrideRoleDescription = m_object->roleDescription(); >+ const AtomString& overrideRoleDescription = m_object->roleDescription(); > if (!overrideRoleDescription.isNull() && !overrideRoleDescription.isEmpty()) > return overrideRoleDescription; > >@@ -2912,7 +2912,7 @@ IGNORE_WARNINGS_END > } > > if ([attributeName isEqualToString:NSAccessibilityAccessKeyAttribute]) { >- AtomicString accessKey = m_object->accessKey(); >+ AtomString accessKey = m_object->accessKey(); > if (accessKey.isNull()) > return nil; > return accessKey; >diff --git a/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp b/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp >index a8e72f9981673046a1a659a0f99109a8853e88c5..09aa64e23ba4f9bf24b5cc1f79de6cbf390be399 100644 >--- a/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp >+++ b/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp >@@ -37,7 +37,7 @@ > > namespace WebCore { > >-void AccessibilityObjectWrapper::accessibilityAttributeValue(const AtomicString& attributeName, VARIANT* result) >+void AccessibilityObjectWrapper::accessibilityAttributeValue(const AtomString& attributeName, VARIANT* result) > { > // FIXME: This should be fleshed out to match the Mac version > >diff --git a/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.h b/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.h >index a65ad295e266b64fc9378b213d2e4d441942054d..c86c34a97efed10ab0e770d4dc77aa3f20d10f12 100644 >--- a/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.h >+++ b/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.h >@@ -26,7 +26,7 @@ > #pragma once > > #include <unknwn.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -43,7 +43,7 @@ namespace WebCore { > bool attached() const { return m_object; } > AccessibilityObject* accessibilityObject() const { return m_object; } > >- void accessibilityAttributeValue(const AtomicString&, VARIANT*); >+ void accessibilityAttributeValue(const AtomString&, VARIANT*); > > protected: > AccessibilityObjectWrapper(AccessibilityObject* obj) : m_object(obj) { } >diff --git a/Source/WebCore/animation/AnimationPlaybackEvent.cpp b/Source/WebCore/animation/AnimationPlaybackEvent.cpp >index 3ad1aedb20257b886196ad9a546a015f061f9ce3..adfb503be5edbcec72aa55d9e0eae73ccfa6154a 100644 >--- a/Source/WebCore/animation/AnimationPlaybackEvent.cpp >+++ b/Source/WebCore/animation/AnimationPlaybackEvent.cpp >@@ -30,7 +30,7 @@ > > namespace WebCore { > >-AnimationPlaybackEvent::AnimationPlaybackEvent(const AtomicString& type, const AnimationPlaybackEventInit& initializer, IsTrusted isTrusted) >+AnimationPlaybackEvent::AnimationPlaybackEvent(const AtomString& type, const AnimationPlaybackEventInit& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > { > if (initializer.currentTime) >@@ -44,7 +44,7 @@ AnimationPlaybackEvent::AnimationPlaybackEvent(const AtomicString& type, const A > m_timelineTime = WTF::nullopt; > } > >-AnimationPlaybackEvent::AnimationPlaybackEvent(const AtomicString& type, Optional<Seconds> currentTime, Optional<Seconds> timelineTime) >+AnimationPlaybackEvent::AnimationPlaybackEvent(const AtomString& type, Optional<Seconds> currentTime, Optional<Seconds> timelineTime) > : Event(type, CanBubble::Yes, IsCancelable::No) > , m_currentTime(currentTime) > , m_timelineTime(timelineTime) >diff --git a/Source/WebCore/animation/AnimationPlaybackEvent.h b/Source/WebCore/animation/AnimationPlaybackEvent.h >index ea88d14ed91fdfa62999c1e4c8cb53d7a3afd5c2..7d1cc3a8721b759b3ed253962a76a031a6941520 100644 >--- a/Source/WebCore/animation/AnimationPlaybackEvent.h >+++ b/Source/WebCore/animation/AnimationPlaybackEvent.h >@@ -33,12 +33,12 @@ namespace WebCore { > > class AnimationPlaybackEvent final : public Event { > public: >- static Ref<AnimationPlaybackEvent> create(const AtomicString& type, Optional<Seconds> currentTime, Optional<Seconds> timelineTime) >+ static Ref<AnimationPlaybackEvent> create(const AtomString& type, Optional<Seconds> currentTime, Optional<Seconds> timelineTime) > { > return adoptRef(*new AnimationPlaybackEvent(type, currentTime, timelineTime)); > } > >- static Ref<AnimationPlaybackEvent> create(const AtomicString& type, const AnimationPlaybackEventInit& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<AnimationPlaybackEvent> create(const AtomString& type, const AnimationPlaybackEventInit& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new AnimationPlaybackEvent(type, initializer, isTrusted)); > } >@@ -53,8 +53,8 @@ public: > EventInterface eventInterface() const override { return AnimationPlaybackEventInterfaceType; } > > private: >- AnimationPlaybackEvent(const AtomicString&, Optional<Seconds>, Optional<Seconds>); >- AnimationPlaybackEvent(const AtomicString&, const AnimationPlaybackEventInit&, IsTrusted); >+ AnimationPlaybackEvent(const AtomString&, Optional<Seconds>, Optional<Seconds>); >+ AnimationPlaybackEvent(const AtomString&, const AnimationPlaybackEventInit&, IsTrusted); > > Markable<Seconds, Seconds::MarkableTraits> m_currentTime; > Markable<Seconds, Seconds::MarkableTraits> m_timelineTime; >diff --git a/Source/WebCore/animation/DeclarativeAnimation.cpp b/Source/WebCore/animation/DeclarativeAnimation.cpp >index 03155c75900b7be499da2f6230f622e3f1b6413d..2a603daaa6010d646457901786f670550c54d613 100644 >--- a/Source/WebCore/animation/DeclarativeAnimation.cpp >+++ b/Source/WebCore/animation/DeclarativeAnimation.cpp >@@ -330,7 +330,7 @@ void DeclarativeAnimation::invalidateDOMEvents(Seconds elapsedTime) > m_previousIteration = iteration; > } > >-void DeclarativeAnimation::enqueueDOMEvent(const AtomicString& eventType, Seconds elapsedTime) >+void DeclarativeAnimation::enqueueDOMEvent(const AtomString& eventType, Seconds elapsedTime) > { > ASSERT(m_owningElement); > auto time = secondsToWebAnimationsAPITime(elapsedTime) / 1000; >diff --git a/Source/WebCore/animation/DeclarativeAnimation.h b/Source/WebCore/animation/DeclarativeAnimation.h >index d95838fbd8a7464e0a09e2fcebe0161e2edc93b6..c6a740a6582e456bdbad8b3a52c97cd576014170 100644 >--- a/Source/WebCore/animation/DeclarativeAnimation.h >+++ b/Source/WebCore/animation/DeclarativeAnimation.h >@@ -77,7 +77,7 @@ private: > void disassociateFromOwningElement(); > void flushPendingStyleChanges() const; > AnimationEffectPhase phaseWithoutEffect() const; >- void enqueueDOMEvent(const AtomicString&, Seconds); >+ void enqueueDOMEvent(const AtomString&, Seconds); > void remove() final; > > // ActiveDOMObject. >diff --git a/Source/WebCore/animation/KeyframeEffect.cpp b/Source/WebCore/animation/KeyframeEffect.cpp >index 3f1356f5f3d577d1bdb4316ccae6db0546beb9b5..f6607511a3617405dcdcab35b52a93ffe15699d5 100644 >--- a/Source/WebCore/animation/KeyframeEffect.cpp >+++ b/Source/WebCore/animation/KeyframeEffect.cpp >@@ -607,7 +607,7 @@ Vector<Strong<JSObject>> KeyframeEffect::getKeyframes(ExecState& state) > auto value = toJS<IDLDOMString>(state, idlValue); > // 4. Call the [[DefineOwnProperty]] internal method on output keyframe with property name property name, > // Property Descriptor { [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: true, [[Value]]: value } and Boolean flag false. >- JSObject::defineOwnProperty(outputKeyframe, &state, AtomicString(propertyName).impl(), PropertyDescriptor(value, 0), false); >+ JSObject::defineOwnProperty(outputKeyframe, &state, AtomString(propertyName).impl(), PropertyDescriptor(value, 0), false); > } > > // 5. Append output keyframe to result. >@@ -645,7 +645,7 @@ Vector<Strong<JSObject>> KeyframeEffect::getKeyframes(ExecState& state) > auto value = toJS<IDLDOMString>(state, it->value); > // 4. Call the [[DefineOwnProperty]] internal method on output keyframe with property name property name, > // Property Descriptor { [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: true, [[Value]]: value } and Boolean flag false. >- JSObject::defineOwnProperty(outputKeyframe, &state, AtomicString(propertyName).impl(), PropertyDescriptor(value, 0), false); >+ JSObject::defineOwnProperty(outputKeyframe, &state, AtomString(propertyName).impl(), PropertyDescriptor(value, 0), false); > } > > // 4. Append output keyframe to result. >diff --git a/Source/WebCore/animation/WebAnimation.cpp b/Source/WebCore/animation/WebAnimation.cpp >index b9e646a2e48b40a867d4461b47350659384c9c0c..edfdbb0a06fd6eda25048b9719b9ef1ba9e13443 100644 >--- a/Source/WebCore/animation/WebAnimation.cpp >+++ b/Source/WebCore/animation/WebAnimation.cpp >@@ -598,7 +598,7 @@ void WebAnimation::cancel(Silently silently) > invalidateEffect(); > } > >-void WebAnimation::enqueueAnimationPlaybackEvent(const AtomicString& type, Optional<Seconds> currentTime, Optional<Seconds> timelineTime) >+void WebAnimation::enqueueAnimationPlaybackEvent(const AtomString& type, Optional<Seconds> currentTime, Optional<Seconds> timelineTime) > { > auto event = AnimationPlaybackEvent::create(type, currentTime, timelineTime); > event->setTarget(this); >diff --git a/Source/WebCore/animation/WebAnimation.h b/Source/WebCore/animation/WebAnimation.h >index e4b38b43b3157ccf7799c4b3bda22e8bc467ad6f..a4fa9d1f9ec8a86741c8ec693596441e9c5c082e 100644 >--- a/Source/WebCore/animation/WebAnimation.h >+++ b/Source/WebCore/animation/WebAnimation.h >@@ -137,7 +137,7 @@ private: > > void timingDidChange(DidSeek, SynchronouslyNotify); > void updateFinishedState(DidSeek, SynchronouslyNotify); >- void enqueueAnimationPlaybackEvent(const AtomicString&, Optional<Seconds>, Optional<Seconds>); >+ void enqueueAnimationPlaybackEvent(const AtomString&, Optional<Seconds>, Optional<Seconds>); > Seconds effectEndTime() const; > WebAnimation& readyPromiseResolve(); > WebAnimation& finishedPromiseResolve(); >diff --git a/Source/WebCore/bindings/IDLTypes.h b/Source/WebCore/bindings/IDLTypes.h >index 18a3c10e3bf0c4735c9901902d5acddff3f4f638..750ea8dfc6d601a23c7ca040c3b38a5b07e413d8 100644 >--- a/Source/WebCore/bindings/IDLTypes.h >+++ b/Source/WebCore/bindings/IDLTypes.h >@@ -141,11 +141,11 @@ template<typename T> struct IDLTreatNullAsEmptyAdaptor : IDLString<String> { > using InnerType = T; > }; > >-template<typename T> struct IDLAtomicStringAdaptor : IDLString<AtomicString> { >+template<typename T> struct IDLAtomStringAdaptor : IDLString<AtomString> { > using InnerType = T; > }; > >-template<typename T> struct IDLRequiresExistingAtomicStringAdaptor : IDLString<AtomicString> { >+template<typename T> struct IDLRequiresExistingAtomStringAdaptor : IDLString<AtomString> { > using InnerType = T; > }; > >diff --git a/Source/WebCore/bindings/js/CachedScriptFetcher.h b/Source/WebCore/bindings/js/CachedScriptFetcher.h >index d5391c697d7cf4f6f5d4079ca272ef77ea9caba7..382314252ca6e4d9320271a168e82de009c982d4 100644 >--- a/Source/WebCore/bindings/js/CachedScriptFetcher.h >+++ b/Source/WebCore/bindings/js/CachedScriptFetcher.h >@@ -41,7 +41,7 @@ public: > static Ref<CachedScriptFetcher> create(const String& charset); > > protected: >- CachedScriptFetcher(const String& nonce, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree) >+ CachedScriptFetcher(const String& nonce, const String& charset, const AtomString& initiatorName, bool isInUserAgentShadowTree) > : m_nonce(nonce) > , m_charset(charset) > , m_initiatorName(initiatorName) >@@ -59,7 +59,7 @@ protected: > private: > String m_nonce; > String m_charset; >- AtomicString m_initiatorName; >+ AtomString m_initiatorName; > bool m_isInUserAgentShadowTree { false }; > }; > >diff --git a/Source/WebCore/bindings/js/CommonVM.cpp b/Source/WebCore/bindings/js/CommonVM.cpp >index 9220f0b16079da06089b77e335301adc7efdae1b..c1e94b8b85726b3d51fe11958992351bf37e1b52 100644 >--- a/Source/WebCore/bindings/js/CommonVM.cpp >+++ b/Source/WebCore/bindings/js/CommonVM.cpp >@@ -35,7 +35,7 @@ > #include <JavaScriptCore/MachineStackMarker.h> > #include <JavaScriptCore/VM.h> > #include <wtf/MainThread.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > #if PLATFORM(IOS_FAMILY) > #include "WebCoreThreadInternal.h" >@@ -83,7 +83,7 @@ Frame* lexicalFrameFromCommonVM() > return nullptr; > } > >-void addImpureProperty(const AtomicString& propertyName) >+void addImpureProperty(const AtomString& propertyName) > { > commonVM().addImpureProperty(propertyName); > } >diff --git a/Source/WebCore/bindings/js/CommonVM.h b/Source/WebCore/bindings/js/CommonVM.h >index 2821eb2888e85a3033f6ded2e122d18c9326e5d9..291162dfc16fb398baaeee23cacfd56793b7be9f 100644 >--- a/Source/WebCore/bindings/js/CommonVM.h >+++ b/Source/WebCore/bindings/js/CommonVM.h >@@ -52,7 +52,7 @@ inline JSC::VM& commonVM() > return commonVMSlow(); > } > >-void addImpureProperty(const AtomicString&); >+void addImpureProperty(const AtomString&); > > } // namespace WebCore > >diff --git a/Source/WebCore/bindings/js/JSCustomElementInterface.cpp b/Source/WebCore/bindings/js/JSCustomElementInterface.cpp >index 9ff543feb97d6f596bed2cf10b72b902938f6b99..0184a7d4f395ca0c540d48d4e6db5005ec0a025e 100644 >--- a/Source/WebCore/bindings/js/JSCustomElementInterface.cpp >+++ b/Source/WebCore/bindings/js/JSCustomElementInterface.cpp >@@ -55,9 +55,9 @@ JSCustomElementInterface::JSCustomElementInterface(const QualifiedName& name, JS > > JSCustomElementInterface::~JSCustomElementInterface() = default; > >-static RefPtr<Element> constructCustomElementSynchronously(Document&, VM&, ExecState&, JSObject* constructor, const AtomicString& localName); >+static RefPtr<Element> constructCustomElementSynchronously(Document&, VM&, ExecState&, JSObject* constructor, const AtomString& localName); > >-Ref<Element> JSCustomElementInterface::constructElementWithFallback(Document& document, const AtomicString& localName) >+Ref<Element> JSCustomElementInterface::constructElementWithFallback(Document& document, const AtomString& localName) > { > if (auto element = tryToConstructCustomElement(document, localName)) > return element.releaseNonNull(); >@@ -84,7 +84,7 @@ Ref<Element> JSCustomElementInterface::constructElementWithFallback(Document& do > return element; > } > >-RefPtr<Element> JSCustomElementInterface::tryToConstructCustomElement(Document& document, const AtomicString& localName) >+RefPtr<Element> JSCustomElementInterface::tryToConstructCustomElement(Document& document, const AtomString& localName) > { > if (!canInvokeCallback()) > return nullptr; >@@ -114,7 +114,7 @@ RefPtr<Element> JSCustomElementInterface::tryToConstructCustomElement(Document& > > // https://dom.spec.whatwg.org/#concept-create-element > // 6. 1. If the synchronous custom elements flag is set >-static RefPtr<Element> constructCustomElementSynchronously(Document& document, VM& vm, ExecState& state, JSObject* constructor, const AtomicString& localName) >+static RefPtr<Element> constructCustomElementSynchronously(Document& document, VM& vm, ExecState& state, JSObject* constructor, const AtomString& localName) > { > auto scope = DECLARE_THROW_SCOPE(vm); > ConstructData constructData; >@@ -300,7 +300,7 @@ void JSCustomElementInterface::setAttributeChangedCallback(JSC::JSObject* callba > m_observedAttributes.add(name); > } > >-void JSCustomElementInterface::invokeAttributeChangedCallback(Element& element, const QualifiedName& attributeName, const AtomicString& oldValue, const AtomicString& newValue) >+void JSCustomElementInterface::invokeAttributeChangedCallback(Element& element, const QualifiedName& attributeName, const AtomString& oldValue, const AtomString& newValue) > { > invokeCallback(element, m_attributeChangedCallback.get(), [&](ExecState* state, JSDOMGlobalObject*, MarkedArgumentBuffer& args) { > args.append(toJS<IDLDOMString>(*state, attributeName.localName())); >diff --git a/Source/WebCore/bindings/js/JSCustomElementInterface.h b/Source/WebCore/bindings/js/JSCustomElementInterface.h >index d18cabdab0ac76e1deaa84a876c487b31920fea8..46b8154dc33b791b17806984a78df2c29393b2f0 100644 >--- a/Source/WebCore/bindings/js/JSCustomElementInterface.h >+++ b/Source/WebCore/bindings/js/JSCustomElementInterface.h >@@ -34,7 +34,7 @@ > #include <wtf/Forward.h> > #include <wtf/Function.h> > #include <wtf/RefCounted.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > namespace JSC { > class JSObject; >@@ -57,7 +57,7 @@ public: > return adoptRef(*new JSCustomElementInterface(name, callback, globalObject)); > } > >- Ref<Element> constructElementWithFallback(Document&, const AtomicString&); >+ Ref<Element> constructElementWithFallback(Document&, const AtomString&); > Ref<Element> constructElementWithFallback(Document&, const QualifiedName&); > > void upgradeElement(Element&); >@@ -75,8 +75,8 @@ public: > void invokeAdoptedCallback(Element&, Document& oldDocument, Document& newDocument); > > void setAttributeChangedCallback(JSC::JSObject* callback, const Vector<String>& observedAttributes); >- bool observesAttribute(const AtomicString& name) const { return m_observedAttributes.contains(name); } >- void invokeAttributeChangedCallback(Element&, const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue); >+ bool observesAttribute(const AtomString& name) const { return m_observedAttributes.contains(name); } >+ void invokeAttributeChangedCallback(Element&, const QualifiedName&, const AtomString& oldValue, const AtomString& newValue); > > ScriptExecutionContext* scriptExecutionContext() const { return ContextDestructionObserver::scriptExecutionContext(); } > JSC::JSObject* constructor() { return m_constructor.get(); } >@@ -92,7 +92,7 @@ public: > private: > JSCustomElementInterface(const QualifiedName&, JSC::JSObject* callback, JSDOMGlobalObject*); > >- RefPtr<Element> tryToConstructCustomElement(Document&, const AtomicString&); >+ RefPtr<Element> tryToConstructCustomElement(Document&, const AtomString&); > > void invokeCallback(Element&, JSC::JSObject* callback, const WTF::Function<void(JSC::ExecState*, JSDOMGlobalObject*, JSC::MarkedArgumentBuffer&)>& addArguments = [](JSC::ExecState*, JSDOMGlobalObject*, JSC::MarkedArgumentBuffer&) { }); > >@@ -104,7 +104,7 @@ private: > JSC::Weak<JSC::JSObject> m_attributeChangedCallback; > Ref<DOMWrapperWorld> m_isolatedWorld; > Vector<RefPtr<Element>, 1> m_constructionStack; >- HashSet<AtomicString> m_observedAttributes; >+ HashSet<AtomString> m_observedAttributes; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/bindings/js/JSCustomElementRegistryCustom.cpp b/Source/WebCore/bindings/js/JSCustomElementRegistryCustom.cpp >index 41597cd4880185f386d74149279a7057c960a02f..98dbc2b67c4ada6c3c8f1fca87b24b654d9c3380 100644 >--- a/Source/WebCore/bindings/js/JSCustomElementRegistryCustom.cpp >+++ b/Source/WebCore/bindings/js/JSCustomElementRegistryCustom.cpp >@@ -56,7 +56,7 @@ static JSObject* getCustomElementCallback(ExecState& state, JSObject& prototype, > return callback.getObject(); > } > >-static bool validateCustomElementNameAndThrowIfNeeded(ExecState& state, const AtomicString& name) >+static bool validateCustomElementNameAndThrowIfNeeded(ExecState& state, const AtomString& name) > { > auto scope = DECLARE_THROW_SCOPE(state.vm()); > switch (Document::validateCustomElementName(name)) { >@@ -91,7 +91,7 @@ JSValue JSCustomElementRegistry::define(ExecState& state) > if (UNLIKELY(state.argumentCount() < 2)) > return throwException(&state, scope, createNotEnoughArgumentsError(&state)); > >- AtomicString localName(state.uncheckedArgument(0).toString(&state)->toAtomicString(&state)); >+ AtomString localName(state.uncheckedArgument(0).toString(&state)->toAtomString(&state)); > RETURN_IF_EXCEPTION(scope, JSValue()); > > JSValue constructorValue = state.uncheckedArgument(1); >@@ -182,7 +182,7 @@ static JSValue whenDefinedPromise(ExecState& state, JSDOMGlobalObject& globalObj > if (UNLIKELY(state.argumentCount() < 1)) > return throwException(&state, scope, createNotEnoughArgumentsError(&state)); > >- AtomicString localName(state.uncheckedArgument(0).toString(&state)->toAtomicString(&state)); >+ AtomString localName(state.uncheckedArgument(0).toString(&state)->toAtomString(&state)); > RETURN_IF_EXCEPTION(scope, JSValue()); > > if (!validateCustomElementNameAndThrowIfNeeded(state, localName)) { >diff --git a/Source/WebCore/bindings/js/JSDOMConvertStrings.h b/Source/WebCore/bindings/js/JSDOMConvertStrings.h >index dc89cbf14595a72e8f9df2ea240ed85dbe7b471f..d8d0be11e6e1153c4a1d869e1ab11346623c52b1 100644 >--- a/Source/WebCore/bindings/js/JSDOMConvertStrings.h >+++ b/Source/WebCore/bindings/js/JSDOMConvertStrings.h >@@ -42,9 +42,9 @@ inline String propertyNameToString(JSC::PropertyName propertyName) > return propertyName.uid() ? propertyName.uid() : propertyName.publicName(); > } > >-inline AtomicString propertyNameToAtomicString(JSC::PropertyName propertyName) >+inline AtomString propertyNameToAtomString(JSC::PropertyName propertyName) > { >- return AtomicString(propertyName.uid() ? propertyName.uid() : propertyName.publicName()); >+ return AtomString(propertyName.uid() ? propertyName.uid() : propertyName.publicName()); > } > > // MARK: - >@@ -153,20 +153,20 @@ template<typename T> struct JSConverter<IDLTreatNullAsEmptyAdaptor<T>> { > } > }; > >-template<typename T> struct Converter<IDLAtomicStringAdaptor<T>> : DefaultConverter<IDLAtomicStringAdaptor<T>> { >- static AtomicString convert(JSC::ExecState& state, JSC::JSValue value) >+template<typename T> struct Converter<IDLAtomStringAdaptor<T>> : DefaultConverter<IDLAtomStringAdaptor<T>> { >+ static AtomString convert(JSC::ExecState& state, JSC::JSValue value) > { > static_assert(std::is_same<T, IDLDOMString>::value, "This adaptor is only supported for IDLDOMString at the moment."); > >- return value.toString(&state)->toAtomicString(&state); >+ return value.toString(&state)->toAtomString(&state); > } > }; > >-template<typename T> struct JSConverter<IDLAtomicStringAdaptor<T>> { >+template<typename T> struct JSConverter<IDLAtomStringAdaptor<T>> { > static constexpr bool needsState = true; > static constexpr bool needsGlobalObject = false; > >- static JSC::JSValue convert(JSC::ExecState& state, const AtomicString& value) >+ static JSC::JSValue convert(JSC::ExecState& state, const AtomString& value) > { > static_assert(std::is_same<T, IDLDOMString>::value, "This adaptor is only supported for IDLDOMString at the moment."); > >@@ -174,20 +174,20 @@ template<typename T> struct JSConverter<IDLAtomicStringAdaptor<T>> { > } > }; > >-template<typename T> struct Converter<IDLRequiresExistingAtomicStringAdaptor<T>> : DefaultConverter<IDLRequiresExistingAtomicStringAdaptor<T>> { >- static AtomicString convert(JSC::ExecState& state, JSC::JSValue value) >+template<typename T> struct Converter<IDLRequiresExistingAtomStringAdaptor<T>> : DefaultConverter<IDLRequiresExistingAtomStringAdaptor<T>> { >+ static AtomString convert(JSC::ExecState& state, JSC::JSValue value) > { > static_assert(std::is_same<T, IDLDOMString>::value, "This adaptor is only supported for IDLDOMString at the moment."); > >- return AtomicString(value.toString(&state)->toExistingAtomicString(&state)); >+ return AtomString(value.toString(&state)->toExistingAtomString(&state)); > } > }; > >-template<typename T> struct JSConverter<IDLRequiresExistingAtomicStringAdaptor<T>> { >+template<typename T> struct JSConverter<IDLRequiresExistingAtomStringAdaptor<T>> { > static constexpr bool needsState = true; > static constexpr bool needsGlobalObject = false; > >- static JSC::JSValue convert(JSC::ExecState& state, const AtomicString& value) >+ static JSC::JSValue convert(JSC::ExecState& state, const AtomString& value) > { > static_assert(std::is_same<T, IDLDOMString>::value, "This adaptor is only supported for IDLDOMString at the moment."); > >diff --git a/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp b/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp >index a5f0619fecf912bcccc208ceb51f5dcb9eccf652..d10310ab6c89aa2a4b9a4a7017767d500cd4868f 100644 >--- a/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp >+++ b/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp >@@ -148,7 +148,7 @@ bool jsDOMWindowGetOwnPropertySlotRestrictedAccess(JSDOMGlobalObject* thisObject > // FIXME: Add support to named attributes on RemoteFrames. > auto* frame = window.frame(); > if (frame && is<Frame>(*frame)) { >- if (auto* scopedChild = downcast<Frame>(*frame).tree().scopedChild(propertyNameToAtomicString(propertyName))) { >+ if (auto* scopedChild = downcast<Frame>(*frame).tree().scopedChild(propertyNameToAtomString(propertyName))) { > slot.setValue(thisObject, JSC::PropertyAttribute::ReadOnly | JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::DontEnum, toJS(&state, scopedChild->document()->domWindow())); > return true; > } >diff --git a/Source/WebCore/bindings/js/JSDOMWindowProperties.cpp b/Source/WebCore/bindings/js/JSDOMWindowProperties.cpp >index 308ca0e94d8a0fc1b07f5e941656ff1e63a04500..9ca9ed756d2a42ba8e6a0b6dbd5a8b20d3b4fa0a 100644 >--- a/Source/WebCore/bindings/js/JSDOMWindowProperties.cpp >+++ b/Source/WebCore/bindings/js/JSDOMWindowProperties.cpp >@@ -48,7 +48,7 @@ static bool jsDOMWindowPropertiesGetOwnPropertySlotNamedItemGetter(JSDOMWindowPr > // properties that are in Moz but not IE. Since we have some of these, we have to do it > // the Moz way. > if (auto* frame = window.frame()) { >- if (auto* scopedChild = frame->tree().scopedChild(propertyNameToAtomicString(propertyName))) { >+ if (auto* scopedChild = frame->tree().scopedChild(propertyNameToAtomString(propertyName))) { > slot.setValue(thisObject, JSC::PropertyAttribute::ReadOnly | JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::DontEnum, toJS(exec, scopedChild->document()->domWindow())); > return true; > } >diff --git a/Source/WebCore/bindings/js/JSEventCustom.cpp b/Source/WebCore/bindings/js/JSEventCustom.cpp >index 87199eb9207a632b4e4ba53519f5852dca1c6652..136196b5e251f628254965c2dd5fde67bb5ddbcc 100644 >--- a/Source/WebCore/bindings/js/JSEventCustom.cpp >+++ b/Source/WebCore/bindings/js/JSEventCustom.cpp >@@ -36,7 +36,7 @@ > #include "JSDOMBinding.h" > #include "JSDataTransfer.h" > #include <JavaScriptCore/JSLock.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > > namespace WebCore { >diff --git a/Source/WebCore/bindings/js/JSEventListener.cpp b/Source/WebCore/bindings/js/JSEventListener.cpp >index 571e7c7514f8689b540c7de9a86d18d8bcf244f5..7bd98c6c84fa7a408f4cf5360b893ef90eb8714d 100644 >--- a/Source/WebCore/bindings/js/JSEventListener.cpp >+++ b/Source/WebCore/bindings/js/JSEventListener.cpp >@@ -236,45 +236,45 @@ static inline RefPtr<JSEventListener> createEventListenerForEventHandlerAttribut > return JSEventListener::create(asObject(listener), &wrapper, true, currentWorld(state)); > } > >-JSC::JSValue eventHandlerAttribute(EventTarget& target, const AtomicString& eventType, DOMWrapperWorld& isolatedWorld) >+JSC::JSValue eventHandlerAttribute(EventTarget& target, const AtomString& eventType, DOMWrapperWorld& isolatedWorld) > { > return eventHandlerAttribute(target.attributeEventListener(eventType, isolatedWorld), *target.scriptExecutionContext()); > } > >-void setEventHandlerAttribute(JSC::ExecState& state, JSC::JSObject& wrapper, EventTarget& target, const AtomicString& eventType, JSC::JSValue value) >+void setEventHandlerAttribute(JSC::ExecState& state, JSC::JSObject& wrapper, EventTarget& target, const AtomString& eventType, JSC::JSValue value) > { > target.setAttributeEventListener(eventType, createEventListenerForEventHandlerAttribute(state, value, wrapper), currentWorld(state)); > } > >-JSC::JSValue windowEventHandlerAttribute(HTMLElement& element, const AtomicString& eventType, DOMWrapperWorld& isolatedWorld) >+JSC::JSValue windowEventHandlerAttribute(HTMLElement& element, const AtomString& eventType, DOMWrapperWorld& isolatedWorld) > { > auto& document = element.document(); > return eventHandlerAttribute(document.getWindowAttributeEventListener(eventType, isolatedWorld), document); > } > >-void setWindowEventHandlerAttribute(JSC::ExecState& state, JSC::JSObject& wrapper, HTMLElement& element, const AtomicString& eventType, JSC::JSValue value) >+void setWindowEventHandlerAttribute(JSC::ExecState& state, JSC::JSObject& wrapper, HTMLElement& element, const AtomString& eventType, JSC::JSValue value) > { > ASSERT(wrapper.globalObject()); > element.document().setWindowAttributeEventListener(eventType, createEventListenerForEventHandlerAttribute(state, value, *wrapper.globalObject()), currentWorld(state)); > } > >-JSC::JSValue windowEventHandlerAttribute(DOMWindow& window, const AtomicString& eventType, DOMWrapperWorld& isolatedWorld) >+JSC::JSValue windowEventHandlerAttribute(DOMWindow& window, const AtomString& eventType, DOMWrapperWorld& isolatedWorld) > { > return eventHandlerAttribute(window, eventType, isolatedWorld); > } > >-void setWindowEventHandlerAttribute(JSC::ExecState& state, JSC::JSObject& wrapper, DOMWindow& window, const AtomicString& eventType, JSC::JSValue value) >+void setWindowEventHandlerAttribute(JSC::ExecState& state, JSC::JSObject& wrapper, DOMWindow& window, const AtomString& eventType, JSC::JSValue value) > { > setEventHandlerAttribute(state, wrapper, window, eventType, value); > } > >-JSC::JSValue documentEventHandlerAttribute(HTMLElement& element, const AtomicString& eventType, DOMWrapperWorld& isolatedWorld) >+JSC::JSValue documentEventHandlerAttribute(HTMLElement& element, const AtomString& eventType, DOMWrapperWorld& isolatedWorld) > { > auto& document = element.document(); > return eventHandlerAttribute(document.attributeEventListener(eventType, isolatedWorld), document); > } > >-void setDocumentEventHandlerAttribute(JSC::ExecState& state, JSC::JSObject& wrapper, HTMLElement& element, const AtomicString& eventType, JSC::JSValue value) >+void setDocumentEventHandlerAttribute(JSC::ExecState& state, JSC::JSObject& wrapper, HTMLElement& element, const AtomString& eventType, JSC::JSValue value) > { > ASSERT(wrapper.globalObject()); > auto& document = element.document(); >@@ -283,12 +283,12 @@ void setDocumentEventHandlerAttribute(JSC::ExecState& state, JSC::JSObject& wrap > document.setAttributeEventListener(eventType, createEventListenerForEventHandlerAttribute(state, value, *documentWrapper), currentWorld(state)); > } > >-JSC::JSValue documentEventHandlerAttribute(Document& document, const AtomicString& eventType, DOMWrapperWorld& isolatedWorld) >+JSC::JSValue documentEventHandlerAttribute(Document& document, const AtomString& eventType, DOMWrapperWorld& isolatedWorld) > { > return eventHandlerAttribute(document, eventType, isolatedWorld); > } > >-void setDocumentEventHandlerAttribute(JSC::ExecState& state, JSC::JSObject& wrapper, Document& document, const AtomicString& eventType, JSC::JSValue value) >+void setDocumentEventHandlerAttribute(JSC::ExecState& state, JSC::JSObject& wrapper, Document& document, const AtomString& eventType, JSC::JSValue value) > { > setEventHandlerAttribute(state, wrapper, document, eventType, value); > } >diff --git a/Source/WebCore/bindings/js/JSEventListener.h b/Source/WebCore/bindings/js/JSEventListener.h >index cb8880baee309f03e419ba70326859cf06225f60..c4668bf3da3b86821927ecf35cb7ebc31821227f 100644 >--- a/Source/WebCore/bindings/js/JSEventListener.h >+++ b/Source/WebCore/bindings/js/JSEventListener.h >@@ -74,20 +74,20 @@ private: > }; > > // For "onxxx" attributes that automatically set up JavaScript event listeners. >-JSC::JSValue eventHandlerAttribute(EventTarget&, const AtomicString& eventType, DOMWrapperWorld&); >-void setEventHandlerAttribute(JSC::ExecState&, JSC::JSObject&, EventTarget&, const AtomicString& eventType, JSC::JSValue); >+JSC::JSValue eventHandlerAttribute(EventTarget&, const AtomString& eventType, DOMWrapperWorld&); >+void setEventHandlerAttribute(JSC::ExecState&, JSC::JSObject&, EventTarget&, const AtomString& eventType, JSC::JSValue); > > // Like the functions above, but for attributes that forward event handlers to the window object rather than setting them on the target. >-JSC::JSValue windowEventHandlerAttribute(HTMLElement&, const AtomicString& eventType, DOMWrapperWorld&); >-void setWindowEventHandlerAttribute(JSC::ExecState&, JSC::JSObject&, HTMLElement&, const AtomicString& eventType, JSC::JSValue); >-JSC::JSValue windowEventHandlerAttribute(DOMWindow&, const AtomicString& eventType, DOMWrapperWorld&); >-void setWindowEventHandlerAttribute(JSC::ExecState&, JSC::JSObject&, DOMWindow&, const AtomicString& eventType, JSC::JSValue); >+JSC::JSValue windowEventHandlerAttribute(HTMLElement&, const AtomString& eventType, DOMWrapperWorld&); >+void setWindowEventHandlerAttribute(JSC::ExecState&, JSC::JSObject&, HTMLElement&, const AtomString& eventType, JSC::JSValue); >+JSC::JSValue windowEventHandlerAttribute(DOMWindow&, const AtomString& eventType, DOMWrapperWorld&); >+void setWindowEventHandlerAttribute(JSC::ExecState&, JSC::JSObject&, DOMWindow&, const AtomString& eventType, JSC::JSValue); > > // Like the functions above, but for attributes that forward event handlers to the document rather than setting them on the target. >-JSC::JSValue documentEventHandlerAttribute(HTMLElement&, const AtomicString& eventType, DOMWrapperWorld&); >-void setDocumentEventHandlerAttribute(JSC::ExecState&, JSC::JSObject&, HTMLElement&, const AtomicString& eventType, JSC::JSValue); >-JSC::JSValue documentEventHandlerAttribute(Document&, const AtomicString& eventType, DOMWrapperWorld&); >-void setDocumentEventHandlerAttribute(JSC::ExecState&, JSC::JSObject&, Document&, const AtomicString& eventType, JSC::JSValue); >+JSC::JSValue documentEventHandlerAttribute(HTMLElement&, const AtomString& eventType, DOMWrapperWorld&); >+void setDocumentEventHandlerAttribute(JSC::ExecState&, JSC::JSObject&, HTMLElement&, const AtomString& eventType, JSC::JSValue); >+JSC::JSValue documentEventHandlerAttribute(Document&, const AtomString& eventType, DOMWrapperWorld&); >+void setDocumentEventHandlerAttribute(JSC::ExecState&, JSC::JSObject&, Document&, const AtomString& eventType, JSC::JSValue); > > inline JSC::JSObject* JSEventListener::jsFunction(ScriptExecutionContext& scriptExecutionContext) const > { >diff --git a/Source/WebCore/bindings/js/JSLazyEventListener.cpp b/Source/WebCore/bindings/js/JSLazyEventListener.cpp >index bfe62c4583ee57d08ac6bddf217df716802cbe9e..2d74f29e26a541517baada3d6d721cad01fdfe57 100644 >--- a/Source/WebCore/bindings/js/JSLazyEventListener.cpp >+++ b/Source/WebCore/bindings/js/JSLazyEventListener.cpp >@@ -42,7 +42,7 @@ DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, eventListenerCounter, ("JSL > > struct JSLazyEventListener::CreationArguments { > const QualifiedName& attributeName; >- const AtomicString& attributeValue; >+ const AtomString& attributeValue; > Document& document; > WeakPtr<ContainerNode> node; > JSObject* wrapper; >@@ -184,19 +184,19 @@ RefPtr<JSLazyEventListener> JSLazyEventListener::create(CreationArguments&& argu > return adoptRef(*new JSLazyEventListener(WTFMove(arguments), sourceURL, position)); > } > >-RefPtr<JSLazyEventListener> JSLazyEventListener::create(Element& element, const QualifiedName& attributeName, const AtomicString& attributeValue) >+RefPtr<JSLazyEventListener> JSLazyEventListener::create(Element& element, const QualifiedName& attributeName, const AtomString& attributeValue) > { > return create({ attributeName, attributeValue, element.document(), makeWeakPtr(element), nullptr, element.isSVGElement() }); > } > >-RefPtr<JSLazyEventListener> JSLazyEventListener::create(Document& document, const QualifiedName& attributeName, const AtomicString& attributeValue) >+RefPtr<JSLazyEventListener> JSLazyEventListener::create(Document& document, const QualifiedName& attributeName, const AtomString& attributeValue) > { > // FIXME: This always passes false for "shouldUseSVGEventName". Is that correct for events dispatched to SVG documents? > // This has been this way for a long time, but became more obvious when refactoring to separate the Element and Document code paths. > return create({ attributeName, attributeValue, document, makeWeakPtr(document), nullptr, false }); > } > >-RefPtr<JSLazyEventListener> JSLazyEventListener::create(DOMWindow& window, const QualifiedName& attributeName, const AtomicString& attributeValue) >+RefPtr<JSLazyEventListener> JSLazyEventListener::create(DOMWindow& window, const QualifiedName& attributeName, const AtomString& attributeValue) > { > ASSERT(window.document()); > auto& document = *window.document(); >diff --git a/Source/WebCore/bindings/js/JSLazyEventListener.h b/Source/WebCore/bindings/js/JSLazyEventListener.h >index f473f44d059d61d72fb225a7f97cf58ddbce30ab..7ab8716fa3f4e5c1ae36a247a2a6b9b129a9276f 100644 >--- a/Source/WebCore/bindings/js/JSLazyEventListener.h >+++ b/Source/WebCore/bindings/js/JSLazyEventListener.h >@@ -33,9 +33,9 @@ class QualifiedName; > > class JSLazyEventListener final : public JSEventListener { > public: >- static RefPtr<JSLazyEventListener> create(Element&, const QualifiedName& attributeName, const AtomicString& attributeValue); >- static RefPtr<JSLazyEventListener> create(Document&, const QualifiedName& attributeName, const AtomicString& attributeValue); >- static RefPtr<JSLazyEventListener> create(DOMWindow&, const QualifiedName& attributeName, const AtomicString& attributeValue); >+ static RefPtr<JSLazyEventListener> create(Element&, const QualifiedName& attributeName, const AtomString& attributeValue); >+ static RefPtr<JSLazyEventListener> create(Document&, const QualifiedName& attributeName, const AtomString& attributeValue); >+ static RefPtr<JSLazyEventListener> create(DOMWindow&, const QualifiedName& attributeName, const AtomString& attributeValue); > > virtual ~JSLazyEventListener(); > >diff --git a/Source/WebCore/bindings/js/JSNodeListCustom.cpp b/Source/WebCore/bindings/js/JSNodeListCustom.cpp >index 7f6d9e72da50795fef35ffd62bd2688c5a10eaf2..609a13f598b7eddecb1964bd8527179354c5bc7b 100644 >--- a/Source/WebCore/bindings/js/JSNodeListCustom.cpp >+++ b/Source/WebCore/bindings/js/JSNodeListCustom.cpp >@@ -31,7 +31,7 @@ > #include "LiveNodeList.h" > #include "Node.h" > #include "NodeList.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > > namespace WebCore { >diff --git a/Source/WebCore/bindings/js/ScriptController.h b/Source/WebCore/bindings/js/ScriptController.h >index ecde7a0aa1803a4a7d90c14131468179d3601664..73611d0c21c691b83ecacb5520f9e9f17c235261 100644 >--- a/Source/WebCore/bindings/js/ScriptController.h >+++ b/Source/WebCore/bindings/js/ScriptController.h >@@ -133,8 +133,8 @@ public: > > void updateDocument(); > >- void namedItemAdded(HTMLDocument*, const AtomicString&) { } >- void namedItemRemoved(HTMLDocument*, const AtomicString&) { } >+ void namedItemAdded(HTMLDocument*, const AtomString&) { } >+ void namedItemRemoved(HTMLDocument*, const AtomString&) { } > > void clearScriptObjects(); > WEBCORE_EXPORT void cleanupScriptObjectsForPlugin(void*); >diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm >index 8d6208182302d551478ffb8c6d09656f7e470d40..35636c98da3c75b860d0fadace44812b11caa510 100644 >--- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm >+++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm >@@ -600,7 +600,7 @@ sub GenerateNamedGetterLambda > push(@$outputArray, " auto getterFunctor = [] (auto& thisObject, auto propertyName) -> ${returnType} {\n"); > > my @arguments = GenerateCallWithUsingReferences($namedGetterOperation->extendedAttributes->{CallWith}, $outputArray, "WTF::nullopt", "thisObject", " "); >- push(@arguments, "propertyNameToAtomicString(propertyName)"); >+ push(@arguments, "propertyNameToAtomString(propertyName)"); > > push(@$outputArray, " auto result = thisObject.wrapped().${namedGetterFunctionName}(" . join(", ", @arguments) . ");\n"); > >@@ -2189,13 +2189,13 @@ sub GenerateDefaultValue > my ($typeScope, $context, $type, $defaultValue) = @_; > > if ($codeGenerator->IsStringType($type)) { >- my $useAtomicString = $type->extendedAttributes->{AtomicString}; >+ my $useAtomString = $type->extendedAttributes->{AtomString}; > if ($defaultValue eq "null") { >- return $useAtomicString ? "nullAtom()" : "String()"; >+ return $useAtomString ? "nullAtom()" : "String()"; > } elsif ($defaultValue eq "\"\"") { >- return $useAtomicString ? "emptyAtom()" : "emptyString()"; >+ return $useAtomString ? "emptyAtom()" : "emptyString()"; > } else { >- return $useAtomicString ? "AtomicString(${defaultValue}, AtomicString::ConstructFromLiteral)" : "${defaultValue}_s"; >+ return $useAtomString ? "AtomString(${defaultValue}, AtomString::ConstructFromLiteral)" : "${defaultValue}_s"; > } > } > >@@ -6468,8 +6468,8 @@ sub IsAnnotatedType > return 1 if $type->extendedAttributes->{Clamp}; > return 1 if $type->extendedAttributes->{EnforceRange}; > return 1 if $type->extendedAttributes->{TreatNullAs} && $type->extendedAttributes->{TreatNullAs} eq "EmptyString"; >- return 1 if $type->extendedAttributes->{AtomicString}; >- return 1 if $type->extendedAttributes->{RequiresExistingAtomicString}; >+ return 1 if $type->extendedAttributes->{AtomString}; >+ return 1 if $type->extendedAttributes->{RequiresExistingAtomString}; > } > > sub GetAnnotatedIDLType >@@ -6479,8 +6479,8 @@ sub GetAnnotatedIDLType > return "IDLClampAdaptor" if $type->extendedAttributes->{Clamp}; > return "IDLEnforceRangeAdaptor" if $type->extendedAttributes->{EnforceRange}; > return "IDLTreatNullAsEmptyAdaptor" if $type->extendedAttributes->{TreatNullAs} && $type->extendedAttributes->{TreatNullAs} eq "EmptyString"; >- return "IDLAtomicStringAdaptor" if $type->extendedAttributes->{AtomicString}; >- return "IDLRequiresExistingAtomicStringAdaptor" if $type->extendedAttributes->{RequiresExistingAtomicString}; >+ return "IDLAtomStringAdaptor" if $type->extendedAttributes->{AtomString}; >+ return "IDLRequiresExistingAtomStringAdaptor" if $type->extendedAttributes->{RequiresExistingAtomString}; > } > > sub GetBaseIDLType >diff --git a/Source/WebCore/bindings/scripts/IDLAttributes.json b/Source/WebCore/bindings/scripts/IDLAttributes.json >index fc80906af915f6500207f9e2f7ead2678bb3a047..dd9519e2449147bec930c224301be291c9e3b05b 100644 >--- a/Source/WebCore/bindings/scripts/IDLAttributes.json >+++ b/Source/WebCore/bindings/scripts/IDLAttributes.json >@@ -22,7 +22,7 @@ > "AppleCopyright": { > "contextsAllowed": ["interface", "attribute", "operation"] > }, >- "AtomicString": { >+ "AtomString": { > "contextsAllowed": ["type"] > }, > "CEReactions": { >@@ -411,7 +411,7 @@ > "ReportExternalMemoryCost": { > "contextsAllowed": ["interface"] > }, >- "RequiresExistingAtomicString": { >+ "RequiresExistingAtomString": { > "contextsAllowed": ["type"] > }, > "RethrowException": { >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestDOMJIT.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestDOMJIT.cpp >index 83b0f7d9e4b5394c1dd40344a466e53d033dbee6..600437b06a32f2cbd6782766832fd7a225465d46 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestDOMJIT.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestDOMJIT.cpp >@@ -61,9 +61,9 @@ JSC::EncodedJSValue JIT_OPERATION unsafeJsTestDOMJITPrototypeFunctionItem(JSC::E > JSC::EncodedJSValue JSC_HOST_CALL jsTestDOMJITPrototypeFunctionHasAttribute(JSC::ExecState*); > JSC::EncodedJSValue JIT_OPERATION unsafeJsTestDOMJITPrototypeFunctionHasAttribute(JSC::ExecState*, JSTestDOMJIT*); > JSC::EncodedJSValue JSC_HOST_CALL jsTestDOMJITPrototypeFunctionGetElementById(JSC::ExecState*); >-JSC::EncodedJSValue JIT_OPERATION unsafeJsTestDOMJITPrototypeFunctionGetElementById(JSC::ExecState*, JSTestDOMJIT*, DOMJIT::IDLJSArgumentType<IDLRequiresExistingAtomicStringAdaptor<IDLDOMString>>); >+JSC::EncodedJSValue JIT_OPERATION unsafeJsTestDOMJITPrototypeFunctionGetElementById(JSC::ExecState*, JSTestDOMJIT*, DOMJIT::IDLJSArgumentType<IDLRequiresExistingAtomStringAdaptor<IDLDOMString>>); > JSC::EncodedJSValue JSC_HOST_CALL jsTestDOMJITPrototypeFunctionGetElementsByName(JSC::ExecState*); >-JSC::EncodedJSValue JIT_OPERATION unsafeJsTestDOMJITPrototypeFunctionGetElementsByName(JSC::ExecState*, JSTestDOMJIT*, DOMJIT::IDLJSArgumentType<IDLAtomicStringAdaptor<IDLDOMString>>); >+JSC::EncodedJSValue JIT_OPERATION unsafeJsTestDOMJITPrototypeFunctionGetElementsByName(JSC::ExecState*, JSTestDOMJIT*, DOMJIT::IDLJSArgumentType<IDLAtomStringAdaptor<IDLDOMString>>); > > // Attributes > >@@ -111,9 +111,9 @@ static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITItem((uintptr_t) > > static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITHasAttribute((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionHasAttribute, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLBoolean>::value); > >-static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetElementById((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetElementById, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLInterface<Element>>::value, DOMJIT::IDLArgumentTypeFilter<IDLRequiresExistingAtomicStringAdaptor<IDLDOMString>>::value); >+static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetElementById((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetElementById, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLInterface<Element>>::value, DOMJIT::IDLArgumentTypeFilter<IDLRequiresExistingAtomStringAdaptor<IDLDOMString>>::value); > >-static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetElementsByName((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetElementsByName, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLInterface<NodeList>>::value, DOMJIT::IDLArgumentTypeFilter<IDLAtomicStringAdaptor<IDLDOMString>>::value); >+static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetElementsByName((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetElementsByName, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLInterface<NodeList>>::value, DOMJIT::IDLArgumentTypeFilter<IDLAtomStringAdaptor<IDLDOMString>>::value); > > static const JSC::DOMJIT::GetterSetter DOMJITAttributeForTestDOMJITAnyAttr { > jsTestDOMJITAnyAttr, >@@ -1208,7 +1208,7 @@ static inline JSC::EncodedJSValue jsTestDOMJITPrototypeFunctionGetElementByIdBod > auto& impl = castedThis->wrapped(); > if (UNLIKELY(state->argumentCount() < 1)) > return throwVMError(state, throwScope, createNotEnoughArgumentsError(state)); >- auto elementId = convert<IDLRequiresExistingAtomicStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); >+ auto elementId = convert<IDLRequiresExistingAtomStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); > RETURN_IF_EXCEPTION(throwScope, encodedJSValue()); > return JSValue::encode(toJS<IDLInterface<Element>>(*state, *castedThis->globalObject(), impl.getElementById(WTFMove(elementId)))); > } >@@ -1218,7 +1218,7 @@ EncodedJSValue JSC_HOST_CALL jsTestDOMJITPrototypeFunctionGetElementById(ExecSta > return IDLOperation<JSTestDOMJIT>::call<jsTestDOMJITPrototypeFunctionGetElementByIdBody>(*state, "getElementById"); > } > >-JSC::EncodedJSValue JIT_OPERATION unsafeJsTestDOMJITPrototypeFunctionGetElementById(JSC::ExecState* state, JSTestDOMJIT* castedThis, DOMJIT::IDLJSArgumentType<IDLRequiresExistingAtomicStringAdaptor<IDLDOMString>> encodedElementId) >+JSC::EncodedJSValue JIT_OPERATION unsafeJsTestDOMJITPrototypeFunctionGetElementById(JSC::ExecState* state, JSTestDOMJIT* castedThis, DOMJIT::IDLJSArgumentType<IDLRequiresExistingAtomStringAdaptor<IDLDOMString>> encodedElementId) > { > UNUSED_PARAM(state); > VM& vm = state->vm(); >@@ -1226,7 +1226,7 @@ JSC::EncodedJSValue JIT_OPERATION unsafeJsTestDOMJITPrototypeFunctionGetElementB > auto throwScope = DECLARE_THROW_SCOPE(vm); > UNUSED_PARAM(throwScope); > auto& impl = castedThis->wrapped(); >- auto elementId = DOMJIT::DirectConverter<IDLRequiresExistingAtomicStringAdaptor<IDLDOMString>>::directConvert(*state, encodedElementId); >+ auto elementId = DOMJIT::DirectConverter<IDLRequiresExistingAtomStringAdaptor<IDLDOMString>>::directConvert(*state, encodedElementId); > RETURN_IF_EXCEPTION(throwScope, encodedJSValue()); > return JSValue::encode(toJS<IDLInterface<Element>>(*state, *castedThis->globalObject(), impl.getElementById(WTFMove(elementId)))); > } >@@ -1238,7 +1238,7 @@ static inline JSC::EncodedJSValue jsTestDOMJITPrototypeFunctionGetElementsByName > auto& impl = castedThis->wrapped(); > if (UNLIKELY(state->argumentCount() < 1)) > return throwVMError(state, throwScope, createNotEnoughArgumentsError(state)); >- auto elementName = convert<IDLAtomicStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); >+ auto elementName = convert<IDLAtomStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); > RETURN_IF_EXCEPTION(throwScope, encodedJSValue()); > return JSValue::encode(toJS<IDLInterface<NodeList>>(*state, *castedThis->globalObject(), impl.getElementsByName(WTFMove(elementName)))); > } >@@ -1248,7 +1248,7 @@ EncodedJSValue JSC_HOST_CALL jsTestDOMJITPrototypeFunctionGetElementsByName(Exec > return IDLOperation<JSTestDOMJIT>::call<jsTestDOMJITPrototypeFunctionGetElementsByNameBody>(*state, "getElementsByName"); > } > >-JSC::EncodedJSValue JIT_OPERATION unsafeJsTestDOMJITPrototypeFunctionGetElementsByName(JSC::ExecState* state, JSTestDOMJIT* castedThis, DOMJIT::IDLJSArgumentType<IDLAtomicStringAdaptor<IDLDOMString>> encodedElementName) >+JSC::EncodedJSValue JIT_OPERATION unsafeJsTestDOMJITPrototypeFunctionGetElementsByName(JSC::ExecState* state, JSTestDOMJIT* castedThis, DOMJIT::IDLJSArgumentType<IDLAtomStringAdaptor<IDLDOMString>> encodedElementName) > { > UNUSED_PARAM(state); > VM& vm = state->vm(); >@@ -1256,7 +1256,7 @@ JSC::EncodedJSValue JIT_OPERATION unsafeJsTestDOMJITPrototypeFunctionGetElements > auto throwScope = DECLARE_THROW_SCOPE(vm); > UNUSED_PARAM(throwScope); > auto& impl = castedThis->wrapped(); >- auto elementName = DOMJIT::DirectConverter<IDLAtomicStringAdaptor<IDLDOMString>>::directConvert(*state, encodedElementName); >+ auto elementName = DOMJIT::DirectConverter<IDLAtomStringAdaptor<IDLDOMString>>::directConvert(*state, encodedElementName); > RETURN_IF_EXCEPTION(throwScope, encodedJSValue()); > return JSValue::encode(toJS<IDLInterface<NodeList>>(*state, *castedThis->globalObject(), impl.getElementsByName(WTFMove(elementName)))); > } >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp >index 5fc7cb6c555e745bcfbabca0643118c6d61f076f..92b9d98a5e7372f2146c74181107b5a288a39991 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp >@@ -152,7 +152,7 @@ bool JSTestEventTarget::getOwnPropertySlot(JSObject* object, ExecState* state, P > } > using GetterIDLType = IDLInterface<Node>; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -180,7 +180,7 @@ bool JSTestEventTarget::getOwnPropertySlotByIndex(JSObject* object, ExecState* s > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLInterface<Node>; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterNoIdentifier.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterNoIdentifier.cpp >index 35b77a74db67869f4da76726848ca3c633950c57..39e6ae5778b107cd625b2d28239a62e1fd91263e 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterNoIdentifier.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterNoIdentifier.cpp >@@ -151,7 +151,7 @@ bool JSTestNamedAndIndexedSetterNoIdentifier::getOwnPropertySlot(JSObject* objec > } > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -179,7 +179,7 @@ bool JSTestNamedAndIndexedSetterNoIdentifier::getOwnPropertySlotByIndex(JSObject > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterThrowingException.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterThrowingException.cpp >index f1b1da1b54b4ba24c8794e921db565b991c9dc7f..9f8dcc68bb73431592d8bcb89b4f4b146791cea3 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterThrowingException.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterThrowingException.cpp >@@ -151,7 +151,7 @@ bool JSTestNamedAndIndexedSetterThrowingException::getOwnPropertySlot(JSObject* > } > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -179,7 +179,7 @@ bool JSTestNamedAndIndexedSetterThrowingException::getOwnPropertySlotByIndex(JSO > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterWithIdentifier.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterWithIdentifier.cpp >index fb6089cbd41a5bfe3282737b227158d30817fe7a..c3f14e57acb357ee16e71eb60d0c922a2285125f 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterWithIdentifier.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedAndIndexedSetterWithIdentifier.cpp >@@ -160,7 +160,7 @@ bool JSTestNamedAndIndexedSetterWithIdentifier::getOwnPropertySlot(JSObject* obj > } > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -188,7 +188,7 @@ bool JSTestNamedAndIndexedSetterWithIdentifier::getOwnPropertySlotByIndex(JSObje > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterNoIdentifier.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterNoIdentifier.cpp >index e7d91f8c868c253d6b88012142553112c3f8d80e..ef3e5591aeff4c3f6833d1d8632071d73e99b5bb 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterNoIdentifier.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterNoIdentifier.cpp >@@ -142,7 +142,7 @@ bool JSTestNamedDeleterNoIdentifier::getOwnPropertySlot(JSObject* object, ExecSt > ASSERT_GC_OBJECT_INHERITS(thisObject, info()); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -162,7 +162,7 @@ bool JSTestNamedDeleterNoIdentifier::getOwnPropertySlotByIndex(JSObject* object, > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterThrowingException.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterThrowingException.cpp >index a7d76ba7a3deb5845304be65c89d8e0da29daf7a..0fd763b328fbb8818cdc11d98fc85538fc73e8fb 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterThrowingException.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterThrowingException.cpp >@@ -142,7 +142,7 @@ bool JSTestNamedDeleterThrowingException::getOwnPropertySlot(JSObject* object, E > ASSERT_GC_OBJECT_INHERITS(thisObject, info()); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -162,7 +162,7 @@ bool JSTestNamedDeleterThrowingException::getOwnPropertySlotByIndex(JSObject* ob > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterWithIdentifier.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterWithIdentifier.cpp >index 9edab591d948349650ad123919f6b36316d54d6b..9e500bdd6d80e81583cc6b77275266b398821134 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterWithIdentifier.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterWithIdentifier.cpp >@@ -148,7 +148,7 @@ bool JSTestNamedDeleterWithIdentifier::getOwnPropertySlot(JSObject* object, Exec > ASSERT_GC_OBJECT_INHERITS(thisObject, info()); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -168,7 +168,7 @@ bool JSTestNamedDeleterWithIdentifier::getOwnPropertySlotByIndex(JSObject* objec > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterWithIndexedGetter.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterWithIndexedGetter.cpp >index 2fb624a015b4ba7898d909250bd074c920ca6e3e..9492b57ef7ed1f9ccd487ee35f20eae3998ce867 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterWithIndexedGetter.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedDeleterWithIndexedGetter.cpp >@@ -151,7 +151,7 @@ bool JSTestNamedDeleterWithIndexedGetter::getOwnPropertySlot(JSObject* object, E > } > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -179,7 +179,7 @@ bool JSTestNamedDeleterWithIndexedGetter::getOwnPropertySlotByIndex(JSObject* ob > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterCallWith.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterCallWith.cpp >index f5959690980573180e86246f1483be9d03090f2e..10e4a6b4b6353dd061e101873b3da6b9787fa4fd 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterCallWith.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterCallWith.cpp >@@ -142,7 +142,7 @@ bool JSTestNamedGetterCallWith::getOwnPropertySlot(JSObject* object, ExecState* > ASSERT_GC_OBJECT_INHERITS(thisObject, info()); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(worldForDOMObject(thisObject), propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(worldForDOMObject(thisObject), propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -162,7 +162,7 @@ bool JSTestNamedGetterCallWith::getOwnPropertySlotByIndex(JSObject* object, Exec > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(worldForDOMObject(thisObject), propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(worldForDOMObject(thisObject), propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterNoIdentifier.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterNoIdentifier.cpp >index fae104a834cd1db8a4b2a41a7c167c9b7bd1f8a5..b2db2ada44f97798b91c0d86b0c6f5d3399dea98 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterNoIdentifier.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterNoIdentifier.cpp >@@ -142,7 +142,7 @@ bool JSTestNamedGetterNoIdentifier::getOwnPropertySlot(JSObject* object, ExecSta > ASSERT_GC_OBJECT_INHERITS(thisObject, info()); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -162,7 +162,7 @@ bool JSTestNamedGetterNoIdentifier::getOwnPropertySlotByIndex(JSObject* object, > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterWithIdentifier.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterWithIdentifier.cpp >index 918b2d61ebd6d22f7062164f65dd241ca48b4814..daa279f99f0a2b18a71313ecd56352f0547e74a2 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterWithIdentifier.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedGetterWithIdentifier.cpp >@@ -148,7 +148,7 @@ bool JSTestNamedGetterWithIdentifier::getOwnPropertySlot(JSObject* object, ExecS > ASSERT_GC_OBJECT_INHERITS(thisObject, info()); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().getterName(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().getterName(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -168,7 +168,7 @@ bool JSTestNamedGetterWithIdentifier::getOwnPropertySlotByIndex(JSObject* object > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().getterName(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().getterName(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterNoIdentifier.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterNoIdentifier.cpp >index 021ce1ea16742d3910eab1e9756e1655fbf757b1..de61438d03a821dff14e99a431e15b8cd038438c 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterNoIdentifier.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterNoIdentifier.cpp >@@ -142,7 +142,7 @@ bool JSTestNamedSetterNoIdentifier::getOwnPropertySlot(JSObject* object, ExecSta > ASSERT_GC_OBJECT_INHERITS(thisObject, info()); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -162,7 +162,7 @@ bool JSTestNamedSetterNoIdentifier::getOwnPropertySlotByIndex(JSObject* object, > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterThrowingException.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterThrowingException.cpp >index 052a1a22825ab4d6099b8db6da18d5174d50ba01..ff95182d91dfdd2434bb5fa059faca04d2b8365f 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterThrowingException.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterThrowingException.cpp >@@ -142,7 +142,7 @@ bool JSTestNamedSetterThrowingException::getOwnPropertySlot(JSObject* object, Ex > ASSERT_GC_OBJECT_INHERITS(thisObject, info()); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -162,7 +162,7 @@ bool JSTestNamedSetterThrowingException::getOwnPropertySlotByIndex(JSObject* obj > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIdentifier.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIdentifier.cpp >index 0b8f5de1cac641abdf0f690bd82dbb05d3f29a71..f5fb8b27cb05e48aec80481eb06df7b5f16171b0 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIdentifier.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIdentifier.cpp >@@ -148,7 +148,7 @@ bool JSTestNamedSetterWithIdentifier::getOwnPropertySlot(JSObject* object, ExecS > ASSERT_GC_OBJECT_INHERITS(thisObject, info()); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -168,7 +168,7 @@ bool JSTestNamedSetterWithIdentifier::getOwnPropertySlotByIndex(JSObject* object > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIndexedGetter.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIndexedGetter.cpp >index 090da163fc52093171cb4fdc04abd6beb8577850..80eb5525621cdefbdc98eb5da50290d38a8d74f2 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIndexedGetter.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIndexedGetter.cpp >@@ -160,7 +160,7 @@ bool JSTestNamedSetterWithIndexedGetter::getOwnPropertySlot(JSObject* object, Ex > } > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -188,7 +188,7 @@ bool JSTestNamedSetterWithIndexedGetter::getOwnPropertySlotByIndex(JSObject* obj > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIndexedGetterAndSetter.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIndexedGetterAndSetter.cpp >index 5d0ba23c476c9c6215b2ce7e115f3559839caf2c..8e15fdf9d10f10699e0575d89a78cf6a027a8d49 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIndexedGetterAndSetter.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithIndexedGetterAndSetter.cpp >@@ -160,7 +160,7 @@ bool JSTestNamedSetterWithIndexedGetterAndSetter::getOwnPropertySlot(JSObject* o > } > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -188,7 +188,7 @@ bool JSTestNamedSetterWithIndexedGetterAndSetter::getOwnPropertySlotByIndex(JSOb > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithOverrideBuiltins.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithOverrideBuiltins.cpp >index f27629c7bbb3a2b88bb556d09e754536eb7c400e..53b137bfe3bb60eee76b5040b5e6caf1dbaa1745 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithOverrideBuiltins.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithOverrideBuiltins.cpp >@@ -142,7 +142,7 @@ bool JSTestNamedSetterWithOverrideBuiltins::getOwnPropertySlot(JSObject* object, > ASSERT_GC_OBJECT_INHERITS(thisObject, info()); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -162,7 +162,7 @@ bool JSTestNamedSetterWithOverrideBuiltins::getOwnPropertySlotByIndex(JSObject* > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithUnforgableProperties.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithUnforgableProperties.cpp >index d4d9738cdb01b8426b663c21fc8298f144ba2637..bc9a41f261e57785679f50b636d0ff4db8782a11 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithUnforgableProperties.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithUnforgableProperties.cpp >@@ -166,7 +166,7 @@ bool JSTestNamedSetterWithUnforgableProperties::getOwnPropertySlot(JSObject* obj > ASSERT_GC_OBJECT_INHERITS(thisObject, info()); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -186,7 +186,7 @@ bool JSTestNamedSetterWithUnforgableProperties::getOwnPropertySlotByIndex(JSObje > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithUnforgablePropertiesAndOverrideBuiltins.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithUnforgablePropertiesAndOverrideBuiltins.cpp >index ce59e749c273e01c4409f6653af5dfa8d04d2a34..198783eb9f1c40ac710da985bc17b7f2aa25411f 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithUnforgablePropertiesAndOverrideBuiltins.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedSetterWithUnforgablePropertiesAndOverrideBuiltins.cpp >@@ -166,7 +166,7 @@ bool JSTestNamedSetterWithUnforgablePropertiesAndOverrideBuiltins::getOwnPropert > ASSERT_GC_OBJECT_INHERITS(thisObject, info()); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -186,7 +186,7 @@ bool JSTestNamedSetterWithUnforgablePropertiesAndOverrideBuiltins::getOwnPropert > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLDOMString; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp >index 5df73bf451507f20d916fd11cf9203af9140fc42..c781c86649c7c3a54418e903f221096687187223 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp >@@ -6453,7 +6453,7 @@ static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalAt > UNUSED_PARAM(state); > UNUSED_PARAM(throwScope); > auto& impl = castedThis->wrapped(); >- auto str = state->argument(0).isUndefined() ? nullAtom() : convert<IDLAtomicStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); >+ auto str = state->argument(0).isUndefined() ? nullAtom() : convert<IDLAtomStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); > RETURN_IF_EXCEPTION(throwScope, encodedJSValue()); > impl.methodWithOptionalAtomicString(WTFMove(str)); > return JSValue::encode(jsUndefined()); >@@ -6485,7 +6485,7 @@ static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalAt > UNUSED_PARAM(state); > UNUSED_PARAM(throwScope); > auto& impl = castedThis->wrapped(); >- auto str = state->argument(0).isUndefined() ? AtomicString("foo", AtomicString::ConstructFromLiteral) : convert<IDLAtomicStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); >+ auto str = state->argument(0).isUndefined() ? AtomString("foo", AtomString::ConstructFromLiteral) : convert<IDLAtomStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); > RETURN_IF_EXCEPTION(throwScope, encodedJSValue()); > impl.methodWithOptionalAtomicStringAndDefaultValue(WTFMove(str)); > return JSValue::encode(jsUndefined()); >@@ -6533,7 +6533,7 @@ static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalAt > UNUSED_PARAM(state); > UNUSED_PARAM(throwScope); > auto& impl = castedThis->wrapped(); >- auto str = state->argument(0).isUndefined() ? nullAtom() : convert<IDLAtomicStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); >+ auto str = state->argument(0).isUndefined() ? nullAtom() : convert<IDLAtomStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); > RETURN_IF_EXCEPTION(throwScope, encodedJSValue()); > impl.methodWithOptionalAtomicStringIsNull(WTFMove(str)); > return JSValue::encode(jsUndefined()); >@@ -6581,7 +6581,7 @@ static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalAt > UNUSED_PARAM(state); > UNUSED_PARAM(throwScope); > auto& impl = castedThis->wrapped(); >- auto str = state->argument(0).isUndefined() ? emptyAtom() : convert<IDLAtomicStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); >+ auto str = state->argument(0).isUndefined() ? emptyAtom() : convert<IDLAtomStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); > RETURN_IF_EXCEPTION(throwScope, encodedJSValue()); > impl.methodWithOptionalAtomicStringIsEmptyString(WTFMove(str)); > return JSValue::encode(jsUndefined()); >@@ -7863,7 +7863,7 @@ static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionGetElementByIdBody(J > auto& impl = castedThis->wrapped(); > if (UNLIKELY(state->argumentCount() < 1)) > return throwVMError(state, throwScope, createNotEnoughArgumentsError(state)); >- auto elementId = convert<IDLRequiresExistingAtomicStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); >+ auto elementId = convert<IDLRequiresExistingAtomStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); > RETURN_IF_EXCEPTION(throwScope, encodedJSValue()); > return JSValue::encode(toJS<IDLNullable<IDLInterface<Element>>>(*state, *castedThis->globalObject(), impl.getElementById(WTFMove(elementId)))); > } >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp >index 9b5a0272316c7583af327c2bae97f52c79cc8399..30c7912adb6c38d30045955384e300bf530dd217 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp >@@ -151,7 +151,7 @@ bool JSTestOverrideBuiltins::getOwnPropertySlot(JSObject* object, ExecState* sta > ASSERT_GC_OBJECT_INHERITS(thisObject, info()); > using GetterIDLType = IDLInterface<Node>; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >@@ -171,7 +171,7 @@ bool JSTestOverrideBuiltins::getOwnPropertySlotByIndex(JSObject* object, ExecSta > auto propertyName = Identifier::from(state, index); > using GetterIDLType = IDLInterface<Node>; > auto getterFunctor = [] (auto& thisObject, auto propertyName) -> Optional<typename GetterIDLType::ImplementationType> { >- auto result = thisObject.wrapped().namedItem(propertyNameToAtomicString(propertyName)); >+ auto result = thisObject.wrapped().namedItem(propertyNameToAtomString(propertyName)); > if (!GetterIDLType::isNullValue(result)) > return typename GetterIDLType::ImplementationType { GetterIDLType::extractValueFromNullable(result) }; > return WTF::nullopt; >diff --git a/Source/WebCore/bindings/scripts/test/TestDOMJIT.idl b/Source/WebCore/bindings/scripts/test/TestDOMJIT.idl >index ac4ea66687ae78c525010990bf910d7d8c370ec7..c602f59b082f039672b1ac0e3ac139df979ac265 100644 >--- a/Source/WebCore/bindings/scripts/test/TestDOMJIT.idl >+++ b/Source/WebCore/bindings/scripts/test/TestDOMJIT.idl >@@ -67,6 +67,6 @@ interface TestDOMJIT : Node { > [DOMJIT=ReadDOM] DOMString? getAttribute(DOMString name); > [DOMJIT=ReadDOM] DOMString item(unsigned short x, unsigned short y); > [DOMJIT=ReadDOM] boolean hasAttribute(); >- [DOMJIT=ReadDOM] Element getElementById([RequiresExistingAtomicString] DOMString elementId); >- [DOMJIT=ReadDOM] NodeList getElementsByName([AtomicString] DOMString elementName); >+ [DOMJIT=ReadDOM] Element getElementById([RequiresExistingAtomString] DOMString elementId); >+ [DOMJIT=ReadDOM] NodeList getElementsByName([AtomString] DOMString elementName); > }; >diff --git a/Source/WebCore/bindings/scripts/test/TestObj.idl b/Source/WebCore/bindings/scripts/test/TestObj.idl >index 2771752214c9e65ae1de06c0d580ddffdb208205..0872a9f5132b67dca6144fe6f343d8f22ac73828 100644 >--- a/Source/WebCore/bindings/scripts/test/TestObj.idl >+++ b/Source/WebCore/bindings/scripts/test/TestObj.idl >@@ -220,15 +220,15 @@ enum TestConfidence { "high", "kinda-low" }; > void methodWithNonOptionalArgAndTwoOptionalArgs(long nonOpt, optional long opt1, optional long opt2); > void methodWithOptionalString(optional DOMString str); > void methodWithOptionalUSVString(optional USVString str); >- void methodWithOptionalAtomicString(optional [AtomicString] DOMString str); >+ void methodWithOptionalAtomicString(optional [AtomString] DOMString str); > void methodWithOptionalStringAndDefaultValue(optional DOMString str = "foo"); >- void methodWithOptionalAtomicStringAndDefaultValue(optional [AtomicString] DOMString str = "foo"); >+ void methodWithOptionalAtomicStringAndDefaultValue(optional [AtomString] DOMString str = "foo"); > void methodWithOptionalStringIsNull(optional DOMString str = null); > void methodWithOptionalStringIsUndefined(optional DOMString str = "undefined"); >- void methodWithOptionalAtomicStringIsNull(optional [AtomicString] DOMString str = null); >+ void methodWithOptionalAtomicStringIsNull(optional [AtomString] DOMString str = null); > void methodWithOptionalStringIsEmptyString(optional DOMString str = ""); > void methodWithOptionalUSVStringIsEmptyString(optional USVString str = ""); >- void methodWithOptionalAtomicStringIsEmptyString(optional [AtomicString] DOMString str = ""); >+ void methodWithOptionalAtomicStringIsEmptyString(optional [AtomString] DOMString str = ""); > void methodWithOptionalDoubleIsNaN(optional unrestricted double number = NaN); > void methodWithOptionalFloatIsNaN(optional unrestricted float number = NaN); > void methodWithOptionalLongLong(optional long long number); >@@ -344,7 +344,7 @@ enum TestConfidence { "high", "kinda-low" }; > > void methodWithAndWithoutNullableSequence(sequence<unsigned long> arrayArg, sequence<unsigned long>? nullableArrayArg); > >- Element? getElementById([RequiresExistingAtomicString] DOMString elementId); >+ Element? getElementById([RequiresExistingAtomString] DOMString elementId); > > [CheckSecurityForNode] readonly attribute Document contentDocument; > [CheckSecurityForNode, MayThrowException] SVGDocument getSVGDocument(); >diff --git a/Source/WebCore/contentextensions/ContentExtensionParser.cpp b/Source/WebCore/contentextensions/ContentExtensionParser.cpp >index 7723a2fa59d3a98e3e6a167c7d26b229c235da76..067c9892c41f88d2cfd843492e4c9ba8688d571a 100644 >--- a/Source/WebCore/contentextensions/ContentExtensionParser.cpp >+++ b/Source/WebCore/contentextensions/ContentExtensionParser.cpp >@@ -231,7 +231,7 @@ static Expected<Trigger, std::error_code> loadTrigger(ExecState& exec, const JSO > bool isValidCSSSelector(const String& selector) > { > ASSERT(isMainThread()); >- AtomicString::init(); >+ AtomString::init(); > QualifiedName::init(); > CSSParserContext context(HTMLQuirksMode); > CSSParser parser(context); >diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp >index 4bc064f776a25709dfa830f60f21adebcd70f924..aff6d3aba300bdf45a2062878f02f60468663b5b 100644 >--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp >+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp >@@ -1731,7 +1731,7 @@ bool ComputedStyleExtractor::useFixedFontDefaultSize() > return style->fontDescription().useFixedDefaultSize(); > } > >-static CSSValueID identifierForFamily(const AtomicString& family) >+static CSSValueID identifierForFamily(const AtomString& family) > { > if (family == cursiveFamily) > return CSSValueCursive; >@@ -1750,7 +1750,7 @@ static CSSValueID identifierForFamily(const AtomicString& family) > return CSSValueInvalid; > } > >-static Ref<CSSPrimitiveValue> valueForFamily(const AtomicString& family) >+static Ref<CSSPrimitiveValue> valueForFamily(const AtomString& family) > { > if (CSSValueID familyIdentifier = identifierForFamily(family)) > return CSSValuePool::singleton().createIdentifierValue(familyIdentifier); >diff --git a/Source/WebCore/css/CSSCustomIdentValue.cpp b/Source/WebCore/css/CSSCustomIdentValue.cpp >index 26d6e3bb0d031d67b4c0a5833f700f8cc3c3e2b6..01e48bddba7ba3be68403ea7513dcfc54853a3a5 100644 >--- a/Source/WebCore/css/CSSCustomIdentValue.cpp >+++ b/Source/WebCore/css/CSSCustomIdentValue.cpp >@@ -53,7 +53,7 @@ CSSCustomIdentValue::CSSCustomIdentValue(CSSPropertyID id) > String CSSCustomIdentValue::customCSSText() const > { > if (isKnownPropertyID()) >- return getPropertyNameAtomicString(m_propertyId); >+ return getPropertyNameAtomString(m_propertyId); > StringBuilder builder; > serializeIdentifier(m_string, builder); > return builder.toString(); >diff --git a/Source/WebCore/css/CSSCustomIdentValue.h b/Source/WebCore/css/CSSCustomIdentValue.h >index a562aed2da13a9fb3926e51abd9c0b6d899962ca..4abcf31ddaafbdeceac642e06ec73d8ef9863750 100644 >--- a/Source/WebCore/css/CSSCustomIdentValue.h >+++ b/Source/WebCore/css/CSSCustomIdentValue.h >@@ -62,7 +62,7 @@ private: > CSSCustomIdentValue(const String&); > CSSCustomIdentValue(CSSPropertyID); > >- // FIXME: Change this to an AtomicString. >+ // FIXME: Change this to an AtomString. > String m_string; > CSSPropertyID m_propertyId; > }; >diff --git a/Source/WebCore/css/CSSCustomPropertyValue.h b/Source/WebCore/css/CSSCustomPropertyValue.h >index bdaa74d55a0f871926df586b66bc02aac90e6783..3a52d04618fd6432452b2dda8347043949a081c8 100644 >--- a/Source/WebCore/css/CSSCustomPropertyValue.h >+++ b/Source/WebCore/css/CSSCustomPropertyValue.h >@@ -44,35 +44,35 @@ class CSSCustomPropertyValue final : public CSSValue { > public: > using VariantValue = Variant<Ref<CSSVariableReferenceValue>, CSSValueID, Ref<CSSVariableData>, Length, Ref<StyleImage>>; > >- static Ref<CSSCustomPropertyValue> createUnresolved(const AtomicString& name, Ref<CSSVariableReferenceValue>&& value) >+ static Ref<CSSCustomPropertyValue> createUnresolved(const AtomString& name, Ref<CSSVariableReferenceValue>&& value) > { > return adoptRef(*new CSSCustomPropertyValue(name, { WTFMove(value) })); > } > >- static Ref<CSSCustomPropertyValue> createUnresolved(const AtomicString& name, CSSValueID value) >+ static Ref<CSSCustomPropertyValue> createUnresolved(const AtomString& name, CSSValueID value) > { > return adoptRef(*new CSSCustomPropertyValue(name, { value })); > } > >- static Ref<CSSCustomPropertyValue> createWithID(const AtomicString& name, CSSValueID id) >+ static Ref<CSSCustomPropertyValue> createWithID(const AtomString& name, CSSValueID id) > { > ASSERT(id == CSSValueInherit || id == CSSValueInitial || id == CSSValueUnset || id == CSSValueRevert || id == CSSValueInvalid); > return adoptRef(*new CSSCustomPropertyValue(name, { id })); > } > >- static Ref<CSSCustomPropertyValue> createSyntaxAll(const AtomicString& name, Ref<CSSVariableData>&& value) >+ static Ref<CSSCustomPropertyValue> createSyntaxAll(const AtomString& name, Ref<CSSVariableData>&& value) > { > return adoptRef(*new CSSCustomPropertyValue(name, { WTFMove(value) })); > } > >- static Ref<CSSCustomPropertyValue> createSyntaxLength(const AtomicString& name, Length value) >+ static Ref<CSSCustomPropertyValue> createSyntaxLength(const AtomString& name, Length value) > { > ASSERT(!value.isUndefined()); > ASSERT(!value.isCalculated()); > return adoptRef(*new CSSCustomPropertyValue(name, { WTFMove(value) })); > } > >- static Ref<CSSCustomPropertyValue> createSyntaxImage(const AtomicString& name, Ref<StyleImage>&& value) >+ static Ref<CSSCustomPropertyValue> createSyntaxImage(const AtomString& name, Ref<StyleImage>&& value) > { > return adoptRef(*new CSSCustomPropertyValue(name, { WTFMove(value) })); > } >@@ -84,7 +84,7 @@ public: > > String customCSSText() const; > >- const AtomicString& name() const { return m_name; } >+ const AtomString& name() const { return m_name; } > bool isResolved() const { return !WTF::holds_alternative<Ref<CSSVariableReferenceValue>>(m_value); } > bool isUnset() const { return WTF::holds_alternative<CSSValueID>(m_value) && WTF::get<CSSValueID>(m_value) == CSSValueUnset; } > bool isInvalid() const { return WTF::holds_alternative<CSSValueID>(m_value) && WTF::get<CSSValueID>(m_value) == CSSValueInvalid; } >@@ -95,7 +95,7 @@ public: > bool equals(const CSSCustomPropertyValue& other) const; > > private: >- CSSCustomPropertyValue(const AtomicString& name, VariantValue&& value) >+ CSSCustomPropertyValue(const AtomString& name, VariantValue&& value) > : CSSValue(CustomPropertyClass) > , m_name(name) > , m_value(WTFMove(value)) >@@ -125,7 +125,7 @@ private: > WTF::visit(visitor, other.m_value); > } > >- const AtomicString m_name; >+ const AtomString m_name; > VariantValue m_value; > > mutable String m_stringValue; >diff --git a/Source/WebCore/css/CSSFontFaceSet.cpp b/Source/WebCore/css/CSSFontFaceSet.cpp >index 0a8cf0939d6916fe20b9d8bc9d911aedbca5a9c0..05e3a3f6e21bc9281785569a14aa50ff52e4a270 100644 >--- a/Source/WebCore/css/CSSFontFaceSet.cpp >+++ b/Source/WebCore/css/CSSFontFaceSet.cpp >@@ -351,8 +351,8 @@ ExceptionOr<Vector<std::reference_wrapper<CSSFontFace>>> CSSFontFaceSet::matchin > return Exception { SyntaxError }; > CSSValueList& familyList = downcast<CSSValueList>(*family); > >- HashSet<AtomicString> uniqueFamilies; >- Vector<AtomicString> familyOrder; >+ HashSet<AtomString> uniqueFamilies; >+ Vector<AtomString> familyOrder; > for (auto& family : familyList) { > auto& primitive = downcast<CSSPrimitiveValue>(family.get()); > if (!primitive.isFontFamily()) >@@ -402,7 +402,7 @@ ExceptionOr<bool> CSSFontFaceSet::check(const String& font, const String& text) > return true; > } > >-CSSSegmentedFontFace* CSSFontFaceSet::fontFace(FontSelectionRequest request, const AtomicString& family) >+CSSSegmentedFontFace* CSSFontFaceSet::fontFace(FontSelectionRequest request, const AtomString& family) > { > auto iterator = m_facesLookupTable.find(family); > if (iterator == m_facesLookupTable.end()) >diff --git a/Source/WebCore/css/CSSFontFaceSet.h b/Source/WebCore/css/CSSFontFaceSet.h >index 795d0a86275b0149aef4cc14e88ea30de713f050..69c18568a2906d7e3254bc92509bc71b6b4eeaa7 100644 >--- a/Source/WebCore/css/CSSFontFaceSet.h >+++ b/Source/WebCore/css/CSSFontFaceSet.h >@@ -68,7 +68,7 @@ public: > > ExceptionOr<bool> check(const String& font, const String& text); > >- CSSSegmentedFontFace* fontFace(FontSelectionRequest, const AtomicString& family); >+ CSSSegmentedFontFace* fontFace(FontSelectionRequest, const AtomString& family); > > enum class Status { Loading, Loaded }; > Status status() const { return m_status; } >diff --git a/Source/WebCore/css/CSSFontFaceSource.h b/Source/WebCore/css/CSSFontFaceSource.h >index 2a6e4aafc496a1ef8cbaed896892b56f72117030..291b248092637fcb4c7708f45377760918ed4d35 100644 >--- a/Source/WebCore/css/CSSFontFaceSource.h >+++ b/Source/WebCore/css/CSSFontFaceSource.h >@@ -29,7 +29,7 @@ > #include "CachedResourceHandle.h" > #include <JavaScriptCore/ArrayBufferView.h> > #include <wtf/WeakPtr.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -65,7 +65,7 @@ public: > }; > Status status() const { return m_status; } > >- const AtomicString& familyNameOrURI() const { return m_familyNameOrURI; } >+ const AtomString& familyNameOrURI() const { return m_familyNameOrURI; } > > void opportunisticallyStartFontDataURLLoading(CSSFontSelector&); > >@@ -85,7 +85,7 @@ private: > > void setStatus(Status); > >- AtomicString m_familyNameOrURI; // URI for remote, built-in font name for local. >+ AtomString m_familyNameOrURI; // URI for remote, built-in font name for local. > CachedResourceHandle<CachedFont> m_font; // For remote fonts, a pointer to our cached resource. > CSSFontFace& m_face; // Our owning font face. > >diff --git a/Source/WebCore/css/CSSFontSelector.cpp b/Source/WebCore/css/CSSFontSelector.cpp >index a7546857686ab890b2f788aef7829f8db72e60e3..db2e7998515ecf93d654e6e90ba32ed217cf59c4 100644 >--- a/Source/WebCore/css/CSSFontSelector.cpp >+++ b/Source/WebCore/css/CSSFontSelector.cpp >@@ -55,7 +55,7 @@ > #include "WebKitFontFamilyNames.h" > #include <wtf/Ref.h> > #include <wtf/SetForScope.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -249,7 +249,7 @@ void CSSFontSelector::dispatchInvalidationCallbacks() > client->fontsNeedUpdate(*this); > } > >-void CSSFontSelector::opportunisticallyStartFontDataURLLoading(const FontCascadeDescription& description, const AtomicString& familyName) >+void CSSFontSelector::opportunisticallyStartFontDataURLLoading(const FontCascadeDescription& description, const AtomString& familyName) > { > const auto& segmentedFontFace = m_cssFontFaceSet->fontFace(description.fontSelectionRequest(), familyName); > if (!segmentedFontFace) >@@ -274,7 +274,7 @@ void CSSFontSelector::fontCacheInvalidated() > dispatchInvalidationCallbacks(); > } > >-static AtomicString resolveGenericFamily(Document* document, const FontDescription& fontDescription, const AtomicString& familyName) >+static AtomString resolveGenericFamily(Document* document, const FontDescription& fontDescription, const AtomString& familyName) > { > auto platformResult = FontDescription::platformResolveGenericFamily(fontDescription.script(), fontDescription.locale(), familyName); > if (!platformResult.isNull()) >@@ -304,7 +304,7 @@ static AtomicString resolveGenericFamily(Document* document, const FontDescripti > return familyName; > } > >-FontRanges CSSFontSelector::fontRangesForFamily(const FontDescription& fontDescription, const AtomicString& familyName) >+FontRanges CSSFontSelector::fontRangesForFamily(const FontDescription& fontDescription, const AtomString& familyName) > { > // If this ASSERT() fires, it usually means you forgot a document.updateStyleIfNeeded() somewhere. > ASSERT(!m_buildIsUnderway || m_computingRootStyleFontCount); >@@ -312,7 +312,7 @@ FontRanges CSSFontSelector::fontRangesForFamily(const FontDescription& fontDescr > // FIXME: The spec (and Firefox) says user specified generic families (sans-serif etc.) should be resolved before the @font-face lookup too. > bool resolveGenericFamilyFirst = familyName == standardFamily; > >- AtomicString familyForLookup = resolveGenericFamilyFirst ? resolveGenericFamily(m_document.get(), fontDescription, familyName) : familyName; >+ AtomString familyForLookup = resolveGenericFamilyFirst ? resolveGenericFamily(m_document.get(), fontDescription, familyName) : familyName; > auto* face = m_cssFontFaceSet->fontFace(fontDescription.fontSelectionRequest(), familyForLookup); > if (face) { > if (RuntimeEnabledFeatures::sharedFeatures().webAPIStatisticsEnabled()) { >diff --git a/Source/WebCore/css/CSSFontSelector.h b/Source/WebCore/css/CSSFontSelector.h >index 9c31b36a71577eadac0c32b016fed1a43bacc1c0..a4420706e606304a5c0e99f7bb1acca32355e527 100644 >--- a/Source/WebCore/css/CSSFontSelector.h >+++ b/Source/WebCore/css/CSSFontSelector.h >@@ -58,7 +58,7 @@ public: > unsigned version() const final { return m_version; } > unsigned uniqueId() const final { return m_uniqueId; } > >- FontRanges fontRangesForFamily(const FontDescription&, const AtomicString&) final; >+ FontRanges fontRangesForFamily(const FontDescription&, const AtomString&) final; > size_t fallbackFontCount() final; > RefPtr<Font> fallbackFontAt(const FontDescription&, size_t) final; > >@@ -91,7 +91,7 @@ private: > > void dispatchInvalidationCallbacks(); > >- void opportunisticallyStartFontDataURLLoading(const FontCascadeDescription&, const AtomicString& family) final; >+ void opportunisticallyStartFontDataURLLoading(const FontCascadeDescription&, const AtomString& family) final; > > void fontModified() final; > >diff --git a/Source/WebCore/css/CSSImageValue.h b/Source/WebCore/css/CSSImageValue.h >index 59bb71c41ec66ecc3f3b4b737f748163b86a91bd..7e6bbb95145325268364c57cb5676223714b4b76 100644 >--- a/Source/WebCore/css/CSSImageValue.h >+++ b/Source/WebCore/css/CSSImageValue.h >@@ -56,7 +56,7 @@ public: > > bool knownToBeOpaque(const RenderElement&) const; > >- void setInitiator(const AtomicString& name) { m_initiatorName = name; } >+ void setInitiator(const AtomString& name) { m_initiatorName = name; } > > private: > CSSImageValue(URL&&, LoadedFromOpaqueSource); >@@ -65,7 +65,7 @@ private: > URL m_url; > CachedResourceHandle<CachedImage> m_cachedImage; > bool m_accessedImage; >- AtomicString m_initiatorName; >+ AtomString m_initiatorName; > LoadedFromOpaqueSource m_loadedFromOpaqueSource { LoadedFromOpaqueSource::No }; > }; > >diff --git a/Source/WebCore/css/CSSKeyframesRule.cpp b/Source/WebCore/css/CSSKeyframesRule.cpp >index 632a547a92d987368214f14ab476ad6649346ea2..c909832da0e5190253513a3983191a7c2f393005 100644 >--- a/Source/WebCore/css/CSSKeyframesRule.cpp >+++ b/Source/WebCore/css/CSSKeyframesRule.cpp >@@ -36,13 +36,13 @@ > > namespace WebCore { > >-StyleRuleKeyframes::StyleRuleKeyframes(const AtomicString& name) >+StyleRuleKeyframes::StyleRuleKeyframes(const AtomString& name) > : StyleRuleBase(Keyframes) > , m_name(name) > { > } > >-StyleRuleKeyframes::StyleRuleKeyframes(const AtomicString& name, std::unique_ptr<DeferredStyleGroupRuleList>&& deferredRules) >+StyleRuleKeyframes::StyleRuleKeyframes(const AtomString& name, std::unique_ptr<DeferredStyleGroupRuleList>&& deferredRules) > : StyleRuleBase(Keyframes) > , m_name(name) > , m_deferredRules(WTFMove(deferredRules)) >diff --git a/Source/WebCore/css/CSSKeyframesRule.h b/Source/WebCore/css/CSSKeyframesRule.h >index dd075957e9302d8ccc864ee48e9941b7ba51a1de..280b6cba9c64a91350a389f751525cbd91c26073 100644 >--- a/Source/WebCore/css/CSSKeyframesRule.h >+++ b/Source/WebCore/css/CSSKeyframesRule.h >@@ -29,7 +29,7 @@ > #include "StyleRule.h" > #include <memory> > #include <wtf/Forward.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -39,8 +39,8 @@ class CSSKeyframeRule; > > class StyleRuleKeyframes final : public StyleRuleBase { > public: >- static Ref<StyleRuleKeyframes> create(const AtomicString& name) { return adoptRef(*new StyleRuleKeyframes(name)); } >- static Ref<StyleRuleKeyframes> create(const AtomicString& name, std::unique_ptr<DeferredStyleGroupRuleList>&& deferredRules) { return adoptRef(*new StyleRuleKeyframes(name, WTFMove(deferredRules))); } >+ static Ref<StyleRuleKeyframes> create(const AtomString& name) { return adoptRef(*new StyleRuleKeyframes(name)); } >+ static Ref<StyleRuleKeyframes> create(const AtomString& name, std::unique_ptr<DeferredStyleGroupRuleList>&& deferredRules) { return adoptRef(*new StyleRuleKeyframes(name, WTFMove(deferredRules))); } > > ~StyleRuleKeyframes(); > >@@ -54,22 +54,22 @@ public: > void wrapperAppendKeyframe(Ref<StyleRuleKeyframe>&&); > void wrapperRemoveKeyframe(unsigned); > >- const AtomicString& name() const { return m_name; } >- void setName(const AtomicString& name) { m_name = name; } >+ const AtomString& name() const { return m_name; } >+ void setName(const AtomString& name) { m_name = name; } > > size_t findKeyframeIndex(const String& key) const; > > Ref<StyleRuleKeyframes> copy() const { return adoptRef(*new StyleRuleKeyframes(*this)); } > > private: >- StyleRuleKeyframes(const AtomicString&); >- StyleRuleKeyframes(const AtomicString&, std::unique_ptr<DeferredStyleGroupRuleList>&&); >+ StyleRuleKeyframes(const AtomString&); >+ StyleRuleKeyframes(const AtomString&, std::unique_ptr<DeferredStyleGroupRuleList>&&); > StyleRuleKeyframes(const StyleRuleKeyframes&); > > void parseDeferredRulesIfNeeded() const; > > mutable Vector<Ref<StyleRuleKeyframe>> m_keyframes; >- AtomicString m_name; >+ AtomString m_name; > > mutable std::unique_ptr<DeferredStyleGroupRuleList> m_deferredRules; > }; >diff --git a/Source/WebCore/css/CSSNamespaceRule.cpp b/Source/WebCore/css/CSSNamespaceRule.cpp >index 3d3ec6ff07d25b8b1db0fa477e6dff93bf5cba47..3b933b8764596f018feae397cd60b61406c38f0c 100644 >--- a/Source/WebCore/css/CSSNamespaceRule.cpp >+++ b/Source/WebCore/css/CSSNamespaceRule.cpp >@@ -40,12 +40,12 @@ CSSNamespaceRule::CSSNamespaceRule(StyleRuleNamespace& namespaceRule, CSSStyleSh > > CSSNamespaceRule::~CSSNamespaceRule() = default; > >-AtomicString CSSNamespaceRule::namespaceURI() const >+AtomString CSSNamespaceRule::namespaceURI() const > { > return m_namespaceRule->uri(); > } > >-AtomicString CSSNamespaceRule::prefix() const >+AtomString CSSNamespaceRule::prefix() const > { > return m_namespaceRule->prefix(); > } >diff --git a/Source/WebCore/css/CSSNamespaceRule.h b/Source/WebCore/css/CSSNamespaceRule.h >index cd7004321e67ce11990d756a88b889dfb7a59231..11f6f9298bc141d8d1e36bbd0666615ca466da2c 100644 >--- a/Source/WebCore/css/CSSNamespaceRule.h >+++ b/Source/WebCore/css/CSSNamespaceRule.h >@@ -37,8 +37,8 @@ public: > > virtual ~CSSNamespaceRule(); > >- AtomicString namespaceURI() const; >- AtomicString prefix() const; >+ AtomString namespaceURI() const; >+ AtomString prefix() const; > > private: > CSSNamespaceRule(StyleRuleNamespace&, CSSStyleSheet*); >diff --git a/Source/WebCore/css/CSSPrimitiveValue.cpp b/Source/WebCore/css/CSSPrimitiveValue.cpp >index 8e4f21fadd5b7e70d187e5fda62053d49ba2c9f0..91168e7710ab2d1335aff2a89c5a36cf033ebc5a 100644 >--- a/Source/WebCore/css/CSSPrimitiveValue.cpp >+++ b/Source/WebCore/css/CSSPrimitiveValue.cpp >@@ -255,18 +255,18 @@ unsigned short CSSPrimitiveValue::primitiveType() const > return CSSPrimitiveValue::CSS_UNKNOWN; > } > >-static const AtomicString& propertyName(CSSPropertyID propertyID) >+static const AtomString& propertyName(CSSPropertyID propertyID) > { > ASSERT_ARG(propertyID, (propertyID >= firstCSSProperty && propertyID < firstCSSProperty + numCSSProperties)); > >- return getPropertyNameAtomicString(propertyID); >+ return getPropertyNameAtomString(propertyID); > } > >-static const AtomicString& valueName(CSSValueID valueID) >+static const AtomString& valueName(CSSValueID valueID) > { > ASSERT_ARG(valueID, (valueID >= firstCSSValueKeyword && valueID <= lastCSSValueKeyword)); > >- return getValueNameAtomicString(valueID); >+ return getValueNameAtomString(valueID); > } > > CSSPrimitiveValue::CSSPrimitiveValue(CSSValueID valueID) >diff --git a/Source/WebCore/css/CSSSelector.cpp b/Source/WebCore/css/CSSSelector.cpp >index f365a85e74db82657fbab888c0635541c0b6006f..efe48ef06e9110754f7940749811983ec040626f 100644 >--- a/Source/WebCore/css/CSSSelector.cpp >+++ b/Source/WebCore/css/CSSSelector.cpp >@@ -33,7 +33,7 @@ > #include <wtf/Assertions.h> > #include <wtf/StdLibExtras.h> > #include <wtf/Vector.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/StringBuilder.h> > > namespace WebCore { >@@ -63,8 +63,8 @@ CSSSelector::CSSSelector(const QualifiedName& tagQName, bool tagIsForNamespaceRu > , m_destructorHasBeenCalled(false) > #endif > { >- const AtomicString& tagLocalName = tagQName.localName(); >- const AtomicString tagLocalNameASCIILowercase = tagLocalName.convertToASCIILowercase(); >+ const AtomString& tagLocalName = tagQName.localName(); >+ const AtomString tagLocalNameASCIILowercase = tagLocalName.convertToASCIILowercase(); > > if (tagLocalName == tagLocalNameASCIILowercase) { > m_data.m_tagQName = tagQName.impl(); >@@ -82,7 +82,7 @@ void CSSSelector::createRareData() > if (m_hasRareData) > return; > // Move the value to the rare data stucture. >- AtomicString value { adoptRef(m_data.m_value) }; >+ AtomString value { adoptRef(m_data.m_value) }; > m_data.m_rareData = &RareData::create(WTFMove(value)).leakRef(); > m_hasRareData = true; > } >@@ -373,7 +373,7 @@ static void appendPseudoClassFunctionTail(StringBuilder& str, const CSSSelector* > > } > >-static void appendLangArgumentList(StringBuilder& str, const Vector<AtomicString>& argumentList) >+static void appendLangArgumentList(StringBuilder& str, const Vector<AtomString>& argumentList) > { > unsigned argumentListSize = argumentList.size(); > for (unsigned i = 0; i < argumentListSize; ++i) { >@@ -671,7 +671,7 @@ String CSSSelector::selectorText(const String& rightSide) const > } > } else if (cs->isAttributeSelector()) { > str.append('['); >- const AtomicString& prefix = cs->attribute().prefix(); >+ const AtomString& prefix = cs->attribute().prefix(); > if (!prefix.isEmpty()) { > str.append(prefix); > str.append('|'); >@@ -759,13 +759,13 @@ void CSSSelector::setAttribute(const QualifiedName& value, bool convertToLowerca > m_caseInsensitiveAttributeValueMatching = matchType == CaseInsensitive; > } > >-void CSSSelector::setArgument(const AtomicString& value) >+void CSSSelector::setArgument(const AtomString& value) > { > createRareData(); > m_data.m_rareData->m_argument = value; > } > >-void CSSSelector::setLangArgumentList(std::unique_ptr<Vector<AtomicString>> argumentList) >+void CSSSelector::setLangArgumentList(std::unique_ptr<Vector<AtomString>> argumentList) > { > createRareData(); > m_data.m_rareData->m_langArgumentList = WTFMove(argumentList); >@@ -802,7 +802,7 @@ int CSSSelector::nthB() const > return m_data.m_rareData->m_b; > } > >-CSSSelector::RareData::RareData(AtomicString&& value) >+CSSSelector::RareData::RareData(AtomString&& value) > : m_matchingValue(value) > , m_serializingValue(value) > , m_a(0) >diff --git a/Source/WebCore/css/CSSSelector.h b/Source/WebCore/css/CSSSelector.h >index 544cc2cd58abea8044435b16485c23858853ea55..e591c6ca48b1868527ade4129300347e07ece1a9 100644 >--- a/Source/WebCore/css/CSSSelector.h >+++ b/Source/WebCore/css/CSSSelector.h >@@ -231,23 +231,23 @@ namespace WebCore { > const CSSSelector* tagHistory() const { return m_isLastInTagHistory ? 0 : const_cast<CSSSelector*>(this + 1); } > > const QualifiedName& tagQName() const; >- const AtomicString& tagLowercaseLocalName() const; >+ const AtomString& tagLowercaseLocalName() const; > >- const AtomicString& value() const; >- const AtomicString& serializingValue() const; >+ const AtomString& value() const; >+ const AtomString& serializingValue() const; > const QualifiedName& attribute() const; >- const AtomicString& attributeCanonicalLocalName() const; >- const AtomicString& argument() const { return m_hasRareData ? m_data.m_rareData->m_argument : nullAtom(); } >+ const AtomString& attributeCanonicalLocalName() const; >+ const AtomString& argument() const { return m_hasRareData ? m_data.m_rareData->m_argument : nullAtom(); } > bool attributeValueMatchingIsCaseInsensitive() const; >- const Vector<AtomicString>* langArgumentList() const { return m_hasRareData ? m_data.m_rareData->m_langArgumentList.get() : nullptr; } >+ const Vector<AtomString>* langArgumentList() const { return m_hasRareData ? m_data.m_rareData->m_langArgumentList.get() : nullptr; } > const CSSSelectorList* selectorList() const { return m_hasRareData ? m_data.m_rareData->m_selectorList.get() : nullptr; } > >- void setValue(const AtomicString&, bool matchLowerCase = false); >+ void setValue(const AtomString&, bool matchLowerCase = false); > > void setAttribute(const QualifiedName&, bool convertToLowercase, AttributeMatchType); > void setNth(int a, int b); >- void setArgument(const AtomicString&); >- void setLangArgumentList(std::unique_ptr<Vector<AtomicString>>); >+ void setArgument(const AtomString&); >+ void setLangArgumentList(std::unique_ptr<Vector<AtomString>>); > void setSelectorList(std::unique_ptr<CSSSelectorList>); > > bool matchNth(int count) const; >@@ -341,7 +341,7 @@ namespace WebCore { > CSSSelector& operator=(const CSSSelector&); > > struct RareData : public RefCounted<RareData> { >- static Ref<RareData> create(AtomicString&& value) { return adoptRef(*new RareData(WTFMove(value))); } >+ static Ref<RareData> create(AtomString&& value) { return adoptRef(*new RareData(WTFMove(value))); } > ~RareData(); > > bool matchNth(int count); >@@ -349,24 +349,24 @@ namespace WebCore { > // For quirks mode, class and id are case-insensitive. In the case where uppercase > // letters are used in quirks mode, |m_matchingValue| holds the lowercase class/id > // and |m_serializingValue| holds the original string. >- AtomicString m_matchingValue; >- AtomicString m_serializingValue; >+ AtomString m_matchingValue; >+ AtomString m_serializingValue; > > int m_a; // Used for :nth-* > int m_b; // Used for :nth-* > QualifiedName m_attribute; // used for attribute selector >- AtomicString m_attributeCanonicalLocalName; >- AtomicString m_argument; // Used for :contains and :nth-* >- std::unique_ptr<Vector<AtomicString>> m_langArgumentList; // Used for :lang arguments. >+ AtomString m_attributeCanonicalLocalName; >+ AtomString m_argument; // Used for :contains and :nth-* >+ std::unique_ptr<Vector<AtomString>> m_langArgumentList; // Used for :lang arguments. > std::unique_ptr<CSSSelectorList> m_selectorList; // Used for :matches() and :not(). > > private: >- RareData(AtomicString&& value); >+ RareData(AtomString&& value); > }; > void createRareData(); > > struct NameWithCase : public RefCounted<NameWithCase> { >- NameWithCase(const QualifiedName& originalName, const AtomicString& lowercaseName) >+ NameWithCase(const QualifiedName& originalName, const AtomString& lowercaseName) > : m_originalName(originalName) > , m_lowercaseLocalName(lowercaseName) > { >@@ -374,12 +374,12 @@ namespace WebCore { > } > > const QualifiedName m_originalName; >- const AtomicString m_lowercaseLocalName; >+ const AtomString m_lowercaseLocalName; > }; > > union DataUnion { > DataUnion() : m_value(0) { } >- AtomicStringImpl* m_value; >+ AtomStringImpl* m_value; > QualifiedName::QualifiedNameImpl* m_tagQName; > RareData* m_rareData; > NameWithCase* m_nameWithCase; >@@ -393,7 +393,7 @@ inline const QualifiedName& CSSSelector::attribute() const > return m_data.m_rareData->m_attribute; > } > >-inline const AtomicString& CSSSelector::attributeCanonicalLocalName() const >+inline const AtomString& CSSSelector::attributeCanonicalLocalName() const > { > ASSERT(isAttributeSelector()); > ASSERT(m_hasRareData); >@@ -455,10 +455,10 @@ inline bool CSSSelector::isAttributeSelector() const > || match() == CSSSelector::End; > } > >-inline void CSSSelector::setValue(const AtomicString& value, bool matchLowerCase) >+inline void CSSSelector::setValue(const AtomString& value, bool matchLowerCase) > { > ASSERT(match() != Tag); >- AtomicString matchingValue = matchLowerCase ? value.convertToASCIILowercase() : value; >+ AtomString matchingValue = matchLowerCase ? value.convertToASCIILowercase() : value; > if (!m_hasRareData && matchingValue != value) > createRareData(); > >@@ -554,31 +554,31 @@ inline const QualifiedName& CSSSelector::tagQName() const > return *reinterpret_cast<const QualifiedName*>(&m_data.m_tagQName); > } > >-inline const AtomicString& CSSSelector::tagLowercaseLocalName() const >+inline const AtomString& CSSSelector::tagLowercaseLocalName() const > { > if (m_hasNameWithCase) > return m_data.m_nameWithCase->m_lowercaseLocalName; > return m_data.m_tagQName->m_localName; > } > >-inline const AtomicString& CSSSelector::value() const >+inline const AtomString& CSSSelector::value() const > { > ASSERT(match() != Tag); > if (m_hasRareData) > return m_data.m_rareData->m_matchingValue; > >- // AtomicString is really just an AtomicStringImpl* so the cast below is safe. >- return *reinterpret_cast<const AtomicString*>(&m_data.m_value); >+ // AtomString is really just an AtomStringImpl* so the cast below is safe. >+ return *reinterpret_cast<const AtomString*>(&m_data.m_value); > } > >-inline const AtomicString& CSSSelector::serializingValue() const >+inline const AtomString& CSSSelector::serializingValue() const > { > ASSERT(match() != Tag); > if (m_hasRareData) > return m_data.m_rareData->m_serializingValue; > >- // AtomicString is really just an AtomicStringImpl* so the cast below is safe. >- return *reinterpret_cast<const AtomicString*>(&m_data.m_value); >+ // AtomString is really just an AtomStringImpl* so the cast below is safe. >+ return *reinterpret_cast<const AtomString*>(&m_data.m_value); > } > > inline bool CSSSelector::attributeValueMatchingIsCaseInsensitive() const >diff --git a/Source/WebCore/css/CSSStyleDeclaration.cpp b/Source/WebCore/css/CSSStyleDeclaration.cpp >index a4f3481e3667c080f0454733a97c46d4ef64c3ab..2f69ef7df85854191aadd027acbe42bd3a57e225 100644 >--- a/Source/WebCore/css/CSSStyleDeclaration.cpp >+++ b/Source/WebCore/css/CSSStyleDeclaration.cpp >@@ -149,7 +149,7 @@ struct CSSPropertyInfo { > bool hadPixelOrPosPrefix; > }; > >-static CSSPropertyInfo parseJavaScriptCSSPropertyName(const AtomicString& propertyName) >+static CSSPropertyInfo parseJavaScriptCSSPropertyName(const AtomString& propertyName) > { > using CSSPropertyInfoMap = HashMap<String, CSSPropertyInfo>; > static NeverDestroyed<CSSPropertyInfoMap> propertyInfoCache; >@@ -258,12 +258,12 @@ static CSSPropertyInfo parseJavaScriptCSSPropertyName(const AtomicString& proper > > } > >-CSSPropertyID CSSStyleDeclaration::getCSSPropertyIDFromJavaScriptPropertyName(const AtomicString& propertyName) >+CSSPropertyID CSSStyleDeclaration::getCSSPropertyIDFromJavaScriptPropertyName(const AtomString& propertyName) > { > return parseJavaScriptCSSPropertyName(propertyName).propertyID; > } > >-Optional<Variant<String, double>> CSSStyleDeclaration::namedItem(const AtomicString& propertyName) >+Optional<Variant<String, double>> CSSStyleDeclaration::namedItem(const AtomString& propertyName) > { > auto propertyInfo = parseJavaScriptCSSPropertyName(propertyName); > if (!propertyInfo.propertyID) >@@ -285,7 +285,7 @@ Optional<Variant<String, double>> CSSStyleDeclaration::namedItem(const AtomicStr > return Variant<String, double> { value->cssText() }; > } > >-ExceptionOr<void> CSSStyleDeclaration::setNamedItem(const AtomicString& propertyName, String value, bool& propertySupported) >+ExceptionOr<void> CSSStyleDeclaration::setNamedItem(const AtomString& propertyName, String value, bool& propertySupported) > { > auto propertyInfo = parseJavaScriptCSSPropertyName(propertyName); > if (!propertyInfo.propertyID) { >@@ -314,10 +314,10 @@ ExceptionOr<void> CSSStyleDeclaration::setNamedItem(const AtomicString& property > return { }; > } > >-Vector<AtomicString> CSSStyleDeclaration::supportedPropertyNames() const >+Vector<AtomString> CSSStyleDeclaration::supportedPropertyNames() const > { > static unsigned numNames = 0; >- static const AtomicString* const cssPropertyNames = [] { >+ static const AtomString* const cssPropertyNames = [] { > String names[numCSSProperties]; > for (int i = 0; i < numCSSProperties; ++i) { > CSSPropertyID id = static_cast<CSSPropertyID>(firstCSSProperty + i); >@@ -325,13 +325,13 @@ Vector<AtomicString> CSSStyleDeclaration::supportedPropertyNames() const > names[numNames++] = getJSPropertyName(id); > } > std::sort(&names[0], &names[numNames], WTF::codePointCompareLessThan); >- auto* identifiers = new AtomicString[numNames]; >+ auto* identifiers = new AtomString[numNames]; > for (unsigned i = 0; i < numNames; ++i) > identifiers[i] = names[i]; > return identifiers; > }(); > >- Vector<AtomicString> result; >+ Vector<AtomString> result; > result.reserveInitialCapacity(numNames); > > for (unsigned i = 0; i < numNames; ++i) >diff --git a/Source/WebCore/css/CSSStyleDeclaration.h b/Source/WebCore/css/CSSStyleDeclaration.h >index 358d7d6e3f7319ec85e2e6f526d007bec09339c1..f987d1e9cbf6f7e36c54c43b8f7411b574a2300c 100644 >--- a/Source/WebCore/css/CSSStyleDeclaration.h >+++ b/Source/WebCore/css/CSSStyleDeclaration.h >@@ -73,11 +73,11 @@ public: > virtual CSSStyleSheet* parentStyleSheet() const { return nullptr; } > > // Bindings support. >- Optional<Variant<String, double>> namedItem(const AtomicString&); >- ExceptionOr<void> setNamedItem(const AtomicString& name, String value, bool& propertySupported); >- Vector<AtomicString> supportedPropertyNames() const; >+ Optional<Variant<String, double>> namedItem(const AtomString&); >+ ExceptionOr<void> setNamedItem(const AtomString& name, String value, bool& propertySupported); >+ Vector<AtomString> supportedPropertyNames() const; > >- static CSSPropertyID getCSSPropertyIDFromJavaScriptPropertyName(const AtomicString&); >+ static CSSPropertyID getCSSPropertyIDFromJavaScriptPropertyName(const AtomString&); > protected: > CSSStyleDeclaration() = default; > }; >diff --git a/Source/WebCore/css/CSSStyleSheet.h b/Source/WebCore/css/CSSStyleSheet.h >index 23768e50fbc8c7cd041ab0263f93d1337767e38a..4d0cff9a85a674bcd077437228c0a4b0bcc50929 100644 >--- a/Source/WebCore/css/CSSStyleSheet.h >+++ b/Source/WebCore/css/CSSStyleSheet.h >@@ -25,7 +25,7 @@ > #include <memory> > #include <wtf/Noncopyable.h> > #include <wtf/TypeCasts.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/TextPosition.h> > > namespace WebCore { >diff --git a/Source/WebCore/css/CSSValue.h b/Source/WebCore/css/CSSValue.h >index 7d4b118fb7be1b20f34c50ddeab84ff6d210efbe..f885ebd9307d26d11f38bfd9d80423b1c8cf14fc 100644 >--- a/Source/WebCore/css/CSSValue.h >+++ b/Source/WebCore/css/CSSValue.h >@@ -279,7 +279,7 @@ inline bool compareCSSValue(const Ref<CSSValueType>& first, const Ref<CSSValueTy > return first.get().equals(second); > } > >-typedef HashMap<AtomicString, RefPtr<CSSCustomPropertyValue>> CustomPropertyValueMap; >+typedef HashMap<AtomString, RefPtr<CSSCustomPropertyValue>> CustomPropertyValueMap; > > } // namespace WebCore > >diff --git a/Source/WebCore/css/CSSValuePool.cpp b/Source/WebCore/css/CSSValuePool.cpp >index fbd6b16eca9f1faafc64e873d49e647a6f2267ee..6947e05baf9dfb7af1db76472b8f69cff25f3a65 100644 >--- a/Source/WebCore/css/CSSValuePool.cpp >+++ b/Source/WebCore/css/CSSValuePool.cpp >@@ -131,7 +131,7 @@ Ref<CSSPrimitiveValue> CSSValuePool::createFontFamilyValue(const String& familyN > }).iterator->value; > } > >-RefPtr<CSSValueList> CSSValuePool::createFontFaceValue(const AtomicString& string) >+RefPtr<CSSValueList> CSSValuePool::createFontFaceValue(const AtomString& string) > { > // Remove one entry at random if the cache grows too large. > // FIXME: Use TinyLRUCache instead? >diff --git a/Source/WebCore/css/CSSValuePool.h b/Source/WebCore/css/CSSValuePool.h >index a92be46a45b10e677ccb73aac47f36b0680936f7..e80e67684d568581db79553bf79ed0201725c556 100644 >--- a/Source/WebCore/css/CSSValuePool.h >+++ b/Source/WebCore/css/CSSValuePool.h >@@ -37,7 +37,7 @@ > #include <wtf/HashMap.h> > #include <wtf/NeverDestroyed.h> > #include <wtf/RefPtr.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -50,7 +50,7 @@ class CSSValuePool { > public: > static CSSValuePool& singleton(); > >- RefPtr<CSSValueList> createFontFaceValue(const AtomicString&); >+ RefPtr<CSSValueList> createFontFaceValue(const AtomString&); > Ref<CSSPrimitiveValue> createFontFamilyValue(const String&, FromSystemFontID = FromSystemFontID::No); > Ref<CSSInheritedValue> createInheritedValue() { return m_inheritedValue.get(); } > Ref<CSSInitialValue> createImplicitInitialValue() { return m_implicitInitialValue.get(); } >@@ -74,7 +74,7 @@ private: > typedef HashMap<Color, RefPtr<CSSPrimitiveValue>> ColorValueCache; > ColorValueCache m_colorValueCache; > >- typedef HashMap<AtomicString, RefPtr<CSSValueList>> FontFaceValueCache; >+ typedef HashMap<AtomString, RefPtr<CSSValueList>> FontFaceValueCache; > FontFaceValueCache m_fontFaceValueCache; > > typedef HashMap<std::pair<String, bool>, RefPtr<CSSPrimitiveValue>> FontFamilyValueCache; >diff --git a/Source/WebCore/css/CSSVariableData.cpp b/Source/WebCore/css/CSSVariableData.cpp >index 604ca183434b658674d3d8c0729a41109158d99d..0cb1b19c9f02658603e8036324a19991f32b52d0 100644 >--- a/Source/WebCore/css/CSSVariableData.cpp >+++ b/Source/WebCore/css/CSSVariableData.cpp >@@ -34,7 +34,7 @@ > #include "CSSParserTokenRange.h" > #include "CSSValuePool.h" > #include "RenderStyle.h" >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/StringBuilder.h> > #include <wtf/text/StringView.h> > >diff --git a/Source/WebCore/css/DocumentRuleSets.cpp b/Source/WebCore/css/DocumentRuleSets.cpp >index a2ef908386be703a6fafe926c30a77f14bafd945..0cb0ffc5c2ba06f74d6dc07f70234ec2b02ff4c5 100644 >--- a/Source/WebCore/css/DocumentRuleSets.cpp >+++ b/Source/WebCore/css/DocumentRuleSets.cpp >@@ -174,7 +174,7 @@ void DocumentRuleSets::collectFeatures() const > m_features.shrinkToFit(); > } > >-static Vector<InvalidationRuleSet>* ensureInvalidationRuleSets(const AtomicString& key, HashMap<AtomicString, std::unique_ptr<Vector<InvalidationRuleSet>>>& ruleSetMap, const HashMap<AtomicString, std::unique_ptr<Vector<RuleFeature>>>& ruleFeatures) >+static Vector<InvalidationRuleSet>* ensureInvalidationRuleSets(const AtomString& key, HashMap<AtomString, std::unique_ptr<Vector<InvalidationRuleSet>>>& ruleSetMap, const HashMap<AtomString, std::unique_ptr<Vector<RuleFeature>>>& ruleFeatures) > { > return ruleSetMap.ensure(key, [&] () -> std::unique_ptr<Vector<InvalidationRuleSet>> { > auto* features = ruleFeatures.get(key); >@@ -201,12 +201,12 @@ static Vector<InvalidationRuleSet>* ensureInvalidationRuleSets(const AtomicStrin > }).iterator->value.get(); > } > >-const Vector<InvalidationRuleSet>* DocumentRuleSets::classInvalidationRuleSets(const AtomicString& className) const >+const Vector<InvalidationRuleSet>* DocumentRuleSets::classInvalidationRuleSets(const AtomString& className) const > { > return ensureInvalidationRuleSets(className, m_classInvalidationRuleSets, m_features.classRules); > } > >-const Vector<InvalidationRuleSet>* DocumentRuleSets::attributeInvalidationRuleSets(const AtomicString& attributeName) const >+const Vector<InvalidationRuleSet>* DocumentRuleSets::attributeInvalidationRuleSets(const AtomString& attributeName) const > { > return ensureInvalidationRuleSets(attributeName, m_attributeInvalidationRuleSets, m_features.attributeRules); > } >diff --git a/Source/WebCore/css/DocumentRuleSets.h b/Source/WebCore/css/DocumentRuleSets.h >index 1bf0649482c157bd0f76733c3db87413c2c9d4e4..2b16cffd997973b87165f9de238f65fa52ac806b 100644 >--- a/Source/WebCore/css/DocumentRuleSets.h >+++ b/Source/WebCore/css/DocumentRuleSets.h >@@ -59,8 +59,8 @@ public: > RuleSet* sibling() const { return m_siblingRuleSet.get(); } > RuleSet* uncommonAttribute() const { return m_uncommonAttributeRuleSet.get(); } > >- const Vector<InvalidationRuleSet>* classInvalidationRuleSets(const AtomicString& className) const; >- const Vector<InvalidationRuleSet>* attributeInvalidationRuleSets(const AtomicString& attributeName) const; >+ const Vector<InvalidationRuleSet>* classInvalidationRuleSets(const AtomString& className) const; >+ const Vector<InvalidationRuleSet>* attributeInvalidationRuleSets(const AtomString& attributeName) const; > > bool hasComplexSelectorsForStyleAttribute() const; > >@@ -89,8 +89,8 @@ private: > mutable RuleFeatureSet m_features; > mutable std::unique_ptr<RuleSet> m_siblingRuleSet; > mutable std::unique_ptr<RuleSet> m_uncommonAttributeRuleSet; >- mutable HashMap<AtomicString, std::unique_ptr<Vector<InvalidationRuleSet>>> m_classInvalidationRuleSets; >- mutable HashMap<AtomicString, std::unique_ptr<Vector<InvalidationRuleSet>>> m_attributeInvalidationRuleSets; >+ mutable HashMap<AtomString, std::unique_ptr<Vector<InvalidationRuleSet>>> m_classInvalidationRuleSets; >+ mutable HashMap<AtomString, std::unique_ptr<Vector<InvalidationRuleSet>>> m_attributeInvalidationRuleSets; > > mutable Optional<bool> m_cachedHasComplexSelectorsForStyleAttribute; > >diff --git a/Source/WebCore/css/MediaFeatureNames.cpp b/Source/WebCore/css/MediaFeatureNames.cpp >index ea4601164b85bf22e8b35201f9ebf86c2e5d0528..2f5b8b047395a2cbd755ac1cf534bfdcef571057 100644 >--- a/Source/WebCore/css/MediaFeatureNames.cpp >+++ b/Source/WebCore/css/MediaFeatureNames.cpp >@@ -24,7 +24,7 @@ > namespace WebCore { > namespace MediaFeatureNames { > >-#define DEFINE_MEDIAFEATURE_GLOBAL(name, string) LazyNeverDestroyed<const AtomicString> name; >+#define DEFINE_MEDIAFEATURE_GLOBAL(name, string) LazyNeverDestroyed<const AtomString> name; > CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(DEFINE_MEDIAFEATURE_GLOBAL) > #undef DEFINE_MEDIAFEATURE_GLOBAL > >@@ -32,8 +32,8 @@ void init() > { > static bool initialized; > if (!initialized) { >- AtomicString::init(); >-#define INITIALIZE_GLOBAL(name, string) name.construct(string, AtomicString::ConstructFromLiteral); >+ AtomString::init(); >+#define INITIALIZE_GLOBAL(name, string) name.construct(string, AtomString::ConstructFromLiteral); > CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(INITIALIZE_GLOBAL) > #undef INITIALIZE_GLOBAL > initialized = true; >diff --git a/Source/WebCore/css/MediaFeatureNames.h b/Source/WebCore/css/MediaFeatureNames.h >index 6b56455562f68f9b4fb2c59ebff002578eff43fa..d86e6646a99fc827c7211aea603540fc90dc5bb4 100644 >--- a/Source/WebCore/css/MediaFeatureNames.h >+++ b/Source/WebCore/css/MediaFeatureNames.h >@@ -21,7 +21,7 @@ > #pragma once > > #include <wtf/NeverDestroyed.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > #if ENABLE(APPLICATION_MANIFEST) > #define CSS_MEDIAQUERY_DISPLAY_MODE(macro) macro(displayMode, "display-mode") >@@ -92,7 +92,7 @@ > namespace WebCore { > namespace MediaFeatureNames { > >-#define CSS_MEDIAQUERY_NAMES_DECLARE(name, string) extern LazyNeverDestroyed<const AtomicString> name; >+#define CSS_MEDIAQUERY_NAMES_DECLARE(name, string) extern LazyNeverDestroyed<const AtomString> name; > CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(CSS_MEDIAQUERY_NAMES_DECLARE) > #undef CSS_MEDIAQUERY_NAMES_DECLARE > >diff --git a/Source/WebCore/css/MediaQueryEvaluator.cpp b/Source/WebCore/css/MediaQueryEvaluator.cpp >index 6ee00de7f2797436355ae670f6efeda0b8f83b83..6cac9e1e36ad99acf8dabc09dff79f15ad8e2302 100644 >--- a/Source/WebCore/css/MediaQueryEvaluator.cpp >+++ b/Source/WebCore/css/MediaQueryEvaluator.cpp >@@ -74,9 +74,9 @@ static TextStream& operator<<(TextStream& ts, MediaFeaturePrefix op) > #endif > > typedef bool (*MediaQueryFunction)(CSSValue*, const CSSToLengthConversionData&, Frame&, MediaFeaturePrefix); >-typedef HashMap<AtomicStringImpl*, MediaQueryFunction> MediaQueryFunctionMap; >+typedef HashMap<AtomStringImpl*, MediaQueryFunction> MediaQueryFunctionMap; > >-static bool isAccessibilitySettingsDependent(const AtomicString& mediaFeature) >+static bool isAccessibilitySettingsDependent(const AtomString& mediaFeature) > { > return mediaFeature == MediaFeatureNames::invertedColors > || mediaFeature == MediaFeatureNames::maxMonochrome >@@ -85,7 +85,7 @@ static bool isAccessibilitySettingsDependent(const AtomicString& mediaFeature) > || mediaFeature == MediaFeatureNames::prefersReducedMotion; > } > >-static bool isViewportDependent(const AtomicString& mediaFeature) >+static bool isViewportDependent(const AtomString& mediaFeature) > { > return mediaFeature == MediaFeatureNames::width > || mediaFeature == MediaFeatureNames::height >@@ -99,7 +99,7 @@ static bool isViewportDependent(const AtomicString& mediaFeature) > || mediaFeature == MediaFeatureNames::maxAspectRatio; > } > >-static bool isAppearanceDependent(const AtomicString& mediaFeature) >+static bool isAppearanceDependent(const AtomString& mediaFeature) > { > return mediaFeature == MediaFeatureNames::prefersDarkInterface > #if ENABLE(DARK_MODE_CSS) >@@ -842,7 +842,7 @@ static bool displayModeEvaluate(CSSValue* value, const CSSToLengthConversionData > #endif // ENABLE(APPLICATION_MANIFEST) > > // Use this function instead of calling add directly to avoid inlining. >-static void add(MediaQueryFunctionMap& map, AtomicStringImpl* key, MediaQueryFunction value) >+static void add(MediaQueryFunctionMap& map, AtomStringImpl* key, MediaQueryFunction value) > { > map.add(key, value); > } >diff --git a/Source/WebCore/css/MediaQueryExpression.cpp b/Source/WebCore/css/MediaQueryExpression.cpp >index 08be05526057fc95d598da8b8d7ad5ed993c4c6f..4373e8b3f172d8a025990657b2425d58993e10d3 100644 >--- a/Source/WebCore/css/MediaQueryExpression.cpp >+++ b/Source/WebCore/css/MediaQueryExpression.cpp >@@ -39,7 +39,7 @@ > > namespace WebCore { > >-static inline bool featureWithValidIdent(const AtomicString& mediaFeature, const CSSPrimitiveValue& value, const MediaQueryParserContext& context) >+static inline bool featureWithValidIdent(const AtomString& mediaFeature, const CSSPrimitiveValue& value, const MediaQueryParserContext& context) > { > if (value.primitiveType() != CSSPrimitiveValue::UnitType::CSS_IDENT) > return false; >@@ -132,7 +132,7 @@ static inline bool featureWithZeroOrOne(const String& mediaFeature, const CSSPri > return mediaFeature == MediaFeatureNames::grid; > } > >-static inline bool isAspectRatioFeature(const AtomicString& mediaFeature) >+static inline bool isAspectRatioFeature(const AtomString& mediaFeature) > { > return mediaFeature == MediaFeatureNames::aspectRatio > || mediaFeature == MediaFeatureNames::deviceAspectRatio >@@ -142,7 +142,7 @@ static inline bool isAspectRatioFeature(const AtomicString& mediaFeature) > || mediaFeature == MediaFeatureNames::maxDeviceAspectRatio; > } > >-static inline bool isFeatureValidWithoutValue(const AtomicString& mediaFeature, const MediaQueryParserContext& context) >+static inline bool isFeatureValidWithoutValue(const AtomString& mediaFeature, const MediaQueryParserContext& context) > { > // Media features that are prefixed by min/max cannot be used without a value. > return mediaFeature == MediaFeatureNames::anyHover >diff --git a/Source/WebCore/css/MediaQueryExpression.h b/Source/WebCore/css/MediaQueryExpression.h >index d4dac1d24d7732be1f1bdf330d8a8bb7eb7921ef..6c836559cc17545296f9c97002dd8145ead8af7c 100644 >--- a/Source/WebCore/css/MediaQueryExpression.h >+++ b/Source/WebCore/css/MediaQueryExpression.h >@@ -44,7 +44,7 @@ class MediaQueryExpression { > public: > explicit MediaQueryExpression(const String& mediaFeature, CSSParserTokenRange&, MediaQueryParserContext&); > >- const AtomicString& mediaFeature() const; >+ const AtomString& mediaFeature() const; > CSSValue* value() const; > > bool isValid() const; >@@ -54,13 +54,13 @@ public: > bool operator==(const MediaQueryExpression&) const; > > private: >- AtomicString m_mediaFeature; >+ AtomString m_mediaFeature; > RefPtr<CSSValue> m_value; > bool m_isValid { false }; > mutable String m_serializationCache; > }; > >-inline const AtomicString& MediaQueryExpression::mediaFeature() const >+inline const AtomString& MediaQueryExpression::mediaFeature() const > { > return m_mediaFeature; > } >diff --git a/Source/WebCore/css/PageRuleCollector.cpp b/Source/WebCore/css/PageRuleCollector.cpp >index d530334ccf81c50d6a1443476dc73a8fea5dc86d..a28450a8facbe809366f66dcfe20402e3139d13c 100644 >--- a/Source/WebCore/css/PageRuleCollector.cpp >+++ b/Source/WebCore/css/PageRuleCollector.cpp >@@ -94,7 +94,7 @@ static bool checkPageSelectorComponents(const CSSSelector* selector, bool isLeft > { > for (const CSSSelector* component = selector; component; component = component->tagHistory()) { > if (component->match() == CSSSelector::Tag) { >- const AtomicString& localName = component->tagQName().localName(); >+ const AtomString& localName = component->tagQName().localName(); > if (localName != starAtom() && localName != pageName) > return false; > } else if (component->match() == CSSSelector::PagePseudoClass) { >diff --git a/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp b/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp >index ed1ff23faa88f4815e1b5ed1b1ea60094668f1c2..3b20d413337533d6cb3c58cb3d104f0f04b5e619 100644 >--- a/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp >+++ b/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp >@@ -126,7 +126,7 @@ private: > static bool s_shouldDeliver; > > std::unique_ptr<MutationObserverInterestGroup> m_mutationRecipients; >- AtomicString m_oldValue; >+ AtomString m_oldValue; > RefPtr<Element> m_customElement; > }; > >diff --git a/Source/WebCore/css/RuleFeature.cpp b/Source/WebCore/css/RuleFeature.cpp >index a488b85cd78e702a569a3039b6cd3df40804acb4..dffda6f51df954d206f03d0c73560dda392d1430 100644 >--- a/Source/WebCore/css/RuleFeature.cpp >+++ b/Source/WebCore/css/RuleFeature.cpp >@@ -217,7 +217,7 @@ void RuleFeatureSet::add(const RuleFeatureSet& other) > usesFirstLetterRules = usesFirstLetterRules || other.usesFirstLetterRules; > } > >-void RuleFeatureSet::registerContentAttribute(const AtomicString& attributeName) >+void RuleFeatureSet::registerContentAttribute(const AtomString& attributeName) > { > contentAttributeNamesInRules.add(attributeName.convertToASCIILowercase()); > attributeCanonicalLocalNamesInRules.add(attributeName); >diff --git a/Source/WebCore/css/RuleFeature.h b/Source/WebCore/css/RuleFeature.h >index f8c94035c315f48fcaaf3204afde39d8b525f48b..25ea4ecd8aadc9b53273e8a825a573f239710062 100644 >--- a/Source/WebCore/css/RuleFeature.h >+++ b/Source/WebCore/css/RuleFeature.h >@@ -25,8 +25,8 @@ > #include <wtf/Forward.h> > #include <wtf/HashMap.h> > #include <wtf/HashSet.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -57,20 +57,20 @@ struct RuleFeatureSet { > void clear(); > void shrinkToFit(); > void collectFeatures(const RuleData&); >- void registerContentAttribute(const AtomicString&); >+ void registerContentAttribute(const AtomString&); > >- HashSet<AtomicString> idsInRules; >- HashSet<AtomicString> idsMatchingAncestorsInRules; >- HashSet<AtomicString> attributeCanonicalLocalNamesInRules; >- HashSet<AtomicString> attributeLocalNamesInRules; >- HashSet<AtomicString> contentAttributeNamesInRules; >+ HashSet<AtomString> idsInRules; >+ HashSet<AtomString> idsMatchingAncestorsInRules; >+ HashSet<AtomString> attributeCanonicalLocalNamesInRules; >+ HashSet<AtomString> attributeLocalNamesInRules; >+ HashSet<AtomString> contentAttributeNamesInRules; > Vector<RuleFeature> siblingRules; > Vector<RuleFeature> uncommonAttributeRules; > >- HashMap<AtomicString, std::unique_ptr<Vector<RuleFeature>>> classRules; >- HashMap<AtomicString, std::unique_ptr<Vector<RuleFeature>>> attributeRules; >- HashSet<AtomicString> classesAffectingHost; >- HashSet<AtomicString> attributesAffectingHost; >+ HashMap<AtomString, std::unique_ptr<Vector<RuleFeature>>> classRules; >+ HashMap<AtomString, std::unique_ptr<Vector<RuleFeature>>> attributeRules; >+ HashSet<AtomString> classesAffectingHost; >+ HashSet<AtomString> attributesAffectingHost; > > bool usesFirstLineRules { false }; > bool usesFirstLetterRules { false }; >@@ -82,7 +82,7 @@ private: > struct SelectorFeatures { > bool hasSiblingSelector { false }; > >- Vector<std::pair<AtomicString, MatchElement>, 32> classes; >+ Vector<std::pair<AtomString, MatchElement>, 32> classes; > Vector<std::pair<const CSSSelector*, MatchElement>, 32> attributes; > }; > void recursivelyCollectFeaturesFromSelector(SelectorFeatures&, const CSSSelector&, MatchElement = MatchElement::Subject); >diff --git a/Source/WebCore/css/RuleSet.cpp b/Source/WebCore/css/RuleSet.cpp >index 0eba42df452e8f2dec9a08d2ec8a4c0de688e232..fa6b9120213ec54bb65903cfae669bd466fbb027 100644 >--- a/Source/WebCore/css/RuleSet.cpp >+++ b/Source/WebCore/css/RuleSet.cpp >@@ -61,7 +61,7 @@ static inline MatchBasedOnRuleHash computeMatchBasedOnRuleHash(const CSSSelector > > if (selector.match() == CSSSelector::Tag) { > const QualifiedName& tagQualifiedName = selector.tagQName(); >- const AtomicString& selectorNamespace = tagQualifiedName.namespaceURI(); >+ const AtomString& selectorNamespace = tagQualifiedName.namespaceURI(); > if (selectorNamespace == starAtom() || selectorNamespace == xhtmlNamespaceURI) { > if (tagQualifiedName == anyQName()) > return MatchBasedOnRuleHash::Universal; >@@ -176,7 +176,7 @@ RuleSet::RuleSet() = default; > > RuleSet::~RuleSet() = default; > >-void RuleSet::addToRuleSet(const AtomicString& key, AtomRuleMap& map, const RuleData& ruleData) >+void RuleSet::addToRuleSet(const AtomString& key, AtomRuleMap& map, const RuleData& ruleData) > { > if (key.isNull()) > return; >@@ -186,7 +186,7 @@ void RuleSet::addToRuleSet(const AtomicString& key, AtomRuleMap& map, const Rule > rules->append(ruleData); > } > >-static unsigned rulesCountForName(const RuleSet::AtomRuleMap& map, const AtomicString& name) >+static unsigned rulesCountForName(const RuleSet::AtomRuleMap& map, const AtomString& name) > { > if (const auto* rules = map.get(name)) > return rules->size(); >diff --git a/Source/WebCore/css/RuleSet.h b/Source/WebCore/css/RuleSet.h >index ba5dc60fe34c6b7678246734d322ac2f7a02f57f..2380fe70ca8bf6ec8aa05a3231d105dc3820385c 100644 >--- a/Source/WebCore/css/RuleSet.h >+++ b/Source/WebCore/css/RuleSet.h >@@ -27,8 +27,8 @@ > #include "StyleRule.h" > #include <wtf/Forward.h> > #include <wtf/HashMap.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -115,23 +115,23 @@ public: > ~RuleSet(); > > typedef Vector<RuleData, 1> RuleDataVector; >- typedef HashMap<AtomicString, std::unique_ptr<RuleDataVector>> AtomRuleMap; >+ typedef HashMap<AtomString, std::unique_ptr<RuleDataVector>> AtomRuleMap; > > void addRulesFromSheet(StyleSheetContents&, const MediaQueryEvaluator&, StyleResolver* = 0); > > void addStyleRule(StyleRule*); > void addRule(StyleRule*, unsigned selectorIndex, unsigned selectorListIndex); > void addPageRule(StyleRulePage*); >- void addToRuleSet(const AtomicString& key, AtomRuleMap&, const RuleData&); >+ void addToRuleSet(const AtomString& key, AtomRuleMap&, const RuleData&); > void shrinkToFit(); > void disableAutoShrinkToFit() { m_autoShrinkToFitEnabled = false; } > > const RuleFeatureSet& features() const { return m_features; } > >- const RuleDataVector* idRules(const AtomicString& key) const { return m_idRules.get(key); } >- const RuleDataVector* classRules(const AtomicString& key) const { return m_classRules.get(key); } >- const RuleDataVector* tagRules(const AtomicString& key, bool isHTMLName) const; >- const RuleDataVector* shadowPseudoElementRules(const AtomicString& key) const { return m_shadowPseudoElementRules.get(key); } >+ const RuleDataVector* idRules(const AtomString& key) const { return m_idRules.get(key); } >+ const RuleDataVector* classRules(const AtomString& key) const { return m_classRules.get(key); } >+ const RuleDataVector* tagRules(const AtomString& key, bool isHTMLName) const; >+ const RuleDataVector* shadowPseudoElementRules(const AtomString& key) const { return m_shadowPseudoElementRules.get(key); } > const RuleDataVector* linkPseudoClassRules() const { return &m_linkPseudoClassRules; } > #if ENABLE(VIDEO_TRACK) > const RuleDataVector* cuePseudoRules() const { return &m_cuePseudoRules; } >@@ -171,7 +171,7 @@ private: > RuleFeatureSet m_features; > }; > >-inline const RuleSet::RuleDataVector* RuleSet::tagRules(const AtomicString& key, bool isHTMLName) const >+inline const RuleSet::RuleDataVector* RuleSet::tagRules(const AtomString& key, bool isHTMLName) const > { > const AtomRuleMap* tagRules; > if (isHTMLName) >diff --git a/Source/WebCore/css/SelectorChecker.cpp b/Source/WebCore/css/SelectorChecker.cpp >index 70c83b8ea32ae5ba5922dd2e9fd34c2eeecd7ddb..2db31dd5fe6912e60daebfe34a9b42ddb6056195 100644 >--- a/Source/WebCore/css/SelectorChecker.cpp >+++ b/Source/WebCore/css/SelectorChecker.cpp >@@ -451,9 +451,9 @@ SelectorChecker::MatchResult SelectorChecker::matchRecursively(CheckingContext& > return MatchResult::fails(Match::SelectorFailsCompletely); > } > >-static bool attributeValueMatches(const Attribute& attribute, CSSSelector::Match match, const AtomicString& selectorValue, bool caseSensitive) >+static bool attributeValueMatches(const Attribute& attribute, CSSSelector::Match match, const AtomString& selectorValue, bool caseSensitive) > { >- const AtomicString& value = attribute.value(); >+ const AtomString& value = attribute.value(); > ASSERT(!value.isNull()); > > switch (match) { >@@ -559,7 +559,7 @@ static bool anyAttributeMatches(const Element& element, const CSSSelector& selec > return false; > } > >-bool SelectorChecker::attributeSelectorMatches(const Element& element, const QualifiedName& attributeName, const AtomicString& attributeValue, const CSSSelector& selector) >+bool SelectorChecker::attributeSelectorMatches(const Element& element, const QualifiedName& attributeName, const AtomString& attributeValue, const CSSSelector& selector) > { > ASSERT(selector.isAttributeSelector()); > auto& selectorAttribute = selector.attribute(); >@@ -636,11 +636,11 @@ static inline bool tagMatches(const Element& element, const CSSSelector& simpleS > if (tagQName == anyQName()) > return true; > >- const AtomicString& localName = (element.isHTMLElement() && element.document().isHTMLDocument()) ? simpleSelector.tagLowercaseLocalName() : tagQName.localName(); >+ const AtomString& localName = (element.isHTMLElement() && element.document().isHTMLDocument()) ? simpleSelector.tagLowercaseLocalName() : tagQName.localName(); > > if (localName != starAtom() && localName != element.localName()) > return false; >- const AtomicString& namespaceURI = tagQName.namespaceURI(); >+ const AtomString& namespaceURI = tagQName.namespaceURI(); > return namespaceURI == starAtom() || namespaceURI == element.namespaceURI(); > } > >diff --git a/Source/WebCore/css/SelectorChecker.h b/Source/WebCore/css/SelectorChecker.h >index 3dbb113dbc0492a4feb104957e293579e9cf8ef1..60b7eea5170591a931a8f35dc613f04a8cd3e692 100644 >--- a/Source/WebCore/css/SelectorChecker.h >+++ b/Source/WebCore/css/SelectorChecker.h >@@ -96,7 +96,7 @@ public: > > static bool isCommonPseudoClassSelector(const CSSSelector*); > static bool matchesFocusPseudoClass(const Element&); >- static bool attributeSelectorMatches(const Element&, const QualifiedName&, const AtomicString& attributeValue, const CSSSelector&); >+ static bool attributeSelectorMatches(const Element&, const QualifiedName&, const AtomString& attributeValue, const CSSSelector&); > > enum LinkMatchMask { MatchDefault = 0, MatchLink = 1, MatchVisited = 2, MatchAll = MatchLink | MatchVisited }; > static unsigned determineLinkMatchType(const CSSSelector*); >diff --git a/Source/WebCore/css/SelectorCheckerTestFunctions.h b/Source/WebCore/css/SelectorCheckerTestFunctions.h >index 5848fbe3523bf06237bc9b6699fad270561351c7..c3f784b57c9406db1d00cd8fb4adca6719b2606f 100644 >--- a/Source/WebCore/css/SelectorCheckerTestFunctions.h >+++ b/Source/WebCore/css/SelectorCheckerTestFunctions.h >@@ -172,9 +172,9 @@ ALWAYS_INLINE bool containslanguageSubtagMatchingRange(StringView language, Stri > return false; > } > >-ALWAYS_INLINE bool matchesLangPseudoClass(const Element& element, const Vector<AtomicString>& argumentList) >+ALWAYS_INLINE bool matchesLangPseudoClass(const Element& element, const Vector<AtomString>& argumentList) > { >- AtomicString language; >+ AtomString language; > #if ENABLE(VIDEO_TRACK) > if (is<WebVTTElement>(element)) > language = downcast<WebVTTElement>(element).language(); >@@ -189,7 +189,7 @@ ALWAYS_INLINE bool matchesLangPseudoClass(const Element& element, const Vector<A > // as specified in www.ietf.org/rfc/rfc4647.txt. > StringView languageStringView = language.string(); > unsigned languageLength = language.length(); >- for (const AtomicString& range : argumentList) { >+ for (const AtomString& range : argumentList) { > if (range.isEmpty()) > continue; > >diff --git a/Source/WebCore/css/SelectorFilter.cpp b/Source/WebCore/css/SelectorFilter.cpp >index 8862c69042bbd1d1581ed5f75d2cc4b90bab8d30..0b65e680322f9e15d5a9abc0491bbc23d3d69336 100644 >--- a/Source/WebCore/css/SelectorFilter.cpp >+++ b/Source/WebCore/css/SelectorFilter.cpp >@@ -38,14 +38,14 @@ namespace WebCore { > // Salt to separate otherwise identical string hashes so a class-selector like .article won't match <article> elements. > enum { TagNameSalt = 13, IdSalt = 17, ClassSalt = 19, AttributeSalt = 23 }; > >-static bool isExcludedAttribute(const AtomicString& name) >+static bool isExcludedAttribute(const AtomString& name) > { > return name == HTMLNames::classAttr->localName() || name == HTMLNames::idAttr->localName() || name == HTMLNames::styleAttr->localName(); > } > > static inline void collectElementIdentifierHashes(const Element& element, Vector<unsigned, 4>& identifierHashes) > { >- AtomicString tagLowercaseLocalName = element.localName().convertToASCIILowercase(); >+ AtomString tagLowercaseLocalName = element.localName().convertToASCIILowercase(); > identifierHashes.append(tagLowercaseLocalName.impl()->existingHash() * TagNameSalt); > > auto& id = element.idForStyleResolution(); >diff --git a/Source/WebCore/css/StyleBuilderCustom.h b/Source/WebCore/css/StyleBuilderCustom.h >index ad5b02dbaa1aaddee837376dc080ea5a5a7caa3a..9a191d17dd8e3edcc1c130c26590e0ca6f4e36a3 100644 >--- a/Source/WebCore/css/StyleBuilderCustom.h >+++ b/Source/WebCore/css/StyleBuilderCustom.h >@@ -145,8 +145,8 @@ public: > static void applyValueStrokeWidth(StyleResolver&, CSSValue&); > static void applyValueStrokeColor(StyleResolver&, CSSValue&); > >- static void applyInitialCustomProperty(StyleResolver&, const CSSRegisteredCustomProperty*, const AtomicString& name); >- static void applyInheritCustomProperty(StyleResolver&, const CSSRegisteredCustomProperty*, const AtomicString& name); >+ static void applyInitialCustomProperty(StyleResolver&, const CSSRegisteredCustomProperty*, const AtomString& name); >+ static void applyInheritCustomProperty(StyleResolver&, const CSSRegisteredCustomProperty*, const AtomString& name); > static void applyValueCustomProperty(StyleResolver&, const CSSRegisteredCustomProperty*, CSSCustomPropertyValue&); > > private: >@@ -901,12 +901,12 @@ inline void StyleBuilderCustom::applyValueFontFamily(StyleResolver& styleResolve > // Before mapping in a new font-family property, we should reset the generic family. > bool oldFamilyUsedFixedDefaultSize = fontDescription.useFixedDefaultSize(); > >- Vector<AtomicString> families; >+ Vector<AtomString> families; > families.reserveInitialCapacity(valueList.length()); > > for (auto& item : valueList) { > auto& contentValue = downcast<CSSPrimitiveValue>(item.get()); >- AtomicString family; >+ AtomString family; > bool isGenericFamily = false; > if (contentValue.isFontFamily()) { > const CSSFontFamily& fontFamily = contentValue.fontFamily(); >@@ -1135,7 +1135,7 @@ inline void StyleBuilderCustom::applyValueCounter(StyleResolver& styleResolver, > > for (auto& item : downcast<CSSValueList>(value)) { > Pair* pair = downcast<CSSPrimitiveValue>(item.get()).pairValue(); >- AtomicString identifier = pair->first()->stringValue(); >+ AtomString identifier = pair->first()->stringValue(); > int value = pair->second()->intValue(); > auto& directives = map.add(identifier, CounterDirectives { }).iterator->value; > if (counterBehavior == Reset) >@@ -1348,7 +1348,7 @@ inline void StyleBuilderCustom::applyValueContent(StyleResolver& styleResolver, > else > const_cast<RenderStyle*>(styleResolver.parentStyle())->setHasAttrContent(); > QualifiedName attr(nullAtom(), contentValue.stringValue().impl(), nullAtom()); >- const AtomicString& value = styleResolver.element()->getAttribute(attr); >+ const AtomString& value = styleResolver.element()->getAttribute(attr); > styleResolver.style()->setContent(value.isNull() ? emptyAtom() : value.impl(), didSet); > didSet = true; > // Register the fact that the attribute value affects the style. >@@ -1745,7 +1745,7 @@ void StyleBuilderCustom::applyValueAlt(StyleResolver& styleResolver, CSSValue& v > const_cast<RenderStyle*>(styleResolver.parentStyle())->setUnique(); > > QualifiedName attr(nullAtom(), primitiveValue.stringValue(), nullAtom()); >- const AtomicString& value = styleResolver.element()->getAttribute(attr); >+ const AtomString& value = styleResolver.element()->getAttribute(attr); > styleResolver.style()->setContentAltText(value.isNull() ? emptyAtom() : value); > > // Register the fact that the attribute value affects the style. >@@ -1799,7 +1799,7 @@ inline void StyleBuilderCustom::applyValueStrokeColor(StyleResolver& styleResolv > styleResolver.style()->setHasExplicitlySetStrokeColor(true); > } > >-inline void StyleBuilderCustom::applyInitialCustomProperty(StyleResolver& styleResolver, const CSSRegisteredCustomProperty* registered, const AtomicString& name) >+inline void StyleBuilderCustom::applyInitialCustomProperty(StyleResolver& styleResolver, const CSSRegisteredCustomProperty* registered, const AtomString& name) > { > if (registered && registered->initialValue()) { > auto initialValue = registered->initialValueCopy(); >@@ -1811,7 +1811,7 @@ inline void StyleBuilderCustom::applyInitialCustomProperty(StyleResolver& styleR > applyValueCustomProperty(styleResolver, registered, invalid.get()); > } > >-inline void StyleBuilderCustom::applyInheritCustomProperty(StyleResolver& styleResolver, const CSSRegisteredCustomProperty* registered, const AtomicString& name) >+inline void StyleBuilderCustom::applyInheritCustomProperty(StyleResolver& styleResolver, const CSSRegisteredCustomProperty* registered, const AtomString& name) > { > auto* parentValue = styleResolver.parentStyle() ? styleResolver.parentStyle()->inheritedCustomProperties().get(name) : nullptr; > if (parentValue && !(registered && !registered->inherits)) >diff --git a/Source/WebCore/css/StyleResolver.cpp b/Source/WebCore/css/StyleResolver.cpp >index ddd9414e524cd09700d0d812ae46aea72af67984..6441004698be35cfc8d7ea61c1407a8b00f790c6 100644 >--- a/Source/WebCore/css/StyleResolver.cpp >+++ b/Source/WebCore/css/StyleResolver.cpp >@@ -111,7 +111,7 @@ > #include <wtf/Seconds.h> > #include <wtf/StdLibExtras.h> > #include <wtf/Vector.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -255,7 +255,7 @@ void StyleResolver::appendAuthorStyleSheets(const Vector<RefPtr<CSSStyleSheet>>& > // This is a simplified style setting function for keyframe styles > void StyleResolver::addKeyframeStyle(Ref<StyleRuleKeyframes>&& rule) > { >- AtomicString s(rule->name()); >+ AtomString s(rule->name()); > m_keyframesRuleMap.set(s.impl(), WTFMove(rule)); > } > >@@ -459,7 +459,7 @@ std::unique_ptr<RenderStyle> StyleResolver::styleForKeyframe(const RenderStyle* > > bool StyleResolver::isAnimationNameValid(const String& name) > { >- return m_keyframesRuleMap.find(AtomicString(name).impl()) != m_keyframesRuleMap.end(); >+ return m_keyframesRuleMap.find(AtomString(name).impl()) != m_keyframesRuleMap.end(); > } > > void StyleResolver::keyframeStylesForAnimation(const Element& element, const RenderStyle* elementStyle, KeyframeList& list) >@@ -760,7 +760,7 @@ void StyleResolver::adjustStyleForInterCharacterRuby() > static bool hasEffectiveDisplayNoneForDisplayContents(const Element& element) > { > // https://drafts.csswg.org/css-display-3/#unbox-html >- static NeverDestroyed<HashSet<AtomicString>> tagNames = [] { >+ static NeverDestroyed<HashSet<AtomString>> tagNames = [] { > static const HTMLQualifiedName* const tagList[] = { > &brTag.get(), > &wbrTag.get(), >@@ -780,7 +780,7 @@ static bool hasEffectiveDisplayNoneForDisplayContents(const Element& element) > &textareaTag.get(), > &selectTag.get(), > }; >- HashSet<AtomicString> set; >+ HashSet<AtomString> set; > for (auto& name : tagList) > set.add(name->localName()); > return set; >@@ -1162,13 +1162,13 @@ void StyleResolver::adjustRenderStyleForSiteSpecificQuirks(RenderStyle& style, c > { > if (document().quirks().needsGMailOverflowScrollQuirk()) { > // This turns sidebar scrollable without mouse move event. >- static NeverDestroyed<AtomicString> roleValue("navigation", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> roleValue("navigation", AtomString::ConstructFromLiteral); > if (style.overflowY() == Overflow::Hidden && element.attributeWithoutSynchronization(roleAttr) == roleValue) > style.setOverflowY(Overflow::Auto); > } > if (document().quirks().needsYouTubeOverflowScrollQuirk()) { > // This turns sidebar scrollable without hover. >- static NeverDestroyed<AtomicString> idValue("guide-inner-content", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> idValue("guide-inner-content", AtomString::ConstructFromLiteral); > if (style.overflowY() == Overflow::Hidden && element.idForStyleResolution() == idValue) > style.setOverflowY(Overflow::Auto); > } >diff --git a/Source/WebCore/css/StyleResolver.h b/Source/WebCore/css/StyleResolver.h >index 2a34b26d71b245f613b261f351f2740cc584945e..01bb8fbb3dc1230c0f39184e19a1fea64410a295 100644 >--- a/Source/WebCore/css/StyleResolver.h >+++ b/Source/WebCore/css/StyleResolver.h >@@ -36,7 +36,7 @@ > #include <wtf/HashMap.h> > #include <wtf/RefPtr.h> > #include <wtf/Vector.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/StringHash.h> > > namespace WebCore { >@@ -193,8 +193,8 @@ public: > static bool colorFromPrimitiveValueIsDerivedFromElement(const CSSPrimitiveValue&); > Color colorFromPrimitiveValue(const CSSPrimitiveValue&, bool forVisitedLink = false) const; > >- bool hasSelectorForId(const AtomicString&) const; >- bool hasSelectorForAttribute(const Element&, const AtomicString&) const; >+ bool hasSelectorForId(const AtomString&) const; >+ bool hasSelectorForAttribute(const Element&, const AtomString&) const; > > #if ENABLE(CSS_DEVICE_ADAPTATION) > ViewportStyleResolver* viewportStyleResolver() { return m_viewportStyleResolver.get(); } >@@ -287,7 +287,7 @@ public: > > void applyDeferredProperties(StyleResolver&, ApplyCascadedPropertyState&); > >- HashMap<AtomicString, Property>& customProperties() { return m_customProperties; } >+ HashMap<AtomString, Property>& customProperties() { return m_customProperties; } > bool hasCustomProperty(const String&) const; > Property customProperty(const String&) const; > >@@ -301,7 +301,7 @@ public: > std::bitset<numCSSProperties + 2> m_propertyIsPresent; > > Vector<Property, 8> m_deferredProperties; >- HashMap<AtomicString, Property> m_customProperties; >+ HashMap<AtomString, Property> m_customProperties; > > TextDirection m_direction; > WritingMode m_writingMode; >@@ -346,7 +346,7 @@ private: > > DocumentRuleSets m_ruleSets; > >- typedef HashMap<AtomicStringImpl*, RefPtr<StyleRuleKeyframes>> KeyframesRuleMap; >+ typedef HashMap<AtomStringImpl*, RefPtr<StyleRuleKeyframes>> KeyframesRuleMap; > KeyframesRuleMap m_keyframesRuleMap; > > public: >@@ -552,7 +552,7 @@ struct ApplyCascadedPropertyState { > }; > > >-inline bool StyleResolver::hasSelectorForAttribute(const Element& element, const AtomicString &attributeName) const >+inline bool StyleResolver::hasSelectorForAttribute(const Element& element, const AtomString &attributeName) const > { > ASSERT(!attributeName.isEmpty()); > if (element.isHTMLElement()) >@@ -560,7 +560,7 @@ inline bool StyleResolver::hasSelectorForAttribute(const Element& element, const > return m_ruleSets.features().attributeLocalNamesInRules.contains(attributeName); > } > >-inline bool StyleResolver::hasSelectorForId(const AtomicString& idValue) const >+inline bool StyleResolver::hasSelectorForId(const AtomString& idValue) const > { > ASSERT(!idValue.isEmpty()); > return m_ruleSets.features().idsInRules.contains(idValue); >diff --git a/Source/WebCore/css/StyleRule.cpp b/Source/WebCore/css/StyleRule.cpp >index 1eefeb8bd10c254b824bc06cd5b8aef06602184f..1df0a2a42573a86af8dde38a1caa39dd469cc72c 100644 >--- a/Source/WebCore/css/StyleRule.cpp >+++ b/Source/WebCore/css/StyleRule.cpp >@@ -434,7 +434,7 @@ StyleRuleCharset::StyleRuleCharset(const StyleRuleCharset& o) > > StyleRuleCharset::~StyleRuleCharset() = default; > >-StyleRuleNamespace::StyleRuleNamespace(AtomicString prefix, AtomicString uri) >+StyleRuleNamespace::StyleRuleNamespace(AtomString prefix, AtomString uri) > : StyleRuleBase(Namespace) > , m_prefix(prefix) > , m_uri(uri) >diff --git a/Source/WebCore/css/StyleRule.h b/Source/WebCore/css/StyleRule.h >index 401d04942c31e13108b0bde8544541cca8feec08..9e6a96d23f8c8e1cbf7239d2ddc0df9a586c4994 100644 >--- a/Source/WebCore/css/StyleRule.h >+++ b/Source/WebCore/css/StyleRule.h >@@ -343,7 +343,7 @@ private: > > class StyleRuleNamespace final : public StyleRuleBase { > public: >- static Ref<StyleRuleNamespace> create(AtomicString prefix, AtomicString uri) >+ static Ref<StyleRuleNamespace> create(AtomString prefix, AtomString uri) > { > return adoptRef(*new StyleRuleNamespace(prefix, uri)); > } >@@ -352,15 +352,15 @@ public: > > Ref<StyleRuleNamespace> copy() const { return adoptRef(*new StyleRuleNamespace(*this)); } > >- AtomicString prefix() const { return m_prefix; } >- AtomicString uri() const { return m_uri; } >+ AtomString prefix() const { return m_prefix; } >+ AtomString uri() const { return m_uri; } > > private: >- StyleRuleNamespace(AtomicString prefix, AtomicString uri); >+ StyleRuleNamespace(AtomString prefix, AtomString uri); > StyleRuleNamespace(const StyleRuleNamespace&); > >- AtomicString m_prefix; >- AtomicString m_uri; >+ AtomString m_prefix; >+ AtomString m_uri; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/css/StyleSheetContents.cpp b/Source/WebCore/css/StyleSheetContents.cpp >index aecbb20f39e93f4f7b8ca2dca1cef9cb7ee970d9..8e8818cc63cbe0ad322d5fd4077a600416ae63ce 100644 >--- a/Source/WebCore/css/StyleSheetContents.cpp >+++ b/Source/WebCore/css/StyleSheetContents.cpp >@@ -295,7 +295,7 @@ void StyleSheetContents::wrapperDeleteRule(unsigned index) > m_childRules.remove(childVectorIndex); > } > >-void StyleSheetContents::parserAddNamespace(const AtomicString& prefix, const AtomicString& uri) >+void StyleSheetContents::parserAddNamespace(const AtomString& prefix, const AtomString& uri) > { > ASSERT(!uri.isNull()); > if (prefix.isNull()) { >@@ -308,7 +308,7 @@ void StyleSheetContents::parserAddNamespace(const AtomicString& prefix, const At > result.iterator->value = uri; > } > >-const AtomicString& StyleSheetContents::namespaceURIFromPrefix(const AtomicString& prefix) >+const AtomString& StyleSheetContents::namespaceURIFromPrefix(const AtomString& prefix) > { > PrefixNamespaceURIMap::const_iterator it = m_namespaces.find(prefix); > if (it == m_namespaces.end()) >diff --git a/Source/WebCore/css/StyleSheetContents.h b/Source/WebCore/css/StyleSheetContents.h >index 553716203ea8a5f3f50d2e1cbb2a4c72c868da2b..cedc0ed3d85079d1446b398a6f6b84e45455b27e 100644 >--- a/Source/WebCore/css/StyleSheetContents.h >+++ b/Source/WebCore/css/StyleSheetContents.h >@@ -28,7 +28,7 @@ > #include <wtf/URL.h> > #include <wtf/Vector.h> > #include <wtf/WeakPtr.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -62,8 +62,8 @@ public: > > const CSSParserContext& parserContext() const { return m_parserContext; } > >- const AtomicString& defaultNamespace() { return m_defaultNamespace; } >- const AtomicString& namespaceURIFromPrefix(const AtomicString& prefix); >+ const AtomString& defaultNamespace() { return m_defaultNamespace; } >+ const AtomString& namespaceURIFromPrefix(const AtomString& prefix); > > void parseAuthorStyleSheet(const CachedCSSStyleSheet*, const SecurityOrigin*); > WEBCORE_EXPORT bool parseString(const String&); >@@ -94,7 +94,7 @@ public: > void setHasSyntacticallyValidCSSHeader(bool b) { m_hasSyntacticallyValidCSSHeader = b; } > bool hasSyntacticallyValidCSSHeader() const { return m_hasSyntacticallyValidCSSHeader; } > >- void parserAddNamespace(const AtomicString& prefix, const AtomicString& uri); >+ void parserAddNamespace(const AtomString& prefix, const AtomString& uri); > void parserAppendRule(Ref<StyleRuleBase>&&); > void parserSetEncodingFromCharsetRule(const String& encoding); > void parserSetUsesStyleBasedEditability() { m_usesStyleBasedEditability = true; } >@@ -161,9 +161,9 @@ private: > Vector<RefPtr<StyleRuleImport>> m_importRules; > Vector<RefPtr<StyleRuleNamespace>> m_namespaceRules; > Vector<RefPtr<StyleRuleBase>> m_childRules; >- typedef HashMap<AtomicString, AtomicString> PrefixNamespaceURIMap; >+ typedef HashMap<AtomString, AtomString> PrefixNamespaceURIMap; > PrefixNamespaceURIMap m_namespaces; >- AtomicString m_defaultNamespace; >+ AtomString m_defaultNamespace; > > bool m_isUserStyleSheet; > bool m_loadCompleted { false }; >diff --git a/Source/WebCore/css/StyleSheetList.cpp b/Source/WebCore/css/StyleSheetList.cpp >index 86932d203d8a25e5ad3069221fe0ea75482c7a17..b53947d18ce13c61d66410dd88dda0e3cb38ffe7 100644 >--- a/Source/WebCore/css/StyleSheetList.cpp >+++ b/Source/WebCore/css/StyleSheetList.cpp >@@ -86,7 +86,7 @@ StyleSheet* StyleSheetList::item(unsigned index) > return index < sheets.size() ? sheets[index].get() : 0; > } > >-CSSStyleSheet* StyleSheetList::namedItem(const AtomicString& name) const >+CSSStyleSheet* StyleSheetList::namedItem(const AtomString& name) const > { > // Support the named getter on document for backwards compatibility. > if (!m_document) >@@ -103,10 +103,10 @@ CSSStyleSheet* StyleSheetList::namedItem(const AtomicString& name) const > return nullptr; > } > >-Vector<AtomicString> StyleSheetList::supportedPropertyNames() >+Vector<AtomString> StyleSheetList::supportedPropertyNames() > { > // FIXME: Should be implemented. >- return Vector<AtomicString>(); >+ return Vector<AtomString>(); > } > > } // namespace WebCore >diff --git a/Source/WebCore/css/StyleSheetList.h b/Source/WebCore/css/StyleSheetList.h >index 48025719105ae2933ee087d41352161b9c301670..c1c4840fb71786e9ce3c8001c46ad25e7a2a0eed 100644 >--- a/Source/WebCore/css/StyleSheetList.h >+++ b/Source/WebCore/css/StyleSheetList.h >@@ -43,8 +43,8 @@ public: > WEBCORE_EXPORT unsigned length() const; > WEBCORE_EXPORT StyleSheet* item(unsigned index); > >- CSSStyleSheet* namedItem(const AtomicString&) const; >- Vector<AtomicString> supportedPropertyNames(); >+ CSSStyleSheet* namedItem(const AtomString&) const; >+ Vector<AtomString> supportedPropertyNames(); > > Node* ownerNode() const; > >diff --git a/Source/WebCore/css/makeprop.pl b/Source/WebCore/css/makeprop.pl >index 869735f10a89c452f6154984f9db61f1b980d506..7acc58cbf12e4aaf574ad382e55a46458cbec9f6 100755 >--- a/Source/WebCore/css/makeprop.pl >+++ b/Source/WebCore/css/makeprop.pl >@@ -248,7 +248,7 @@ print GPERF << "EOF"; > #include \"HashTools.h\" > #include "RuntimeEnabledFeatures.h" > #include <wtf/ASCIICType.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/WTFString.h> > #include <string.h> > >@@ -350,7 +350,7 @@ const char* getPropertyName(CSSPropertyID id) > return propertyNameStrings[index]; > } > >-const AtomicString& getPropertyNameAtomicString(CSSPropertyID id) >+const AtomString& getPropertyNameAtomString(CSSPropertyID id) > { > if (id < firstCSSProperty) > return nullAtom(); >@@ -358,11 +358,11 @@ const AtomicString& getPropertyNameAtomicString(CSSPropertyID id) > if (index >= numCSSProperties) > return nullAtom(); > >- static AtomicString* propertyStrings = new AtomicString[numCSSProperties]; // Intentionally never destroyed. >- AtomicString& propertyString = propertyStrings[index]; >+ static AtomString* propertyStrings = new AtomString[numCSSProperties]; // Intentionally never destroyed. >+ AtomString& propertyString = propertyStrings[index]; > if (propertyString.isNull()) { > const char* propertyName = propertyNameStrings[index]; >- propertyString = AtomicString(propertyName, strlen(propertyName), AtomicString::ConstructFromLiteral); >+ propertyString = AtomString(propertyName, strlen(propertyName), AtomString::ConstructFromLiteral); > } > return propertyString; > } >@@ -370,7 +370,7 @@ const AtomicString& getPropertyNameAtomicString(CSSPropertyID id) > String getPropertyNameString(CSSPropertyID id) > { > // We share the StringImpl with the AtomicStrings. >- return getPropertyNameAtomicString(id).string(); >+ return getPropertyNameAtomString(id).string(); > } > > String getJSPropertyName(CSSPropertyID id) >@@ -487,7 +487,7 @@ print HEADER << "EOF"; > bool isInternalCSSProperty(const CSSPropertyID); > bool isEnabledCSSProperty(const CSSPropertyID); > const char* getPropertyName(CSSPropertyID); >-const WTF::AtomicString& getPropertyNameAtomicString(CSSPropertyID id); >+const WTF::AtomString& getPropertyNameAtomString(CSSPropertyID id); > WTF::String getPropertyNameString(CSSPropertyID id); > WTF::String getJSPropertyName(CSSPropertyID); > >diff --git a/Source/WebCore/css/makevalues.pl b/Source/WebCore/css/makevalues.pl >index d1e8090d81d6e8c1c6fd8872f0d16b278e6c2217..7224df5114246795fde5b64991b2c5c269c74125 100755 >--- a/Source/WebCore/css/makevalues.pl >+++ b/Source/WebCore/css/makevalues.pl >@@ -74,7 +74,7 @@ print GPERF << "EOF"; > #include \"CSSValueKeywords.h\" > #include \"HashTools.h\" > #include <wtf/ASCIICType.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/WTFString.h> > #include <string.h> > >@@ -131,13 +131,13 @@ const char* getValueName(unsigned short id) > return valueList[id]; > } > >-const AtomicString& getValueNameAtomicString(CSSValueID id) >+const AtomString& getValueNameAtomString(CSSValueID id) > { > if (id < firstCSSValueKeyword || id > lastCSSValueKeyword) > return nullAtom(); > >- static AtomicString* valueKeywordStrings = new AtomicString[numCSSValueKeywords]; // Leaked intentionally. >- AtomicString& valueKeywordString = valueKeywordStrings[id]; >+ static AtomString* valueKeywordStrings = new AtomString[numCSSValueKeywords]; // Leaked intentionally. >+ AtomString& valueKeywordString = valueKeywordStrings[id]; > if (valueKeywordString.isNull()) > valueKeywordString = getValueName(id); > return valueKeywordString; >@@ -146,7 +146,7 @@ const AtomicString& getValueNameAtomicString(CSSValueID id) > String getValueNameString(CSSValueID id) > { > // We share the StringImpl with the AtomicStrings. >- return getValueNameAtomicString(id).string(); >+ return getValueNameAtomString(id).string(); > } > > } // namespace WebCore >@@ -194,7 +194,7 @@ print HEADER "const size_t maxCSSValueKeywordLength = " . $maxLen . ";\n"; > print HEADER << "EOF"; > > const char* getValueName(unsigned short id); >-const WTF::AtomicString& getValueNameAtomicString(CSSValueID id); >+const WTF::AtomString& getValueNameAtomString(CSSValueID id); > WTF::String getValueNameString(CSSValueID id); > > inline CSSValueID convertToCSSValueID(int value) >diff --git a/Source/WebCore/css/parser/CSSParser.cpp b/Source/WebCore/css/parser/CSSParser.cpp >index b4fa697c967a19145c3de332e357c6232d4a9ab2..05e100b9e697eaf93572492b572d1bef6b0f3b1b 100644 >--- a/Source/WebCore/css/parser/CSSParser.cpp >+++ b/Source/WebCore/css/parser/CSSParser.cpp >@@ -146,7 +146,7 @@ CSSParser::ParseResult CSSParser::parseValue(MutableStyleProperties& declaration > return parser.parseValue(declaration, propertyID, string, important); > } > >-CSSParser::ParseResult CSSParser::parseCustomPropertyValue(MutableStyleProperties& declaration, const AtomicString& propertyName, const String& string, bool important, const CSSParserContext& context) >+CSSParser::ParseResult CSSParser::parseCustomPropertyValue(MutableStyleProperties& declaration, const AtomString& propertyName, const String& string, bool important, const CSSParserContext& context) > { > return CSSParserImpl::parseCustomPropertyValue(&declaration, propertyName, string, important, context); > } >diff --git a/Source/WebCore/css/parser/CSSParser.h b/Source/WebCore/css/parser/CSSParser.h >index 47063cdfb9a255c56bfdc45f6ce4b036441100fa..e3307898faaff2cf72f581a0c28c8e5722653c37 100644 >--- a/Source/WebCore/css/parser/CSSParser.h >+++ b/Source/WebCore/css/parser/CSSParser.h >@@ -67,7 +67,7 @@ public: > static void parseDeclarationForInspector(const CSSParserContext&, const String&, CSSParserObserver&); > > static ParseResult parseValue(MutableStyleProperties&, CSSPropertyID, const String&, bool important, const CSSParserContext&); >- static ParseResult parseCustomPropertyValue(MutableStyleProperties&, const AtomicString& propertyName, const String&, bool important, const CSSParserContext&); >+ static ParseResult parseCustomPropertyValue(MutableStyleProperties&, const AtomString& propertyName, const String&, bool important, const CSSParserContext&); > > static RefPtr<CSSValue> parseFontFaceDescriptor(CSSPropertyID, const String&, const CSSParserContext&); > >diff --git a/Source/WebCore/css/parser/CSSParserImpl.cpp b/Source/WebCore/css/parser/CSSParserImpl.cpp >index 4110cd4f554e26767eee69aee48fec38d8d8a61a..fefb77d5b4e526e5916ece593658cac18c2eb7b9 100644 >--- a/Source/WebCore/css/parser/CSSParserImpl.cpp >+++ b/Source/WebCore/css/parser/CSSParserImpl.cpp >@@ -96,7 +96,7 @@ CSSParser::ParseResult CSSParserImpl::parseValue(MutableStyleProperties* declara > return declaration->addParsedProperties(parser.m_parsedProperties) ? CSSParser::ParseResult::Changed : CSSParser::ParseResult::Unchanged; > } > >-CSSParser::ParseResult CSSParserImpl::parseCustomPropertyValue(MutableStyleProperties* declaration, const AtomicString& propertyName, const String& string, bool important, const CSSParserContext& context) >+CSSParser::ParseResult CSSParserImpl::parseCustomPropertyValue(MutableStyleProperties* declaration, const AtomString& propertyName, const String& string, bool important, const CSSParserContext& context) > { > CSSParserImpl parser(context, string); > parser.consumeCustomPropertyValue(parser.tokenizer()->tokenRange(), propertyName, important); >@@ -105,7 +105,7 @@ CSSParser::ParseResult CSSParserImpl::parseCustomPropertyValue(MutableStylePrope > return declaration->addParsedProperties(parser.m_parsedProperties) ? CSSParser::ParseResult::Changed : CSSParser::ParseResult::Unchanged; > } > >-static inline void filterProperties(bool important, const ParsedPropertyVector& input, ParsedPropertyVector& output, size_t& unusedEntries, std::bitset<numCSSProperties>& seenProperties, HashSet<AtomicString>& seenCustomProperties) >+static inline void filterProperties(bool important, const ParsedPropertyVector& input, ParsedPropertyVector& output, size_t& unusedEntries, std::bitset<numCSSProperties>& seenProperties, HashSet<AtomString>& seenCustomProperties) > { > // Add properties in reverse order so that highest priority definitions are reached first. Duplicate definitions can then be ignored when found. > for (size_t i = input.size(); i--; ) { >@@ -146,7 +146,7 @@ static Ref<ImmutableStyleProperties> createStyleProperties(ParsedPropertyVector& > std::bitset<numCSSProperties> seenProperties; > size_t unusedEntries = parsedProperties.size(); > ParsedPropertyVector results(unusedEntries); >- HashSet<AtomicString> seenCustomProperties; >+ HashSet<AtomString> seenCustomProperties; > > filterProperties(true, parsedProperties, results, unusedEntries, seenProperties, seenCustomProperties); > filterProperties(false, parsedProperties, results, unusedEntries, seenProperties, seenCustomProperties); >@@ -213,7 +213,7 @@ bool CSSParserImpl::parseDeclarationList(MutableStyleProperties* declaration, co > std::bitset<numCSSProperties> seenProperties; > size_t unusedEntries = parser.m_parsedProperties.size(); > ParsedPropertyVector results(unusedEntries); >- HashSet<AtomicString> seenCustomProperties; >+ HashSet<AtomString> seenCustomProperties; > filterProperties(true, parser.m_parsedProperties, results, unusedEntries, seenProperties, seenCustomProperties); > filterProperties(false, parser.m_parsedProperties, results, unusedEntries, seenProperties, seenCustomProperties); > if (unusedEntries) >@@ -264,16 +264,16 @@ CSSSelectorList CSSParserImpl::parsePageSelector(CSSParserTokenRange range, Styl > { > // We only support a small subset of the css-page spec. > range.consumeWhitespace(); >- AtomicString typeSelector; >+ AtomString typeSelector; > if (range.peek().type() == IdentToken) >- typeSelector = range.consume().value().toAtomicString(); >+ typeSelector = range.consume().value().toAtomString(); > >- AtomicString pseudo; >+ AtomString pseudo; > if (range.peek().type() == ColonToken) { > range.consume(); > if (range.peek().type() != IdentToken) > return CSSSelectorList(); >- pseudo = range.consume().value().toAtomicString(); >+ pseudo = range.consume().value().toAtomString(); > } > > range.consumeWhitespace(); >@@ -477,21 +477,21 @@ RefPtr<StyleRuleBase> CSSParserImpl::consumeQualifiedRule(CSSParserTokenRange& r > } > > // This may still consume tokens if it fails >-static AtomicString consumeStringOrURI(CSSParserTokenRange& range) >+static AtomString consumeStringOrURI(CSSParserTokenRange& range) > { > const CSSParserToken& token = range.peek(); > > if (token.type() == StringToken || token.type() == UrlToken) >- return range.consumeIncludingWhitespace().value().toAtomicString(); >+ return range.consumeIncludingWhitespace().value().toAtomString(); > > if (token.type() != FunctionToken || !equalIgnoringASCIICase(token.value(), "url")) >- return AtomicString(); >+ return AtomString(); > > CSSParserTokenRange contents = range.consumeBlock(); > const CSSParserToken& uri = contents.consumeIncludingWhitespace(); > if (uri.type() == BadStringToken || !contents.atEnd()) >- return AtomicString(); >- return uri.value().toAtomicString(); >+ return AtomString(); >+ return uri.value().toAtomString(); > } > > RefPtr<StyleRuleCharset> CSSParserImpl::consumeCharsetRule(CSSParserTokenRange prelude) >@@ -504,7 +504,7 @@ RefPtr<StyleRuleCharset> CSSParserImpl::consumeCharsetRule(CSSParserTokenRange p > > RefPtr<StyleRuleImport> CSSParserImpl::consumeImportRule(CSSParserTokenRange prelude) > { >- AtomicString uri(consumeStringOrURI(prelude)); >+ AtomString uri(consumeStringOrURI(prelude)); > if (uri.isNull()) > return nullptr; // Parse error, expected string or URI > >@@ -521,11 +521,11 @@ RefPtr<StyleRuleImport> CSSParserImpl::consumeImportRule(CSSParserTokenRange pre > > RefPtr<StyleRuleNamespace> CSSParserImpl::consumeNamespaceRule(CSSParserTokenRange prelude) > { >- AtomicString namespacePrefix; >+ AtomString namespacePrefix; > if (prelude.peek().type() == IdentToken) >- namespacePrefix = prelude.consumeIncludingWhitespace().value().toAtomicString(); >+ namespacePrefix = prelude.consumeIncludingWhitespace().value().toAtomString(); > >- AtomicString uri(consumeStringOrURI(prelude)); >+ AtomString uri(consumeStringOrURI(prelude)); > if (uri.isNull() || !prelude.atEnd()) > return nullptr; // Parse error, expected string or URI > >@@ -822,7 +822,7 @@ void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range, StyleRule::Typ > > size_t propertiesCount = m_parsedProperties.size(); > if (propertyID == CSSPropertyInvalid && CSSVariableParser::isValidVariableName(token)) { >- AtomicString variableName = token.value().toAtomicString(); >+ AtomString variableName = token.value().toAtomString(); > consumeCustomPropertyValue(range.makeSubRange(&range.peek(), declarationValueEnd), variableName, important); > } > >@@ -839,7 +839,7 @@ void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range, StyleRule::Typ > } > } > >-void CSSParserImpl::consumeCustomPropertyValue(CSSParserTokenRange range, const AtomicString& variableName, bool important) >+void CSSParserImpl::consumeCustomPropertyValue(CSSParserTokenRange range, const AtomString& variableName, bool important) > { > if (RefPtr<CSSCustomPropertyValue> value = CSSVariableParser::parseDeclarationValue(variableName, range, m_context)) > m_parsedProperties.append(CSSProperty(CSSPropertyCustom, WTFMove(value), important)); >diff --git a/Source/WebCore/css/parser/CSSParserImpl.h b/Source/WebCore/css/parser/CSSParserImpl.h >index 36e37905e27bd3bc664506595297c218bcc92d78..115843049390c1559742b2a106ae1711698aaa76 100644 >--- a/Source/WebCore/css/parser/CSSParserImpl.h >+++ b/Source/WebCore/css/parser/CSSParserImpl.h >@@ -83,7 +83,7 @@ public: > }; > > static CSSParser::ParseResult parseValue(MutableStyleProperties*, CSSPropertyID, const String&, bool important, const CSSParserContext&); >- static CSSParser::ParseResult parseCustomPropertyValue(MutableStyleProperties*, const AtomicString& propertyName, const String&, bool important, const CSSParserContext&); >+ static CSSParser::ParseResult parseCustomPropertyValue(MutableStyleProperties*, const AtomString& propertyName, const String&, bool important, const CSSParserContext&); > static Ref<ImmutableStyleProperties> parseInlineStyleDeclaration(const String&, const Element*); > static bool parseDeclarationList(MutableStyleProperties*, const String&, const CSSParserContext&); > static RefPtr<StyleRuleBase> parseRule(const String&, const CSSParserContext&, StyleSheetContents*, AllowedRulesType); >@@ -141,7 +141,7 @@ private: > void consumeDeclarationList(CSSParserTokenRange, StyleRule::Type); > void consumeDeclaration(CSSParserTokenRange, StyleRule::Type); > void consumeDeclarationValue(CSSParserTokenRange, CSSPropertyID, bool important, StyleRule::Type); >- void consumeCustomPropertyValue(CSSParserTokenRange, const AtomicString& propertyName, bool important); >+ void consumeCustomPropertyValue(CSSParserTokenRange, const AtomString& propertyName, bool important); > > static std::unique_ptr<Vector<double>> consumeKeyframeKeyList(CSSParserTokenRange); > >diff --git a/Source/WebCore/css/parser/CSSParserSelector.cpp b/Source/WebCore/css/parser/CSSParserSelector.cpp >index 1af424eac9ff3b70f52fe5e6b32417419c11b7a3..97393c94748a37f7fea954a65607de30f9a07930 100644 >--- a/Source/WebCore/css/parser/CSSParserSelector.cpp >+++ b/Source/WebCore/css/parser/CSSParserSelector.cpp >@@ -32,7 +32,7 @@ > > namespace WebCore { > >-CSSParserSelector* CSSParserSelector::parsePagePseudoSelector(const AtomicString& pseudoTypeString) >+CSSParserSelector* CSSParserSelector::parsePagePseudoSelector(const AtomString& pseudoTypeString) > { > CSSSelector::PagePseudoClassType pseudoType; > if (equalLettersIgnoringASCIICase(pseudoTypeString, "first")) >@@ -52,7 +52,7 @@ CSSParserSelector* CSSParserSelector::parsePagePseudoSelector(const AtomicString > > CSSParserSelector* CSSParserSelector::parsePseudoElementSelectorFromStringView(StringView& pseudoTypeString) > { >- AtomicString name = pseudoTypeString.toAtomicString(); >+ AtomString name = pseudoTypeString.toAtomString(); > > CSSSelector::PseudoElementType pseudoType = CSSSelector::parsePseudoElementType(name); > if (pseudoType == CSSSelector::PseudoElementUnknown) { >@@ -71,7 +71,7 @@ CSSParserSelector* CSSParserSelector::parsePseudoElementSelectorFromStringView(S > if (pseudoType == CSSSelector::PseudoElementWebKitCustomLegacyPrefixed) { > ASSERT_WITH_MESSAGE(name == "-webkit-input-placeholder", "-webkit-input-placeholder is the only LegacyPrefix pseudo type."); > if (name == "-webkit-input-placeholder") >- name = AtomicString("placeholder", AtomicString::ConstructFromLiteral); >+ name = AtomString("placeholder", AtomString::ConstructFromLiteral); > } > selector->m_selector->setValue(name); > return selector.release(); >@@ -90,7 +90,7 @@ CSSParserSelector* CSSParserSelector::parsePseudoClassSelectorFromStringView(Str > auto selector = std::make_unique<CSSParserSelector>(); > selector->m_selector->setMatch(CSSSelector::PseudoElement); > selector->m_selector->setPseudoElementType(pseudoType.compatibilityPseudoElement); >- AtomicString name = pseudoTypeString.toAtomicString(); >+ AtomString name = pseudoTypeString.toAtomString(); > selector->m_selector->setValue(name); > return selector.release(); > } >@@ -127,7 +127,7 @@ void CSSParserSelector::adoptSelectorVector(Vector<std::unique_ptr<CSSParserSele > m_selector->setSelectorList(std::make_unique<CSSSelectorList>(WTFMove(selectorVector))); > } > >-void CSSParserSelector::setLangArgumentList(std::unique_ptr<Vector<AtomicString>> argumentList) >+void CSSParserSelector::setLangArgumentList(std::unique_ptr<Vector<AtomString>> argumentList) > { > ASSERT_WITH_MESSAGE(!argumentList->isEmpty(), "No CSS Selector takes an empty argument list."); > m_selector->setLangArgumentList(WTFMove(argumentList)); >diff --git a/Source/WebCore/css/parser/CSSParserSelector.h b/Source/WebCore/css/parser/CSSParserSelector.h >index 860fda1c1112ab99a3283e3a23c6417cea5727ce..02b9c8556831b38a6e735926d6d3aa1c67a18af6 100644 >--- a/Source/WebCore/css/parser/CSSParserSelector.h >+++ b/Source/WebCore/css/parser/CSSParserSelector.h >@@ -22,8 +22,8 @@ > > #include "CSSSelector.h" > #include "CSSValueKeywords.h" >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/WTFString.h> > > namespace WebCore { >@@ -43,7 +43,7 @@ class CSSParserSelector { > public: > static CSSParserSelector* parsePseudoClassSelectorFromStringView(StringView&); > static CSSParserSelector* parsePseudoElementSelectorFromStringView(StringView&); >- static CSSParserSelector* parsePagePseudoSelector(const AtomicString&); >+ static CSSParserSelector* parsePagePseudoSelector(const AtomString&); > > CSSParserSelector(); > explicit CSSParserSelector(const QualifiedName&); >@@ -51,11 +51,11 @@ public: > > std::unique_ptr<CSSSelector> releaseSelector() { return WTFMove(m_selector); } > >- void setValue(const AtomicString& value, bool matchLowerCase = false) { m_selector->setValue(value, matchLowerCase); } >+ void setValue(const AtomString& value, bool matchLowerCase = false) { m_selector->setValue(value, matchLowerCase); } > > void setAttribute(const QualifiedName& value, bool convertToLowercase, CSSSelector::AttributeMatchType type) { m_selector->setAttribute(value, convertToLowercase, type); } > >- void setArgument(const AtomicString& value) { m_selector->setArgument(value); } >+ void setArgument(const AtomString& value) { m_selector->setArgument(value); } > void setNth(int a, int b) { m_selector->setNth(a, b); } > void setMatch(CSSSelector::Match value) { m_selector->setMatch(value); } > void setRelation(CSSSelector::RelationType value) { m_selector->setRelation(value); } >@@ -68,7 +68,7 @@ public: > void setPseudoElementType(CSSSelector::PseudoElementType type) { m_selector->setPseudoElementType(type); } > > void adoptSelectorVector(Vector<std::unique_ptr<CSSParserSelector>>&&); >- void setLangArgumentList(std::unique_ptr<Vector<AtomicString>>); >+ void setLangArgumentList(std::unique_ptr<Vector<AtomString>>); > void setSelectorList(std::unique_ptr<CSSSelectorList>); > > CSSSelector::PseudoClassType pseudoClassType() const { return m_selector->pseudoClassType(); } >diff --git a/Source/WebCore/css/parser/CSSPropertyParser.cpp b/Source/WebCore/css/parser/CSSPropertyParser.cpp >index fb8b5e694cb350e589797bfad26243627765b825..902da151c0360a87f900032da8d5d7c4f856cd20 100644 >--- a/Source/WebCore/css/parser/CSSPropertyParser.cpp >+++ b/Source/WebCore/css/parser/CSSPropertyParser.cpp >@@ -2197,7 +2197,7 @@ static RefPtr<CSSValue> consumeAttr(CSSParserTokenRange args, CSSParserContext c > return nullptr; > > CSSParserToken token = args.consumeIncludingWhitespace(); >- auto attrName = token.value().toAtomicString(); >+ auto attrName = token.value().toAtomString(); > if (context.isHTMLDocument) > attrName = attrName.convertToASCIILowercase(); > >diff --git a/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp b/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp >index 8b939aaaa3d66d3d88fc429349f5dd5c9eaf060e..2005fc02a99d6b2ec6b6f019919732115d93e6a1 100644 >--- a/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp >+++ b/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp >@@ -1444,7 +1444,7 @@ static RefPtr<CSSValue> consumeImageSet(CSSParserTokenRange& range, const CSSPar > CSSParserTokenRange args = consumeFunction(rangeCopy); > RefPtr<CSSImageSetValue> imageSet = CSSImageSetValue::create(context.isContentOpaque ? LoadedFromOpaqueSource::Yes : LoadedFromOpaqueSource::No); > do { >- AtomicString urlValue = consumeUrlAsStringView(args).toAtomicString(); >+ AtomString urlValue = consumeUrlAsStringView(args).toAtomString(); > if (urlValue.isNull()) > return nullptr; > >@@ -1661,7 +1661,7 @@ RefPtr<CSSShadowValue> consumeSingleShadow(CSSParserTokenRange& range, CSSParser > > RefPtr<CSSValue> consumeImage(CSSParserTokenRange& range, CSSParserContext context, ConsumeGeneratedImage generatedImage) > { >- AtomicString uri = consumeUrlAsStringView(range).toAtomicString(); >+ AtomString uri = consumeUrlAsStringView(range).toAtomString(); > if (!uri.isNull()) > return CSSImageValue::create(completeURL(context, uri), context.isContentOpaque ? LoadedFromOpaqueSource::Yes : LoadedFromOpaqueSource::No); > >diff --git a/Source/WebCore/css/parser/CSSSelectorParser.cpp b/Source/WebCore/css/parser/CSSSelectorParser.cpp >index 98d75c5c9b91f3f94dee2add8f70caa2d2e462bf..ecd003670c4c4e405da6d833d003310d2aeaf25b 100644 >--- a/Source/WebCore/css/parser/CSSSelectorParser.cpp >+++ b/Source/WebCore/css/parser/CSSSelectorParser.cpp >@@ -95,7 +95,7 @@ CSSSelectorList CSSSelectorParser::consumeCompoundSelectorList(CSSParserTokenRan > return CSSSelectorList { WTFMove(selectorList) }; > } > >-static bool consumeLangArgumentList(std::unique_ptr<Vector<AtomicString>>& argumentList, CSSParserTokenRange& range) >+static bool consumeLangArgumentList(std::unique_ptr<Vector<AtomString>>& argumentList, CSSParserTokenRange& range) > { > const CSSParserToken& ident = range.consumeIncludingWhitespace(); > if (ident.type() != IdentToken && ident.type() != StringToken) >@@ -103,7 +103,7 @@ static bool consumeLangArgumentList(std::unique_ptr<Vector<AtomicString>>& argum > StringView string = ident.value(); > if (string.startsWith("--")) > return false; >- argumentList->append(string.toAtomicString()); >+ argumentList->append(string.toAtomString()); > while (!range.atEnd() && range.peek().type() == CommaToken) { > range.consumeIncludingWhitespace(); > const CSSParserToken& ident = range.consumeIncludingWhitespace(); >@@ -112,7 +112,7 @@ static bool consumeLangArgumentList(std::unique_ptr<Vector<AtomicString>>& argum > StringView string = ident.value(); > if (string.startsWith("--")) > return false; >- argumentList->append(string.toAtomicString()); >+ argumentList->append(string.toAtomString()); > } > return range.atEnd(); > } >@@ -260,8 +260,8 @@ std::unique_ptr<CSSParserSelector> CSSSelectorParser::consumeCompoundSelector(CS > { > std::unique_ptr<CSSParserSelector> compoundSelector; > >- AtomicString namespacePrefix; >- AtomicString elementName; >+ AtomString namespacePrefix; >+ AtomString elementName; > CSSSelector::PseudoElementType compoundPseudoElement = CSSSelector::PseudoElementUnknown; > if (!consumeName(range, elementName, namespacePrefix)) { > compoundSelector = consumeSimpleSelector(range); >@@ -289,7 +289,7 @@ std::unique_ptr<CSSParserSelector> CSSSelectorParser::consumeCompoundSelector(CS > } > > if (!compoundSelector) { >- AtomicString namespaceURI = determineNamespace(namespacePrefix); >+ AtomString namespaceURI = determineNamespace(namespacePrefix); > if (namespaceURI.isNull()) { > m_failedParsing = true; > return nullptr; >@@ -324,14 +324,14 @@ std::unique_ptr<CSSParserSelector> CSSSelectorParser::consumeSimpleSelector(CSSP > return selector; > } > >-bool CSSSelectorParser::consumeName(CSSParserTokenRange& range, AtomicString& name, AtomicString& namespacePrefix) >+bool CSSSelectorParser::consumeName(CSSParserTokenRange& range, AtomString& name, AtomString& namespacePrefix) > { > name = nullAtom(); > namespacePrefix = nullAtom(); > > const CSSParserToken& firstToken = range.peek(); > if (firstToken.type() == IdentToken) { >- name = firstToken.value().toAtomicString(); >+ name = firstToken.value().toAtomString(); > range.consume(); > } else if (firstToken.type() == DelimiterToken && firstToken.delimiter() == '*') { > name = starAtom(); >@@ -349,7 +349,7 @@ bool CSSSelectorParser::consumeName(CSSParserTokenRange& range, AtomicString& na > namespacePrefix = name; > const CSSParserToken& nameToken = range.consume(); > if (nameToken.type() == IdentToken) { >- name = nameToken.value().toAtomicString(); >+ name = nameToken.value().toAtomString(); > } else if (nameToken.type() == DelimiterToken && nameToken.delimiter() == '*') > name = starAtom(); > else { >@@ -372,7 +372,7 @@ std::unique_ptr<CSSParserSelector> CSSSelectorParser::consumeId(CSSParserTokenRa > // FIXME-NEWPARSER: Avoid having to do this, but the old parser does and we need > // to be compatible for now. > CSSParserToken token = range.consume(); >- selector->setValue(token.value().toAtomicString(), m_context.mode == HTMLQuirksMode); >+ selector->setValue(token.value().toAtomString(), m_context.mode == HTMLQuirksMode); > return selector; > } > >@@ -389,7 +389,7 @@ std::unique_ptr<CSSParserSelector> CSSSelectorParser::consumeClass(CSSParserToke > // FIXME-NEWPARSER: Avoid having to do this, but the old parser does and we need > // to be compatible for now. > CSSParserToken token = range.consume(); >- selector->setValue(token.value().toAtomicString(), m_context.mode == HTMLQuirksMode); >+ selector->setValue(token.value().toAtomString(), m_context.mode == HTMLQuirksMode); > > return selector; > } >@@ -400,13 +400,13 @@ std::unique_ptr<CSSParserSelector> CSSSelectorParser::consumeAttribute(CSSParser > CSSParserTokenRange block = range.consumeBlock(); > block.consumeWhitespace(); > >- AtomicString namespacePrefix; >- AtomicString attributeName; >+ AtomString namespacePrefix; >+ AtomString attributeName; > if (!consumeName(block, attributeName, namespacePrefix)) > return nullptr; > block.consumeWhitespace(); > >- AtomicString namespaceURI = determineNamespace(namespacePrefix); >+ AtomString namespaceURI = determineNamespace(namespacePrefix); > if (namespaceURI.isNull()) > return nullptr; > >@@ -427,7 +427,7 @@ std::unique_ptr<CSSParserSelector> CSSSelectorParser::consumeAttribute(CSSParser > const CSSParserToken& attributeValue = block.consumeIncludingWhitespace(); > if (attributeValue.type() != IdentToken && attributeValue.type() != StringToken) > return nullptr; >- selector->setValue(attributeValue.value().toAtomicString()); >+ selector->setValue(attributeValue.value().toAtomString()); > > selector->setAttribute(qualifiedName, m_context.isHTMLDocument, consumeAttributeFlags(block)); > >@@ -567,7 +567,7 @@ std::unique_ptr<CSSParserSelector> CSSSelectorParser::consumePseudo(CSSParserTok > } > case CSSSelector::PseudoClassLang: { > // FIXME: CSS Selectors Level 4 allows :lang(*-foo) >- auto argumentList = std::make_unique<Vector<AtomicString>>(); >+ auto argumentList = std::make_unique<Vector<AtomString>>(); > if (!consumeLangArgumentList(argumentList, block)) > return nullptr; > selector->setLangArgumentList(WTFMove(argumentList)); >@@ -596,7 +596,7 @@ std::unique_ptr<CSSParserSelector> CSSSelectorParser::consumePseudo(CSSParserTok > const CSSParserToken& ident = block.consumeIncludingWhitespace(); > if (ident.type() != IdentToken || !block.atEnd()) > return nullptr; >- selector->setArgument(ident.value().toAtomicString()); >+ selector->setArgument(ident.value().toAtomString()); > return selector; > } > #endif >@@ -775,14 +775,14 @@ bool CSSSelectorParser::consumeANPlusB(CSSParserTokenRange& range, std::pair<int > return true; > } > >-const AtomicString& CSSSelectorParser::defaultNamespace() const >+const AtomString& CSSSelectorParser::defaultNamespace() const > { > if (!m_styleSheet) > return starAtom(); > return m_styleSheet->defaultNamespace(); > } > >-const AtomicString& CSSSelectorParser::determineNamespace(const AtomicString& prefix) >+const AtomString& CSSSelectorParser::determineNamespace(const AtomString& prefix) > { > if (prefix.isNull()) > return defaultNamespace(); >@@ -795,20 +795,20 @@ const AtomicString& CSSSelectorParser::determineNamespace(const AtomicString& pr > return m_styleSheet->namespaceURIFromPrefix(prefix); > } > >-void CSSSelectorParser::prependTypeSelectorIfNeeded(const AtomicString& namespacePrefix, const AtomicString& elementName, CSSParserSelector* compoundSelector) >+void CSSSelectorParser::prependTypeSelectorIfNeeded(const AtomString& namespacePrefix, const AtomString& elementName, CSSParserSelector* compoundSelector) > { > bool isShadowDOM = compoundSelector->needsImplicitShadowCombinatorForMatching(); > > if (elementName.isNull() && defaultNamespace() == starAtom() && !isShadowDOM) > return; > >- AtomicString determinedElementName = elementName.isNull() ? starAtom() : elementName; >- AtomicString namespaceURI = determineNamespace(namespacePrefix); >+ AtomString determinedElementName = elementName.isNull() ? starAtom() : elementName; >+ AtomString namespaceURI = determineNamespace(namespacePrefix); > if (namespaceURI.isNull()) { > m_failedParsing = true; > return; > } >- AtomicString determinedPrefix = namespacePrefix; >+ AtomString determinedPrefix = namespacePrefix; > if (namespaceURI == defaultNamespace()) > determinedPrefix = nullAtom(); > QualifiedName tag = QualifiedName(determinedPrefix, determinedElementName, namespaceURI); >diff --git a/Source/WebCore/css/parser/CSSSelectorParser.h b/Source/WebCore/css/parser/CSSSelectorParser.h >index 283028737c7c20b469a21ae7252f361c24563345..521e1da8e2a890e83afbd0c6d2cdde2c60f1fd47 100644 >--- a/Source/WebCore/css/parser/CSSSelectorParser.h >+++ b/Source/WebCore/css/parser/CSSSelectorParser.h >@@ -60,7 +60,7 @@ private: > // This doesn't include element names, since they're handled specially > std::unique_ptr<CSSParserSelector> consumeSimpleSelector(CSSParserTokenRange&); > >- bool consumeName(CSSParserTokenRange&, AtomicString& name, AtomicString& namespacePrefix); >+ bool consumeName(CSSParserTokenRange&, AtomString& name, AtomString& namespacePrefix); > > // These will return nullptr when the selector is invalid > std::unique_ptr<CSSParserSelector> consumeId(CSSParserTokenRange&); >@@ -72,9 +72,9 @@ private: > CSSSelector::Match consumeAttributeMatch(CSSParserTokenRange&); > CSSSelector::AttributeMatchType consumeAttributeFlags(CSSParserTokenRange&); > >- const AtomicString& defaultNamespace() const; >- const AtomicString& determineNamespace(const AtomicString& prefix); >- void prependTypeSelectorIfNeeded(const AtomicString& namespacePrefix, const AtomicString& elementName, CSSParserSelector*); >+ const AtomString& defaultNamespace() const; >+ const AtomString& determineNamespace(const AtomString& prefix); >+ void prependTypeSelectorIfNeeded(const AtomString& namespacePrefix, const AtomString& elementName, CSSParserSelector*); > static std::unique_ptr<CSSParserSelector> addSimpleSelectorToCompound(std::unique_ptr<CSSParserSelector> compoundSelector, std::unique_ptr<CSSParserSelector> simpleSelector); > static std::unique_ptr<CSSParserSelector> splitCompoundAtImplicitShadowCrossingCombinator(std::unique_ptr<CSSParserSelector> compoundSelector, const CSSParserContext&); > >diff --git a/Source/WebCore/css/parser/CSSVariableParser.cpp b/Source/WebCore/css/parser/CSSVariableParser.cpp >index 1be23b9fec8f5ecdad4eb844853f9e02ca5a920d..1f3b33affe768e419955f029f58f64823f92f079 100644 >--- a/Source/WebCore/css/parser/CSSVariableParser.cpp >+++ b/Source/WebCore/css/parser/CSSVariableParser.cpp >@@ -177,7 +177,7 @@ bool CSSVariableParser::containsValidVariableReferences(CSSParserTokenRange rang > return type == CSSValueInternalVariableValue && hasReferences && !hasAtApplyRule; > } > >-RefPtr<CSSCustomPropertyValue> CSSVariableParser::parseDeclarationValue(const AtomicString& variableName, CSSParserTokenRange range, const CSSParserContext& parserContext) >+RefPtr<CSSCustomPropertyValue> CSSVariableParser::parseDeclarationValue(const AtomString& variableName, CSSParserTokenRange range, const CSSParserContext& parserContext) > { > if (range.atEnd()) > return nullptr; >diff --git a/Source/WebCore/css/parser/CSSVariableParser.h b/Source/WebCore/css/parser/CSSVariableParser.h >index c10c44c27d94ca796c9d35f0eb32a2606bffdfa6..3de1c1663fced6a4a467887619bc3b7f7ca0b337 100644 >--- a/Source/WebCore/css/parser/CSSVariableParser.h >+++ b/Source/WebCore/css/parser/CSSVariableParser.h >@@ -31,7 +31,7 @@ > > #include "CSSParserTokenRange.h" > #include <wtf/RefPtr.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -42,7 +42,7 @@ class CSSVariableParser { > public: > static bool containsValidVariableReferences(CSSParserTokenRange, const CSSParserContext&); > >- static RefPtr<CSSCustomPropertyValue> parseDeclarationValue(const AtomicString&, CSSParserTokenRange, const CSSParserContext&); >+ static RefPtr<CSSCustomPropertyValue> parseDeclarationValue(const AtomString&, CSSParserTokenRange, const CSSParserContext&); > > static bool isValidVariableName(const CSSParserToken&); > static bool isValidVariableName(const String&); >diff --git a/Source/WebCore/cssjit/SelectorCompiler.cpp b/Source/WebCore/cssjit/SelectorCompiler.cpp >index 2a43fd8200baf38a127545bdae1b1a32294c626a..114879094fa06e4561b82ec14050bbcc7f38c7cc 100644 >--- a/Source/WebCore/cssjit/SelectorCompiler.cpp >+++ b/Source/WebCore/cssjit/SelectorCompiler.cpp >@@ -197,9 +197,9 @@ struct SelectorFragment { > // FIXME: the large stack allocation caused by the inline capacity causes memory inefficiency. We should dump > // the min/max/average of the vectors and pick better inline capacity. > const CSSSelector* tagNameSelector = nullptr; >- const AtomicString* id = nullptr; >- Vector<const Vector<AtomicString>*> languageArgumentsList; >- Vector<const AtomicStringImpl*, 8> classNames; >+ const AtomString* id = nullptr; >+ Vector<const Vector<AtomString>*> languageArgumentsList; >+ Vector<const AtomStringImpl*, 8> classNames; > HashSet<unsigned> pseudoClasses; > Vector<JSC::FunctionPtr<CSSOperationPtrTag>, 4> unoptimizedPseudoClasses; > Vector<JSC::FunctionPtr<CSSOperationPtrTag>, 4> unoptimizedPseudoClassesWithContext; >@@ -300,7 +300,7 @@ private: > void generateElementIsFirstChild(Assembler::JumpList& failureCases); > void generateElementIsHovered(Assembler::JumpList& failureCases, const SelectorFragment&); > void generateElementIsInLanguage(Assembler::JumpList& failureCases, const SelectorFragment&); >- void generateElementIsInLanguage(Assembler::JumpList& failureCases, const Vector<AtomicString>*); >+ void generateElementIsInLanguage(Assembler::JumpList& failureCases, const Vector<AtomString>*); > void generateElementIsLastChild(Assembler::JumpList& failureCases); > void generateElementIsOnlyChild(Assembler::JumpList& failureCases); > void generateElementHasPlaceholderShown(Assembler::JumpList& failureCases); >@@ -309,11 +309,11 @@ private: > void generateElementAttributesMatching(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const SelectorFragment&); > void generateElementAttributeMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, Assembler::RegisterID decIndexRegister, const AttributeMatchingInfo& attributeInfo); > void generateElementAttributeValueMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AttributeMatchingInfo& attributeInfo); >- void generateElementAttributeValueExactMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomicString& expectedValue, AttributeCaseSensitivity valueCaseSensitivity); >- void generateElementAttributeFunctionCallValueMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomicString& expectedValue, AttributeCaseSensitivity valueCaseSensitivity, JSC::FunctionPtr<CSSOperationPtrTag> caseSensitiveTest, JSC::FunctionPtr<CSSOperationPtrTag> caseInsensitiveTest); >+ void generateElementAttributeValueExactMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomString& expectedValue, AttributeCaseSensitivity valueCaseSensitivity); >+ void generateElementAttributeFunctionCallValueMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomString& expectedValue, AttributeCaseSensitivity valueCaseSensitivity, JSC::FunctionPtr<CSSOperationPtrTag> caseSensitiveTest, JSC::FunctionPtr<CSSOperationPtrTag> caseInsensitiveTest); > void generateElementHasTagName(Assembler::JumpList& failureCases, const CSSSelector& tagMatchingSelector); >- void generateElementHasId(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const AtomicString& idToMatch); >- void generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomicStringImpl*, 8>& classNames); >+ void generateElementHasId(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const AtomString& idToMatch); >+ void generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomStringImpl*, 8>& classNames); > void generateElementIsLink(Assembler::JumpList& failureCases); > void generateElementIsNthChild(Assembler::JumpList& failureCases, const SelectorFragment&); > void generateElementIsNthChildOf(Assembler::JumpList& failureCases, const SelectorFragment&); >@@ -781,7 +781,7 @@ static inline FunctionType addPseudoClassType(const CSSSelector& selector, Selec > > case CSSSelector::PseudoClassLang: > { >- const Vector<AtomicString>* selectorLangArgumentList = selector.langArgumentList(); >+ const Vector<AtomString>* selectorLangArgumentList = selector.langArgumentList(); > ASSERT(selectorLangArgumentList && !selectorLangArgumentList->isEmpty()); > fragment.languageArgumentsList.append(selectorLangArgumentList); > return FunctionType::SimpleSelectorChecker; >@@ -917,7 +917,7 @@ static FunctionType constructFragmentsInternal(const CSSSelector* rootSelector, > fragment->onlyMatchesLinksInQuirksMode = false; > break; > case CSSSelector::Id: { >- const AtomicString& id = selector->value(); >+ const AtomString& id = selector->value(); > if (fragment->id) { > if (id != *fragment->id) > return FunctionType::CannotMatchAnything; >@@ -1404,11 +1404,11 @@ static inline TagNameEquality equalTagNames(const CSSSelector* lhs, const CSSSel > if (rhsQualifiedName == anyQName()) > return TagNameEquality::MaybeEqual; > >- const AtomicString& lhsLocalName = lhsQualifiedName.localName(); >- const AtomicString& rhsLocalName = rhsQualifiedName.localName(); >+ const AtomString& lhsLocalName = lhsQualifiedName.localName(); >+ const AtomString& rhsLocalName = rhsQualifiedName.localName(); > if (lhsLocalName != starAtom() && rhsLocalName != starAtom()) { >- const AtomicString& lhsLowercaseLocalName = lhs->tagLowercaseLocalName(); >- const AtomicString& rhsLowercaseLocalName = rhs->tagLowercaseLocalName(); >+ const AtomString& lhsLowercaseLocalName = lhs->tagLowercaseLocalName(); >+ const AtomString& rhsLowercaseLocalName = rhs->tagLowercaseLocalName(); > > if (lhsLowercaseLocalName != rhsLowercaseLocalName) > return TagNameEquality::StrictlyNotEqual; >@@ -1418,8 +1418,8 @@ static inline TagNameEquality equalTagNames(const CSSSelector* lhs, const CSSSel > return TagNameEquality::MaybeEqual; > } > >- const AtomicString& lhsNamespaceURI = lhsQualifiedName.namespaceURI(); >- const AtomicString& rhsNamespaceURI = rhsQualifiedName.namespaceURI(); >+ const AtomString& lhsNamespaceURI = lhsQualifiedName.namespaceURI(); >+ const AtomString& rhsNamespaceURI = rhsQualifiedName.namespaceURI(); > if (lhsNamespaceURI != starAtom() && rhsNamespaceURI != starAtom()) { > if (lhsNamespaceURI != rhsNamespaceURI) > return TagNameEquality::StrictlyNotEqual; >@@ -2697,7 +2697,7 @@ static inline bool canMatchStyleAttribute(const SelectorFragment& fragment) > if (Attribute::nameMatchesFilter(HTMLNames::styleAttr, attributeName.prefix(), attributeName.localName(), attributeName.namespaceURI())) > return true; > >- const AtomicString& canonicalLocalName = attributeSelector.attributeCanonicalLocalName(); >+ const AtomString& canonicalLocalName = attributeSelector.attributeCanonicalLocalName(); > if (attributeName.localName() != canonicalLocalName > && Attribute::nameMatchesFilter(HTMLNames::styleAttr, attributeName.prefix(), attributeSelector.attributeCanonicalLocalName(), attributeName.namespaceURI())) { > return true; >@@ -2730,7 +2730,7 @@ static inline bool canMatchAnimatableSVGAttribute(const SelectorFragment& fragme > if (Attribute::nameMatchesFilter(candidateForLocalName, selectorAttributeName.prefix(), selectorAttributeName.localName(), selectorAttributeName.namespaceURI())) > return true; > >- const AtomicString& canonicalLocalName = attributeSelector.attributeCanonicalLocalName(); >+ const AtomString& canonicalLocalName = attributeSelector.attributeCanonicalLocalName(); > if (selectorAttributeName.localName() != canonicalLocalName) { > const QualifiedName& candidateForCanonicalLocalName = SVGElement::animatableAttributeForName(selectorAttributeName.localName()); > if (Attribute::nameMatchesFilter(candidateForCanonicalLocalName, selectorAttributeName.prefix(), selectorAttributeName.localName(), selectorAttributeName.namespaceURI())) >@@ -2825,8 +2825,8 @@ void SelectorCodeGenerator::generateElementAttributeMatching(Assembler::JumpList > // In general, canonicalLocalName and localName are the same. When they differ, we have to check if the node is HTML to know > // which one to use. > const CSSSelector& attributeSelector = attributeInfo.selector(); >- const AtomicStringImpl* canonicalLocalName = attributeSelector.attributeCanonicalLocalName().impl(); >- const AtomicStringImpl* localName = attributeSelector.attribute().localName().impl(); >+ const AtomStringImpl* canonicalLocalName = attributeSelector.attributeCanonicalLocalName().impl(); >+ const AtomStringImpl* localName = attributeSelector.attribute().localName().impl(); > if (canonicalLocalName == localName) > m_assembler.move(Assembler::TrustedImmPtr(canonicalLocalName), localNameToMatch); > else { >@@ -2847,7 +2847,7 @@ void SelectorCodeGenerator::generateElementAttributeMatching(Assembler::JumpList > if (shouldCheckNamespace) { > Assembler::Jump nameDoesNotMatch = m_assembler.branchPtr(Assembler::NotEqual, Assembler::Address(qualifiedNameImpl, QualifiedName::QualifiedNameImpl::localNameMemoryOffset()), localNameToMatch); > >- const AtomicStringImpl* namespaceURI = attributeSelector.attribute().namespaceURI().impl(); >+ const AtomStringImpl* namespaceURI = attributeSelector.attribute().namespaceURI().impl(); > if (namespaceURI) { > LocalRegister namespaceToMatch(m_registerAllocator); > m_assembler.move(Assembler::TrustedImmPtr(namespaceURI), namespaceToMatch); >@@ -2886,42 +2886,42 @@ enum CaseSensitivity { > }; > > template<CaseSensitivity caseSensitivity> >-static bool attributeValueBeginsWith(const Attribute* attribute, AtomicStringImpl* expectedString) >+static bool attributeValueBeginsWith(const Attribute* attribute, AtomStringImpl* expectedString) > { > ASSERT(expectedString); > >- AtomicStringImpl& valueImpl = *attribute->value().impl(); >+ AtomStringImpl& valueImpl = *attribute->value().impl(); > if (caseSensitivity == CaseSensitive) > return valueImpl.startsWith(*expectedString); > return valueImpl.startsWithIgnoringASCIICase(*expectedString); > } > > template<CaseSensitivity caseSensitivity> >-static bool attributeValueContains(const Attribute* attribute, AtomicStringImpl* expectedString) >+static bool attributeValueContains(const Attribute* attribute, AtomStringImpl* expectedString) > { >- AtomicStringImpl& valueImpl = *attribute->value().impl(); >+ AtomStringImpl& valueImpl = *attribute->value().impl(); > if (caseSensitivity == CaseSensitive) > return valueImpl.find(expectedString) != notFound; > return valueImpl.findIgnoringASCIICase(expectedString) != notFound; > } > > template<CaseSensitivity caseSensitivity> >-static bool attributeValueEndsWith(const Attribute* attribute, AtomicStringImpl* expectedString) >+static bool attributeValueEndsWith(const Attribute* attribute, AtomStringImpl* expectedString) > { > ASSERT(expectedString); > >- AtomicStringImpl& valueImpl = *attribute->value().impl(); >+ AtomStringImpl& valueImpl = *attribute->value().impl(); > if (caseSensitivity == CaseSensitive) > return valueImpl.endsWith(*expectedString); > return valueImpl.endsWithIgnoringASCIICase(*expectedString); > } > > template<CaseSensitivity caseSensitivity> >-static bool attributeValueMatchHyphenRule(const Attribute* attribute, AtomicStringImpl* expectedString) >+static bool attributeValueMatchHyphenRule(const Attribute* attribute, AtomStringImpl* expectedString) > { > ASSERT(expectedString); > >- AtomicStringImpl& valueImpl = *attribute->value().impl(); >+ AtomStringImpl& valueImpl = *attribute->value().impl(); > if (valueImpl.length() < expectedString->length()) > return false; > >@@ -2938,9 +2938,9 @@ static bool attributeValueMatchHyphenRule(const Attribute* attribute, AtomicStri > } > > template<CaseSensitivity caseSensitivity> >-static bool attributeValueSpaceSeparetedListContains(const Attribute* attribute, AtomicStringImpl* expectedString) >+static bool attributeValueSpaceSeparetedListContains(const Attribute* attribute, AtomStringImpl* expectedString) > { >- AtomicStringImpl& value = *attribute->value().impl(); >+ AtomStringImpl& value = *attribute->value().impl(); > > unsigned startSearchAt = 0; > while (true) { >@@ -2964,7 +2964,7 @@ static bool attributeValueSpaceSeparetedListContains(const Attribute* attribute, > void SelectorCodeGenerator::generateElementAttributeValueMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AttributeMatchingInfo& attributeInfo) > { > const CSSSelector& attributeSelector = attributeInfo.selector(); >- const AtomicString& expectedValue = attributeSelector.value(); >+ const AtomString& expectedValue = attributeSelector.value(); > ASSERT(!expectedValue.isNull()); > AttributeCaseSensitivity valueCaseSensitivity = attributeInfo.attributeCaseSensitivity(); > >@@ -2997,7 +2997,7 @@ static inline Assembler::Jump testIsHTMLClassOnDocument(Assembler::ResultConditi > return assembler.branchTest32(condition, Assembler::Address(documentAddress, Document::documentClassesMemoryOffset()), Assembler::TrustedImm32(Document::isHTMLDocumentClassFlag())); > } > >-void SelectorCodeGenerator::generateElementAttributeValueExactMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomicString& expectedValue, AttributeCaseSensitivity valueCaseSensitivity) >+void SelectorCodeGenerator::generateElementAttributeValueExactMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomString& expectedValue, AttributeCaseSensitivity valueCaseSensitivity) > { > LocalRegisterWithPreference expectedValueRegister(m_registerAllocator, JSC::GPRInfo::argumentGPR1); > m_assembler.move(Assembler::TrustedImmPtr(expectedValue.impl()), expectedValueRegister); >@@ -3047,7 +3047,7 @@ void SelectorCodeGenerator::generateElementAttributeValueExactMatching(Assembler > } > } > >-void SelectorCodeGenerator::generateElementAttributeFunctionCallValueMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomicString& expectedValue, AttributeCaseSensitivity valueCaseSensitivity, JSC::FunctionPtr<CSSOperationPtrTag> caseSensitiveTest, JSC::FunctionPtr<CSSOperationPtrTag> caseInsensitiveTest) >+void SelectorCodeGenerator::generateElementAttributeFunctionCallValueMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomString& expectedValue, AttributeCaseSensitivity valueCaseSensitivity, JSC::FunctionPtr<CSSOperationPtrTag> caseSensitiveTest, JSC::FunctionPtr<CSSOperationPtrTag> caseInsensitiveTest) > { > LocalRegisterWithPreference expectedValueRegister(m_registerAllocator, JSC::GPRInfo::argumentGPR1); > m_assembler.move(Assembler::TrustedImmPtr(expectedValue.impl()), expectedValueRegister); >@@ -3268,11 +3268,11 @@ void SelectorCodeGenerator::generateElementIsHovered(Assembler::JumpList& failur > > void SelectorCodeGenerator::generateElementIsInLanguage(Assembler::JumpList& failureCases, const SelectorFragment& fragment) > { >- for (const Vector<AtomicString>* languageArguments : fragment.languageArgumentsList) >+ for (const Vector<AtomString>* languageArguments : fragment.languageArgumentsList) > generateElementIsInLanguage(failureCases, languageArguments); > } > >-void SelectorCodeGenerator::generateElementIsInLanguage(Assembler::JumpList& failureCases, const Vector<AtomicString>* languageArguments) >+void SelectorCodeGenerator::generateElementIsInLanguage(Assembler::JumpList& failureCases, const Vector<AtomString>* languageArguments) > { > LocalRegisterWithPreference langRangeRegister(m_registerAllocator, JSC::GPRInfo::argumentGPR1); > m_assembler.move(Assembler::TrustedImmPtr(languageArguments), langRangeRegister); >@@ -3455,9 +3455,9 @@ inline void SelectorCodeGenerator::generateElementHasTagName(Assembler::JumpList > LocalRegister qualifiedNameImpl(m_registerAllocator); > m_assembler.loadPtr(Assembler::Address(elementAddressRegister, Element::tagQNameMemoryOffset() + QualifiedName::implMemoryOffset()), qualifiedNameImpl); > >- const AtomicString& selectorLocalName = nameToMatch.localName(); >+ const AtomString& selectorLocalName = nameToMatch.localName(); > if (selectorLocalName != starAtom()) { >- const AtomicString& lowercaseLocalName = tagMatchingSelector.tagLowercaseLocalName(); >+ const AtomString& lowercaseLocalName = tagMatchingSelector.tagLowercaseLocalName(); > > if (selectorLocalName == lowercaseLocalName) { > // Generate localName == element->localName(). >@@ -3485,7 +3485,7 @@ inline void SelectorCodeGenerator::generateElementHasTagName(Assembler::JumpList > } > } > >- const AtomicString& selectorNamespaceURI = nameToMatch.namespaceURI(); >+ const AtomString& selectorNamespaceURI = nameToMatch.namespaceURI(); > if (selectorNamespaceURI != starAtom()) { > // Generate namespaceURI == element->namespaceURI(). > LocalRegister constantRegister(m_registerAllocator); >@@ -3494,15 +3494,15 @@ inline void SelectorCodeGenerator::generateElementHasTagName(Assembler::JumpList > } > } > >-void SelectorCodeGenerator::generateElementHasId(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const AtomicString& idToMatch) >+void SelectorCodeGenerator::generateElementHasId(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const AtomString& idToMatch) > { >- // Compare the pointers of the AtomicStringImpl from idForStyleResolution with the reference idToMatch. >+ // Compare the pointers of the AtomStringImpl from idForStyleResolution with the reference idToMatch. > LocalRegister idToMatchRegister(m_registerAllocator); > m_assembler.move(Assembler::TrustedImmPtr(idToMatch.impl()), idToMatchRegister); > failureCases.append(m_assembler.branchPtr(Assembler::NotEqual, Assembler::Address(elementDataAddress, ElementData::idForStyleResolutionMemoryOffset()), idToMatchRegister)); > } > >-void SelectorCodeGenerator::generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomicStringImpl*, 8>& classNames) >+void SelectorCodeGenerator::generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomStringImpl*, 8>& classNames) > { > // Load m_classNames. > LocalRegister spaceSplitStringData(m_registerAllocator); >diff --git a/Source/WebCore/dom/AnimationEvent.cpp b/Source/WebCore/dom/AnimationEvent.cpp >index c5256671c7808ffc2f23654a94e6cf11a231ccd8..ab332cac59930d625b744cb13b565cbbd495d87a 100644 >--- a/Source/WebCore/dom/AnimationEvent.cpp >+++ b/Source/WebCore/dom/AnimationEvent.cpp >@@ -28,14 +28,14 @@ > > namespace WebCore { > >-AnimationEvent::AnimationEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+AnimationEvent::AnimationEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_animationName(initializer.animationName) > , m_elapsedTime(initializer.elapsedTime) > { > } > >-AnimationEvent::AnimationEvent(const AtomicString& type, const String& animationName, double elapsedTime) >+AnimationEvent::AnimationEvent(const AtomString& type, const String& animationName, double elapsedTime) > : Event(type, CanBubble::Yes, IsCancelable::No) > , m_animationName(animationName) > , m_elapsedTime(elapsedTime) >diff --git a/Source/WebCore/dom/AnimationEvent.h b/Source/WebCore/dom/AnimationEvent.h >index 52bebf428d67af796e34cc30edca6c4fcf71e590..51e2f69593c8c9a7c7851fa77115ca8053eae435 100644 >--- a/Source/WebCore/dom/AnimationEvent.h >+++ b/Source/WebCore/dom/AnimationEvent.h >@@ -31,7 +31,7 @@ namespace WebCore { > > class AnimationEvent final : public Event { > public: >- static Ref<AnimationEvent> create(const AtomicString& type, const String& animationName, double elapsedTime) >+ static Ref<AnimationEvent> create(const AtomString& type, const String& animationName, double elapsedTime) > { > return adoptRef(*new AnimationEvent(type, animationName, elapsedTime)); > } >@@ -41,7 +41,7 @@ public: > double elapsedTime { 0 }; > }; > >- static Ref<AnimationEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<AnimationEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new AnimationEvent(type, initializer, isTrusted)); > } >@@ -54,8 +54,8 @@ public: > EventInterface eventInterface() const override; > > private: >- AnimationEvent(const AtomicString& type, const String& animationName, double elapsedTime); >- AnimationEvent(const AtomicString&, const Init&, IsTrusted); >+ AnimationEvent(const AtomString& type, const String& animationName, double elapsedTime); >+ AnimationEvent(const AtomString&, const Init&, IsTrusted); > > String m_animationName; > double m_elapsedTime; >diff --git a/Source/WebCore/dom/Attr.cpp b/Source/WebCore/dom/Attr.cpp >index 49fa57dfa5eb906441c38e3974b3264d261a334c..2e9940a38bfeccaab967b179c28b3149d6d465f7 100644 >--- a/Source/WebCore/dom/Attr.cpp >+++ b/Source/WebCore/dom/Attr.cpp >@@ -31,7 +31,7 @@ > #include "TextNodeTraversal.h" > #include "XMLNSNames.h" > #include <wtf/IsoMallocInlines.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -46,7 +46,7 @@ Attr::Attr(Element& element, const QualifiedName& name) > { > } > >-Attr::Attr(Document& document, const QualifiedName& name, const AtomicString& standaloneValue) >+Attr::Attr(Document& document, const QualifiedName& name, const AtomString& standaloneValue) > : Node(document, CreateOther) > , m_name(name) > , m_standaloneValue(standaloneValue) >@@ -58,7 +58,7 @@ Ref<Attr> Attr::create(Element& element, const QualifiedName& name) > return adoptRef(*new Attr(element, name)); > } > >-Ref<Attr> Attr::create(Document& document, const QualifiedName& name, const AtomicString& value) >+Ref<Attr> Attr::create(Document& document, const QualifiedName& name, const AtomString& value) > { > return adoptRef(*new Attr(document, name, value)); > } >@@ -69,7 +69,7 @@ Attr::~Attr() > ASSERT_WITH_SECURITY_IMPLICATION(treeScope().rootNode().isDocumentNode()); > } > >-ExceptionOr<void> Attr::setPrefix(const AtomicString& prefix) >+ExceptionOr<void> Attr::setPrefix(const AtomString& prefix) > { > auto result = checkSetPrefix(prefix); > if (result.hasException()) >@@ -78,7 +78,7 @@ ExceptionOr<void> Attr::setPrefix(const AtomicString& prefix) > if ((prefix == xmlnsAtom() && namespaceURI() != XMLNSNames::xmlnsNamespaceURI) || qualifiedName() == xmlnsAtom()) > return Exception { NamespaceError }; > >- const AtomicString& newPrefix = prefix.isEmpty() ? nullAtom() : prefix; >+ const AtomString& newPrefix = prefix.isEmpty() ? nullAtom() : prefix; > if (m_element) > elementAttribute().setPrefix(newPrefix); > m_name.setPrefix(newPrefix); >@@ -86,7 +86,7 @@ ExceptionOr<void> Attr::setPrefix(const AtomicString& prefix) > return { }; > } > >-void Attr::setValue(const AtomicString& value) >+void Attr::setValue(const AtomString& value) > { > if (m_element) > m_element->setAttribute(qualifiedName(), value); >@@ -116,7 +116,7 @@ CSSStyleDeclaration* Attr::style() > return &m_style->ensureCSSStyleDeclaration(); > } > >-const AtomicString& Attr::value() const >+const AtomString& Attr::value() const > { > if (m_element) > return m_element->getAttribute(qualifiedName()); >@@ -130,7 +130,7 @@ Attribute& Attr::elementAttribute() > return *m_element->ensureUniqueElementData().findAttributeByName(qualifiedName()); > } > >-void Attr::detachFromElementWithValue(const AtomicString& value) >+void Attr::detachFromElementWithValue(const AtomString& value) > { > ASSERT(m_element); > ASSERT(m_standaloneValue.isNull()); >diff --git a/Source/WebCore/dom/Attr.h b/Source/WebCore/dom/Attr.h >index 7ee0a0bd08d758971f3c02a50bf41d96b105715b..ac94c809e9363cb4c6776e354606210abc4527ac 100644 >--- a/Source/WebCore/dom/Attr.h >+++ b/Source/WebCore/dom/Attr.h >@@ -37,30 +37,30 @@ class Attr final : public Node { > WTF_MAKE_ISO_ALLOCATED(Attr); > public: > static Ref<Attr> create(Element&, const QualifiedName&); >- static Ref<Attr> create(Document&, const QualifiedName&, const AtomicString& value); >+ static Ref<Attr> create(Document&, const QualifiedName&, const AtomString& value); > virtual ~Attr(); > > String name() const { return qualifiedName().toString(); } > bool specified() const { return true; } > Element* ownerElement() const { return m_element; } > >- WEBCORE_EXPORT const AtomicString& value() const; >- WEBCORE_EXPORT void setValue(const AtomicString&); >+ WEBCORE_EXPORT const AtomString& value() const; >+ WEBCORE_EXPORT void setValue(const AtomString&); > > const QualifiedName& qualifiedName() const { return m_name; } > > WEBCORE_EXPORT CSSStyleDeclaration* style(); > > void attachToElement(Element&); >- void detachFromElementWithValue(const AtomicString&); >+ void detachFromElementWithValue(const AtomString&); > >- const AtomicString& namespaceURI() const final { return m_name.namespaceURI(); } >- const AtomicString& localName() const final { return m_name.localName(); } >- const AtomicString& prefix() const final { return m_name.prefix(); } >+ const AtomString& namespaceURI() const final { return m_name.namespaceURI(); } >+ const AtomString& localName() const final { return m_name.localName(); } >+ const AtomString& prefix() const final { return m_name.prefix(); } > > private: > Attr(Element&, const QualifiedName&); >- Attr(Document&, const QualifiedName&, const AtomicString& value); >+ Attr(Document&, const QualifiedName&, const AtomString& value); > > String nodeName() const final { return name(); } > NodeType nodeType() const final { return ATTRIBUTE_NODE; } >@@ -68,7 +68,7 @@ private: > String nodeValue() const final { return value(); } > ExceptionOr<void> setNodeValue(const String&) final; > >- ExceptionOr<void> setPrefix(const AtomicString&) final; >+ ExceptionOr<void> setPrefix(const AtomString&) final; > > Ref<Node> cloneNodeInternal(Document&, CloningOperation) final; > >@@ -80,7 +80,7 @@ private: > // Note that m_name is always set, but m_element/m_standaloneValue may be null. > Element* m_element { nullptr }; > QualifiedName m_name; >- AtomicString m_standaloneValue; >+ AtomString m_standaloneValue; > > RefPtr<MutableStyleProperties> m_style; > }; >diff --git a/Source/WebCore/dom/Attribute.h b/Source/WebCore/dom/Attribute.h >index 456c286f2a1bcbb0ec2d878dcb198afe6cabdc80..0d625e94ec47bf2ca08f5d9cb5c7b042fd64525a 100644 >--- a/Source/WebCore/dom/Attribute.h >+++ b/Source/WebCore/dom/Attribute.h >@@ -33,7 +33,7 @@ namespace WebCore { > // The actual Attr with its value as a Text child is allocated only if needed. > class Attribute { > public: >- Attribute(const QualifiedName& name, const AtomicString& value) >+ Attribute(const QualifiedName& name, const AtomString& value) > : m_name(name) > , m_value(value) > { >@@ -42,21 +42,21 @@ public: > // NOTE: The references returned by these functions are only valid for as long > // as the Attribute stays in place. For example, calling a function that mutates > // an Element's internal attribute storage may invalidate them. >- const AtomicString& value() const { return m_value; } >+ const AtomString& value() const { return m_value; } > static ptrdiff_t valueMemoryOffset() { return OBJECT_OFFSETOF(Attribute, m_value); } >- const AtomicString& prefix() const { return m_name.prefix(); } >- const AtomicString& localName() const { return m_name.localName(); } >- const AtomicString& namespaceURI() const { return m_name.namespaceURI(); } >+ const AtomString& prefix() const { return m_name.prefix(); } >+ const AtomString& localName() const { return m_name.localName(); } >+ const AtomString& namespaceURI() const { return m_name.namespaceURI(); } > > const QualifiedName& name() const { return m_name; } > static ptrdiff_t nameMemoryOffset() { return OBJECT_OFFSETOF(Attribute, m_name); } > > bool isEmpty() const { return m_value.isEmpty(); } >- static bool nameMatchesFilter(const QualifiedName&, const AtomicString& filterPrefix, const AtomicString& filterLocalName, const AtomicString& filterNamespaceURI); >- bool matches(const AtomicString& prefix, const AtomicString& localName, const AtomicString& namespaceURI) const; >+ static bool nameMatchesFilter(const QualifiedName&, const AtomString& filterPrefix, const AtomString& filterLocalName, const AtomString& filterNamespaceURI); >+ bool matches(const AtomString& prefix, const AtomString& localName, const AtomString& namespaceURI) const; > >- void setValue(const AtomicString& value) { m_value = value; } >- void setPrefix(const AtomicString& prefix) { m_name.setPrefix(prefix); } >+ void setValue(const AtomString& value) { m_value = value; } >+ void setPrefix(const AtomString& prefix) { m_name.setPrefix(prefix); } > > // Note: This API is only for HTMLTreeBuilder. It is not safe to change the > // name of an attribute once parseAttribute has been called as DOM >@@ -71,17 +71,17 @@ public: > > private: > QualifiedName m_name; >- AtomicString m_value; >+ AtomString m_value; > }; > >-inline bool Attribute::nameMatchesFilter(const QualifiedName& name, const AtomicString& filterPrefix, const AtomicString& filterLocalName, const AtomicString& filterNamespaceURI) >+inline bool Attribute::nameMatchesFilter(const QualifiedName& name, const AtomString& filterPrefix, const AtomString& filterLocalName, const AtomString& filterNamespaceURI) > { > if (filterLocalName != name.localName()) > return false; > return filterPrefix == starAtom() || filterNamespaceURI == name.namespaceURI(); > } > >-inline bool Attribute::matches(const AtomicString& prefix, const AtomicString& localName, const AtomicString& namespaceURI) const >+inline bool Attribute::matches(const AtomString& prefix, const AtomString& localName, const AtomString& namespaceURI) const > { > return nameMatchesFilter(m_name, prefix, localName, namespaceURI); > } >diff --git a/Source/WebCore/dom/BeforeLoadEvent.h b/Source/WebCore/dom/BeforeLoadEvent.h >index f6356924959abe8b17eeb332c5d3388f86ea941d..107ad2249cf719d853ba4381df10b9f624682a36 100644 >--- a/Source/WebCore/dom/BeforeLoadEvent.h >+++ b/Source/WebCore/dom/BeforeLoadEvent.h >@@ -42,7 +42,7 @@ public: > String url; > }; > >- static Ref<BeforeLoadEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<BeforeLoadEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new BeforeLoadEvent(type, initializer, isTrusted)); > } >@@ -58,7 +58,7 @@ private: > { > } > >- BeforeLoadEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+ BeforeLoadEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_url(initializer.url) > { >diff --git a/Source/WebCore/dom/ClassCollection.cpp b/Source/WebCore/dom/ClassCollection.cpp >index 3817ecd7bb0ff676c3c4798d6cc22a0f979485d1..1998305c4d6f2a159183898cb5527c468cf0ecdb 100644 >--- a/Source/WebCore/dom/ClassCollection.cpp >+++ b/Source/WebCore/dom/ClassCollection.cpp >@@ -38,7 +38,7 @@ namespace WebCore { > > WTF_MAKE_ISO_ALLOCATED_IMPL(ClassCollection); > >-Ref<ClassCollection> ClassCollection::create(ContainerNode& rootNode, CollectionType type, const AtomicString& classNames) >+Ref<ClassCollection> ClassCollection::create(ContainerNode& rootNode, CollectionType type, const AtomString& classNames) > { > ASSERT(type == ByClass); > return adoptRef(*new ClassCollection(rootNode, type, classNames)); >diff --git a/Source/WebCore/dom/ClassCollection.h b/Source/WebCore/dom/ClassCollection.h >index 3d8803f5c34427190e83bab1b591021abea48fdc..ecf7f3d20c615c4689820f19aa9cf3a8632f6bdd 100644 >--- a/Source/WebCore/dom/ClassCollection.h >+++ b/Source/WebCore/dom/ClassCollection.h >@@ -38,20 +38,20 @@ namespace WebCore { > class ClassCollection final : public CachedHTMLCollection<ClassCollection, CollectionTypeTraits<ByClass>::traversalType> { > WTF_MAKE_ISO_ALLOCATED(ClassCollection); > public: >- static Ref<ClassCollection> create(ContainerNode&, CollectionType, const AtomicString& classNames); >+ static Ref<ClassCollection> create(ContainerNode&, CollectionType, const AtomString& classNames); > > virtual ~ClassCollection(); > > bool elementMatches(Element&) const; > > private: >- ClassCollection(ContainerNode& rootNode, CollectionType, const AtomicString& classNames); >+ ClassCollection(ContainerNode& rootNode, CollectionType, const AtomString& classNames); > > SpaceSplitString m_classNames; >- AtomicString m_originalClassNames; >+ AtomString m_originalClassNames; > }; > >-inline ClassCollection::ClassCollection(ContainerNode& rootNode, CollectionType type, const AtomicString& classNames) >+inline ClassCollection::ClassCollection(ContainerNode& rootNode, CollectionType type, const AtomString& classNames) > : CachedHTMLCollection<ClassCollection, CollectionTypeTraits<ByClass>::traversalType>(rootNode, type) > , m_classNames(classNames, rootNode.document().inQuirksMode()) > , m_originalClassNames(classNames) >diff --git a/Source/WebCore/dom/ClipboardEvent.cpp b/Source/WebCore/dom/ClipboardEvent.cpp >index 3caadcf24c5fe5569c70378faf5e72ff0f4d1e50..e3ff51adf4fadecf3b3602f8cfa4683ed39b0a6c 100644 >--- a/Source/WebCore/dom/ClipboardEvent.cpp >+++ b/Source/WebCore/dom/ClipboardEvent.cpp >@@ -27,13 +27,13 @@ > > namespace WebCore { > >-ClipboardEvent::ClipboardEvent(const AtomicString& type, Ref<DataTransfer>&& dataTransfer) >+ClipboardEvent::ClipboardEvent(const AtomString& type, Ref<DataTransfer>&& dataTransfer) > : Event(type, CanBubble::Yes, IsCancelable::Yes, IsComposed::Yes) > , m_clipboardData(WTFMove(dataTransfer)) > { > } > >-ClipboardEvent::ClipboardEvent(const AtomicString& type, const Init& init) >+ClipboardEvent::ClipboardEvent(const AtomString& type, const Init& init) > : Event(type, init, IsTrusted::No) > , m_clipboardData(init.clipboardData) > { >diff --git a/Source/WebCore/dom/ClipboardEvent.h b/Source/WebCore/dom/ClipboardEvent.h >index 7906be0d3801a7cb71460dfa988e1e705836ce10..0d4e4cb1611037e671c592182d99f43a41004f9d 100644 >--- a/Source/WebCore/dom/ClipboardEvent.h >+++ b/Source/WebCore/dom/ClipboardEvent.h >@@ -37,12 +37,12 @@ public: > RefPtr<DataTransfer> clipboardData; > }; > >- static Ref<ClipboardEvent> create(const AtomicString& type, Ref<DataTransfer>&& dataTransfer) >+ static Ref<ClipboardEvent> create(const AtomString& type, Ref<DataTransfer>&& dataTransfer) > { > return adoptRef(*new ClipboardEvent(type, WTFMove(dataTransfer))); > } > >- static Ref<ClipboardEvent> create(const AtomicString& type, const Init& init) >+ static Ref<ClipboardEvent> create(const AtomString& type, const Init& init) > { > return adoptRef(*new ClipboardEvent(type, init)); > } >@@ -50,8 +50,8 @@ public: > DataTransfer* clipboardData() const { return m_clipboardData.get(); } > > private: >- ClipboardEvent(const AtomicString& type, Ref<DataTransfer>&&); >- ClipboardEvent(const AtomicString& type, const Init&); >+ ClipboardEvent(const AtomString& type, Ref<DataTransfer>&&); >+ ClipboardEvent(const AtomString& type, const Init&); > > EventInterface eventInterface() const final; > bool isClipboardEvent() const final; >diff --git a/Source/WebCore/dom/CompositionEvent.cpp b/Source/WebCore/dom/CompositionEvent.cpp >index 1d04795de82787052b6c961b79ee0f8e161ffb8a..ec09c384519c068e62631283bde34d07b57d6aa8 100644 >--- a/Source/WebCore/dom/CompositionEvent.cpp >+++ b/Source/WebCore/dom/CompositionEvent.cpp >@@ -31,13 +31,13 @@ namespace WebCore { > > CompositionEvent::CompositionEvent() = default; > >-CompositionEvent::CompositionEvent(const AtomicString& type, RefPtr<WindowProxy>&& view, const String& data) >+CompositionEvent::CompositionEvent(const AtomString& type, RefPtr<WindowProxy>&& view, const String& data) > : UIEvent(type, CanBubble::Yes, IsCancelable::Yes, IsComposed::Yes, WTFMove(view), 0) > , m_data(data) > { > } > >-CompositionEvent::CompositionEvent(const AtomicString& type, const Init& initializer) >+CompositionEvent::CompositionEvent(const AtomString& type, const Init& initializer) > : UIEvent(type, initializer) > , m_data(initializer.data) > { >@@ -45,7 +45,7 @@ CompositionEvent::CompositionEvent(const AtomicString& type, const Init& initial > > CompositionEvent::~CompositionEvent() = default; > >-void CompositionEvent::initCompositionEvent(const AtomicString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&& view, const String& data) >+void CompositionEvent::initCompositionEvent(const AtomString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&& view, const String& data) > { > if (isBeingDispatched()) > return; >diff --git a/Source/WebCore/dom/CompositionEvent.h b/Source/WebCore/dom/CompositionEvent.h >index 223b8605949ca2e52c4f3c62295f38567aa6d223..210905a014188523a5db536a043241a5db6cdb40 100644 >--- a/Source/WebCore/dom/CompositionEvent.h >+++ b/Source/WebCore/dom/CompositionEvent.h >@@ -32,7 +32,7 @@ namespace WebCore { > > class CompositionEvent final : public UIEvent { > public: >- static Ref<CompositionEvent> create(const AtomicString& type, RefPtr<WindowProxy>&& view, const String& data) >+ static Ref<CompositionEvent> create(const AtomString& type, RefPtr<WindowProxy>&& view, const String& data) > { > return adoptRef(*new CompositionEvent(type, WTFMove(view), data)); > } >@@ -46,14 +46,14 @@ public: > String data; > }; > >- static Ref<CompositionEvent> create(const AtomicString& type, const Init& initializer) >+ static Ref<CompositionEvent> create(const AtomString& type, const Init& initializer) > { > return adoptRef(*new CompositionEvent(type, initializer)); > } > > virtual ~CompositionEvent(); > >- void initCompositionEvent(const AtomicString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&&, const String& data); >+ void initCompositionEvent(const AtomString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&&, const String& data); > > String data() const { return m_data; } > >@@ -61,8 +61,8 @@ public: > > private: > CompositionEvent(); >- CompositionEvent(const AtomicString& type, RefPtr<WindowProxy>&&, const String&); >- CompositionEvent(const AtomicString& type, const Init&); >+ CompositionEvent(const AtomString& type, RefPtr<WindowProxy>&&, const String&); >+ CompositionEvent(const AtomString& type, const Init&); > > bool isCompositionEvent() const override; > >diff --git a/Source/WebCore/dom/ConstantPropertyMap.cpp b/Source/WebCore/dom/ConstantPropertyMap.cpp >index 6c108c888715f67fa9818600abdb15104faac2f0..fd142f7deab0748e96a19c5b0daed906270d30b2 100644 >--- a/Source/WebCore/dom/ConstantPropertyMap.cpp >+++ b/Source/WebCore/dom/ConstantPropertyMap.cpp >@@ -48,17 +48,17 @@ const ConstantPropertyMap::Values& ConstantPropertyMap::values() const > return *m_values; > } > >-const AtomicString& ConstantPropertyMap::nameForProperty(ConstantProperty property) const >+const AtomString& ConstantPropertyMap::nameForProperty(ConstantProperty property) const > { >- static NeverDestroyed<AtomicString> safeAreaInsetTopName("safe-area-inset-top", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> safeAreaInsetRightName("safe-area-inset-right", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> safeAreaInsetBottomName("safe-area-inset-bottom", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> safeAreaInsetLeftName("safe-area-inset-left", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> fullscreenInsetTopName("fullscreen-inset-top", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> fullscreenInsetLeftName("fullscreen-inset-left", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> fullscreenInsetBottomName("fullscreen-inset-bottom", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> fullscreenInsetRightName("fullscreen-inset-right", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> fullscreenAutoHideDurationName("fullscreen-auto-hide-duration", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> safeAreaInsetTopName("safe-area-inset-top", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> safeAreaInsetRightName("safe-area-inset-right", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> safeAreaInsetBottomName("safe-area-inset-bottom", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> safeAreaInsetLeftName("safe-area-inset-left", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> fullscreenInsetTopName("fullscreen-inset-top", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> fullscreenInsetLeftName("fullscreen-inset-left", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> fullscreenInsetBottomName("fullscreen-inset-bottom", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> fullscreenInsetRightName("fullscreen-inset-right", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> fullscreenAutoHideDurationName("fullscreen-auto-hide-duration", AtomString::ConstructFromLiteral); > > switch (property) { > case ConstantProperty::SafeAreaInsetTop: >diff --git a/Source/WebCore/dom/ConstantPropertyMap.h b/Source/WebCore/dom/ConstantPropertyMap.h >index d26fb988b018cde63b44f2a1a757177919ab4697..7faed98a0b1eb12a9ea0aaf6f0099736d8bc838b 100644 >--- a/Source/WebCore/dom/ConstantPropertyMap.h >+++ b/Source/WebCore/dom/ConstantPropertyMap.h >@@ -29,8 +29,8 @@ > #include <wtf/HashMap.h> > #include <wtf/Ref.h> > #include <wtf/Seconds.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -55,7 +55,7 @@ class ConstantPropertyMap { > public: > explicit ConstantPropertyMap(Document&); > >- typedef HashMap<AtomicString, Ref<CSSCustomPropertyValue>> Values; >+ typedef HashMap<AtomString, Ref<CSSCustomPropertyValue>> Values; > const Values& values() const; > > void didChangeSafeAreaInsets(); >@@ -65,7 +65,7 @@ public: > private: > void buildValues(); > >- const AtomicString& nameForProperty(ConstantProperty) const; >+ const AtomString& nameForProperty(ConstantProperty) const; > void setValueForProperty(ConstantProperty, Ref<CSSVariableData>&&); > > void updateConstantsForSafeAreaInsets(); >diff --git a/Source/WebCore/dom/ContainerNode.cpp b/Source/WebCore/dom/ContainerNode.cpp >index b85af131b5ac409878723bc4ef2a86450ed38b65..030fc644027636ff2a6a0dbf9cbddc3fa24f6fbc 100644 >--- a/Source/WebCore/dom/ContainerNode.cpp >+++ b/Source/WebCore/dom/ContainerNode.cpp >@@ -875,7 +875,7 @@ ExceptionOr<Ref<NodeList>> ContainerNode::querySelectorAll(const String& selecto > return query.releaseReturnValue().queryAll(*this); > } > >-Ref<HTMLCollection> ContainerNode::getElementsByTagName(const AtomicString& qualifiedName) >+Ref<HTMLCollection> ContainerNode::getElementsByTagName(const AtomString& qualifiedName) > { > ASSERT(!qualifiedName.isNull()); > >@@ -887,7 +887,7 @@ Ref<HTMLCollection> ContainerNode::getElementsByTagName(const AtomicString& qual > return ensureRareData().ensureNodeLists().addCachedCollection<TagCollection>(*this, ByTag, qualifiedName); > } > >-Ref<HTMLCollection> ContainerNode::getElementsByTagNameNS(const AtomicString& namespaceURI, const AtomicString& localName) >+Ref<HTMLCollection> ContainerNode::getElementsByTagNameNS(const AtomString& namespaceURI, const AtomString& localName) > { > ASSERT(!localName.isNull()); > return ensureRareData().ensureNodeLists().addCachedTagCollectionNS(*this, namespaceURI.isEmpty() ? nullAtom() : namespaceURI, localName); >@@ -898,12 +898,12 @@ Ref<NodeList> ContainerNode::getElementsByName(const String& elementName) > return ensureRareData().ensureNodeLists().addCacheWithAtomicName<NameNodeList>(*this, elementName); > } > >-Ref<HTMLCollection> ContainerNode::getElementsByClassName(const AtomicString& classNames) >+Ref<HTMLCollection> ContainerNode::getElementsByClassName(const AtomString& classNames) > { > return ensureRareData().ensureNodeLists().addCachedCollection<ClassCollection>(*this, ByClass, classNames); > } > >-Ref<RadioNodeList> ContainerNode::radioNodeList(const AtomicString& name) >+Ref<RadioNodeList> ContainerNode::radioNodeList(const AtomString& name) > { > ASSERT(hasTagName(HTMLNames::formTag) || hasTagName(HTMLNames::fieldsetTag)); > return ensureRareData().ensureNodeLists().addCacheWithAtomicName<RadioNodeList>(*this, name); >diff --git a/Source/WebCore/dom/ContainerNode.h b/Source/WebCore/dom/ContainerNode.h >index 3f0571e335e7796eefe5448a207a2f02a888ad4a..2b29060fe5492053dcbaae9a96c5543fa9daf5b1 100644 >--- a/Source/WebCore/dom/ContainerNode.h >+++ b/Source/WebCore/dom/ContainerNode.h >@@ -114,11 +114,11 @@ public: > WEBCORE_EXPORT ExceptionOr<Element*> querySelector(const String& selectors); > WEBCORE_EXPORT ExceptionOr<Ref<NodeList>> querySelectorAll(const String& selectors); > >- WEBCORE_EXPORT Ref<HTMLCollection> getElementsByTagName(const AtomicString&); >- WEBCORE_EXPORT Ref<HTMLCollection> getElementsByTagNameNS(const AtomicString& namespaceURI, const AtomicString& localName); >+ WEBCORE_EXPORT Ref<HTMLCollection> getElementsByTagName(const AtomString&); >+ WEBCORE_EXPORT Ref<HTMLCollection> getElementsByTagNameNS(const AtomString& namespaceURI, const AtomString& localName); > WEBCORE_EXPORT Ref<NodeList> getElementsByName(const String& elementName); >- WEBCORE_EXPORT Ref<HTMLCollection> getElementsByClassName(const AtomicString& classNames); >- Ref<RadioNodeList> radioNodeList(const AtomicString&); >+ WEBCORE_EXPORT Ref<HTMLCollection> getElementsByClassName(const AtomString& classNames); >+ Ref<RadioNodeList> radioNodeList(const AtomString&); > > // From the ParentNode interface - https://dom.spec.whatwg.org/#interface-parentnode > WEBCORE_EXPORT Ref<HTMLCollection> children(); >diff --git a/Source/WebCore/dom/CustomElementReactionQueue.cpp b/Source/WebCore/dom/CustomElementReactionQueue.cpp >index bd49e873474d513019d2247a8a61ce34fe343104..9eb5d7e49f56a1e98d1fbb9b23e6ea72e226158f 100644 >--- a/Source/WebCore/dom/CustomElementReactionQueue.cpp >+++ b/Source/WebCore/dom/CustomElementReactionQueue.cpp >@@ -63,7 +63,7 @@ public: > , m_newDocument(&newDocument) > { } > >- CustomElementReactionQueueItem(const QualifiedName& attributeName, const AtomicString& oldValue, const AtomicString& newValue) >+ CustomElementReactionQueueItem(const QualifiedName& attributeName, const AtomString& oldValue, const AtomString& newValue) > : m_type(Type::AttributeChanged) > , m_attributeName(attributeName) > , m_oldValue(oldValue) >@@ -99,8 +99,8 @@ private: > RefPtr<Document> m_oldDocument; > RefPtr<Document> m_newDocument; > Optional<QualifiedName> m_attributeName; >- AtomicString m_oldValue; >- AtomicString m_newValue; >+ AtomString m_oldValue; >+ AtomString m_newValue; > }; > > CustomElementReactionQueue::CustomElementReactionQueue(JSCustomElementInterface& elementInterface) >@@ -190,7 +190,7 @@ void CustomElementReactionQueue::enqueueAdoptedCallbackIfNeeded(Element& element > enqueueElementOnAppropriateElementQueue(element); > } > >-void CustomElementReactionQueue::enqueueAttributeChangedCallbackIfNeeded(Element& element, const QualifiedName& attributeName, const AtomicString& oldValue, const AtomicString& newValue) >+void CustomElementReactionQueue::enqueueAttributeChangedCallbackIfNeeded(Element& element, const QualifiedName& attributeName, const AtomString& oldValue, const AtomString& newValue) > { > ASSERT(CustomElementReactionDisallowedScope::isReactionAllowed()); > ASSERT(element.isDefinedCustomElement()); >diff --git a/Source/WebCore/dom/CustomElementReactionQueue.h b/Source/WebCore/dom/CustomElementReactionQueue.h >index c82c60704db459ccb7713eb8aaa80a4e9ad4387a..589c841cc3e88ce79e742e7b2bb34ae9e69f08ab 100644 >--- a/Source/WebCore/dom/CustomElementReactionQueue.h >+++ b/Source/WebCore/dom/CustomElementReactionQueue.h >@@ -56,7 +56,7 @@ public: > static void enqueueConnectedCallbackIfNeeded(Element&); > static void enqueueDisconnectedCallbackIfNeeded(Element&); > static void enqueueAdoptedCallbackIfNeeded(Element&, Document& oldDocument, Document& newDocument); >- static void enqueueAttributeChangedCallbackIfNeeded(Element&, const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue); >+ static void enqueueAttributeChangedCallbackIfNeeded(Element&, const QualifiedName&, const AtomString& oldValue, const AtomString& newValue); > static void enqueuePostUpgradeReactions(Element&); > > bool observesStyleAttribute() const; >diff --git a/Source/WebCore/dom/CustomElementRegistry.cpp b/Source/WebCore/dom/CustomElementRegistry.cpp >index 661721d0a5945a14d291f713688f3f061c9b55d4..769b16bb4fbe5e79503f6450e8f2711aef572b56 100644 >--- a/Source/WebCore/dom/CustomElementRegistry.cpp >+++ b/Source/WebCore/dom/CustomElementRegistry.cpp >@@ -37,7 +37,7 @@ > #include "ShadowRoot.h" > #include "TypedElementDescendantIterator.h" > #include <JavaScriptCore/JSCJSValueInlines.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -69,7 +69,7 @@ static void enqueueUpgradeInShadowIncludingTreeOrder(ContainerNode& node, JSCust > > void CustomElementRegistry::addElementDefinition(Ref<JSCustomElementInterface>&& elementInterface) > { >- AtomicString localName = elementInterface->name().localName(); >+ AtomString localName = elementInterface->name().localName(); > ASSERT(!m_nameMap.contains(localName)); > m_constructorMap.add(elementInterface->constructor(), elementInterface.ptr()); > m_nameMap.add(localName, elementInterface.copyRef()); >@@ -93,7 +93,7 @@ JSCustomElementInterface* CustomElementRegistry::findInterface(const QualifiedNa > return m_nameMap.get(name.localName()); > } > >-JSCustomElementInterface* CustomElementRegistry::findInterface(const AtomicString& name) const >+JSCustomElementInterface* CustomElementRegistry::findInterface(const AtomString& name) const > { > return m_nameMap.get(name); > } >@@ -108,7 +108,7 @@ bool CustomElementRegistry::containsConstructor(const JSC::JSObject* constructor > return m_constructorMap.contains(constructor); > } > >-JSC::JSValue CustomElementRegistry::get(const AtomicString& name) >+JSC::JSValue CustomElementRegistry::get(const AtomString& name) > { > if (auto* elementInterface = m_nameMap.get(name)) > return elementInterface->constructor(); >diff --git a/Source/WebCore/dom/CustomElementRegistry.h b/Source/WebCore/dom/CustomElementRegistry.h >index b42abbd1ecc8dc9b2952640c04a40cf8c1c0cf7d..dec78244170af7deab3ad69bdf28ed90e5ed6563 100644 >--- a/Source/WebCore/dom/CustomElementRegistry.h >+++ b/Source/WebCore/dom/CustomElementRegistry.h >@@ -28,8 +28,8 @@ > #include "ContextDestructionObserver.h" > #include "QualifiedName.h" > #include <wtf/HashMap.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > namespace JSC { > >@@ -59,22 +59,22 @@ public: > > JSCustomElementInterface* findInterface(const Element&) const; > JSCustomElementInterface* findInterface(const QualifiedName&) const; >- JSCustomElementInterface* findInterface(const AtomicString&) const; >+ JSCustomElementInterface* findInterface(const AtomString&) const; > JSCustomElementInterface* findInterface(const JSC::JSObject*) const; > bool containsConstructor(const JSC::JSObject*) const; > >- JSC::JSValue get(const AtomicString&); >+ JSC::JSValue get(const AtomString&); > void upgrade(Node& root); > >- HashMap<AtomicString, Ref<DeferredPromise>>& promiseMap() { return m_promiseMap; } >+ HashMap<AtomString, Ref<DeferredPromise>>& promiseMap() { return m_promiseMap; } > > private: > CustomElementRegistry(DOMWindow&, ScriptExecutionContext*); > > DOMWindow& m_window; >- HashMap<AtomicString, Ref<JSCustomElementInterface>> m_nameMap; >+ HashMap<AtomString, Ref<JSCustomElementInterface>> m_nameMap; > HashMap<const JSC::JSObject*, JSCustomElementInterface*> m_constructorMap; >- HashMap<AtomicString, Ref<DeferredPromise>> m_promiseMap; >+ HashMap<AtomString, Ref<DeferredPromise>> m_promiseMap; > > bool m_elementDefinitionIsRunning { false }; > >diff --git a/Source/WebCore/dom/CustomEvent.cpp b/Source/WebCore/dom/CustomEvent.cpp >index 6e650b3228698c9576288f66ddaff9f9ce4902cd..66d72ff03db2a74c05ffa70ae8e8c5475dbbb29c 100644 >--- a/Source/WebCore/dom/CustomEvent.cpp >+++ b/Source/WebCore/dom/CustomEvent.cpp >@@ -36,7 +36,7 @@ inline CustomEvent::CustomEvent(IsTrusted isTrusted) > { > } > >-inline CustomEvent::CustomEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+inline CustomEvent::CustomEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_detail(initializer.detail) > { >@@ -49,12 +49,12 @@ Ref<CustomEvent> CustomEvent::create(IsTrusted isTrusted) > return adoptRef(*new CustomEvent(isTrusted)); > } > >-Ref<CustomEvent> CustomEvent::create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+Ref<CustomEvent> CustomEvent::create(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > { > return adoptRef(*new CustomEvent(type, initializer, isTrusted)); > } > >-void CustomEvent::initCustomEvent(const AtomicString& type, bool canBubble, bool cancelable, JSC::JSValue detail) >+void CustomEvent::initCustomEvent(const AtomString& type, bool canBubble, bool cancelable, JSC::JSValue detail) > { > if (isBeingDispatched()) > return; >diff --git a/Source/WebCore/dom/CustomEvent.h b/Source/WebCore/dom/CustomEvent.h >index 973abbbaa70a0d872031ac4cb8ba899277b003db..e78d50e677e777fe15ca5398426874139d7a61af 100644 >--- a/Source/WebCore/dom/CustomEvent.h >+++ b/Source/WebCore/dom/CustomEvent.h >@@ -42,16 +42,16 @@ public: > JSC::JSValue detail; > }; > >- static Ref<CustomEvent> create(const AtomicString& type, const Init&, IsTrusted = IsTrusted::No); >+ static Ref<CustomEvent> create(const AtomString& type, const Init&, IsTrusted = IsTrusted::No); > >- void initCustomEvent(const AtomicString& type, bool canBubble, bool cancelable, JSC::JSValue detail = JSC::JSValue::JSUndefined); >+ void initCustomEvent(const AtomString& type, bool canBubble, bool cancelable, JSC::JSValue detail = JSC::JSValue::JSUndefined); > > const JSValueInWrappedObject& detail() const { return m_detail; } > JSValueInWrappedObject& cachedDetail() { return m_cachedDetail; } > > private: > CustomEvent(IsTrusted); >- CustomEvent(const AtomicString& type, const Init& initializer, IsTrusted); >+ CustomEvent(const AtomString& type, const Init& initializer, IsTrusted); > > EventInterface eventInterface() const final; > >diff --git a/Source/WebCore/dom/DataTransferItem.h b/Source/WebCore/dom/DataTransferItem.h >index 91ebda1a4e6f752707e5f78b249926c38113725f..b4ff59945af9c9ea4c1cf8bfb30660ea836ae684 100644 >--- a/Source/WebCore/dom/DataTransferItem.h >+++ b/Source/WebCore/dom/DataTransferItem.h >@@ -36,7 +36,7 @@ > #include <wtf/Forward.h> > #include <wtf/RefCounted.h> > #include <wtf/WeakPtr.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >diff --git a/Source/WebCore/dom/DatasetDOMStringMap.cpp b/Source/WebCore/dom/DatasetDOMStringMap.cpp >index a6aeedc0e7eb62f68a1d2d9848ce06addcc0b6f8..d789cc7fa4b671876e8c636c2b230ae16663c743 100644 >--- a/Source/WebCore/dom/DatasetDOMStringMap.cpp >+++ b/Source/WebCore/dom/DatasetDOMStringMap.cpp >@@ -29,7 +29,7 @@ > #include "Element.h" > #include <wtf/ASCIICType.h> > #include <wtf/IsoMallocInlines.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/StringBuilder.h> > > namespace WebCore { >@@ -109,7 +109,7 @@ static bool isValidPropertyName(const String& name) > } > > template<typename CharacterType> >-static inline AtomicString convertPropertyNameToAttributeName(const StringImpl& name) >+static inline AtomString convertPropertyNameToAttributeName(const StringImpl& name) > { > const CharacterType dataPrefix[] = { 'd', 'a', 't', 'a', '-' }; > >@@ -129,10 +129,10 @@ static inline AtomicString convertPropertyNameToAttributeName(const StringImpl& > } else > buffer.append(character); > } >- return AtomicString(buffer.data(), buffer.size()); >+ return AtomString(buffer.data(), buffer.size()); > } > >-static AtomicString convertPropertyNameToAttributeName(const String& name) >+static AtomString convertPropertyNameToAttributeName(const String& name) > { > if (name.isNull()) > return nullAtom(); >@@ -161,7 +161,7 @@ bool DatasetDOMStringMap::isSupportedPropertyName(const String& propertyName) co > auto attributeIteratorAccessor = m_element.attributesIterator(); > if (attributeIteratorAccessor.attributeCount() == 1) { > // If the node has a single attribute, it is the dataset member accessed in most cases. >- // Building a new AtomicString in that case is overkill so we do a direct character comparison. >+ // Building a new AtomString in that case is overkill so we do a direct character comparison. > const auto& attribute = *attributeIteratorAccessor.begin(); > if (propertyNameMatchesAttributeName(propertyName, attribute.localName())) > return true; >@@ -191,19 +191,19 @@ Vector<String> DatasetDOMStringMap::supportedPropertyNames() const > return names; > } > >-const AtomicString* DatasetDOMStringMap::item(const String& propertyName) const >+const AtomString* DatasetDOMStringMap::item(const String& propertyName) const > { > if (m_element.hasAttributes()) { > AttributeIteratorAccessor attributeIteratorAccessor = m_element.attributesIterator(); > > if (attributeIteratorAccessor.attributeCount() == 1) { > // If the node has a single attribute, it is the dataset member accessed in most cases. >- // Building a new AtomicString in that case is overkill so we do a direct character comparison. >+ // Building a new AtomString in that case is overkill so we do a direct character comparison. > const Attribute& attribute = *attributeIteratorAccessor.begin(); > if (propertyNameMatchesAttributeName(propertyName, attribute.localName())) > return &attribute.value(); > } else { >- AtomicString attributeName = convertPropertyNameToAttributeName(propertyName); >+ AtomString attributeName = convertPropertyNameToAttributeName(propertyName); > for (const Attribute& attribute : attributeIteratorAccessor) { > if (attribute.localName() == attributeName) > return &attribute.value(); >@@ -214,7 +214,7 @@ const AtomicString* DatasetDOMStringMap::item(const String& propertyName) const > return nullptr; > } > >-String DatasetDOMStringMap::namedItem(const AtomicString& name) const >+String DatasetDOMStringMap::namedItem(const AtomString& name) const > { > if (const auto* value = item(name)) > return *value; >diff --git a/Source/WebCore/dom/DatasetDOMStringMap.h b/Source/WebCore/dom/DatasetDOMStringMap.h >index 3fdb547fa17525fb9c3a278ed3036d5d05a7cf70..f1a98acddcdb6e9fe9e89073435221caed5927d4 100644 >--- a/Source/WebCore/dom/DatasetDOMStringMap.h >+++ b/Source/WebCore/dom/DatasetDOMStringMap.h >@@ -46,14 +46,14 @@ public: > bool isSupportedPropertyName(const String& name) const; > Vector<String> supportedPropertyNames() const; > >- String namedItem(const AtomicString& name) const; >+ String namedItem(const AtomString& name) const; > ExceptionOr<void> setNamedItem(const String& name, const String& value); > bool deleteNamedProperty(const String& name); > > Element& element() { return m_element; } > > private: >- const AtomicString* item(const String& name) const; >+ const AtomString* item(const String& name) const; > > Element& m_element; > }; >diff --git a/Source/WebCore/dom/DeviceMotionEvent.cpp b/Source/WebCore/dom/DeviceMotionEvent.cpp >index 90d702dc39052d0fc76de08415da47b8373b2d96..c51402aa94b573b1451a9f023a82cf2e82c9c161 100644 >--- a/Source/WebCore/dom/DeviceMotionEvent.cpp >+++ b/Source/WebCore/dom/DeviceMotionEvent.cpp >@@ -37,7 +37,7 @@ DeviceMotionEvent::DeviceMotionEvent() > { > } > >-DeviceMotionEvent::DeviceMotionEvent(const AtomicString& eventType, DeviceMotionData* deviceMotionData) >+DeviceMotionEvent::DeviceMotionEvent(const AtomString& eventType, DeviceMotionData* deviceMotionData) > : Event(eventType, CanBubble::No, IsCancelable::No) > , m_deviceMotionData(deviceMotionData) > { >@@ -101,7 +101,7 @@ Optional<double> DeviceMotionEvent::interval() const > return m_deviceMotionData->interval(); > } > >-void DeviceMotionEvent::initDeviceMotionEvent(const AtomicString& type, bool bubbles, bool cancelable, Optional<DeviceMotionEvent::Acceleration>&& acceleration, Optional<DeviceMotionEvent::Acceleration>&& accelerationIncludingGravity, Optional<DeviceMotionEvent::RotationRate>&& rotationRate, Optional<double> interval) >+void DeviceMotionEvent::initDeviceMotionEvent(const AtomString& type, bool bubbles, bool cancelable, Optional<DeviceMotionEvent::Acceleration>&& acceleration, Optional<DeviceMotionEvent::Acceleration>&& accelerationIncludingGravity, Optional<DeviceMotionEvent::RotationRate>&& rotationRate, Optional<double> interval) > { > if (isBeingDispatched()) > return; >diff --git a/Source/WebCore/dom/DeviceMotionEvent.h b/Source/WebCore/dom/DeviceMotionEvent.h >index 51d71a0e7cd7843d1582b039cce23a827253e9fc..9ea18345b487743d08d7f7021653da3612645697 100644 >--- a/Source/WebCore/dom/DeviceMotionEvent.h >+++ b/Source/WebCore/dom/DeviceMotionEvent.h >@@ -50,7 +50,7 @@ public: > Optional<double> gamma; > }; > >- static Ref<DeviceMotionEvent> create(const AtomicString& eventType, DeviceMotionData* deviceMotionData) >+ static Ref<DeviceMotionEvent> create(const AtomString& eventType, DeviceMotionData* deviceMotionData) > { > return adoptRef(*new DeviceMotionEvent(eventType, deviceMotionData)); > } >@@ -65,11 +65,11 @@ public: > Optional<RotationRate> rotationRate() const; > Optional<double> interval() const; > >- void initDeviceMotionEvent(const AtomicString& type, bool bubbles, bool cancelable, Optional<Acceleration>&&, Optional<Acceleration>&&, Optional<RotationRate>&&, Optional<double>); >+ void initDeviceMotionEvent(const AtomString& type, bool bubbles, bool cancelable, Optional<Acceleration>&&, Optional<Acceleration>&&, Optional<RotationRate>&&, Optional<double>); > > private: > DeviceMotionEvent(); >- DeviceMotionEvent(const AtomicString& eventType, DeviceMotionData*); >+ DeviceMotionEvent(const AtomString& eventType, DeviceMotionData*); > > EventInterface eventInterface() const override; > >diff --git a/Source/WebCore/dom/DeviceOrientationEvent.cpp b/Source/WebCore/dom/DeviceOrientationEvent.cpp >index e821b6553108a120c0fb27127ba5755190e71e1e..3d946cbccc3bdb57236ba85ab22a6127d679d9c5 100644 >--- a/Source/WebCore/dom/DeviceOrientationEvent.cpp >+++ b/Source/WebCore/dom/DeviceOrientationEvent.cpp >@@ -37,7 +37,7 @@ DeviceOrientationEvent::DeviceOrientationEvent() > { > } > >-DeviceOrientationEvent::DeviceOrientationEvent(const AtomicString& eventType, DeviceOrientationData* orientation) >+DeviceOrientationEvent::DeviceOrientationEvent(const AtomString& eventType, DeviceOrientationData* orientation) > : Event(eventType, CanBubble::No, IsCancelable::No) > , m_orientation(orientation) > { >@@ -70,7 +70,7 @@ Optional<double> DeviceOrientationEvent::compassAccuracy() const > return m_orientation->compassAccuracy(); > } > >-void DeviceOrientationEvent::initDeviceOrientationEvent(const AtomicString& type, bool bubbles, bool cancelable, Optional<double> alpha, Optional<double> beta, Optional<double> gamma, Optional<double> compassHeading, Optional<double> compassAccuracy) >+void DeviceOrientationEvent::initDeviceOrientationEvent(const AtomString& type, bool bubbles, bool cancelable, Optional<double> alpha, Optional<double> beta, Optional<double> gamma, Optional<double> compassHeading, Optional<double> compassAccuracy) > { > if (isBeingDispatched()) > return; >@@ -86,7 +86,7 @@ Optional<bool> DeviceOrientationEvent::absolute() const > return m_orientation->absolute(); > } > >-void DeviceOrientationEvent::initDeviceOrientationEvent(const AtomicString& type, bool bubbles, bool cancelable, Optional<double> alpha, Optional<double> beta, Optional<double> gamma, Optional<bool> absolute) >+void DeviceOrientationEvent::initDeviceOrientationEvent(const AtomString& type, bool bubbles, bool cancelable, Optional<double> alpha, Optional<double> beta, Optional<double> gamma, Optional<bool> absolute) > { > if (isBeingDispatched()) > return; >diff --git a/Source/WebCore/dom/DeviceOrientationEvent.h b/Source/WebCore/dom/DeviceOrientationEvent.h >index 628708b6e84b52618e9683cd6cde67f3fa1168f3..abb39405de6cea0102ef9af16645e7cf5e9a4743 100644 >--- a/Source/WebCore/dom/DeviceOrientationEvent.h >+++ b/Source/WebCore/dom/DeviceOrientationEvent.h >@@ -34,7 +34,7 @@ class DeviceOrientationData; > > class DeviceOrientationEvent final : public Event, public DeviceOrientationOrMotionEvent { > public: >- static Ref<DeviceOrientationEvent> create(const AtomicString& eventType, DeviceOrientationData* orientation) >+ static Ref<DeviceOrientationEvent> create(const AtomString& eventType, DeviceOrientationData* orientation) > { > return adoptRef(*new DeviceOrientationEvent(eventType, orientation)); > } >@@ -54,16 +54,16 @@ public: > Optional<double> compassHeading() const; > Optional<double> compassAccuracy() const; > >- void initDeviceOrientationEvent(const AtomicString& type, bool bubbles, bool cancelable, Optional<double> alpha, Optional<double> beta, Optional<double> gamma, Optional<double> compassHeading, Optional<double> compassAccuracy); >+ void initDeviceOrientationEvent(const AtomString& type, bool bubbles, bool cancelable, Optional<double> alpha, Optional<double> beta, Optional<double> gamma, Optional<double> compassHeading, Optional<double> compassAccuracy); > #else > Optional<bool> absolute() const; > >- void initDeviceOrientationEvent(const AtomicString& type, bool bubbles, bool cancelable, Optional<double> alpha, Optional<double> beta, Optional<double> gamma, Optional<bool> absolute); >+ void initDeviceOrientationEvent(const AtomString& type, bool bubbles, bool cancelable, Optional<double> alpha, Optional<double> beta, Optional<double> gamma, Optional<bool> absolute); > #endif > > private: > DeviceOrientationEvent(); >- DeviceOrientationEvent(const AtomicString& eventType, DeviceOrientationData*); >+ DeviceOrientationEvent(const AtomString& eventType, DeviceOrientationData*); > > EventInterface eventInterface() const override; > >diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp >index a2edab1f3f6a05409b649a9f33867d4043db3494..4457d13f81edaf7f20a872173ea71a1a6f205732 100644 >--- a/Source/WebCore/dom/Document.cpp >+++ b/Source/WebCore/dom/Document.cpp >@@ -893,12 +893,12 @@ static ALWAYS_INLINE Ref<HTMLElement> createUpgradeCandidateElement(Document& do > return element; > } > >-static ALWAYS_INLINE Ref<HTMLElement> createUpgradeCandidateElement(Document& document, const AtomicString& localName) >+static ALWAYS_INLINE Ref<HTMLElement> createUpgradeCandidateElement(Document& document, const AtomString& localName) > { > return createUpgradeCandidateElement(document, QualifiedName { nullAtom(), localName, xhtmlNamespaceURI }); > } > >-static inline bool isValidHTMLElementName(const AtomicString& localName) >+static inline bool isValidHTMLElementName(const AtomString& localName) > { > return Document::isValidName(localName); > } >@@ -929,7 +929,7 @@ static ExceptionOr<Ref<Element>> createHTMLElementWithNameValidation(Document& d > return Ref<Element> { createUpgradeCandidateElement(document, name) }; > } > >-ExceptionOr<Ref<Element>> Document::createElementForBindings(const AtomicString& name) >+ExceptionOr<Ref<Element>> Document::createElementForBindings(const AtomString& name) > { > if (isHTMLDocument()) > return createHTMLElementWithNameValidation(*this, name.convertToASCIILowercase()); >@@ -1174,7 +1174,7 @@ static inline bool isPotentialCustomElementNameCharacter(UChar32 character) > return std::binary_search(std::begin(ranges), std::end(ranges), character); > } > >-CustomElementNameValidationStatus Document::validateCustomElementName(const AtomicString& localName) >+CustomElementNameValidationStatus Document::validateCustomElementName(const AtomString& localName) > { > if (!isASCIILower(localName[0])) > return CustomElementNameValidationStatus::FirstCharacterIsNotLowercaseASCIILetter; >@@ -1195,7 +1195,7 @@ CustomElementNameValidationStatus Document::validateCustomElementName(const Atom > #if ENABLE(MATHML) > const auto& annotationXmlLocalName = MathMLNames::annotation_xmlTag->localName(); > #else >- static NeverDestroyed<const AtomicString> annotationXmlLocalName("annotation-xml", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> annotationXmlLocalName("annotation-xml", AtomString::ConstructFromLiteral); > #endif > > if (localName == SVGNames::color_profileTag->localName() >@@ -1211,7 +1211,7 @@ CustomElementNameValidationStatus Document::validateCustomElementName(const Atom > return CustomElementNameValidationStatus::Valid; > } > >-ExceptionOr<Ref<Element>> Document::createElementNS(const AtomicString& namespaceURI, const String& qualifiedName) >+ExceptionOr<Ref<Element>> Document::createElementNS(const AtomString& namespaceURI, const String& qualifiedName) > { > auto parseResult = parseQualifiedName(namespaceURI, qualifiedName); > if (parseResult.hasException()) >@@ -1340,7 +1340,7 @@ void Document::setVisualUpdatesAllowedByClient(bool visualUpdatesAllowedByClient > > String Document::characterSetWithUTF8Fallback() const > { >- AtomicString name = encoding(); >+ AtomString name = encoding(); > if (!name.isNull()) > return name; > return UTF8Encoding().domName(); >@@ -2698,7 +2698,7 @@ ScriptableDocumentParser* Document::scriptableDocumentParser() const > return parser() ? parser()->asScriptableDocumentParser() : nullptr; > } > >-ExceptionOr<RefPtr<WindowProxy>> Document::openForBindings(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& url, const AtomicString& name, const String& features) >+ExceptionOr<RefPtr<WindowProxy>> Document::openForBindings(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& url, const AtomString& name, const String& features) > { > if (!m_domWindow) > return Exception { InvalidAccessError }; >@@ -3221,12 +3221,12 @@ void Document::setBaseURLOverride(const URL& url) > void Document::processBaseElement() > { > // Find the first href attribute in a base element and the first target attribute in a base element. >- const AtomicString* href = nullptr; >- const AtomicString* target = nullptr; >+ const AtomString* href = nullptr; >+ const AtomString* target = nullptr; > auto baseDescendants = descendantsOfType<HTMLBaseElement>(*this); > for (auto& base : baseDescendants) { > if (!href) { >- const AtomicString& value = base.attributeWithoutSynchronization(hrefAttr); >+ const AtomString& value = base.attributeWithoutSynchronization(hrefAttr); > if (!value.isNull()) { > href = &value; > if (target) >@@ -3234,7 +3234,7 @@ void Document::processBaseElement() > } > } > if (!target) { >- const AtomicString& value = base.attributeWithoutSynchronization(targetAttr); >+ const AtomString& value = base.attributeWithoutSynchronization(targetAttr); > if (!value.isNull()) { > target = &value; > if (href) >@@ -4546,26 +4546,26 @@ Document& Document::contextDocument() const > return const_cast<Document&>(*this); > } > >-void Document::setAttributeEventListener(const AtomicString& eventType, const QualifiedName& attributeName, const AtomicString& attributeValue, DOMWrapperWorld& isolatedWorld) >+void Document::setAttributeEventListener(const AtomString& eventType, const QualifiedName& attributeName, const AtomString& attributeValue, DOMWrapperWorld& isolatedWorld) > { > setAttributeEventListener(eventType, JSLazyEventListener::create(*this, attributeName, attributeValue), isolatedWorld); > } > >-void Document::setWindowAttributeEventListener(const AtomicString& eventType, RefPtr<EventListener>&& listener, DOMWrapperWorld& isolatedWorld) >+void Document::setWindowAttributeEventListener(const AtomString& eventType, RefPtr<EventListener>&& listener, DOMWrapperWorld& isolatedWorld) > { > if (!m_domWindow) > return; > m_domWindow->setAttributeEventListener(eventType, WTFMove(listener), isolatedWorld); > } > >-void Document::setWindowAttributeEventListener(const AtomicString& eventType, const QualifiedName& attributeName, const AtomicString& attributeValue, DOMWrapperWorld& isolatedWorld) >+void Document::setWindowAttributeEventListener(const AtomString& eventType, const QualifiedName& attributeName, const AtomString& attributeValue, DOMWrapperWorld& isolatedWorld) > { > if (!m_domWindow) > return; > setWindowAttributeEventListener(eventType, JSLazyEventListener::create(*m_domWindow, attributeName, attributeValue), isolatedWorld); > } > >-EventListener* Document::getWindowAttributeEventListener(const AtomicString& eventType, DOMWrapperWorld& isolatedWorld) >+EventListener* Document::getWindowAttributeEventListener(const AtomString& eventType, DOMWrapperWorld& isolatedWorld) > { > if (!m_domWindow) > return nullptr; >@@ -4704,7 +4704,7 @@ bool Document::hasListenerTypeForEventType(PlatformEvent::Type eventType) const > } > } > >-void Document::addListenerTypeIfNeeded(const AtomicString& eventType) >+void Document::addListenerTypeIfNeeded(const AtomString& eventType) > { > if (eventType == eventNames().DOMSubtreeModifiedEvent) > addListenerType(DOMSUBTREEMODIFIED_LISTENER); >@@ -4963,7 +4963,7 @@ bool Document::isValidName(const String& name) > return isValidNameNonASCII(characters, length); > } > >-ExceptionOr<std::pair<AtomicString, AtomicString>> Document::parseQualifiedName(const String& qualifiedName) >+ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(const String& qualifiedName) > { > unsigned length = qualifiedName.length(); > >@@ -4994,15 +4994,15 @@ ExceptionOr<std::pair<AtomicString, AtomicString>> Document::parseQualifiedName( > } > > if (!sawColon) >- return std::pair<AtomicString, AtomicString> { { }, { qualifiedName } }; >+ return std::pair<AtomString, AtomString> { { }, { qualifiedName } }; > > if (!colonPosition || length - colonPosition <= 1) > return Exception { InvalidCharacterError }; > >- return std::pair<AtomicString, AtomicString> { StringView { qualifiedName }.substring(0, colonPosition).toAtomicString(), StringView { qualifiedName }.substring(colonPosition + 1).toAtomicString() }; >+ return std::pair<AtomString, AtomString> { StringView { qualifiedName }.substring(0, colonPosition).toAtomString(), StringView { qualifiedName }.substring(colonPosition + 1).toAtomString() }; > } > >-ExceptionOr<QualifiedName> Document::parseQualifiedName(const AtomicString& namespaceURI, const String& qualifiedName) >+ExceptionOr<QualifiedName> Document::parseQualifiedName(const AtomString& namespaceURI, const String& qualifiedName) > { > auto parseResult = parseQualifiedName(qualifiedName); > if (parseResult.hasException()) >@@ -5522,7 +5522,7 @@ ExceptionOr<Ref<Attr>> Document::createAttribute(const String& name) > return createAttributeNS({ }, isHTMLDocument() ? name.convertToASCIILowercase() : name, true); > } > >-ExceptionOr<Ref<Attr>> Document::createAttributeNS(const AtomicString& namespaceURI, const String& qualifiedName, bool shouldIgnoreNamespaceChecks) >+ExceptionOr<Ref<Attr>> Document::createAttributeNS(const AtomString& namespaceURI, const String& qualifiedName, bool shouldIgnoreNamespaceChecks) > { > auto parseResult = parseQualifiedName(namespaceURI, qualifiedName); > if (parseResult.hasException()) >@@ -5614,17 +5614,17 @@ Ref<HTMLCollection> Document::all() > return ensureRareData().ensureNodeLists().addCachedCollection<HTMLAllCollection>(*this, DocAll); > } > >-Ref<HTMLCollection> Document::allFilteredByName(const AtomicString& name) >+Ref<HTMLCollection> Document::allFilteredByName(const AtomString& name) > { > return ensureRareData().ensureNodeLists().addCachedCollection<HTMLAllNamedSubCollection>(*this, DocumentAllNamedItems, name); > } > >-Ref<HTMLCollection> Document::windowNamedItems(const AtomicString& name) >+Ref<HTMLCollection> Document::windowNamedItems(const AtomString& name) > { > return ensureRareData().ensureNodeLists().addCachedCollection<WindowNameCollection>(*this, WindowNamedItems, name); > } > >-Ref<HTMLCollection> Document::documentNamedItems(const AtomicString& name) >+Ref<HTMLCollection> Document::documentNamedItems(const AtomString& name) > { > return ensureRareData().ensureNodeLists().addCachedCollection<DocumentNameCollection>(*this, DocumentNamedItems, name); > } >@@ -6839,9 +6839,9 @@ bool Document::haveStylesheetsLoaded() const > return !styleScope().hasPendingSheets() || m_ignorePendingStylesheets; > } > >-Locale& Document::getCachedLocale(const AtomicString& locale) >+Locale& Document::getCachedLocale(const AtomString& locale) > { >- AtomicString localeKey = locale; >+ AtomString localeKey = locale; > if (locale.isEmpty() || !settings().langAttributeAwareFormControlUIEnabled()) > localeKey = defaultLanguage(); > LocaleIdentifierToLocaleMap::AddResult result = m_localeCache.add(localeKey, nullptr); >@@ -7566,7 +7566,7 @@ void Document::updateResizeObservations(Page& page) > } > #endif > >-const AtomicString& Document::dir() const >+const AtomString& Document::dir() const > { > auto* documentElement = this->documentElement(); > if (!is<HTMLHtmlElement>(documentElement)) >@@ -7574,7 +7574,7 @@ const AtomicString& Document::dir() const > return downcast<HTMLHtmlElement>(*documentElement).dir(); > } > >-void Document::setDir(const AtomicString& value) >+void Document::setDir(const AtomString& value) > { > auto* documentElement = this->documentElement(); > if (is<HTMLHtmlElement>(documentElement)) >@@ -7668,7 +7668,7 @@ void Document::forEachApplicationStateChangeListener(const Function<void(Applica > functor(*listener); > } > >-const AtomicString& Document::bgColor() const >+const AtomString& Document::bgColor() const > { > auto* bodyElement = body(); > if (!bodyElement) >@@ -7682,7 +7682,7 @@ void Document::setBgColor(const String& value) > bodyElement->setAttributeWithoutSynchronization(bgcolorAttr, value); > } > >-const AtomicString& Document::fgColor() const >+const AtomString& Document::fgColor() const > { > auto* bodyElement = body(); > if (!bodyElement) >@@ -7696,7 +7696,7 @@ void Document::setFgColor(const String& value) > bodyElement->setAttributeWithoutSynchronization(textAttr, value); > } > >-const AtomicString& Document::alinkColor() const >+const AtomString& Document::alinkColor() const > { > auto* bodyElement = body(); > if (!bodyElement) >@@ -7710,7 +7710,7 @@ void Document::setAlinkColor(const String& value) > bodyElement->setAttributeWithoutSynchronization(alinkAttr, value); > } > >-const AtomicString& Document::linkColorForBindings() const >+const AtomString& Document::linkColorForBindings() const > { > auto* bodyElement = body(); > if (!bodyElement) >@@ -7724,7 +7724,7 @@ void Document::setLinkColorForBindings(const String& value) > bodyElement->setAttributeWithoutSynchronization(linkAttr, value); > } > >-const AtomicString& Document::vlinkColor() const >+const AtomString& Document::vlinkColor() const > { > auto* bodyElement = body(); > if (!bodyElement) >diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h >index 1b6fafd12af3de7cc012508b08da215fd03c5aed..5ba7496601bb877b2b55d97d6725cd9e798260ff 100644 >--- a/Source/WebCore/dom/Document.h >+++ b/Source/WebCore/dom/Document.h >@@ -69,7 +69,7 @@ > #include <wtf/UniqueRef.h> > #include <wtf/WeakHashSet.h> > #include <wtf/WeakPtr.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > #if PLATFORM(IOS_FAMILY) > #include "EventTrackingRegions.h" >@@ -429,19 +429,19 @@ public: > > bool hasManifest() const; > >- WEBCORE_EXPORT ExceptionOr<Ref<Element>> createElementForBindings(const AtomicString& tagName); >+ WEBCORE_EXPORT ExceptionOr<Ref<Element>> createElementForBindings(const AtomString& tagName); > WEBCORE_EXPORT Ref<DocumentFragment> createDocumentFragment(); > WEBCORE_EXPORT Ref<Text> createTextNode(const String& data); > WEBCORE_EXPORT Ref<Comment> createComment(const String& data); > WEBCORE_EXPORT ExceptionOr<Ref<CDATASection>> createCDATASection(const String& data); > WEBCORE_EXPORT ExceptionOr<Ref<ProcessingInstruction>> createProcessingInstruction(const String& target, const String& data); > WEBCORE_EXPORT ExceptionOr<Ref<Attr>> createAttribute(const String& name); >- WEBCORE_EXPORT ExceptionOr<Ref<Attr>> createAttributeNS(const AtomicString& namespaceURI, const String& qualifiedName, bool shouldIgnoreNamespaceChecks = false); >+ WEBCORE_EXPORT ExceptionOr<Ref<Attr>> createAttributeNS(const AtomString& namespaceURI, const String& qualifiedName, bool shouldIgnoreNamespaceChecks = false); > WEBCORE_EXPORT ExceptionOr<Ref<Node>> importNode(Node& nodeToImport, bool deep); >- WEBCORE_EXPORT ExceptionOr<Ref<Element>> createElementNS(const AtomicString& namespaceURI, const String& qualifiedName); >+ WEBCORE_EXPORT ExceptionOr<Ref<Element>> createElementNS(const AtomString& namespaceURI, const String& qualifiedName); > WEBCORE_EXPORT Ref<Element> createElement(const QualifiedName&, bool createdByParser); > >- static CustomElementNameValidationStatus validateCustomElementName(const AtomicString&); >+ static CustomElementNameValidationStatus validateCustomElementName(const AtomString&); > > WEBCORE_EXPORT RefPtr<Range> caretRangeFromPoint(int x, int y); > RefPtr<Range> caretRangeFromPoint(const LayoutPoint& clientPoint); >@@ -458,7 +458,7 @@ public: > WEBCORE_EXPORT String characterSetWithUTF8Fallback() const; > TextEncoding textEncoding() const; > >- AtomicString encoding() const { return textEncoding().domName(); } >+ AtomString encoding() const { return textEncoding().domName(); } > > WEBCORE_EXPORT void setCharset(const String&); // Used by ObjC / GOBject bindings only. > >@@ -505,10 +505,10 @@ public: > WEBCORE_EXPORT Ref<HTMLCollection> anchors(); > WEBCORE_EXPORT Ref<HTMLCollection> scripts(); > Ref<HTMLCollection> all(); >- Ref<HTMLCollection> allFilteredByName(const AtomicString&); >+ Ref<HTMLCollection> allFilteredByName(const AtomString&); > >- Ref<HTMLCollection> windowNamedItems(const AtomicString&); >- Ref<HTMLCollection> documentNamedItems(const AtomicString&); >+ Ref<HTMLCollection> windowNamedItems(const AtomString&); >+ Ref<HTMLCollection> documentNamedItems(const AtomString&); > > // Other methods (not part of DOM) > bool isSynthesized() const { return m_isSynthesized; } >@@ -638,7 +638,7 @@ public: > > WEBCORE_EXPORT DocumentLoader* loader() const; > >- WEBCORE_EXPORT ExceptionOr<RefPtr<WindowProxy>> openForBindings(DOMWindow& activeWindow, DOMWindow& firstDOMWindow, const String& url, const AtomicString& name, const String& features); >+ WEBCORE_EXPORT ExceptionOr<RefPtr<WindowProxy>> openForBindings(DOMWindow& activeWindow, DOMWindow& firstDOMWindow, const String& url, const AtomString& name, const String& features); > WEBCORE_EXPORT ExceptionOr<Document&> openForBindings(Document* responsibleDocument, const String&, const String&); > > // FIXME: We should rename this at some point and give back the name 'open' to the HTML specified ones. >@@ -823,9 +823,9 @@ public: > void setContextDocument(Document& document) { m_contextDocument = makeWeakPtr(document); } > > // Helper functions for forwarding DOMWindow event related tasks to the DOMWindow if it exists. >- void setWindowAttributeEventListener(const AtomicString& eventType, const QualifiedName& attributeName, const AtomicString& value, DOMWrapperWorld&); >- void setWindowAttributeEventListener(const AtomicString& eventType, RefPtr<EventListener>&&, DOMWrapperWorld&); >- EventListener* getWindowAttributeEventListener(const AtomicString& eventType, DOMWrapperWorld&); >+ void setWindowAttributeEventListener(const AtomString& eventType, const QualifiedName& attributeName, const AtomString& value, DOMWrapperWorld&); >+ void setWindowAttributeEventListener(const AtomString& eventType, RefPtr<EventListener>&&, DOMWrapperWorld&); >+ EventListener* getWindowAttributeEventListener(const AtomString& eventType, DOMWrapperWorld&); > WEBCORE_EXPORT void dispatchWindowEvent(Event&, EventTarget* = nullptr); > void dispatchWindowLoadEvent(); > >@@ -856,7 +856,7 @@ public: > > bool hasListenerType(ListenerType listenerType) const { return (m_listenerTypes & listenerType); } > bool hasListenerTypeForEventType(PlatformEvent::Type) const; >- void addListenerTypeIfNeeded(const AtomicString& eventType); >+ void addListenerTypeIfNeeded(const AtomString& eventType); > > bool hasMutationObserversOfType(MutationObserver::MutationType type) const > { >@@ -899,8 +899,8 @@ public: > const String& title() const { return m_title.string; } > WEBCORE_EXPORT void setTitle(const String&); > >- WEBCORE_EXPORT const AtomicString& dir() const; >- WEBCORE_EXPORT void setDir(const AtomicString&); >+ WEBCORE_EXPORT const AtomString& dir() const; >+ WEBCORE_EXPORT void setDir(const AtomString&); > > void titleElementAdded(Element& titleElement); > void titleElementRemoved(Element& titleElement); >@@ -962,8 +962,8 @@ public: > > // The following breaks a qualified name into a prefix and a local name. > // It also does a validity check, and returns an error if the qualified name is invalid. >- static ExceptionOr<std::pair<AtomicString, AtomicString>> parseQualifiedName(const String& qualifiedName); >- static ExceptionOr<QualifiedName> parseQualifiedName(const AtomicString& namespaceURI, const String& qualifiedName); >+ static ExceptionOr<std::pair<AtomString, AtomString>> parseQualifiedName(const String& qualifiedName); >+ static ExceptionOr<QualifiedName> parseQualifiedName(const AtomString& namespaceURI, const String& qualifiedName); > > // Checks to make sure prefix and namespace do not conflict (per DOM Core 3) > static bool hasValidNamespaceForElements(const QualifiedName&); >@@ -1297,7 +1297,7 @@ public: > void updateTextRenderer(Text&, unsigned offsetOfReplacedText, unsigned lengthOfReplacedText); > > // Return a Locale for the default locale if the argument is null or empty. >- Locale& getCachedLocale(const AtomicString& locale = nullAtom()); >+ Locale& getCachedLocale(const AtomString& locale = nullAtom()); > > const Document* templateDocument() const; > Document& ensureTemplateDocument(); >@@ -1413,7 +1413,7 @@ public: > #endif > > using ContainerNode::setAttributeEventListener; >- void setAttributeEventListener(const AtomicString& eventType, const QualifiedName& attributeName, const AtomicString& value, DOMWrapperWorld& isolatedWorld); >+ void setAttributeEventListener(const AtomString& eventType, const QualifiedName& attributeName, const AtomString& value, DOMWrapperWorld& isolatedWorld); > > DOMSelection* getSelection(); > >@@ -1429,15 +1429,15 @@ public: > void orientationChanged(int orientation); > OrientationNotifier& orientationNotifier() { return m_orientationNotifier; } > >- WEBCORE_EXPORT const AtomicString& bgColor() const; >+ WEBCORE_EXPORT const AtomString& bgColor() const; > WEBCORE_EXPORT void setBgColor(const String&); >- WEBCORE_EXPORT const AtomicString& fgColor() const; >+ WEBCORE_EXPORT const AtomString& fgColor() const; > WEBCORE_EXPORT void setFgColor(const String&); >- WEBCORE_EXPORT const AtomicString& alinkColor() const; >+ WEBCORE_EXPORT const AtomString& alinkColor() const; > WEBCORE_EXPORT void setAlinkColor(const String&); >- WEBCORE_EXPORT const AtomicString& linkColorForBindings() const; >+ WEBCORE_EXPORT const AtomString& linkColorForBindings() const; > WEBCORE_EXPORT void setLinkColorForBindings(const String&); >- WEBCORE_EXPORT const AtomicString& vlinkColor() const; >+ WEBCORE_EXPORT const AtomString& vlinkColor() const; > WEBCORE_EXPORT void setVlinkColor(const String&); > > // Per https://html.spec.whatwg.org/multipage/obsolete.html#dom-document-clear, this method does nothing. >@@ -1856,7 +1856,7 @@ private: > > std::unique_ptr<DocumentSharedObjectPool> m_sharedObjectPool; > >- typedef HashMap<AtomicString, std::unique_ptr<Locale>> LocaleIdentifierToLocaleMap; >+ typedef HashMap<AtomString, std::unique_ptr<Locale>> LocaleIdentifierToLocaleMap; > LocaleIdentifierToLocaleMap m_localeCache; > > RefPtr<Document> m_templateDocument; >diff --git a/Source/WebCore/dom/Document.idl b/Source/WebCore/dom/Document.idl >index 5649b6c3c70850a9ce4680ec18de5bfdb23271c0..f4675762d42b32f485aa086e65dd1602fe15e4b3 100644 >--- a/Source/WebCore/dom/Document.idl >+++ b/Source/WebCore/dom/Document.idl >@@ -100,7 +100,7 @@ typedef ( > readonly attribute HTMLCollection links; // Should be [SameObject]. > readonly attribute HTMLCollection forms; // Should be [SameObject]. > readonly attribute HTMLCollection scripts; // Should be [SameObject]. >- NodeList getElementsByName([AtomicString] DOMString elementName); >+ NodeList getElementsByName([AtomString] DOMString elementName); > readonly attribute HTMLScriptElement? currentScript; // FIXME: Should return a HTMLOrSVGScriptElement. > > // dynamic markup insertion >diff --git a/Source/WebCore/dom/DocumentFragment.cpp b/Source/WebCore/dom/DocumentFragment.cpp >index 29bcf4c6f1e44d53b70a0a71cda11923fd423840..8f21b27935037619eb103b94cc20c72cbb711a18 100644 >--- a/Source/WebCore/dom/DocumentFragment.cpp >+++ b/Source/WebCore/dom/DocumentFragment.cpp >@@ -93,7 +93,7 @@ bool DocumentFragment::parseXML(const String& source, Element* contextElement, P > return XMLDocumentParser::parseDocumentFragment(source, *this, contextElement, parserContentPolicy); > } > >-Element* DocumentFragment::getElementById(const AtomicString& id) const >+Element* DocumentFragment::getElementById(const AtomString& id) const > { > if (id.isNull()) > return nullptr; >diff --git a/Source/WebCore/dom/DocumentFragment.h b/Source/WebCore/dom/DocumentFragment.h >index d1c9322895a3a9d522b0ee2536798b7912361909..f9f9ba08c1a86f52f7e57dba80db3d1e842dd154 100644 >--- a/Source/WebCore/dom/DocumentFragment.h >+++ b/Source/WebCore/dom/DocumentFragment.h >@@ -40,7 +40,7 @@ public: > virtual bool isTemplateContent() const { return false; } > > // From the NonElementParentNode interface - https://dom.spec.whatwg.org/#interface-nonelementparentnode >- WEBCORE_EXPORT Element* getElementById(const AtomicString&) const; >+ WEBCORE_EXPORT Element* getElementById(const AtomString&) const; > > protected: > DocumentFragment(Document&, ConstructionType = CreateContainer); >diff --git a/Source/WebCore/dom/Element.cpp b/Source/WebCore/dom/Element.cpp >index b1090d93041457cd3a196e8931ca42a625c8ec50..f07c5ec61d275bc903a468d6a4de49847e67f317 100644 >--- a/Source/WebCore/dom/Element.cpp >+++ b/Source/WebCore/dom/Element.cpp >@@ -169,9 +169,9 @@ static Attr* findAttrNodeInList(Vector<RefPtr<Attr>>& attrNodeList, const Qualif > return nullptr; > } > >-static Attr* findAttrNodeInList(Vector<RefPtr<Attr>>& attrNodeList, const AtomicString& localName, bool shouldIgnoreAttributeCase) >+static Attr* findAttrNodeInList(Vector<RefPtr<Attr>>& attrNodeList, const AtomString& localName, bool shouldIgnoreAttributeCase) > { >- const AtomicString& caseAdjustedName = shouldIgnoreAttributeCase ? localName.convertToASCIILowercase() : localName; >+ const AtomString& caseAdjustedName = shouldIgnoreAttributeCase ? localName.convertToASCIILowercase() : localName; > for (auto& node : attrNodeList) { > if (node->qualifiedName().localName() == caseAdjustedName) > return node.get(); >@@ -297,7 +297,7 @@ static bool isCompatibilityMouseEvent(const MouseEvent& mouseEvent) > } > #endif > >-bool Element::dispatchMouseEvent(const PlatformMouseEvent& platformEvent, const AtomicString& eventType, int detail, Element* relatedTarget) >+bool Element::dispatchMouseEvent(const PlatformMouseEvent& platformEvent, const AtomString& eventType, int detail, Element* relatedTarget) > { > if (isDisabledFormControl()) > return false; >@@ -518,14 +518,14 @@ ALWAYS_INLINE void Element::synchronizeAttribute(const QualifiedName& name) cons > downcast<SVGElement>(const_cast<Element&>(*this)).synchronizeAttribute(name); > } > >-static ALWAYS_INLINE bool isStyleAttribute(const Element& element, const AtomicString& attributeLocalName) >+static ALWAYS_INLINE bool isStyleAttribute(const Element& element, const AtomString& attributeLocalName) > { > if (shouldIgnoreAttributeCase(element)) > return equalLettersIgnoringASCIICase(attributeLocalName, "style"); > return attributeLocalName == styleAttr->localName(); > } > >-ALWAYS_INLINE void Element::synchronizeAttribute(const AtomicString& localName) const >+ALWAYS_INLINE void Element::synchronizeAttribute(const AtomString& localName) const > { > // This version of synchronizeAttribute() is streamlined for the case where you don't have a full QualifiedName, > // e.g when called from DOM API. >@@ -541,7 +541,7 @@ ALWAYS_INLINE void Element::synchronizeAttribute(const AtomicString& localName) > downcast<SVGElement>(const_cast<Element&>(*this)).synchronizeAttribute(QualifiedName(nullAtom(), localName, nullAtom())); > } > >-const AtomicString& Element::getAttribute(const QualifiedName& name) const >+const AtomString& Element::getAttribute(const QualifiedName& name) const > { > if (!elementData()) > return nullAtom(); >@@ -1490,7 +1490,7 @@ IntRect Element::screenRect() const > return IntRect(); > } > >-const AtomicString& Element::getAttribute(const AtomicString& qualifiedName) const >+const AtomString& Element::getAttribute(const AtomString& qualifiedName) const > { > if (!elementData()) > return nullAtom(); >@@ -1500,13 +1500,13 @@ const AtomicString& Element::getAttribute(const AtomicString& qualifiedName) con > return nullAtom(); > } > >-const AtomicString& Element::getAttributeNS(const AtomicString& namespaceURI, const AtomicString& localName) const >+const AtomString& Element::getAttributeNS(const AtomString& namespaceURI, const AtomString& localName) const > { > return getAttribute(QualifiedName(nullAtom(), localName, namespaceURI)); > } > > // https://dom.spec.whatwg.org/#dom-element-toggleattribute >-ExceptionOr<bool> Element::toggleAttribute(const AtomicString& qualifiedName, Optional<bool> force) >+ExceptionOr<bool> Element::toggleAttribute(const AtomString& qualifiedName, Optional<bool> force) > { > if (!Document::isValidName(qualifiedName)) > return Exception { InvalidCharacterError }; >@@ -1530,7 +1530,7 @@ ExceptionOr<bool> Element::toggleAttribute(const AtomicString& qualifiedName, Op > return true; > } > >-ExceptionOr<void> Element::setAttribute(const AtomicString& qualifiedName, const AtomicString& value) >+ExceptionOr<void> Element::setAttribute(const AtomString& qualifiedName, const AtomString& value) > { > if (!Document::isValidName(qualifiedName)) > return Exception { InvalidCharacterError }; >@@ -1544,26 +1544,26 @@ ExceptionOr<void> Element::setAttribute(const AtomicString& qualifiedName, const > return { }; > } > >-void Element::setAttribute(const QualifiedName& name, const AtomicString& value) >+void Element::setAttribute(const QualifiedName& name, const AtomString& value) > { > synchronizeAttribute(name); > unsigned index = elementData() ? elementData()->findAttributeIndexByName(name) : ElementData::attributeNotFound; > setAttributeInternal(index, name, value, NotInSynchronizationOfLazyAttribute); > } > >-void Element::setAttributeWithoutSynchronization(const QualifiedName& name, const AtomicString& value) >+void Element::setAttributeWithoutSynchronization(const QualifiedName& name, const AtomString& value) > { > unsigned index = elementData() ? elementData()->findAttributeIndexByName(name) : ElementData::attributeNotFound; > setAttributeInternal(index, name, value, NotInSynchronizationOfLazyAttribute); > } > >-void Element::setSynchronizedLazyAttribute(const QualifiedName& name, const AtomicString& value) >+void Element::setSynchronizedLazyAttribute(const QualifiedName& name, const AtomString& value) > { > unsigned index = elementData() ? elementData()->findAttributeIndexByName(name) : ElementData::attributeNotFound; > setAttributeInternal(index, name, value, InSynchronizationOfLazyAttribute); > } > >-inline void Element::setAttributeInternal(unsigned index, const QualifiedName& name, const AtomicString& newValue, SynchronizationOfLazyAttribute inSynchronizationOfLazyAttribute) >+inline void Element::setAttributeInternal(unsigned index, const QualifiedName& name, const AtomString& newValue, SynchronizationOfLazyAttribute inSynchronizationOfLazyAttribute) > { > if (newValue.isNull()) { > if (index != ElementData::attributeNotFound) >@@ -1583,7 +1583,7 @@ inline void Element::setAttributeInternal(unsigned index, const QualifiedName& n > > const Attribute& attribute = attributeAt(index); > QualifiedName attributeName = attribute.name(); >- AtomicString oldValue = attribute.value(); >+ AtomString oldValue = attribute.value(); > > willModifyAttribute(attributeName, oldValue, newValue); > >@@ -1595,14 +1595,14 @@ inline void Element::setAttributeInternal(unsigned index, const QualifiedName& n > didModifyAttribute(attributeName, oldValue, newValue); > } > >-static inline AtomicString makeIdForStyleResolution(const AtomicString& value, bool inQuirksMode) >+static inline AtomString makeIdForStyleResolution(const AtomString& value, bool inQuirksMode) > { > if (inQuirksMode) > return value.convertToASCIILowercase(); > return value; > } > >-void Element::attributeChanged(const QualifiedName& name, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason) >+void Element::attributeChanged(const QualifiedName& name, const AtomString& oldValue, const AtomString& newValue, AttributeModificationReason) > { > bool valueIsSameAsBefore = oldValue == newValue; > >@@ -1612,8 +1612,8 @@ void Element::attributeChanged(const QualifiedName& name, const AtomicString& ol > else if (name == HTMLNames::classAttr) > classAttributeChanged(newValue); > else if (name == HTMLNames::idAttr) { >- AtomicString oldId = elementData()->idForStyleResolution(); >- AtomicString newId = makeIdForStyleResolution(newValue, document().inQuirksMode()); >+ AtomString oldId = elementData()->idForStyleResolution(); >+ AtomString newId = makeIdForStyleResolution(newValue, document().inQuirksMode()); > if (newId != oldId) { > Style::IdChangeInvalidation styleInvalidation(*this, oldId, newId); > elementData()->setIdForStyleResolution(newId); >@@ -1667,7 +1667,7 @@ static inline bool classStringHasClassName(const CharacterType* characters, unsi > return i < length; > } > >-static inline bool classStringHasClassName(const AtomicString& newClassString) >+static inline bool classStringHasClassName(const AtomString& newClassString) > { > unsigned length = newClassString.length(); > >@@ -1679,7 +1679,7 @@ static inline bool classStringHasClassName(const AtomicString& newClassString) > return classStringHasClassName(newClassString.characters16(), length); > } > >-void Element::classAttributeChanged(const AtomicString& newClassString) >+void Element::classAttributeChanged(const AtomString& newClassString) > { > // Note: We'll need ElementData, but it doesn't have to be UniqueElementData. > if (!elementData()) >@@ -1706,7 +1706,7 @@ URL Element::absoluteLinkURL() const > if (!isLink()) > return URL(); > >- AtomicString linkAttribute; >+ AtomString linkAttribute; > if (hasTagName(SVGNames::aTag)) > linkAttribute = getAttribute(SVGNames::hrefAttr, XLinkNames::hrefAttr); > else >@@ -1924,7 +1924,7 @@ String Element::nodeNamePreservingCase() const > return m_tagName.toString(); > } > >-ExceptionOr<void> Element::setPrefix(const AtomicString& prefix) >+ExceptionOr<void> Element::setPrefix(const AtomString& prefix) > { > auto result = checkSetPrefix(prefix); > if (result.hasException()) >@@ -1934,7 +1934,7 @@ ExceptionOr<void> Element::setPrefix(const AtomicString& prefix) > return { }; > } > >-const AtomicString& Element::imageSourceURL() const >+const AtomString& Element::imageSourceURL() const > { > return attributeWithoutSynchronization(srcAttr); > } >@@ -1972,7 +1972,7 @@ Node::InsertedIntoAncestorResult Element::insertedIntoAncestor(InsertionType ins > if (!insertionType.treeScopeChanged) > newScope = nullptr; > >- const AtomicString& idValue = getIdAttribute(); >+ const AtomString& idValue = getIdAttribute(); > if (!idValue.isNull()) { > if (newScope) > updateIdForTreeScope(*newScope, nullAtom(), idValue); >@@ -1980,7 +1980,7 @@ Node::InsertedIntoAncestorResult Element::insertedIntoAncestor(InsertionType ins > updateIdForDocument(*newDocument, nullAtom(), idValue, AlwaysUpdateHTMLDocumentNamedItemMaps); > } > >- const AtomicString& nameValue = getNameAttribute(); >+ const AtomString& nameValue = getNameAttribute(); > if (!nameValue.isNull()) { > if (newScope) > updateNameForTreeScope(*newScope, nullAtom(), nameValue); >@@ -2032,7 +2032,7 @@ void Element::removedFromAncestor(RemovalType removalType, ContainerNode& oldPar > if (!removalType.treeScopeChanged) > oldScope = nullptr; > >- const AtomicString& idValue = getIdAttribute(); >+ const AtomString& idValue = getIdAttribute(); > if (!idValue.isNull()) { > if (oldScope) > updateIdForTreeScope(*oldScope, idValue, nullAtom()); >@@ -2040,7 +2040,7 @@ void Element::removedFromAncestor(RemovalType removalType, ContainerNode& oldPar > updateIdForDocument(*oldHTMLDocument, idValue, nullAtom(), AlwaysUpdateHTMLDocumentNamedItemMaps); > } > >- const AtomicString& nameValue = getNameAttribute(); >+ const AtomString& nameValue = getNameAttribute(); > if (!nameValue.isNull()) { > if (oldScope) > updateNameForTreeScope(*oldScope, nameValue, nullAtom()); >@@ -2149,7 +2149,7 @@ void Element::removeShadowRoot() > > static bool canAttachAuthorShadowRoot(const Element& element) > { >- static NeverDestroyed<HashSet<AtomicString>> tagNames = [] { >+ static NeverDestroyed<HashSet<AtomString>> tagNames = [] { > static const HTMLQualifiedName* const tagList[] = { > &articleTag.get(), > &asideTag.get(), >@@ -2169,7 +2169,7 @@ static bool canAttachAuthorShadowRoot(const Element& element) > §ionTag.get(), > &spanTag.get() > }; >- HashSet<AtomicString> set; >+ HashSet<AtomString> set; > for (auto& name : tagList) > set.add(name->localName()); > return set; >@@ -2279,7 +2279,7 @@ CustomElementReactionQueue* Element::reactionQueue() const > return elementRareData()->customElementReactionQueue(); > } > >-const AtomicString& Element::shadowPseudoId() const >+const AtomString& Element::shadowPseudoId() const > { > return pseudo(); > } >@@ -2437,7 +2437,7 @@ void Element::childrenChanged(const ChildChange& change) > } > } > >-void Element::setAttributeEventListener(const AtomicString& eventType, const QualifiedName& attributeName, const AtomicString& attributeValue) >+void Element::setAttributeEventListener(const AtomString& eventType, const QualifiedName& attributeName, const AtomString& attributeValue) > { > setAttributeEventListener(eventType, JSLazyEventListener::create(*this, attributeName, attributeValue), mainThreadNormalWorld()); > } >@@ -2614,7 +2614,7 @@ ExceptionOr<Ref<Attr>> Element::removeAttributeNode(Attr& attr) > return oldAttrNode; > } > >-ExceptionOr<QualifiedName> Element::parseAttributeName(const AtomicString& namespaceURI, const AtomicString& qualifiedName) >+ExceptionOr<QualifiedName> Element::parseAttributeName(const AtomString& namespaceURI, const AtomString& qualifiedName) > { > auto parseResult = Document::parseQualifiedName(namespaceURI, qualifiedName); > if (parseResult.hasException()) >@@ -2625,7 +2625,7 @@ ExceptionOr<QualifiedName> Element::parseAttributeName(const AtomicString& names > return parsedAttributeName; > } > >-ExceptionOr<void> Element::setAttributeNS(const AtomicString& namespaceURI, const AtomicString& qualifiedName, const AtomicString& value) >+ExceptionOr<void> Element::setAttributeNS(const AtomString& namespaceURI, const AtomString& qualifiedName, const AtomString& value) > { > auto result = parseAttributeName(namespaceURI, qualifiedName); > if (result.hasException()) >@@ -2641,7 +2641,7 @@ void Element::removeAttributeInternal(unsigned index, SynchronizationOfLazyAttri > UniqueElementData& elementData = ensureUniqueElementData(); > > QualifiedName name = elementData.attributeAt(index).name(); >- AtomicString valueBeingRemoved = elementData.attributeAt(index).value(); >+ AtomString valueBeingRemoved = elementData.attributeAt(index).value(); > > if (RefPtr<Attr> attrNode = attrIfExists(name)) > detachAttrNodeFromElementWithValue(attrNode.get(), elementData.attributeAt(index).value()); >@@ -2661,7 +2661,7 @@ void Element::removeAttributeInternal(unsigned index, SynchronizationOfLazyAttri > didRemoveAttribute(name, valueBeingRemoved); > } > >-void Element::addAttributeInternal(const QualifiedName& name, const AtomicString& value, SynchronizationOfLazyAttribute inSynchronizationOfLazyAttribute) >+void Element::addAttributeInternal(const QualifiedName& name, const AtomString& value, SynchronizationOfLazyAttribute inSynchronizationOfLazyAttribute) > { > if (inSynchronizationOfLazyAttribute) { > ensureUniqueElementData().addAttribute(name, value); >@@ -2676,12 +2676,12 @@ void Element::addAttributeInternal(const QualifiedName& name, const AtomicString > didAddAttribute(name, value); > } > >-bool Element::removeAttribute(const AtomicString& qualifiedName) >+bool Element::removeAttribute(const AtomString& qualifiedName) > { > if (!elementData()) > return false; > >- AtomicString caseAdjustedQualifiedName = shouldIgnoreAttributeCase(*this) ? qualifiedName.convertToASCIILowercase() : qualifiedName; >+ AtomString caseAdjustedQualifiedName = shouldIgnoreAttributeCase(*this) ? qualifiedName.convertToASCIILowercase() : qualifiedName; > unsigned index = elementData()->findAttributeIndexByName(caseAdjustedQualifiedName, false); > if (index == ElementData::attributeNotFound) { > if (UNLIKELY(caseAdjustedQualifiedName == styleAttr) && elementData()->styleAttributeIsDirty() && is<StyledElement>(*this)) >@@ -2693,12 +2693,12 @@ bool Element::removeAttribute(const AtomicString& qualifiedName) > return true; > } > >-bool Element::removeAttributeNS(const AtomicString& namespaceURI, const AtomicString& localName) >+bool Element::removeAttributeNS(const AtomString& namespaceURI, const AtomString& localName) > { > return removeAttribute(QualifiedName(nullAtom(), localName, namespaceURI)); > } > >-RefPtr<Attr> Element::getAttributeNode(const AtomicString& qualifiedName) >+RefPtr<Attr> Element::getAttributeNode(const AtomString& qualifiedName) > { > if (!elementData()) > return nullptr; >@@ -2709,7 +2709,7 @@ RefPtr<Attr> Element::getAttributeNode(const AtomicString& qualifiedName) > return ensureAttr(attribute->name()); > } > >-RefPtr<Attr> Element::getAttributeNodeNS(const AtomicString& namespaceURI, const AtomicString& localName) >+RefPtr<Attr> Element::getAttributeNodeNS(const AtomString& namespaceURI, const AtomString& localName) > { > if (!elementData()) > return 0; >@@ -2721,7 +2721,7 @@ RefPtr<Attr> Element::getAttributeNodeNS(const AtomicString& namespaceURI, const > return ensureAttr(attribute->name()); > } > >-bool Element::hasAttribute(const AtomicString& qualifiedName) const >+bool Element::hasAttribute(const AtomString& qualifiedName) const > { > if (!elementData()) > return false; >@@ -2729,7 +2729,7 @@ bool Element::hasAttribute(const AtomicString& qualifiedName) const > return elementData()->findAttributeByName(qualifiedName, shouldIgnoreAttributeCase(*this)); > } > >-bool Element::hasAttributeNS(const AtomicString& namespaceURI, const AtomicString& localName) const >+bool Element::hasAttributeNS(const AtomString& namespaceURI, const AtomString& localName) const > { > if (!elementData()) > return false; >@@ -2830,14 +2830,14 @@ void Element::blur() > } > } > >-void Element::dispatchFocusInEvent(const AtomicString& eventType, RefPtr<Element>&& oldFocusedElement) >+void Element::dispatchFocusInEvent(const AtomString& eventType, RefPtr<Element>&& oldFocusedElement) > { > ASSERT_WITH_SECURITY_IMPLICATION(ScriptDisallowedScope::InMainThread::isScriptAllowed()); > ASSERT(eventType == eventNames().focusinEvent || eventType == eventNames().DOMFocusInEvent); > dispatchScopedEvent(FocusEvent::create(eventType, Event::CanBubble::Yes, Event::IsCancelable::No, document().windowProxy(), 0, WTFMove(oldFocusedElement))); > } > >-void Element::dispatchFocusOutEvent(const AtomicString& eventType, RefPtr<Element>&& newFocusedElement) >+void Element::dispatchFocusOutEvent(const AtomString& eventType, RefPtr<Element>&& newFocusedElement) > { > ASSERT_WITH_SECURITY_IMPLICATION(ScriptDisallowedScope::InMainThread::isScriptAllowed()); > ASSERT(eventType == eventNames().focusoutEvent || eventType == eventNames().DOMFocusOutEvent); >@@ -2980,12 +2980,12 @@ String Element::title() const > return String(); > } > >-const AtomicString& Element::pseudo() const >+const AtomString& Element::pseudo() const > { > return attributeWithoutSynchronization(pseudoAttr); > } > >-void Element::setPseudo(const AtomicString& value) >+void Element::setPseudo(const AtomString& value) > { > setAttributeWithoutSynchronization(pseudoAttr, value); > } >@@ -3253,7 +3253,7 @@ unsigned Element::rareDataChildIndex() const > return elementRareData()->childIndex(); > } > >-AtomicString Element::computeInheritedLanguage() const >+AtomString Element::computeInheritedLanguage() const > { > if (const ElementData* elementData = this->elementData()) { > if (const Attribute* attribute = elementData->findLanguageAttribute()) >@@ -3443,7 +3443,7 @@ int Element::getIntegralAttribute(const QualifiedName& attributeName) const > > void Element::setIntegralAttribute(const QualifiedName& attributeName, int value) > { >- setAttribute(attributeName, AtomicString::number(value)); >+ setAttribute(attributeName, AtomString::number(value)); > } > > unsigned Element::getUnsignedIntegralAttribute(const QualifiedName& attributeName) const >@@ -3453,7 +3453,7 @@ unsigned Element::getUnsignedIntegralAttribute(const QualifiedName& attributeNam > > void Element::setUnsignedIntegralAttribute(const QualifiedName& attributeName, unsigned value) > { >- setAttribute(attributeName, AtomicString::number(limitToOnlyHTMLNonNegative(value))); >+ setAttribute(attributeName, AtomString::number(limitToOnlyHTMLNonNegative(value))); > } > > bool Element::childShouldCreateRenderer(const Node& child) const >@@ -3589,7 +3589,7 @@ ResizeObserverData* Element::resizeObserverData() > > SpellcheckAttributeState Element::spellcheckAttributeState() const > { >- const AtomicString& value = attributeWithoutSynchronization(HTMLNames::spellcheckAttr); >+ const AtomString& value = attributeWithoutSynchronization(HTMLNames::spellcheckAttr); > if (value.isNull()) > return SpellcheckAttributeDefault; > if (value.isEmpty() || equalLettersIgnoringASCIICase(value, "true")) >@@ -3635,7 +3635,7 @@ bool Element::hasNamedNodeMap() const > } > #endif > >-inline void Element::updateName(const AtomicString& oldName, const AtomicString& newName) >+inline void Element::updateName(const AtomString& oldName, const AtomString& newName) > { > if (!isInTreeScope()) > return; >@@ -3652,7 +3652,7 @@ inline void Element::updateName(const AtomicString& oldName, const AtomicString& > updateNameForDocument(downcast<HTMLDocument>(document()), oldName, newName); > } > >-void Element::updateNameForTreeScope(TreeScope& scope, const AtomicString& oldName, const AtomicString& newName) >+void Element::updateNameForTreeScope(TreeScope& scope, const AtomString& oldName, const AtomString& newName) > { > ASSERT(oldName != newName); > >@@ -3662,7 +3662,7 @@ void Element::updateNameForTreeScope(TreeScope& scope, const AtomicString& oldNa > scope.addElementByName(*newName.impl(), *this); > } > >-void Element::updateNameForDocument(HTMLDocument& document, const AtomicString& oldName, const AtomicString& newName) >+void Element::updateNameForDocument(HTMLDocument& document, const AtomString& oldName, const AtomString& newName) > { > ASSERT(oldName != newName); > >@@ -3670,7 +3670,7 @@ void Element::updateNameForDocument(HTMLDocument& document, const AtomicString& > return; > > if (WindowNameCollection::elementMatchesIfNameAttributeMatch(*this)) { >- const AtomicString& id = WindowNameCollection::elementMatchesIfIdAttributeMatch(*this) ? getIdAttribute() : nullAtom(); >+ const AtomString& id = WindowNameCollection::elementMatchesIfIdAttributeMatch(*this) ? getIdAttribute() : nullAtom(); > if (!oldName.isEmpty() && oldName != id) > document.removeWindowNamedItem(*oldName.impl(), *this); > if (!newName.isEmpty() && newName != id) >@@ -3678,7 +3678,7 @@ void Element::updateNameForDocument(HTMLDocument& document, const AtomicString& > } > > if (DocumentNameCollection::elementMatchesIfNameAttributeMatch(*this)) { >- const AtomicString& id = DocumentNameCollection::elementMatchesIfIdAttributeMatch(*this) ? getIdAttribute() : nullAtom(); >+ const AtomString& id = DocumentNameCollection::elementMatchesIfIdAttributeMatch(*this) ? getIdAttribute() : nullAtom(); > if (!oldName.isEmpty() && oldName != id) > document.removeDocumentNamedItem(*oldName.impl(), *this); > if (!newName.isEmpty() && newName != id) >@@ -3686,7 +3686,7 @@ void Element::updateNameForDocument(HTMLDocument& document, const AtomicString& > } > } > >-inline void Element::updateId(const AtomicString& oldId, const AtomicString& newId, NotifyObservers notifyObservers) >+inline void Element::updateId(const AtomString& oldId, const AtomString& newId, NotifyObservers notifyObservers) > { > if (!isInTreeScope()) > return; >@@ -3703,7 +3703,7 @@ inline void Element::updateId(const AtomicString& oldId, const AtomicString& new > updateIdForDocument(downcast<HTMLDocument>(document()), oldId, newId, UpdateHTMLDocumentNamedItemMapsOnlyIfDiffersFromNameAttribute); > } > >-void Element::updateIdForTreeScope(TreeScope& scope, const AtomicString& oldId, const AtomicString& newId, NotifyObservers notifyObservers) >+void Element::updateIdForTreeScope(TreeScope& scope, const AtomString& oldId, const AtomString& newId, NotifyObservers notifyObservers) > { > ASSERT(isInTreeScope()); > ASSERT(oldId != newId); >@@ -3714,7 +3714,7 @@ void Element::updateIdForTreeScope(TreeScope& scope, const AtomicString& oldId, > scope.addElementById(*newId.impl(), *this, notifyObservers == NotifyObservers::Yes); > } > >-void Element::updateIdForDocument(HTMLDocument& document, const AtomicString& oldId, const AtomicString& newId, HTMLDocumentNamedItemMapsUpdatingCondition condition) >+void Element::updateIdForDocument(HTMLDocument& document, const AtomString& oldId, const AtomString& newId, HTMLDocumentNamedItemMapsUpdatingCondition condition) > { > ASSERT(isConnected()); > ASSERT(oldId != newId); >@@ -3723,7 +3723,7 @@ void Element::updateIdForDocument(HTMLDocument& document, const AtomicString& ol > return; > > if (WindowNameCollection::elementMatchesIfIdAttributeMatch(*this)) { >- const AtomicString& name = condition == UpdateHTMLDocumentNamedItemMapsOnlyIfDiffersFromNameAttribute && WindowNameCollection::elementMatchesIfNameAttributeMatch(*this) ? getNameAttribute() : nullAtom(); >+ const AtomString& name = condition == UpdateHTMLDocumentNamedItemMapsOnlyIfDiffersFromNameAttribute && WindowNameCollection::elementMatchesIfNameAttributeMatch(*this) ? getNameAttribute() : nullAtom(); > if (!oldId.isEmpty() && oldId != name) > document.removeWindowNamedItem(*oldId.impl(), *this); > if (!newId.isEmpty() && newId != name) >@@ -3731,7 +3731,7 @@ void Element::updateIdForDocument(HTMLDocument& document, const AtomicString& ol > } > > if (DocumentNameCollection::elementMatchesIfIdAttributeMatch(*this)) { >- const AtomicString& name = condition == UpdateHTMLDocumentNamedItemMapsOnlyIfDiffersFromNameAttribute && DocumentNameCollection::elementMatchesIfNameAttributeMatch(*this) ? getNameAttribute() : nullAtom(); >+ const AtomString& name = condition == UpdateHTMLDocumentNamedItemMapsOnlyIfDiffersFromNameAttribute && DocumentNameCollection::elementMatchesIfNameAttributeMatch(*this) ? getNameAttribute() : nullAtom(); > if (!oldId.isEmpty() && oldId != name) > document.removeDocumentNamedItem(*oldId.impl(), *this); > if (!newId.isEmpty() && newId != name) >@@ -3739,7 +3739,7 @@ void Element::updateIdForDocument(HTMLDocument& document, const AtomicString& ol > } > } > >-void Element::updateLabel(TreeScope& scope, const AtomicString& oldForAttributeValue, const AtomicString& newForAttributeValue) >+void Element::updateLabel(TreeScope& scope, const AtomString& oldForAttributeValue, const AtomString& newForAttributeValue) > { > ASSERT(hasTagName(labelTag)); > >@@ -3755,7 +3755,7 @@ void Element::updateLabel(TreeScope& scope, const AtomicString& oldForAttributeV > scope.addLabel(*newForAttributeValue.impl(), downcast<HTMLLabelElement>(*this)); > } > >-void Element::willModifyAttribute(const QualifiedName& name, const AtomicString& oldValue, const AtomicString& newValue) >+void Element::willModifyAttribute(const QualifiedName& name, const AtomString& oldValue, const AtomString& newValue) > { > if (name == HTMLNames::idAttr) > updateId(oldValue, newValue, NotifyObservers::No); // Will notify observers after the attribute is actually changed. >@@ -3772,21 +3772,21 @@ void Element::willModifyAttribute(const QualifiedName& name, const AtomicString& > InspectorInstrumentation::willModifyDOMAttr(document(), *this, oldValue, newValue); > } > >-void Element::didAddAttribute(const QualifiedName& name, const AtomicString& value) >+void Element::didAddAttribute(const QualifiedName& name, const AtomString& value) > { > attributeChanged(name, nullAtom(), value); > InspectorInstrumentation::didModifyDOMAttr(document(), *this, name.localName(), value); > dispatchSubtreeModifiedEvent(); > } > >-void Element::didModifyAttribute(const QualifiedName& name, const AtomicString& oldValue, const AtomicString& newValue) >+void Element::didModifyAttribute(const QualifiedName& name, const AtomString& oldValue, const AtomString& newValue) > { > attributeChanged(name, oldValue, newValue); > InspectorInstrumentation::didModifyDOMAttr(document(), *this, name.localName(), newValue); > // Do not dispatch a DOMSubtreeModified event here; see bug 81141. > } > >-void Element::didRemoveAttribute(const QualifiedName& name, const AtomicString& oldValue) >+void Element::didRemoveAttribute(const QualifiedName& name, const AtomString& oldValue) > { > attributeChanged(name, oldValue, nullAtom()); > InspectorInstrumentation::didRemoveDOMAttr(document(), *this, name.localName()); >@@ -3805,7 +3805,7 @@ void Element::setSavedLayerScrollPosition(const IntPoint& position) > ensureElementRareData().setSavedLayerScrollPosition(position); > } > >-RefPtr<Attr> Element::attrIfExists(const AtomicString& localName, bool shouldIgnoreAttributeCase) >+RefPtr<Attr> Element::attrIfExists(const AtomString& localName, bool shouldIgnoreAttributeCase) > { > if (auto* attrNodeList = attrNodeListForElement(*this)) > return findAttrNodeInList(*attrNodeList, localName, shouldIgnoreAttributeCase); >@@ -3831,7 +3831,7 @@ Ref<Attr> Element::ensureAttr(const QualifiedName& name) > return attrNode.releaseNonNull(); > } > >-void Element::detachAttrNodeFromElementWithValue(Attr* attrNode, const AtomicString& value) >+void Element::detachAttrNodeFromElementWithValue(Attr* attrNode, const AtomString& value) > { > ASSERT(hasSyntheticAttrChildNodes()); > attrNode->detachFromElementWithValue(value); >@@ -3949,14 +3949,14 @@ void Element::cloneAttributesFromElement(const Element& other) > // Fortunately, those named item maps are only updated when this element is in the document, which should never be the case. > ASSERT(!isConnected()); > >- const AtomicString& oldID = getIdAttribute(); >- const AtomicString& newID = other.getIdAttribute(); >+ const AtomString& oldID = getIdAttribute(); >+ const AtomString& newID = other.getIdAttribute(); > > if (!oldID.isNull() || !newID.isNull()) > updateId(oldID, newID, NotifyObservers::No); // Will notify observers after the attribute is actually changed. > >- const AtomicString& oldName = getNameAttribute(); >- const AtomicString& newName = other.getNameAttribute(); >+ const AtomString& oldName = getNameAttribute(); >+ const AtomString& newName = other.getNameAttribute(); > > if (!oldName.isNull() || !newName.isNull()) > updateName(oldName, newName); >@@ -4158,7 +4158,7 @@ Element* Element::findAnchorElementForLink(String& outAnchorName) > if (!isLink()) > return nullptr; > >- const AtomicString& href = attributeWithoutSynchronization(HTMLNames::hrefAttr); >+ const AtomString& href = attributeWithoutSynchronization(HTMLNames::hrefAttr); > if (href.isNull()) > return nullptr; > >diff --git a/Source/WebCore/dom/Element.h b/Source/WebCore/dom/Element.h >index 784e3cdb5ab673f0667effe0198c1b4c50adc505..4475d758a580e61a7ffb6e9596a81089a73b7cb6 100644 >--- a/Source/WebCore/dom/Element.h >+++ b/Source/WebCore/dom/Element.h >@@ -84,12 +84,12 @@ public: > virtual ~Element(); > > WEBCORE_EXPORT bool hasAttribute(const QualifiedName&) const; >- WEBCORE_EXPORT const AtomicString& getAttribute(const QualifiedName&) const; >+ WEBCORE_EXPORT const AtomString& getAttribute(const QualifiedName&) const; > template<typename... QualifiedNames> >- const AtomicString& getAttribute(const QualifiedName&, const QualifiedNames&...) const; >- WEBCORE_EXPORT void setAttribute(const QualifiedName&, const AtomicString& value); >- WEBCORE_EXPORT void setAttributeWithoutSynchronization(const QualifiedName&, const AtomicString& value); >- void setSynchronizedLazyAttribute(const QualifiedName&, const AtomicString& value); >+ const AtomString& getAttribute(const QualifiedName&, const QualifiedNames&...) const; >+ WEBCORE_EXPORT void setAttribute(const QualifiedName&, const AtomString& value); >+ WEBCORE_EXPORT void setAttributeWithoutSynchronization(const QualifiedName&, const AtomString& value); >+ void setSynchronizedLazyAttribute(const QualifiedName&, const AtomString& value); > bool removeAttribute(const QualifiedName&); > Vector<String> getAttributeNames() const; > >@@ -102,7 +102,7 @@ public: > // Call this to get the value of an attribute that is known not to be the style > // attribute or one of the SVG animatable attributes. > bool hasAttributeWithoutSynchronization(const QualifiedName&) const; >- const AtomicString& attributeWithoutSynchronization(const QualifiedName&) const; >+ const AtomString& attributeWithoutSynchronization(const QualifiedName&) const; > #ifndef NDEBUG > WEBCORE_EXPORT bool fastAttributeLookupAllowed(const QualifiedName&) const; > #endif >@@ -115,27 +115,27 @@ public: > // in style attribute or one of the SVG animation attributes. > bool hasAttributesWithoutUpdate() const; > >- WEBCORE_EXPORT bool hasAttribute(const AtomicString& qualifiedName) const; >- WEBCORE_EXPORT bool hasAttributeNS(const AtomicString& namespaceURI, const AtomicString& localName) const; >+ WEBCORE_EXPORT bool hasAttribute(const AtomString& qualifiedName) const; >+ WEBCORE_EXPORT bool hasAttributeNS(const AtomString& namespaceURI, const AtomString& localName) const; > >- WEBCORE_EXPORT const AtomicString& getAttribute(const AtomicString& qualifiedName) const; >- WEBCORE_EXPORT const AtomicString& getAttributeNS(const AtomicString& namespaceURI, const AtomicString& localName) const; >+ WEBCORE_EXPORT const AtomString& getAttribute(const AtomString& qualifiedName) const; >+ WEBCORE_EXPORT const AtomString& getAttributeNS(const AtomString& namespaceURI, const AtomString& localName) const; > >- WEBCORE_EXPORT ExceptionOr<void> setAttribute(const AtomicString& qualifiedName, const AtomicString& value); >- static ExceptionOr<QualifiedName> parseAttributeName(const AtomicString& namespaceURI, const AtomicString& qualifiedName); >- WEBCORE_EXPORT ExceptionOr<void> setAttributeNS(const AtomicString& namespaceURI, const AtomicString& qualifiedName, const AtomicString& value); >+ WEBCORE_EXPORT ExceptionOr<void> setAttribute(const AtomString& qualifiedName, const AtomString& value); >+ static ExceptionOr<QualifiedName> parseAttributeName(const AtomString& namespaceURI, const AtomString& qualifiedName); >+ WEBCORE_EXPORT ExceptionOr<void> setAttributeNS(const AtomString& namespaceURI, const AtomString& qualifiedName, const AtomString& value); > >- ExceptionOr<bool> toggleAttribute(const AtomicString& qualifiedName, Optional<bool> force); >+ ExceptionOr<bool> toggleAttribute(const AtomString& qualifiedName, Optional<bool> force); > >- const AtomicString& getIdAttribute() const; >- void setIdAttribute(const AtomicString&); >+ const AtomString& getIdAttribute() const; >+ void setIdAttribute(const AtomString&); > >- const AtomicString& getNameAttribute() const; >+ const AtomString& getNameAttribute() const; > > // Call this to get the value of the id attribute for style resolution purposes. > // The value will already be lowercased if the document is in compatibility mode, > // so this function is not suitable for non-style uses. >- const AtomicString& idForStyleResolution() const; >+ const AtomString& idForStyleResolution() const; > > // Internal methods that assume the existence of attribute storage, one should use hasAttributes() > // before calling them. >@@ -144,7 +144,7 @@ public: > const Attribute& attributeAt(unsigned index) const; > const Attribute* findAttributeByName(const QualifiedName&) const; > unsigned findAttributeIndexByName(const QualifiedName& name) const { return elementData()->findAttributeIndexByName(name); } >- unsigned findAttributeIndexByName(const AtomicString& name, bool shouldIgnoreAttributeCase) const { return elementData()->findAttributeIndexByName(name, shouldIgnoreAttributeCase); } >+ unsigned findAttributeIndexByName(const AtomString& name, bool shouldIgnoreAttributeCase) const { return elementData()->findAttributeIndexByName(name, shouldIgnoreAttributeCase); } > > WEBCORE_EXPORT void scrollIntoView(Optional<Variant<bool, ScrollIntoViewOptions>>&& arg); > WEBCORE_EXPORT void scrollIntoView(bool alignToTop = true); >@@ -201,19 +201,19 @@ public: > // Returns the absolute bounding box translated into screen coordinates. > WEBCORE_EXPORT IntRect screenRect() const; > >- WEBCORE_EXPORT bool removeAttribute(const AtomicString& qualifiedName); >- WEBCORE_EXPORT bool removeAttributeNS(const AtomicString& namespaceURI, const AtomicString& localName); >+ WEBCORE_EXPORT bool removeAttribute(const AtomString& qualifiedName); >+ WEBCORE_EXPORT bool removeAttributeNS(const AtomString& namespaceURI, const AtomString& localName); > > Ref<Attr> detachAttribute(unsigned index); > >- WEBCORE_EXPORT RefPtr<Attr> getAttributeNode(const AtomicString& qualifiedName); >- WEBCORE_EXPORT RefPtr<Attr> getAttributeNodeNS(const AtomicString& namespaceURI, const AtomicString& localName); >+ WEBCORE_EXPORT RefPtr<Attr> getAttributeNode(const AtomString& qualifiedName); >+ WEBCORE_EXPORT RefPtr<Attr> getAttributeNodeNS(const AtomString& namespaceURI, const AtomString& localName); > WEBCORE_EXPORT ExceptionOr<RefPtr<Attr>> setAttributeNode(Attr&); > WEBCORE_EXPORT ExceptionOr<RefPtr<Attr>> setAttributeNodeNS(Attr&); > WEBCORE_EXPORT ExceptionOr<Ref<Attr>> removeAttributeNode(Attr&); > > RefPtr<Attr> attrIfExists(const QualifiedName&); >- RefPtr<Attr> attrIfExists(const AtomicString& localName, bool shouldIgnoreAttributeCase); >+ RefPtr<Attr> attrIfExists(const AtomString& localName, bool shouldIgnoreAttributeCase); > Ref<Attr> ensureAttr(const QualifiedName&); > > const Vector<RefPtr<Attr>>& attrNodeList(); >@@ -229,13 +229,13 @@ public: > bool hasTagName(const SVGQualifiedName& tagName) const { return ContainerNode::hasTagName(tagName); } > > // A fast function for checking the local name against another atomic string. >- bool hasLocalName(const AtomicString& other) const { return m_tagName.localName() == other; } >+ bool hasLocalName(const AtomString& other) const { return m_tagName.localName() == other; } > >- const AtomicString& localName() const final { return m_tagName.localName(); } >- const AtomicString& prefix() const final { return m_tagName.prefix(); } >- const AtomicString& namespaceURI() const final { return m_tagName.namespaceURI(); } >+ const AtomString& localName() const final { return m_tagName.localName(); } >+ const AtomString& prefix() const final { return m_tagName.prefix(); } >+ const AtomString& namespaceURI() const final { return m_tagName.namespaceURI(); } > >- ExceptionOr<void> setPrefix(const AtomicString&) final; >+ ExceptionOr<void> setPrefix(const AtomString&) final; > > String nodeName() const override; > >@@ -256,8 +256,8 @@ public: > }; > > // This method is called whenever an attribute is added, changed or removed. >- virtual void attributeChanged(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason = ModifiedDirectly); >- virtual void parseAttribute(const QualifiedName&, const AtomicString&) { } >+ virtual void attributeChanged(const QualifiedName&, const AtomString& oldValue, const AtomString& newValue, AttributeModificationReason = ModifiedDirectly); >+ virtual void parseAttribute(const QualifiedName&, const AtomString&) { } > > // Only called by the parser immediately after element construction. > void parserSetAttributes(const Vector<Attribute>&); >@@ -307,7 +307,7 @@ public: > CustomElementReactionQueue* reactionQueue() const; > > // FIXME: this should not be virtual, do not override this. >- virtual const AtomicString& shadowPseudoId() const; >+ virtual const AtomString& shadowPseudoId() const; > > bool isInActiveChain() const { return isUserActionElement() && isUserActionElementInActiveChain(); } > bool active() const { return isUserActionElement() && isUserActionElementActive(); } >@@ -378,7 +378,7 @@ public: > void setStyleIsAffectedByPreviousSibling() { setFlag(StyleIsAffectedByPreviousSibling); } > void setChildIndex(unsigned); > >- WEBCORE_EXPORT AtomicString computeInheritedLanguage() const; >+ WEBCORE_EXPORT AtomString computeInheritedLanguage() const; > Locale& locale() const; > > virtual void accessKeyAction(bool /*sendToAnyEvent*/) { } >@@ -391,7 +391,7 @@ public: > WEBCORE_EXPORT URL getURLAttribute(const QualifiedName&) const; > URL getNonEmptyURLAttribute(const QualifiedName&) const; > >- virtual const AtomicString& imageSourceURL() const; >+ virtual const AtomString& imageSourceURL() const; > virtual String target() const { return String(); } > > static AXTextStateChangeIntent defaultFocusTextStateChangeIntent() { return AXTextStateChangeIntent(AXTextStateChangeTypeSelectionMove, AXTextSelection { AXTextSelectionDirectionDiscontiguous, AXTextSelectionGranularityUnknown, true }); } >@@ -409,8 +409,8 @@ public: > > virtual String title() const; > >- const AtomicString& pseudo() const; >- WEBCORE_EXPORT void setPseudo(const AtomicString&); >+ const AtomString& pseudo() const; >+ WEBCORE_EXPORT void setPseudo(const AtomString&); > > LayoutSize minimumSizeForResizing() const; > void setMinimumSizeForResizing(const LayoutSize&); >@@ -516,12 +516,12 @@ public: > IntPoint savedLayerScrollPosition() const; > void setSavedLayerScrollPosition(const IntPoint&); > >- bool dispatchMouseEvent(const PlatformMouseEvent&, const AtomicString& eventType, int clickCount = 0, Element* relatedTarget = nullptr); >+ bool dispatchMouseEvent(const PlatformMouseEvent&, const AtomString& eventType, int clickCount = 0, Element* relatedTarget = nullptr); > bool dispatchWheelEvent(const PlatformWheelEvent&); > bool dispatchKeyEvent(const PlatformKeyboardEvent&); > void dispatchSimulatedClick(Event* underlyingEvent, SimulatedClickMouseEventOptions = SendNoEvents, SimulatedClickVisualOptions = ShowPressedLook); >- void dispatchFocusInEvent(const AtomicString& eventType, RefPtr<Element>&& oldFocusedElement); >- void dispatchFocusOutEvent(const AtomicString& eventType, RefPtr<Element>&& newFocusedElement); >+ void dispatchFocusInEvent(const AtomString& eventType, RefPtr<Element>&& oldFocusedElement); >+ void dispatchFocusOutEvent(const AtomString& eventType, RefPtr<Element>&& newFocusedElement); > virtual void dispatchFocusEvent(RefPtr<Element>&& oldFocusedElement, FocusDirection); > virtual void dispatchBlurEvent(RefPtr<Element>&& newFocusedElement); > void dispatchWebKitImageReadyEventForTesting(); >@@ -586,7 +586,7 @@ public: > void storeDisplayContentsStyle(std::unique_ptr<RenderStyle>); > > using ContainerNode::setAttributeEventListener; >- void setAttributeEventListener(const AtomicString& eventType, const QualifiedName& attributeName, const AtomicString& value); >+ void setAttributeEventListener(const AtomString& eventType, const QualifiedName& attributeName, const AtomString& value); > > #if ENABLE(INTERSECTION_OBSERVER) > IntersectionObserverData& ensureIntersectionObserverData(); >@@ -627,7 +627,7 @@ protected: > // classAttributeChanged() exists to share code between > // parseAttribute (called via setAttribute()) and > // svgAttributeChanged (called when element.className.baseValue is set) >- void classAttributeChanged(const AtomicString& newClassString); >+ void classAttributeChanged(const AtomString& newClassString); > > void addShadowRoot(Ref<ShadowRoot>&&); > >@@ -650,25 +650,25 @@ private: > > virtual void didAddUserAgentShadowRoot(ShadowRoot&) { } > >- void didAddAttribute(const QualifiedName&, const AtomicString&); >- void willModifyAttribute(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue); >- void didModifyAttribute(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue); >- void didRemoveAttribute(const QualifiedName&, const AtomicString& oldValue); >+ void didAddAttribute(const QualifiedName&, const AtomString&); >+ void willModifyAttribute(const QualifiedName&, const AtomString& oldValue, const AtomString& newValue); >+ void didModifyAttribute(const QualifiedName&, const AtomString& oldValue, const AtomString& newValue); >+ void didRemoveAttribute(const QualifiedName&, const AtomString& oldValue); > > void synchronizeAttribute(const QualifiedName&) const; >- void synchronizeAttribute(const AtomicString& localName) const; >+ void synchronizeAttribute(const AtomString& localName) const; > >- void updateName(const AtomicString& oldName, const AtomicString& newName); >- void updateNameForTreeScope(TreeScope&, const AtomicString& oldName, const AtomicString& newName); >- void updateNameForDocument(HTMLDocument&, const AtomicString& oldName, const AtomicString& newName); >+ void updateName(const AtomString& oldName, const AtomString& newName); >+ void updateNameForTreeScope(TreeScope&, const AtomString& oldName, const AtomString& newName); >+ void updateNameForDocument(HTMLDocument&, const AtomString& oldName, const AtomString& newName); > > enum class NotifyObservers { No, Yes }; >- void updateId(const AtomicString& oldId, const AtomicString& newId, NotifyObservers = NotifyObservers::Yes); >- void updateIdForTreeScope(TreeScope&, const AtomicString& oldId, const AtomicString& newId, NotifyObservers = NotifyObservers::Yes); >+ void updateId(const AtomString& oldId, const AtomString& newId, NotifyObservers = NotifyObservers::Yes); >+ void updateIdForTreeScope(TreeScope&, const AtomString& oldId, const AtomString& newId, NotifyObservers = NotifyObservers::Yes); > > enum HTMLDocumentNamedItemMapsUpdatingCondition { AlwaysUpdateHTMLDocumentNamedItemMaps, UpdateHTMLDocumentNamedItemMapsOnlyIfDiffersFromNameAttribute }; >- void updateIdForDocument(HTMLDocument&, const AtomicString& oldId, const AtomicString& newId, HTMLDocumentNamedItemMapsUpdatingCondition); >- void updateLabel(TreeScope&, const AtomicString& oldForAttributeValue, const AtomicString& newForAttributeValue); >+ void updateIdForDocument(HTMLDocument&, const AtomString& oldId, const AtomString& newId, HTMLDocumentNamedItemMapsUpdatingCondition); >+ void updateLabel(TreeScope&, const AtomString& oldForAttributeValue, const AtomString& newForAttributeValue); > > ExceptionOr<Node*> insertAdjacent(const String& where, Ref<Node>&& newChild); > >@@ -678,8 +678,8 @@ private: > bool childTypeAllowed(NodeType) const final; > > enum SynchronizationOfLazyAttribute { NotInSynchronizationOfLazyAttribute, InSynchronizationOfLazyAttribute }; >- void setAttributeInternal(unsigned index, const QualifiedName&, const AtomicString& value, SynchronizationOfLazyAttribute); >- void addAttributeInternal(const QualifiedName&, const AtomicString& value, SynchronizationOfLazyAttribute); >+ void setAttributeInternal(unsigned index, const QualifiedName&, const AtomString& value, SynchronizationOfLazyAttribute); >+ void addAttributeInternal(const QualifiedName&, const AtomString& value, SynchronizationOfLazyAttribute); > void removeAttributeInternal(unsigned index, SynchronizationOfLazyAttribute); > > LayoutRect absoluteEventBounds(bool& boundsIncludeAllDescendantElements, bool& includesFixedPositionElements); >@@ -727,7 +727,7 @@ private: > ElementRareData& ensureElementRareData(); > > void detachAllAttrNodesFromElement(); >- void detachAttrNodeFromElementWithValue(Attr*, const AtomicString& value); >+ void detachAttrNodeFromElementWithValue(Attr*, const AtomString& value); > > // Anyone thinking of using this should call document instead of ownerDocument. > void ownerDocument() const = delete; >@@ -771,7 +771,7 @@ inline bool Element::hasAttributeWithoutSynchronization(const QualifiedName& nam > return elementData() && findAttributeByName(name); > } > >-inline const AtomicString& Element::attributeWithoutSynchronization(const QualifiedName& name) const >+inline const AtomString& Element::attributeWithoutSynchronization(const QualifiedName& name) const > { > if (elementData()) { > if (const Attribute* attribute = findAttributeByName(name)) >@@ -785,26 +785,26 @@ inline bool Element::hasAttributesWithoutUpdate() const > return elementData() && !elementData()->isEmpty(); > } > >-inline const AtomicString& Element::idForStyleResolution() const >+inline const AtomString& Element::idForStyleResolution() const > { > return hasID() ? elementData()->idForStyleResolution() : nullAtom(); > } > >-inline const AtomicString& Element::getIdAttribute() const >+inline const AtomString& Element::getIdAttribute() const > { > if (hasID()) > return elementData()->findAttributeByName(HTMLNames::idAttr)->value(); > return nullAtom(); > } > >-inline const AtomicString& Element::getNameAttribute() const >+inline const AtomString& Element::getNameAttribute() const > { > if (hasName()) > return elementData()->findAttributeByName(HTMLNames::nameAttr)->value(); > return nullAtom(); > } > >-inline void Element::setIdAttribute(const AtomicString& value) >+inline void Element::setIdAttribute(const AtomString& value) > { > setAttributeWithoutSynchronization(HTMLNames::idAttr, value); > } >@@ -871,9 +871,9 @@ inline void Element::setHasFocusWithin(bool flag) > } > > template<typename... QualifiedNames> >-inline const AtomicString& Element::getAttribute(const QualifiedName& name, const QualifiedNames&... names) const >+inline const AtomString& Element::getAttribute(const QualifiedName& name, const QualifiedNames&... names) const > { >- const AtomicString& value = getAttribute(name); >+ const AtomString& value = getAttribute(name); > if (!value.isNull()) > return value; > return getAttribute(names...); >diff --git a/Source/WebCore/dom/ElementData.h b/Source/WebCore/dom/ElementData.h >index f6d1eafd736b2aa826beb2b7fe054ffc2d59b653..7158d1d8fb92c6c600c80903d8a43abd8d9b3411 100644 >--- a/Source/WebCore/dom/ElementData.h >+++ b/Source/WebCore/dom/ElementData.h >@@ -88,9 +88,9 @@ public: > const SpaceSplitString& classNames() const { return m_classNames; } > static ptrdiff_t classNamesMemoryOffset() { return OBJECT_OFFSETOF(ElementData, m_classNames); } > >- const AtomicString& idForStyleResolution() const { return m_idForStyleResolution; } >+ const AtomString& idForStyleResolution() const { return m_idForStyleResolution; } > static ptrdiff_t idForStyleResolutionMemoryOffset() { return OBJECT_OFFSETOF(ElementData, m_idForStyleResolution); } >- void setIdForStyleResolution(const AtomicString& newId) const { m_idForStyleResolution = newId; } >+ void setIdForStyleResolution(const AtomString& newId) const { m_idForStyleResolution = newId; } > > const StyleProperties* inlineStyle() const { return m_inlineStyle.get(); } > const StyleProperties* presentationAttributeStyle() const; >@@ -102,7 +102,7 @@ public: > const Attribute& attributeAt(unsigned index) const; > const Attribute* findAttributeByName(const QualifiedName&) const; > unsigned findAttributeIndexByName(const QualifiedName&) const; >- unsigned findAttributeIndexByName(const AtomicString& name, bool shouldIgnoreAttributeCase) const; >+ unsigned findAttributeIndexByName(const AtomString& name, bool shouldIgnoreAttributeCase) const; > const Attribute* findLanguageAttribute() const; > > bool hasID() const { return !m_idForStyleResolution.isNull(); } >@@ -161,7 +161,7 @@ protected: > > mutable RefPtr<StyleProperties> m_inlineStyle; > mutable SpaceSplitString m_classNames; >- mutable AtomicString m_idForStyleResolution; >+ mutable AtomString m_idForStyleResolution; > > private: > friend class Element; >@@ -173,7 +173,7 @@ private: > void destroy(); > > const Attribute* attributeBase() const; >- const Attribute* findAttributeByName(const AtomicString& name, bool shouldIgnoreAttributeCase) const; >+ const Attribute* findAttributeByName(const AtomString& name, bool shouldIgnoreAttributeCase) const; > > Ref<UniqueElementData> makeUniqueCopy() const; > }; >@@ -206,7 +206,7 @@ public: > Ref<ShareableElementData> makeShareableCopy() const; > > // These functions do no error/duplicate checking. >- void addAttribute(const QualifiedName&, const AtomicString&); >+ void addAttribute(const QualifiedName&, const AtomString&); > void removeAttribute(unsigned index); > > Attribute& attributeAt(unsigned index); >@@ -260,7 +260,7 @@ inline AttributeIteratorAccessor ElementData::attributesIterator() const > return AttributeIteratorAccessor(downcast<ShareableElementData>(*this).m_attributeArray, arraySize()); > } > >-ALWAYS_INLINE const Attribute* ElementData::findAttributeByName(const AtomicString& name, bool shouldIgnoreAttributeCase) const >+ALWAYS_INLINE const Attribute* ElementData::findAttributeByName(const AtomString& name, bool shouldIgnoreAttributeCase) const > { > unsigned index = findAttributeIndexByName(name, shouldIgnoreAttributeCase); > if (index != attributeNotFound) >@@ -280,14 +280,14 @@ ALWAYS_INLINE unsigned ElementData::findAttributeIndexByName(const QualifiedName > > // We use a boolean parameter instead of calling shouldIgnoreAttributeCase so that the caller > // can tune the behavior (hasAttribute is case sensitive whereas getAttribute is not). >-ALWAYS_INLINE unsigned ElementData::findAttributeIndexByName(const AtomicString& name, bool shouldIgnoreAttributeCase) const >+ALWAYS_INLINE unsigned ElementData::findAttributeIndexByName(const AtomString& name, bool shouldIgnoreAttributeCase) const > { > unsigned attributeCount = length(); > if (!attributeCount) > return attributeNotFound; > > const Attribute* attributes = attributeBase(); >- const AtomicString& caseAdjustedName = shouldIgnoreAttributeCase ? name.convertToASCIILowercase() : name; >+ const AtomString& caseAdjustedName = shouldIgnoreAttributeCase ? name.convertToASCIILowercase() : name; > > unsigned attributeIndex = 0; > do { >@@ -322,7 +322,7 @@ inline const Attribute& ElementData::attributeAt(unsigned index) const > return attributeBase()[index]; > } > >-inline void UniqueElementData::addAttribute(const QualifiedName& attributeName, const AtomicString& value) >+inline void UniqueElementData::addAttribute(const QualifiedName& attributeName, const AtomString& value) > { > m_attributeVector.append(Attribute(attributeName, value)); > } >diff --git a/Source/WebCore/dom/ErrorEvent.cpp b/Source/WebCore/dom/ErrorEvent.cpp >index 48dbd1d1a44aea9169505fe32b8b59988f16c154..ab077d6ef2bbf4c6448845681ad19427ec4b58cc 100644 >--- a/Source/WebCore/dom/ErrorEvent.cpp >+++ b/Source/WebCore/dom/ErrorEvent.cpp >@@ -40,7 +40,7 @@ > namespace WebCore { > using namespace JSC; > >-ErrorEvent::ErrorEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+ErrorEvent::ErrorEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_message(initializer.message) > , m_fileName(initializer.filename) >diff --git a/Source/WebCore/dom/ErrorEvent.h b/Source/WebCore/dom/ErrorEvent.h >index a85e93cca661ab7f4f4063bb1a737c6fa1187c5d..37fe3282c92addeb85cd4508885791a8c4a6e7ac 100644 >--- a/Source/WebCore/dom/ErrorEvent.h >+++ b/Source/WebCore/dom/ErrorEvent.h >@@ -54,7 +54,7 @@ public: > JSC::JSValue error; > }; > >- static Ref<ErrorEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<ErrorEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new ErrorEvent(type, initializer, isTrusted)); > } >@@ -76,7 +76,7 @@ public: > > private: > ErrorEvent(const String& message, const String& fileName, unsigned lineNumber, unsigned columnNumber, JSC::Strong<JSC::Unknown> error); >- ErrorEvent(const AtomicString&, const Init&, IsTrusted); >+ ErrorEvent(const AtomString&, const Init&, IsTrusted); > > bool isErrorEvent() const override; > >diff --git a/Source/WebCore/dom/Event.cpp b/Source/WebCore/dom/Event.cpp >index c8469c3c4bf05c0718f037cd7b7d97917fccb2a8..9b4fb7276ff00a5e32a3123e39b9e91910e5f163 100644 >--- a/Source/WebCore/dom/Event.cpp >+++ b/Source/WebCore/dom/Event.cpp >@@ -35,7 +35,7 @@ > > namespace WebCore { > >-ALWAYS_INLINE Event::Event(MonotonicTime createTime, const AtomicString& type, IsTrusted isTrusted, CanBubble canBubble, IsCancelable cancelable, IsComposed composed) >+ALWAYS_INLINE Event::Event(MonotonicTime createTime, const AtomString& type, IsTrusted isTrusted, CanBubble canBubble, IsCancelable cancelable, IsComposed composed) > : m_isInitialized { !type.isNull() } > , m_canBubble { canBubble == CanBubble::Yes } > , m_cancelable { cancelable == IsCancelable::Yes } >@@ -58,19 +58,19 @@ Event::Event(IsTrusted isTrusted) > { > } > >-Event::Event(const AtomicString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed) >+Event::Event(const AtomString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed) > : Event { MonotonicTime::now(), eventType, IsTrusted::Yes, canBubble, isCancelable, isComposed } > { > ASSERT(!eventType.isNull()); > } > >-Event::Event(const AtomicString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, MonotonicTime timestamp, IsTrusted isTrusted) >+Event::Event(const AtomString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, MonotonicTime timestamp, IsTrusted isTrusted) > : Event { timestamp, eventType, isTrusted, canBubble, isCancelable, isComposed } > { > ASSERT(!eventType.isNull()); > } > >-Event::Event(const AtomicString& eventType, const EventInit& initializer, IsTrusted isTrusted) >+Event::Event(const AtomString& eventType, const EventInit& initializer, IsTrusted isTrusted) > : Event { MonotonicTime::now(), eventType, isTrusted, > initializer.bubbles ? CanBubble::Yes : CanBubble::No, > initializer.cancelable ? IsCancelable::Yes : IsCancelable::No, >@@ -81,7 +81,7 @@ Event::Event(const AtomicString& eventType, const EventInit& initializer, IsTrus > > Event::~Event() = default; > >-Ref<Event> Event::create(const AtomicString& type, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed) >+Ref<Event> Event::create(const AtomString& type, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed) > { > return adoptRef(*new Event(type, canBubble, isCancelable, isComposed)); > } >@@ -91,12 +91,12 @@ Ref<Event> Event::createForBindings() > return adoptRef(*new Event); > } > >-Ref<Event> Event::create(const AtomicString& type, const EventInit& initializer, IsTrusted isTrusted) >+Ref<Event> Event::create(const AtomString& type, const EventInit& initializer, IsTrusted isTrusted) > { > return adoptRef(*new Event(type, initializer, isTrusted)); > } > >-void Event::initEvent(const AtomicString& eventTypeArg, bool canBubbleArg, bool cancelableArg) >+void Event::initEvent(const AtomString& eventTypeArg, bool canBubbleArg, bool cancelableArg) > { > if (isBeingDispatched()) > return; >diff --git a/Source/WebCore/dom/Event.h b/Source/WebCore/dom/Event.h >index 11360858bf5d4670707b301f79b613cd988dd492..237959be5bb173cb90cb378fc82e2c19814f669e 100644 >--- a/Source/WebCore/dom/Event.h >+++ b/Source/WebCore/dom/Event.h >@@ -30,7 +30,7 @@ > #include "ScriptWrappable.h" > #include <wtf/MonotonicTime.h> > #include <wtf/TypeCasts.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -52,18 +52,18 @@ public: > BUBBLING_PHASE = 3 > }; > >- WEBCORE_EXPORT static Ref<Event> create(const AtomicString& type, CanBubble, IsCancelable, IsComposed = IsComposed::No); >+ WEBCORE_EXPORT static Ref<Event> create(const AtomString& type, CanBubble, IsCancelable, IsComposed = IsComposed::No); > static Ref<Event> createForBindings(); >- static Ref<Event> create(const AtomicString& type, const EventInit&, IsTrusted = IsTrusted::No); >+ static Ref<Event> create(const AtomString& type, const EventInit&, IsTrusted = IsTrusted::No); > > virtual ~Event(); > >- WEBCORE_EXPORT void initEvent(const AtomicString& type, bool canBubble, bool cancelable); >+ WEBCORE_EXPORT void initEvent(const AtomString& type, bool canBubble, bool cancelable); > > bool isInitialized() const { return m_isInitialized; } > >- const AtomicString& type() const { return m_type; } >- void setType(const AtomicString& type) { m_type = type; } >+ const AtomString& type() const { return m_type; } >+ void setType(const AtomString& type) { m_type = type; } > > EventTarget* target() const { return m_target.get(); } > void setTarget(RefPtr<EventTarget>&&); >@@ -143,14 +143,14 @@ public: > > protected: > explicit Event(IsTrusted = IsTrusted::No); >- Event(const AtomicString& type, CanBubble, IsCancelable, IsComposed = IsComposed::No); >- Event(const AtomicString& type, CanBubble, IsCancelable, IsComposed, MonotonicTime timestamp, IsTrusted isTrusted = IsTrusted::Yes); >- Event(const AtomicString& type, const EventInit&, IsTrusted); >+ Event(const AtomString& type, CanBubble, IsCancelable, IsComposed = IsComposed::No); >+ Event(const AtomString& type, CanBubble, IsCancelable, IsComposed, MonotonicTime timestamp, IsTrusted isTrusted = IsTrusted::Yes); >+ Event(const AtomString& type, const EventInit&, IsTrusted); > > virtual void receivedTarget() { } > > private: >- explicit Event(MonotonicTime createTime, const AtomicString& type, IsTrusted, CanBubble, IsCancelable, IsComposed); >+ explicit Event(MonotonicTime createTime, const AtomString& type, IsTrusted, CanBubble, IsCancelable, IsComposed); > > void setCanceledFlagIfPossible(); > >@@ -169,7 +169,7 @@ private: > > unsigned m_eventPhase : 2; > >- AtomicString m_type; >+ AtomString m_type; > > RefPtr<EventTarget> m_currentTarget; > const EventPath* m_eventPath { nullptr }; >diff --git a/Source/WebCore/dom/EventListenerMap.cpp b/Source/WebCore/dom/EventListenerMap.cpp >index bdd2d56ab5b2aa9cee80fc06d928b8e8a20b27bd..d9e66349cbdba0bb81d2acfbfdc0d43378c658db 100644 >--- a/Source/WebCore/dom/EventListenerMap.cpp >+++ b/Source/WebCore/dom/EventListenerMap.cpp >@@ -53,7 +53,7 @@ EventListenerMap::EventListenerMap() > { > } > >-bool EventListenerMap::containsCapturing(const AtomicString& eventType) const >+bool EventListenerMap::containsCapturing(const AtomString& eventType) const > { > auto* listeners = find(eventType); > if (!listeners) >@@ -66,7 +66,7 @@ bool EventListenerMap::containsCapturing(const AtomicString& eventType) const > return false; > } > >-bool EventListenerMap::containsActive(const AtomicString& eventType) const >+bool EventListenerMap::containsActive(const AtomString& eventType) const > { > auto* listeners = find(eventType); > if (!listeners) >@@ -93,9 +93,9 @@ void EventListenerMap::clear() > m_entries.clear(); > } > >-Vector<AtomicString> EventListenerMap::eventTypes() const >+Vector<AtomString> EventListenerMap::eventTypes() const > { >- Vector<AtomicString> types; >+ Vector<AtomString> types; > types.reserveInitialCapacity(m_entries.size()); > > for (auto& entry : m_entries) >@@ -114,7 +114,7 @@ static inline size_t findListener(const EventListenerVector& listeners, EventLis > return notFound; > } > >-void EventListenerMap::replace(const AtomicString& eventType, EventListener& oldListener, Ref<EventListener>&& newListener, const RegisteredEventListener::Options& options) >+void EventListenerMap::replace(const AtomString& eventType, EventListener& oldListener, Ref<EventListener>&& newListener, const RegisteredEventListener::Options& options) > { > auto locker = holdLock(m_lock); > >@@ -129,7 +129,7 @@ void EventListenerMap::replace(const AtomicString& eventType, EventListener& old > registeredListener = RegisteredEventListener::create(WTFMove(newListener), options); > } > >-bool EventListenerMap::add(const AtomicString& eventType, Ref<EventListener>&& listener, const RegisteredEventListener::Options& options) >+bool EventListenerMap::add(const AtomString& eventType, Ref<EventListener>&& listener, const RegisteredEventListener::Options& options) > { > auto locker = holdLock(m_lock); > >@@ -159,7 +159,7 @@ static bool removeListenerFromVector(EventListenerVector& listeners, EventListen > return true; > } > >-bool EventListenerMap::remove(const AtomicString& eventType, EventListener& listener, bool useCapture) >+bool EventListenerMap::remove(const AtomString& eventType, EventListener& listener, bool useCapture) > { > auto locker = holdLock(m_lock); > >@@ -177,7 +177,7 @@ bool EventListenerMap::remove(const AtomicString& eventType, EventListener& list > return false; > } > >-EventListenerVector* EventListenerMap::find(const AtomicString& eventType) const >+EventListenerVector* EventListenerMap::find(const AtomString& eventType) const > { > for (auto& entry : m_entries) { > if (entry.first == eventType) >@@ -199,7 +199,7 @@ static void removeFirstListenerCreatedFromMarkup(EventListenerVector& listenerVe > ASSERT_UNUSED(foundListener, foundListener); > } > >-void EventListenerMap::removeFirstEventListenerCreatedFromMarkup(const AtomicString& eventType) >+void EventListenerMap::removeFirstEventListenerCreatedFromMarkup(const AtomString& eventType) > { > auto locker = holdLock(m_lock); > >@@ -215,7 +215,7 @@ void EventListenerMap::removeFirstEventListenerCreatedFromMarkup(const AtomicStr > } > } > >-static void copyListenersNotCreatedFromMarkupToTarget(const AtomicString& eventType, EventListenerVector& listenerVector, EventTarget* target) >+static void copyListenersNotCreatedFromMarkupToTarget(const AtomString& eventType, EventListenerVector& listenerVector, EventTarget* target) > { > for (auto& registeredListener : listenerVector) { > // Event listeners created from markup have already been transfered to the shadow tree during cloning. >diff --git a/Source/WebCore/dom/EventListenerMap.h b/Source/WebCore/dom/EventListenerMap.h >index ae5f98d23ac3e6855dc30ed66516522ec6ff54c1..ac44760d6e7caa34103b79acc7250f06f0b96c39 100644 >--- a/Source/WebCore/dom/EventListenerMap.h >+++ b/Source/WebCore/dom/EventListenerMap.h >@@ -37,7 +37,7 @@ > #include <memory> > #include <wtf/Forward.h> > #include <wtf/Lock.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -50,19 +50,19 @@ public: > EventListenerMap(); > > bool isEmpty() const { return m_entries.isEmpty(); } >- bool contains(const AtomicString& eventType) const { return find(eventType); } >- bool containsCapturing(const AtomicString& eventType) const; >- bool containsActive(const AtomicString& eventType) const; >+ bool contains(const AtomString& eventType) const { return find(eventType); } >+ bool containsCapturing(const AtomString& eventType) const; >+ bool containsActive(const AtomString& eventType) const; > > void clear(); > >- void replace(const AtomicString& eventType, EventListener& oldListener, Ref<EventListener>&& newListener, const RegisteredEventListener::Options&); >- bool add(const AtomicString& eventType, Ref<EventListener>&&, const RegisteredEventListener::Options&); >- bool remove(const AtomicString& eventType, EventListener&, bool useCapture); >- WEBCORE_EXPORT EventListenerVector* find(const AtomicString& eventType) const; >- Vector<AtomicString> eventTypes() const; >+ void replace(const AtomString& eventType, EventListener& oldListener, Ref<EventListener>&& newListener, const RegisteredEventListener::Options&); >+ bool add(const AtomString& eventType, Ref<EventListener>&&, const RegisteredEventListener::Options&); >+ bool remove(const AtomString& eventType, EventListener&, bool useCapture); >+ WEBCORE_EXPORT EventListenerVector* find(const AtomString& eventType) const; >+ Vector<AtomString> eventTypes() const; > >- void removeFirstEventListenerCreatedFromMarkup(const AtomicString& eventType); >+ void removeFirstEventListenerCreatedFromMarkup(const AtomString& eventType); > void copyEventListenersNotCreatedFromMarkupToTarget(EventTarget*); > > Lock& lock() { return m_lock; } >@@ -72,7 +72,7 @@ private: > > void assertNoActiveIterators() const; > >- Vector<std::pair<AtomicString, std::unique_ptr<EventListenerVector>>, 2> m_entries; >+ Vector<std::pair<AtomString, std::unique_ptr<EventListenerVector>>, 2> m_entries; > > #ifndef NDEBUG > std::atomic<int> m_activeIteratorCount { 0 }; >diff --git a/Source/WebCore/dom/EventNames.cpp b/Source/WebCore/dom/EventNames.cpp >index fcc5601fc60101737146d5619930cf6e9bdeaa6e..d49f4c4f1dc70e638c6c7ac06029ed916e555f26 100644 >--- a/Source/WebCore/dom/EventNames.cpp >+++ b/Source/WebCore/dom/EventNames.cpp >@@ -24,7 +24,7 @@ > namespace WebCore { > > #define INITIALIZE_EVENT_NAME(name) \ >- name##Event(#name, AtomicString::ConstructFromLiteral), >+ name##Event(#name, AtomString::ConstructFromLiteral), > > EventNames::EventNames() > : DOM_EVENT_NAMES_FOR_EACH(INITIALIZE_EVENT_NAME) dummy(0) >diff --git a/Source/WebCore/dom/EventNames.h b/Source/WebCore/dom/EventNames.h >index eff82d0a205f3503efcf36197ad27319ca0185ab..1dfd9095cc5afd8fe515fb6e8e3af2cea90f6668 100644 >--- a/Source/WebCore/dom/EventNames.h >+++ b/Source/WebCore/dom/EventNames.h >@@ -26,7 +26,7 @@ > #include "ThreadGlobalData.h" > #include <array> > #include <functional> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > #if ENABLE(TOUCH_EVENTS) > #include "RuntimeEnabledFeatures.h" >@@ -335,7 +335,7 @@ struct EventNames { > WTF_MAKE_NONCOPYABLE(EventNames); WTF_MAKE_FAST_ALLOCATED; > > public: >-#define DOM_EVENT_NAMES_DECLARE(name) const AtomicString name##Event; >+#define DOM_EVENT_NAMES_DECLARE(name) const AtomString name##Event; > DOM_EVENT_NAMES_FOR_EACH(DOM_EVENT_NAMES_DECLARE) > #undef DOM_EVENT_NAMES_DECLARE > >@@ -355,17 +355,17 @@ public: > > // FIXME: Inelegant to call these both event names and event types. > // We should choose one term and stick to it. >- bool isWheelEventType(const AtomicString& eventType) const; >- bool isGestureEventType(const AtomicString& eventType) const; >- bool isTouchRelatedEventType(const Document&, const AtomicString& eventType) const; >- bool isTouchScrollBlockingEventType(const AtomicString& eventType) const; >+ bool isWheelEventType(const AtomString& eventType) const; >+ bool isGestureEventType(const AtomString& eventType) const; >+ bool isTouchRelatedEventType(const Document&, const AtomString& eventType) const; >+ bool isTouchScrollBlockingEventType(const AtomString& eventType) const; > #if ENABLE(GAMEPAD) >- bool isGamepadEventType(const AtomicString& eventType) const; >+ bool isGamepadEventType(const AtomString& eventType) const; > #endif > >- std::array<std::reference_wrapper<const AtomicString>, 13> touchRelatedEventNames() const; >- std::array<std::reference_wrapper<const AtomicString>, 16> extendedTouchRelatedEventNames() const; >- std::array<std::reference_wrapper<const AtomicString>, 3> gestureEventNames() const; >+ std::array<std::reference_wrapper<const AtomString>, 13> touchRelatedEventNames() const; >+ std::array<std::reference_wrapper<const AtomString>, 16> extendedTouchRelatedEventNames() const; >+ std::array<std::reference_wrapper<const AtomString>, 3> gestureEventNames() const; > > private: > EventNames(); // Private to prevent accidental call to EventNames() instead of eventNames(). >@@ -381,18 +381,18 @@ inline const EventNames& eventNames() > return threadGlobalData().eventNames(); > } > >-inline bool EventNames::isGestureEventType(const AtomicString& eventType) const >+inline bool EventNames::isGestureEventType(const AtomString& eventType) const > { > return eventType == gesturestartEvent || eventType == gesturechangeEvent || eventType == gestureendEvent; > } > >-inline bool EventNames::isTouchScrollBlockingEventType(const AtomicString& eventType) const >+inline bool EventNames::isTouchScrollBlockingEventType(const AtomString& eventType) const > { > return eventType == touchstartEvent > || eventType == touchmoveEvent; > } > >-inline bool EventNames::isTouchRelatedEventType(const Document& document, const AtomicString& eventType) const >+inline bool EventNames::isTouchRelatedEventType(const Document& document, const AtomString& eventType) const > { > #if ENABLE(TOUCH_EVENTS) > if (document.quirks().shouldDispatchSimulatedMouseEvents() || RuntimeEnabledFeatures::sharedFeatures().mouseEventsSimulationEnabled()) { >@@ -416,30 +416,30 @@ inline bool EventNames::isTouchRelatedEventType(const Document& document, const > || eventType == pointercancelEvent; > } > >-inline bool EventNames::isWheelEventType(const AtomicString& eventType) const >+inline bool EventNames::isWheelEventType(const AtomString& eventType) const > { > return eventType == wheelEvent > || eventType == mousewheelEvent; > } > >-inline std::array<std::reference_wrapper<const AtomicString>, 13> EventNames::touchRelatedEventNames() const >+inline std::array<std::reference_wrapper<const AtomString>, 13> EventNames::touchRelatedEventNames() const > { > return { { touchstartEvent, touchmoveEvent, touchendEvent, touchcancelEvent, touchforcechangeEvent, pointeroverEvent, pointerenterEvent, pointerdownEvent, pointermoveEvent, pointerupEvent, pointeroutEvent, pointerleaveEvent, pointercancelEvent } }; > } > >-inline std::array<std::reference_wrapper<const AtomicString>, 16> EventNames::extendedTouchRelatedEventNames() const >+inline std::array<std::reference_wrapper<const AtomString>, 16> EventNames::extendedTouchRelatedEventNames() const > { > return { { touchstartEvent, touchmoveEvent, touchendEvent, touchcancelEvent, touchforcechangeEvent, pointeroverEvent, pointerenterEvent, pointerdownEvent, pointermoveEvent, pointerupEvent, pointeroutEvent, pointerleaveEvent, pointercancelEvent, mousedownEvent, mousemoveEvent, mouseupEvent } }; > } > >-inline std::array<std::reference_wrapper<const AtomicString>, 3> EventNames::gestureEventNames() const >+inline std::array<std::reference_wrapper<const AtomString>, 3> EventNames::gestureEventNames() const > { > return { { gesturestartEvent, gesturechangeEvent, gestureendEvent } }; > } > > #if ENABLE(GAMEPAD) > >-inline bool EventNames::isGamepadEventType(const AtomicString& eventType) const >+inline bool EventNames::isGamepadEventType(const AtomString& eventType) const > { > return eventType == gamepadconnectedEvent > || eventType == gamepaddisconnectedEvent; >diff --git a/Source/WebCore/dom/EventSender.h b/Source/WebCore/dom/EventSender.h >index 15cdb1779b200af3692bfee1e70c9ab02c6b34e9..717cc51619134fc3728fd16bf02b52db29efdab5 100644 >--- a/Source/WebCore/dom/EventSender.h >+++ b/Source/WebCore/dom/EventSender.h >@@ -33,9 +33,9 @@ namespace WebCore { > template<typename T> class EventSender { > WTF_MAKE_NONCOPYABLE(EventSender); WTF_MAKE_FAST_ALLOCATED; > public: >- explicit EventSender(const AtomicString& eventType); >+ explicit EventSender(const AtomString& eventType); > >- const AtomicString& eventType() const { return m_eventType; } >+ const AtomString& eventType() const { return m_eventType; } > void dispatchEventSoon(T&); > void cancelEvent(T&); > void dispatchPendingEvents(); >@@ -50,13 +50,13 @@ public: > private: > void timerFired() { dispatchPendingEvents(); } > >- AtomicString m_eventType; >+ AtomString m_eventType; > Timer m_timer; > Vector<T*> m_dispatchSoonList; > Vector<T*> m_dispatchingList; > }; > >-template<typename T> EventSender<T>::EventSender(const AtomicString& eventType) >+template<typename T> EventSender<T>::EventSender(const AtomString& eventType) > : m_eventType(eventType) > , m_timer(*this, &EventSender::timerFired) > { >diff --git a/Source/WebCore/dom/EventTarget.cpp b/Source/WebCore/dom/EventTarget.cpp >index b89394bae9adaad485cb30582d432410020f30fa..9e471440c87ebfafa381057dd993bda2dff8da1a 100644 >--- a/Source/WebCore/dom/EventTarget.cpp >+++ b/Source/WebCore/dom/EventTarget.cpp >@@ -68,7 +68,7 @@ bool EventTarget::isPaymentRequest() const > return false; > } > >-bool EventTarget::addEventListener(const AtomicString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) >+bool EventTarget::addEventListener(const AtomString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) > { > #if !ASSERT_DISABLED > listener->checkValidityForEventTarget(*this); >@@ -100,7 +100,7 @@ bool EventTarget::addEventListener(const AtomicString& eventType, Ref<EventListe > return true; > } > >-void EventTarget::addEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&& listener, AddEventListenerOptionsOrBoolean&& variant) >+void EventTarget::addEventListenerForBindings(const AtomString& eventType, RefPtr<EventListener>&& listener, AddEventListenerOptionsOrBoolean&& variant) > { > if (!listener) > return; >@@ -114,7 +114,7 @@ void EventTarget::addEventListenerForBindings(const AtomicString& eventType, Ref > WTF::visit(visitor, variant); > } > >-void EventTarget::removeEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&& listener, ListenerOptionsOrBoolean&& variant) >+void EventTarget::removeEventListenerForBindings(const AtomString& eventType, RefPtr<EventListener>&& listener, ListenerOptionsOrBoolean&& variant) > { > if (!listener) > return; >@@ -128,7 +128,7 @@ void EventTarget::removeEventListenerForBindings(const AtomicString& eventType, > WTF::visit(visitor, variant); > } > >-bool EventTarget::removeEventListener(const AtomicString& eventType, EventListener& listener, const ListenerOptions& options) >+bool EventTarget::removeEventListener(const AtomString& eventType, EventListener& listener, const ListenerOptions& options) > { > auto* data = eventTargetData(); > if (!data) >@@ -139,7 +139,7 @@ bool EventTarget::removeEventListener(const AtomicString& eventType, EventListen > return data->eventListenerMap.remove(eventType, listener, options.capture); > } > >-bool EventTarget::setAttributeEventListener(const AtomicString& eventType, RefPtr<EventListener>&& listener, DOMWrapperWorld& isolatedWorld) >+bool EventTarget::setAttributeEventListener(const AtomString& eventType, RefPtr<EventListener>&& listener, DOMWrapperWorld& isolatedWorld) > { > auto* existingListener = attributeEventListener(eventType, isolatedWorld); > if (!listener) { >@@ -164,7 +164,7 @@ bool EventTarget::setAttributeEventListener(const AtomicString& eventType, RefPt > return addEventListener(eventType, listener.releaseNonNull()); > } > >-EventListener* EventTarget::attributeEventListener(const AtomicString& eventType, DOMWrapperWorld& isolatedWorld) >+EventListener* EventTarget::attributeEventListener(const AtomString& eventType, DOMWrapperWorld& isolatedWorld) > { > for (auto& eventListener : eventListeners(eventType)) { > auto& listener = eventListener->callback(); >@@ -179,7 +179,7 @@ EventListener* EventTarget::attributeEventListener(const AtomicString& eventType > return nullptr; > } > >-bool EventTarget::hasActiveEventListeners(const AtomicString& eventType) const >+bool EventTarget::hasActiveEventListeners(const AtomString& eventType) const > { > auto* data = eventTargetData(); > return data && data->eventListenerMap.containsActive(eventType); >@@ -218,7 +218,7 @@ void EventTarget::uncaughtExceptionInEventHandler() > { > } > >-static const AtomicString& legacyType(const Event& event) >+static const AtomString& legacyType(const Event& event) > { > if (event.type() == eventNames().animationendEvent) > return eventNames().webkitAnimationEndEvent; >@@ -260,10 +260,10 @@ void EventTarget::fireEventListeners(Event& event, EventInvokePhase phase) > if (!event.isTrusted()) > return; > >- const AtomicString& legacyTypeName = legacyType(event); >+ const AtomString& legacyTypeName = legacyType(event); > if (!legacyTypeName.isNull()) { > if (auto* legacyListenersVector = data->eventListenerMap.find(legacyTypeName)) { >- AtomicString typeName = event.type(); >+ AtomString typeName = event.type(); > event.setType(legacyTypeName); > innerInvokeEventListeners(event, *legacyListenersVector, phase); > event.setType(typeName); >@@ -326,14 +326,14 @@ void EventTarget::innerInvokeEventListeners(Event& event, EventListenerVector li > InspectorInstrumentation::didDispatchEvent(willDispatchEventCookie, event.defaultPrevented()); > } > >-Vector<AtomicString> EventTarget::eventTypes() >+Vector<AtomString> EventTarget::eventTypes() > { > if (auto* data = eventTargetData()) > return data->eventListenerMap.eventTypes(); > return { }; > } > >-const EventListenerVector& EventTarget::eventListeners(const AtomicString& eventType) >+const EventListenerVector& EventTarget::eventListeners(const AtomString& eventType) > { > auto* data = eventTargetData(); > auto* listenerVector = data ? data->eventListenerMap.find(eventType) : nullptr; >diff --git a/Source/WebCore/dom/EventTarget.h b/Source/WebCore/dom/EventTarget.h >index 102337b53f9d68ee5d8db854730e857f354e1ee0..f82ae5248fade0ea3e8a75ffcc91f9dd58ab3695 100644 >--- a/Source/WebCore/dom/EventTarget.h >+++ b/Source/WebCore/dom/EventTarget.h >@@ -83,29 +83,29 @@ public: > }; > > using AddEventListenerOptionsOrBoolean = Variant<AddEventListenerOptions, bool>; >- WEBCORE_EXPORT void addEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&&, AddEventListenerOptionsOrBoolean&&); >+ WEBCORE_EXPORT void addEventListenerForBindings(const AtomString& eventType, RefPtr<EventListener>&&, AddEventListenerOptionsOrBoolean&&); > using ListenerOptionsOrBoolean = Variant<ListenerOptions, bool>; >- WEBCORE_EXPORT void removeEventListenerForBindings(const AtomicString& eventType, RefPtr<EventListener>&&, ListenerOptionsOrBoolean&&); >+ WEBCORE_EXPORT void removeEventListenerForBindings(const AtomString& eventType, RefPtr<EventListener>&&, ListenerOptionsOrBoolean&&); > WEBCORE_EXPORT ExceptionOr<bool> dispatchEventForBindings(Event&); > >- virtual bool addEventListener(const AtomicString& eventType, Ref<EventListener>&&, const AddEventListenerOptions& = { }); >- virtual bool removeEventListener(const AtomicString& eventType, EventListener&, const ListenerOptions&); >+ virtual bool addEventListener(const AtomString& eventType, Ref<EventListener>&&, const AddEventListenerOptions& = { }); >+ virtual bool removeEventListener(const AtomString& eventType, EventListener&, const ListenerOptions&); > > virtual void removeAllEventListeners(); > virtual void dispatchEvent(Event&); > virtual void uncaughtExceptionInEventHandler(); > > // Used for legacy "onevent" attributes. >- bool setAttributeEventListener(const AtomicString& eventType, RefPtr<EventListener>&&, DOMWrapperWorld&); >- EventListener* attributeEventListener(const AtomicString& eventType, DOMWrapperWorld&); >+ bool setAttributeEventListener(const AtomString& eventType, RefPtr<EventListener>&&, DOMWrapperWorld&); >+ EventListener* attributeEventListener(const AtomString& eventType, DOMWrapperWorld&); > > bool hasEventListeners() const; >- bool hasEventListeners(const AtomicString& eventType) const; >- bool hasCapturingEventListeners(const AtomicString& eventType); >- bool hasActiveEventListeners(const AtomicString& eventType) const; >+ bool hasEventListeners(const AtomString& eventType) const; >+ bool hasCapturingEventListeners(const AtomString& eventType); >+ bool hasActiveEventListeners(const AtomString& eventType) const; > >- Vector<AtomicString> eventTypes(); >- const EventListenerVector& eventListeners(const AtomicString& eventType); >+ Vector<AtomString> eventTypes(); >+ const EventListenerVector& eventListeners(const AtomString& eventType); > > enum class EventInvokePhase { Capturing, Bubbling }; > void fireEventListeners(Event&, EventInvokePhase); >@@ -158,13 +158,13 @@ inline bool EventTarget::hasEventListeners() const > return data && !data->eventListenerMap.isEmpty(); > } > >-inline bool EventTarget::hasEventListeners(const AtomicString& eventType) const >+inline bool EventTarget::hasEventListeners(const AtomString& eventType) const > { > auto* data = eventTargetData(); > return data && data->eventListenerMap.contains(eventType); > } > >-inline bool EventTarget::hasCapturingEventListeners(const AtomicString& eventType) >+inline bool EventTarget::hasCapturingEventListeners(const AtomString& eventType) > { > auto* data = eventTargetData(); > return data && data->eventListenerMap.containsCapturing(eventType); >diff --git a/Source/WebCore/dom/EventTarget.idl b/Source/WebCore/dom/EventTarget.idl >index 0f91ef324a66c02dbb019ad54216aa13b6b2b14b..e5f179d51d1f59567e14d9b5c79e8515b3c850fc 100644 >--- a/Source/WebCore/dom/EventTarget.idl >+++ b/Source/WebCore/dom/EventTarget.idl >@@ -26,8 +26,8 @@ > JSCustomMarkFunction, > JSCustomToNativeObject, > ] interface EventTarget { >- [ImplementedAs=addEventListenerForBindings] void addEventListener([AtomicString] DOMString type, EventListener? callback, optional (AddEventListenerOptions or boolean) options = false); >- [ImplementedAs=removeEventListenerForBindings] void removeEventListener([AtomicString] DOMString type, EventListener? callback, optional (EventListenerOptions or boolean) options = false); >+ [ImplementedAs=addEventListenerForBindings] void addEventListener([AtomString] DOMString type, EventListener? callback, optional (AddEventListenerOptions or boolean) options = false); >+ [ImplementedAs=removeEventListenerForBindings] void removeEventListener([AtomString] DOMString type, EventListener? callback, optional (EventListenerOptions or boolean) options = false); > [ImplementedAs=dispatchEventForBindings, MayThrowException] boolean dispatchEvent(Event event); > }; > >diff --git a/Source/WebCore/dom/FocusEvent.cpp b/Source/WebCore/dom/FocusEvent.cpp >index 826361549c2e3b030cc8f9d633e954417b7898c5..6b219a4a824eb5145844da5e5e28429ac526243e 100644 >--- a/Source/WebCore/dom/FocusEvent.cpp >+++ b/Source/WebCore/dom/FocusEvent.cpp >@@ -40,13 +40,13 @@ bool FocusEvent::isFocusEvent() const > return true; > } > >-FocusEvent::FocusEvent(const AtomicString& type, CanBubble canBubble, IsCancelable isCancelable, RefPtr<WindowProxy>&& view, int detail, RefPtr<EventTarget>&& relatedTarget) >+FocusEvent::FocusEvent(const AtomString& type, CanBubble canBubble, IsCancelable isCancelable, RefPtr<WindowProxy>&& view, int detail, RefPtr<EventTarget>&& relatedTarget) > : UIEvent(type, canBubble, isCancelable, IsComposed::Yes, WTFMove(view), detail) > , m_relatedTarget(WTFMove(relatedTarget)) > { > } > >-FocusEvent::FocusEvent(const AtomicString& type, const Init& initializer) >+FocusEvent::FocusEvent(const AtomString& type, const Init& initializer) > : UIEvent(type, initializer) > , m_relatedTarget(initializer.relatedTarget) > { >diff --git a/Source/WebCore/dom/FocusEvent.h b/Source/WebCore/dom/FocusEvent.h >index 867a008d5ca3b7e9d9ec537e1320bbaeef361526..e73ab40f4ae675ddf4045822c96a4001b2b72ae1 100644 >--- a/Source/WebCore/dom/FocusEvent.h >+++ b/Source/WebCore/dom/FocusEvent.h >@@ -35,7 +35,7 @@ class Node; > > class FocusEvent final : public UIEvent { > public: >- static Ref<FocusEvent> create(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, RefPtr<WindowProxy>&& view, int detail, RefPtr<EventTarget>&& relatedTarget) >+ static Ref<FocusEvent> create(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, RefPtr<WindowProxy>&& view, int detail, RefPtr<EventTarget>&& relatedTarget) > { > return adoptRef(*new FocusEvent(type, canBubble, cancelable, WTFMove(view), detail, WTFMove(relatedTarget))); > } >@@ -49,7 +49,7 @@ public: > RefPtr<EventTarget> relatedTarget; > }; > >- static Ref<FocusEvent> create(const AtomicString& type, const Init& initializer) >+ static Ref<FocusEvent> create(const AtomString& type, const Init& initializer) > { > return adoptRef(*new FocusEvent(type, initializer)); > } >@@ -58,8 +58,8 @@ public: > > private: > FocusEvent() = default; >- FocusEvent(const AtomicString& type, CanBubble, IsCancelable, RefPtr<WindowProxy>&&, int, RefPtr<EventTarget>&&); >- FocusEvent(const AtomicString& type, const Init&); >+ FocusEvent(const AtomString& type, CanBubble, IsCancelable, RefPtr<WindowProxy>&&, int, RefPtr<EventTarget>&&); >+ FocusEvent(const AtomString& type, const Init&); > > EventInterface eventInterface() const final; > bool isFocusEvent() const final; >diff --git a/Source/WebCore/dom/FullscreenManager.cpp b/Source/WebCore/dom/FullscreenManager.cpp >index 6f92c905028f9162b8c05d751d3844c7199d4a97..830a1cb24556146c522df782014986f2d3693aa3 100644 >--- a/Source/WebCore/dom/FullscreenManager.cpp >+++ b/Source/WebCore/dom/FullscreenManager.cpp >@@ -458,7 +458,7 @@ void FullscreenManager::dispatchFullscreenChangeEvents() > dispatchFullscreenChangeOrErrorEvent(errorQueue, eventNames().webkitfullscreenerrorEvent, /* shouldNotifyMediaElement */ false); > } > >-void FullscreenManager::dispatchFullscreenChangeOrErrorEvent(Deque<RefPtr<Node>>& queue, const AtomicString& eventName, bool shouldNotifyMediaElement) >+void FullscreenManager::dispatchFullscreenChangeOrErrorEvent(Deque<RefPtr<Node>>& queue, const AtomString& eventName, bool shouldNotifyMediaElement) > { > while (!queue.isEmpty()) { > RefPtr<Node> node = queue.takeFirst(); >diff --git a/Source/WebCore/dom/FullscreenManager.h b/Source/WebCore/dom/FullscreenManager.h >index ebdaa95d8cdfde42b8029f7aa434a19932349c06..edd9ca28ea493ac7c94c8bde285b1666c3882559 100644 >--- a/Source/WebCore/dom/FullscreenManager.h >+++ b/Source/WebCore/dom/FullscreenManager.h >@@ -99,7 +99,7 @@ public: > protected: > friend class Document; > >- void dispatchFullscreenChangeOrErrorEvent(Deque<RefPtr<Node>>&, const AtomicString& eventName, bool shouldNotifyMediaElement); >+ void dispatchFullscreenChangeOrErrorEvent(Deque<RefPtr<Node>>&, const AtomString& eventName, bool shouldNotifyMediaElement); > void clearFullscreenElementStack(); > void popFullscreenElementStack(); > void pushFullscreenElementStack(Element&); >diff --git a/Source/WebCore/dom/GenericEventQueue.cpp b/Source/WebCore/dom/GenericEventQueue.cpp >index 8cfa8f04cb12f0ce1ff46542be622a474130aae0..7a08482e77cc403d2f09ee44b3acde7037237e5f 100644 >--- a/Source/WebCore/dom/GenericEventQueue.cpp >+++ b/Source/WebCore/dom/GenericEventQueue.cpp >@@ -92,7 +92,7 @@ bool GenericEventQueue::hasPendingEvents() const > return !m_pendingEvents.isEmpty(); > } > >-bool GenericEventQueue::hasPendingEventsOfType(const AtomicString& type) const >+bool GenericEventQueue::hasPendingEventsOfType(const AtomString& type) const > { > for (auto& event : m_pendingEvents) { > if (event->type() == type) >diff --git a/Source/WebCore/dom/GenericEventQueue.h b/Source/WebCore/dom/GenericEventQueue.h >index e498cfa377adf156c375741e86b51bf1398dca6e..b7b659f32e0aa5b6c8917b42713b5c53dae36b8e 100644 >--- a/Source/WebCore/dom/GenericEventQueue.h >+++ b/Source/WebCore/dom/GenericEventQueue.h >@@ -47,7 +47,7 @@ public: > > void cancelAllEvents(); > bool hasPendingEvents() const; >- bool hasPendingEventsOfType(const AtomicString&) const; >+ bool hasPendingEventsOfType(const AtomString&) const; > > void suspend(); > void resume(); >diff --git a/Source/WebCore/dom/HashChangeEvent.h b/Source/WebCore/dom/HashChangeEvent.h >index c81375eb867f20117caaaf449f135b0c3aaf9792..81a6b477e606139be0c13ee22a76fded4fb44d39 100644 >--- a/Source/WebCore/dom/HashChangeEvent.h >+++ b/Source/WebCore/dom/HashChangeEvent.h >@@ -42,12 +42,12 @@ public: > String newURL; > }; > >- static Ref<HashChangeEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<HashChangeEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new HashChangeEvent(type, initializer, isTrusted)); > } > >- void initHashChangeEvent(const AtomicString& eventType, bool canBubble, bool cancelable, const String& oldURL, const String& newURL) >+ void initHashChangeEvent(const AtomString& eventType, bool canBubble, bool cancelable, const String& oldURL, const String& newURL) > { > if (isBeingDispatched()) > return; >@@ -75,7 +75,7 @@ private: > { > } > >- HashChangeEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+ HashChangeEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_oldURL(initializer.oldURL) > , m_newURL(initializer.newURL) >diff --git a/Source/WebCore/dom/IdTargetObserver.cpp b/Source/WebCore/dom/IdTargetObserver.cpp >index afadd38f90814c991603c0e225ce90d88cac4125..e2730d1cfb5e9ffa9cfe837ffebc8c5046e72a11 100644 >--- a/Source/WebCore/dom/IdTargetObserver.cpp >+++ b/Source/WebCore/dom/IdTargetObserver.cpp >@@ -30,7 +30,7 @@ > > namespace WebCore { > >-IdTargetObserver::IdTargetObserver(IdTargetObserverRegistry& registry, const AtomicString& id) >+IdTargetObserver::IdTargetObserver(IdTargetObserverRegistry& registry, const AtomString& id) > : m_registry(®istry) > , m_id(id) > { >diff --git a/Source/WebCore/dom/IdTargetObserver.h b/Source/WebCore/dom/IdTargetObserver.h >index 2e26bf276ab7d1811a0f1eab9fce702d64b029a9..4406b6375a70f7f30813bc444f6f499d801f6b89 100644 >--- a/Source/WebCore/dom/IdTargetObserver.h >+++ b/Source/WebCore/dom/IdTargetObserver.h >@@ -25,7 +25,7 @@ > > #pragma once > >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -37,11 +37,11 @@ public: > virtual void idTargetChanged() = 0; > > protected: >- IdTargetObserver(IdTargetObserverRegistry&, const AtomicString& id); >+ IdTargetObserver(IdTargetObserverRegistry&, const AtomString& id); > > private: > IdTargetObserverRegistry* m_registry; >- AtomicString m_id; >+ AtomString m_id; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/dom/IdTargetObserverRegistry.cpp b/Source/WebCore/dom/IdTargetObserverRegistry.cpp >index f711b40a29cda5bdd5efe51b6acb638d63047316..b3a06e47b0700f7c47d3d9aef33f443724e0c55e 100644 >--- a/Source/WebCore/dom/IdTargetObserverRegistry.cpp >+++ b/Source/WebCore/dom/IdTargetObserverRegistry.cpp >@@ -30,7 +30,7 @@ > > namespace WebCore { > >-void IdTargetObserverRegistry::addObserver(const AtomicString& id, IdTargetObserver* observer) >+void IdTargetObserverRegistry::addObserver(const AtomString& id, IdTargetObserver* observer) > { > if (id.isEmpty()) > return; >@@ -42,7 +42,7 @@ void IdTargetObserverRegistry::addObserver(const AtomicString& id, IdTargetObser > result.iterator->value->add(observer); > } > >-void IdTargetObserverRegistry::removeObserver(const AtomicString& id, IdTargetObserver* observer) >+void IdTargetObserverRegistry::removeObserver(const AtomString& id, IdTargetObserver* observer) > { > if (id.isEmpty() || m_registry.isEmpty()) > return; >@@ -55,7 +55,7 @@ void IdTargetObserverRegistry::removeObserver(const AtomicString& id, IdTargetOb > m_registry.remove(iter); > } > >-void IdTargetObserverRegistry::notifyObserversInternal(const AtomicStringImpl& id) >+void IdTargetObserverRegistry::notifyObserversInternal(const AtomStringImpl& id) > { > ASSERT(!m_registry.isEmpty()); > >diff --git a/Source/WebCore/dom/IdTargetObserverRegistry.h b/Source/WebCore/dom/IdTargetObserverRegistry.h >index edac13dd6c342a7ea0d322a86b188c45b6081a8c..a1e63ace13f3033c431a889f7a6d20d59aa7cf2a 100644 >--- a/Source/WebCore/dom/IdTargetObserverRegistry.h >+++ b/Source/WebCore/dom/IdTargetObserverRegistry.h >@@ -29,7 +29,7 @@ > #include <wtf/Forward.h> > #include <wtf/HashMap.h> > #include <wtf/HashSet.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -41,27 +41,27 @@ class IdTargetObserverRegistry { > public: > IdTargetObserverRegistry() { } > >- void notifyObservers(const AtomicString& id); >- void notifyObservers(const AtomicStringImpl& id); >+ void notifyObservers(const AtomString& id); >+ void notifyObservers(const AtomStringImpl& id); > > private: >- void addObserver(const AtomicString& id, IdTargetObserver*); >- void removeObserver(const AtomicString& id, IdTargetObserver*); >- void notifyObserversInternal(const AtomicStringImpl& id); >+ void addObserver(const AtomString& id, IdTargetObserver*); >+ void removeObserver(const AtomString& id, IdTargetObserver*); >+ void notifyObserversInternal(const AtomStringImpl& id); > > typedef HashSet<IdTargetObserver*> ObserverSet; >- typedef HashMap<const AtomicStringImpl*, std::unique_ptr<ObserverSet>> IdToObserverSetMap; >+ typedef HashMap<const AtomStringImpl*, std::unique_ptr<ObserverSet>> IdToObserverSetMap; > IdToObserverSetMap m_registry; > ObserverSet* m_notifyingObserversInSet { nullptr }; > }; > >-inline void IdTargetObserverRegistry::notifyObservers(const AtomicString& id) >+inline void IdTargetObserverRegistry::notifyObservers(const AtomString& id) > { > if (!id.isEmpty()) > return notifyObservers(*id.impl()); > } > >-inline void IdTargetObserverRegistry::notifyObservers(const AtomicStringImpl& id) >+inline void IdTargetObserverRegistry::notifyObservers(const AtomStringImpl& id) > { > ASSERT(!m_notifyingObserversInSet); > ASSERT(id.length()); >diff --git a/Source/WebCore/dom/InlineClassicScript.h b/Source/WebCore/dom/InlineClassicScript.h >index 9fa9f31f4e3f6bd67975ca616a4c2e70c7ad228b..ad4b850f1af670db780cab7f795bb20c04dc552e 100644 >--- a/Source/WebCore/dom/InlineClassicScript.h >+++ b/Source/WebCore/dom/InlineClassicScript.h >@@ -39,7 +39,7 @@ public: > bool isModuleScript() const final { return false; } > > private: >- InlineClassicScript(const String& nonce, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree) >+ InlineClassicScript(const String& nonce, const String& crossOriginMode, const String& charset, const AtomString& initiatorName, bool isInUserAgentShadowTree) > : ScriptElementCachedScriptFetcher(nonce, crossOriginMode, charset, initiatorName, isInUserAgentShadowTree) > { > } >diff --git a/Source/WebCore/dom/InlineStyleSheetOwner.cpp b/Source/WebCore/dom/InlineStyleSheetOwner.cpp >index 150a78d590316c7e14419d82acb79b804c62b8af..3b12ca45aa84ec2d85958dac8afeaaa13fcb9faa 100644 >--- a/Source/WebCore/dom/InlineStyleSheetOwner.cpp >+++ b/Source/WebCore/dom/InlineStyleSheetOwner.cpp >@@ -142,14 +142,14 @@ void InlineStyleSheetOwner::clearSheet() > sheet->clearOwnerNode(); > } > >-inline bool isValidCSSContentType(Element& element, const AtomicString& type) >+inline bool isValidCSSContentType(Element& element, const AtomString& type) > { > if (type.isEmpty()) > return true; > // FIXME: Should MIME types really be case sensitive in XML documents? Doesn't seem like they should, > // even though other things are case sensitive in that context. MIME types should never be case sensitive. > // We should verify this and then remove the isHTMLElement check here. >- static NeverDestroyed<const AtomicString> cssContentType("text/css", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> cssContentType("text/css", AtomString::ConstructFromLiteral); > return element.isHTMLElement() ? equalLettersIgnoringASCIICase(type, "text/css") : type == cssContentType; > } > >diff --git a/Source/WebCore/dom/InlineStyleSheetOwner.h b/Source/WebCore/dom/InlineStyleSheetOwner.h >index 06fae80d1f04a5213d626c9387bf20fbad808d8e..4ba0fa9cb88c4eb8bd3ff13df76a87f907a03dff 100644 >--- a/Source/WebCore/dom/InlineStyleSheetOwner.h >+++ b/Source/WebCore/dom/InlineStyleSheetOwner.h >@@ -34,8 +34,8 @@ public: > InlineStyleSheetOwner(Document&, bool createdByParser); > ~InlineStyleSheetOwner(); > >- void setContentType(const AtomicString& contentType) { m_contentType = contentType; } >- void setMedia(const AtomicString& media) { m_media = media; } >+ void setContentType(const AtomString& contentType) { m_contentType = contentType; } >+ void setMedia(const AtomString& media) { m_media = media; } > > CSSStyleSheet* sheet() const { return m_sheet.get(); } > >@@ -61,8 +61,8 @@ private: > bool m_isParsingChildren; > bool m_loading; > WTF::TextPosition m_startTextPosition; >- AtomicString m_contentType; >- AtomicString m_media; >+ AtomString m_contentType; >+ AtomString m_media; > RefPtr<CSSStyleSheet> m_sheet; > Style::Scope* m_styleScope { nullptr }; > }; >diff --git a/Source/WebCore/dom/InputEvent.cpp b/Source/WebCore/dom/InputEvent.cpp >index 040e5d5f268525b755b0102d06929a1e090d2015..0e9aeee762a7b6f42b688e4332f192f8194d29b1 100644 >--- a/Source/WebCore/dom/InputEvent.cpp >+++ b/Source/WebCore/dom/InputEvent.cpp >@@ -33,12 +33,12 @@ > > namespace WebCore { > >-Ref<InputEvent> InputEvent::create(const AtomicString& eventType, const String& inputType, IsCancelable cancelable, RefPtr<WindowProxy>&& view, const String& data, RefPtr<DataTransfer>&& dataTransfer, const Vector<RefPtr<StaticRange>>& targetRanges, int detail) >+Ref<InputEvent> InputEvent::create(const AtomString& eventType, const String& inputType, IsCancelable cancelable, RefPtr<WindowProxy>&& view, const String& data, RefPtr<DataTransfer>&& dataTransfer, const Vector<RefPtr<StaticRange>>& targetRanges, int detail) > { > return adoptRef(*new InputEvent(eventType, inputType, cancelable, WTFMove(view), data, WTFMove(dataTransfer), targetRanges, detail)); > } > >-InputEvent::InputEvent(const AtomicString& eventType, const String& inputType, IsCancelable cancelable, RefPtr<WindowProxy>&& view, const String& data, RefPtr<DataTransfer>&& dataTransfer, const Vector<RefPtr<StaticRange>>& targetRanges, int detail) >+InputEvent::InputEvent(const AtomString& eventType, const String& inputType, IsCancelable cancelable, RefPtr<WindowProxy>&& view, const String& data, RefPtr<DataTransfer>&& dataTransfer, const Vector<RefPtr<StaticRange>>& targetRanges, int detail) > : UIEvent(eventType, CanBubble::Yes, cancelable, IsComposed::Yes, WTFMove(view), detail) > , m_inputType(inputType) > , m_data(data) >@@ -47,7 +47,7 @@ InputEvent::InputEvent(const AtomicString& eventType, const String& inputType, I > { > } > >-InputEvent::InputEvent(const AtomicString& eventType, const Init& initializer) >+InputEvent::InputEvent(const AtomString& eventType, const Init& initializer) > : UIEvent(eventType, initializer) > , m_inputType(emptyString()) > , m_data(initializer.data) >diff --git a/Source/WebCore/dom/InputEvent.h b/Source/WebCore/dom/InputEvent.h >index b333bfe90af219d2597dabe36383cd96ab6b8e51..3e708a3c579a03ce4977b7a696e54d98c28f0c00 100644 >--- a/Source/WebCore/dom/InputEvent.h >+++ b/Source/WebCore/dom/InputEvent.h >@@ -39,10 +39,10 @@ public: > String data; > }; > >- static Ref<InputEvent> create(const AtomicString& eventType, const String& inputType, IsCancelable, RefPtr<WindowProxy>&& view, >+ static Ref<InputEvent> create(const AtomString& eventType, const String& inputType, IsCancelable, RefPtr<WindowProxy>&& view, > const String& data, RefPtr<DataTransfer>&&, const Vector<RefPtr<StaticRange>>& targetRanges, int detail); > >- static Ref<InputEvent> create(const AtomicString& type, const Init& initializer) >+ static Ref<InputEvent> create(const AtomString& type, const Init& initializer) > { > return adoptRef(*new InputEvent(type, initializer)); > } >@@ -55,8 +55,8 @@ public: > const Vector<RefPtr<StaticRange>>& getTargetRanges() { return m_targetRanges; } > > private: >- InputEvent(const AtomicString& eventType, const String& inputType, IsCancelable, RefPtr<WindowProxy>&&, const String& data, RefPtr<DataTransfer>&&, const Vector<RefPtr<StaticRange>>& targetRanges, int detail); >- InputEvent(const AtomicString& eventType, const Init&); >+ InputEvent(const AtomString& eventType, const String& inputType, IsCancelable, RefPtr<WindowProxy>&&, const String& data, RefPtr<DataTransfer>&&, const Vector<RefPtr<StaticRange>>& targetRanges, int detail); >+ InputEvent(const AtomString& eventType, const Init&); > > String m_inputType; > String m_data; >diff --git a/Source/WebCore/dom/KeyboardEvent.cpp b/Source/WebCore/dom/KeyboardEvent.cpp >index 4ec6c9e9251e198317c305d678c3a482c6bcfb5d..7e7a34797b8629f62f7f786ab14c5c6f5bd90b14 100644 >--- a/Source/WebCore/dom/KeyboardEvent.cpp >+++ b/Source/WebCore/dom/KeyboardEvent.cpp >@@ -34,7 +34,7 @@ > > namespace WebCore { > >-static inline const AtomicString& eventTypeForKeyboardEventType(PlatformEvent::Type type) >+static inline const AtomString& eventTypeForKeyboardEventType(PlatformEvent::Type type) > { > switch (type) { > case PlatformEvent::KeyUp: >@@ -116,7 +116,7 @@ inline KeyboardEvent::KeyboardEvent(const PlatformKeyboardEvent& key, RefPtr<Win > { > } > >-inline KeyboardEvent::KeyboardEvent(const AtomicString& eventType, const Init& initializer) >+inline KeyboardEvent::KeyboardEvent(const AtomString& eventType, const Init& initializer) > : UIEventWithKeyState(eventType, initializer) > #if ENABLE(KEYBOARD_KEY_ATTRIBUTE) > , m_key(initializer.key) >@@ -146,12 +146,12 @@ Ref<KeyboardEvent> KeyboardEvent::createForBindings() > return adoptRef(*new KeyboardEvent); > } > >-Ref<KeyboardEvent> KeyboardEvent::create(const AtomicString& type, const Init& initializer) >+Ref<KeyboardEvent> KeyboardEvent::create(const AtomString& type, const Init& initializer) > { > return adoptRef(*new KeyboardEvent(type, initializer)); > } > >-void KeyboardEvent::initKeyboardEvent(const AtomicString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&& view, >+void KeyboardEvent::initKeyboardEvent(const AtomString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&& view, > const String& keyIdentifier, unsigned location, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool altGraphKey) > { > if (isBeingDispatched()) >diff --git a/Source/WebCore/dom/KeyboardEvent.h b/Source/WebCore/dom/KeyboardEvent.h >index b7340b304fb8785f09c385c2724165822a56ce84..e256e8b0fd84468e24430660fa483642f74c3cf9 100644 >--- a/Source/WebCore/dom/KeyboardEvent.h >+++ b/Source/WebCore/dom/KeyboardEvent.h >@@ -61,11 +61,11 @@ public: > unsigned which; > }; > >- static Ref<KeyboardEvent> create(const AtomicString& type, const Init&); >+ static Ref<KeyboardEvent> create(const AtomString& type, const Init&); > > virtual ~KeyboardEvent(); > >- WEBCORE_EXPORT void initKeyboardEvent(const AtomicString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&&, >+ WEBCORE_EXPORT void initKeyboardEvent(const AtomString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&&, > const String& keyIdentifier, unsigned location, > bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool altGraphKey = false); > >@@ -101,7 +101,7 @@ public: > private: > KeyboardEvent(); > KeyboardEvent(const PlatformKeyboardEvent&, RefPtr<WindowProxy>&&); >- KeyboardEvent(const AtomicString&, const Init&); >+ KeyboardEvent(const AtomString&, const Init&); > > std::unique_ptr<PlatformKeyboardEvent> m_underlyingPlatformEvent; > #if ENABLE(KEYBOARD_KEY_ATTRIBUTE) >diff --git a/Source/WebCore/dom/LoadableClassicScript.cpp b/Source/WebCore/dom/LoadableClassicScript.cpp >index d927e95be269a25ae4336a74b00027c1758fe48a..739dbf4d9a2c5293fe97728f654fe8c74b62ec58 100644 >--- a/Source/WebCore/dom/LoadableClassicScript.cpp >+++ b/Source/WebCore/dom/LoadableClassicScript.cpp >@@ -35,7 +35,7 @@ > > namespace WebCore { > >-Ref<LoadableClassicScript> LoadableClassicScript::create(const String& nonce, const String& integrityMetadata, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree) >+Ref<LoadableClassicScript> LoadableClassicScript::create(const String& nonce, const String& integrityMetadata, const String& crossOriginMode, const String& charset, const AtomString& initiatorName, bool isInUserAgentShadowTree) > { > return adoptRef(*new LoadableClassicScript(nonce, integrityMetadata, crossOriginMode, charset, initiatorName, isInUserAgentShadowTree)); > } >diff --git a/Source/WebCore/dom/LoadableClassicScript.h b/Source/WebCore/dom/LoadableClassicScript.h >index 067644a47d1f9d902b4e196aaeffa8a6f95d4f0f..381b5a18bd15e0a89265168040fbfdd045962ded 100644 >--- a/Source/WebCore/dom/LoadableClassicScript.h >+++ b/Source/WebCore/dom/LoadableClassicScript.h >@@ -40,7 +40,7 @@ class LoadableClassicScript final : public LoadableScript, private CachedResourc > public: > virtual ~LoadableClassicScript(); > >- static Ref<LoadableClassicScript> create(const String& nonce, const String& integrity, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree); >+ static Ref<LoadableClassicScript> create(const String& nonce, const String& integrity, const String& crossOriginMode, const String& charset, const AtomString& initiatorName, bool isInUserAgentShadowTree); > bool isLoaded() const final; > Optional<Error> error() const final; > bool wasCanceled() const final; >@@ -55,7 +55,7 @@ public: > bool load(Document&, const URL&); > > private: >- LoadableClassicScript(const String& nonce, const String& integrity, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree) >+ LoadableClassicScript(const String& nonce, const String& integrity, const String& crossOriginMode, const String& charset, const AtomString& initiatorName, bool isInUserAgentShadowTree) > : LoadableScript(nonce, crossOriginMode, charset, initiatorName, isInUserAgentShadowTree) > , m_integrity(integrity) > { >diff --git a/Source/WebCore/dom/LoadableModuleScript.cpp b/Source/WebCore/dom/LoadableModuleScript.cpp >index 322cd3a7392c9bf0e4570d571275daa367748e21..db94fe4ee5d525ce15ed1fc710394c2cf25223a6 100644 >--- a/Source/WebCore/dom/LoadableModuleScript.cpp >+++ b/Source/WebCore/dom/LoadableModuleScript.cpp >@@ -34,12 +34,12 @@ > > namespace WebCore { > >-Ref<LoadableModuleScript> LoadableModuleScript::create(const String& nonce, const String& integrity, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree) >+Ref<LoadableModuleScript> LoadableModuleScript::create(const String& nonce, const String& integrity, const String& crossOriginMode, const String& charset, const AtomString& initiatorName, bool isInUserAgentShadowTree) > { > return adoptRef(*new LoadableModuleScript(nonce, integrity, crossOriginMode, charset, initiatorName, isInUserAgentShadowTree)); > } > >-LoadableModuleScript::LoadableModuleScript(const String& nonce, const String& integrity, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree) >+LoadableModuleScript::LoadableModuleScript(const String& nonce, const String& integrity, const String& crossOriginMode, const String& charset, const AtomString& initiatorName, bool isInUserAgentShadowTree) > : LoadableScript(nonce, crossOriginMode, charset, initiatorName, isInUserAgentShadowTree) > , m_parameters(ModuleFetchParameters::create(integrity)) > { >diff --git a/Source/WebCore/dom/LoadableModuleScript.h b/Source/WebCore/dom/LoadableModuleScript.h >index 173dca36aa174c3813182490d1aec6f6f7af64d5..90aa36709ae7a5fe2450426ba2b69934e1fe13ba 100644 >--- a/Source/WebCore/dom/LoadableModuleScript.h >+++ b/Source/WebCore/dom/LoadableModuleScript.h >@@ -37,7 +37,7 @@ class LoadableModuleScript final : public LoadableScript { > public: > virtual ~LoadableModuleScript(); > >- static Ref<LoadableModuleScript> create(const String& nonce, const String& integrity, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree); >+ static Ref<LoadableModuleScript> create(const String& nonce, const String& integrity, const String& crossOriginMode, const String& charset, const AtomString& initiatorName, bool isInUserAgentShadowTree); > > bool isLoaded() const final; > Optional<Error> error() const final; >@@ -60,7 +60,7 @@ public: > UniquedStringImpl* moduleKey() const { return m_moduleKey.get(); } > > private: >- LoadableModuleScript(const String& nonce, const String& integrity, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree); >+ LoadableModuleScript(const String& nonce, const String& integrity, const String& crossOriginMode, const String& charset, const AtomString& initiatorName, bool isInUserAgentShadowTree); > > Ref<ModuleFetchParameters> m_parameters; > RefPtr<UniquedStringImpl> m_moduleKey; >diff --git a/Source/WebCore/dom/LoadableScript.h b/Source/WebCore/dom/LoadableScript.h >index 670badf34d8caddd3e5a8ab106a1bc35c4826027..bfea29302dacb96b88e6ea62c583a78071ba57fc 100644 >--- a/Source/WebCore/dom/LoadableScript.h >+++ b/Source/WebCore/dom/LoadableScript.h >@@ -68,7 +68,7 @@ public: > void removeClient(LoadableScriptClient&); > > protected: >- LoadableScript(const String& nonce, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree) >+ LoadableScript(const String& nonce, const String& crossOriginMode, const String& charset, const AtomString& initiatorName, bool isInUserAgentShadowTree) > : ScriptElementCachedScriptFetcher(nonce, crossOriginMode, charset, initiatorName, isInUserAgentShadowTree) > { > } >diff --git a/Source/WebCore/dom/MessageEvent.cpp b/Source/WebCore/dom/MessageEvent.cpp >index afb24e5b76bec8baead175f79d081111ccab0881..3e4786d889b3ac67166ab8697898e70afc24fbd5 100644 >--- a/Source/WebCore/dom/MessageEvent.cpp >+++ b/Source/WebCore/dom/MessageEvent.cpp >@@ -38,7 +38,7 @@ using namespace JSC; > > MessageEvent::MessageEvent() = default; > >-inline MessageEvent::MessageEvent(const AtomicString& type, Init&& initializer, IsTrusted isTrusted) >+inline MessageEvent::MessageEvent(const AtomString& type, Init&& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_data(JSValueInWrappedObject { initializer.data }) > , m_origin(initializer.origin) >@@ -58,7 +58,7 @@ inline MessageEvent::MessageEvent(DataType&& data, const String& origin, const S > { > } > >-inline MessageEvent::MessageEvent(const AtomicString& type, Ref<SerializedScriptValue>&& data, const String& origin, const String& lastEventId) >+inline MessageEvent::MessageEvent(const AtomString& type, Ref<SerializedScriptValue>&& data, const String& origin, const String& lastEventId) > : Event(type, CanBubble::No, IsCancelable::No) > , m_data(WTFMove(data)) > , m_origin(origin) >@@ -71,7 +71,7 @@ Ref<MessageEvent> MessageEvent::create(Vector<RefPtr<MessagePort>>&& ports, Ref< > return adoptRef(*new MessageEvent(WTFMove(data), origin, lastEventId, WTFMove(source), WTFMove(ports))); > } > >-Ref<MessageEvent> MessageEvent::create(const AtomicString& type, Ref<SerializedScriptValue>&& data, const String& origin, const String& lastEventId) >+Ref<MessageEvent> MessageEvent::create(const AtomString& type, Ref<SerializedScriptValue>&& data, const String& origin, const String& lastEventId) > { > return adoptRef(*new MessageEvent(type, WTFMove(data), origin, lastEventId)); > } >@@ -96,14 +96,14 @@ Ref<MessageEvent> MessageEvent::createForBindings() > return adoptRef(*new MessageEvent); > } > >-Ref<MessageEvent> MessageEvent::create(const AtomicString& type, Init&& initializer, IsTrusted isTrusted) >+Ref<MessageEvent> MessageEvent::create(const AtomString& type, Init&& initializer, IsTrusted isTrusted) > { > return adoptRef(*new MessageEvent(type, WTFMove(initializer), isTrusted)); > } > > MessageEvent::~MessageEvent() = default; > >-void MessageEvent::initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, JSValue data, const String& origin, const String& lastEventId, Optional<MessageEventSource>&& source, Vector<RefPtr<MessagePort>>&& ports) >+void MessageEvent::initMessageEvent(const AtomString& type, bool canBubble, bool cancelable, JSValue data, const String& origin, const String& lastEventId, Optional<MessageEventSource>&& source, Vector<RefPtr<MessagePort>>&& ports) > { > if (isBeingDispatched()) > return; >diff --git a/Source/WebCore/dom/MessageEvent.h b/Source/WebCore/dom/MessageEvent.h >index 9216968263260d51047fcf62683abad24547187d..148831a601c4729b06b1dc494302e85c5010f7fb 100644 >--- a/Source/WebCore/dom/MessageEvent.h >+++ b/Source/WebCore/dom/MessageEvent.h >@@ -48,7 +48,7 @@ using MessageEventSource = Variant<RefPtr<WindowProxy>, RefPtr<MessagePort>>; > class MessageEvent final : public Event { > public: > static Ref<MessageEvent> create(Vector<RefPtr<MessagePort>>&&, Ref<SerializedScriptValue>&&, const String& origin = { }, const String& lastEventId = { }, Optional<MessageEventSource>&& source = WTF::nullopt); >- static Ref<MessageEvent> create(const AtomicString& type, Ref<SerializedScriptValue>&&, const String& origin, const String& lastEventId); >+ static Ref<MessageEvent> create(const AtomString& type, Ref<SerializedScriptValue>&&, const String& origin, const String& lastEventId); > static Ref<MessageEvent> create(const String& data, const String& origin = { }); > static Ref<MessageEvent> create(Ref<Blob>&& data, const String& origin); > static Ref<MessageEvent> create(Ref<ArrayBuffer>&& data, const String& origin = { }); >@@ -61,11 +61,11 @@ public: > Optional<MessageEventSource> source; > Vector<RefPtr<MessagePort>> ports; > }; >- static Ref<MessageEvent> create(const AtomicString& type, Init&&, IsTrusted = IsTrusted::No); >+ static Ref<MessageEvent> create(const AtomString& type, Init&&, IsTrusted = IsTrusted::No); > > virtual ~MessageEvent(); > >- void initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, JSC::JSValue data, const String& origin, const String& lastEventId, Optional<MessageEventSource>&&, Vector<RefPtr<MessagePort>>&&); >+ void initMessageEvent(const AtomString& type, bool canBubble, bool cancelable, JSC::JSValue data, const String& origin, const String& lastEventId, Optional<MessageEventSource>&&, Vector<RefPtr<MessagePort>>&&); > > const String& origin() const { return m_origin; } > const String& lastEventId() const { return m_lastEventId; } >@@ -80,8 +80,8 @@ public: > > private: > MessageEvent(); >- MessageEvent(const AtomicString& type, Init&&, IsTrusted); >- MessageEvent(const AtomicString& type, Ref<SerializedScriptValue>&& data, const String& origin, const String& lastEventId); >+ MessageEvent(const AtomString& type, Init&&, IsTrusted); >+ MessageEvent(const AtomString& type, Ref<SerializedScriptValue>&& data, const String& origin, const String& lastEventId); > MessageEvent(DataType&&, const String& origin, const String& lastEventId = { }, Optional<MessageEventSource>&& = WTF::nullopt, Vector<RefPtr<MessagePort>>&& = { }); > > EventInterface eventInterface() const final; >diff --git a/Source/WebCore/dom/MessagePort.cpp b/Source/WebCore/dom/MessagePort.cpp >index a029b3d71e7e94604d8193c091540c3a41a27e03..adf1337d99bfef236da8372fdb52c7a34b5dec61 100644 >--- a/Source/WebCore/dom/MessagePort.cpp >+++ b/Source/WebCore/dom/MessagePort.cpp >@@ -401,7 +401,7 @@ Vector<RefPtr<MessagePort>> MessagePort::entanglePorts(ScriptExecutionContext& c > return ports; > } > >-bool MessagePort::addEventListener(const AtomicString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) >+bool MessagePort::addEventListener(const AtomString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) > { > if (eventType == eventNames().messageEvent) { > if (listener->isAttribute()) >@@ -413,7 +413,7 @@ bool MessagePort::addEventListener(const AtomicString& eventType, Ref<EventListe > return EventTargetWithInlineData::addEventListener(eventType, WTFMove(listener), options); > } > >-bool MessagePort::removeEventListener(const AtomicString& eventType, EventListener& listener, const ListenerOptions& options) >+bool MessagePort::removeEventListener(const AtomString& eventType, EventListener& listener, const ListenerOptions& options) > { > auto result = EventTargetWithInlineData::removeEventListener(eventType, listener, options); > >diff --git a/Source/WebCore/dom/MessagePort.h b/Source/WebCore/dom/MessagePort.h >index ef272d3e5bd159db5eda3db0be1f20a1721f144b..8cfb62db0e63e57ca036ac4896e2d3ae9d43f0ad 100644 >--- a/Source/WebCore/dom/MessagePort.h >+++ b/Source/WebCore/dom/MessagePort.h >@@ -99,8 +99,8 @@ public: > private: > explicit MessagePort(ScriptExecutionContext&, const MessagePortIdentifier& local, const MessagePortIdentifier& remote); > >- bool addEventListener(const AtomicString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) final; >- bool removeEventListener(const AtomicString& eventType, EventListener&, const ListenerOptions&) final; >+ bool addEventListener(const AtomString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) final; >+ bool removeEventListener(const AtomString& eventType, EventListener&, const ListenerOptions&) final; > > void disentangle(); > >diff --git a/Source/WebCore/dom/MouseEvent.cpp b/Source/WebCore/dom/MouseEvent.cpp >index f2516f75ecdabf672025bb190904fdef247ab844..5cfafa4113183a52913be15bccad3193f58a40d3 100644 >--- a/Source/WebCore/dom/MouseEvent.cpp >+++ b/Source/WebCore/dom/MouseEvent.cpp >@@ -39,12 +39,12 @@ namespace WebCore { > > using namespace JSC; > >-Ref<MouseEvent> MouseEvent::create(const AtomicString& type, const MouseEventInit& initializer) >+Ref<MouseEvent> MouseEvent::create(const AtomString& type, const MouseEventInit& initializer) > { > return adoptRef(*new MouseEvent(type, initializer)); > } > >-Ref<MouseEvent> MouseEvent::create(const AtomicString& eventType, RefPtr<WindowProxy>&& view, const PlatformMouseEvent& event, int detail, Node* relatedTarget) >+Ref<MouseEvent> MouseEvent::create(const AtomString& eventType, RefPtr<WindowProxy>&& view, const PlatformMouseEvent& event, int detail, Node* relatedTarget) > { > bool isMouseEnterOrLeave = eventType == eventNames().mouseenterEvent || eventType == eventNames().mouseleaveEvent; > auto isCancelable = eventType != eventNames().mousemoveEvent && !isMouseEnterOrLeave ? IsCancelable::Yes : IsCancelable::No; >@@ -61,7 +61,7 @@ Ref<MouseEvent> MouseEvent::create(const AtomicString& eventType, RefPtr<WindowP > event.modifiers(), event.button(), event.buttons(), relatedTarget, event.force(), event.syntheticClickType()); > } > >-Ref<MouseEvent> MouseEvent::create(const AtomicString& type, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, MonotonicTime timestamp, RefPtr<WindowProxy>&& view, int detail, >+Ref<MouseEvent> MouseEvent::create(const AtomString& type, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, MonotonicTime timestamp, RefPtr<WindowProxy>&& view, int detail, > const IntPoint& screenLocation, const IntPoint& windowLocation, const IntPoint& movementDelta, OptionSet<Modifier> modifiers, short button, unsigned short buttons, > EventTarget* relatedTarget, double force, unsigned short syntheticClickType, DataTransfer* dataTransfer, IsSimulated isSimulated, IsTrusted isTrusted) > { >@@ -69,7 +69,7 @@ Ref<MouseEvent> MouseEvent::create(const AtomicString& type, CanBubble canBubble > screenLocation, windowLocation, movementDelta, modifiers, button, buttons, relatedTarget, force, syntheticClickType, dataTransfer, isSimulated, isTrusted)); > } > >-Ref<MouseEvent> MouseEvent::create(const AtomicString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, RefPtr<WindowProxy>&& view, int detail, >+Ref<MouseEvent> MouseEvent::create(const AtomString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, RefPtr<WindowProxy>&& view, int detail, > int screenX, int screenY, int clientX, int clientY, OptionSet<Modifier> modifiers, short button, unsigned short buttons, > unsigned short syntheticClickType, EventTarget* relatedTarget) > { >@@ -78,7 +78,7 @@ Ref<MouseEvent> MouseEvent::create(const AtomicString& eventType, CanBubble canB > > MouseEvent::MouseEvent() = default; > >-MouseEvent::MouseEvent(const AtomicString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, >+MouseEvent::MouseEvent(const AtomString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, > MonotonicTime timestamp, RefPtr<WindowProxy>&& view, int detail, > const IntPoint& screenLocation, const IntPoint& windowLocation, const IntPoint& movementDelta, OptionSet<Modifier> modifiers, short button, unsigned short buttons, > EventTarget* relatedTarget, double force, unsigned short syntheticClickType, DataTransfer* dataTransfer, IsSimulated isSimulated, IsTrusted isTrusted) >@@ -93,7 +93,7 @@ MouseEvent::MouseEvent(const AtomicString& eventType, CanBubble canBubble, IsCan > { > } > >-MouseEvent::MouseEvent(const AtomicString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, >+MouseEvent::MouseEvent(const AtomString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, > RefPtr<WindowProxy>&& view, int detail, const IntPoint& screenLocation, const IntPoint& clientLocation, > OptionSet<Modifier> modifiers, short button, unsigned short buttons, unsigned short syntheticClickType, EventTarget* relatedTarget) > : MouseRelatedEvent(eventType, canBubble, isCancelable, isComposed, MonotonicTime::now(), WTFMove(view), detail, screenLocation, { }, { }, modifiers, IsSimulated::No) >@@ -106,7 +106,7 @@ MouseEvent::MouseEvent(const AtomicString& eventType, CanBubble canBubble, IsCan > initCoordinates(clientLocation); > } > >-MouseEvent::MouseEvent(const AtomicString& eventType, const MouseEventInit& initializer) >+MouseEvent::MouseEvent(const AtomString& eventType, const MouseEventInit& initializer) > : MouseRelatedEvent(eventType, initializer) > , m_button(initializer.button == -2 ? 0 : initializer.button) > , m_buttons(initializer.buttons) >@@ -118,7 +118,7 @@ MouseEvent::MouseEvent(const AtomicString& eventType, const MouseEventInit& init > > MouseEvent::~MouseEvent() = default; > >-void MouseEvent::initMouseEvent(const AtomicString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&& view, int detail, >+void MouseEvent::initMouseEvent(const AtomString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&& view, int detail, > int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, short button, EventTarget* relatedTarget) > { > if (isBeingDispatched()) >@@ -141,7 +141,7 @@ void MouseEvent::initMouseEvent(const AtomicString& type, bool canBubble, bool c > > // FIXME: We need this quirk because iAd Producer is calling this function with a relatedTarget that is not an EventTarget (rdar://problem/30640101). > // We should remove this quirk when possible. >-void MouseEvent::initMouseEventQuirk(ExecState& state, ScriptExecutionContext& scriptExecutionContext, const AtomicString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&& view, int detail, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, short button, JSValue relatedTargetValue) >+void MouseEvent::initMouseEventQuirk(ExecState& state, ScriptExecutionContext& scriptExecutionContext, const AtomString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&& view, int detail, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, short button, JSValue relatedTargetValue) > { > EventTarget* relatedTarget = nullptr; > #if PLATFORM(MAC) >diff --git a/Source/WebCore/dom/MouseEvent.h b/Source/WebCore/dom/MouseEvent.h >index cf8200d72e3d813960c54939d932ad623e85ae5f..f460d012cd05aa9b6bd2d1140b760d688beb4208 100644 >--- a/Source/WebCore/dom/MouseEvent.h >+++ b/Source/WebCore/dom/MouseEvent.h >@@ -39,19 +39,19 @@ class PlatformMouseEvent; > > class MouseEvent : public MouseRelatedEvent { > public: >- WEBCORE_EXPORT static Ref<MouseEvent> create(const AtomicString& type, CanBubble, IsCancelable, IsComposed, MonotonicTime timestamp, RefPtr<WindowProxy>&&, int detail, >+ WEBCORE_EXPORT static Ref<MouseEvent> create(const AtomString& type, CanBubble, IsCancelable, IsComposed, MonotonicTime timestamp, RefPtr<WindowProxy>&&, int detail, > const IntPoint& screenLocation, const IntPoint& windowLocation, const IntPoint& movementDelta, OptionSet<Modifier>, short button, unsigned short buttons, > EventTarget* relatedTarget, double force, unsigned short syntheticClickType, DataTransfer* = nullptr, IsSimulated = IsSimulated::No, IsTrusted = IsTrusted::Yes); > >- WEBCORE_EXPORT static Ref<MouseEvent> create(const AtomicString& eventType, RefPtr<WindowProxy>&&, const PlatformMouseEvent&, int detail, Node* relatedTarget); >+ WEBCORE_EXPORT static Ref<MouseEvent> create(const AtomString& eventType, RefPtr<WindowProxy>&&, const PlatformMouseEvent&, int detail, Node* relatedTarget); > >- static Ref<MouseEvent> create(const AtomicString& eventType, CanBubble, IsCancelable, IsComposed, RefPtr<WindowProxy>&&, int detail, >+ static Ref<MouseEvent> create(const AtomString& eventType, CanBubble, IsCancelable, IsComposed, RefPtr<WindowProxy>&&, int detail, > int screenX, int screenY, int clientX, int clientY, OptionSet<Modifier>, short button, unsigned short buttons, > unsigned short syntheticClickType, EventTarget* relatedTarget); > > static Ref<MouseEvent> createForBindings() { return adoptRef(*new MouseEvent); } > >- static Ref<MouseEvent> create(const AtomicString& eventType, const MouseEventInit&); >+ static Ref<MouseEvent> create(const AtomString& eventType, const MouseEventInit&); > > #if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS_FAMILY) > static Ref<MouseEvent> create(const PlatformTouchEvent&, unsigned touchIndex, Ref<WindowProxy>&&); >@@ -59,11 +59,11 @@ public: > > virtual ~MouseEvent(); > >- WEBCORE_EXPORT void initMouseEvent(const AtomicString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&&, >+ WEBCORE_EXPORT void initMouseEvent(const AtomString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&&, > int detail, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, > short button, EventTarget* relatedTarget); > >- void initMouseEventQuirk(JSC::ExecState&, ScriptExecutionContext&, const AtomicString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&&, >+ void initMouseEventQuirk(JSC::ExecState&, ScriptExecutionContext&, const AtomString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&&, > int detail, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, > short button, JSC::JSValue relatedTarget); > >@@ -85,15 +85,15 @@ public: > int which() const final; > > protected: >- MouseEvent(const AtomicString& type, CanBubble, IsCancelable, IsComposed, MonotonicTime timestamp, RefPtr<WindowProxy>&&, int detail, >+ MouseEvent(const AtomString& type, CanBubble, IsCancelable, IsComposed, MonotonicTime timestamp, RefPtr<WindowProxy>&&, int detail, > const IntPoint& screenLocation, const IntPoint& windowLocation, const IntPoint& movementDelta, OptionSet<Modifier>, short button, unsigned short buttons, > EventTarget* relatedTarget, double force, unsigned short syntheticClickType, DataTransfer*, IsSimulated, IsTrusted); > >- MouseEvent(const AtomicString& type, CanBubble, IsCancelable, IsComposed, RefPtr<WindowProxy>&&, int detail, >+ MouseEvent(const AtomString& type, CanBubble, IsCancelable, IsComposed, RefPtr<WindowProxy>&&, int detail, > const IntPoint& screenLocation, const IntPoint& clientLocation, OptionSet<Modifier>, short button, unsigned short buttons, > unsigned short syntheticClickType, EventTarget* relatedTarget); > >- MouseEvent(const AtomicString& type, const MouseEventInit&); >+ MouseEvent(const AtomString& type, const MouseEventInit&); > > MouseEvent(); > >diff --git a/Source/WebCore/dom/MouseRelatedEvent.cpp b/Source/WebCore/dom/MouseRelatedEvent.cpp >index 73fed4571acdb443766bcd6881fe30bd0cd9c1e4..94c7e65c4158d3a961058ed2c11298a2a17ad9e4 100644 >--- a/Source/WebCore/dom/MouseRelatedEvent.cpp >+++ b/Source/WebCore/dom/MouseRelatedEvent.cpp >@@ -33,7 +33,7 @@ > > namespace WebCore { > >-MouseRelatedEvent::MouseRelatedEvent(const AtomicString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, >+MouseRelatedEvent::MouseRelatedEvent(const AtomString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, > MonotonicTime timestamp, RefPtr<WindowProxy>&& view, int detail, > const IntPoint& screenLocation, const IntPoint& windowLocation, const IntPoint& movementDelta, OptionSet<Modifier> modifiers, IsSimulated isSimulated, IsTrusted isTrusted) > : UIEventWithKeyState(eventType, canBubble, isCancelable, isComposed, timestamp, WTFMove(view), detail, modifiers, isTrusted) >@@ -49,13 +49,13 @@ MouseRelatedEvent::MouseRelatedEvent(const AtomicString& eventType, CanBubble ca > init(m_isSimulated, windowLocation); > } > >-MouseRelatedEvent::MouseRelatedEvent(const AtomicString& type, IsCancelable isCancelable, MonotonicTime timestamp, RefPtr<WindowProxy>&& view, const IntPoint& globalLocation, OptionSet<Modifier> modifiers) >+MouseRelatedEvent::MouseRelatedEvent(const AtomString& type, IsCancelable isCancelable, MonotonicTime timestamp, RefPtr<WindowProxy>&& view, const IntPoint& globalLocation, OptionSet<Modifier> modifiers) > : MouseRelatedEvent(type, CanBubble::Yes, isCancelable, IsComposed::Yes, timestamp, > WTFMove(view), 0, globalLocation, globalLocation /* Converted in init */, { }, modifiers, IsSimulated::No) > { > } > >-MouseRelatedEvent::MouseRelatedEvent(const AtomicString& eventType, const MouseRelatedEventInit& initializer, IsTrusted isTrusted) >+MouseRelatedEvent::MouseRelatedEvent(const AtomString& eventType, const MouseRelatedEventInit& initializer, IsTrusted isTrusted) > : UIEventWithKeyState(eventType, initializer) > , m_screenLocation(IntPoint(initializer.screenX, initializer.screenY)) > #if ENABLE(POINTER_LOCK) >diff --git a/Source/WebCore/dom/MouseRelatedEvent.h b/Source/WebCore/dom/MouseRelatedEvent.h >index 930d90d714b3567a7766e2aecb2e614d79567560..209214cd9de4adf70fb23769598afcf48d6b3a64 100644 >--- a/Source/WebCore/dom/MouseRelatedEvent.h >+++ b/Source/WebCore/dom/MouseRelatedEvent.h >@@ -76,11 +76,11 @@ public: > > protected: > MouseRelatedEvent() = default; >- MouseRelatedEvent(const AtomicString& type, CanBubble, IsCancelable, IsComposed, MonotonicTime, RefPtr<WindowProxy>&&, int detail, >+ MouseRelatedEvent(const AtomString& type, CanBubble, IsCancelable, IsComposed, MonotonicTime, RefPtr<WindowProxy>&&, int detail, > const IntPoint& screenLocation, const IntPoint& windowLocation, const IntPoint& movementDelta, OptionSet<Modifier> modifiers, > IsSimulated = IsSimulated::No, IsTrusted = IsTrusted::Yes); >- MouseRelatedEvent(const AtomicString& type, IsCancelable, MonotonicTime, RefPtr<WindowProxy>&&, const IntPoint& globalLocation, OptionSet<Modifier>); >- MouseRelatedEvent(const AtomicString& type, const MouseRelatedEventInit&, IsTrusted = IsTrusted::No); >+ MouseRelatedEvent(const AtomString& type, IsCancelable, MonotonicTime, RefPtr<WindowProxy>&&, const IntPoint& globalLocation, OptionSet<Modifier>); >+ MouseRelatedEvent(const AtomString& type, const MouseRelatedEventInit&, IsTrusted = IsTrusted::No); > > void initCoordinates(); > void initCoordinates(const LayoutPoint& clientLocation); >diff --git a/Source/WebCore/dom/MutationEvent.cpp b/Source/WebCore/dom/MutationEvent.cpp >index 13a7c2256632580210400534ac8156f30fc4e76a..d6cafec145ba5dea920574a54b485e78eeb27e24 100644 >--- a/Source/WebCore/dom/MutationEvent.cpp >+++ b/Source/WebCore/dom/MutationEvent.cpp >@@ -25,7 +25,7 @@ > > namespace WebCore { > >-MutationEvent::MutationEvent(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, Node* relatedNode, const String& prevValue, const String& newValue) >+MutationEvent::MutationEvent(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, Node* relatedNode, const String& prevValue, const String& newValue) > : Event(type, canBubble, cancelable) > , m_relatedNode(relatedNode) > , m_prevValue(prevValue) >@@ -33,7 +33,7 @@ MutationEvent::MutationEvent(const AtomicString& type, CanBubble canBubble, IsCa > { > } > >-void MutationEvent::initMutationEvent(const AtomicString& type, bool canBubble, bool cancelable, Node* relatedNode, const String& prevValue, const String& newValue, const String& attrName, unsigned short attrChange) >+void MutationEvent::initMutationEvent(const AtomString& type, bool canBubble, bool cancelable, Node* relatedNode, const String& prevValue, const String& newValue, const String& attrName, unsigned short attrChange) > { > if (isBeingDispatched()) > return; >diff --git a/Source/WebCore/dom/MutationEvent.h b/Source/WebCore/dom/MutationEvent.h >index e58ed187acb1c2b87186d1929fdb2905a3ff1a3b..3ba6cee071d722fc33188defd2d18c03c3d9b17d 100644 >--- a/Source/WebCore/dom/MutationEvent.h >+++ b/Source/WebCore/dom/MutationEvent.h >@@ -36,7 +36,7 @@ public: > REMOVAL = 3 > }; > >- static Ref<MutationEvent> create(const AtomicString& type, CanBubble canBubble, Node* relatedNode = nullptr, const String& prevValue = String(), const String& newValue = String()) >+ static Ref<MutationEvent> create(const AtomString& type, CanBubble canBubble, Node* relatedNode = nullptr, const String& prevValue = String(), const String& newValue = String()) > { > return adoptRef(*new MutationEvent(type, canBubble, IsCancelable::No, relatedNode, prevValue, newValue)); > } >@@ -46,7 +46,7 @@ public: > return adoptRef(*new MutationEvent); > } > >- WEBCORE_EXPORT void initMutationEvent(const AtomicString& type, bool canBubble, bool cancelable, Node* relatedNode, const String& prevValue, const String& newValue, const String& attrName, unsigned short attrChange); >+ WEBCORE_EXPORT void initMutationEvent(const AtomString& type, bool canBubble, bool cancelable, Node* relatedNode, const String& prevValue, const String& newValue, const String& attrName, unsigned short attrChange); > > Node* relatedNode() const { return m_relatedNode.get(); } > String prevValue() const { return m_prevValue; } >@@ -56,7 +56,7 @@ public: > > private: > MutationEvent() = default; >- MutationEvent(const AtomicString& type, CanBubble, IsCancelable, Node* relatedNode, const String& prevValue, const String& newValue); >+ MutationEvent(const AtomString& type, CanBubble, IsCancelable, Node* relatedNode, const String& prevValue, const String& newValue); > > EventInterface eventInterface() const final; > >diff --git a/Source/WebCore/dom/MutationObserver.cpp b/Source/WebCore/dom/MutationObserver.cpp >index 6f79a74401f0d92b5da8f397b2483e2ce06ac9a3..66c5ea0b9d6345443812fb131ffe5dbe6ca1ddf3 100644 >--- a/Source/WebCore/dom/MutationObserver.cpp >+++ b/Source/WebCore/dom/MutationObserver.cpp >@@ -90,7 +90,7 @@ ExceptionOr<void> MutationObserver::observe(Node& node, const Init& init) > if (init.characterDataOldValue.valueOr(false)) > options |= CharacterDataOldValue; > >- HashSet<AtomicString> attributeFilter; >+ HashSet<AtomString> attributeFilter; > if (init.attributeFilter) { > for (auto& value : init.attributeFilter.value()) > attributeFilter.add(value); >diff --git a/Source/WebCore/dom/MutationObserverRegistration.cpp b/Source/WebCore/dom/MutationObserverRegistration.cpp >index 442c30a7bdd1f927cf473b990e2d44eb911e1792..c8fc01067245e4e36197a2f6d4d1e457547bbc8a 100644 >--- a/Source/WebCore/dom/MutationObserverRegistration.cpp >+++ b/Source/WebCore/dom/MutationObserverRegistration.cpp >@@ -37,7 +37,7 @@ > > namespace WebCore { > >-MutationObserverRegistration::MutationObserverRegistration(MutationObserver& observer, Node& node, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter) >+MutationObserverRegistration::MutationObserverRegistration(MutationObserver& observer, Node& node, MutationObserverOptions options, const HashSet<AtomString>& attributeFilter) > : m_observer(observer) > , m_node(node) > , m_options(options) >@@ -52,7 +52,7 @@ MutationObserverRegistration::~MutationObserverRegistration() > m_observer->observationEnded(*this); > } > >-void MutationObserverRegistration::resetObservation(MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter) >+void MutationObserverRegistration::resetObservation(MutationObserverOptions options, const HashSet<AtomString>& attributeFilter) > { > takeTransientRegistrations(); > m_options = options; >diff --git a/Source/WebCore/dom/MutationObserverRegistration.h b/Source/WebCore/dom/MutationObserverRegistration.h >index 59d43d268bd4fa866b9e337c51c2fe9987813e85..e6940483a313c8fd1bd16dc17cb96b13acd22a3a 100644 >--- a/Source/WebCore/dom/MutationObserverRegistration.h >+++ b/Source/WebCore/dom/MutationObserverRegistration.h >@@ -33,8 +33,8 @@ > #include "GCReachableRef.h" > #include "MutationObserver.h" > #include <wtf/HashSet.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -43,10 +43,10 @@ class QualifiedName; > class MutationObserverRegistration { > WTF_MAKE_FAST_ALLOCATED; > public: >- MutationObserverRegistration(MutationObserver&, Node&, MutationObserverOptions, const HashSet<AtomicString>& attributeFilter); >+ MutationObserverRegistration(MutationObserver&, Node&, MutationObserverOptions, const HashSet<AtomString>& attributeFilter); > ~MutationObserverRegistration(); > >- void resetObservation(MutationObserverOptions, const HashSet<AtomicString>& attributeFilter); >+ void resetObservation(MutationObserverOptions, const HashSet<AtomString>& attributeFilter); > void observedSubtreeNodeWillDetach(Node&); > std::unique_ptr<HashSet<GCReachableRef<Node>>> takeTransientRegistrations(); > bool hasTransientRegistrations() const { return m_transientRegistrationNodes && !m_transientRegistrationNodes->isEmpty(); } >@@ -67,7 +67,7 @@ private: > RefPtr<Node> m_nodeKeptAlive; > std::unique_ptr<HashSet<GCReachableRef<Node>>> m_transientRegistrationNodes; > MutationObserverOptions m_options; >- HashSet<AtomicString> m_attributeFilter; >+ HashSet<AtomString> m_attributeFilter; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/dom/MutationRecord.cpp b/Source/WebCore/dom/MutationRecord.cpp >index 257b5ea256968171f6c171359aacdf4f040eafd6..519320d46991c14b372781acceac74903c082a18 100644 >--- a/Source/WebCore/dom/MutationRecord.cpp >+++ b/Source/WebCore/dom/MutationRecord.cpp >@@ -61,7 +61,7 @@ public: > } > > private: >- const AtomicString& type() override; >+ const AtomString& type() override; > Node* target() override { return m_target.ptr(); } > NodeList* addedNodes() override { return m_addedNodes.get(); } > NodeList* removedNodes() override { return m_removedNodes.get(); } >@@ -118,7 +118,7 @@ private: > > class AttributesRecord final : public RecordWithEmptyNodeLists { > public: >- AttributesRecord(Element& target, const QualifiedName& name, const AtomicString& oldValue) >+ AttributesRecord(Element& target, const QualifiedName& name, const AtomString& oldValue) > : RecordWithEmptyNodeLists(target, oldValue) > , m_attributeName(name.localName()) > , m_attributeNamespace(name.namespaceURI()) >@@ -126,12 +126,12 @@ public: > } > > private: >- const AtomicString& type() override; >- const AtomicString& attributeName() override { return m_attributeName; } >- const AtomicString& attributeNamespace() override { return m_attributeNamespace; } >+ const AtomString& type() override; >+ const AtomString& attributeName() override { return m_attributeName; } >+ const AtomString& attributeNamespace() override { return m_attributeNamespace; } > >- AtomicString m_attributeName; >- AtomicString m_attributeNamespace; >+ AtomString m_attributeName; >+ AtomString m_attributeNamespace; > }; > > class CharacterDataRecord : public RecordWithEmptyNodeLists { >@@ -142,7 +142,7 @@ public: > } > > private: >- const AtomicString& type() override; >+ const AtomString& type() override; > }; > > class MutationRecordWithNullOldValue final : public MutationRecord { >@@ -153,14 +153,14 @@ public: > } > > private: >- const AtomicString& type() override { return m_record->type(); } >+ const AtomString& type() override { return m_record->type(); } > Node* target() override { return m_record->target(); } > NodeList* addedNodes() override { return m_record->addedNodes(); } > NodeList* removedNodes() override { return m_record->removedNodes(); } > Node* previousSibling() override { return m_record->previousSibling(); } > Node* nextSibling() override { return m_record->nextSibling(); } >- const AtomicString& attributeName() override { return m_record->attributeName(); } >- const AtomicString& attributeNamespace() override { return m_record->attributeNamespace(); } >+ const AtomString& attributeName() override { return m_record->attributeName(); } >+ const AtomString& attributeNamespace() override { return m_record->attributeNamespace(); } > > String oldValue() override { return String(); } > >@@ -172,21 +172,21 @@ private: > Ref<MutationRecord> m_record; > }; > >-const AtomicString& ChildListRecord::type() >+const AtomString& ChildListRecord::type() > { >- static NeverDestroyed<AtomicString> childList("childList", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> childList("childList", AtomString::ConstructFromLiteral); > return childList; > } > >-const AtomicString& AttributesRecord::type() >+const AtomString& AttributesRecord::type() > { >- static NeverDestroyed<AtomicString> attributes("attributes", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> attributes("attributes", AtomString::ConstructFromLiteral); > return attributes; > } > >-const AtomicString& CharacterDataRecord::type() >+const AtomString& CharacterDataRecord::type() > { >- static NeverDestroyed<AtomicString> characterData("characterData", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> characterData("characterData", AtomString::ConstructFromLiteral); > return characterData; > } > >@@ -197,7 +197,7 @@ Ref<MutationRecord> MutationRecord::createChildList(ContainerNode& target, Ref<N > return adoptRef(static_cast<MutationRecord&>(*new ChildListRecord(target, WTFMove(added), WTFMove(removed), WTFMove(previousSibling), WTFMove(nextSibling)))); > } > >-Ref<MutationRecord> MutationRecord::createAttributes(Element& target, const QualifiedName& name, const AtomicString& oldValue) >+Ref<MutationRecord> MutationRecord::createAttributes(Element& target, const QualifiedName& name, const AtomString& oldValue) > { > return adoptRef(static_cast<MutationRecord&>(*new AttributesRecord(target, name, oldValue))); > } >diff --git a/Source/WebCore/dom/MutationRecord.h b/Source/WebCore/dom/MutationRecord.h >index 8872b4482e8bbc829c5bc5ce511712e39606a682..37542f630caae96c199f70296c2a2237e511bdba 100644 >--- a/Source/WebCore/dom/MutationRecord.h >+++ b/Source/WebCore/dom/MutationRecord.h >@@ -52,14 +52,14 @@ class QualifiedName; > class MutationRecord : public RefCounted<MutationRecord> { > public: > static Ref<MutationRecord> createChildList(ContainerNode& target, Ref<NodeList>&& added, Ref<NodeList>&& removed, RefPtr<Node>&& previousSibling, RefPtr<Node>&& nextSibling); >- static Ref<MutationRecord> createAttributes(Element& target, const QualifiedName&, const AtomicString& oldValue); >+ static Ref<MutationRecord> createAttributes(Element& target, const QualifiedName&, const AtomString& oldValue); > static Ref<MutationRecord> createCharacterData(CharacterData& target, const String& oldValue); > > static Ref<MutationRecord> createWithNullOldValue(MutationRecord&); > > virtual ~MutationRecord(); > >- virtual const AtomicString& type() = 0; >+ virtual const AtomString& type() = 0; > virtual Node* target() = 0; > > virtual NodeList* addedNodes() = 0; >@@ -67,8 +67,8 @@ public: > virtual Node* previousSibling() { return 0; } > virtual Node* nextSibling() { return 0; } > >- virtual const AtomicString& attributeName() { return nullAtom(); } >- virtual const AtomicString& attributeNamespace() { return nullAtom(); } >+ virtual const AtomString& attributeName() { return nullAtom(); } >+ virtual const AtomString& attributeNamespace() { return nullAtom(); } > > virtual String oldValue() { return String(); } > >diff --git a/Source/WebCore/dom/NameNodeList.cpp b/Source/WebCore/dom/NameNodeList.cpp >index 0bb82381026df393f0e84608f08054fa587fc997..2a0afb801edeaef5a8b01749a5234526957b9eb2 100644 >--- a/Source/WebCore/dom/NameNodeList.cpp >+++ b/Source/WebCore/dom/NameNodeList.cpp >@@ -32,7 +32,7 @@ using namespace HTMLNames; > > WTF_MAKE_ISO_ALLOCATED_IMPL(NameNodeList); > >-NameNodeList::NameNodeList(ContainerNode& rootNode, const AtomicString& name) >+NameNodeList::NameNodeList(ContainerNode& rootNode, const AtomString& name) > : CachedLiveNodeList(rootNode, InvalidateOnNameAttrChange) > , m_name(name) > { >diff --git a/Source/WebCore/dom/NameNodeList.h b/Source/WebCore/dom/NameNodeList.h >index 85eece24847b83cc7055751a4c331f8c35d48a95..70c5c700e950e531437f0fde51ccc38d6dcb3aa1 100644 >--- a/Source/WebCore/dom/NameNodeList.h >+++ b/Source/WebCore/dom/NameNodeList.h >@@ -25,7 +25,7 @@ > > #include "LiveNodeList.h" > #include <wtf/Forward.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -33,7 +33,7 @@ namespace WebCore { > class NameNodeList final : public CachedLiveNodeList<NameNodeList> { > WTF_MAKE_ISO_ALLOCATED(NameNodeList); > public: >- static Ref<NameNodeList> create(ContainerNode& rootNode, const AtomicString& name) >+ static Ref<NameNodeList> create(ContainerNode& rootNode, const AtomString& name) > { > return adoptRef(*new NameNodeList(rootNode, name)); > } >@@ -44,9 +44,9 @@ public: > bool isRootedAtDocument() const override { return false; } > > private: >- NameNodeList(ContainerNode& rootNode, const AtomicString& name); >+ NameNodeList(ContainerNode& rootNode, const AtomString& name); > >- AtomicString m_name; >+ AtomString m_name; > }; > > inline bool NameNodeList::elementMatches(Element& element) const >diff --git a/Source/WebCore/dom/NamedNodeMap.cpp b/Source/WebCore/dom/NamedNodeMap.cpp >index 75ba66d4f0b26103cb2851bba7f3de448348825f..2771902ca402590cc735a89e00c86f5d6c9a9cf9 100644 >--- a/Source/WebCore/dom/NamedNodeMap.cpp >+++ b/Source/WebCore/dom/NamedNodeMap.cpp >@@ -45,17 +45,17 @@ void NamedNodeMap::deref() > m_element.deref(); > } > >-RefPtr<Attr> NamedNodeMap::getNamedItem(const AtomicString& name) const >+RefPtr<Attr> NamedNodeMap::getNamedItem(const AtomString& name) const > { > return m_element.getAttributeNode(name); > } > >-RefPtr<Attr> NamedNodeMap::getNamedItemNS(const AtomicString& namespaceURI, const AtomicString& localName) const >+RefPtr<Attr> NamedNodeMap::getNamedItemNS(const AtomString& namespaceURI, const AtomString& localName) const > { > return m_element.getAttributeNodeNS(namespaceURI, localName); > } > >-ExceptionOr<Ref<Attr>> NamedNodeMap::removeNamedItem(const AtomicString& name) >+ExceptionOr<Ref<Attr>> NamedNodeMap::removeNamedItem(const AtomString& name) > { > if (!m_element.hasAttributes()) > return Exception { NotFoundError }; >@@ -80,7 +80,7 @@ Vector<String> NamedNodeMap::supportedPropertyNames() const > return names; > } > >-ExceptionOr<Ref<Attr>> NamedNodeMap::removeNamedItemNS(const AtomicString& namespaceURI, const AtomicString& localName) >+ExceptionOr<Ref<Attr>> NamedNodeMap::removeNamedItemNS(const AtomString& namespaceURI, const AtomString& localName) > { > if (!m_element.hasAttributes()) > return Exception { NotFoundError }; >diff --git a/Source/WebCore/dom/NamedNodeMap.h b/Source/WebCore/dom/NamedNodeMap.h >index d30d23aa5bafefb420e2d185365fbc242d6d06aa..1ce768119db7079f18df52dd7723c60dc272d62d 100644 >--- a/Source/WebCore/dom/NamedNodeMap.h >+++ b/Source/WebCore/dom/NamedNodeMap.h >@@ -45,11 +45,11 @@ public: > > WEBCORE_EXPORT unsigned length() const; > WEBCORE_EXPORT RefPtr<Attr> item(unsigned index) const; >- WEBCORE_EXPORT RefPtr<Attr> getNamedItem(const AtomicString&) const; >- WEBCORE_EXPORT RefPtr<Attr> getNamedItemNS(const AtomicString& namespaceURI, const AtomicString& localName) const; >+ WEBCORE_EXPORT RefPtr<Attr> getNamedItem(const AtomString&) const; >+ WEBCORE_EXPORT RefPtr<Attr> getNamedItemNS(const AtomString& namespaceURI, const AtomString& localName) const; > WEBCORE_EXPORT ExceptionOr<RefPtr<Attr>> setNamedItem(Attr&); >- WEBCORE_EXPORT ExceptionOr<Ref<Attr>> removeNamedItem(const AtomicString& name); >- WEBCORE_EXPORT ExceptionOr<Ref<Attr>> removeNamedItemNS(const AtomicString& namespaceURI, const AtomicString& localName); >+ WEBCORE_EXPORT ExceptionOr<Ref<Attr>> removeNamedItem(const AtomString& name); >+ WEBCORE_EXPORT ExceptionOr<Ref<Attr>> removeNamedItemNS(const AtomString& namespaceURI, const AtomString& localName); > > Vector<String> supportedPropertyNames() const; > >diff --git a/Source/WebCore/dom/Node.cpp b/Source/WebCore/dom/Node.cpp >index 15041e922753f108fdb192e28a35851b7f6747f7..fae18a95d8ba1ac2f57a2d22a47deb8c0ae3ccde 100644 >--- a/Source/WebCore/dom/Node.cpp >+++ b/Source/WebCore/dom/Node.cpp >@@ -687,13 +687,13 @@ ExceptionOr<Ref<Node>> Node::cloneNodeForBindings(bool deep) > return cloneNode(deep); > } > >-const AtomicString& Node::prefix() const >+const AtomString& Node::prefix() const > { > // For nodes other than elements and attributes, the prefix is always null > return nullAtom(); > } > >-ExceptionOr<void> Node::setPrefix(const AtomicString&) >+ExceptionOr<void> Node::setPrefix(const AtomString&) > { > // The spec says that for nodes other than elements and attributes, prefix is always null. > // It does not say what to do when the user tries to set the prefix on another type of >@@ -701,12 +701,12 @@ ExceptionOr<void> Node::setPrefix(const AtomicString&) > return Exception { NamespaceError }; > } > >-const AtomicString& Node::localName() const >+const AtomString& Node::localName() const > { > return nullAtom(); > } > >-const AtomicString& Node::namespaceURI() const >+const AtomString& Node::namespaceURI() const > { > return nullAtom(); > } >@@ -976,7 +976,7 @@ void Node::clearNodeLists() > rareData()->clearNodeLists(); > } > >-ExceptionOr<void> Node::checkSetPrefix(const AtomicString& prefix) >+ExceptionOr<void> Node::checkSetPrefix(const AtomString& prefix) > { > // Perform error checking as required by spec for setting Node.prefix. Used by > // Element::setPrefix() and Attr::setPrefix() >@@ -1411,7 +1411,7 @@ bool Node::isEqualNode(Node* other) const > } > > // https://dom.spec.whatwg.org/#locate-a-namespace >-static const AtomicString& locateDefaultNamespace(const Node& node, const AtomicString& prefix) >+static const AtomString& locateDefaultNamespace(const Node& node, const AtomString& prefix) > { > switch (node.nodeType()) { > case Node::ELEMENT_NODE: { >@@ -1453,21 +1453,21 @@ static const AtomicString& locateDefaultNamespace(const Node& node, const Atomic > } > > // https://dom.spec.whatwg.org/#dom-node-isdefaultnamespace >-bool Node::isDefaultNamespace(const AtomicString& potentiallyEmptyNamespace) const >+bool Node::isDefaultNamespace(const AtomString& potentiallyEmptyNamespace) const > { >- const AtomicString& namespaceURI = potentiallyEmptyNamespace.isEmpty() ? nullAtom() : potentiallyEmptyNamespace; >+ const AtomString& namespaceURI = potentiallyEmptyNamespace.isEmpty() ? nullAtom() : potentiallyEmptyNamespace; > return locateDefaultNamespace(*this, nullAtom()) == namespaceURI; > } > > // https://dom.spec.whatwg.org/#dom-node-lookupnamespaceuri >-const AtomicString& Node::lookupNamespaceURI(const AtomicString& potentiallyEmptyPrefix) const >+const AtomString& Node::lookupNamespaceURI(const AtomString& potentiallyEmptyPrefix) const > { >- const AtomicString& prefix = potentiallyEmptyPrefix.isEmpty() ? nullAtom() : potentiallyEmptyPrefix; >+ const AtomString& prefix = potentiallyEmptyPrefix.isEmpty() ? nullAtom() : potentiallyEmptyPrefix; > return locateDefaultNamespace(*this, prefix); > } > > // https://dom.spec.whatwg.org/#locate-a-namespace-prefix >-static const AtomicString& locateNamespacePrefix(const Element& element, const AtomicString& namespaceURI) >+static const AtomString& locateNamespacePrefix(const Element& element, const AtomString& namespaceURI) > { > if (element.namespaceURI() == namespaceURI) > return element.prefix(); >@@ -1483,7 +1483,7 @@ static const AtomicString& locateNamespacePrefix(const Element& element, const A > } > > // https://dom.spec.whatwg.org/#dom-node-lookupprefix >-const AtomicString& Node::lookupPrefix(const AtomicString& namespaceURI) const >+const AtomString& Node::lookupPrefix(const AtomString& namespaceURI) const > { > if (namespaceURI.isEmpty()) > return nullAtom(); >@@ -1741,7 +1741,7 @@ static void appendAttributeDesc(const Node* node, StringBuilder& stringBuilder, > if (!is<Element>(*node)) > return; > >- const AtomicString& attr = downcast<Element>(*node).getAttribute(name); >+ const AtomString& attr = downcast<Element>(*node).getAttribute(name); > if (attr.isEmpty()) > return; > >@@ -1794,7 +1794,7 @@ void Node::showNodePathForThis() const > fprintf(stderr, "/%s", node->nodeName().utf8().data()); > > const Element& element = downcast<Element>(*node); >- const AtomicString& idattr = element.getIdAttribute(); >+ const AtomString& idattr = element.getIdAttribute(); > bool hasIdAttr = !idattr.isNull() && !idattr.isEmpty(); > if (node->previousSibling() || node->nextSibling()) { > int count = 0; >@@ -2104,7 +2104,7 @@ void Node::moveNodeToNewDocument(Document& oldDocument, Document& newDocument) > downcast<Element>(*this).didMoveToNewDocument(oldDocument, newDocument); > } > >-static inline bool tryAddEventListener(Node* targetNode, const AtomicString& eventType, Ref<EventListener>&& listener, const EventTarget::AddEventListenerOptions& options) >+static inline bool tryAddEventListener(Node* targetNode, const AtomString& eventType, Ref<EventListener>&& listener, const EventTarget::AddEventListenerOptions& options) > { > if (!targetNode->EventTarget::addEventListener(eventType, listener.copyRef(), options)) > return false; >@@ -2133,12 +2133,12 @@ static inline bool tryAddEventListener(Node* targetNode, const AtomicString& eve > return true; > } > >-bool Node::addEventListener(const AtomicString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) >+bool Node::addEventListener(const AtomString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) > { > return tryAddEventListener(this, eventType, WTFMove(listener), options); > } > >-static inline bool tryRemoveEventListener(Node* targetNode, const AtomicString& eventType, EventListener& listener, const EventTarget::ListenerOptions& options) >+static inline bool tryRemoveEventListener(Node* targetNode, const AtomString& eventType, EventListener& listener, const EventTarget::ListenerOptions& options) > { > if (!targetNode->EventTarget::removeEventListener(eventType, listener, options)) > return false; >@@ -2168,7 +2168,7 @@ static inline bool tryRemoveEventListener(Node* targetNode, const AtomicString& > return true; > } > >-bool Node::removeEventListener(const AtomicString& eventType, EventListener& listener, const ListenerOptions& options) >+bool Node::removeEventListener(const AtomString& eventType, EventListener& listener, const ListenerOptions& options) > { > return tryRemoveEventListener(this, eventType, listener, options); > } >@@ -2271,7 +2271,7 @@ HashMap<Ref<MutationObserver>, MutationRecordDeliveryOptions> Node::registeredMu > return result; > } > >-void Node::registerMutationObserver(MutationObserver& observer, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter) >+void Node::registerMutationObserver(MutationObserver& observer, MutationObserverOptions options, const HashSet<AtomString>& attributeFilter) > { > MutationObserverRegistration* registration = nullptr; > auto& registry = ensureRareData().ensureMutationObserverData().registry; >@@ -2367,7 +2367,7 @@ void Node::dispatchSubtreeModifiedEvent() > > if (!document().hasListenerType(Document::DOMSUBTREEMODIFIED_LISTENER)) > return; >- const AtomicString& subtreeModifiedEventName = eventNames().DOMSubtreeModifiedEvent; >+ const AtomString& subtreeModifiedEventName = eventNames().DOMSubtreeModifiedEvent; > if (!parentNode() && !hasEventListeners(subtreeModifiedEventName)) > return; > >@@ -2405,7 +2405,7 @@ void Node::defaultEventHandler(Event& event) > { > if (event.target() != this) > return; >- const AtomicString& eventType = event.type(); >+ const AtomString& eventType = event.type(); > if (eventType == eventNames().keydownEvent || eventType == eventNames().keypressEvent) { > if (is<KeyboardEvent>(event)) { > if (Frame* frame = document().frame()) >diff --git a/Source/WebCore/dom/Node.h b/Source/WebCore/dom/Node.h >index fccdd7df6fce77401a1d430bd24c232ca6c987a4..5f85223ba6c11ec9227e5a2ba0ad8a490e84588c 100644 >--- a/Source/WebCore/dom/Node.h >+++ b/Source/WebCore/dom/Node.h >@@ -165,17 +165,17 @@ public: > Ref<Node> cloneNode(bool deep) { return cloneNodeInternal(document(), deep ? CloningOperation::Everything : CloningOperation::OnlySelf); } > WEBCORE_EXPORT ExceptionOr<Ref<Node>> cloneNodeForBindings(bool deep); > >- virtual const AtomicString& localName() const; >- virtual const AtomicString& namespaceURI() const; >- virtual const AtomicString& prefix() const; >- virtual ExceptionOr<void> setPrefix(const AtomicString&); >+ virtual const AtomString& localName() const; >+ virtual const AtomString& namespaceURI() const; >+ virtual const AtomString& prefix() const; >+ virtual ExceptionOr<void> setPrefix(const AtomString&); > WEBCORE_EXPORT void normalize(); > > bool isSameNode(Node* other) const { return this == other; } > WEBCORE_EXPORT bool isEqualNode(Node*) const; >- WEBCORE_EXPORT bool isDefaultNamespace(const AtomicString& namespaceURI) const; >- WEBCORE_EXPORT const AtomicString& lookupPrefix(const AtomicString& namespaceURI) const; >- WEBCORE_EXPORT const AtomicString& lookupNamespaceURI(const AtomicString& prefix) const; >+ WEBCORE_EXPORT bool isDefaultNamespace(const AtomString& namespaceURI) const; >+ WEBCORE_EXPORT const AtomString& lookupPrefix(const AtomString& namespaceURI) const; >+ WEBCORE_EXPORT const AtomString& lookupNamespaceURI(const AtomString& prefix) const; > > WEBCORE_EXPORT String textContent(bool convertBRsToNewlines = false) const; > WEBCORE_EXPORT ExceptionOr<void> setTextContent(const String&); >@@ -384,7 +384,7 @@ public: > unsigned countChildNodes() const; > Node* traverseToChildAt(unsigned) const; > >- ExceptionOr<void> checkSetPrefix(const AtomicString& prefix); >+ ExceptionOr<void> checkSetPrefix(const AtomString& prefix); > > WEBCORE_EXPORT bool isDescendantOf(const Node&) const; > bool isDescendantOf(const Node* other) const { return other && isDescendantOf(*other); } >@@ -472,8 +472,8 @@ public: > EventTargetInterface eventTargetInterface() const override; > ScriptExecutionContext* scriptExecutionContext() const final; // Implemented in Document.h > >- bool addEventListener(const AtomicString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) override; >- bool removeEventListener(const AtomicString& eventType, EventListener&, const ListenerOptions&) override; >+ bool addEventListener(const AtomString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) override; >+ bool removeEventListener(const AtomString& eventType, EventListener&, const ListenerOptions&) override; > > using EventTarget::dispatchEvent; > void dispatchEvent(Event&) override; >@@ -512,7 +512,7 @@ public: > EventTargetData& ensureEventTargetData() final; > > HashMap<Ref<MutationObserver>, MutationRecordDeliveryOptions> registeredMutationObservers(MutationObserver::MutationType, const QualifiedName* attributeName); >- void registerMutationObserver(MutationObserver&, MutationObserverOptions, const HashSet<AtomicString>& attributeFilter); >+ void registerMutationObserver(MutationObserver&, MutationObserverOptions, const HashSet<AtomString>& attributeFilter); > void unregisterMutationObserver(MutationObserverRegistration&); > void registerTransientMutationObserver(MutationObserverRegistration&); > void unregisterTransientMutationObserver(MutationObserverRegistration&); >diff --git a/Source/WebCore/dom/NodeRareData.h b/Source/WebCore/dom/NodeRareData.h >index 4f8502bf8f5f2e4787d4511635107b49cd597ee5..6822f66cae371702799659405683db0819901f3c 100644 >--- a/Source/WebCore/dom/NodeRareData.h >+++ b/Source/WebCore/dom/NodeRareData.h >@@ -29,7 +29,7 @@ > #include "QualifiedName.h" > #include "TagCollection.h" > #include <wtf/HashSet.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -95,20 +95,20 @@ public: > } > > struct NodeListCacheMapEntryHash { >- static unsigned hash(const std::pair<unsigned char, AtomicString>& entry) >+ static unsigned hash(const std::pair<unsigned char, AtomString>& entry) > { >- return DefaultHash<AtomicString>::Hash::hash(entry.second) + entry.first; >+ return DefaultHash<AtomString>::Hash::hash(entry.second) + entry.first; > } >- static bool equal(const std::pair<unsigned char, AtomicString>& a, const std::pair<unsigned char, AtomicString>& b) { return a.first == b.first && DefaultHash<AtomicString>::Hash::equal(a.second, b.second); } >- static const bool safeToCompareToEmptyOrDeleted = DefaultHash<AtomicString>::Hash::safeToCompareToEmptyOrDeleted; >+ static bool equal(const std::pair<unsigned char, AtomString>& a, const std::pair<unsigned char, AtomString>& b) { return a.first == b.first && DefaultHash<AtomString>::Hash::equal(a.second, b.second); } >+ static const bool safeToCompareToEmptyOrDeleted = DefaultHash<AtomString>::Hash::safeToCompareToEmptyOrDeleted; > }; > >- typedef HashMap<std::pair<unsigned char, AtomicString>, LiveNodeList*, NodeListCacheMapEntryHash> NodeListAtomicNameCacheMap; >- typedef HashMap<std::pair<unsigned char, AtomicString>, HTMLCollection*, NodeListCacheMapEntryHash> CollectionCacheMap; >+ typedef HashMap<std::pair<unsigned char, AtomString>, LiveNodeList*, NodeListCacheMapEntryHash> NodeListAtomicNameCacheMap; >+ typedef HashMap<std::pair<unsigned char, AtomString>, HTMLCollection*, NodeListCacheMapEntryHash> CollectionCacheMap; > typedef HashMap<QualifiedName, TagCollectionNS*> TagCollectionNSCache; > > template<typename T, typename ContainerType> >- ALWAYS_INLINE Ref<T> addCacheWithAtomicName(ContainerType& container, const AtomicString& name) >+ ALWAYS_INLINE Ref<T> addCacheWithAtomicName(ContainerType& container, const AtomString& name) > { > NodeListAtomicNameCacheMap::AddResult result = m_atomicNameCaches.fastAdd(namedNodeListKey<T>(name), nullptr); > if (!result.isNewEntry) >@@ -119,7 +119,7 @@ public: > return list; > } > >- ALWAYS_INLINE Ref<TagCollectionNS> addCachedTagCollectionNS(ContainerNode& node, const AtomicString& namespaceURI, const AtomicString& localName) >+ ALWAYS_INLINE Ref<TagCollectionNS> addCachedTagCollectionNS(ContainerNode& node, const AtomString& namespaceURI, const AtomString& localName) > { > QualifiedName name(nullAtom(), localName, namespaceURI); > TagCollectionNSCache::AddResult result = m_tagCollectionNSCache.fastAdd(name, nullptr); >@@ -132,7 +132,7 @@ public: > } > > template<typename T, typename ContainerType> >- ALWAYS_INLINE Ref<T> addCachedCollection(ContainerType& container, CollectionType collectionType, const AtomicString& name) >+ ALWAYS_INLINE Ref<T> addCachedCollection(ContainerType& container, CollectionType collectionType, const AtomString& name) > { > CollectionCacheMap::AddResult result = m_cachedCollections.fastAdd(namedCollectionKey(collectionType, name), nullptr); > if (!result.isNewEntry) >@@ -162,7 +162,7 @@ public: > } > > template <class NodeListType> >- void removeCacheWithAtomicName(NodeListType* list, const AtomicString& name = starAtom()) >+ void removeCacheWithAtomicName(NodeListType* list, const AtomString& name = starAtom()) > { > ASSERT(list == m_atomicNameCaches.get(namedNodeListKey<NodeListType>(name))); > if (deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList(list->ownerNode())) >@@ -170,7 +170,7 @@ public: > m_atomicNameCaches.remove(namedNodeListKey<NodeListType>(name)); > } > >- void removeCachedTagCollectionNS(HTMLCollection& collection, const AtomicString& namespaceURI, const AtomicString& localName) >+ void removeCachedTagCollectionNS(HTMLCollection& collection, const AtomString& namespaceURI, const AtomString& localName) > { > QualifiedName name(nullAtom(), localName, namespaceURI); > ASSERT(&collection == m_tagCollectionNSCache.get(name)); >@@ -179,7 +179,7 @@ public: > m_tagCollectionNSCache.remove(name); > } > >- void removeCachedCollection(HTMLCollection* collection, const AtomicString& name = starAtom()) >+ void removeCachedCollection(HTMLCollection* collection, const AtomString& name = starAtom()) > { > ASSERT(collection == m_cachedCollections.get(namedCollectionKey(collection->type(), name))); > if (deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList(collection->ownerNode())) >@@ -215,15 +215,15 @@ public: > } > > private: >- std::pair<unsigned char, AtomicString> namedCollectionKey(CollectionType type, const AtomicString& name) >+ std::pair<unsigned char, AtomString> namedCollectionKey(CollectionType type, const AtomString& name) > { >- return std::pair<unsigned char, AtomicString>(type, name); >+ return std::pair<unsigned char, AtomString>(type, name); > } > > template <class NodeListType> >- std::pair<unsigned char, AtomicString> namedNodeListKey(const AtomicString& name) >+ std::pair<unsigned char, AtomString> namedNodeListKey(const AtomString& name) > { >- return std::pair<unsigned char, AtomicString>(NodeListTypeIdentifier<NodeListType>::value(), name); >+ return std::pair<unsigned char, AtomString>(NodeListTypeIdentifier<NodeListType>::value(), name); > } > > bool deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList(Node&); >diff --git a/Source/WebCore/dom/NonElementParentNode.idl b/Source/WebCore/dom/NonElementParentNode.idl >index 92238703f2ad73ff7488a4553657a3b702e190bc..7329d31a9731a607a028082bad054cdac835cfdd 100644 >--- a/Source/WebCore/dom/NonElementParentNode.idl >+++ b/Source/WebCore/dom/NonElementParentNode.idl >@@ -28,5 +28,5 @@ > [ > NoInterfaceObject, > ] interface NonElementParentNode { >- [DOMJIT=ReadDOM] Element? getElementById([RequiresExistingAtomicString] DOMString elementId); >+ [DOMJIT=ReadDOM] Element? getElementById([RequiresExistingAtomString] DOMString elementId); > }; >diff --git a/Source/WebCore/dom/OverflowEvent.cpp b/Source/WebCore/dom/OverflowEvent.cpp >index 8c53ad4acc6090f6221d98842e9bb79dd3715d57..48f956db1a5633fe4c9c53c4bf223ca39b46f59e 100644 >--- a/Source/WebCore/dom/OverflowEvent.cpp >+++ b/Source/WebCore/dom/OverflowEvent.cpp >@@ -52,7 +52,7 @@ OverflowEvent::OverflowEvent(bool horizontalOverflowChanged, bool horizontalOver > m_orient = VERTICAL; > } > >-OverflowEvent::OverflowEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+OverflowEvent::OverflowEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_orient(initializer.orient) > , m_horizontalOverflow(initializer.horizontalOverflow) >diff --git a/Source/WebCore/dom/OverflowEvent.h b/Source/WebCore/dom/OverflowEvent.h >index f2da99578e3bc46b5feba27478165ffafbd45e3e..62c8f98e077e111e5140884579c8c9faf931fa4a 100644 >--- a/Source/WebCore/dom/OverflowEvent.h >+++ b/Source/WebCore/dom/OverflowEvent.h >@@ -53,7 +53,7 @@ public: > bool verticalOverflow { false }; > }; > >- static Ref<OverflowEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<OverflowEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new OverflowEvent(type, initializer, isTrusted)); > } >@@ -69,7 +69,7 @@ public: > private: > OverflowEvent(); > OverflowEvent(bool horizontalOverflowChanged, bool horizontalOverflow, bool verticalOverflowChanged, bool verticalOverflow); >- OverflowEvent(const AtomicString&, const Init&, IsTrusted); >+ OverflowEvent(const AtomString&, const Init&, IsTrusted); > > unsigned short m_orient; > bool m_horizontalOverflow; >diff --git a/Source/WebCore/dom/PageTransitionEvent.cpp b/Source/WebCore/dom/PageTransitionEvent.cpp >index 08089d4ef890d1baa98a85898b41dfa5ee883c03..0602c1f4cb59f440597b86d479d3bb3856607166 100644 >--- a/Source/WebCore/dom/PageTransitionEvent.cpp >+++ b/Source/WebCore/dom/PageTransitionEvent.cpp >@@ -28,13 +28,13 @@ > > namespace WebCore { > >-PageTransitionEvent::PageTransitionEvent(const AtomicString& type, bool persisted) >+PageTransitionEvent::PageTransitionEvent(const AtomString& type, bool persisted) > : Event(type, CanBubble::Yes, IsCancelable::Yes) > , m_persisted(persisted) > { > } > >-PageTransitionEvent::PageTransitionEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+PageTransitionEvent::PageTransitionEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_persisted(initializer.persisted) > { >diff --git a/Source/WebCore/dom/PageTransitionEvent.h b/Source/WebCore/dom/PageTransitionEvent.h >index 8442fa613ef0958fe39da02a344760755c086168..333083e26e4c2ed4929dc616ad063088571d3f8d 100644 >--- a/Source/WebCore/dom/PageTransitionEvent.h >+++ b/Source/WebCore/dom/PageTransitionEvent.h >@@ -31,7 +31,7 @@ namespace WebCore { > > class PageTransitionEvent final : public Event { > public: >- static Ref<PageTransitionEvent> create(const AtomicString& type, bool persisted) >+ static Ref<PageTransitionEvent> create(const AtomString& type, bool persisted) > { > return adoptRef(*new PageTransitionEvent(type, persisted)); > } >@@ -40,7 +40,7 @@ public: > bool persisted { false }; > }; > >- static Ref<PageTransitionEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<PageTransitionEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new PageTransitionEvent(type, initializer, isTrusted)); > } >@@ -52,8 +52,8 @@ public: > bool persisted() const { return m_persisted; } > > private: >- PageTransitionEvent(const AtomicString& type, bool persisted); >- PageTransitionEvent(const AtomicString&, const Init&, IsTrusted); >+ PageTransitionEvent(const AtomString& type, bool persisted); >+ PageTransitionEvent(const AtomString&, const Init&, IsTrusted); > > bool m_persisted; > }; >diff --git a/Source/WebCore/dom/PointerEvent.cpp b/Source/WebCore/dom/PointerEvent.cpp >index 01150983bc5592ebc00b6eff2049d2d128763ed6..3d218af01b39fde6e69a98466aed9972373bd903 100644 >--- a/Source/WebCore/dom/PointerEvent.cpp >+++ b/Source/WebCore/dom/PointerEvent.cpp >@@ -50,7 +50,7 @@ const String& PointerEvent::touchPointerType() > return touchType; > } > >-static AtomicString pointerEventType(const AtomicString& mouseEventType) >+static AtomString pointerEventType(const AtomString& mouseEventType) > { > auto& names = eventNames(); > if (mouseEventType == names.mousedownEvent) >@@ -92,7 +92,7 @@ Ref<PointerEvent> PointerEvent::create(const String& type, PointerID pointerId, > > PointerEvent::PointerEvent() = default; > >-PointerEvent::PointerEvent(const AtomicString& type, Init&& initializer) >+PointerEvent::PointerEvent(const AtomString& type, Init&& initializer) > : MouseEvent(type, initializer) > , m_pointerId(initializer.pointerId) > , m_width(initializer.width) >@@ -107,13 +107,13 @@ PointerEvent::PointerEvent(const AtomicString& type, Init&& initializer) > { > } > >-PointerEvent::PointerEvent(const AtomicString& type, short button, const MouseEvent& mouseEvent) >+PointerEvent::PointerEvent(const AtomString& type, short button, const MouseEvent& mouseEvent) > : MouseEvent(type, typeCanBubble(type), typeIsCancelable(type), typeIsComposed(type), mouseEvent.view(), mouseEvent.detail(), mouseEvent.screenLocation(), { mouseEvent.clientX(), mouseEvent.clientY() }, mouseEvent.modifierKeys(), button, mouseEvent.buttons(), mouseEvent.syntheticClickType(), mouseEvent.relatedTarget()) > , m_isPrimary(true) > { > } > >-PointerEvent::PointerEvent(const AtomicString& type, PointerID pointerId, const String& pointerType, IsPrimary isPrimary) >+PointerEvent::PointerEvent(const AtomString& type, PointerID pointerId, const String& pointerType, IsPrimary isPrimary) > : MouseEvent(type, typeCanBubble(type), typeIsCancelable(type), typeIsComposed(type), nullptr, 0, { }, { }, { }, 0, 0, 0, nullptr) > , m_pointerId(pointerId) > , m_pointerType(pointerType) >diff --git a/Source/WebCore/dom/PointerEvent.h b/Source/WebCore/dom/PointerEvent.h >index 1ec736799ccb0c4f7413ca8e6ab63bd7ef47ea0d..f9587fca1543b17e26355e667ab97618c5ce68c5 100644 >--- a/Source/WebCore/dom/PointerEvent.h >+++ b/Source/WebCore/dom/PointerEvent.h >@@ -56,12 +56,12 @@ public: > > enum class IsPrimary : uint8_t { No, Yes }; > >- static Ref<PointerEvent> create(const AtomicString& type, Init&& initializer) >+ static Ref<PointerEvent> create(const AtomString& type, Init&& initializer) > { > return adoptRef(*new PointerEvent(type, WTFMove(initializer))); > } > >- static Ref<PointerEvent> createForPointerCapture(const AtomicString& type, const PointerEvent& pointerEvent) >+ static Ref<PointerEvent> createForPointerCapture(const AtomString& type, const PointerEvent& pointerEvent) > { > Init initializer; > initializer.bubbles = true; >@@ -115,17 +115,17 @@ public: > EventInterface eventInterface() const override; > > private: >- static bool typeIsEnterOrLeave(const AtomicString& type) { return type == eventNames().pointerenterEvent || type == eventNames().pointerleaveEvent; } >- static CanBubble typeCanBubble(const AtomicString& type) { return typeIsEnterOrLeave(type) ? CanBubble::No : CanBubble::Yes; } >- static IsCancelable typeIsCancelable(const AtomicString& type) { return typeIsEnterOrLeave(type) ? IsCancelable::No : IsCancelable::Yes; } >- static IsComposed typeIsComposed(const AtomicString& type) { return typeIsEnterOrLeave(type) ? IsComposed::No : IsComposed::Yes; } >+ static bool typeIsEnterOrLeave(const AtomString& type) { return type == eventNames().pointerenterEvent || type == eventNames().pointerleaveEvent; } >+ static CanBubble typeCanBubble(const AtomString& type) { return typeIsEnterOrLeave(type) ? CanBubble::No : CanBubble::Yes; } >+ static IsCancelable typeIsCancelable(const AtomString& type) { return typeIsEnterOrLeave(type) ? IsCancelable::No : IsCancelable::Yes; } >+ static IsComposed typeIsComposed(const AtomString& type) { return typeIsEnterOrLeave(type) ? IsComposed::No : IsComposed::Yes; } > > PointerEvent(); >- PointerEvent(const AtomicString&, Init&&); >- PointerEvent(const AtomicString& type, short button, const MouseEvent&); >- PointerEvent(const AtomicString& type, PointerID, const String& pointerType, IsPrimary); >+ PointerEvent(const AtomString&, Init&&); >+ PointerEvent(const AtomString& type, short button, const MouseEvent&); >+ PointerEvent(const AtomString& type, PointerID, const String& pointerType, IsPrimary); > #if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS_FAMILY) >- PointerEvent(const AtomicString& type, const PlatformTouchEvent&, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&); >+ PointerEvent(const AtomString& type, const PlatformTouchEvent&, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&); > #endif > > PointerID m_pointerId { mousePointerID }; >diff --git a/Source/WebCore/dom/PopStateEvent.cpp b/Source/WebCore/dom/PopStateEvent.cpp >index 3ad0c4f79c79966ffa8fdcba526606e1e8564f40..d1dafd07948dbce364b560acfa2fd4cefafe41a5 100644 >--- a/Source/WebCore/dom/PopStateEvent.cpp >+++ b/Source/WebCore/dom/PopStateEvent.cpp >@@ -33,7 +33,7 @@ > > namespace WebCore { > >-PopStateEvent::PopStateEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+PopStateEvent::PopStateEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_state(initializer.state) > { >@@ -53,7 +53,7 @@ Ref<PopStateEvent> PopStateEvent::create(RefPtr<SerializedScriptValue>&& seriali > return adoptRef(*new PopStateEvent(WTFMove(serializedState), history)); > } > >-Ref<PopStateEvent> PopStateEvent::create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+Ref<PopStateEvent> PopStateEvent::create(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > { > return adoptRef(*new PopStateEvent(type, initializer, isTrusted)); > } >diff --git a/Source/WebCore/dom/PopStateEvent.h b/Source/WebCore/dom/PopStateEvent.h >index d7d1e48c9756eff1c78ae21915b81893dbfdd369..567e456acd5ab06a217ae20edc4f49e071323b8a 100644 >--- a/Source/WebCore/dom/PopStateEvent.h >+++ b/Source/WebCore/dom/PopStateEvent.h >@@ -43,7 +43,7 @@ public: > JSC::JSValue state; > }; > >- static Ref<PopStateEvent> create(const AtomicString&, const Init&, IsTrusted = IsTrusted::No); >+ static Ref<PopStateEvent> create(const AtomString&, const Init&, IsTrusted = IsTrusted::No); > static Ref<PopStateEvent> createForBindings(); > > const JSValueInWrappedObject& state() const { return m_state; } >@@ -55,7 +55,7 @@ public: > > private: > PopStateEvent() = default; >- PopStateEvent(const AtomicString&, const Init&, IsTrusted); >+ PopStateEvent(const AtomString&, const Init&, IsTrusted); > PopStateEvent(RefPtr<SerializedScriptValue>&&, History*); > > EventInterface eventInterface() const final; >diff --git a/Source/WebCore/dom/ProgressEvent.cpp b/Source/WebCore/dom/ProgressEvent.cpp >index a13708b80463603f11f7ec1c90a07bddd059a202..8223ab4cbe27f898bf3734ebd253372904ce504c 100644 >--- a/Source/WebCore/dom/ProgressEvent.cpp >+++ b/Source/WebCore/dom/ProgressEvent.cpp >@@ -28,7 +28,7 @@ > > namespace WebCore { > >-ProgressEvent::ProgressEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+ProgressEvent::ProgressEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_lengthComputable(initializer.lengthComputable) > , m_loaded(initializer.loaded) >@@ -36,7 +36,7 @@ ProgressEvent::ProgressEvent(const AtomicString& type, const Init& initializer, > { > } > >-ProgressEvent::ProgressEvent(const AtomicString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total) >+ProgressEvent::ProgressEvent(const AtomString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total) > : Event(type, CanBubble::No, IsCancelable::No) > , m_lengthComputable(lengthComputable) > , m_loaded(loaded) >diff --git a/Source/WebCore/dom/ProgressEvent.h b/Source/WebCore/dom/ProgressEvent.h >index ffabcb8b1d0d764296960d3a17704b1d57f77d6f..b696ebf85b1f3d8d43ce5f932e735f758294105a 100644 >--- a/Source/WebCore/dom/ProgressEvent.h >+++ b/Source/WebCore/dom/ProgressEvent.h >@@ -31,7 +31,7 @@ namespace WebCore { > > class ProgressEvent : public Event { > public: >- static Ref<ProgressEvent> create(const AtomicString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total) >+ static Ref<ProgressEvent> create(const AtomString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total) > { > return adoptRef(*new ProgressEvent(type, lengthComputable, loaded, total)); > } >@@ -42,7 +42,7 @@ public: > unsigned long long total { 0 }; > }; > >- static Ref<ProgressEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<ProgressEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new ProgressEvent(type, initializer, isTrusted)); > } >@@ -54,8 +54,8 @@ public: > EventInterface eventInterface() const override; > > protected: >- ProgressEvent(const AtomicString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total); >- ProgressEvent(const AtomicString&, const Init&, IsTrusted); >+ ProgressEvent(const AtomString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total); >+ ProgressEvent(const AtomString&, const Init&, IsTrusted); > > private: > bool m_lengthComputable; >diff --git a/Source/WebCore/dom/PromiseRejectionEvent.cpp b/Source/WebCore/dom/PromiseRejectionEvent.cpp >index 451d6288b44110f54488b70f10476835a8223be3..7cd0ab17af88718c5b462dab55359374a738f20e 100644 >--- a/Source/WebCore/dom/PromiseRejectionEvent.cpp >+++ b/Source/WebCore/dom/PromiseRejectionEvent.cpp >@@ -34,7 +34,7 @@ > namespace WebCore { > using namespace JSC; > >-PromiseRejectionEvent::PromiseRejectionEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+PromiseRejectionEvent::PromiseRejectionEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_promise(*(initializer.promise)) > , m_reason(initializer.reason) >diff --git a/Source/WebCore/dom/PromiseRejectionEvent.h b/Source/WebCore/dom/PromiseRejectionEvent.h >index 2dc7d8555dbfce12effc6b9fd7228c35ece758b3..6f4ca507bd6e535e25ad5d1733e005fcff685984 100644 >--- a/Source/WebCore/dom/PromiseRejectionEvent.h >+++ b/Source/WebCore/dom/PromiseRejectionEvent.h >@@ -39,7 +39,7 @@ public: > JSC::JSValue reason; > }; > >- static Ref<PromiseRejectionEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<PromiseRejectionEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new PromiseRejectionEvent(type, initializer, isTrusted)); > } >@@ -52,7 +52,7 @@ public: > EventInterface eventInterface() const override { return PromiseRejectionEventInterfaceType; } > > private: >- PromiseRejectionEvent(const AtomicString&, const Init&, IsTrusted); >+ PromiseRejectionEvent(const AtomString&, const Init&, IsTrusted); > > Ref<DOMPromise> m_promise; > JSValueInWrappedObject m_reason; >diff --git a/Source/WebCore/dom/QualifiedName.cpp b/Source/WebCore/dom/QualifiedName.cpp >index 986292ff951cb4ffac1ada6a5798601682b5cd3e..46a95666bca66eeac479a5c1f17c3b7a32727bbd 100644 >--- a/Source/WebCore/dom/QualifiedName.cpp >+++ b/Source/WebCore/dom/QualifiedName.cpp >@@ -26,7 +26,7 @@ > > namespace WebCore { > >-QualifiedName::QualifiedName(const AtomicString& p, const AtomicString& l, const AtomicString& n) >+QualifiedName::QualifiedName(const AtomString& p, const AtomString& l, const AtomString& n) > : m_impl(threadGlobalData().qualifiedNameCache().getOrCreate(QualifiedNameComponents { p.impl(), l.impl(), n.isEmpty() ? nullptr : n.impl() })) > { > } >@@ -45,7 +45,7 @@ void QualifiedName::init() > if (initialized) > return; > >- ASSERT_WITH_MESSAGE(WTF::nullAtomData.isConstructed(), "AtomicString::init should have been called"); >+ ASSERT_WITH_MESSAGE(WTF::nullAtomData.isConstructed(), "AtomString::init should have been called"); > anyName.construct(nullAtom(), starAtom(), starAtom()); > initialized = true; > } >@@ -56,7 +56,7 @@ const QualifiedName& nullQName() > return nullName; > } > >-const AtomicString& QualifiedName::localNameUpper() const >+const AtomString& QualifiedName::localNameUpper() const > { > if (!m_impl->m_localNameUpper) > m_impl->m_localNameUpper = m_impl->m_localName.convertToASCIIUppercase(); >diff --git a/Source/WebCore/dom/QualifiedName.h b/Source/WebCore/dom/QualifiedName.h >index 8b762e5e89f78d24f17e8f8049106d27b1985d7e..20f1244158bacfeb9ebebb81f98624f65022ef4d 100644 >--- a/Source/WebCore/dom/QualifiedName.h >+++ b/Source/WebCore/dom/QualifiedName.h >@@ -22,7 +22,7 @@ > > #include <wtf/HashTraits.h> > #include <wtf/NeverDestroyed.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -37,7 +37,7 @@ class QualifiedName { > public: > class QualifiedNameImpl : public RefCounted<QualifiedNameImpl> { > public: >- static Ref<QualifiedNameImpl> create(const AtomicString& prefix, const AtomicString& localName, const AtomicString& namespaceURI) >+ static Ref<QualifiedNameImpl> create(const AtomString& prefix, const AtomString& localName, const AtomString& namespaceURI) > { > return adoptRef(*new QualifiedNameImpl(prefix, localName, namespaceURI)); > } >@@ -47,10 +47,10 @@ public: > unsigned computeHash() const; > > mutable unsigned m_existingHash { 0 }; >- const AtomicString m_prefix; >- const AtomicString m_localName; >- const AtomicString m_namespace; >- mutable AtomicString m_localNameUpper; >+ const AtomString m_prefix; >+ const AtomString m_localName; >+ const AtomString m_namespace; >+ mutable AtomString m_localNameUpper; > > #if ENABLE(JIT) > static ptrdiff_t localNameMemoryOffset() { return OBJECT_OFFSETOF(QualifiedNameImpl, m_localName); } >@@ -58,7 +58,7 @@ public: > #endif > > private: >- QualifiedNameImpl(const AtomicString& prefix, const AtomicString& localName, const AtomicString& namespaceURI) >+ QualifiedNameImpl(const AtomString& prefix, const AtomString& localName, const AtomString& namespaceURI) > : m_prefix(prefix) > , m_localName(localName) > , m_namespace(namespaceURI) >@@ -67,7 +67,7 @@ public: > } > }; > >- WEBCORE_EXPORT QualifiedName(const AtomicString& prefix, const AtomicString& localName, const AtomicString& namespaceURI); >+ WEBCORE_EXPORT QualifiedName(const AtomString& prefix, const AtomString& localName, const AtomString& namespaceURI); > explicit QualifiedName(WTF::HashTableDeletedValueType) : m_impl(WTF::HashTableDeletedValue) { } > bool isHashTableDeletedValue() const { return m_impl.isHashTableDeletedValue(); } > #ifdef QNAME_DEFAULT_CONSTRUCTOR >@@ -80,14 +80,14 @@ public: > bool matches(const QualifiedName& other) const { return m_impl == other.m_impl || (localName() == other.localName() && namespaceURI() == other.namespaceURI()); } > > bool hasPrefix() const { return !m_impl->m_prefix.isNull(); } >- void setPrefix(const AtomicString& prefix) { *this = QualifiedName(prefix, localName(), namespaceURI()); } >+ void setPrefix(const AtomString& prefix) { *this = QualifiedName(prefix, localName(), namespaceURI()); } > >- const AtomicString& prefix() const { return m_impl->m_prefix; } >- const AtomicString& localName() const { return m_impl->m_localName; } >- const AtomicString& namespaceURI() const { return m_impl->m_namespace; } >+ const AtomString& prefix() const { return m_impl->m_prefix; } >+ const AtomString& localName() const { return m_impl->m_localName; } >+ const AtomString& namespaceURI() const { return m_impl->m_namespace; } > > // Uppercased localName, cached for efficiency >- const AtomicString& localNameUpper() const; >+ const AtomString& localNameUpper() const; > > String toString() const; > >@@ -110,10 +110,10 @@ inline const QualifiedName& anyQName() { return anyName; } > > const QualifiedName& nullQName(); > >-inline bool operator==(const AtomicString& a, const QualifiedName& q) { return a == q.localName(); } >-inline bool operator!=(const AtomicString& a, const QualifiedName& q) { return a != q.localName(); } >-inline bool operator==(const QualifiedName& q, const AtomicString& a) { return a == q.localName(); } >-inline bool operator!=(const QualifiedName& q, const AtomicString& a) { return a != q.localName(); } >+inline bool operator==(const AtomString& a, const QualifiedName& q) { return a == q.localName(); } >+inline bool operator!=(const AtomString& a, const QualifiedName& q) { return a != q.localName(); } >+inline bool operator==(const QualifiedName& q, const AtomString& a) { return a == q.localName(); } >+inline bool operator!=(const QualifiedName& q, const AtomString& a) { return a != q.localName(); } > > inline unsigned hashComponents(const QualifiedNameComponents& buf) > { >diff --git a/Source/WebCore/dom/RadioButtonGroups.cpp b/Source/WebCore/dom/RadioButtonGroups.cpp >index 2f305ef681d20b48da5715beb285e227604496f3..5337c58cdfbbaab230184502638dc63449f796ac 100644 >--- a/Source/WebCore/dom/RadioButtonGroups.cpp >+++ b/Source/WebCore/dom/RadioButtonGroups.cpp >@@ -249,7 +249,7 @@ void RadioButtonGroups::requiredStateChanged(HTMLInputElement& element) > group->requiredStateChanged(element); > } > >-HTMLInputElement* RadioButtonGroups::checkedButtonForGroup(const AtomicString& name) const >+HTMLInputElement* RadioButtonGroups::checkedButtonForGroup(const AtomString& name) const > { > if (!m_nameToGroupMap) > return nullptr; >@@ -261,7 +261,7 @@ HTMLInputElement* RadioButtonGroups::checkedButtonForGroup(const AtomicString& n > bool RadioButtonGroups::hasCheckedButton(const HTMLInputElement& element) const > { > ASSERT(element.isRadioButton()); >- const AtomicString& name = element.name(); >+ const AtomString& name = element.name(); > if (name.isEmpty() || !m_nameToGroupMap) > return element.checked(); > return m_nameToGroupMap->get(name.impl())->checkedButton(); >@@ -294,7 +294,7 @@ void RadioButtonGroups::removeButton(HTMLInputElement& element) > if (it->value->isEmpty()) { > // FIXME: We may skip deallocating the empty RadioButtonGroup for > // performance improvement. If we do so, we need to change the key type >- // of m_nameToGroupMap from AtomicStringImpl* to RefPtr<AtomicStringImpl>. >+ // of m_nameToGroupMap from AtomStringImpl* to RefPtr<AtomStringImpl>. > m_nameToGroupMap->remove(it); > if (m_nameToGroupMap->isEmpty()) > m_nameToGroupMap = nullptr; >diff --git a/Source/WebCore/dom/RadioButtonGroups.h b/Source/WebCore/dom/RadioButtonGroups.h >index 4b284509142fc23d006c68ead564be4e18683664..26f1f7137f53929eb84b7064e5feb86f1741fa64 100644 >--- a/Source/WebCore/dom/RadioButtonGroups.h >+++ b/Source/WebCore/dom/RadioButtonGroups.h >@@ -38,13 +38,13 @@ public: > void updateCheckedState(HTMLInputElement&); > void requiredStateChanged(HTMLInputElement&); > void removeButton(HTMLInputElement&); >- HTMLInputElement* checkedButtonForGroup(const AtomicString& groupName) const; >+ HTMLInputElement* checkedButtonForGroup(const AtomString& groupName) const; > bool hasCheckedButton(const HTMLInputElement&) const; > bool isInRequiredGroup(HTMLInputElement&) const; > Vector<HTMLInputElement*> groupMembers(const HTMLInputElement&) const; > > private: >- typedef HashMap<AtomicStringImpl*, std::unique_ptr<RadioButtonGroup>> NameToGroupMap; >+ typedef HashMap<AtomStringImpl*, std::unique_ptr<RadioButtonGroup>> NameToGroupMap; > std::unique_ptr<NameToGroupMap> m_nameToGroupMap; > }; > >diff --git a/Source/WebCore/dom/ScriptElementCachedScriptFetcher.h b/Source/WebCore/dom/ScriptElementCachedScriptFetcher.h >index 03c3896dbed8e462aa9916d8ac7ba68f90ef3fd6..170804e9d87cfcbee545f40a000e7e310a2e7d4d 100644 >--- a/Source/WebCore/dom/ScriptElementCachedScriptFetcher.h >+++ b/Source/WebCore/dom/ScriptElementCachedScriptFetcher.h >@@ -39,7 +39,7 @@ public: > const String& crossOriginMode() const { return m_crossOriginMode; } > > protected: >- ScriptElementCachedScriptFetcher(const String& nonce, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree) >+ ScriptElementCachedScriptFetcher(const String& nonce, const String& crossOriginMode, const String& charset, const AtomString& initiatorName, bool isInUserAgentShadowTree) > : CachedScriptFetcher(nonce, charset, initiatorName, isInUserAgentShadowTree) > , m_crossOriginMode(crossOriginMode) > { >diff --git a/Source/WebCore/dom/SecurityPolicyViolationEvent.h b/Source/WebCore/dom/SecurityPolicyViolationEvent.h >index abdd5c5500711d30d3537f472b41a4fd392eb5b6..3c40b71eb9075c1a00fd87d810a4b74555abddd2 100644 >--- a/Source/WebCore/dom/SecurityPolicyViolationEvent.h >+++ b/Source/WebCore/dom/SecurityPolicyViolationEvent.h >@@ -31,7 +31,7 @@ namespace WebCore { > > class SecurityPolicyViolationEvent final : public Event { > public: >- static Ref<SecurityPolicyViolationEvent> create(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, const String& documentURI, const String& referrer, const String& blockedURI, const String& violatedDirective, const String& effectiveDirective, const String& originalPolicy, const String& sourceFile, unsigned short statusCode, int lineNumber, int columnNumber) >+ static Ref<SecurityPolicyViolationEvent> create(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, const String& documentURI, const String& referrer, const String& blockedURI, const String& violatedDirective, const String& effectiveDirective, const String& originalPolicy, const String& sourceFile, unsigned short statusCode, int lineNumber, int columnNumber) > { > return adoptRef(*new SecurityPolicyViolationEvent(type, canBubble, cancelable, documentURI, referrer, blockedURI, violatedDirective, effectiveDirective, originalPolicy, sourceFile, statusCode, lineNumber, columnNumber)); > } >@@ -57,7 +57,7 @@ public: > template<class Decoder> static bool decode(Decoder&, Init&); > }; > >- static Ref<SecurityPolicyViolationEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<SecurityPolicyViolationEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new SecurityPolicyViolationEvent(type, initializer, isTrusted)); > } >@@ -80,7 +80,7 @@ private: > { > } > >- SecurityPolicyViolationEvent(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, const String& documentURI, const String& referrer, const String& blockedURI, const String& violatedDirective, const String& effectiveDirective, const String& originalPolicy, const String& sourceFile, unsigned short statusCode, int lineNumber, int columnNumber) >+ SecurityPolicyViolationEvent(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, const String& documentURI, const String& referrer, const String& blockedURI, const String& violatedDirective, const String& effectiveDirective, const String& originalPolicy, const String& sourceFile, unsigned short statusCode, int lineNumber, int columnNumber) > : Event(type, canBubble, cancelable) > , m_documentURI(documentURI) > , m_referrer(referrer) >@@ -95,7 +95,7 @@ private: > { > } > >- SecurityPolicyViolationEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+ SecurityPolicyViolationEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_documentURI(initializer.documentURI) > , m_referrer(initializer.referrer) >diff --git a/Source/WebCore/dom/SelectorQuery.cpp b/Source/WebCore/dom/SelectorQuery.cpp >index acec1c206111e3fdd6bcba38a83288ed202da3a7..55dc2c87a4ac202d71adda66d596b5fea0bc8856 100644 >--- a/Source/WebCore/dom/SelectorQuery.cpp >+++ b/Source/WebCore/dom/SelectorQuery.cpp >@@ -221,7 +221,7 @@ ALWAYS_INLINE void SelectorDataList::executeFastPathForIdSelector(const Containe > ASSERT(m_selectors.size() == 1); > ASSERT(idSelector); > >- const AtomicString& idToMatch = idSelector->value(); >+ const AtomString& idToMatch = idSelector->value(); > if (UNLIKELY(rootNode.treeScope().containsMultipleElementsWithId(idToMatch))) { > const Vector<Element*>* elements = rootNode.treeScope().getAllElementsById(idToMatch); > ASSERT(elements); >@@ -263,7 +263,7 @@ static ContainerNode& filterRootById(ContainerNode& rootNode, const CSSSelector& > bool inAdjacentChain = false; > for (; selector; selector = selector->tagHistory()) { > if (canBeUsedForIdFastPath(*selector)) { >- const AtomicString& idToMatch = selector->value(); >+ const AtomString& idToMatch = selector->value(); > if (ContainerNode* searchRoot = rootNode.treeScope().getElementById(idToMatch)) { > if (LIKELY(!rootNode.treeScope().containsMultipleElementsWithId(idToMatch))) { > if (inAdjacentChain) >@@ -283,7 +283,7 @@ static ContainerNode& filterRootById(ContainerNode& rootNode, const CSSSelector& > return rootNode; > } > >-static ALWAYS_INLINE bool localNameMatches(const Element& element, const AtomicString& localName, const AtomicString& lowercaseLocalName) >+static ALWAYS_INLINE bool localNameMatches(const Element& element, const AtomString& localName, const AtomString& lowercaseLocalName) > { > if (element.isHTMLElement() && element.document().isHTMLDocument()) > return element.localName() == lowercaseLocalName; >@@ -292,7 +292,7 @@ static ALWAYS_INLINE bool localNameMatches(const Element& element, const AtomicS > } > > template <typename SelectorQueryTrait> >-static inline void elementsForLocalName(const ContainerNode& rootNode, const AtomicString& localName, const AtomicString& lowercaseLocalName, typename SelectorQueryTrait::OutputType& output) >+static inline void elementsForLocalName(const ContainerNode& rootNode, const AtomString& localName, const AtomString& lowercaseLocalName, typename SelectorQueryTrait::OutputType& output) > { > if (localName == lowercaseLocalName) { > for (auto& element : elementDescendants(const_cast<ContainerNode&>(rootNode))) { >@@ -331,9 +331,9 @@ ALWAYS_INLINE void SelectorDataList::executeSingleTagNameSelectorData(const Cont > ASSERT(isSingleTagNameSelector(*selectorData.selector)); > > const QualifiedName& tagQualifiedName = selectorData.selector->tagQName(); >- const AtomicString& selectorLocalName = tagQualifiedName.localName(); >- const AtomicString& selectorLowercaseLocalName = selectorData.selector->tagLowercaseLocalName(); >- const AtomicString& selectorNamespaceURI = tagQualifiedName.namespaceURI(); >+ const AtomString& selectorLocalName = tagQualifiedName.localName(); >+ const AtomString& selectorLowercaseLocalName = selectorData.selector->tagLowercaseLocalName(); >+ const AtomString& selectorNamespaceURI = tagQualifiedName.namespaceURI(); > > if (selectorNamespaceURI == starAtom()) { > if (selectorLocalName != starAtom()) { >@@ -361,7 +361,7 @@ ALWAYS_INLINE void SelectorDataList::executeSingleClassNameSelectorData(const Co > ASSERT(m_selectors.size() == 1); > ASSERT(isSingleClassNameSelector(*selectorData.selector)); > >- const AtomicString& className = selectorData.selector->value(); >+ const AtomString& className = selectorData.selector->value(); > for (auto& element : elementDescendants(const_cast<ContainerNode&>(rootNode))) { > if (element.hasClass() && element.classNames().contains(className)) { > SelectorQueryTrait::appendOutputForElement(output, &element); >diff --git a/Source/WebCore/dom/SelectorQuery.h b/Source/WebCore/dom/SelectorQuery.h >index c6a44095ad41522aa7c6323d02630fb702845ae8..0dbf82664803c056c21884a3068d006a227f3eb2 100644 >--- a/Source/WebCore/dom/SelectorQuery.h >+++ b/Source/WebCore/dom/SelectorQuery.h >@@ -31,7 +31,7 @@ > #include "SelectorCompiler.h" > #include <wtf/HashMap.h> > #include <wtf/Vector.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >diff --git a/Source/WebCore/dom/ShadowRoot.cpp b/Source/WebCore/dom/ShadowRoot.cpp >index 6e8851e5b80fccb9a1c05c2a9cb1b82d76010739..6963b68379d88f27a84e2f1da6515381805b293c 100644 >--- a/Source/WebCore/dom/ShadowRoot.cpp >+++ b/Source/WebCore/dom/ShadowRoot.cpp >@@ -218,13 +218,13 @@ HTMLSlotElement* ShadowRoot::findAssignedSlot(const Node& node) > return m_slotAssignment->findAssignedSlot(node, *this); > } > >-void ShadowRoot::renameSlotElement(HTMLSlotElement& slot, const AtomicString& oldName, const AtomicString& newName) >+void ShadowRoot::renameSlotElement(HTMLSlotElement& slot, const AtomString& oldName, const AtomString& newName) > { > ASSERT(m_slotAssignment); > return m_slotAssignment->renameSlotElement(slot, oldName, newName, *this); > } > >-void ShadowRoot::addSlotElementByName(const AtomicString& name, HTMLSlotElement& slot) >+void ShadowRoot::addSlotElementByName(const AtomString& name, HTMLSlotElement& slot) > { > ASSERT(&slot.rootNode() == this); > if (!m_slotAssignment) >@@ -233,7 +233,7 @@ void ShadowRoot::addSlotElementByName(const AtomicString& name, HTMLSlotElement& > return m_slotAssignment->addSlotElementByName(name, slot, *this); > } > >-void ShadowRoot::removeSlotElementByName(const AtomicString& name, HTMLSlotElement& slot, ContainerNode& oldParentOfRemovedTree) >+void ShadowRoot::removeSlotElementByName(const AtomString& name, HTMLSlotElement& slot, ContainerNode& oldParentOfRemovedTree) > { > ASSERT(m_slotAssignment); > return m_slotAssignment->removeSlotElementByName(name, slot, &oldParentOfRemovedTree, *this); >diff --git a/Source/WebCore/dom/ShadowRoot.h b/Source/WebCore/dom/ShadowRoot.h >index 36ef614a0d02b3d853f40eaa4750ba586e184dee..9cbee5a75562e2113cd3e8ceae7a9f9275465779 100644 >--- a/Source/WebCore/dom/ShadowRoot.h >+++ b/Source/WebCore/dom/ShadowRoot.h >@@ -75,9 +75,9 @@ public: > > HTMLSlotElement* findAssignedSlot(const Node&); > >- void renameSlotElement(HTMLSlotElement&, const AtomicString& oldName, const AtomicString& newName); >- void addSlotElementByName(const AtomicString&, HTMLSlotElement&); >- void removeSlotElementByName(const AtomicString&, HTMLSlotElement&, ContainerNode& oldParentOfRemovedTree); >+ void renameSlotElement(HTMLSlotElement&, const AtomString& oldName, const AtomString& newName); >+ void addSlotElementByName(const AtomString&, HTMLSlotElement&); >+ void removeSlotElementByName(const AtomString&, HTMLSlotElement&, ContainerNode& oldParentOfRemovedTree); > void slotFallbackDidChange(HTMLSlotElement&); > void resolveSlotsBeforeNodeInsertionOrRemoval(); > void willRemoveAllChildren(ContainerNode&); >@@ -85,7 +85,7 @@ public: > void didRemoveAllChildrenOfShadowHost(); > void didChangeDefaultSlot(); > void hostChildElementDidChange(const Element&); >- void hostChildElementDidChangeSlotAttribute(Element&, const AtomicString& oldValue, const AtomicString& newValue); >+ void hostChildElementDidChangeSlotAttribute(Element&, const AtomString& oldValue, const AtomString& newValue); > > const Vector<Node*>* assignedNodesForSlot(const HTMLSlotElement&); > >diff --git a/Source/WebCore/dom/SimulatedClick.cpp b/Source/WebCore/dom/SimulatedClick.cpp >index 24199c020fcd790788b1d8be76d4c3e7316ec337..05e3abdfa6899fa07a874e509f0b58058a821201 100644 >--- a/Source/WebCore/dom/SimulatedClick.cpp >+++ b/Source/WebCore/dom/SimulatedClick.cpp >@@ -39,13 +39,13 @@ namespace WebCore { > class SimulatedMouseEvent final : public MouseEvent { > WTF_MAKE_ISO_ALLOCATED_INLINE(SimulatedMouseEvent); > public: >- static Ref<SimulatedMouseEvent> create(const AtomicString& eventType, RefPtr<WindowProxy>&& view, RefPtr<Event>&& underlyingEvent, Element& target, SimulatedClickSource source) >+ static Ref<SimulatedMouseEvent> create(const AtomString& eventType, RefPtr<WindowProxy>&& view, RefPtr<Event>&& underlyingEvent, Element& target, SimulatedClickSource source) > { > return adoptRef(*new SimulatedMouseEvent(eventType, WTFMove(view), WTFMove(underlyingEvent), target, source)); > } > > private: >- SimulatedMouseEvent(const AtomicString& eventType, RefPtr<WindowProxy>&& view, RefPtr<Event>&& underlyingEvent, Element& target, SimulatedClickSource source) >+ SimulatedMouseEvent(const AtomString& eventType, RefPtr<WindowProxy>&& view, RefPtr<Event>&& underlyingEvent, Element& target, SimulatedClickSource source) > : MouseEvent(eventType, CanBubble::Yes, IsCancelable::Yes, IsComposed::Yes, > underlyingEvent ? underlyingEvent->timeStamp() : MonotonicTime::now(), WTFMove(view), /* detail */ 0, > { }, { }, { }, modifiersFromUnderlyingEvent(underlyingEvent), 0, 0, nullptr, 0, 0, nullptr, IsSimulated::Yes, >@@ -76,7 +76,7 @@ private: > } > }; > >-static void simulateMouseEvent(const AtomicString& eventType, Element& element, Event* underlyingEvent, SimulatedClickSource source) >+static void simulateMouseEvent(const AtomString& eventType, Element& element, Event* underlyingEvent, SimulatedClickSource source) > { > element.dispatchEvent(SimulatedMouseEvent::create(eventType, element.document().windowProxy(), underlyingEvent, element, source)); > } >diff --git a/Source/WebCore/dom/SlotAssignment.cpp b/Source/WebCore/dom/SlotAssignment.cpp >index e39cfd49cdfdb9df20989a657642227a073bc3c1..a419dda528accbda6de9ddf1a54864cfdf9160ef 100644 >--- a/Source/WebCore/dom/SlotAssignment.cpp >+++ b/Source/WebCore/dom/SlotAssignment.cpp >@@ -35,12 +35,12 @@ namespace WebCore { > > using namespace HTMLNames; > >-static const AtomicString& slotNameFromAttributeValue(const AtomicString& value) >+static const AtomString& slotNameFromAttributeValue(const AtomString& value) > { > return value == nullAtom() ? SlotAssignment::defaultSlotName() : value; > } > >-static const AtomicString& slotNameFromSlotAttribute(const Node& child) >+static const AtomString& slotNameFromSlotAttribute(const Node& child) > { > if (is<Text>(child)) > return SlotAssignment::defaultSlotName(); >@@ -49,7 +49,7 @@ static const AtomicString& slotNameFromSlotAttribute(const Node& child) > } > > #if !ASSERT_DISABLED >-static HTMLSlotElement* findSlotElement(ShadowRoot& shadowRoot, const AtomicString& slotName) >+static HTMLSlotElement* findSlotElement(ShadowRoot& shadowRoot, const AtomString& slotName) > { > for (auto& slotElement : descendantsOfType<HTMLSlotElement>(shadowRoot)) { > if (slotNameFromAttributeValue(slotElement.attributeWithoutSynchronization(nameAttr)) == slotName) >@@ -94,7 +94,7 @@ inline bool SlotAssignment::hasAssignedNodes(ShadowRoot& shadowRoot, Slot& slot) > return !slot.assignedNodes.isEmpty(); > } > >-void SlotAssignment::renameSlotElement(HTMLSlotElement& slotElement, const AtomicString& oldName, const AtomicString& newName, ShadowRoot& shadowRoot) >+void SlotAssignment::renameSlotElement(HTMLSlotElement& slotElement, const AtomString& oldName, const AtomString& newName, ShadowRoot& shadowRoot) > { > ASSERT(m_slotElementsForConsistencyCheck.contains(&slotElement)); > >@@ -104,7 +104,7 @@ void SlotAssignment::renameSlotElement(HTMLSlotElement& slotElement, const Atomi > addSlotElementByName(newName, slotElement, shadowRoot); > } > >-void SlotAssignment::addSlotElementByName(const AtomicString& name, HTMLSlotElement& slotElement, ShadowRoot& shadowRoot) >+void SlotAssignment::addSlotElementByName(const AtomString& name, HTMLSlotElement& slotElement, ShadowRoot& shadowRoot) > { > #ifndef NDEBUG > ASSERT(!m_slotElementsForConsistencyCheck.contains(&slotElement)); >@@ -143,7 +143,7 @@ void SlotAssignment::addSlotElementByName(const AtomicString& name, HTMLSlotElem > resolveSlotsAfterSlotMutation(shadowRoot, SlotMutationType::Insertion); > } > >-void SlotAssignment::removeSlotElementByName(const AtomicString& name, HTMLSlotElement& slotElement, ContainerNode* oldParentOfRemovedTreeForRemoval, ShadowRoot& shadowRoot) >+void SlotAssignment::removeSlotElementByName(const AtomString& name, HTMLSlotElement& slotElement, ContainerNode* oldParentOfRemovedTreeForRemoval, ShadowRoot& shadowRoot) > { > #ifndef NDEBUG > ASSERT(m_slotElementsForConsistencyCheck.contains(&slotElement)); >@@ -289,7 +289,7 @@ void SlotAssignment::willRemoveAllChildren(ShadowRoot& shadowRoot) > resolveAllSlotElements(shadowRoot); > } > >-void SlotAssignment::didChangeSlot(const AtomicString& slotAttrValue, ShadowRoot& shadowRoot) >+void SlotAssignment::didChangeSlot(const AtomString& slotAttrValue, ShadowRoot& shadowRoot) > { > auto& slotName = slotNameFromAttributeValue(slotAttrValue); > auto* slot = m_slots.get(slotName); >@@ -317,7 +317,7 @@ void SlotAssignment::hostChildElementDidChange(const Element& childElement, Shad > const Vector<Node*>* SlotAssignment::assignedNodesForSlot(const HTMLSlotElement& slotElement, ShadowRoot& shadowRoot) > { > ASSERT(slotElement.containingShadowRoot() == &shadowRoot); >- const AtomicString& slotName = slotNameFromAttributeValue(slotElement.attributeWithoutSynchronization(nameAttr)); >+ const AtomString& slotName = slotNameFromAttributeValue(slotElement.attributeWithoutSynchronization(nameAttr)); > auto* slot = m_slots.get(slotName); > RELEASE_ASSERT(slot); > >@@ -334,7 +334,7 @@ const Vector<Node*>* SlotAssignment::assignedNodesForSlot(const HTMLSlotElement& > return &slot->assignedNodes; > } > >-const AtomicString& SlotAssignment::slotNameForHostChild(const Node& child) const >+const AtomString& SlotAssignment::slotNameForHostChild(const Node& child) const > { > return slotNameFromSlotAttribute(child); > } >@@ -399,7 +399,7 @@ void SlotAssignment::assignSlots(ShadowRoot& shadowRoot) > entry.value->assignedNodes.shrinkToFit(); > } > >-void SlotAssignment::assignToSlot(Node& child, const AtomicString& slotName) >+void SlotAssignment::assignToSlot(Node& child, const AtomString& slotName) > { > ASSERT(!slotName.isNull()); > if (slotName == defaultSlotName()) { >diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h >index 463673ca5907d9627cf79a62591aa873df3dc6ea..f2464a609ee40c95a4d881ebd8e1a8b62e76a2d8 100644 >--- a/Source/WebCore/dom/SlotAssignment.h >+++ b/Source/WebCore/dom/SlotAssignment.h >@@ -31,8 +31,8 @@ > #include <wtf/HashSet.h> > #include <wtf/Vector.h> > #include <wtf/WeakPtr.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -46,19 +46,19 @@ public: > SlotAssignment(); > virtual ~SlotAssignment(); > >- static const AtomicString& defaultSlotName() { return emptyAtom(); } >+ static const AtomString& defaultSlotName() { return emptyAtom(); } > > HTMLSlotElement* findAssignedSlot(const Node&, ShadowRoot&); > >- void renameSlotElement(HTMLSlotElement&, const AtomicString& oldName, const AtomicString& newName, ShadowRoot&); >- void addSlotElementByName(const AtomicString&, HTMLSlotElement&, ShadowRoot&); >- void removeSlotElementByName(const AtomicString&, HTMLSlotElement&, ContainerNode* oldParentOfRemovedTreeForRemoval, ShadowRoot&); >+ void renameSlotElement(HTMLSlotElement&, const AtomString& oldName, const AtomString& newName, ShadowRoot&); >+ void addSlotElementByName(const AtomString&, HTMLSlotElement&, ShadowRoot&); >+ void removeSlotElementByName(const AtomString&, HTMLSlotElement&, ContainerNode* oldParentOfRemovedTreeForRemoval, ShadowRoot&); > void slotFallbackDidChange(HTMLSlotElement&, ShadowRoot&); > void resolveSlotsBeforeNodeInsertionOrRemoval(ShadowRoot&); > void willRemoveAllChildren(ShadowRoot&); > >- void didChangeSlot(const AtomicString&, ShadowRoot&); >- void enqueueSlotChangeEvent(const AtomicString&, ShadowRoot&); >+ void didChangeSlot(const AtomString&, ShadowRoot&); >+ void enqueueSlotChangeEvent(const AtomString&, ShadowRoot&); > > const Vector<Node*>* assignedNodesForSlot(const HTMLSlotElement&, ShadowRoot&); > >@@ -85,15 +85,15 @@ private: > enum class SlotMutationType { Insertion, Removal }; > void resolveSlotsAfterSlotMutation(ShadowRoot&, SlotMutationType, ContainerNode* oldParentOfRemovedTree = nullptr); > >- virtual const AtomicString& slotNameForHostChild(const Node&) const; >+ virtual const AtomString& slotNameForHostChild(const Node&) const; > > HTMLSlotElement* findFirstSlotElement(Slot&, ShadowRoot&); > void resolveAllSlotElements(ShadowRoot&); > > void assignSlots(ShadowRoot&); >- void assignToSlot(Node& child, const AtomicString& slotName); >+ void assignToSlot(Node& child, const AtomString& slotName); > >- HashMap<AtomicString, std::unique_ptr<Slot>> m_slots; >+ HashMap<AtomString, std::unique_ptr<Slot>> m_slots; > > #ifndef NDEBUG > HashSet<HTMLSlotElement*> m_slotElementsForConsistencyCheck; >@@ -136,7 +136,7 @@ inline void ShadowRoot::hostChildElementDidChange(const Element& childElement) > m_slotAssignment->hostChildElementDidChange(childElement, *this); > } > >-inline void ShadowRoot::hostChildElementDidChangeSlotAttribute(Element& element, const AtomicString& oldValue, const AtomicString& newValue) >+inline void ShadowRoot::hostChildElementDidChangeSlotAttribute(Element& element, const AtomString& oldValue, const AtomString& newValue) > { > if (!m_slotAssignment) > return; >diff --git a/Source/WebCore/dom/SpaceSplitString.cpp b/Source/WebCore/dom/SpaceSplitString.cpp >index 10c69abe62a5e25885c33986daa9cfc9a470acea..18e385e2a299d0dc39a3040d190b7ca30b08ee31 100644 >--- a/Source/WebCore/dom/SpaceSplitString.cpp >+++ b/Source/WebCore/dom/SpaceSplitString.cpp >@@ -24,7 +24,7 @@ > #include "HTMLParserIdioms.h" > #include <wtf/HashMap.h> > #include <wtf/NeverDestroyed.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -76,7 +76,7 @@ bool SpaceSplitStringData::containsAll(SpaceSplitStringData& other) > return true; > } > >-struct SpaceSplitStringTableKeyTraits : public HashTraits<AtomicString> >+struct SpaceSplitStringTableKeyTraits : public HashTraits<AtomString> > { > // The number 200 for typicalNumberOfSpaceSplitString was based on the typical number of unique class names > // on typical websites on August 2013. >@@ -84,7 +84,7 @@ struct SpaceSplitStringTableKeyTraits : public HashTraits<AtomicString> > static const int minimumTableSize = WTF::HashTableCapacityForSize<typicalNumberOfSpaceSplitString>::value; > }; > >-typedef HashMap<AtomicString, SpaceSplitStringData*, AtomicStringHash, SpaceSplitStringTableKeyTraits> SpaceSplitStringTable; >+typedef HashMap<AtomString, SpaceSplitStringData*, AtomStringHash, SpaceSplitStringTableKeyTraits> SpaceSplitStringTable; > > static SpaceSplitStringTable& spaceSplitStringTable() > { >@@ -92,7 +92,7 @@ static SpaceSplitStringTable& spaceSplitStringTable() > return table; > } > >-void SpaceSplitString::set(const AtomicString& inputString, bool shouldFoldCase) >+void SpaceSplitString::set(const AtomString& inputString, bool shouldFoldCase) > { > if (inputString.isNull()) { > clear(); >@@ -155,35 +155,35 @@ private: > unsigned m_tokenCount; > }; > >-class TokenAtomicStringInitializer { >- WTF_MAKE_NONCOPYABLE(TokenAtomicStringInitializer); >+class TokenAtomStringInitializer { >+ WTF_MAKE_NONCOPYABLE(TokenAtomStringInitializer); > public: >- TokenAtomicStringInitializer(AtomicString* memory) : m_memoryBucket(memory) { } >+ TokenAtomStringInitializer(AtomString* memory) : m_memoryBucket(memory) { } > > template<typename CharacterType> bool processToken(const CharacterType* characters, unsigned length) > { >- new (NotNull, m_memoryBucket) AtomicString(characters, length); >+ new (NotNull, m_memoryBucket) AtomString(characters, length); > ++m_memoryBucket; > return true; > } > >- const AtomicString* nextMemoryBucket() const { return m_memoryBucket; } >+ const AtomString* nextMemoryBucket() const { return m_memoryBucket; } > > private: >- AtomicString* m_memoryBucket; >+ AtomString* m_memoryBucket; > }; > >-inline Ref<SpaceSplitStringData> SpaceSplitStringData::create(const AtomicString& keyString, unsigned tokenCount) >+inline Ref<SpaceSplitStringData> SpaceSplitStringData::create(const AtomString& keyString, unsigned tokenCount) > { > ASSERT(tokenCount); > >- RELEASE_ASSERT(tokenCount < (std::numeric_limits<unsigned>::max() - sizeof(SpaceSplitStringData)) / sizeof(AtomicString)); >- unsigned sizeToAllocate = sizeof(SpaceSplitStringData) + tokenCount * sizeof(AtomicString); >+ RELEASE_ASSERT(tokenCount < (std::numeric_limits<unsigned>::max() - sizeof(SpaceSplitStringData)) / sizeof(AtomString)); >+ unsigned sizeToAllocate = sizeof(SpaceSplitStringData) + tokenCount * sizeof(AtomString); > SpaceSplitStringData* spaceSplitStringData = static_cast<SpaceSplitStringData*>(fastMalloc(sizeToAllocate)); > > new (NotNull, spaceSplitStringData) SpaceSplitStringData(keyString, tokenCount); >- AtomicString* tokenArrayStart = spaceSplitStringData->tokenArrayStart(); >- TokenAtomicStringInitializer tokenInitializer(tokenArrayStart); >+ AtomString* tokenArrayStart = spaceSplitStringData->tokenArrayStart(); >+ TokenAtomStringInitializer tokenInitializer(tokenArrayStart); > tokenizeSpaceSplitString(tokenInitializer, keyString); > ASSERT(static_cast<unsigned>(tokenInitializer.nextMemoryBucket() - tokenArrayStart) == tokenCount); > ASSERT(reinterpret_cast<const char*>(tokenInitializer.nextMemoryBucket()) == reinterpret_cast<const char*>(spaceSplitStringData) + sizeToAllocate); >@@ -191,7 +191,7 @@ inline Ref<SpaceSplitStringData> SpaceSplitStringData::create(const AtomicString > return adoptRef(*spaceSplitStringData); > } > >-RefPtr<SpaceSplitStringData> SpaceSplitStringData::create(const AtomicString& keyString) >+RefPtr<SpaceSplitStringData> SpaceSplitStringData::create(const AtomString& keyString) > { > ASSERT(isMainThread()); > ASSERT(!keyString.isNull()); >@@ -223,9 +223,9 @@ void SpaceSplitStringData::destroy(SpaceSplitStringData* spaceSplitString) > > unsigned i = 0; > unsigned size = spaceSplitString->size(); >- const AtomicString* data = spaceSplitString->tokenArrayStart(); >+ const AtomString* data = spaceSplitString->tokenArrayStart(); > do { >- data[i].~AtomicString(); >+ data[i].~AtomString(); > ++i; > } while (i < size); > >diff --git a/Source/WebCore/dom/SpaceSplitString.h b/Source/WebCore/dom/SpaceSplitString.h >index 057fbfc47e8ebaae0c3a80fd2026fd7b312b0590..6a18564b49e7eda69b5a586477de42698d4b81ea 100644 >--- a/Source/WebCore/dom/SpaceSplitString.h >+++ b/Source/WebCore/dom/SpaceSplitString.h >@@ -21,7 +21,7 @@ > #pragma once > > #include <wtf/MainThread.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -29,11 +29,11 @@ class SpaceSplitStringData { > WTF_MAKE_NONCOPYABLE(SpaceSplitStringData); > WTF_MAKE_FAST_ALLOCATED; > public: >- static RefPtr<SpaceSplitStringData> create(const AtomicString&); >+ static RefPtr<SpaceSplitStringData> create(const AtomString&); > >- bool contains(const AtomicString& string) >+ bool contains(const AtomString& string) > { >- const AtomicString* data = tokenArrayStart(); >+ const AtomString* data = tokenArrayStart(); > unsigned i = 0; > do { > if (data[i] == string) >@@ -48,7 +48,7 @@ public: > unsigned size() const { return m_size; } > static ptrdiff_t sizeMemoryOffset() { return OBJECT_OFFSETOF(SpaceSplitStringData, m_size); } > >- const AtomicString& operator[](unsigned i) >+ const AtomString& operator[](unsigned i) > { > RELEASE_ASSERT(i < m_size); > return tokenArrayStart()[i]; >@@ -76,8 +76,8 @@ public: > static ptrdiff_t tokensMemoryOffset() { return sizeof(SpaceSplitStringData); } > > private: >- static Ref<SpaceSplitStringData> create(const AtomicString&, unsigned tokenCount); >- SpaceSplitStringData(const AtomicString& string, unsigned size) >+ static Ref<SpaceSplitStringData> create(const AtomString&, unsigned tokenCount); >+ SpaceSplitStringData(const AtomString& string, unsigned size) > : m_keyString(string) > , m_refCount(1) > , m_size(size) >@@ -89,9 +89,9 @@ private: > ~SpaceSplitStringData() = default; > static void destroy(SpaceSplitStringData*); > >- AtomicString* tokenArrayStart() { return reinterpret_cast<AtomicString*>(this + 1); } >+ AtomString* tokenArrayStart() { return reinterpret_cast<AtomString*>(this + 1); } > >- AtomicString m_keyString; >+ AtomString m_keyString; > unsigned m_refCount; > unsigned m_size; > }; >@@ -99,19 +99,19 @@ private: > class SpaceSplitString { > public: > SpaceSplitString() = default; >- SpaceSplitString(const AtomicString& string, bool shouldFoldCase) { set(string, shouldFoldCase); } >+ SpaceSplitString(const AtomString& string, bool shouldFoldCase) { set(string, shouldFoldCase); } > > bool operator!=(const SpaceSplitString& other) const { return m_data != other.m_data; } > >- void set(const AtomicString&, bool shouldFoldCase); >+ void set(const AtomString&, bool shouldFoldCase); > void clear() { m_data = nullptr; } > >- bool contains(const AtomicString& string) const { return m_data && m_data->contains(string); } >+ bool contains(const AtomString& string) const { return m_data && m_data->contains(string); } > bool containsAll(const SpaceSplitString& names) const { return !names.m_data || (m_data && m_data->containsAll(*names.m_data)); } > > unsigned size() const { return m_data ? m_data->size() : 0; } > bool isEmpty() const { return !m_data; } >- const AtomicString& operator[](unsigned i) const >+ const AtomString& operator[](unsigned i) const > { > ASSERT_WITH_SECURITY_IMPLICATION(m_data); > return (*m_data)[i]; >diff --git a/Source/WebCore/dom/StyledElement.cpp b/Source/WebCore/dom/StyledElement.cpp >index 80c81f85ae46c698ddb94a1c7df46b388386d48b..3ab2feda3783aa9a0d24c07c851a619ab46a9794 100644 >--- a/Source/WebCore/dom/StyledElement.cpp >+++ b/Source/WebCore/dom/StyledElement.cpp >@@ -140,7 +140,7 @@ MutableStyleProperties& StyledElement::ensureMutableInlineStyle() > return downcast<MutableStyleProperties>(*inlineStyle); > } > >-void StyledElement::attributeChanged(const QualifiedName& name, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason reason) >+void StyledElement::attributeChanged(const QualifiedName& name, const AtomString& oldValue, const AtomString& newValue, AttributeModificationReason reason) > { > if (oldValue != newValue) { > if (name == styleAttr) >@@ -168,7 +168,7 @@ static bool usesStyleBasedEditability(const StyleProperties& properties) > return properties.getPropertyCSSValue(CSSPropertyWebkitUserModify); > } > >-void StyledElement::setInlineStyleFromString(const AtomicString& newStyleString) >+void StyledElement::setInlineStyleFromString(const AtomString& newStyleString) > { > RefPtr<StyleProperties>& inlineStyle = elementData()->m_inlineStyle; > >@@ -190,7 +190,7 @@ void StyledElement::setInlineStyleFromString(const AtomicString& newStyleString) > document().setHasElementUsingStyleBasedEditability(); > } > >-void StyledElement::styleAttributeChanged(const AtomicString& newStyleString, AttributeModificationReason reason) >+void StyledElement::styleAttributeChanged(const AtomString& newStyleString, AttributeModificationReason reason) > { > WTF::OrdinalNumber startLineNumber = WTF::OrdinalNumber::beforeFirst(); > if (document().scriptableDocumentParser() && !document().isInDocumentWrite()) >diff --git a/Source/WebCore/dom/StyledElement.h b/Source/WebCore/dom/StyledElement.h >index c53d8e6157aa9d2750b8f89d084561aab10a2738..56f6f4412731a5cf554f965c7138a7536c3997a1 100644 >--- a/Source/WebCore/dom/StyledElement.h >+++ b/Source/WebCore/dom/StyledElement.h >@@ -63,7 +63,7 @@ public: > #endif > > const StyleProperties* presentationAttributeStyle() const; >- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) { } >+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) { } > > protected: > StyledElement(const QualifiedName& name, Document& document, ConstructionType type) >@@ -71,7 +71,7 @@ protected: > { > } > >- void attributeChanged(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason = ModifiedDirectly) override; >+ void attributeChanged(const QualifiedName&, const AtomString& oldValue, const AtomString& newValue, AttributeModificationReason = ModifiedDirectly) override; > > virtual bool isPresentationAttribute(const QualifiedName&) const { return false; } > >@@ -82,11 +82,11 @@ protected: > void addSubresourceAttributeURLs(ListHashSet<URL>&) const override; > > private: >- void styleAttributeChanged(const AtomicString& newStyleString, AttributeModificationReason); >+ void styleAttributeChanged(const AtomString& newStyleString, AttributeModificationReason); > > void inlineStyleChanged(); > PropertySetCSSStyleDeclaration* inlineStyleCSSOMWrapper(); >- void setInlineStyleFromString(const AtomicString&); >+ void setInlineStyleFromString(const AtomString&); > MutableStyleProperties& ensureMutableInlineStyle(); > > void rebuildPresentationAttributeStyle(); >diff --git a/Source/WebCore/dom/TagCollection.cpp b/Source/WebCore/dom/TagCollection.cpp >index 4291fcdab4945ae8e69a9f781d3396665b4c1813..e067f2f1d2984cb787fee9a304912155dc9c3744 100644 >--- a/Source/WebCore/dom/TagCollection.cpp >+++ b/Source/WebCore/dom/TagCollection.cpp >@@ -33,7 +33,7 @@ WTF_MAKE_ISO_ALLOCATED_IMPL(TagCollection); > WTF_MAKE_ISO_ALLOCATED_IMPL(TagCollectionNS); > WTF_MAKE_ISO_ALLOCATED_IMPL(HTMLTagCollection); > >-TagCollectionNS::TagCollectionNS(ContainerNode& rootNode, const AtomicString& namespaceURI, const AtomicString& localName) >+TagCollectionNS::TagCollectionNS(ContainerNode& rootNode, const AtomString& namespaceURI, const AtomString& localName) > : CachedHTMLCollection<TagCollectionNS, CollectionTypeTraits<ByTag>::traversalType>(rootNode, ByTag) > , m_namespaceURI(namespaceURI) > , m_localName(localName) >@@ -46,7 +46,7 @@ TagCollectionNS::~TagCollectionNS() > ownerNode().nodeLists()->removeCachedTagCollectionNS(*this, m_namespaceURI, m_localName); > } > >-TagCollection::TagCollection(ContainerNode& rootNode, const AtomicString& qualifiedName) >+TagCollection::TagCollection(ContainerNode& rootNode, const AtomString& qualifiedName) > : CachedHTMLCollection<TagCollection, CollectionTypeTraits<ByTag>::traversalType>(rootNode, ByTag) > , m_qualifiedName(qualifiedName) > { >@@ -58,7 +58,7 @@ TagCollection::~TagCollection() > ownerNode().nodeLists()->removeCachedCollection(this, m_qualifiedName); > } > >-HTMLTagCollection::HTMLTagCollection(ContainerNode& rootNode, const AtomicString& qualifiedName) >+HTMLTagCollection::HTMLTagCollection(ContainerNode& rootNode, const AtomString& qualifiedName) > : CachedHTMLCollection<HTMLTagCollection, CollectionTypeTraits<ByHTMLTag>::traversalType>(rootNode, ByHTMLTag) > , m_qualifiedName(qualifiedName) > , m_loweredQualifiedName(qualifiedName.convertToASCIILowercase()) >diff --git a/Source/WebCore/dom/TagCollection.h b/Source/WebCore/dom/TagCollection.h >index 482e0db4f86820a4f48d14e7e17b6d06381cc43d..81dd3a59228640b4ba959669bfad3f20e6591419 100644 >--- a/Source/WebCore/dom/TagCollection.h >+++ b/Source/WebCore/dom/TagCollection.h >@@ -24,7 +24,7 @@ > #pragma once > > #include "CachedHTMLCollection.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -32,7 +32,7 @@ namespace WebCore { > class TagCollection final : public CachedHTMLCollection<TagCollection, CollectionTypeTraits<ByTag>::traversalType> { > WTF_MAKE_ISO_ALLOCATED(TagCollection); > public: >- static Ref<TagCollection> create(ContainerNode& rootNode, CollectionType type, const AtomicString& qualifiedName) >+ static Ref<TagCollection> create(ContainerNode& rootNode, CollectionType type, const AtomString& qualifiedName) > { > ASSERT_UNUSED(type, type == ByTag); > return adoptRef(*new TagCollection(rootNode, qualifiedName)); >@@ -42,15 +42,15 @@ public: > bool elementMatches(Element&) const; > > private: >- TagCollection(ContainerNode& rootNode, const AtomicString& qualifiedName); >+ TagCollection(ContainerNode& rootNode, const AtomString& qualifiedName); > >- AtomicString m_qualifiedName; >+ AtomString m_qualifiedName; > }; > > class TagCollectionNS final : public CachedHTMLCollection<TagCollectionNS, CollectionTypeTraits<ByTag>::traversalType> { > WTF_MAKE_ISO_ALLOCATED(TagCollectionNS); > public: >- static Ref<TagCollectionNS> create(ContainerNode& rootNode, const AtomicString& namespaceURI, const AtomicString& localName) >+ static Ref<TagCollectionNS> create(ContainerNode& rootNode, const AtomString& namespaceURI, const AtomString& localName) > { > return adoptRef(*new TagCollectionNS(rootNode, namespaceURI, localName)); > } >@@ -59,16 +59,16 @@ public: > bool elementMatches(Element&) const; > > private: >- TagCollectionNS(ContainerNode& rootNode, const AtomicString& namespaceURI, const AtomicString& localName); >+ TagCollectionNS(ContainerNode& rootNode, const AtomString& namespaceURI, const AtomString& localName); > >- AtomicString m_namespaceURI; >- AtomicString m_localName; >+ AtomString m_namespaceURI; >+ AtomString m_localName; > }; > > class HTMLTagCollection final : public CachedHTMLCollection<HTMLTagCollection, CollectionTypeTraits<ByHTMLTag>::traversalType> { > WTF_MAKE_ISO_ALLOCATED(HTMLTagCollection); > public: >- static Ref<HTMLTagCollection> create(ContainerNode& rootNode, CollectionType type, const AtomicString& qualifiedName) >+ static Ref<HTMLTagCollection> create(ContainerNode& rootNode, CollectionType type, const AtomString& qualifiedName) > { > ASSERT_UNUSED(type, type == ByHTMLTag); > return adoptRef(*new HTMLTagCollection(rootNode, qualifiedName)); >@@ -78,10 +78,10 @@ public: > bool elementMatches(Element&) const; > > private: >- HTMLTagCollection(ContainerNode& rootNode, const AtomicString& qualifiedName); >+ HTMLTagCollection(ContainerNode& rootNode, const AtomString& qualifiedName); > >- AtomicString m_qualifiedName; >- AtomicString m_loweredQualifiedName; >+ AtomString m_qualifiedName; >+ AtomString m_loweredQualifiedName; > }; > > inline bool TagCollection::elementMatches(Element& element) const >diff --git a/Source/WebCore/dom/TextEvent.cpp b/Source/WebCore/dom/TextEvent.cpp >index 6a041e8244bfafaead8ad15e24d41d99c29f63e6..eb46b7df65c8291bc060a070ee68329a617cbd0a 100644 >--- a/Source/WebCore/dom/TextEvent.cpp >+++ b/Source/WebCore/dom/TextEvent.cpp >@@ -105,7 +105,7 @@ TextEvent::TextEvent(RefPtr<WindowProxy>&& view, const String& data, const Vecto > > TextEvent::~TextEvent() = default; > >-void TextEvent::initTextEvent(const AtomicString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&& view, const String& data) >+void TextEvent::initTextEvent(const AtomString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&& view, const String& data) > { > if (isBeingDispatched()) > return; >diff --git a/Source/WebCore/dom/TextEvent.h b/Source/WebCore/dom/TextEvent.h >index 0ae2ac863fb81bbb286385165b6b1251d2dfb1b8..916deb502b5a004431d8291263b7a420201ec198 100644 >--- a/Source/WebCore/dom/TextEvent.h >+++ b/Source/WebCore/dom/TextEvent.h >@@ -47,7 +47,7 @@ namespace WebCore { > > virtual ~TextEvent(); > >- WEBCORE_EXPORT void initTextEvent(const AtomicString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&&, const String& data); >+ WEBCORE_EXPORT void initTextEvent(const AtomString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&&, const String& data); > > String data() const { return m_data; } > >diff --git a/Source/WebCore/dom/TouchEvent.cpp b/Source/WebCore/dom/TouchEvent.cpp >index 53267e4421aa316f27c2e31a55b4e3920c8eff88..eb0e84913d5cf8e76da677c9c5a31500f173a0a1 100644 >--- a/Source/WebCore/dom/TouchEvent.cpp >+++ b/Source/WebCore/dom/TouchEvent.cpp >@@ -36,7 +36,7 @@ namespace WebCore { > > TouchEvent::TouchEvent() = default; > >-TouchEvent::TouchEvent(TouchList* touches, TouchList* targetTouches, TouchList* changedTouches, const AtomicString& type, >+TouchEvent::TouchEvent(TouchList* touches, TouchList* targetTouches, TouchList* changedTouches, const AtomString& type, > RefPtr<WindowProxy>&& view, const IntPoint& globalLocation, OptionSet<Modifier> modifiers) > : MouseRelatedEvent(type, IsCancelable::Yes, MonotonicTime::now(), WTFMove(view), globalLocation, modifiers) > , m_touches(touches) >@@ -45,7 +45,7 @@ TouchEvent::TouchEvent(TouchList* touches, TouchList* targetTouches, TouchList* > { > } > >-TouchEvent::TouchEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+TouchEvent::TouchEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : MouseRelatedEvent(type, initializer, isTrusted) > , m_touches(initializer.touches ? initializer.touches : TouchList::create()) > , m_targetTouches(initializer.targetTouches ? initializer.targetTouches : TouchList::create()) >@@ -56,7 +56,7 @@ TouchEvent::TouchEvent(const AtomicString& type, const Init& initializer, IsTrus > TouchEvent::~TouchEvent() = default; > > void TouchEvent::initTouchEvent(TouchList* touches, TouchList* targetTouches, >- TouchList* changedTouches, const AtomicString& type, >+ TouchList* changedTouches, const AtomString& type, > RefPtr<WindowProxy>&& view, int screenX, int screenY, int clientX, int clientY, > bool ctrlKey, bool altKey, bool shiftKey, bool metaKey) > { >diff --git a/Source/WebCore/dom/TouchEvent.h b/Source/WebCore/dom/TouchEvent.h >index 13de0c298651ce4110e46a775cd31cac33b84eb5..833fe2a508fe1ba92bb58894823bc1ef65f77b36 100644 >--- a/Source/WebCore/dom/TouchEvent.h >+++ b/Source/WebCore/dom/TouchEvent.h >@@ -40,7 +40,7 @@ public: > virtual ~TouchEvent(); > > static Ref<TouchEvent> create(TouchList* touches, TouchList* targetTouches, TouchList* changedTouches, >- const AtomicString& type, RefPtr<WindowProxy>&& view, const IntPoint& globalLocation, OptionSet<Modifier> modifiers) >+ const AtomString& type, RefPtr<WindowProxy>&& view, const IntPoint& globalLocation, OptionSet<Modifier> modifiers) > { > return adoptRef(*new TouchEvent(touches, targetTouches, changedTouches, type, WTFMove(view), globalLocation, modifiers)); > } >@@ -55,12 +55,12 @@ public: > RefPtr<TouchList> changedTouches; > }; > >- static Ref<TouchEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<TouchEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new TouchEvent(type, initializer, isTrusted)); > } > >- void initTouchEvent(TouchList* touches, TouchList* targetTouches, TouchList* changedTouches, const AtomicString& type, >+ void initTouchEvent(TouchList* touches, TouchList* targetTouches, TouchList* changedTouches, const AtomString& type, > RefPtr<WindowProxy>&&, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey); > > TouchList* touches() const { return m_touches.get(); } >@@ -77,9 +77,9 @@ public: > > private: > TouchEvent(); >- TouchEvent(TouchList* touches, TouchList* targetTouches, TouchList* changedTouches, const AtomicString& type, >+ TouchEvent(TouchList* touches, TouchList* targetTouches, TouchList* changedTouches, const AtomString& type, > RefPtr<WindowProxy>&&, const IntPoint& globalLocation, OptionSet<Modifier>); >- TouchEvent(const AtomicString&, const Init&, IsTrusted); >+ TouchEvent(const AtomString&, const Init&, IsTrusted); > > RefPtr<TouchList> m_touches; > RefPtr<TouchList> m_targetTouches; >diff --git a/Source/WebCore/dom/TransitionEvent.cpp b/Source/WebCore/dom/TransitionEvent.cpp >index 5db09b9939c04c3bfe10fa0631e7c17001334643..11cb174157ce783902bc7090fbeb583fa9265945 100644 >--- a/Source/WebCore/dom/TransitionEvent.cpp >+++ b/Source/WebCore/dom/TransitionEvent.cpp >@@ -29,7 +29,7 @@ > > namespace WebCore { > >-TransitionEvent::TransitionEvent(const AtomicString& type, const String& propertyName, double elapsedTime, const String& pseudoElement) >+TransitionEvent::TransitionEvent(const AtomString& type, const String& propertyName, double elapsedTime, const String& pseudoElement) > : Event(type, CanBubble::Yes, IsCancelable::Yes) > , m_propertyName(propertyName) > , m_elapsedTime(elapsedTime) >@@ -37,7 +37,7 @@ TransitionEvent::TransitionEvent(const AtomicString& type, const String& propert > { > } > >-TransitionEvent::TransitionEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+TransitionEvent::TransitionEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_propertyName(initializer.propertyName) > , m_elapsedTime(initializer.elapsedTime) >diff --git a/Source/WebCore/dom/TransitionEvent.h b/Source/WebCore/dom/TransitionEvent.h >index 06d1d04f2880c8e3885915a84f501b289c60ea11..b50ee247e6bf4070e4fd1fd53b4d74ef6da1fb23 100644 >--- a/Source/WebCore/dom/TransitionEvent.h >+++ b/Source/WebCore/dom/TransitionEvent.h >@@ -32,7 +32,7 @@ namespace WebCore { > > class TransitionEvent final : public Event { > public: >- static Ref<TransitionEvent> create(const AtomicString& type, const String& propertyName, double elapsedTime, const String& pseudoElement) >+ static Ref<TransitionEvent> create(const AtomString& type, const String& propertyName, double elapsedTime, const String& pseudoElement) > { > return adoptRef(*new TransitionEvent(type, propertyName, elapsedTime, pseudoElement)); > } >@@ -43,7 +43,7 @@ public: > String pseudoElement; > }; > >- static Ref<TransitionEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<TransitionEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new TransitionEvent(type, initializer, isTrusted)); > } >@@ -57,8 +57,8 @@ public: > EventInterface eventInterface() const override; > > private: >- TransitionEvent(const AtomicString& type, const String& propertyName, double elapsedTime, const String& pseudoElement); >- TransitionEvent(const AtomicString& type, const Init& initializer, IsTrusted); >+ TransitionEvent(const AtomString& type, const String& propertyName, double elapsedTime, const String& pseudoElement); >+ TransitionEvent(const AtomString& type, const Init& initializer, IsTrusted); > > String m_propertyName; > double m_elapsedTime; >diff --git a/Source/WebCore/dom/TreeScope.cpp b/Source/WebCore/dom/TreeScope.cpp >index c4d5587d6bec70e843bd996a663949ddf75fa2df..2f2870d1669d44bc6184a72ec63eb323f527d39f 100644 >--- a/Source/WebCore/dom/TreeScope.cpp >+++ b/Source/WebCore/dom/TreeScope.cpp >@@ -98,7 +98,7 @@ void TreeScope::setParentTreeScope(TreeScope& newParentScope) > setDocumentScope(newParentScope.documentScope()); > } > >-Element* TreeScope::getElementById(const AtomicString& elementId) const >+Element* TreeScope::getElementById(const AtomString& elementId) const > { > if (elementId.isNull()) > return nullptr; >@@ -112,7 +112,7 @@ Element* TreeScope::getElementById(const String& elementId) const > if (!m_elementsById) > return nullptr; > >- if (RefPtr<AtomicStringImpl> atomicElementId = AtomicStringImpl::lookUp(elementId.impl())) >+ if (RefPtr<AtomStringImpl> atomicElementId = AtomStringImpl::lookUp(elementId.impl())) > return m_elementsById->getElementById(*atomicElementId, *this); > > return nullptr; >@@ -123,13 +123,13 @@ Element* TreeScope::getElementById(StringView elementId) const > if (!m_elementsById) > return nullptr; > >- if (auto atomicElementId = elementId.toExistingAtomicString()) >+ if (auto atomicElementId = elementId.toExistingAtomString()) > return m_elementsById->getElementById(*atomicElementId, *this); > > return nullptr; > } > >-const Vector<Element*>* TreeScope::getAllElementsById(const AtomicString& elementId) const >+const Vector<Element*>* TreeScope::getAllElementsById(const AtomString& elementId) const > { > if (elementId.isEmpty()) > return nullptr; >@@ -138,7 +138,7 @@ const Vector<Element*>* TreeScope::getAllElementsById(const AtomicString& elemen > return m_elementsById->getAllElementsById(*elementId.impl(), *this); > } > >-void TreeScope::addElementById(const AtomicStringImpl& elementId, Element& element, bool notifyObservers) >+void TreeScope::addElementById(const AtomStringImpl& elementId, Element& element, bool notifyObservers) > { > if (!m_elementsById) > m_elementsById = std::make_unique<TreeScopeOrderedMap>(); >@@ -147,7 +147,7 @@ void TreeScope::addElementById(const AtomicStringImpl& elementId, Element& eleme > m_idTargetObserverRegistry->notifyObservers(elementId); > } > >-void TreeScope::removeElementById(const AtomicStringImpl& elementId, Element& element, bool notifyObservers) >+void TreeScope::removeElementById(const AtomStringImpl& elementId, Element& element, bool notifyObservers) > { > if (!m_elementsById) > return; >@@ -156,7 +156,7 @@ void TreeScope::removeElementById(const AtomicStringImpl& elementId, Element& el > m_idTargetObserverRegistry->notifyObservers(elementId); > } > >-Element* TreeScope::getElementByName(const AtomicString& name) const >+Element* TreeScope::getElementByName(const AtomString& name) const > { > if (name.isEmpty()) > return nullptr; >@@ -165,14 +165,14 @@ Element* TreeScope::getElementByName(const AtomicString& name) const > return m_elementsByName->getElementByName(*name.impl(), *this); > } > >-void TreeScope::addElementByName(const AtomicStringImpl& name, Element& element) >+void TreeScope::addElementByName(const AtomStringImpl& name, Element& element) > { > if (!m_elementsByName) > m_elementsByName = std::make_unique<TreeScopeOrderedMap>(); > m_elementsByName->add(name, element, *this); > } > >-void TreeScope::removeElementByName(const AtomicStringImpl& name, Element& element) >+void TreeScope::removeElementByName(const AtomStringImpl& name, Element& element) > { > if (!m_elementsByName) > return; >@@ -235,7 +235,7 @@ Element* TreeScope::ancestorElementInThisScope(Element* element) const > > void TreeScope::addImageMap(HTMLMapElement& imageMap) > { >- AtomicStringImpl* name = imageMap.getName().impl(); >+ AtomStringImpl* name = imageMap.getName().impl(); > if (!name) > return; > if (!m_imageMapsByName) >@@ -247,53 +247,53 @@ void TreeScope::removeImageMap(HTMLMapElement& imageMap) > { > if (!m_imageMapsByName) > return; >- AtomicStringImpl* name = imageMap.getName().impl(); >+ AtomStringImpl* name = imageMap.getName().impl(); > if (!name) > return; > m_imageMapsByName->remove(*name, imageMap); > } > >-HTMLMapElement* TreeScope::getImageMap(const AtomicString& name) const >+HTMLMapElement* TreeScope::getImageMap(const AtomString& name) const > { > if (!m_imageMapsByName || !name.impl()) > return nullptr; > return m_imageMapsByName->getElementByMapName(*name.impl(), *this); > } > >-void TreeScope::addImageElementByUsemap(const AtomicStringImpl& name, HTMLImageElement& element) >+void TreeScope::addImageElementByUsemap(const AtomStringImpl& name, HTMLImageElement& element) > { > if (!m_imagesByUsemap) > m_imagesByUsemap = std::make_unique<TreeScopeOrderedMap>(); > return m_imagesByUsemap->add(name, element, *this); > } > >-void TreeScope::removeImageElementByUsemap(const AtomicStringImpl& name, HTMLImageElement& element) >+void TreeScope::removeImageElementByUsemap(const AtomStringImpl& name, HTMLImageElement& element) > { > if (!m_imagesByUsemap) > return; > m_imagesByUsemap->remove(name, element); > } > >-HTMLImageElement* TreeScope::imageElementByUsemap(const AtomicStringImpl& name) const >+HTMLImageElement* TreeScope::imageElementByUsemap(const AtomStringImpl& name) const > { > if (!m_imagesByUsemap) > return nullptr; > return m_imagesByUsemap->getElementByUsemap(name, *this); > } > >-void TreeScope::addLabel(const AtomicStringImpl& forAttributeValue, HTMLLabelElement& element) >+void TreeScope::addLabel(const AtomStringImpl& forAttributeValue, HTMLLabelElement& element) > { > ASSERT(m_labelsByForAttribute); > m_labelsByForAttribute->add(forAttributeValue, element, *this); > } > >-void TreeScope::removeLabel(const AtomicStringImpl& forAttributeValue, HTMLLabelElement& element) >+void TreeScope::removeLabel(const AtomStringImpl& forAttributeValue, HTMLLabelElement& element) > { > ASSERT(m_labelsByForAttribute); > m_labelsByForAttribute->remove(forAttributeValue, element); > } > >-HTMLLabelElement* TreeScope::labelElementForId(const AtomicString& forAttributeValue) >+HTMLLabelElement* TreeScope::labelElementForId(const AtomString& forAttributeValue) > { > if (forAttributeValue.isEmpty()) > return nullptr; >@@ -303,7 +303,7 @@ HTMLLabelElement* TreeScope::labelElementForId(const AtomicString& forAttributeV > m_labelsByForAttribute = std::make_unique<TreeScopeOrderedMap>(); > > for (auto& label : descendantsOfType<HTMLLabelElement>(m_rootNode)) { >- const AtomicString& forValue = label.attributeWithoutSynchronization(forAttr); >+ const AtomString& forValue = label.attributeWithoutSynchronization(forAttr); > if (!forValue.isEmpty()) > addLabel(*forValue.impl(), label); > } >diff --git a/Source/WebCore/dom/TreeScope.h b/Source/WebCore/dom/TreeScope.h >index efb4425fbee3e997b4747fb2047c7493a16013db..2f257f0fe1c7f118c79a45f4d07c69493317edfc 100644 >--- a/Source/WebCore/dom/TreeScope.h >+++ b/Source/WebCore/dom/TreeScope.h >@@ -30,7 +30,7 @@ > #include <memory> > #include <wtf/Forward.h> > #include <wtf/Vector.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -56,20 +56,20 @@ public: > Element* focusedElementInScope(); > Element* pointerLockElement() const; > >- WEBCORE_EXPORT Element* getElementById(const AtomicString&) const; >+ WEBCORE_EXPORT Element* getElementById(const AtomString&) const; > WEBCORE_EXPORT Element* getElementById(const String&) const; > Element* getElementById(StringView) const; >- const Vector<Element*>* getAllElementsById(const AtomicString&) const; >- bool hasElementWithId(const AtomicStringImpl&) const; >- bool containsMultipleElementsWithId(const AtomicString& id) const; >- void addElementById(const AtomicStringImpl& elementId, Element&, bool notifyObservers = true); >- void removeElementById(const AtomicStringImpl& elementId, Element&, bool notifyObservers = true); >- >- WEBCORE_EXPORT Element* getElementByName(const AtomicString&) const; >- bool hasElementWithName(const AtomicStringImpl&) const; >- bool containsMultipleElementsWithName(const AtomicString&) const; >- void addElementByName(const AtomicStringImpl&, Element&); >- void removeElementByName(const AtomicStringImpl&, Element&); >+ const Vector<Element*>* getAllElementsById(const AtomString&) const; >+ bool hasElementWithId(const AtomStringImpl&) const; >+ bool containsMultipleElementsWithId(const AtomString& id) const; >+ void addElementById(const AtomStringImpl& elementId, Element&, bool notifyObservers = true); >+ void removeElementById(const AtomStringImpl& elementId, Element&, bool notifyObservers = true); >+ >+ WEBCORE_EXPORT Element* getElementByName(const AtomString&) const; >+ bool hasElementWithName(const AtomStringImpl&) const; >+ bool containsMultipleElementsWithName(const AtomString&) const; >+ void addElementByName(const AtomStringImpl&, Element&); >+ void removeElementByName(const AtomStringImpl&, Element&); > > Document& documentScope() const { return m_documentScope.get(); } > static ptrdiff_t documentScopeMemoryOffset() { return OBJECT_OFFSETOF(TreeScope, m_documentScope); } >@@ -82,17 +82,17 @@ public: > > void addImageMap(HTMLMapElement&); > void removeImageMap(HTMLMapElement&); >- HTMLMapElement* getImageMap(const AtomicString&) const; >+ HTMLMapElement* getImageMap(const AtomString&) const; > >- void addImageElementByUsemap(const AtomicStringImpl&, HTMLImageElement&); >- void removeImageElementByUsemap(const AtomicStringImpl&, HTMLImageElement&); >- HTMLImageElement* imageElementByUsemap(const AtomicStringImpl&) const; >+ void addImageElementByUsemap(const AtomStringImpl&, HTMLImageElement&); >+ void removeImageElementByUsemap(const AtomStringImpl&, HTMLImageElement&); >+ HTMLImageElement* imageElementByUsemap(const AtomStringImpl&) const; > > // For accessibility. > bool shouldCacheLabelsByForAttribute() const { return !!m_labelsByForAttribute; } >- void addLabel(const AtomicStringImpl& forAttributeValue, HTMLLabelElement&); >- void removeLabel(const AtomicStringImpl& forAttributeValue, HTMLLabelElement&); >- HTMLLabelElement* labelElementForId(const AtomicString& forAttributeValue); >+ void addLabel(const AtomStringImpl& forAttributeValue, HTMLLabelElement&); >+ void removeLabel(const AtomStringImpl& forAttributeValue, HTMLLabelElement&); >+ HTMLLabelElement* labelElementForId(const AtomString& forAttributeValue); > > WEBCORE_EXPORT RefPtr<Element> elementFromPoint(double clientX, double clientY); > WEBCORE_EXPORT Vector<RefPtr<Element>> elementsFromPoint(double clientX, double clientY); >@@ -137,22 +137,22 @@ private: > std::unique_ptr<IdTargetObserverRegistry> m_idTargetObserverRegistry; > }; > >-inline bool TreeScope::hasElementWithId(const AtomicStringImpl& id) const >+inline bool TreeScope::hasElementWithId(const AtomStringImpl& id) const > { > return m_elementsById && m_elementsById->contains(id); > } > >-inline bool TreeScope::containsMultipleElementsWithId(const AtomicString& id) const >+inline bool TreeScope::containsMultipleElementsWithId(const AtomString& id) const > { > return m_elementsById && id.impl() && m_elementsById->containsMultiple(*id.impl()); > } > >-inline bool TreeScope::hasElementWithName(const AtomicStringImpl& id) const >+inline bool TreeScope::hasElementWithName(const AtomStringImpl& id) const > { > return m_elementsByName && m_elementsByName->contains(id); > } > >-inline bool TreeScope::containsMultipleElementsWithName(const AtomicString& name) const >+inline bool TreeScope::containsMultipleElementsWithName(const AtomString& name) const > { > return m_elementsByName && name.impl() && m_elementsByName->containsMultiple(*name.impl()); > } >diff --git a/Source/WebCore/dom/TreeScopeOrderedMap.cpp b/Source/WebCore/dom/TreeScopeOrderedMap.cpp >index 6906387a3efd747b5bc84de0e2bbd8eaf6ce74fe..57dce5b25fa4329a868cabd147a84810d374d192 100644 >--- a/Source/WebCore/dom/TreeScopeOrderedMap.cpp >+++ b/Source/WebCore/dom/TreeScopeOrderedMap.cpp >@@ -47,7 +47,7 @@ void TreeScopeOrderedMap::clear() > m_map.clear(); > } > >-void TreeScopeOrderedMap::add(const AtomicStringImpl& key, Element& element, const TreeScope& treeScope) >+void TreeScopeOrderedMap::add(const AtomStringImpl& key, Element& element, const TreeScope& treeScope) > { > RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(&element.treeScope() == &treeScope); > ASSERT_WITH_SECURITY_IMPLICATION(treeScope.rootNode().containsIncludingShadowDOM(&element)); >@@ -73,7 +73,7 @@ void TreeScopeOrderedMap::add(const AtomicStringImpl& key, Element& element, con > entry.orderedList.clear(); > } > >-void TreeScopeOrderedMap::remove(const AtomicStringImpl& key, Element& element) >+void TreeScopeOrderedMap::remove(const AtomStringImpl& key, Element& element) > { > m_map.checkConsistency(); > auto it = m_map.find(&key); >@@ -95,7 +95,7 @@ void TreeScopeOrderedMap::remove(const AtomicStringImpl& key, Element& element) > } > > template <typename KeyMatchingFunction> >-inline Element* TreeScopeOrderedMap::get(const AtomicStringImpl& key, const TreeScope& scope, const KeyMatchingFunction& keyMatches) const >+inline Element* TreeScopeOrderedMap::get(const AtomStringImpl& key, const TreeScope& scope, const KeyMatchingFunction& keyMatches) const > { > m_map.checkConsistency(); > >@@ -142,57 +142,57 @@ inline Element* TreeScopeOrderedMap::get(const AtomicStringImpl& key, const Tree > return nullptr; > } > >-Element* TreeScopeOrderedMap::getElementById(const AtomicStringImpl& key, const TreeScope& scope) const >+Element* TreeScopeOrderedMap::getElementById(const AtomStringImpl& key, const TreeScope& scope) const > { >- return get(key, scope, [] (const AtomicStringImpl& key, const Element& element) { >+ return get(key, scope, [] (const AtomStringImpl& key, const Element& element) { > return element.getIdAttribute().impl() == &key; > }); > } > >-Element* TreeScopeOrderedMap::getElementByName(const AtomicStringImpl& key, const TreeScope& scope) const >+Element* TreeScopeOrderedMap::getElementByName(const AtomStringImpl& key, const TreeScope& scope) const > { >- return get(key, scope, [] (const AtomicStringImpl& key, const Element& element) { >+ return get(key, scope, [] (const AtomStringImpl& key, const Element& element) { > return element.getNameAttribute().impl() == &key; > }); > } > >-HTMLMapElement* TreeScopeOrderedMap::getElementByMapName(const AtomicStringImpl& key, const TreeScope& scope) const >+HTMLMapElement* TreeScopeOrderedMap::getElementByMapName(const AtomStringImpl& key, const TreeScope& scope) const > { >- return downcast<HTMLMapElement>(get(key, scope, [] (const AtomicStringImpl& key, const Element& element) { >+ return downcast<HTMLMapElement>(get(key, scope, [] (const AtomStringImpl& key, const Element& element) { > return is<HTMLMapElement>(element) && downcast<HTMLMapElement>(element).getName().impl() == &key; > })); > } > >-HTMLImageElement* TreeScopeOrderedMap::getElementByUsemap(const AtomicStringImpl& key, const TreeScope& scope) const >+HTMLImageElement* TreeScopeOrderedMap::getElementByUsemap(const AtomStringImpl& key, const TreeScope& scope) const > { >- return downcast<HTMLImageElement>(get(key, scope, [] (const AtomicStringImpl& key, const Element& element) { >+ return downcast<HTMLImageElement>(get(key, scope, [] (const AtomStringImpl& key, const Element& element) { > // FIXME: HTML5 specification says we should match both image and object elements. > return is<HTMLImageElement>(element) && downcast<HTMLImageElement>(element).matchesUsemap(key); > })); > } > >-HTMLLabelElement* TreeScopeOrderedMap::getElementByLabelForAttribute(const AtomicStringImpl& key, const TreeScope& scope) const >+HTMLLabelElement* TreeScopeOrderedMap::getElementByLabelForAttribute(const AtomStringImpl& key, const TreeScope& scope) const > { >- return downcast<HTMLLabelElement>(get(key, scope, [] (const AtomicStringImpl& key, const Element& element) { >+ return downcast<HTMLLabelElement>(get(key, scope, [] (const AtomStringImpl& key, const Element& element) { > return is<HTMLLabelElement>(element) && element.attributeWithoutSynchronization(forAttr).impl() == &key; > })); > } > >-Element* TreeScopeOrderedMap::getElementByWindowNamedItem(const AtomicStringImpl& key, const TreeScope& scope) const >+Element* TreeScopeOrderedMap::getElementByWindowNamedItem(const AtomStringImpl& key, const TreeScope& scope) const > { >- return get(key, scope, [] (const AtomicStringImpl& key, const Element& element) { >+ return get(key, scope, [] (const AtomStringImpl& key, const Element& element) { > return WindowNameCollection::elementMatches(element, &key); > }); > } > >-Element* TreeScopeOrderedMap::getElementByDocumentNamedItem(const AtomicStringImpl& key, const TreeScope& scope) const >+Element* TreeScopeOrderedMap::getElementByDocumentNamedItem(const AtomStringImpl& key, const TreeScope& scope) const > { >- return get(key, scope, [] (const AtomicStringImpl& key, const Element& element) { >+ return get(key, scope, [] (const AtomStringImpl& key, const Element& element) { > return DocumentNameCollection::elementMatches(element, &key); > }); > } > >-const Vector<Element*>* TreeScopeOrderedMap::getAllElementsById(const AtomicStringImpl& key, const TreeScope& scope) const >+const Vector<Element*>* TreeScopeOrderedMap::getAllElementsById(const AtomStringImpl& key, const TreeScope& scope) const > { > m_map.checkConsistency(); > >diff --git a/Source/WebCore/dom/TreeScopeOrderedMap.h b/Source/WebCore/dom/TreeScopeOrderedMap.h >index d2e52ccfb86489f1297e35aa6664c9954f4bfac5..59752791e76ef9fb62ea8c6fbe2a0ac8d12f56ee 100644 >--- a/Source/WebCore/dom/TreeScopeOrderedMap.h >+++ b/Source/WebCore/dom/TreeScopeOrderedMap.h >@@ -33,7 +33,7 @@ > #include <wtf/HashMap.h> > #include <wtf/HashSet.h> > #include <wtf/Vector.h> >-#include <wtf/text/AtomicStringImpl.h> >+#include <wtf/text/AtomStringImpl.h> > > namespace WebCore { > >@@ -46,28 +46,28 @@ class TreeScope; > class TreeScopeOrderedMap { > WTF_MAKE_FAST_ALLOCATED; > public: >- void add(const AtomicStringImpl&, Element&, const TreeScope&); >- void remove(const AtomicStringImpl&, Element&); >+ void add(const AtomStringImpl&, Element&, const TreeScope&); >+ void remove(const AtomStringImpl&, Element&); > void clear(); > >- bool contains(const AtomicStringImpl&) const; >- bool containsSingle(const AtomicStringImpl&) const; >- bool containsMultiple(const AtomicStringImpl&) const; >+ bool contains(const AtomStringImpl&) const; >+ bool containsSingle(const AtomStringImpl&) const; >+ bool containsMultiple(const AtomStringImpl&) const; > > // concrete instantiations of the get<>() method template >- Element* getElementById(const AtomicStringImpl&, const TreeScope&) const; >- Element* getElementByName(const AtomicStringImpl&, const TreeScope&) const; >- HTMLMapElement* getElementByMapName(const AtomicStringImpl&, const TreeScope&) const; >- HTMLImageElement* getElementByUsemap(const AtomicStringImpl&, const TreeScope&) const; >- HTMLLabelElement* getElementByLabelForAttribute(const AtomicStringImpl&, const TreeScope&) const; >- Element* getElementByWindowNamedItem(const AtomicStringImpl&, const TreeScope&) const; >- Element* getElementByDocumentNamedItem(const AtomicStringImpl&, const TreeScope&) const; >+ Element* getElementById(const AtomStringImpl&, const TreeScope&) const; >+ Element* getElementByName(const AtomStringImpl&, const TreeScope&) const; >+ HTMLMapElement* getElementByMapName(const AtomStringImpl&, const TreeScope&) const; >+ HTMLImageElement* getElementByUsemap(const AtomStringImpl&, const TreeScope&) const; >+ HTMLLabelElement* getElementByLabelForAttribute(const AtomStringImpl&, const TreeScope&) const; >+ Element* getElementByWindowNamedItem(const AtomStringImpl&, const TreeScope&) const; >+ Element* getElementByDocumentNamedItem(const AtomStringImpl&, const TreeScope&) const; > >- const Vector<Element*>* getAllElementsById(const AtomicStringImpl&, const TreeScope&) const; >+ const Vector<Element*>* getAllElementsById(const AtomStringImpl&, const TreeScope&) const; > > private: > template <typename KeyMatchingFunction> >- Element* get(const AtomicStringImpl&, const TreeScope&, const KeyMatchingFunction&) const; >+ Element* get(const AtomStringImpl&, const TreeScope&, const KeyMatchingFunction&) const; > > struct MapEntry { > MapEntry() { } >@@ -84,23 +84,23 @@ private: > #endif > }; > >- typedef HashMap<const AtomicStringImpl*, MapEntry> Map; >+ typedef HashMap<const AtomStringImpl*, MapEntry> Map; > > mutable Map m_map; > }; > >-inline bool TreeScopeOrderedMap::containsSingle(const AtomicStringImpl& id) const >+inline bool TreeScopeOrderedMap::containsSingle(const AtomStringImpl& id) const > { > auto it = m_map.find(&id); > return it != m_map.end() && it->value.count == 1; > } > >-inline bool TreeScopeOrderedMap::contains(const AtomicStringImpl& id) const >+inline bool TreeScopeOrderedMap::contains(const AtomStringImpl& id) const > { > return m_map.contains(&id); > } > >-inline bool TreeScopeOrderedMap::containsMultiple(const AtomicStringImpl& id) const >+inline bool TreeScopeOrderedMap::containsMultiple(const AtomStringImpl& id) const > { > auto it = m_map.find(&id); > return it != m_map.end() && it->value.count > 1; >diff --git a/Source/WebCore/dom/UIEvent.cpp b/Source/WebCore/dom/UIEvent.cpp >index 42f12e977331818bfaeca8d49a0c233140547ead..87f8d044e59706eeb0819a6a79c32417ab5f71a6 100644 >--- a/Source/WebCore/dom/UIEvent.cpp >+++ b/Source/WebCore/dom/UIEvent.cpp >@@ -32,21 +32,21 @@ UIEvent::UIEvent() > { > } > >-UIEvent::UIEvent(const AtomicString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, RefPtr<WindowProxy>&& viewArg, int detailArg) >+UIEvent::UIEvent(const AtomString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, RefPtr<WindowProxy>&& viewArg, int detailArg) > : Event(eventType, canBubble, isCancelable, isComposed) > , m_view(WTFMove(viewArg)) > , m_detail(detailArg) > { > } > >-UIEvent::UIEvent(const AtomicString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, MonotonicTime timestamp, RefPtr<WindowProxy>&& viewArg, int detailArg, IsTrusted isTrusted) >+UIEvent::UIEvent(const AtomString& eventType, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, MonotonicTime timestamp, RefPtr<WindowProxy>&& viewArg, int detailArg, IsTrusted isTrusted) > : Event(eventType, canBubble, isCancelable, isComposed, timestamp, isTrusted) > , m_view(WTFMove(viewArg)) > , m_detail(detailArg) > { > } > >-UIEvent::UIEvent(const AtomicString& eventType, const UIEventInit& initializer) >+UIEvent::UIEvent(const AtomString& eventType, const UIEventInit& initializer) > : Event(eventType, initializer, IsTrusted::No) > , m_view(initializer.view.get()) > , m_detail(initializer.detail) >@@ -55,7 +55,7 @@ UIEvent::UIEvent(const AtomicString& eventType, const UIEventInit& initializer) > > UIEvent::~UIEvent() = default; > >-void UIEvent::initUIEvent(const AtomicString& typeArg, bool canBubbleArg, bool cancelableArg, RefPtr<WindowProxy>&& viewArg, int detailArg) >+void UIEvent::initUIEvent(const AtomString& typeArg, bool canBubbleArg, bool cancelableArg, RefPtr<WindowProxy>&& viewArg, int detailArg) > { > if (isBeingDispatched()) > return; >diff --git a/Source/WebCore/dom/UIEvent.h b/Source/WebCore/dom/UIEvent.h >index 9333f039a7b47c2cde96346fc9e25982d03b16da..ec2eee78df8943fbc5c818705a7cbc2bde746fec 100644 >--- a/Source/WebCore/dom/UIEvent.h >+++ b/Source/WebCore/dom/UIEvent.h >@@ -34,7 +34,7 @@ typedef WindowProxy AbstractView; > > class UIEvent : public Event { > public: >- static Ref<UIEvent> create(const AtomicString& type, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, RefPtr<WindowProxy>&& view, int detail) >+ static Ref<UIEvent> create(const AtomString& type, CanBubble canBubble, IsCancelable isCancelable, IsComposed isComposed, RefPtr<WindowProxy>&& view, int detail) > { > return adoptRef(*new UIEvent(type, canBubble, isCancelable, isComposed, WTFMove(view), detail)); > } >@@ -42,13 +42,13 @@ public: > { > return adoptRef(*new UIEvent); > } >- static Ref<UIEvent> create(const AtomicString& type, const UIEventInit& initializer) >+ static Ref<UIEvent> create(const AtomString& type, const UIEventInit& initializer) > { > return adoptRef(*new UIEvent(type, initializer)); > } > virtual ~UIEvent(); > >- WEBCORE_EXPORT void initUIEvent(const AtomicString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&&, int detail); >+ WEBCORE_EXPORT void initUIEvent(const AtomString& type, bool canBubble, bool cancelable, RefPtr<WindowProxy>&&, int detail); > > WindowProxy* view() const { return m_view.get(); } > int detail() const { return m_detail; } >@@ -66,9 +66,9 @@ public: > protected: > UIEvent(); > >- UIEvent(const AtomicString& type, CanBubble, IsCancelable, IsComposed, RefPtr<WindowProxy>&&, int detail); >- UIEvent(const AtomicString& type, CanBubble, IsCancelable, IsComposed, MonotonicTime timestamp, RefPtr<WindowProxy>&&, int detail, IsTrusted = IsTrusted::Yes); >- UIEvent(const AtomicString&, const UIEventInit&); >+ UIEvent(const AtomString& type, CanBubble, IsCancelable, IsComposed, RefPtr<WindowProxy>&&, int detail); >+ UIEvent(const AtomString& type, CanBubble, IsCancelable, IsComposed, MonotonicTime timestamp, RefPtr<WindowProxy>&&, int detail, IsTrusted = IsTrusted::Yes); >+ UIEvent(const AtomString&, const UIEventInit&); > > private: > bool isUIEvent() const final; >diff --git a/Source/WebCore/dom/UIEventWithKeyState.h b/Source/WebCore/dom/UIEventWithKeyState.h >index 1b5abd5b06b66bf764ec6fb69a02b24e9876415f..a8fc1433525832ad73cab7813ca7e162433e2f0c 100644 >--- a/Source/WebCore/dom/UIEventWithKeyState.h >+++ b/Source/WebCore/dom/UIEventWithKeyState.h >@@ -47,21 +47,21 @@ public: > protected: > UIEventWithKeyState() = default; > >- UIEventWithKeyState(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, IsComposed isComposed, >+ UIEventWithKeyState(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, IsComposed isComposed, > RefPtr<WindowProxy>&& view, int detail, OptionSet<Modifier> modifiers) > : UIEvent(type, canBubble, cancelable, isComposed, WTFMove(view), detail) > , m_modifiers(modifiers) > { > } > >- UIEventWithKeyState(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, IsComposed isComposed, >+ UIEventWithKeyState(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, IsComposed isComposed, > MonotonicTime timestamp, RefPtr<WindowProxy>&& view, int detail, OptionSet<Modifier> modifiers, IsTrusted isTrusted) > : UIEvent(type, canBubble, cancelable, isComposed, timestamp, WTFMove(view), detail, isTrusted) > , m_modifiers(modifiers) > { > } > >- UIEventWithKeyState(const AtomicString& type, const EventModifierInit& initializer) >+ UIEventWithKeyState(const AtomString& type, const EventModifierInit& initializer) > : UIEvent(type, initializer) > , m_modifiers(modifiersFromInitializer(initializer)) > { >diff --git a/Source/WebCore/dom/VisitedLinkState.cpp b/Source/WebCore/dom/VisitedLinkState.cpp >index 61297b2bb9bf0ad3e0b95382976427a6d33432fc..a03af147f39c21e4ef777bfcbf4411d14aab0c81 100644 >--- a/Source/WebCore/dom/VisitedLinkState.cpp >+++ b/Source/WebCore/dom/VisitedLinkState.cpp >@@ -42,7 +42,7 @@ namespace WebCore { > > using namespace HTMLNames; > >-inline static const AtomicString* linkAttribute(const Element& element) >+inline static const AtomString* linkAttribute(const Element& element) > { > if (!element.isLink()) > return nullptr; >@@ -91,7 +91,7 @@ InsideLink VisitedLinkState::determineLinkStateSlowCase(const Element& element) > { > ASSERT(element.isLink()); > >- const AtomicString* attribute = linkAttribute(element); >+ const AtomString* attribute = linkAttribute(element); > if (!attribute || attribute->isNull()) > return InsideLink::NotInside; > >diff --git a/Source/WebCore/dom/WebKitAnimationEvent.cpp b/Source/WebCore/dom/WebKitAnimationEvent.cpp >index 38733f9bfbf7855085cb895428d826a516112084..f04c9095878b922d2693cbccb94b79d6221673f6 100644 >--- a/Source/WebCore/dom/WebKitAnimationEvent.cpp >+++ b/Source/WebCore/dom/WebKitAnimationEvent.cpp >@@ -28,14 +28,14 @@ > > namespace WebCore { > >-WebKitAnimationEvent::WebKitAnimationEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+WebKitAnimationEvent::WebKitAnimationEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_animationName(initializer.animationName) > , m_elapsedTime(initializer.elapsedTime) > { > } > >-WebKitAnimationEvent::WebKitAnimationEvent(const AtomicString& type, const String& animationName, double elapsedTime) >+WebKitAnimationEvent::WebKitAnimationEvent(const AtomString& type, const String& animationName, double elapsedTime) > : Event(type, CanBubble::Yes, IsCancelable::Yes) > , m_animationName(animationName) > , m_elapsedTime(elapsedTime) >diff --git a/Source/WebCore/dom/WebKitAnimationEvent.h b/Source/WebCore/dom/WebKitAnimationEvent.h >index 5506b619745a2515bc00941ce9b17675734cadf8..9c7a51a18aeeda35eb04f73b4e6e95994fad067c 100644 >--- a/Source/WebCore/dom/WebKitAnimationEvent.h >+++ b/Source/WebCore/dom/WebKitAnimationEvent.h >@@ -31,7 +31,7 @@ namespace WebCore { > > class WebKitAnimationEvent final : public Event { > public: >- static Ref<WebKitAnimationEvent> create(const AtomicString& type, const String& animationName, double elapsedTime) >+ static Ref<WebKitAnimationEvent> create(const AtomString& type, const String& animationName, double elapsedTime) > { > return adoptRef(*new WebKitAnimationEvent(type, animationName, elapsedTime)); > } >@@ -41,7 +41,7 @@ public: > double elapsedTime { 0.0 }; > }; > >- static Ref<WebKitAnimationEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<WebKitAnimationEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new WebKitAnimationEvent(type, initializer, isTrusted)); > } >@@ -54,8 +54,8 @@ public: > EventInterface eventInterface() const override; > > private: >- WebKitAnimationEvent(const AtomicString& type, const String& animationName, double elapsedTime); >- WebKitAnimationEvent(const AtomicString&, const Init&, IsTrusted); >+ WebKitAnimationEvent(const AtomString& type, const String& animationName, double elapsedTime); >+ WebKitAnimationEvent(const AtomString&, const Init&, IsTrusted); > > String m_animationName; > double m_elapsedTime; >diff --git a/Source/WebCore/dom/WebKitTransitionEvent.cpp b/Source/WebCore/dom/WebKitTransitionEvent.cpp >index dab9bd1f04e57c596d7a5bac62dd8451596b26f7..f4ee465981a55aa8bfadc88c7a762d8288a4e7a0 100644 >--- a/Source/WebCore/dom/WebKitTransitionEvent.cpp >+++ b/Source/WebCore/dom/WebKitTransitionEvent.cpp >@@ -28,7 +28,7 @@ > > namespace WebCore { > >-WebKitTransitionEvent::WebKitTransitionEvent(const AtomicString& type, const String& propertyName, double elapsedTime, const String& pseudoElement) >+WebKitTransitionEvent::WebKitTransitionEvent(const AtomString& type, const String& propertyName, double elapsedTime, const String& pseudoElement) > : Event(type, CanBubble::Yes, IsCancelable::Yes) > , m_propertyName(propertyName) > , m_elapsedTime(elapsedTime) >@@ -36,7 +36,7 @@ WebKitTransitionEvent::WebKitTransitionEvent(const AtomicString& type, const Str > { > } > >-WebKitTransitionEvent::WebKitTransitionEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+WebKitTransitionEvent::WebKitTransitionEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_propertyName(initializer.propertyName) > , m_elapsedTime(initializer.elapsedTime) >diff --git a/Source/WebCore/dom/WebKitTransitionEvent.h b/Source/WebCore/dom/WebKitTransitionEvent.h >index 76643ff62e59a89207f17d60053d73132d3ab94f..84337471cb0911530f76b26cbd1afe32c5dd5ead 100644 >--- a/Source/WebCore/dom/WebKitTransitionEvent.h >+++ b/Source/WebCore/dom/WebKitTransitionEvent.h >@@ -31,7 +31,7 @@ namespace WebCore { > > class WebKitTransitionEvent final : public Event { > public: >- static Ref<WebKitTransitionEvent> create(const AtomicString& type, const String& propertyName, double elapsedTime, const String& pseudoElement) >+ static Ref<WebKitTransitionEvent> create(const AtomString& type, const String& propertyName, double elapsedTime, const String& pseudoElement) > { > return adoptRef(*new WebKitTransitionEvent(type, propertyName, elapsedTime, pseudoElement)); > } >@@ -42,7 +42,7 @@ public: > String pseudoElement; > }; > >- static Ref<WebKitTransitionEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<WebKitTransitionEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new WebKitTransitionEvent(type, initializer, isTrusted)); > } >@@ -56,8 +56,8 @@ public: > EventInterface eventInterface() const override; > > private: >- WebKitTransitionEvent(const AtomicString& type, const String& propertyName, double elapsedTime, const String& pseudoElement); >- WebKitTransitionEvent(const AtomicString& type, const Init& initializer, IsTrusted); >+ WebKitTransitionEvent(const AtomString& type, const String& propertyName, double elapsedTime, const String& pseudoElement); >+ WebKitTransitionEvent(const AtomString& type, const Init& initializer, IsTrusted); > > String m_propertyName; > double m_elapsedTime; >diff --git a/Source/WebCore/dom/WheelEvent.cpp b/Source/WebCore/dom/WheelEvent.cpp >index 37e07104463a4d3766c34980c79a3da922db7c1f..4d45195e0ec84f463dcf916422e3a625a9d6b8b0 100644 >--- a/Source/WebCore/dom/WheelEvent.cpp >+++ b/Source/WebCore/dom/WheelEvent.cpp >@@ -37,7 +37,7 @@ inline static unsigned determineDeltaMode(const PlatformWheelEvent& event) > > inline WheelEvent::WheelEvent() = default; > >-inline WheelEvent::WheelEvent(const AtomicString& type, const Init& initializer) >+inline WheelEvent::WheelEvent(const AtomString& type, const Init& initializer) > : MouseEvent(type, initializer) > , m_wheelDelta(initializer.wheelDeltaX ? initializer.wheelDeltaX : -initializer.deltaX, initializer.wheelDeltaY ? initializer.wheelDeltaY : -initializer.deltaY) > , m_deltaX(initializer.deltaX ? initializer.deltaX : -initializer.wheelDeltaX) >@@ -68,7 +68,7 @@ Ref<WheelEvent> WheelEvent::createForBindings() > return adoptRef(*new WheelEvent); > } > >-Ref<WheelEvent> WheelEvent::create(const AtomicString& type, const Init& initializer) >+Ref<WheelEvent> WheelEvent::create(const AtomString& type, const Init& initializer) > { > return adoptRef(*new WheelEvent(type, initializer)); > } >diff --git a/Source/WebCore/dom/WheelEvent.h b/Source/WebCore/dom/WheelEvent.h >index 366157e9d32845a82cf54cc76786211f60b3c422..450436bfdf9ac97b5586f1852b4c2b4fd1291006 100644 >--- a/Source/WebCore/dom/WheelEvent.h >+++ b/Source/WebCore/dom/WheelEvent.h >@@ -51,7 +51,7 @@ public: > int wheelDeltaY { 0 }; // Deprecated. > }; > >- static Ref<WheelEvent> create(const AtomicString& type, const Init&); >+ static Ref<WheelEvent> create(const AtomString& type, const Init&); > > WEBCORE_EXPORT void initWebKitWheelEvent(int rawDeltaX, int rawDeltaY, RefPtr<WindowProxy>&&, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey); > >@@ -74,7 +74,7 @@ public: > > private: > WheelEvent(); >- WheelEvent(const AtomicString&, const Init&); >+ WheelEvent(const AtomString&, const Init&); > WheelEvent(const PlatformWheelEvent&, RefPtr<WindowProxy>&&); > > EventInterface eventInterface() const final; >diff --git a/Source/WebCore/dom/ios/MouseEventIOS.cpp b/Source/WebCore/dom/ios/MouseEventIOS.cpp >index 302e1fee1fdbf6150a4937e689fd050258bc3b61..d24458840c6a0c7844fe36ded588a6780ed5a0f2 100644 >--- a/Source/WebCore/dom/ios/MouseEventIOS.cpp >+++ b/Source/WebCore/dom/ios/MouseEventIOS.cpp >@@ -32,7 +32,7 @@ > > namespace WebCore { > >-static AtomicString mouseEventType(PlatformTouchPoint::TouchPhaseType phase) >+static AtomString mouseEventType(PlatformTouchPoint::TouchPhaseType phase) > { > switch (phase) { > case PlatformTouchPoint::TouchPhaseBegan: >diff --git a/Source/WebCore/dom/ios/PointerEventIOS.cpp b/Source/WebCore/dom/ios/PointerEventIOS.cpp >index 0e3c076719d136ce75fa06c798aeaef400bd4838..11f82fed672bed6e034cc60a88232b85c515bb7e 100644 >--- a/Source/WebCore/dom/ios/PointerEventIOS.cpp >+++ b/Source/WebCore/dom/ios/PointerEventIOS.cpp >@@ -32,7 +32,7 @@ > > namespace WebCore { > >-static const AtomicString& pointerEventType(PlatformTouchPoint::TouchPhaseType phase) >+static const AtomString& pointerEventType(PlatformTouchPoint::TouchPhaseType phase) > { > switch (phase) { > case PlatformTouchPoint::TouchPhaseBegan: >@@ -61,7 +61,7 @@ Ref<PointerEvent> PointerEvent::create(const String& type, const PlatformTouchEv > return adoptRef(*new PointerEvent(type, event, typeIsCancelable(type), index, isPrimary, WTFMove(view))); > } > >-PointerEvent::PointerEvent(const AtomicString& type, const PlatformTouchEvent& event, IsCancelable isCancelable, unsigned index, bool isPrimary, Ref<WindowProxy>&& view) >+PointerEvent::PointerEvent(const AtomString& type, const PlatformTouchEvent& event, IsCancelable isCancelable, unsigned index, bool isPrimary, Ref<WindowProxy>&& view) > : MouseEvent(type, typeCanBubble(type), isCancelable, typeIsComposed(type), event.timestamp().approximateMonotonicTime(), WTFMove(view), 0, event.touchLocationAtIndex(index), event.touchLocationAtIndex(index), { }, event.modifiers(), 0, 0, nullptr, 0, 0, nullptr, IsSimulated::No, IsTrusted::Yes) > , m_pointerId(event.touchIdentifierAtIndex(index)) > , m_width(2 * event.radiusXAtIndex(index)) >diff --git a/Source/WebCore/dom/make_names.pl b/Source/WebCore/dom/make_names.pl >index 3bae491d72bebd533197473a387c1d650665aa65..d951ff0651779784c59a87d1e8df82d1390aa680 100755 >--- a/Source/WebCore/dom/make_names.pl >+++ b/Source/WebCore/dom/make_names.pl >@@ -112,10 +112,10 @@ if (length($fontNamesIn)) { > printLicenseHeader($F); > printHeaderHead($F, "CSS", $familyNamesFileBase, <<END, ""); > #include <wtf/NeverDestroyed.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > END > >- printMacros($F, "extern LazyNeverDestroyed<const WTF::AtomicString>", "", \%parameters); >+ printMacros($F, "extern LazyNeverDestroyed<const WTF::AtomString>", "", \%parameters); > print F "#endif\n\n"; > > printInit($F, 1); >@@ -129,7 +129,7 @@ END > > print F StaticString::GenerateStrings(\%parameters); > >- printMacros($F, "LazyNeverDestroyed<const WTF::AtomicString>", "", \%parameters); >+ printMacros($F, "LazyNeverDestroyed<const WTF::AtomString>", "", \%parameters); > > printInit($F, 0); > >@@ -596,7 +596,7 @@ print F "\nvoid init() > > // Use placement new to initialize the globals. > >- AtomicString::init(); >+ AtomString::init(); > "; > } > >@@ -715,14 +715,14 @@ sub printNamesHeaderFile > printLicenseHeader($F); > printHeaderHead($F, "DOM", $parameters{namespace}, <<END, "class $parameters{namespace}QualifiedName : public QualifiedName { };\n\n"); > #include <wtf/NeverDestroyed.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include "QualifiedName.h" > END > > my $lowercaseNamespacePrefix = lc($parameters{namespacePrefix}); > > print F "// Namespace\n"; >- print F "WEBCORE_EXPORT extern LazyNeverDestroyed<const WTF::AtomicString> ${lowercaseNamespacePrefix}NamespaceURI;\n\n"; >+ print F "WEBCORE_EXPORT extern LazyNeverDestroyed<const WTF::AtomString> ${lowercaseNamespacePrefix}NamespaceURI;\n\n"; > > if (keys %allTags) { > print F "// Tags\n"; >@@ -760,7 +760,7 @@ sub printNamesCppFile > > my $lowercaseNamespacePrefix = lc($parameters{namespacePrefix}); > >- print F "LazyNeverDestroyed<const AtomicString> ${lowercaseNamespacePrefix}NamespaceURI;\n\n"; >+ print F "LazyNeverDestroyed<const AtomString> ${lowercaseNamespacePrefix}NamespaceURI;\n\n"; > > print F StaticString::GenerateStrings(\%allStrings); > >@@ -797,7 +797,7 @@ sub printNamesCppFile > > printInit($F, 0); > >- print(F " AtomicString ${lowercaseNamespacePrefix}NS(\"$parameters{namespaceURI}\", AtomicString::ConstructFromLiteral);\n\n"); >+ print(F " AtomString ${lowercaseNamespacePrefix}NS(\"$parameters{namespaceURI}\", AtomString::ConstructFromLiteral);\n\n"); > > print(F " // Namespace\n"); > print(F " ${lowercaseNamespacePrefix}NamespaceURI.construct(${lowercaseNamespacePrefix}NS);\n"); >@@ -919,7 +919,7 @@ print F <<END; > }; > > for (auto& entry : ${type}Table) >- entry.targetAddress->construct(nullAtom(), AtomicString(&entry.name), $namespaceURI); >+ entry.targetAddress->construct(nullAtom(), AtomString(&entry.name), $namespaceURI); > END > > } >@@ -1004,7 +1004,7 @@ struct $parameters{namespace}ConstructorFunctionMapEntry { > const QualifiedName* qualifiedName; // Use pointer instead of reference so that emptyValue() in HashMap is cheap to create. > }; > >-static NEVER_INLINE HashMap<AtomicStringImpl*, $parameters{namespace}ConstructorFunctionMapEntry> create$parameters{namespace}FactoryMap() >+static NEVER_INLINE HashMap<AtomStringImpl*, $parameters{namespace}ConstructorFunctionMapEntry> create$parameters{namespace}FactoryMap() > { > struct TableEntry { > const QualifiedName& name; >@@ -1020,19 +1020,19 @@ END > print F <<END > }; > >- HashMap<AtomicStringImpl*, $parameters{namespace}ConstructorFunctionMapEntry> map; >+ HashMap<AtomStringImpl*, $parameters{namespace}ConstructorFunctionMapEntry> map; > for (auto& entry : table) > map.add(entry.name.localName().impl(), $parameters{namespace}ConstructorFunctionMapEntry(entry.function, entry.name)); > return map; > } > >-static $parameters{namespace}ConstructorFunctionMapEntry find$parameters{namespace}ElementConstructorFunction(const AtomicString& localName) >+static $parameters{namespace}ConstructorFunctionMapEntry find$parameters{namespace}ElementConstructorFunction(const AtomString& localName) > { > static const auto map = makeNeverDestroyed(create$parameters{namespace}FactoryMap()); > return map.get().get(localName.impl()); > } > >-RefPtr<$parameters{namespace}Element> $parameters{namespace}ElementFactory::createKnownElement(const AtomicString& localName, Document& document$formElementArgumentForDefinition, bool createdByParser) >+RefPtr<$parameters{namespace}Element> $parameters{namespace}ElementFactory::createKnownElement(const AtomString& localName, Document& document$formElementArgumentForDefinition, bool createdByParser) > { > const $parameters{namespace}ConstructorFunctionMapEntry& entry = find$parameters{namespace}ElementConstructorFunction(localName); > if (LIKELY(entry.function)) { >@@ -1051,7 +1051,7 @@ RefPtr<$parameters{namespace}Element> $parameters{namespace}ElementFactory::crea > return nullptr; > } > >-Ref<$parameters{namespace}Element> $parameters{namespace}ElementFactory::createElement(const AtomicString& localName, Document& document$formElementArgumentForDefinition, bool createdByParser) >+Ref<$parameters{namespace}Element> $parameters{namespace}ElementFactory::createElement(const AtomString& localName, Document& document$formElementArgumentForDefinition, bool createdByParser) > { > const $parameters{namespace}ConstructorFunctionMapEntry& entry = find$parameters{namespace}ElementConstructorFunction(localName); > if (LIKELY(entry.function)) { >@@ -1107,7 +1107,7 @@ public: > END > ; > >-print F "static RefPtr<$parameters{namespace}Element> createKnownElement(const AtomicString&, Document&"; >+print F "static RefPtr<$parameters{namespace}Element> createKnownElement(const AtomString&, Document&"; > print F ", HTMLFormElement* = nullptr" if $parameters{namespace} eq "HTML"; > print F ", bool createdByParser = false);\n"; > >@@ -1115,7 +1115,7 @@ print F "static RefPtr<$parameters{namespace}Element> createKnownElement(const Q > print F ", HTMLFormElement* = nullptr" if $parameters{namespace} eq "HTML"; > print F ", bool createdByParser = false);\n"; > >-print F "static Ref<$parameters{namespace}Element> createElement(const AtomicString&, Document&"; >+print F "static Ref<$parameters{namespace}Element> createElement(const AtomString&, Document&"; > print F ", HTMLFormElement* = nullptr" if $parameters{namespace} eq "HTML"; > print F ", bool createdByParser = false);\n"; > >@@ -1260,7 +1260,7 @@ END > > print F <<END > >-static NEVER_INLINE HashMap<AtomicStringImpl*, Create$parameters{namespace}ElementWrapperFunction> create$parameters{namespace}WrapperMap() >+static NEVER_INLINE HashMap<AtomStringImpl*, Create$parameters{namespace}ElementWrapperFunction> create$parameters{namespace}WrapperMap() > { > struct TableEntry { > const QualifiedName& name; >@@ -1298,7 +1298,7 @@ END > print F <<END > }; > >- HashMap<AtomicStringImpl*, Create$parameters{namespace}ElementWrapperFunction> map; >+ HashMap<AtomStringImpl*, Create$parameters{namespace}ElementWrapperFunction> map; > for (auto& entry : table) > map.add(entry.name.localName().impl(), entry.function); > return map; >diff --git a/Source/WebCore/domjit/DOMJITIDLConvert.h b/Source/WebCore/domjit/DOMJITIDLConvert.h >index 01f9c5c897962bcef518c7c8436b8d48e9a698e4..c9fcf502156a9f98758c45068eb86fe51c81edf5 100644 >--- a/Source/WebCore/domjit/DOMJITIDLConvert.h >+++ b/Source/WebCore/domjit/DOMJITIDLConvert.h >@@ -41,18 +41,18 @@ struct DirectConverter<IDLDOMString> { > }; > > template<> >-struct DirectConverter<IDLAtomicStringAdaptor<IDLDOMString>> { >+struct DirectConverter<IDLAtomStringAdaptor<IDLDOMString>> { > static String directConvert(JSC::ExecState& state, JSC::JSString* string) > { >- return string->toAtomicString(&state); >+ return string->toAtomString(&state); > } > }; > > template<> >-struct DirectConverter<IDLRequiresExistingAtomicStringAdaptor<IDLDOMString>> { >+struct DirectConverter<IDLRequiresExistingAtomStringAdaptor<IDLDOMString>> { > static String directConvert(JSC::ExecState& state, JSC::JSString* string) > { >- return string->toExistingAtomicString(&state); >+ return string->toExistingAtomString(&state); > } > }; > >diff --git a/Source/WebCore/domjit/DOMJITIDLType.h b/Source/WebCore/domjit/DOMJITIDLType.h >index e0a5d2868cbaa0909a7c52ae30384e4bf5a84040..9b108ea3e41fcbedd479affe568c9d1e296ccea6 100644 >--- a/Source/WebCore/domjit/DOMJITIDLType.h >+++ b/Source/WebCore/domjit/DOMJITIDLType.h >@@ -39,8 +39,8 @@ template<> struct IDLJSArgumentTypeSelect<IDLShort> { typedef int32_t type; }; > template<> struct IDLJSArgumentTypeSelect<IDLUnsignedShort> { typedef int32_t type; }; > template<> struct IDLJSArgumentTypeSelect<IDLLong> { typedef int32_t type; }; > template<> struct IDLJSArgumentTypeSelect<IDLDOMString> { typedef JSC::JSString* type; }; >-template<> struct IDLJSArgumentTypeSelect<IDLAtomicStringAdaptor<IDLDOMString>> { typedef JSC::JSString* type; }; >-template<> struct IDLJSArgumentTypeSelect<IDLRequiresExistingAtomicStringAdaptor<IDLDOMString>> { typedef JSC::JSString* type; }; >+template<> struct IDLJSArgumentTypeSelect<IDLAtomStringAdaptor<IDLDOMString>> { typedef JSC::JSString* type; }; >+template<> struct IDLJSArgumentTypeSelect<IDLRequiresExistingAtomStringAdaptor<IDLDOMString>> { typedef JSC::JSString* type; }; > > template<typename IDLType> > using IDLJSArgumentType = typename IDLJSArgumentTypeSelect<IDLType>::type; >diff --git a/Source/WebCore/domjit/DOMJITIDLTypeFilter.h b/Source/WebCore/domjit/DOMJITIDLTypeFilter.h >index fa255ee45f4fc65fa8dce182ad7faf6aff79b4db..c0329d8272b1a35188d58399bc37bac4058dd455 100644 >--- a/Source/WebCore/domjit/DOMJITIDLTypeFilter.h >+++ b/Source/WebCore/domjit/DOMJITIDLTypeFilter.h >@@ -40,8 +40,8 @@ template<> struct IDLArgumentTypeFilter<IDLShort> { static const constexpr JSC:: > template<> struct IDLArgumentTypeFilter<IDLUnsignedShort> { static const constexpr JSC::SpeculatedType value = JSC::SpecInt32Only; }; > template<> struct IDLArgumentTypeFilter<IDLLong> { static const constexpr JSC::SpeculatedType value = JSC::SpecInt32Only; }; > template<> struct IDLArgumentTypeFilter<IDLDOMString> { static const constexpr JSC::SpeculatedType value = JSC::SpecString; }; >-template<> struct IDLArgumentTypeFilter<IDLAtomicStringAdaptor<IDLDOMString>> { static const constexpr JSC::SpeculatedType value = JSC::SpecString; }; >-template<> struct IDLArgumentTypeFilter<IDLRequiresExistingAtomicStringAdaptor<IDLDOMString>> { static const constexpr JSC::SpeculatedType value = JSC::SpecString; }; >+template<> struct IDLArgumentTypeFilter<IDLAtomStringAdaptor<IDLDOMString>> { static const constexpr JSC::SpeculatedType value = JSC::SpecString; }; >+template<> struct IDLArgumentTypeFilter<IDLRequiresExistingAtomStringAdaptor<IDLDOMString>> { static const constexpr JSC::SpeculatedType value = JSC::SpecString; }; > > template<typename IDLType> > struct IDLResultTypeFilter { >@@ -65,8 +65,8 @@ template<> struct IDLResultTypeFilter<IDLUnrestrictedDouble> { static const cons > template<> struct IDLResultTypeFilter<IDLDOMString> { static const constexpr JSC::SpeculatedType value = JSC::SpecString; }; > template<> struct IDLResultTypeFilter<IDLByteString> { static const constexpr JSC::SpeculatedType value = JSC::SpecString; }; > template<> struct IDLResultTypeFilter<IDLUSVString> { static const constexpr JSC::SpeculatedType value = JSC::SpecString; }; >-template<> struct IDLResultTypeFilter<IDLAtomicStringAdaptor<IDLDOMString>> { static const constexpr JSC::SpeculatedType value = JSC::SpecString; }; >-template<> struct IDLResultTypeFilter<IDLRequiresExistingAtomicStringAdaptor<IDLDOMString>> { static const constexpr JSC::SpeculatedType value = JSC::SpecString; }; >+template<> struct IDLResultTypeFilter<IDLAtomStringAdaptor<IDLDOMString>> { static const constexpr JSC::SpeculatedType value = JSC::SpecString; }; >+template<> struct IDLResultTypeFilter<IDLRequiresExistingAtomStringAdaptor<IDLDOMString>> { static const constexpr JSC::SpeculatedType value = JSC::SpecString; }; > > template<typename T> > struct IDLResultTypeFilter<IDLNullable<T>> { >diff --git a/Source/WebCore/editing/ApplyBlockElementCommand.cpp b/Source/WebCore/editing/ApplyBlockElementCommand.cpp >index d72d0cafc294abee443e907377fa62af5e045fc5..dbb5a2a1a1ba1e0e07ed02fe6a23ee790bab6822 100644 >--- a/Source/WebCore/editing/ApplyBlockElementCommand.cpp >+++ b/Source/WebCore/editing/ApplyBlockElementCommand.cpp >@@ -39,7 +39,7 @@ namespace WebCore { > > using namespace HTMLNames; > >-ApplyBlockElementCommand::ApplyBlockElementCommand(Document& document, const QualifiedName& tagName, const AtomicString& inlineStyle) >+ApplyBlockElementCommand::ApplyBlockElementCommand(Document& document, const QualifiedName& tagName, const AtomString& inlineStyle) > : CompositeEditCommand(document) > , m_tagName(tagName) > , m_inlineStyle(inlineStyle) >diff --git a/Source/WebCore/editing/ApplyBlockElementCommand.h b/Source/WebCore/editing/ApplyBlockElementCommand.h >index 6cc6df497f6a1a8754ebf6ecd63655eeda292d14..842b3e2d9bfcbc061c6ce6c2725404d8cbef65aa 100644 >--- a/Source/WebCore/editing/ApplyBlockElementCommand.h >+++ b/Source/WebCore/editing/ApplyBlockElementCommand.h >@@ -37,7 +37,7 @@ namespace WebCore { > > class ApplyBlockElementCommand : public CompositeEditCommand { > protected: >- ApplyBlockElementCommand(Document&, const QualifiedName& tagName, const AtomicString& inlineStyle); >+ ApplyBlockElementCommand(Document&, const QualifiedName& tagName, const AtomString& inlineStyle); > ApplyBlockElementCommand(Document&, const QualifiedName& tagName); > > virtual void formatSelection(const VisiblePosition& startOfSelection, const VisiblePosition& endOfSelection); >@@ -52,7 +52,7 @@ private: > VisiblePosition endOfNextParagraphSplittingTextNodesIfNeeded(VisiblePosition&, Position&, Position&); > > QualifiedName m_tagName; >- AtomicString m_inlineStyle; >+ AtomString m_inlineStyle; > Position m_endOfLastParagraph; > }; > >diff --git a/Source/WebCore/editing/BreakBlockquoteCommand.cpp b/Source/WebCore/editing/BreakBlockquoteCommand.cpp >index acbb5d6ab46e0da366e1d0ae65b654c3f8e7bc2e..fdf118c5b34b54d7d568bd875c5ad23df49f71b7 100644 >--- a/Source/WebCore/editing/BreakBlockquoteCommand.cpp >+++ b/Source/WebCore/editing/BreakBlockquoteCommand.cpp >@@ -149,7 +149,7 @@ void BreakBlockquoteCommand::doApply() > while (listChildNode && !listChildNode->hasTagName(liTag)) > listChildNode = listChildNode->nextSibling(); > if (listChildNode && is<RenderListItem>(listChildNode->renderer())) >- setNodeAttribute(clonedChild, startAttr, AtomicString::number(downcast<RenderListItem>(*listChildNode->renderer()).value())); >+ setNodeAttribute(clonedChild, startAttr, AtomString::number(downcast<RenderListItem>(*listChildNode->renderer()).value())); > } > > appendNode(clonedChild.copyRef(), clonedAncestor.releaseNonNull()); >diff --git a/Source/WebCore/editing/CompositeEditCommand.cpp b/Source/WebCore/editing/CompositeEditCommand.cpp >index 33bd30eac0712cccdde1c992c92e7ad37c428c35..98a496660667b8a5ec33b64dc28f77286dba0338 100644 >--- a/Source/WebCore/editing/CompositeEditCommand.cpp >+++ b/Source/WebCore/editing/CompositeEditCommand.cpp >@@ -860,7 +860,7 @@ void CompositeEditCommand::removeNodeAttribute(Element& element, const Qualified > setNodeAttribute(element, attribute, nullAtom()); > } > >-void CompositeEditCommand::setNodeAttribute(Element& element, const QualifiedName& attribute, const AtomicString& value) >+void CompositeEditCommand::setNodeAttribute(Element& element, const QualifiedName& attribute, const AtomString& value) > { > applyCommandToComposite(SetNodeAttributeCommand::create(element, attribute, value)); > } >diff --git a/Source/WebCore/editing/CompositeEditCommand.h b/Source/WebCore/editing/CompositeEditCommand.h >index 12819f20f9028a6d6fb0098aab877e073f5da029..dda490b13cdc2ddb83fb1fc8ffab09df0088d82c 100644 >--- a/Source/WebCore/editing/CompositeEditCommand.h >+++ b/Source/WebCore/editing/CompositeEditCommand.h >@@ -176,7 +176,7 @@ protected: > Position replaceSelectedTextInNode(const String&); > void replaceTextInNodePreservingMarkers(Text&, unsigned offset, unsigned count, const String& replacementText); > Position positionOutsideTabSpan(const Position&); >- void setNodeAttribute(Element&, const QualifiedName& attribute, const AtomicString& value); >+ void setNodeAttribute(Element&, const QualifiedName& attribute, const AtomString& value); > void splitElement(Element&, Node& atChild); > void splitTextNode(Text&, unsigned offset); > void splitTextNodeContainingElement(Text&, unsigned offset); >diff --git a/Source/WebCore/editing/Editing.cpp b/Source/WebCore/editing/Editing.cpp >index 89440fe1abb7f82a8e99b05a89a5b6fc00acfbcb..5f2dcf49c56b54eec405d1b9d3cc974f7087ae52 100644 >--- a/Source/WebCore/editing/Editing.cpp >+++ b/Source/WebCore/editing/Editing.cpp >@@ -888,7 +888,7 @@ Ref<HTMLElement> createHTMLElement(Document& document, const QualifiedName& name > return HTMLElementFactory::createElement(name, document); > } > >-Ref<HTMLElement> createHTMLElement(Document& document, const AtomicString& tagName) >+Ref<HTMLElement> createHTMLElement(Document& document, const AtomString& tagName) > { > return createHTMLElement(document, QualifiedName(nullAtom(), tagName, xhtmlNamespaceURI)); > } >diff --git a/Source/WebCore/editing/Editing.h b/Source/WebCore/editing/Editing.h >index 5fbf1e96f8d51ad48e34d220881a7a3a1125d243..0b582033fa8bf7128e91ef04e7136d03ed46cc7c 100644 >--- a/Source/WebCore/editing/Editing.h >+++ b/Source/WebCore/editing/Editing.h >@@ -156,7 +156,7 @@ VisiblePosition visiblePositionForIndexUsingCharacterIterator(Node&, int index); > > WEBCORE_EXPORT Ref<HTMLElement> createDefaultParagraphElement(Document&); > Ref<HTMLElement> createHTMLElement(Document&, const QualifiedName&); >-Ref<HTMLElement> createHTMLElement(Document&, const AtomicString&); >+Ref<HTMLElement> createHTMLElement(Document&, const AtomString&); > > WEBCORE_EXPORT HTMLElement* enclosingList(Node*); > HTMLElement* outermostEnclosingList(Node*, Node* rootList = nullptr); >diff --git a/Source/WebCore/editing/EditingStyle.cpp b/Source/WebCore/editing/EditingStyle.cpp >index 692ee42ee58dfad67829e9da67ba5d9f7bee60de..06c3c8fda5e1e55296147a0b15e64c66e323e10b 100644 >--- a/Source/WebCore/editing/EditingStyle.cpp >+++ b/Source/WebCore/editing/EditingStyle.cpp >@@ -296,7 +296,7 @@ void HTMLAttributeEquivalent::addToStyle(Element* element, EditingStyle* style) > RefPtr<CSSValue> HTMLAttributeEquivalent::attributeValueAsCSSValue(Element* element) const > { > ASSERT(element); >- const AtomicString& value = element->getAttribute(m_attrName); >+ const AtomString& value = element->getAttribute(m_attrName); > if (value.isNull()) > return nullptr; > >@@ -321,7 +321,7 @@ HTMLFontSizeEquivalent::HTMLFontSizeEquivalent() > RefPtr<CSSValue> HTMLFontSizeEquivalent::attributeValueAsCSSValue(Element* element) const > { > ASSERT(element); >- const AtomicString& value = element->getAttribute(m_attrName); >+ const AtomString& value = element->getAttribute(m_attrName); > if (value.isNull()) > return nullptr; > CSSValueID size; >diff --git a/Source/WebCore/editing/Editor.cpp b/Source/WebCore/editing/Editor.cpp >index dc50b6c223e803cc5a621dab14d53d7f36021902..059e1cbf91f3fd68f251a75242f0875d434dd793 100644 >--- a/Source/WebCore/editing/Editor.cpp >+++ b/Source/WebCore/editing/Editor.cpp >@@ -122,7 +122,7 @@ > > namespace WebCore { > >-static bool dispatchBeforeInputEvent(Element& element, const AtomicString& inputType, const String& data = { }, RefPtr<DataTransfer>&& dataTransfer = nullptr, const Vector<RefPtr<StaticRange>>& targetRanges = { }, Event::IsCancelable cancelable = Event::IsCancelable::Yes) >+static bool dispatchBeforeInputEvent(Element& element, const AtomString& inputType, const String& data = { }, RefPtr<DataTransfer>&& dataTransfer = nullptr, const Vector<RefPtr<StaticRange>>& targetRanges = { }, Event::IsCancelable cancelable = Event::IsCancelable::Yes) > { > if (!element.document().settings().inputEventsEnabled()) > return true; >@@ -132,7 +132,7 @@ static bool dispatchBeforeInputEvent(Element& element, const AtomicString& input > return !event->defaultPrevented(); > } > >-static void dispatchInputEvent(Element& element, const AtomicString& inputType, const String& data = { }, RefPtr<DataTransfer>&& dataTransfer = nullptr, const Vector<RefPtr<StaticRange>>& targetRanges = { }) >+static void dispatchInputEvent(Element& element, const AtomString& inputType, const String& data = { }, RefPtr<DataTransfer>&& dataTransfer = nullptr, const Vector<RefPtr<StaticRange>>& targetRanges = { }) > { > if (element.document().settings().inputEventsEnabled()) { > // FIXME: We should not be dispatching to the scoped queue here. Normally, input events are dispatched in CompositeEditCommand::apply after the end of the scope, >@@ -353,7 +353,7 @@ enum class ClipboardEventKind { > BeforePaste, > }; > >-static AtomicString eventNameForClipboardEvent(ClipboardEventKind kind) >+static AtomString eventNameForClipboardEvent(ClipboardEventKind kind) > { > switch (kind) { > case ClipboardEventKind::Copy: >@@ -1056,7 +1056,7 @@ static void notifyTextFromControls(Element* startRoot, Element* endRoot) > endingTextControl->didEditInnerTextValue(); > } > >-static bool dispatchBeforeInputEvents(RefPtr<Element> startRoot, RefPtr<Element> endRoot, const AtomicString& inputTypeName, const String& data = { }, RefPtr<DataTransfer>&& dataTransfer = nullptr, const Vector<RefPtr<StaticRange>>& targetRanges = { }, Event::IsCancelable cancelable = Event::IsCancelable::Yes) >+static bool dispatchBeforeInputEvents(RefPtr<Element> startRoot, RefPtr<Element> endRoot, const AtomString& inputTypeName, const String& data = { }, RefPtr<DataTransfer>&& dataTransfer = nullptr, const Vector<RefPtr<StaticRange>>& targetRanges = { }, Event::IsCancelable cancelable = Event::IsCancelable::Yes) > { > bool continueWithDefaultBehavior = true; > if (startRoot) >@@ -1066,7 +1066,7 @@ static bool dispatchBeforeInputEvents(RefPtr<Element> startRoot, RefPtr<Element> > return continueWithDefaultBehavior; > } > >-static void dispatchInputEvents(RefPtr<Element> startRoot, RefPtr<Element> endRoot, const AtomicString& inputTypeName, const String& data = { }, RefPtr<DataTransfer>&& dataTransfer = nullptr, const Vector<RefPtr<StaticRange>>& targetRanges = { }) >+static void dispatchInputEvents(RefPtr<Element> startRoot, RefPtr<Element> endRoot, const AtomString& inputTypeName, const String& data = { }, RefPtr<DataTransfer>&& dataTransfer = nullptr, const Vector<RefPtr<StaticRange>>& targetRanges = { }) > { > if (startRoot) > dispatchInputEvent(*startRoot, inputTypeName, data, WTFMove(dataTransfer), targetRanges); >@@ -1463,8 +1463,8 @@ void Editor::pasteAsQuotation() > void Editor::quoteFragmentForPasting(DocumentFragment& fragment) > { > auto blockQuote = HTMLQuoteElement::create(blockquoteTag, document()); >- blockQuote->setAttributeWithoutSynchronization(typeAttr, AtomicString("cite")); >- blockQuote->setAttributeWithoutSynchronization(classAttr, AtomicString(ApplePasteAsQuotation)); >+ blockQuote->setAttributeWithoutSynchronization(typeAttr, AtomString("cite")); >+ blockQuote->setAttributeWithoutSynchronization(classAttr, AtomString(ApplePasteAsQuotation)); > > auto childNode = fragment.firstChild(); > >diff --git a/Source/WebCore/editing/EditorCommand.cpp b/Source/WebCore/editing/EditorCommand.cpp >index 82163e678202782d2c120cafa3c78b2d5bb08375..4e5aa618688616962017f3cf3ff4d1fb5fbd1c34 100644 >--- a/Source/WebCore/editing/EditorCommand.cpp >+++ b/Source/WebCore/editing/EditorCommand.cpp >@@ -63,7 +63,7 @@ > #include "markup.h" > #include <pal/system/Sound.h> > #include <pal/text/KillRing.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >diff --git a/Source/WebCore/editing/InsertEditableImageCommand.cpp b/Source/WebCore/editing/InsertEditableImageCommand.cpp >index d9afa56e6cccaf092bb3da52286fade192b69bf0..22d4d6ff74c205daa5ab9856ff4a622bab802589 100644 >--- a/Source/WebCore/editing/InsertEditableImageCommand.cpp >+++ b/Source/WebCore/editing/InsertEditableImageCommand.cpp >@@ -50,9 +50,9 @@ void InsertEditableImageCommand::doApply() > > m_imageElement = HTMLImageElement::create(document()); > m_imageElement->setAttributeWithoutSynchronization(HTMLNames::x_apple_editable_imageAttr, emptyAtom()); >- m_imageElement->setAttributeWithoutSynchronization(HTMLNames::widthAttr, AtomicString("100%", AtomicString::ConstructFromLiteral)); >- m_imageElement->setAttributeWithoutSynchronization(HTMLNames::heightAttr, AtomicString("300px", AtomicString::ConstructFromLiteral)); >- m_imageElement->setAttributeWithoutSynchronization(HTMLNames::styleAttr, AtomicString("display: block", AtomicString::ConstructFromLiteral)); >+ m_imageElement->setAttributeWithoutSynchronization(HTMLNames::widthAttr, AtomString("100%", AtomString::ConstructFromLiteral)); >+ m_imageElement->setAttributeWithoutSynchronization(HTMLNames::heightAttr, AtomString("300px", AtomString::ConstructFromLiteral)); >+ m_imageElement->setAttributeWithoutSynchronization(HTMLNames::styleAttr, AtomString("display: block", AtomString::ConstructFromLiteral)); > > insertNodeAt(*m_imageElement, endingSelection().start()); > setEndingSelection(visiblePositionAfterNode(*m_imageElement)); >diff --git a/Source/WebCore/editing/MarkupAccumulator.cpp b/Source/WebCore/editing/MarkupAccumulator.cpp >index 52500637a9d04be65ff57643a987693185a98664..7e9b47ff6d657f08fd0a9405be88258db3dc473f 100644 >--- a/Source/WebCore/editing/MarkupAccumulator.cpp >+++ b/Source/WebCore/editing/MarkupAccumulator.cpp >@@ -94,7 +94,7 @@ static bool elementCannotHaveEndTag(const Node& node) > // If current node is an area, base, basefont, bgsound, br, col, embed, frame, hr, img, > // input, keygen, link, meta, param, source, track or wbr element, then continue on to > // the next child node at this point. >- static const AtomicStringImpl* const localNames[] = { >+ static const AtomStringImpl* const localNames[] = { > areaTag->localName().impl(), > baseTag->localName().impl(), > basefontTag->localName().impl(), >@@ -317,7 +317,7 @@ void MarkupAccumulator::appendQuotedURLAttributeValue(StringBuilder& result, con > bool MarkupAccumulator::shouldAddNamespaceElement(const Element& element) > { > // Don't add namespace attribute if it is already defined for this elem. >- const AtomicString& prefix = element.prefix(); >+ const AtomString& prefix = element.prefix(); > if (prefix.isEmpty()) > return !element.hasAttribute(xmlnsAtom()); > >@@ -346,7 +346,7 @@ bool MarkupAccumulator::shouldAddNamespaceAttribute(const Attribute& attribute, > return true; > } > >-void MarkupAccumulator::appendNamespace(StringBuilder& result, const AtomicString& prefix, const AtomicString& namespaceURI, Namespaces& namespaces, bool allowEmptyDefaultNS) >+void MarkupAccumulator::appendNamespace(StringBuilder& result, const AtomString& prefix, const AtomString& namespaceURI, Namespaces& namespaces, bool allowEmptyDefaultNS) > { > namespaces.checkConsistency(); > if (namespaceURI.isEmpty()) { >@@ -360,8 +360,8 @@ void MarkupAccumulator::appendNamespace(StringBuilder& result, const AtomicStrin > } > > // Use emptyAtom()s's impl() for both null and empty strings since the HashMap can't handle 0 as a key >- AtomicStringImpl* pre = prefix.isEmpty() ? emptyAtom().impl() : prefix.impl(); >- AtomicStringImpl* foundNS = namespaces.get(pre); >+ AtomStringImpl* pre = prefix.isEmpty() ? emptyAtom().impl() : prefix.impl(); >+ AtomStringImpl* foundNS = namespaces.get(pre); > if (foundNS != namespaceURI.impl()) { > namespaces.set(pre, namespaceURI.impl()); > // Add namespace to prefix pair so we can do constraint checking later. >@@ -531,7 +531,7 @@ void MarkupAccumulator::generateUniquePrefix(QualifiedName& prefixedName, const > builder.clear(); > builder.appendLiteral("NS"); > builder.appendNumber(++m_prefixLevel); >- const AtomicString& name = builder.toAtomicString(); >+ const AtomString& name = builder.toAtomString(); > if (!namespaces.get(name.impl())) { > prefixedName.setPrefix(name); > return; >@@ -554,11 +554,11 @@ void MarkupAccumulator::appendAttribute(StringBuilder& result, const Element& el > // Always use xml as prefix if the namespace is the XML namespace. > prefixedName.setPrefix(xmlAtom()); > } else { >- AtomicStringImpl* foundNS = namespaces && attribute.prefix().impl() ? namespaces->get(attribute.prefix().impl()) : 0; >+ AtomStringImpl* foundNS = namespaces && attribute.prefix().impl() ? namespaces->get(attribute.prefix().impl()) : 0; > bool prefixIsAlreadyMappedToOtherNS = foundNS && foundNS != attribute.namespaceURI().impl(); > if (attribute.prefix().isEmpty() || !foundNS || prefixIsAlreadyMappedToOtherNS) { >- if (AtomicStringImpl* prefix = namespaces ? namespaces->get(attribute.namespaceURI().impl()) : 0) >- prefixedName.setPrefix(AtomicString(prefix)); >+ if (AtomStringImpl* prefix = namespaces ? namespaces->get(attribute.namespaceURI().impl()) : 0) >+ prefixedName.setPrefix(AtomString(prefix)); > else { > bool shouldBeDeclaredUsingAppendNamespace = !attribute.prefix().isEmpty() && !foundNS; > if (!shouldBeDeclaredUsingAppendNamespace && attribute.localName() != xmlnsAtom() && namespaces) >diff --git a/Source/WebCore/editing/MarkupAccumulator.h b/Source/WebCore/editing/MarkupAccumulator.h >index aaacb2761fb620bf52a78448dd20b461ff566886..7c7bbf31fdbec3c92d642c957d5c882f5c15262d 100644 >--- a/Source/WebCore/editing/MarkupAccumulator.h >+++ b/Source/WebCore/editing/MarkupAccumulator.h >@@ -38,7 +38,7 @@ class Element; > class Node; > class Range; > >-typedef HashMap<AtomicString, AtomicStringImpl*> Namespaces; >+typedef HashMap<AtomString, AtomStringImpl*> Namespaces; > > enum EntityMask { > EntityAmp = 0x0001, >@@ -94,7 +94,7 @@ protected: > void appendEndMarkup(StringBuilder&, const Element&); > > void appendAttributeValue(StringBuilder&, const String&, bool isSerializingHTML); >- void appendNamespace(StringBuilder&, const AtomicString& prefix, const AtomicString& namespaceURI, Namespaces&, bool allowEmptyDefaultNS = false); >+ void appendNamespace(StringBuilder&, const AtomString& prefix, const AtomString& namespaceURI, Namespaces&, bool allowEmptyDefaultNS = false); > void appendXMLDeclaration(StringBuilder&, const Document&); > void appendDocumentType(StringBuilder&, const DocumentType&); > void appendProcessingInstruction(StringBuilder&, const String& target, const String& data); >diff --git a/Source/WebCore/editing/ReplaceSelectionCommand.cpp b/Source/WebCore/editing/ReplaceSelectionCommand.cpp >index ca96dbf0bb0562c23c29edcb99ba5c6b4b48ed54..9572b10de45fecfdbcb2dbd776dd70aa2fc91681 100644 >--- a/Source/WebCore/editing/ReplaceSelectionCommand.cpp >+++ b/Source/WebCore/editing/ReplaceSelectionCommand.cpp >@@ -572,7 +572,7 @@ void ReplaceSelectionCommand::removeRedundantStylesAndKeepStyleSpanInline(Insert > } > } > >-static bool isProhibitedParagraphChild(const AtomicString& name) >+static bool isProhibitedParagraphChild(const AtomString& name) > { > // https://dvcs.w3.org/hg/editing/raw-file/57abe6d3cb60/editing.html#prohibited-paragraph-child > static const auto localNames = makeNeverDestroyed([] { >@@ -626,7 +626,7 @@ static bool isProhibitedParagraphChild(const AtomicString& name) > &ulTag.get(), > &xmpTag.get(), > }; >- HashSet<AtomicString> set; >+ HashSet<AtomString> set; > for (auto& tag : tags) > set.add(tag->localName()); > return set; >@@ -903,7 +903,7 @@ static bool isInlineNodeWithStyle(const Node* node) > // We can skip over elements whose class attribute is > // one of our internal classes. > const HTMLElement* element = static_cast<const HTMLElement*>(node); >- const AtomicString& classAttributeValue = element->attributeWithoutSynchronization(classAttr); >+ const AtomString& classAttributeValue = element->attributeWithoutSynchronization(classAttr); > if (classAttributeValue == AppleTabSpanClass > || classAttributeValue == AppleConvertedSpace > || classAttributeValue == ApplePasteAsQuotation) >diff --git a/Source/WebCore/editing/SetNodeAttributeCommand.cpp b/Source/WebCore/editing/SetNodeAttributeCommand.cpp >index f838e546c19825ba84d6f61402253f43284664d7..80c146a1840e8e4f894c86fbfb64a65f21b9b80e 100644 >--- a/Source/WebCore/editing/SetNodeAttributeCommand.cpp >+++ b/Source/WebCore/editing/SetNodeAttributeCommand.cpp >@@ -31,7 +31,7 @@ > > namespace WebCore { > >-SetNodeAttributeCommand::SetNodeAttributeCommand(Ref<Element>&& element, const QualifiedName& attribute, const AtomicString& value) >+SetNodeAttributeCommand::SetNodeAttributeCommand(Ref<Element>&& element, const QualifiedName& attribute, const AtomString& value) > : SimpleEditCommand(element->document()) > , m_element(WTFMove(element)) > , m_attribute(attribute) >@@ -48,7 +48,7 @@ void SetNodeAttributeCommand::doApply() > void SetNodeAttributeCommand::doUnapply() > { > m_element->setAttribute(m_attribute, m_oldValue); >- AtomicStringImpl* nullString = nullptr; >+ AtomStringImpl* nullString = nullptr; > m_oldValue = nullString; > } > >diff --git a/Source/WebCore/editing/SetNodeAttributeCommand.h b/Source/WebCore/editing/SetNodeAttributeCommand.h >index 88449dee6b76a3c56be3353a0ad4cf266a610d15..de512c50e7270e049c48aecd1cf77d9a5b873ed0 100644 >--- a/Source/WebCore/editing/SetNodeAttributeCommand.h >+++ b/Source/WebCore/editing/SetNodeAttributeCommand.h >@@ -32,13 +32,13 @@ namespace WebCore { > > class SetNodeAttributeCommand : public SimpleEditCommand { > public: >- static Ref<SetNodeAttributeCommand> create(Ref<Element>&& element, const QualifiedName& attribute, const AtomicString& value) >+ static Ref<SetNodeAttributeCommand> create(Ref<Element>&& element, const QualifiedName& attribute, const AtomString& value) > { > return adoptRef(*new SetNodeAttributeCommand(WTFMove(element), attribute, value)); > } > > private: >- SetNodeAttributeCommand(Ref<Element>&&, const QualifiedName& attribute, const AtomicString& value); >+ SetNodeAttributeCommand(Ref<Element>&&, const QualifiedName& attribute, const AtomString& value); > > void doApply() override; > void doUnapply() override; >@@ -49,8 +49,8 @@ private: > > Ref<Element> m_element; > QualifiedName m_attribute; >- AtomicString m_value; >- AtomicString m_oldValue; >+ AtomString m_value; >+ AtomString m_oldValue; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/editing/SplitElementCommand.cpp b/Source/WebCore/editing/SplitElementCommand.cpp >index ba32ab5ce6b4be69e632b389763f85d7959c5fac..d21bcf09deee65a1683531f348af4dd3f9d96a84 100644 >--- a/Source/WebCore/editing/SplitElementCommand.cpp >+++ b/Source/WebCore/editing/SplitElementCommand.cpp >@@ -84,7 +84,7 @@ void SplitElementCommand::doUnapply() > m_element2->insertBefore(child, refChild.get()); > > // Recover the id attribute of the original element. >- const AtomicString& id = m_element1->getIdAttribute(); >+ const AtomString& id = m_element1->getIdAttribute(); > if (!id.isNull()) > m_element2->setIdAttribute(id); > >diff --git a/Source/WebCore/editing/cocoa/DataDetection.mm b/Source/WebCore/editing/cocoa/DataDetection.mm >index bcb238e106d777883ede0f343ad46cf4c295a8dd..681f5f5653af21b26dcf958df3199ed810ee0ada 100644 >--- a/Source/WebCore/editing/cocoa/DataDetection.mm >+++ b/Source/WebCore/editing/cocoa/DataDetection.mm >@@ -196,7 +196,7 @@ bool DataDetection::shouldCancelDefaultAction(Element& element) > if (softLink_DataDetectorsCore_DDShouldImmediatelyShowActionSheetForURL(downcast<HTMLAnchorElement>(element).href())) > return true; > >- const AtomicString& resultAttribute = element.attributeWithoutSynchronization(x_apple_data_detectors_resultAttr); >+ const AtomString& resultAttribute = element.attributeWithoutSynchronization(x_apple_data_detectors_resultAttr); > if (resultAttribute.isEmpty()) > return false; > NSArray *results = element.document().frame()->dataDetectionResults(); >@@ -636,7 +636,7 @@ NSArray *DataDetection::detectContentInRange(RefPtr<Range>& contextRange, DataDe > anchorElement->appendChild(WTFMove(newTextNode)); > > // Add a special attribute to mark this URLification as the result of data detectors. >- anchorElement->setAttributeWithoutSynchronization(x_apple_data_detectorsAttr, AtomicString("true", AtomicString::ConstructFromLiteral)); >+ anchorElement->setAttributeWithoutSynchronization(x_apple_data_detectorsAttr, AtomString("true", AtomString::ConstructFromLiteral)); > anchorElement->setAttributeWithoutSynchronization(x_apple_data_detectors_typeAttr, dataDetectorTypeForCategory(softLink_DataDetectorsCore_DDResultGetCategory(coreResult))); > anchorElement->setAttributeWithoutSynchronization(x_apple_data_detectors_resultAttr, identifier); > >diff --git a/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm b/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm >index bf29a86c491ef39ac45fc28d892fb7fe483df499..2612e73f351a9982f7f77c1d7a57dc469ca0e9b6 100644 >--- a/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm >+++ b/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm >@@ -262,9 +262,9 @@ static Ref<DocumentFragment> createFragmentForImageAttachment(Frame& frame, Docu > image->setAttributeWithoutSynchronization(HTMLNames::srcAttr, DOMURL::createObjectURL(document, Blob::create(buffer.get(), contentType))); > image->setAttachmentElement(WTFMove(attachment)); > if (preferredSize.width) >- image->setAttributeWithoutSynchronization(HTMLNames::widthAttr, AtomicString::number(*preferredSize.width)); >+ image->setAttributeWithoutSynchronization(HTMLNames::widthAttr, AtomString::number(*preferredSize.width)); > if (preferredSize.height) >- image->setAttributeWithoutSynchronization(HTMLNames::heightAttr, AtomicString::number(*preferredSize.height)); >+ image->setAttributeWithoutSynchronization(HTMLNames::heightAttr, AtomString::number(*preferredSize.height)); > fragment->appendChild(WTFMove(image)); > } else { > attachment->updateAttributes(buffer->size(), contentType, defaultImageAttachmentName); >@@ -296,7 +296,7 @@ static void replaceRichContentWithAttachments(Frame& frame, DocumentFragment& fr > return; > > // FIXME: Handle resources in subframe archives. >- HashMap<AtomicString, Ref<ArchiveResource>> urlToResourceMap; >+ HashMap<AtomString, Ref<ArchiveResource>> urlToResourceMap; > for (auto& subresource : subresources) { > auto& url = subresource->url(); > if (shouldReplaceSubresourceURL(url)) >@@ -332,7 +332,7 @@ static void replaceRichContentWithAttachments(Frame& frame, DocumentFragment& fr > if (name.isEmpty()) > name = URL({ }, resourceURLString).lastPathComponent(); > if (name.isEmpty()) >- name = AtomicString("media"); >+ name = AtomString("media"); > > attachmentInsertionInfo.append({ name, resource->value->mimeType(), resource->value->data(), image }); > } >@@ -350,7 +350,7 @@ static void replaceRichContentWithAttachments(Frame& frame, DocumentFragment& fr > > auto name = URL({ }, resourceURLString).lastPathComponent(); > if (name.isEmpty()) >- name = AtomicString("file"); >+ name = AtomString("file"); > > attachmentInsertionInfo.append({ name, resource->value->mimeType(), resource->value->data(), object }); > } >@@ -413,7 +413,7 @@ RefPtr<DocumentFragment> createFragmentAndAddResources(Frame& frame, NSAttribute > return WTFMove(fragmentAndResources.fragment); > } > >- HashMap<AtomicString, AtomicString> blobURLMap; >+ HashMap<AtomString, AtomString> blobURLMap; > for (const Ref<ArchiveResource>& subresource : fragmentAndResources.resources) { > auto blob = Blob::create(subresource->data(), subresource->mimeType()); > String blobURL = DOMURL::createObjectURL(document, blob); >@@ -459,7 +459,7 @@ static String sanitizeMarkupWithArchive(Frame& frame, Document& destinationDocum > return sanitizedMarkupForFragmentInDocument(WTFMove(fragment), *stagingDocument, msoListQuirks, markupAndArchive.markup); > } > >- HashMap<AtomicString, AtomicString> blobURLMap; >+ HashMap<AtomString, AtomString> blobURLMap; > for (const Ref<ArchiveResource>& subresource : markupAndArchive.archive->subresources()) { > auto& subresourceURL = subresource->url(); > if (!shouldReplaceSubresourceURL(subresourceURL)) >@@ -739,9 +739,9 @@ static Ref<HTMLElement> attachmentForFilePath(Frame& frame, const String& path, > image->setAttributeWithoutSynchronization(HTMLNames::srcAttr, DOMURL::createObjectURL(document, File::create(path))); > image->setAttachmentElement(WTFMove(attachment)); > if (preferredSize.width) >- image->setAttributeWithoutSynchronization(HTMLNames::widthAttr, AtomicString::number(*preferredSize.width)); >+ image->setAttributeWithoutSynchronization(HTMLNames::widthAttr, AtomString::number(*preferredSize.width)); > if (preferredSize.height) >- image->setAttributeWithoutSynchronization(HTMLNames::heightAttr, AtomicString::number(*preferredSize.height)); >+ image->setAttributeWithoutSynchronization(HTMLNames::heightAttr, AtomString::number(*preferredSize.height)); > return image; > } > >@@ -776,9 +776,9 @@ static Ref<HTMLElement> attachmentForData(Frame& frame, SharedBuffer& buffer, co > image->setAttributeWithoutSynchronization(HTMLNames::srcAttr, DOMURL::createObjectURL(document, File::create(Blob::create(buffer, WTFMove(attachmentType)), WTFMove(fileName)))); > image->setAttachmentElement(WTFMove(attachment)); > if (preferredSize.width) >- image->setAttributeWithoutSynchronization(HTMLNames::widthAttr, AtomicString::number(*preferredSize.width)); >+ image->setAttributeWithoutSynchronization(HTMLNames::widthAttr, AtomString::number(*preferredSize.width)); > if (preferredSize.height) >- image->setAttributeWithoutSynchronization(HTMLNames::heightAttr, AtomicString::number(*preferredSize.height)); >+ image->setAttributeWithoutSynchronization(HTMLNames::heightAttr, AtomString::number(*preferredSize.height)); > return image; > } > >diff --git a/Source/WebCore/editing/gtk/EditorGtk.cpp b/Source/WebCore/editing/gtk/EditorGtk.cpp >index 8c4ea290fc5b8c3d4c3d09ce305412d826a5dca7..706e82673f081333735e5871278c8d450d0b69bc 100644 >--- a/Source/WebCore/editing/gtk/EditorGtk.cpp >+++ b/Source/WebCore/editing/gtk/EditorGtk.cpp >@@ -103,7 +103,7 @@ void Editor::pasteWithPasteboard(Pasteboard* pasteboard, OptionSet<PasteOption> > pasteAsFragment(fragment.releaseNonNull(), canSmartReplaceWithPasteboard(*pasteboard), chosePlainText, options.contains(PasteOption::IgnoreMailBlockquote) ? MailBlockquoteHandling::IgnoreBlockquote : MailBlockquoteHandling::RespectBlockquote); > } > >-static const AtomicString& elementURL(Element& element) >+static const AtomString& elementURL(Element& element) > { > if (is<HTMLImageElement>(element) || is<HTMLInputElement>(element)) > return element.attributeWithoutSynchronization(HTMLNames::srcAttr); >diff --git a/Source/WebCore/editing/markup.cpp b/Source/WebCore/editing/markup.cpp >index cac009732125cc899590e4b44a645ec4eff17905..d4ea36dd01fd3c2da57b8948a67b426fde3b0303 100644 >--- a/Source/WebCore/editing/markup.cpp >+++ b/Source/WebCore/editing/markup.cpp >@@ -130,7 +130,7 @@ static void completeURLs(DocumentFragment* fragment, const String& baseURL) > change.apply(); > } > >-void replaceSubresourceURLs(Ref<DocumentFragment>&& fragment, HashMap<AtomicString, AtomicString>&& replacementMap) >+void replaceSubresourceURLs(Ref<DocumentFragment>&& fragment, HashMap<AtomString, AtomString>&& replacementMap) > { > Vector<AttributeChange> changes; > for (auto& element : descendantsOfType<Element>(fragment)) { >@@ -1241,9 +1241,9 @@ Ref<DocumentFragment> createFragmentForImageAndURL(Document& document, const Str > auto imageElement = HTMLImageElement::create(document); > imageElement->setAttributeWithoutSynchronization(HTMLNames::srcAttr, url); > if (preferredSize.width) >- imageElement->setAttributeWithoutSynchronization(HTMLNames::widthAttr, AtomicString::number(*preferredSize.width)); >+ imageElement->setAttributeWithoutSynchronization(HTMLNames::widthAttr, AtomString::number(*preferredSize.width)); > if (preferredSize.height) >- imageElement->setAttributeWithoutSynchronization(HTMLNames::heightAttr, AtomicString::number(*preferredSize.height)); >+ imageElement->setAttributeWithoutSynchronization(HTMLNames::heightAttr, AtomString::number(*preferredSize.height)); > auto fragment = document.createDocumentFragment(); > fragment->appendChild(imageElement); > >diff --git a/Source/WebCore/editing/markup.h b/Source/WebCore/editing/markup.h >index a5eb8244fe49d414c4385df52703e857827ff45f..100fbf35b4cf2141d8444c74939eadde96e5b581 100644 >--- a/Source/WebCore/editing/markup.h >+++ b/Source/WebCore/editing/markup.h >@@ -49,7 +49,7 @@ class QualifiedName; > class Range; > class VisibleSelection; > >-void replaceSubresourceURLs(Ref<DocumentFragment>&&, HashMap<AtomicString, AtomicString>&&); >+void replaceSubresourceURLs(Ref<DocumentFragment>&&, HashMap<AtomString, AtomString>&&); > void removeSubresourceURLAttributes(Ref<DocumentFragment>&&, WTF::Function<bool(const URL&)> shouldRemoveURL); > > enum class MSOListQuirks { CheckIfNeeded, Disabled }; >diff --git a/Source/WebCore/fileapi/FileReader.cpp b/Source/WebCore/fileapi/FileReader.cpp >index 88852475e998a3f10d13e93ffba175256864a60b..9ad3da9efff0f3a707a0601f78601d5d868258f5 100644 >--- a/Source/WebCore/fileapi/FileReader.cpp >+++ b/Source/WebCore/fileapi/FileReader.cpp >@@ -222,7 +222,7 @@ void FileReader::didFail(int errorCode) > m_loadingActivity = nullptr; > } > >-void FileReader::fireEvent(const AtomicString& type) >+void FileReader::fireEvent(const AtomString& type) > { > dispatchEvent(ProgressEvent::create(type, true, m_loader ? m_loader->bytesLoaded() : 0, m_loader ? m_loader->totalBytes() : 0)); > } >diff --git a/Source/WebCore/fileapi/FileReader.h b/Source/WebCore/fileapi/FileReader.h >index 90f1ead0062762103c0d6df422e65414d8825556..effdb290f3f043ee7f6888be84fc6212988b367e 100644 >--- a/Source/WebCore/fileapi/FileReader.h >+++ b/Source/WebCore/fileapi/FileReader.h >@@ -93,7 +93,7 @@ private: > > ExceptionOr<void> readInternal(Blob&, FileReaderLoader::ReadType); > void fireErrorEvent(int httpStatusCode); >- void fireEvent(const AtomicString& type); >+ void fireEvent(const AtomString& type); > > ReadyState m_state { EMPTY }; > bool m_aborting { false }; >diff --git a/Source/WebCore/html/Autocapitalize.cpp b/Source/WebCore/html/Autocapitalize.cpp >index 2f87a352208c48cfadeac3b1ab7754ed90d3b832..218f3db2f6111d496fefa1dd7898c86cdd8511e5 100644 >--- a/Source/WebCore/html/Autocapitalize.cpp >+++ b/Source/WebCore/html/Autocapitalize.cpp >@@ -30,7 +30,7 @@ > > namespace WebCore { > >-AutocapitalizeType autocapitalizeTypeForAttributeValue(const AtomicString& attributeValue) >+AutocapitalizeType autocapitalizeTypeForAttributeValue(const AtomString& attributeValue) > { > // Omitted / missing values are the Default state. > if (attributeValue.isEmpty()) >@@ -49,25 +49,25 @@ AutocapitalizeType autocapitalizeTypeForAttributeValue(const AtomicString& attri > return AutocapitalizeTypeSentences; > } > >-const AtomicString& stringForAutocapitalizeType(AutocapitalizeType type) >+const AtomString& stringForAutocapitalizeType(AutocapitalizeType type) > { > switch (type) { > case AutocapitalizeTypeDefault: > return nullAtom(); > case AutocapitalizeTypeNone: { >- static NeverDestroyed<const AtomicString> valueNone("none", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> valueNone("none", AtomString::ConstructFromLiteral); > return valueNone; > } > case AutocapitalizeTypeSentences: { >- static NeverDestroyed<const AtomicString> valueSentences("sentences", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> valueSentences("sentences", AtomString::ConstructFromLiteral); > return valueSentences; > } > case AutocapitalizeTypeWords: { >- static NeverDestroyed<const AtomicString> valueWords("words", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> valueWords("words", AtomString::ConstructFromLiteral); > return valueWords; > } > case AutocapitalizeTypeAllCharacters: { >- static NeverDestroyed<const AtomicString> valueAllCharacters("characters", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> valueAllCharacters("characters", AtomString::ConstructFromLiteral); > return valueAllCharacters; > } > } >diff --git a/Source/WebCore/html/Autocapitalize.h b/Source/WebCore/html/Autocapitalize.h >index 1c32579e6bef0b9d37c6468b84a88dd2a20bc190..9151bc1a2f07b5571b423c7239e8721beac53c5a 100644 >--- a/Source/WebCore/html/Autocapitalize.h >+++ b/Source/WebCore/html/Autocapitalize.h >@@ -26,11 +26,11 @@ > #pragma once > > #include "AutocapitalizeTypes.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >-AutocapitalizeType autocapitalizeTypeForAttributeValue(const AtomicString&); >-const AtomicString& stringForAutocapitalizeType(AutocapitalizeType); >+AutocapitalizeType autocapitalizeTypeForAttributeValue(const AtomString&); >+const AtomString& stringForAutocapitalizeType(AutocapitalizeType); > > } // namespace WebCore >diff --git a/Source/WebCore/html/Autofill.cpp b/Source/WebCore/html/Autofill.cpp >index 2f1de9bcecef520ca11e80d3638f7001c7b863a3..50da8128ebdd375a367fa5f1e7f9e59214a0364b 100644 >--- a/Source/WebCore/html/Autofill.cpp >+++ b/Source/WebCore/html/Autofill.cpp >@@ -31,8 +31,8 @@ > #include "HTMLNames.h" > #include <wtf/HashMap.h> > #include <wtf/NeverDestroyed.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -48,7 +48,7 @@ struct AutofillInfo { > AutofillCategory category; > }; > >-static const HashMap<AtomicString, AutofillInfo>& fieldNameMap() >+static const HashMap<AtomString, AutofillInfo>& fieldNameMap() > { > static const auto map = makeNeverDestroyed([] { > struct MapEntry { >@@ -113,7 +113,7 @@ static const HashMap<AtomicString, AutofillInfo>& fieldNameMap() > { "email", { AutofillFieldName::Email, AutofillCategory::Contact } }, > { "impp", { AutofillFieldName::Impp, AutofillCategory::Contact } }, > }; >- HashMap<AtomicString, AutofillInfo> map; >+ HashMap<AtomString, AutofillInfo> map; > for (auto& entry : entries) > map.add(entry.name, entry.value); > return map; >@@ -121,7 +121,7 @@ static const HashMap<AtomicString, AutofillInfo>& fieldNameMap() > return map; > } > >-AutofillFieldName toAutofillFieldName(const AtomicString& value) >+AutofillFieldName toAutofillFieldName(const AtomString& value) > { > auto map = fieldNameMap(); > auto it = map.find(value); >@@ -130,13 +130,13 @@ AutofillFieldName toAutofillFieldName(const AtomicString& value) > return it->value.fieldName; > } > >-static inline bool isContactToken(const AtomicString& token) >+static inline bool isContactToken(const AtomString& token) > { >- static NeverDestroyed<AtomicString> home("home", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> work("work", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> mobile("mobile", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> fax("fax", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> pager("pager", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> home("home", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> work("work", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> mobile("mobile", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> fax("fax", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> pager("pager", AtomString::ConstructFromLiteral); > > return token == home || token == work || token == mobile || token == fax || token == pager; > } >@@ -161,8 +161,8 @@ static unsigned maxTokensForAutofillFieldCategory(AutofillCategory category) > // https://html.spec.whatwg.org/multipage/forms.html#processing-model-3 > AutofillData AutofillData::createFromHTMLFormControlElement(const HTMLFormControlElement& element) > { >- static NeverDestroyed<AtomicString> on("on", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> off("off", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> on("on", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> off("off", AtomString::ConstructFromLiteral); > > // Label: Default > // 26. Let the element's IDL-exposed autofill value be the empty string, and its autofill hint set and autofill scope be empty. >@@ -180,7 +180,7 @@ AutofillData AutofillData::createFromHTMLFormControlElement(const HTMLFormContro > }; > > >- const AtomicString& attributeValue = element.attributeWithoutSynchronization(HTMLNames::autocompleteAttr); >+ const AtomString& attributeValue = element.attributeWithoutSynchronization(HTMLNames::autocompleteAttr); > > // 1. If the element has no autocomplete attribute, then jump to the step labeled default. > if (attributeValue.isNull()) >diff --git a/Source/WebCore/html/Autofill.h b/Source/WebCore/html/Autofill.h >index 3a539bac79dc66f7982abaf1315fc148e0184e15..a4abaf931237cf6bdb1903833bba1e58bd338548 100644 >--- a/Source/WebCore/html/Autofill.h >+++ b/Source/WebCore/html/Autofill.h >@@ -25,7 +25,7 @@ > > #pragma once > >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/WTFString.h> > > namespace WebCore { >@@ -92,7 +92,7 @@ enum class AutofillFieldName { > Impp > }; > >-WEBCORE_EXPORT AutofillFieldName toAutofillFieldName(const AtomicString&); >+WEBCORE_EXPORT AutofillFieldName toAutofillFieldName(const AtomString&); > > class HTMLFormControlElement; > >@@ -100,7 +100,7 @@ class AutofillData { > public: > static AutofillData createFromHTMLFormControlElement(const HTMLFormControlElement&); > >- AutofillData(const AtomicString& fieldName, const String& idlExposedValue) >+ AutofillData(const AtomString& fieldName, const String& idlExposedValue) > : fieldName(fieldName) > , idlExposedValue(idlExposedValue) > { >@@ -108,7 +108,7 @@ public: > > // We could add support for hint tokens and scope tokens if those ever became useful to anyone. > >- AtomicString fieldName; >+ AtomString fieldName; > String idlExposedValue; > }; > >diff --git a/Source/WebCore/html/BaseCheckableInputType.cpp b/Source/WebCore/html/BaseCheckableInputType.cpp >index 4fdae444d8c5db5fe5fd73a818f3780b48dc5c24..eb9744be25fe0a9d7b170d20ed9b2865f811d51b 100644 >--- a/Source/WebCore/html/BaseCheckableInputType.cpp >+++ b/Source/WebCore/html/BaseCheckableInputType.cpp >@@ -101,7 +101,7 @@ void BaseCheckableInputType::accessKeyAction(bool sendMouseEvents) > > String BaseCheckableInputType::fallbackValue() const > { >- static NeverDestroyed<const AtomicString> on("on", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> on("on", AtomString::ConstructFromLiteral); > return on.get(); > } > >diff --git a/Source/WebCore/html/BaseChooserOnlyDateAndTimeInputType.cpp b/Source/WebCore/html/BaseChooserOnlyDateAndTimeInputType.cpp >index 7828ea1a936b83ce40d32f5efae2269570aebb70..ab41976d32f5bdfbbf5b70f08b9cb69bd0427485 100644 >--- a/Source/WebCore/html/BaseChooserOnlyDateAndTimeInputType.cpp >+++ b/Source/WebCore/html/BaseChooserOnlyDateAndTimeInputType.cpp >@@ -61,7 +61,7 @@ void BaseChooserOnlyDateAndTimeInputType::handleDOMActivateEvent(Event&) > > void BaseChooserOnlyDateAndTimeInputType::createShadowSubtree() > { >- static NeverDestroyed<AtomicString> valueContainerPseudo("-webkit-date-and-time-value", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> valueContainerPseudo("-webkit-date-and-time-value", AtomString::ConstructFromLiteral); > > ASSERT(element()); > auto valueContainer = HTMLDivElement::create(element()->document()); >diff --git a/Source/WebCore/html/BaseTextInputType.cpp b/Source/WebCore/html/BaseTextInputType.cpp >index b3685b91a9973b8311b1ca9cc80035f5fcfe51e8..01189abe3bf1da3751fbd323fb5ae78ea338e779 100644 >--- a/Source/WebCore/html/BaseTextInputType.cpp >+++ b/Source/WebCore/html/BaseTextInputType.cpp >@@ -43,7 +43,7 @@ bool BaseTextInputType::patternMismatch(const String& value) const > ASSERT(element()); > // FIXME: We should execute RegExp parser first to check validity instead of creating an actual RegularExpression. > // https://bugs.webkit.org/show_bug.cgi?id=183361 >- const AtomicString& rawPattern = element()->attributeWithoutSynchronization(patternAttr); >+ const AtomString& rawPattern = element()->attributeWithoutSynchronization(patternAttr); > if (rawPattern.isNull() || value.isEmpty() || !JSC::Yarr::RegularExpression(rawPattern, JSC::Yarr::TextCaseSensitive, JSC::Yarr::MultilineDisabled, JSC::Yarr::UnicodeAwareMode).isValid()) > return false; > String pattern = "^(?:" + rawPattern + ")$"; >diff --git a/Source/WebCore/html/ButtonInputType.cpp b/Source/WebCore/html/ButtonInputType.cpp >index cb452e643f51e5b36697cfe1112c21cb03fb663c..e9518652b3149d56cae5205c72f45b5fcd8dc72c 100644 >--- a/Source/WebCore/html/ButtonInputType.cpp >+++ b/Source/WebCore/html/ButtonInputType.cpp >@@ -35,7 +35,7 @@ > > namespace WebCore { > >-const AtomicString& ButtonInputType::formControlType() const >+const AtomString& ButtonInputType::formControlType() const > { > return InputTypeNames::button(); > } >diff --git a/Source/WebCore/html/ButtonInputType.h b/Source/WebCore/html/ButtonInputType.h >index cc2fd62fc798d5395569ca67ab3c0a2076ffad7d..861f95a69c80a818cc40a91b158fd001a77d3048 100644 >--- a/Source/WebCore/html/ButtonInputType.h >+++ b/Source/WebCore/html/ButtonInputType.h >@@ -39,7 +39,7 @@ public: > explicit ButtonInputType(HTMLInputElement& element) : BaseButtonInputType(element) { } > > private: >- const AtomicString& formControlType() const override; >+ const AtomString& formControlType() const override; > bool supportsValidation() const override; > bool isTextButton() const override; > }; >diff --git a/Source/WebCore/html/CachedHTMLCollection.h b/Source/WebCore/html/CachedHTMLCollection.h >index 2c052a718073cfde09ba9c534398dbd71d30e4bc..79f477d74f224e71b46aba477f6cdb0da89df485 100644 >--- a/Source/WebCore/html/CachedHTMLCollection.h >+++ b/Source/WebCore/html/CachedHTMLCollection.h >@@ -42,7 +42,7 @@ public: > > unsigned length() const final { return m_indexCache.nodeCount(collection()); } > Element* item(unsigned offset) const override { return m_indexCache.nodeAt(collection(), offset); } >- Element* namedItem(const AtomicString& name) const override; >+ Element* namedItem(const AtomString& name) const override; > size_t memoryCost() const final > { > // memoryCost() may be invoked concurrently from a GC thread, and we need to be careful about what data we access here and how. >@@ -129,7 +129,7 @@ static inline bool nameShouldBeVisibleInDocumentAll(Element& element) > } > > template <typename HTMLCollectionClass, CollectionTraversalType traversalType> >-Element* CachedHTMLCollection<HTMLCollectionClass, traversalType>::namedItem(const AtomicString& name) const >+Element* CachedHTMLCollection<HTMLCollectionClass, traversalType>::namedItem(const AtomString& name) const > { > // http://msdn.microsoft.com/workshop/author/dhtml/reference/methods/nameditem.asp > // This method first searches for an object with a matching id >diff --git a/Source/WebCore/html/CheckboxInputType.cpp b/Source/WebCore/html/CheckboxInputType.cpp >index 4103a7a1f9713e61f6a5a38eddf349e0cead5014..4132011dfc0a518d010449ef8cd623f04ed7b4fe 100644 >--- a/Source/WebCore/html/CheckboxInputType.cpp >+++ b/Source/WebCore/html/CheckboxInputType.cpp >@@ -39,7 +39,7 @@ > > namespace WebCore { > >-const AtomicString& CheckboxInputType::formControlType() const >+const AtomString& CheckboxInputType::formControlType() const > { > return InputTypeNames::checkbox(); > } >diff --git a/Source/WebCore/html/CheckboxInputType.h b/Source/WebCore/html/CheckboxInputType.h >index 69a907099eaffc26ec7cc7b44363d4633a9838f7..eb11b1b176ebb5c53035744c55dec4013073f180 100644 >--- a/Source/WebCore/html/CheckboxInputType.h >+++ b/Source/WebCore/html/CheckboxInputType.h >@@ -39,7 +39,7 @@ public: > explicit CheckboxInputType(HTMLInputElement& element) : BaseCheckableInputType(element) { } > > private: >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > bool valueMissing(const String&) const final; > String valueMissingText() const final; > void handleKeyupEvent(KeyboardEvent&) final; >diff --git a/Source/WebCore/html/ColorInputType.cpp b/Source/WebCore/html/ColorInputType.cpp >index 9c07bbd4168418d7695e8d5c929a9a3032a5d812..b949a691f60fdc99c2d7f67fdf8b7753858e3928 100644 >--- a/Source/WebCore/html/ColorInputType.cpp >+++ b/Source/WebCore/html/ColorInputType.cpp >@@ -109,7 +109,7 @@ bool ColorInputType::isPresentingAttachedView() const > return !!m_chooser; > } > >-const AtomicString& ColorInputType::formControlType() const >+const AtomString& ColorInputType::formControlType() const > { > return InputTypeNames::color(); > } >@@ -145,9 +145,9 @@ void ColorInputType::createShadowSubtree() > > Document& document = element()->document(); > auto wrapperElement = HTMLDivElement::create(document); >- wrapperElement->setPseudo(AtomicString("-webkit-color-swatch-wrapper", AtomicString::ConstructFromLiteral)); >+ wrapperElement->setPseudo(AtomString("-webkit-color-swatch-wrapper", AtomString::ConstructFromLiteral)); > auto colorSwatch = HTMLDivElement::create(document); >- colorSwatch->setPseudo(AtomicString("-webkit-color-swatch", AtomicString::ConstructFromLiteral)); >+ colorSwatch->setPseudo(AtomString("-webkit-color-swatch", AtomString::ConstructFromLiteral)); > wrapperElement->appendChild(colorSwatch); > element()->userAgentShadowRoot()->appendChild(wrapperElement); > >diff --git a/Source/WebCore/html/ColorInputType.h b/Source/WebCore/html/ColorInputType.h >index d89236cfce555872b40022a2fabba8a9c0654ae5..9a3c7b717351059e64fe415e9180c452e3a9b3c4 100644 >--- a/Source/WebCore/html/ColorInputType.h >+++ b/Source/WebCore/html/ColorInputType.h >@@ -55,7 +55,7 @@ private: > bool isKeyboardFocusable(KeyboardEvent*) const final; > bool isColorControl() const final; > bool isPresentingAttachedView() const final; >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > bool supportsRequired() const final; > String fallbackValue() const final; > String sanitizeValue(const String&) const final; >diff --git a/Source/WebCore/html/DOMTokenList.cpp b/Source/WebCore/html/DOMTokenList.cpp >index af00911e06ecc57ed38a468322293532c35a6dfa..7af20a3f4ba96c28a1906e5092cb8b91da4c684b 100644 >--- a/Source/WebCore/html/DOMTokenList.cpp >+++ b/Source/WebCore/html/DOMTokenList.cpp >@@ -30,7 +30,7 @@ > #include "SpaceSplitString.h" > #include <wtf/HashSet.h> > #include <wtf/SetForScope.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/StringBuilder.h> > > namespace WebCore { >@@ -68,7 +68,7 @@ ExceptionOr<void> DOMTokenList::validateTokens(const String* tokens, size_t leng > return { }; > } > >-bool DOMTokenList::contains(const AtomicString& token) const >+bool DOMTokenList::contains(const AtomString& token) const > { > return tokens().contains(token); > } >@@ -76,7 +76,7 @@ bool DOMTokenList::contains(const AtomicString& token) const > inline ExceptionOr<void> DOMTokenList::addInternal(const String* newTokens, size_t length) > { > // This is usually called with a single token. >- Vector<AtomicString, 1> uniqueNewTokens; >+ Vector<AtomString, 1> uniqueNewTokens; > uniqueNewTokens.reserveInitialCapacity(length); > > auto& tokens = this->tokens(); >@@ -102,7 +102,7 @@ ExceptionOr<void> DOMTokenList::add(const Vector<String>& tokens) > return addInternal(tokens.data(), tokens.size()); > } > >-ExceptionOr<void> DOMTokenList::add(const AtomicString& token) >+ExceptionOr<void> DOMTokenList::add(const AtomString& token) > { > return addInternal(&token.string(), 1); > } >@@ -127,12 +127,12 @@ ExceptionOr<void> DOMTokenList::remove(const Vector<String>& tokens) > return removeInternal(tokens.data(), tokens.size()); > } > >-ExceptionOr<void> DOMTokenList::remove(const AtomicString& token) >+ExceptionOr<void> DOMTokenList::remove(const AtomString& token) > { > return removeInternal(&token.string(), 1); > } > >-ExceptionOr<bool> DOMTokenList::toggle(const AtomicString& token, Optional<bool> force) >+ExceptionOr<bool> DOMTokenList::toggle(const AtomString& token, Optional<bool> force) > { > auto result = validateToken(token); > if (result.hasException()) >@@ -157,7 +157,7 @@ ExceptionOr<bool> DOMTokenList::toggle(const AtomicString& token, Optional<bool> > return true; > } > >-static inline void replaceInOrderedSet(Vector<AtomicString>& tokens, size_t tokenIndex, const AtomicString& newToken) >+static inline void replaceInOrderedSet(Vector<AtomString>& tokens, size_t tokenIndex, const AtomString& newToken) > { > ASSERT(tokenIndex != notFound); > ASSERT(tokenIndex < tokens.size()); >@@ -179,7 +179,7 @@ static inline void replaceInOrderedSet(Vector<AtomicString>& tokens, size_t toke > } > > // https://dom.spec.whatwg.org/#dom-domtokenlist-replace >-ExceptionOr<bool> DOMTokenList::replace(const AtomicString& token, const AtomicString& newToken) >+ExceptionOr<bool> DOMTokenList::replace(const AtomString& token, const AtomString& newToken) > { > if (token.isEmpty() || newToken.isEmpty()) > return Exception { SyntaxError }; >@@ -210,7 +210,7 @@ ExceptionOr<bool> DOMTokenList::supports(StringView token) > } > > // https://dom.spec.whatwg.org/#dom-domtokenlist-value >-const AtomicString& DOMTokenList::value() const >+const AtomString& DOMTokenList::value() const > { > return m_element.getAttribute(m_attributeName); > } >@@ -225,7 +225,7 @@ void DOMTokenList::updateTokensFromAttributeValue(const String& value) > // Clear tokens but not capacity. > m_tokens.shrink(0); > >- HashSet<AtomicString> addedTokens; >+ HashSet<AtomString> addedTokens; > // https://dom.spec.whatwg.org/#ordered%20sets > for (unsigned start = 0; ; ) { > while (start < value.length() && isHTMLSpace(value[start])) >@@ -236,7 +236,7 @@ void DOMTokenList::updateTokensFromAttributeValue(const String& value) > while (end < value.length() && !isHTMLSpace(value[end])) > ++end; > >- AtomicString token = value.substring(start, end - start); >+ AtomString token = value.substring(start, end - start); > if (!addedTokens.contains(token)) { > m_tokens.append(token); > addedTokens.add(token); >@@ -249,7 +249,7 @@ void DOMTokenList::updateTokensFromAttributeValue(const String& value) > m_tokensNeedUpdating = false; > } > >-void DOMTokenList::associatedAttributeValueChanged(const AtomicString&) >+void DOMTokenList::associatedAttributeValueChanged(const AtomString&) > { > // Do not reset the DOMTokenList value if the attribute value was changed by us. > if (m_inUpdateAssociatedAttributeFromTokens) >@@ -273,13 +273,13 @@ void DOMTokenList::updateAssociatedAttributeFromTokens() > builder.append(' '); > builder.append(token); > } >- AtomicString serializedValue = builder.toAtomicString(); >+ AtomString serializedValue = builder.toAtomString(); > > SetForScope<bool> inAttributeUpdate(m_inUpdateAssociatedAttributeFromTokens, true); > m_element.setAttribute(m_attributeName, serializedValue); > } > >-Vector<AtomicString>& DOMTokenList::tokens() >+Vector<AtomString>& DOMTokenList::tokens() > { > if (m_tokensNeedUpdating) > updateTokensFromAttributeValue(m_element.getAttribute(m_attributeName)); >diff --git a/Source/WebCore/html/DOMTokenList.h b/Source/WebCore/html/DOMTokenList.h >index 8c0267e84d6351f4b1621a1a55b22b734e61f8f0..b32402d037da90d8fea2faad46d97af73d628086 100644 >--- a/Source/WebCore/html/DOMTokenList.h >+++ b/Source/WebCore/html/DOMTokenList.h >@@ -35,34 +35,34 @@ public: > using IsSupportedTokenFunction = WTF::Function<bool(Document&, StringView)>; > DOMTokenList(Element&, const QualifiedName& attributeName, IsSupportedTokenFunction&& isSupportedToken = { }); > >- void associatedAttributeValueChanged(const AtomicString&); >+ void associatedAttributeValueChanged(const AtomString&); > > void ref() { m_element.ref(); } > void deref() { m_element.deref(); } > > unsigned length() const; >- const AtomicString& item(unsigned index) const; >+ const AtomString& item(unsigned index) const; > >- WEBCORE_EXPORT bool contains(const AtomicString&) const; >+ WEBCORE_EXPORT bool contains(const AtomString&) const; > ExceptionOr<void> add(const Vector<String>&); >- ExceptionOr<void> add(const AtomicString&); >+ ExceptionOr<void> add(const AtomString&); > ExceptionOr<void> remove(const Vector<String>&); >- ExceptionOr<void> remove(const AtomicString&); >- WEBCORE_EXPORT ExceptionOr<bool> toggle(const AtomicString&, Optional<bool> force); >- ExceptionOr<bool> replace(const AtomicString& token, const AtomicString& newToken); >+ ExceptionOr<void> remove(const AtomString&); >+ WEBCORE_EXPORT ExceptionOr<bool> toggle(const AtomString&, Optional<bool> force); >+ ExceptionOr<bool> replace(const AtomString& token, const AtomString& newToken); > ExceptionOr<bool> supports(StringView token); > > Element& element() const { return m_element; } > > WEBCORE_EXPORT void setValue(const String&); >- WEBCORE_EXPORT const AtomicString& value() const; >+ WEBCORE_EXPORT const AtomString& value() const; > > private: > void updateTokensFromAttributeValue(const String&); > void updateAssociatedAttributeFromTokens(); > >- WEBCORE_EXPORT Vector<AtomicString>& tokens(); >- const Vector<AtomicString>& tokens() const { return const_cast<DOMTokenList&>(*this).tokens(); } >+ WEBCORE_EXPORT Vector<AtomString>& tokens(); >+ const Vector<AtomString>& tokens() const { return const_cast<DOMTokenList&>(*this).tokens(); } > > static ExceptionOr<void> validateToken(const String&); > static ExceptionOr<void> validateTokens(const String* tokens, size_t length); >@@ -73,7 +73,7 @@ private: > const WebCore::QualifiedName& m_attributeName; > bool m_inUpdateAssociatedAttributeFromTokens { false }; > bool m_tokensNeedUpdating { true }; >- Vector<AtomicString> m_tokens; >+ Vector<AtomString> m_tokens; > IsSupportedTokenFunction m_isSupportedToken; > }; > >@@ -82,7 +82,7 @@ inline unsigned DOMTokenList::length() const > return tokens().size(); > } > >-inline const AtomicString& DOMTokenList::item(unsigned index) const >+inline const AtomString& DOMTokenList::item(unsigned index) const > { > auto& tokens = this->tokens(); > return index < tokens.size() ? tokens[index] : nullAtom(); >diff --git a/Source/WebCore/html/DateInputType.cpp b/Source/WebCore/html/DateInputType.cpp >index c848a87dc670a79bb9a78918d032036712cd669c..79df52d76b37e7fee78029ee78872eae2f0f7fdd 100644 >--- a/Source/WebCore/html/DateInputType.cpp >+++ b/Source/WebCore/html/DateInputType.cpp >@@ -50,7 +50,7 @@ DateInputType::DateInputType(HTMLInputElement& element) > { > } > >-const AtomicString& DateInputType::formControlType() const >+const AtomString& DateInputType::formControlType() const > { > return InputTypeNames::date(); > } >diff --git a/Source/WebCore/html/DateInputType.h b/Source/WebCore/html/DateInputType.h >index 5be1ec3f3f0dd9e701e98166fbdc33a51eddd8b8..0ff702c8629e02895e7e2e2a793d44206670f478 100644 >--- a/Source/WebCore/html/DateInputType.h >+++ b/Source/WebCore/html/DateInputType.h >@@ -41,7 +41,7 @@ public: > explicit DateInputType(HTMLInputElement&); > > private: >- const AtomicString& formControlType() const override; >+ const AtomString& formControlType() const override; > DateComponents::Type dateType() const override; > StepRange createStepRange(AnyStepHandling) const override; > bool parseToDateComponentsInternal(const UChar*, unsigned length, DateComponents*) const override; >diff --git a/Source/WebCore/html/DateTimeInputType.cpp b/Source/WebCore/html/DateTimeInputType.cpp >index ecfd638d6695c2b9ec6d376470ab2ace4ae518e7..5bee39fea7007d252974b8e57646696953141949 100644 >--- a/Source/WebCore/html/DateTimeInputType.cpp >+++ b/Source/WebCore/html/DateTimeInputType.cpp >@@ -45,7 +45,7 @@ static const int dateTimeDefaultStepBase = 0; > static const int dateTimeStepScaleFactor = 1000; > static const StepRange::StepDescription dateTimeStepDescription { dateTimeDefaultStep, dateTimeDefaultStepBase, dateTimeStepScaleFactor, StepRange::ScaledStepValueShouldBeInteger }; > >-const AtomicString& DateTimeInputType::formControlType() const >+const AtomString& DateTimeInputType::formControlType() const > { > return InputTypeNames::datetime(); > } >diff --git a/Source/WebCore/html/DateTimeInputType.h b/Source/WebCore/html/DateTimeInputType.h >index c87ac7b08cf45584a0af4349b5dddffea31c8ab8..ab550e65e2b308f72c59cf76b26abd3b1e56974d 100644 >--- a/Source/WebCore/html/DateTimeInputType.h >+++ b/Source/WebCore/html/DateTimeInputType.h >@@ -42,7 +42,7 @@ public: > explicit DateTimeInputType(HTMLInputElement& element) : BaseDateTimeInputType(element) { } > > private: >- const AtomicString& formControlType() const override; >+ const AtomString& formControlType() const override; > DateComponents::Type dateType() const override; > StepRange createStepRange(AnyStepHandling) const override; > Decimal defaultValueForStepUp() const override; >diff --git a/Source/WebCore/html/DateTimeLocalInputType.cpp b/Source/WebCore/html/DateTimeLocalInputType.cpp >index 7cac1d9cbd633b95419b8e1fbf21b9e21613c98d..f1042f7b0f7cf8791aeb785d40eedef8c217b5ee 100644 >--- a/Source/WebCore/html/DateTimeLocalInputType.cpp >+++ b/Source/WebCore/html/DateTimeLocalInputType.cpp >@@ -46,7 +46,7 @@ static const int dateTimeLocalDefaultStepBase = 0; > static const int dateTimeLocalStepScaleFactor = 1000; > static const StepRange::StepDescription dateTimeLocalStepDescription { dateTimeLocalDefaultStep, dateTimeLocalDefaultStepBase, dateTimeLocalStepScaleFactor, StepRange::ScaledStepValueShouldBeInteger }; > >-const AtomicString& DateTimeLocalInputType::formControlType() const >+const AtomString& DateTimeLocalInputType::formControlType() const > { > return InputTypeNames::datetimelocal(); > } >diff --git a/Source/WebCore/html/DateTimeLocalInputType.h b/Source/WebCore/html/DateTimeLocalInputType.h >index 7a086bc9aee7da9e48b22d61b806213206c09114..340aa9257179bd9759732c4baf769f558bd23d4d 100644 >--- a/Source/WebCore/html/DateTimeLocalInputType.h >+++ b/Source/WebCore/html/DateTimeLocalInputType.h >@@ -41,7 +41,7 @@ public: > explicit DateTimeLocalInputType(HTMLInputElement& element) : BaseChooserOnlyDateAndTimeInputType(element) { } > > private: >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > DateComponents::Type dateType() const final; > double valueAsDate() const final; > ExceptionOr<void> setValueAsDate(double) const final; >diff --git a/Source/WebCore/html/EmailInputType.cpp b/Source/WebCore/html/EmailInputType.cpp >index 42553693988b93dd1b5903f321181df9921293ae..dee5cc4bfa4817682007125a1da9524ec98b8e84 100644 >--- a/Source/WebCore/html/EmailInputType.cpp >+++ b/Source/WebCore/html/EmailInputType.cpp >@@ -52,7 +52,7 @@ static bool isValidEmailAddress(const String& address) > return !matchOffset && matchLength == addressLength; > } > >-const AtomicString& EmailInputType::formControlType() const >+const AtomString& EmailInputType::formControlType() const > { > return InputTypeNames::email(); > } >diff --git a/Source/WebCore/html/EmailInputType.h b/Source/WebCore/html/EmailInputType.h >index 0e2fb97252e0cc09e1f7aacd7d456054f47ebf77..02ad3db3a5e651d7a179f394a761299af2901cd5 100644 >--- a/Source/WebCore/html/EmailInputType.h >+++ b/Source/WebCore/html/EmailInputType.h >@@ -39,7 +39,7 @@ public: > explicit EmailInputType(HTMLInputElement& element) : BaseTextInputType(element) { } > > private: >- const AtomicString& formControlType() const override; >+ const AtomString& formControlType() const override; > bool typeMismatchFor(const String&) const override; > bool typeMismatch() const override; > String typeMismatchText() const override; >diff --git a/Source/WebCore/html/FTPDirectoryDocument.cpp b/Source/WebCore/html/FTPDirectoryDocument.cpp >index 02cc0804ffe2c7dfdd332c9b230181fe731b8911..f5630749f4e2fa8bfffd3713a5f6f119cb60b2fc 100644 >--- a/Source/WebCore/html/FTPDirectoryDocument.cpp >+++ b/Source/WebCore/html/FTPDirectoryDocument.cpp >@@ -112,28 +112,28 @@ void FTPDirectoryDocumentParser::appendEntry(const String& filename, const Strin > auto& document = *this->document(); > > auto rowElement = m_tableElement->insertRow(-1).releaseReturnValue(); >- rowElement->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomicString("ftpDirectoryEntryRow", AtomicString::ConstructFromLiteral)); >+ rowElement->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomString("ftpDirectoryEntryRow", AtomString::ConstructFromLiteral)); > > auto typeElement = HTMLTableCellElement::create(tdTag, document); > typeElement->appendChild(Text::create(document, String(&noBreakSpace, 1))); > if (isDirectory) >- typeElement->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomicString("ftpDirectoryIcon ftpDirectoryTypeDirectory", AtomicString::ConstructFromLiteral)); >+ typeElement->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomString("ftpDirectoryIcon ftpDirectoryTypeDirectory", AtomString::ConstructFromLiteral)); > else >- typeElement->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomicString("ftpDirectoryIcon ftpDirectoryTypeFile", AtomicString::ConstructFromLiteral)); >+ typeElement->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomString("ftpDirectoryIcon ftpDirectoryTypeFile", AtomString::ConstructFromLiteral)); > rowElement->appendChild(typeElement); > > auto nameElement = createTDForFilename(filename); >- nameElement->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomicString("ftpDirectoryFileName", AtomicString::ConstructFromLiteral)); >+ nameElement->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomString("ftpDirectoryFileName", AtomString::ConstructFromLiteral)); > rowElement->appendChild(nameElement); > > auto dateElement = HTMLTableCellElement::create(tdTag, document); > dateElement->appendChild(Text::create(document, date)); >- dateElement->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomicString("ftpDirectoryFileDate", AtomicString::ConstructFromLiteral)); >+ dateElement->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomString("ftpDirectoryFileDate", AtomString::ConstructFromLiteral)); > rowElement->appendChild(dateElement); > > auto sizeElement = HTMLTableCellElement::create(tdTag, document); > sizeElement->appendChild(Text::create(document, size)); >- sizeElement->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomicString("ftpDirectoryFileSize", AtomicString::ConstructFromLiteral)); >+ sizeElement->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomString("ftpDirectoryFileSize", AtomString::ConstructFromLiteral)); > rowElement->appendChild(sizeElement); > } > >@@ -314,7 +314,7 @@ bool FTPDirectoryDocumentParser::loadDocumentTemplate() > } > > m_tableElement = HTMLTableElement::create(document); >- m_tableElement->setAttributeWithoutSynchronization(HTMLNames::idAttr, AtomicString("ftpDirectoryTable", AtomicString::ConstructFromLiteral)); >+ m_tableElement->setAttributeWithoutSynchronization(HTMLNames::idAttr, AtomString("ftpDirectoryTable", AtomString::ConstructFromLiteral)); > > // If we didn't find the table element, lets try to append our own to the body. > // If that fails for some reason, cram it on the end of the document as a last ditch effort. >@@ -336,8 +336,8 @@ void FTPDirectoryDocumentParser::createBasicDocument() > document.appendChild(bodyElement); > > m_tableElement = HTMLTableElement::create(document); >- m_tableElement->setAttributeWithoutSynchronization(HTMLNames::idAttr, AtomicString("ftpDirectoryTable", AtomicString::ConstructFromLiteral)); >- m_tableElement->setAttribute(HTMLNames::styleAttr, AtomicString("width:100%", AtomicString::ConstructFromLiteral)); >+ m_tableElement->setAttributeWithoutSynchronization(HTMLNames::idAttr, AtomString("ftpDirectoryTable", AtomString::ConstructFromLiteral)); >+ m_tableElement->setAttribute(HTMLNames::styleAttr, AtomString("width:100%", AtomString::ConstructFromLiteral)); > > bodyElement->appendChild(*m_tableElement); > >diff --git a/Source/WebCore/html/FileInputType.cpp b/Source/WebCore/html/FileInputType.cpp >index c3240505176e662bb40238896450a8ec3b3a1044..afc258839122738d76f04f6b90acca917f1c392d 100644 >--- a/Source/WebCore/html/FileInputType.cpp >+++ b/Source/WebCore/html/FileInputType.cpp >@@ -89,8 +89,8 @@ Ref<UploadButtonElement> UploadButtonElement::createForMultiple(Document& docume > UploadButtonElement::UploadButtonElement(Document& document) > : HTMLInputElement(inputTag, document, 0, false) > { >- setType(AtomicString("button", AtomicString::ConstructFromLiteral)); >- setPseudo(AtomicString("-webkit-file-upload-button", AtomicString::ConstructFromLiteral)); >+ setType(AtomString("button", AtomString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-file-upload-button", AtomString::ConstructFromLiteral)); > } > > FileInputType::FileInputType(HTMLInputElement& element) >@@ -125,7 +125,7 @@ Vector<FileChooserFileInfo> FileInputType::filesFromFormControlState(const FormC > return files; > } > >-const AtomicString& FileInputType::formControlType() const >+const AtomString& FileInputType::formControlType() const > { > return InputTypeNames::file(); > } >diff --git a/Source/WebCore/html/FileInputType.h b/Source/WebCore/html/FileInputType.h >index c582cacf1b2e946706dc9b474ef0ee38c4dc83b6..826ac28e31e86ed9a1cc99a156d467e94b03155b 100644 >--- a/Source/WebCore/html/FileInputType.h >+++ b/Source/WebCore/html/FileInputType.h >@@ -51,7 +51,7 @@ public: > static Vector<FileChooserFileInfo> filesFromFormControlState(const FormControlState&); > > private: >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > FormControlState saveFormControlState() const final; > void restoreFormControlState(const FormControlState&) final; > bool appendFormData(DOMFormData&, bool) const final; >diff --git a/Source/WebCore/html/FormAssociatedElement.cpp b/Source/WebCore/html/FormAssociatedElement.cpp >index bd42622014db247cbca55b27acfab1f510f9c0ea..806e5f3daebe294e330230dfa5ede8c92d58c318 100644 >--- a/Source/WebCore/html/FormAssociatedElement.cpp >+++ b/Source/WebCore/html/FormAssociatedElement.cpp >@@ -42,7 +42,7 @@ using namespace HTMLNames; > class FormAttributeTargetObserver final : private IdTargetObserver { > WTF_MAKE_FAST_ALLOCATED; > public: >- FormAttributeTargetObserver(const AtomicString& id, FormAssociatedElement&); >+ FormAttributeTargetObserver(const AtomString& id, FormAssociatedElement&); > > private: > void idTargetChanged() override; >@@ -101,7 +101,7 @@ void FormAssociatedElement::removedFromAncestor(Node::RemovalType, ContainerNode > > HTMLFormElement* FormAssociatedElement::findAssociatedForm(const HTMLElement* element, HTMLFormElement* currentAssociatedForm) > { >- const AtomicString& formId(element->attributeWithoutSynchronization(formAttr)); >+ const AtomString& formId(element->attributeWithoutSynchronization(formAttr)); > if (!formId.isNull() && element->isConnected()) { > // The HTML5 spec says that the element should be associated with > // the first element in the document to have an ID that equal to >@@ -287,9 +287,9 @@ void FormAssociatedElement::formAttributeTargetChanged() > resetFormOwner(); > } > >-const AtomicString& FormAssociatedElement::name() const >+const AtomString& FormAssociatedElement::name() const > { >- const AtomicString& name = asHTMLElement().getNameAttribute(); >+ const AtomString& name = asHTMLElement().getNameAttribute(); > return name.isNull() ? emptyAtom() : name; > } > >@@ -298,7 +298,7 @@ bool FormAssociatedElement::isFormControlElementWithState() const > return false; > } > >-FormAttributeTargetObserver::FormAttributeTargetObserver(const AtomicString& id, FormAssociatedElement& element) >+FormAttributeTargetObserver::FormAttributeTargetObserver(const AtomString& id, FormAssociatedElement& element) > : IdTargetObserver(element.asHTMLElement().treeScope().idTargetObserverRegistry(), id) > , m_element(element) > { >diff --git a/Source/WebCore/html/FormAssociatedElement.h b/Source/WebCore/html/FormAssociatedElement.h >index 88639de1c1e968b466a019003d1cb953b6f13ff1..922ed561b02766eabfeaad55f1492e4d8077e100 100644 >--- a/Source/WebCore/html/FormAssociatedElement.h >+++ b/Source/WebCore/html/FormAssociatedElement.h >@@ -58,7 +58,7 @@ public: > // Returns the 'name' attribute value. If this element has no name > // attribute, it returns an empty string instead of null string. > // Note that the 'name' IDL attribute doesn't use this function. >- virtual const AtomicString& name() const; >+ virtual const AtomString& name() const; > > // Override in derived classes to get the encoded name=value pair for submitting. > // Return true for a successful control (see HTML4-17.13.2). >diff --git a/Source/WebCore/html/FormController.cpp b/Source/WebCore/html/FormController.cpp >index 4006d196aae832bf592ec44c36924940f39363fb..b7d1035b7589469b155014410812d1c112aa934b 100644 >--- a/Source/WebCore/html/FormController.cpp >+++ b/Source/WebCore/html/FormController.cpp >@@ -79,13 +79,13 @@ static inline Optional<FormControlState> deserializeFormControlState(const Vecto > > class FormElementKey { > public: >- FormElementKey(AtomicStringImpl* = 0, AtomicStringImpl* = 0); >+ FormElementKey(AtomStringImpl* = 0, AtomStringImpl* = 0); > ~FormElementKey(); > FormElementKey(const FormElementKey&); > FormElementKey& operator=(const FormElementKey&); > >- AtomicStringImpl* name() const { return m_name; } >- AtomicStringImpl* type() const { return m_type; } >+ AtomStringImpl* name() const { return m_name; } >+ AtomStringImpl* type() const { return m_type; } > > // Hash table deleted values, which are only constructed and never copied or destroyed. > FormElementKey(WTF::HashTableDeletedValueType) : m_name(hashTableDeletedValue()) { } >@@ -95,13 +95,13 @@ private: > void ref() const; > void deref() const; > >- static AtomicStringImpl* hashTableDeletedValue() { return reinterpret_cast<AtomicStringImpl*>(-1); } >+ static AtomStringImpl* hashTableDeletedValue() { return reinterpret_cast<AtomStringImpl*>(-1); } > >- AtomicStringImpl* m_name; >- AtomicStringImpl* m_type; >+ AtomStringImpl* m_name; >+ AtomStringImpl* m_type; > }; > >-FormElementKey::FormElementKey(AtomicStringImpl* name, AtomicStringImpl* type) >+FormElementKey::FormElementKey(AtomStringImpl* name, AtomStringImpl* type) > : m_name(name) > , m_type(type) > { >@@ -177,8 +177,8 @@ public: > static std::unique_ptr<SavedFormState> deserialize(const Vector<String>&, size_t& index); > void serializeTo(Vector<String>&) const; > bool isEmpty() const { return m_stateForNewFormElements.isEmpty(); } >- void appendControlState(const AtomicString& name, const AtomicString& type, const FormControlState&); >- FormControlState takeControlState(const AtomicString& name, const AtomicString& type); >+ void appendControlState(const AtomString& name, const AtomString& type, const FormControlState&); >+ FormControlState takeControlState(const AtomString& name, const AtomString& type); > > Vector<String> referencedFilePaths() const; > >@@ -227,13 +227,13 @@ void SavedFormState::serializeTo(Vector<String>& stateVector) const > } > } > >-void SavedFormState::appendControlState(const AtomicString& name, const AtomicString& type, const FormControlState& state) >+void SavedFormState::appendControlState(const AtomString& name, const AtomString& type, const FormControlState& state) > { > m_stateForNewFormElements.add({ name.impl(), type.impl() }, Deque<FormControlState> { }).iterator->value.append(state); > ++m_controlStateCount; > } > >-FormControlState SavedFormState::takeControlState(const AtomicString& name, const AtomicString& type) >+FormControlState SavedFormState::takeControlState(const AtomString& name, const AtomString& type) > { > auto iterator = m_stateForNewFormElements.find({ name.impl(), type.impl() }); > if (iterator == m_stateForNewFormElements.end()) >@@ -268,11 +268,11 @@ class FormKeyGenerator { > > public: > FormKeyGenerator() = default; >- AtomicString formKey(const HTMLFormControlElementWithState&); >+ AtomString formKey(const HTMLFormControlElementWithState&); > void willDeleteForm(HTMLFormElement*); > > private: >- typedef HashMap<HTMLFormElement*, AtomicString> FormToKeyMap; >+ typedef HashMap<HTMLFormElement*, AtomString> FormToKeyMap; > typedef HashMap<String, unsigned> FormSignatureToNextIndexMap; > FormToKeyMap m_formToKeyMap; > FormSignatureToNextIndexMap m_formSignatureToNextIndexMap; >@@ -291,7 +291,7 @@ static inline void recordFormStructure(const HTMLFormElement& form, StringBuilde > RefPtr<HTMLFormControlElementWithState> control = static_cast<HTMLFormControlElementWithState*>(controls[i]); > if (!ownerFormForState(*control)) > continue; >- AtomicString name = control->name(); >+ AtomString name = control->name(); > if (name.isEmpty()) > continue; > namedControls++; >@@ -315,11 +315,11 @@ static inline String formSignature(const HTMLFormElement& form) > return builder.toString(); > } > >-AtomicString FormKeyGenerator::formKey(const HTMLFormControlElementWithState& control) >+AtomString FormKeyGenerator::formKey(const HTMLFormControlElementWithState& control) > { > auto form = makeRefPtr(ownerFormForState(control)); > if (!form) { >- static NeverDestroyed<AtomicString> formKeyForNoOwner("No owner", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> formKeyForNoOwner("No owner", AtomString::ConstructFromLiteral); > return formKeyForNoOwner; > } > >@@ -422,7 +422,7 @@ void FormController::formStatesFromStateVector(const Vector<String>& stateVector > return; > > while (i + 1 < stateVector.size()) { >- AtomicString formKey = stateVector[i++]; >+ AtomString formKey = stateVector[i++]; > auto state = SavedFormState::deserialize(stateVector, i); > if (!state) { > i = 0; >diff --git a/Source/WebCore/html/FormController.h b/Source/WebCore/html/FormController.h >index 45aa43dd1940765357a829b7d6f9ef5aa31e9689..9d5268e8a243d2fc70ad6ccb1ae86e70d3c18ee6 100644 >--- a/Source/WebCore/html/FormController.h >+++ b/Source/WebCore/html/FormController.h >@@ -61,7 +61,7 @@ public: > > private: > typedef ListHashSet<RefPtr<HTMLFormControlElementWithState>> FormElementListHashSet; >- typedef HashMap<RefPtr<AtomicStringImpl>, std::unique_ptr<SavedFormState>> SavedFormStateMap; >+ typedef HashMap<RefPtr<AtomStringImpl>, std::unique_ptr<SavedFormState>> SavedFormStateMap; > > static std::unique_ptr<SavedFormStateMap> createSavedFormStateMap(const FormElementListHashSet&); > FormControlState takeStateForFormElement(const HTMLFormControlElementWithState&); >diff --git a/Source/WebCore/html/HTMLAllCollection.cpp b/Source/WebCore/html/HTMLAllCollection.cpp >index de90367b182fc37b90c55e7e0e3f14b8949b1490..777c4e7f5be8b44f52f0d43888ac62444a97d11b 100644 >--- a/Source/WebCore/html/HTMLAllCollection.cpp >+++ b/Source/WebCore/html/HTMLAllCollection.cpp >@@ -48,7 +48,7 @@ inline HTMLAllCollection::HTMLAllCollection(Document& document, CollectionType t > } > > // https://html.spec.whatwg.org/multipage/infrastructure.html#dom-htmlallcollection-item >-Optional<Variant<RefPtr<HTMLCollection>, RefPtr<Element>>> HTMLAllCollection::namedOrIndexedItemOrItems(const AtomicString& nameOrIndex) const >+Optional<Variant<RefPtr<HTMLCollection>, RefPtr<Element>>> HTMLAllCollection::namedOrIndexedItemOrItems(const AtomString& nameOrIndex) const > { > if (nameOrIndex.isNull()) > return WTF::nullopt; >@@ -60,7 +60,7 @@ Optional<Variant<RefPtr<HTMLCollection>, RefPtr<Element>>> HTMLAllCollection::na > } > > // https://html.spec.whatwg.org/multipage/infrastructure.html#concept-get-all-named >-Optional<Variant<RefPtr<HTMLCollection>, RefPtr<Element>>> HTMLAllCollection::namedItemOrItems(const AtomicString& name) const >+Optional<Variant<RefPtr<HTMLCollection>, RefPtr<Element>>> HTMLAllCollection::namedItemOrItems(const AtomString& name) const > { > auto namedItems = this->namedItems(name); > >diff --git a/Source/WebCore/html/HTMLAllCollection.h b/Source/WebCore/html/HTMLAllCollection.h >index 25fc5a61221ea6ae3c5376e327c6971e5f1c611a..1358416fe3892a99885a6f9f4049cde1d9d37d0b 100644 >--- a/Source/WebCore/html/HTMLAllCollection.h >+++ b/Source/WebCore/html/HTMLAllCollection.h >@@ -33,8 +33,8 @@ class HTMLAllCollection final : public AllDescendantsCollection { > public: > static Ref<HTMLAllCollection> create(Document&, CollectionType); > >- Optional<Variant<RefPtr<HTMLCollection>, RefPtr<Element>>> namedOrIndexedItemOrItems(const AtomicString& nameOrIndex) const; >- Optional<Variant<RefPtr<HTMLCollection>, RefPtr<Element>>> namedItemOrItems(const AtomicString&) const; >+ Optional<Variant<RefPtr<HTMLCollection>, RefPtr<Element>>> namedOrIndexedItemOrItems(const AtomString& nameOrIndex) const; >+ Optional<Variant<RefPtr<HTMLCollection>, RefPtr<Element>>> namedItemOrItems(const AtomString&) const; > > private: > HTMLAllCollection(Document&, CollectionType); >@@ -44,7 +44,7 @@ static_assert(sizeof(HTMLAllCollection) == sizeof(AllDescendantsCollection), "") > class HTMLAllNamedSubCollection final : public CachedHTMLCollection<HTMLAllNamedSubCollection, CollectionTraversalType::Descendants> { > WTF_MAKE_ISO_ALLOCATED(HTMLAllNamedSubCollection); > public: >- static Ref<HTMLAllNamedSubCollection> create(Document& document, CollectionType type, const AtomicString& name) >+ static Ref<HTMLAllNamedSubCollection> create(Document& document, CollectionType type, const AtomString& name) > { > return adoptRef(*new HTMLAllNamedSubCollection(document, type, name)); > } >@@ -53,14 +53,14 @@ public: > bool elementMatches(Element&) const; > > private: >- HTMLAllNamedSubCollection(Document& document, CollectionType type, const AtomicString& name) >+ HTMLAllNamedSubCollection(Document& document, CollectionType type, const AtomString& name) > : CachedHTMLCollection<HTMLAllNamedSubCollection, CollectionTraversalType::Descendants>(document, type) > , m_name(name) > { > ASSERT(type == DocumentAllNamedItems); > } > >- AtomicString m_name; >+ AtomString m_name; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/html/HTMLAnchorElement.cpp b/Source/WebCore/html/HTMLAnchorElement.cpp >index 41abfe3b7b84b179b6d16df662f2e7ae4bf37d55..1047c58eec3536e3d3993a7b6e58625b015952f1 100644 >--- a/Source/WebCore/html/HTMLAnchorElement.cpp >+++ b/Source/WebCore/html/HTMLAnchorElement.cpp >@@ -233,7 +233,7 @@ void HTMLAnchorElement::setActive(bool down, bool pause) > HTMLElement::setActive(down, pause); > } > >-void HTMLAnchorElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLAnchorElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == hrefAttr) { > bool wasLink = isLink(); >@@ -251,9 +251,9 @@ void HTMLAnchorElement::parseAttribute(const QualifiedName& name, const AtomicSt > // Do nothing. > } else if (name == relAttr) { > // Update HTMLAnchorElement::relList() if more rel attributes values are supported. >- static NeverDestroyed<AtomicString> noReferrer("noreferrer", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> noOpener("noopener", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> opener("opener", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> noReferrer("noreferrer", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> noOpener("noopener", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> opener("opener", AtomString::ConstructFromLiteral); > const bool shouldFoldCase = true; > SpaceSplitString relValue(value, shouldFoldCase); > if (relValue.contains(noReferrer)) >@@ -288,7 +288,7 @@ bool HTMLAnchorElement::canStartSelection() const > > bool HTMLAnchorElement::draggable() const > { >- const AtomicString& value = attributeWithoutSynchronization(draggableAttr); >+ const AtomString& value = attributeWithoutSynchronization(draggableAttr); > if (equalLettersIgnoringASCIICase(value, "true")) > return true; > if (equalLettersIgnoringASCIICase(value, "false")) >@@ -301,7 +301,7 @@ URL HTMLAnchorElement::href() const > return document().completeURL(stripLeadingAndTrailingHTMLSpaces(attributeWithoutSynchronization(hrefAttr))); > } > >-void HTMLAnchorElement::setHref(const AtomicString& value) >+void HTMLAnchorElement::setHref(const AtomString& value) > { > setAttributeWithoutSynchronization(hrefAttr, value); > } >@@ -325,7 +325,7 @@ DOMTokenList& HTMLAnchorElement::relList() const > return *m_relList; > } > >-const AtomicString& HTMLAnchorElement::name() const >+const AtomString& HTMLAnchorElement::name() const > { > return getNameAttribute(); > } >@@ -380,7 +380,7 @@ bool HTMLAnchorElement::isSystemPreviewLink() const > if (!RuntimeEnabledFeatures::sharedFeatures().systemPreviewEnabled()) > return false; > >- static NeverDestroyed<AtomicString> systemPreviewRelValue("ar", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> systemPreviewRelValue("ar", AtomString::ConstructFromLiteral); > > if (!relList().contains(systemPreviewRelValue)) > return false; >diff --git a/Source/WebCore/html/HTMLAnchorElement.h b/Source/WebCore/html/HTMLAnchorElement.h >index 4b4bc79048f628da88c6e25509063d86bbfbc3bb..e9d2d880a17ef2e1f8ae13a3006f36d2fa440828 100644 >--- a/Source/WebCore/html/HTMLAnchorElement.h >+++ b/Source/WebCore/html/HTMLAnchorElement.h >@@ -50,9 +50,9 @@ public: > virtual ~HTMLAnchorElement(); > > WEBCORE_EXPORT URL href() const; >- void setHref(const AtomicString&); >+ void setHref(const AtomString&); > >- const AtomicString& name() const; >+ const AtomString& name() const; > > WEBCORE_EXPORT String origin() const; > >@@ -76,7 +76,7 @@ public: > protected: > HTMLAnchorElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > > private: > bool supportsFocus() const override; >diff --git a/Source/WebCore/html/HTMLAppletElement.cpp b/Source/WebCore/html/HTMLAppletElement.cpp >index 9140cb391a04488dafa0c80a5273bba22261f214..c8f5f5da86c8b23f08df008aba46940e2f8d5bbb 100644 >--- a/Source/WebCore/html/HTMLAppletElement.cpp >+++ b/Source/WebCore/html/HTMLAppletElement.cpp >@@ -57,7 +57,7 @@ Ref<HTMLAppletElement> HTMLAppletElement::create(const QualifiedName& tagName, D > return result; > } > >-void HTMLAppletElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLAppletElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == altAttr > || name == archiveAttr >@@ -138,19 +138,19 @@ void HTMLAppletElement::updateWidget(CreatePlugins createPlugins) > paramNames.append("code"); > paramValues.append(attributeWithoutSynchronization(codeAttr).string()); > >- const AtomicString& codeBase = attributeWithoutSynchronization(codebaseAttr); >+ const AtomString& codeBase = attributeWithoutSynchronization(codebaseAttr); > if (!codeBase.isNull()) { > paramNames.append("codeBase"_s); > paramValues.append(codeBase.string()); > } > >- const AtomicString& name = document().isHTMLDocument() ? getNameAttribute() : getIdAttribute(); >+ const AtomString& name = document().isHTMLDocument() ? getNameAttribute() : getIdAttribute(); > if (!name.isNull()) { > paramNames.append("name"); > paramValues.append(name.string()); > } > >- const AtomicString& archive = attributeWithoutSynchronization(archiveAttr); >+ const AtomString& archive = attributeWithoutSynchronization(archiveAttr); > if (!archive.isNull()) { > paramNames.append("archive"_s); > paramValues.append(archive.string()); >@@ -159,7 +159,7 @@ void HTMLAppletElement::updateWidget(CreatePlugins createPlugins) > paramNames.append("baseURL"_s); > paramValues.append(document().baseURL().string()); > >- const AtomicString& mayScript = attributeWithoutSynchronization(mayscriptAttr); >+ const AtomString& mayScript = attributeWithoutSynchronization(mayscriptAttr); > if (!mayScript.isNull()) { > paramNames.append("mayScript"_s); > paramValues.append(mayScript.string()); >diff --git a/Source/WebCore/html/HTMLAppletElement.h b/Source/WebCore/html/HTMLAppletElement.h >index 60dd58112ec6f6ca5003a1102be41a8042abb494..0eddedcbfac272fe9b5188eab564e35e854dfc82 100644 >--- a/Source/WebCore/html/HTMLAppletElement.h >+++ b/Source/WebCore/html/HTMLAppletElement.h >@@ -34,7 +34,7 @@ public: > private: > HTMLAppletElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isURLAttribute(const Attribute&) const final; > > bool rendererIsNeeded(const RenderStyle&) final; >diff --git a/Source/WebCore/html/HTMLAreaElement.cpp b/Source/WebCore/html/HTMLAreaElement.cpp >index bab136e8a1c22b2c977586ac864b840fda100f97..ac0758de83b04882a5d8922fd405548ef956dca2 100644 >--- a/Source/WebCore/html/HTMLAreaElement.cpp >+++ b/Source/WebCore/html/HTMLAreaElement.cpp >@@ -52,7 +52,7 @@ Ref<HTMLAreaElement> HTMLAreaElement::create(const QualifiedName& tagName, Docum > return adoptRef(*new HTMLAreaElement(tagName, document)); > } > >-void HTMLAreaElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLAreaElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == shapeAttr) { > if (equalLettersIgnoringASCIICase(value, "default")) >diff --git a/Source/WebCore/html/HTMLAreaElement.h b/Source/WebCore/html/HTMLAreaElement.h >index cd6fdbca3b22975cfe8a36b3d4f251933f1a6167..8ef466bb84f66c7cc4260fbf241d9c3d5d7b65db 100644 >--- a/Source/WebCore/html/HTMLAreaElement.h >+++ b/Source/WebCore/html/HTMLAreaElement.h >@@ -52,7 +52,7 @@ public: > private: > HTMLAreaElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool supportsFocus() const final; > String target() const final; > bool isKeyboardFocusable(KeyboardEvent*) const final; >diff --git a/Source/WebCore/html/HTMLAttachmentElement.cpp b/Source/WebCore/html/HTMLAttachmentElement.cpp >index c040c198d9d1b70d70ec50ef2a49814ebfd3b110..fcfa784a05cd5055b18e36db5898be70adf72611 100644 >--- a/Source/WebCore/html/HTMLAttachmentElement.cpp >+++ b/Source/WebCore/html/HTMLAttachmentElement.cpp >@@ -156,7 +156,7 @@ bool HTMLAttachmentElement::hasEnclosingImage() const > return is<HTMLImageElement>(shadowHost()); > } > >-void HTMLAttachmentElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLAttachmentElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == progressAttr || name == subtitleAttr || name == titleAttr || name == typeAttr) { > if (auto* renderer = this->renderer()) >diff --git a/Source/WebCore/html/HTMLAttachmentElement.h b/Source/WebCore/html/HTMLAttachmentElement.h >index c84a8bf95df1d49810c4746d98e8a00328887b57..a9bb2475755a28ac2d3179646ab8e3d1a92fbce5 100644 >--- a/Source/WebCore/html/HTMLAttachmentElement.h >+++ b/Source/WebCore/html/HTMLAttachmentElement.h >@@ -83,7 +83,7 @@ private: > #endif > } > bool canContainRangeEndPoint() const final { return false; } >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > RefPtr<File> m_file; > String m_uniqueIdentifier; >diff --git a/Source/WebCore/html/HTMLAudioElement.cpp b/Source/WebCore/html/HTMLAudioElement.cpp >index dd1331b902ff1dfcdfad26b895db01b7da2fde78..cc8d5937f31478877587918eab3129424fef8da2 100644 >--- a/Source/WebCore/html/HTMLAudioElement.cpp >+++ b/Source/WebCore/html/HTMLAudioElement.cpp >@@ -52,7 +52,7 @@ Ref<HTMLAudioElement> HTMLAudioElement::create(const QualifiedName& tagName, Doc > return element; > } > >-Ref<HTMLAudioElement> HTMLAudioElement::createForJSConstructor(Document& document, const AtomicString& src) >+Ref<HTMLAudioElement> HTMLAudioElement::createForJSConstructor(Document& document, const AtomString& src) > { > auto element = create(audioTag, document, false); > element->setAttributeWithoutSynchronization(preloadAttr, "auto"); >diff --git a/Source/WebCore/html/HTMLAudioElement.h b/Source/WebCore/html/HTMLAudioElement.h >index 2713bf249a781ea7da0b6f85fc0f352feb0a3eb0..76f799a1bbe2218ce9361f2172d23095089ee58d 100644 >--- a/Source/WebCore/html/HTMLAudioElement.h >+++ b/Source/WebCore/html/HTMLAudioElement.h >@@ -38,7 +38,7 @@ class HTMLAudioElement final : public HTMLMediaElement { > WTF_MAKE_ISO_ALLOCATED(HTMLAudioElement); > public: > static Ref<HTMLAudioElement> create(const QualifiedName&, Document&, bool); >- static Ref<HTMLAudioElement> createForJSConstructor(Document&, const AtomicString& src); >+ static Ref<HTMLAudioElement> createForJSConstructor(Document&, const AtomString& src); > > private: > HTMLAudioElement(const QualifiedName&, Document&, bool); >diff --git a/Source/WebCore/html/HTMLAudioElement.idl b/Source/WebCore/html/HTMLAudioElement.idl >index e112b6aa47b36a70f3b940c237af206df6e6801a..8db1022d04711c6026b4be1734ef85a79598a065 100644 >--- a/Source/WebCore/html/HTMLAudioElement.idl >+++ b/Source/WebCore/html/HTMLAudioElement.idl >@@ -26,6 +26,6 @@ > [ > Conditional=VIDEO, > ConstructorCallWith=Document, >- NamedConstructor=Audio(optional [AtomicString] DOMString src) >+ NamedConstructor=Audio(optional [AtomString] DOMString src) > ] interface HTMLAudioElement : HTMLMediaElement { > }; >diff --git a/Source/WebCore/html/HTMLBRElement.cpp b/Source/WebCore/html/HTMLBRElement.cpp >index 9956c06e3db87f1993a9805b5872e54e99fb5ffd..7207e7fa87aa7715d159d833ef8f1766b9dac8a1 100644 >--- a/Source/WebCore/html/HTMLBRElement.cpp >+++ b/Source/WebCore/html/HTMLBRElement.cpp >@@ -58,7 +58,7 @@ bool HTMLBRElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLElement::isPresentationAttribute(name); > } > >-void HTMLBRElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLBRElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == clearAttr) { > // If the string is empty, then don't add the clear property. >diff --git a/Source/WebCore/html/HTMLBRElement.h b/Source/WebCore/html/HTMLBRElement.h >index 6adc116d0d759faee32df99407ca1d2bd9e44929..0bb7968c6253c1e292ef84049b79d8eff25e3c22 100644 >--- a/Source/WebCore/html/HTMLBRElement.h >+++ b/Source/WebCore/html/HTMLBRElement.h >@@ -39,7 +39,7 @@ private: > HTMLBRElement(const QualifiedName&, Document&); > > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; > }; >diff --git a/Source/WebCore/html/HTMLBaseElement.cpp b/Source/WebCore/html/HTMLBaseElement.cpp >index fa411c4daf251035d0993f3922ce2f02d49d4eba..aa0688cadfed6f659a37c3be8381dc8cf13c5754 100644 >--- a/Source/WebCore/html/HTMLBaseElement.cpp >+++ b/Source/WebCore/html/HTMLBaseElement.cpp >@@ -46,7 +46,7 @@ Ref<HTMLBaseElement> HTMLBaseElement::create(const QualifiedName& tagName, Docum > return adoptRef(*new HTMLBaseElement(tagName, document)); > } > >-void HTMLBaseElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLBaseElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == hrefAttr || name == targetAttr) > document().processBaseElement(); >@@ -85,7 +85,7 @@ URL HTMLBaseElement::href() const > // base elements like this one can be used to set that base URL. Thus we need to resolve relative to the document's > // URL and ignore the base URL. > >- const AtomicString& attributeValue = attributeWithoutSynchronization(hrefAttr); >+ const AtomString& attributeValue = attributeWithoutSynchronization(hrefAttr); > if (attributeValue.isNull()) > return document().url(); > >@@ -98,7 +98,7 @@ URL HTMLBaseElement::href() const > return url; > } > >-void HTMLBaseElement::setHref(const AtomicString& value) >+void HTMLBaseElement::setHref(const AtomString& value) > { > setAttributeWithoutSynchronization(hrefAttr, value); > } >diff --git a/Source/WebCore/html/HTMLBaseElement.h b/Source/WebCore/html/HTMLBaseElement.h >index 7cb69d98cf919c2d25f14c96feba8f38e4f5ac76..e8bb9d01f585a275d6407412fcd850e70096f7ff 100644 >--- a/Source/WebCore/html/HTMLBaseElement.h >+++ b/Source/WebCore/html/HTMLBaseElement.h >@@ -32,14 +32,14 @@ public: > static Ref<HTMLBaseElement> create(const QualifiedName&, Document&); > > WEBCORE_EXPORT URL href() const; >- WEBCORE_EXPORT void setHref(const AtomicString&); >+ WEBCORE_EXPORT void setHref(const AtomString&); > > private: > HTMLBaseElement(const QualifiedName&, Document&); > > String target() const final; > bool isURLAttribute(const Attribute&) const final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; > void removedFromAncestor(RemovalType, ContainerNode&) final; > }; >diff --git a/Source/WebCore/html/HTMLBodyElement.cpp b/Source/WebCore/html/HTMLBodyElement.cpp >index 9699ca95ff522c79228def40ee8dc64cc887aff9..49a660deb5bcb5c5c8d1e422277a5b74ab8c4901 100644 >--- a/Source/WebCore/html/HTMLBodyElement.cpp >+++ b/Source/WebCore/html/HTMLBodyElement.cpp >@@ -69,7 +69,7 @@ bool HTMLBodyElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLElement::isPresentationAttribute(name); > } > >-void HTMLBodyElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLBodyElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == backgroundAttr) { > String url = stripLeadingAndTrailingHTMLSpaces(value); >@@ -135,13 +135,13 @@ HTMLElement::EventHandlerNameMap HTMLBodyElement::createWindowEventHandlerNameMa > return map; > } > >-const AtomicString& HTMLBodyElement::eventNameForWindowEventHandlerAttribute(const QualifiedName& attributeName) >+const AtomString& HTMLBodyElement::eventNameForWindowEventHandlerAttribute(const QualifiedName& attributeName) > { > static NeverDestroyed<EventHandlerNameMap> map = createWindowEventHandlerNameMap(); > return eventNameForEventHandlerAttribute(attributeName, map.get()); > } > >-void HTMLBodyElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLBodyElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == vlinkAttr || name == alinkAttr || name == linkAttr) { > if (value.isNull()) { >diff --git a/Source/WebCore/html/HTMLBodyElement.h b/Source/WebCore/html/HTMLBodyElement.h >index 45b0fbc53cb0c1d7e32e139adac698693d104048..f6a801db40406deb16f9d77e35032f27f9355d02 100644 >--- a/Source/WebCore/html/HTMLBodyElement.h >+++ b/Source/WebCore/html/HTMLBodyElement.h >@@ -34,14 +34,14 @@ public: > static Ref<HTMLBodyElement> create(const QualifiedName&, Document&); > virtual ~HTMLBodyElement(); > >- static const AtomicString& eventNameForWindowEventHandlerAttribute(const QualifiedName& attributeName); >+ static const AtomString& eventNameForWindowEventHandlerAttribute(const QualifiedName& attributeName); > > private: > HTMLBodyElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; > void didFinishInsertingNode() final; >diff --git a/Source/WebCore/html/HTMLButtonElement.cpp b/Source/WebCore/html/HTMLButtonElement.cpp >index ed82b692b23274ed1a6c16143031901e1af510d8..d282957f21f045e41dac46aa15c5d01c36ff3a37 100644 >--- a/Source/WebCore/html/HTMLButtonElement.cpp >+++ b/Source/WebCore/html/HTMLButtonElement.cpp >@@ -55,7 +55,7 @@ Ref<HTMLButtonElement> HTMLButtonElement::create(const QualifiedName& tagName, D > return adoptRef(*new HTMLButtonElement(tagName, document, form)); > } > >-void HTMLButtonElement::setType(const AtomicString& type) >+void HTMLButtonElement::setType(const AtomString& type) > { > setAttributeWithoutSynchronization(typeAttr, type); > } >@@ -65,19 +65,19 @@ RenderPtr<RenderElement> HTMLButtonElement::createElementRenderer(RenderStyle&& > return createRenderer<RenderButton>(*this, WTFMove(style)); > } > >-const AtomicString& HTMLButtonElement::formControlType() const >+const AtomString& HTMLButtonElement::formControlType() const > { > switch (m_type) { > case SUBMIT: { >- static NeverDestroyed<const AtomicString> submit("submit", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> submit("submit", AtomString::ConstructFromLiteral); > return submit; > } > case BUTTON: { >- static NeverDestroyed<const AtomicString> button("button", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> button("button", AtomString::ConstructFromLiteral); > return button; > } > case RESET: { >- static NeverDestroyed<const AtomicString> reset("reset", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> reset("reset", AtomString::ConstructFromLiteral); > return reset; > } > } >@@ -97,7 +97,7 @@ bool HTMLButtonElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLFormControlElement::isPresentationAttribute(name); > } > >-void HTMLButtonElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLButtonElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == typeAttr) { > Type oldType = m_type; >@@ -218,7 +218,7 @@ bool HTMLButtonElement::isURLAttribute(const Attribute& attribute) const > return attribute.name() == formactionAttr || HTMLFormControlElement::isURLAttribute(attribute); > } > >-const AtomicString& HTMLButtonElement::value() const >+const AtomString& HTMLButtonElement::value() const > { > return attributeWithoutSynchronization(valueAttr); > } >diff --git a/Source/WebCore/html/HTMLButtonElement.h b/Source/WebCore/html/HTMLButtonElement.h >index 19df246676b3abe23cea002faad4054ceb1cd387..6f013f7cc5cf63900b0e51166701ddfe83aeee1e 100644 >--- a/Source/WebCore/html/HTMLButtonElement.h >+++ b/Source/WebCore/html/HTMLButtonElement.h >@@ -34,9 +34,9 @@ class HTMLButtonElement final : public HTMLFormControlElement { > public: > static Ref<HTMLButtonElement> create(const QualifiedName&, Document&, HTMLFormElement*); > >- WEBCORE_EXPORT void setType(const AtomicString&); >+ WEBCORE_EXPORT void setType(const AtomString&); > >- const AtomicString& value() const; >+ const AtomString& value() const; > > bool willRespondToMouseClickEvents() final; > >@@ -47,11 +47,11 @@ private: > > enum Type { SUBMIT, RESET, BUTTON }; > >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isPresentationAttribute(const QualifiedName&) const final; > void defaultEventHandler(Event&) final; > >diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp >index 231acfe2d3b2d0d95513dd8a0ec90ae0113e0b49..9bc967a25d0d1ac9391b6b1850e9bbdf8b7d3383 100644 >--- a/Source/WebCore/html/HTMLCanvasElement.cpp >+++ b/Source/WebCore/html/HTMLCanvasElement.cpp >@@ -151,7 +151,7 @@ HTMLCanvasElement::~HTMLCanvasElement() > releaseImageBufferAndContext(); > } > >-void HTMLCanvasElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLCanvasElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == widthAttr || name == heightAttr) > reset(); >@@ -180,7 +180,7 @@ ExceptionOr<void> HTMLCanvasElement::setHeight(unsigned value) > { > if (m_context && m_context->isPlaceholder()) > return Exception { InvalidStateError }; >- setAttributeWithoutSynchronization(heightAttr, AtomicString::number(limitToOnlyHTMLNonNegative(value, defaultHeight))); >+ setAttributeWithoutSynchronization(heightAttr, AtomString::number(limitToOnlyHTMLNonNegative(value, defaultHeight))); > return { }; > } > >@@ -188,7 +188,7 @@ ExceptionOr<void> HTMLCanvasElement::setWidth(unsigned value) > { > if (m_context && m_context->isPlaceholder()) > return Exception { InvalidStateError }; >- setAttributeWithoutSynchronization(widthAttr, AtomicString::number(limitToOnlyHTMLNonNegative(value, defaultWidth))); >+ setAttributeWithoutSynchronization(widthAttr, AtomString::number(limitToOnlyHTMLNonNegative(value, defaultWidth))); > return { }; > } > >diff --git a/Source/WebCore/html/HTMLCanvasElement.h b/Source/WebCore/html/HTMLCanvasElement.h >index 7b52b8f3b7241cddc17547e2b13d5fc3589fa7f6..04148b83583226861b4b332a0f18b81d0f1dea9e 100644 >--- a/Source/WebCore/html/HTMLCanvasElement.h >+++ b/Source/WebCore/html/HTMLCanvasElement.h >@@ -157,7 +157,7 @@ private: > > bool isHTMLCanvasElement() const final { return true; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; > > bool canContainRangeEndPoint() const final; >diff --git a/Source/WebCore/html/HTMLCollection.cpp b/Source/WebCore/html/HTMLCollection.cpp >index 3af95ca391103b05e2d5bc8301bfe4ac114c0da5..976c8e0a9a06a9b83d6ca941bd5dd37b9f3385c5 100644 >--- a/Source/WebCore/html/HTMLCollection.cpp >+++ b/Source/WebCore/html/HTMLCollection.cpp >@@ -159,7 +159,7 @@ void HTMLCollection::invalidateNamedElementCache(Document& document) const > } > } > >-Element* HTMLCollection::namedItemSlow(const AtomicString& name) const >+Element* HTMLCollection::namedItemSlow(const AtomString& name) const > { > // The pathological case. We need to walk the entire subtree. > updateNamedElementCache(); >@@ -179,7 +179,7 @@ Element* HTMLCollection::namedItemSlow(const AtomicString& name) const > } > > // Documented in https://dom.spec.whatwg.org/#interface-htmlcollection. >-const Vector<AtomicString>& HTMLCollection::supportedPropertyNames() >+const Vector<AtomString>& HTMLCollection::supportedPropertyNames() > { > updateNamedElementCache(); > ASSERT(m_namedElementCache); >@@ -210,12 +210,12 @@ void HTMLCollection::updateNamedElementCache() const > unsigned size = length(); > for (unsigned i = 0; i < size; ++i) { > Element& element = *item(i); >- const AtomicString& id = element.getIdAttribute(); >+ const AtomString& id = element.getIdAttribute(); > if (!id.isEmpty()) > cache->appendToIdCache(id, element); > if (!is<HTMLElement>(element)) > continue; >- const AtomicString& name = element.getNameAttribute(); >+ const AtomString& name = element.getNameAttribute(); > if (!name.isEmpty() && id != name && (type() != DocAll || nameShouldBeVisibleInDocumentAll(downcast<HTMLElement>(element)))) > cache->appendToNameCache(name, element); > } >@@ -223,7 +223,7 @@ void HTMLCollection::updateNamedElementCache() const > setNamedItemCache(WTFMove(cache)); > } > >-Vector<Ref<Element>> HTMLCollection::namedItems(const AtomicString& name) const >+Vector<Ref<Element>> HTMLCollection::namedItems(const AtomString& name) const > { > // FIXME: This non-virtual function can't possibly be doing the correct thing for > // any derived class that overrides the virtual namedItem function. >diff --git a/Source/WebCore/html/HTMLCollection.h b/Source/WebCore/html/HTMLCollection.h >index 4fec76d2973adcdb2c707ac5e3701e5f8ff93fac..f008f3378dab3a681f3e829d81ccbbda9eadbd74 100644 >--- a/Source/WebCore/html/HTMLCollection.h >+++ b/Source/WebCore/html/HTMLCollection.h >@@ -34,25 +34,25 @@ class Element; > class CollectionNamedElementCache { > WTF_MAKE_FAST_ALLOCATED; > public: >- const Vector<Element*>* findElementsWithId(const AtomicString& id) const; >- const Vector<Element*>* findElementsWithName(const AtomicString& name) const; >- const Vector<AtomicString>& propertyNames() const { return m_propertyNames; } >+ const Vector<Element*>* findElementsWithId(const AtomString& id) const; >+ const Vector<Element*>* findElementsWithName(const AtomString& name) const; >+ const Vector<AtomString>& propertyNames() const { return m_propertyNames; } > >- void appendToIdCache(const AtomicString& id, Element&); >- void appendToNameCache(const AtomicString& name, Element&); >+ void appendToIdCache(const AtomString& id, Element&); >+ void appendToNameCache(const AtomString& name, Element&); > void didPopulate(); > > size_t memoryCost() const; > > private: >- typedef HashMap<AtomicStringImpl*, Vector<Element*>> StringToElementsMap; >+ typedef HashMap<AtomStringImpl*, Vector<Element*>> StringToElementsMap; > >- const Vector<Element*>* find(const StringToElementsMap&, const AtomicString& key) const; >- void append(StringToElementsMap&, const AtomicString& key, Element&); >+ const Vector<Element*>* find(const StringToElementsMap&, const AtomString& key) const; >+ void append(StringToElementsMap&, const AtomString& key, Element&); > > StringToElementsMap m_idMap; > StringToElementsMap m_nameMap; >- Vector<AtomicString> m_propertyNames; >+ Vector<AtomString> m_propertyNames; > > #if !ASSERT_DISABLED > bool m_didPopulate { false }; >@@ -67,12 +67,12 @@ public: > > // DOM API > Element* item(unsigned index) const override = 0; // Tighten return type from NodeList::item(). >- virtual Element* namedItem(const AtomicString& name) const = 0; >- const Vector<AtomicString>& supportedPropertyNames(); >+ virtual Element* namedItem(const AtomString& name) const = 0; >+ const Vector<AtomString>& supportedPropertyNames(); > bool isSupportedPropertyName(const String& name); > > // Non-DOM API >- Vector<Ref<Element>> namedItems(const AtomicString& name) const; >+ Vector<Ref<Element>> namedItems(const AtomString& name) const; > size_t memoryCost() const override; > > bool isRootedAtDocument() const; >@@ -90,7 +90,7 @@ protected: > HTMLCollection(ContainerNode& base, CollectionType); > > virtual void updateNamedElementCache() const; >- WEBCORE_EXPORT Element* namedItemSlow(const AtomicString& name) const; >+ WEBCORE_EXPORT Element* namedItemSlow(const AtomString& name) const; > > void setNamedItemCache(std::unique_ptr<CollectionNamedElementCache>) const; > const CollectionNamedElementCache& namedItemCaches() const; >@@ -121,22 +121,22 @@ inline ContainerNode& HTMLCollection::rootNode() const > return ownerNode(); > } > >-inline const Vector<Element*>* CollectionNamedElementCache::findElementsWithId(const AtomicString& id) const >+inline const Vector<Element*>* CollectionNamedElementCache::findElementsWithId(const AtomString& id) const > { > return find(m_idMap, id); > } > >-inline const Vector<Element*>* CollectionNamedElementCache::findElementsWithName(const AtomicString& name) const >+inline const Vector<Element*>* CollectionNamedElementCache::findElementsWithName(const AtomString& name) const > { > return find(m_nameMap, name); > } > >-inline void CollectionNamedElementCache::appendToIdCache(const AtomicString& id, Element& element) >+inline void CollectionNamedElementCache::appendToIdCache(const AtomString& id, Element& element) > { > append(m_idMap, id, element); > } > >-inline void CollectionNamedElementCache::appendToNameCache(const AtomicString& name, Element& element) >+inline void CollectionNamedElementCache::appendToNameCache(const AtomString& name, Element& element) > { > append(m_nameMap, name, element); > } >@@ -145,7 +145,7 @@ inline size_t CollectionNamedElementCache::memoryCost() const > { > // memoryCost() may be invoked concurrently from a GC thread, and we need to be careful about what data we access here and how. > // It is safe to access m_idMap.size(), m_nameMap.size(), and m_propertyNames.size() because they don't chase pointers. >- return (m_idMap.size() + m_nameMap.size()) * sizeof(Element*) + m_propertyNames.size() * sizeof(AtomicString); >+ return (m_idMap.size() + m_nameMap.size()) * sizeof(Element*) + m_propertyNames.size() * sizeof(AtomString); > } > > inline void CollectionNamedElementCache::didPopulate() >@@ -157,14 +157,14 @@ inline void CollectionNamedElementCache::didPopulate() > reportExtraMemoryAllocatedForCollectionIndexCache(cost); > } > >-inline const Vector<Element*>* CollectionNamedElementCache::find(const StringToElementsMap& map, const AtomicString& key) const >+inline const Vector<Element*>* CollectionNamedElementCache::find(const StringToElementsMap& map, const AtomString& key) const > { > ASSERT(m_didPopulate); > auto it = map.find(key.impl()); > return it != map.end() ? &it->value : nullptr; > } > >-inline void CollectionNamedElementCache::append(StringToElementsMap& map, const AtomicString& key, Element& element) >+inline void CollectionNamedElementCache::append(StringToElementsMap& map, const AtomString& key, Element& element) > { > if (!m_idMap.contains(key.impl()) && !m_nameMap.contains(key.impl())) > m_propertyNames.append(key); >diff --git a/Source/WebCore/html/HTMLDetailsElement.cpp b/Source/WebCore/html/HTMLDetailsElement.cpp >index 3aac1941109904d894c00cacb53593cf66df42fe..f157874e6d534e3f6134e4a5df4f51be2f67a31a 100644 >--- a/Source/WebCore/html/HTMLDetailsElement.cpp >+++ b/Source/WebCore/html/HTMLDetailsElement.cpp >@@ -49,16 +49,16 @@ static DetailEventSender& detailToggleEventSender() > return sharedToggleEventSender; > } > >-static const AtomicString& summarySlotName() >+static const AtomString& summarySlotName() > { >- static NeverDestroyed<AtomicString> summarySlot("summarySlot"); >+ static NeverDestroyed<AtomString> summarySlot("summarySlot"); > return summarySlot; > } > > class DetailsSlotAssignment final : public SlotAssignment { > private: > void hostChildElementDidChange(const Element&, ShadowRoot&) override; >- const AtomicString& slotNameForHostChild(const Node&) const override; >+ const AtomString& slotNameForHostChild(const Node&) const override; > }; > > void DetailsSlotAssignment::hostChildElementDidChange(const Element& childElement, ShadowRoot& shadowRoot) >@@ -71,7 +71,7 @@ void DetailsSlotAssignment::hostChildElementDidChange(const Element& childElemen > didChangeSlot(SlotAssignment::defaultSlotName(), shadowRoot); > } > >-const AtomicString& DetailsSlotAssignment::slotNameForHostChild(const Node& child) const >+const AtomString& DetailsSlotAssignment::slotNameForHostChild(const Node& child) const > { > auto& parent = *child.parentNode(); > ASSERT(is<HTMLDetailsElement>(parent)); >@@ -145,7 +145,7 @@ void HTMLDetailsElement::dispatchPendingEvent(DetailEventSender* eventSender) > dispatchEvent(Event::create(eventNames().toggleEvent, Event::CanBubble::No, Event::IsCancelable::No)); > } > >-void HTMLDetailsElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLDetailsElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == openAttr) { > bool oldValue = m_isOpen; >diff --git a/Source/WebCore/html/HTMLDetailsElement.h b/Source/WebCore/html/HTMLDetailsElement.h >index fd1450e086fdc73f5899849c1bb57ca7688d8885..7b78eb18b2aed911eb610dbdd318e74c5e15a8e9 100644 >--- a/Source/WebCore/html/HTMLDetailsElement.h >+++ b/Source/WebCore/html/HTMLDetailsElement.h >@@ -47,7 +47,7 @@ private: > HTMLDetailsElement(const QualifiedName&, Document&); > > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > void didAddUserAgentShadowRoot(ShadowRoot&) final; > bool hasCustomFocusLogic() const final { return true; } >diff --git a/Source/WebCore/html/HTMLDivElement.cpp b/Source/WebCore/html/HTMLDivElement.cpp >index 8345099f8b1260efa7bcce5733f1bb9b3b2ce0c9..d89e789c38eb522e4c6c2601a36546d2680d1876 100644 >--- a/Source/WebCore/html/HTMLDivElement.cpp >+++ b/Source/WebCore/html/HTMLDivElement.cpp >@@ -50,7 +50,7 @@ Ref<HTMLDivElement> HTMLDivElement::create(const QualifiedName& tagName, Documen > return adoptRef(*new HTMLDivElement(tagName, document)); > } > >-void HTMLDivElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLDivElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == alignAttr) { > if (equalLettersIgnoringASCIICase(value, "middle") || equalLettersIgnoringASCIICase(value, "center")) >diff --git a/Source/WebCore/html/HTMLDivElement.h b/Source/WebCore/html/HTMLDivElement.h >index 513acfab71a46fe3ba5c509f898493514a440124..a27cb10fdc22d5a9bb786f1fa20c6926fd49bc75 100644 >--- a/Source/WebCore/html/HTMLDivElement.h >+++ b/Source/WebCore/html/HTMLDivElement.h >@@ -36,7 +36,7 @@ protected: > HTMLDivElement(const QualifiedName&, Document&); > > private: >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/html/HTMLDocument.cpp b/Source/WebCore/html/HTMLDocument.cpp >index 0c7d39003831da4b29e77f641910b4d81bd1dc80..0411410a74dca69ef49c8b16e286966695d5e306 100644 >--- a/Source/WebCore/html/HTMLDocument.cpp >+++ b/Source/WebCore/html/HTMLDocument.cpp >@@ -115,7 +115,7 @@ Ref<DocumentParser> HTMLDocument::createParser() > } > > // https://html.spec.whatwg.org/multipage/dom.html#dom-document-nameditem >-Optional<Variant<RefPtr<WindowProxy>, RefPtr<Element>, RefPtr<HTMLCollection>>> HTMLDocument::namedItem(const AtomicString& name) >+Optional<Variant<RefPtr<WindowProxy>, RefPtr<Element>, RefPtr<HTMLCollection>>> HTMLDocument::namedItem(const AtomString& name) > { > if (name.isNull() || !hasDocumentNamedItem(*name.impl())) > return WTF::nullopt; >@@ -135,7 +135,7 @@ Optional<Variant<RefPtr<WindowProxy>, RefPtr<Element>, RefPtr<HTMLCollection>>> > return Variant<RefPtr<WindowProxy>, RefPtr<Element>, RefPtr<HTMLCollection>> { RefPtr<Element> { &element } }; > } > >-Vector<AtomicString> HTMLDocument::supportedPropertyNames() const >+Vector<AtomString> HTMLDocument::supportedPropertyNames() const > { > // https://html.spec.whatwg.org/multipage/dom.html#dom-document-namedItem-which > // >@@ -155,23 +155,23 @@ Vector<AtomicString> HTMLDocument::supportedPropertyNames() const > return { }; > } > >-void HTMLDocument::addDocumentNamedItem(const AtomicStringImpl& name, Element& item) >+void HTMLDocument::addDocumentNamedItem(const AtomStringImpl& name, Element& item) > { > m_documentNamedItem.add(name, item, *this); >- addImpureProperty(AtomicString(const_cast<AtomicStringImpl*>(&name))); >+ addImpureProperty(AtomString(const_cast<AtomStringImpl*>(&name))); > } > >-void HTMLDocument::removeDocumentNamedItem(const AtomicStringImpl& name, Element& item) >+void HTMLDocument::removeDocumentNamedItem(const AtomStringImpl& name, Element& item) > { > m_documentNamedItem.remove(name, item); > } > >-void HTMLDocument::addWindowNamedItem(const AtomicStringImpl& name, Element& item) >+void HTMLDocument::addWindowNamedItem(const AtomStringImpl& name, Element& item) > { > m_windowNamedItem.add(name, item, *this); > } > >-void HTMLDocument::removeWindowNamedItem(const AtomicStringImpl& name, Element& item) >+void HTMLDocument::removeWindowNamedItem(const AtomStringImpl& name, Element& item) > { > m_windowNamedItem.remove(name, item); > } >@@ -228,7 +228,7 @@ bool HTMLDocument::isCaseSensitiveAttribute(const QualifiedName& attributeName) > &valuetypeAttr.get(), > &vlinkAttr.get(), > }; >- HashSet<AtomicString> set; >+ HashSet<AtomString> set; > for (auto* name : names) > set.add(name->localName()); > return set; >diff --git a/Source/WebCore/html/HTMLDocument.h b/Source/WebCore/html/HTMLDocument.h >index 502b2233616cb3cb750777b3c95348fef69c3b1e..ab987beac3e7f934e2e9f3c21afe309e32083228 100644 >--- a/Source/WebCore/html/HTMLDocument.h >+++ b/Source/WebCore/html/HTMLDocument.h >@@ -36,20 +36,20 @@ public: > WEBCORE_EXPORT int width(); > WEBCORE_EXPORT int height(); > >- Optional<Variant<RefPtr<WindowProxy>, RefPtr<Element>, RefPtr<HTMLCollection>>> namedItem(const AtomicString&); >- Vector<AtomicString> supportedPropertyNames() const; >+ Optional<Variant<RefPtr<WindowProxy>, RefPtr<Element>, RefPtr<HTMLCollection>>> namedItem(const AtomString&); >+ Vector<AtomString> supportedPropertyNames() const; > >- Element* documentNamedItem(const AtomicStringImpl& name) const { return m_documentNamedItem.getElementByDocumentNamedItem(name, *this); } >- bool hasDocumentNamedItem(const AtomicStringImpl& name) const { return m_documentNamedItem.contains(name); } >- bool documentNamedItemContainsMultipleElements(const AtomicStringImpl& name) const { return m_documentNamedItem.containsMultiple(name); } >- void addDocumentNamedItem(const AtomicStringImpl&, Element&); >- void removeDocumentNamedItem(const AtomicStringImpl&, Element&); >+ Element* documentNamedItem(const AtomStringImpl& name) const { return m_documentNamedItem.getElementByDocumentNamedItem(name, *this); } >+ bool hasDocumentNamedItem(const AtomStringImpl& name) const { return m_documentNamedItem.contains(name); } >+ bool documentNamedItemContainsMultipleElements(const AtomStringImpl& name) const { return m_documentNamedItem.containsMultiple(name); } >+ void addDocumentNamedItem(const AtomStringImpl&, Element&); >+ void removeDocumentNamedItem(const AtomStringImpl&, Element&); > >- Element* windowNamedItem(const AtomicStringImpl& name) const { return m_windowNamedItem.getElementByWindowNamedItem(name, *this); } >- bool hasWindowNamedItem(const AtomicStringImpl& name) const { return m_windowNamedItem.contains(name); } >- bool windowNamedItemContainsMultipleElements(const AtomicStringImpl& name) const { return m_windowNamedItem.containsMultiple(name); } >- void addWindowNamedItem(const AtomicStringImpl&, Element&); >- void removeWindowNamedItem(const AtomicStringImpl&, Element&); >+ Element* windowNamedItem(const AtomStringImpl& name) const { return m_windowNamedItem.getElementByWindowNamedItem(name, *this); } >+ bool hasWindowNamedItem(const AtomStringImpl& name) const { return m_windowNamedItem.contains(name); } >+ bool windowNamedItemContainsMultipleElements(const AtomStringImpl& name) const { return m_windowNamedItem.containsMultiple(name); } >+ void addWindowNamedItem(const AtomStringImpl&, Element&); >+ void removeWindowNamedItem(const AtomStringImpl&, Element&); > > static bool isCaseSensitiveAttribute(const QualifiedName&); > >diff --git a/Source/WebCore/html/HTMLElement.cpp b/Source/WebCore/html/HTMLElement.cpp >index e3ee808cf3ee0d1ee1ecf0f7723e66220cc1e163..82c22d419dd876fb0c8842a38dc9a446f1394842 100644 >--- a/Source/WebCore/html/HTMLElement.cpp >+++ b/Source/WebCore/html/HTMLElement.cpp >@@ -84,7 +84,7 @@ Ref<HTMLElement> HTMLElement::create(const QualifiedName& tagName, Document& doc > > String HTMLElement::nodeName() const > { >- // FIXME: Would be nice to have an AtomicString lookup based off uppercase >+ // FIXME: Would be nice to have an AtomString lookup based off uppercase > // ASCII characters that does not have to copy the string on a hit in the hash. > if (document().isHTMLDocument()) { > if (LIKELY(!tagQName().hasPrefix())) >@@ -103,7 +103,7 @@ static inline CSSValueID unicodeBidiAttributeForDirAuto(HTMLElement& element) > return CSSValueIsolate; > } > >-unsigned HTMLElement::parseBorderWidthAttribute(const AtomicString& value) const >+unsigned HTMLElement::parseBorderWidthAttribute(const AtomString& value) const > { > if (auto optionalBorderWidth = parseHTMLNonNegativeInteger(value)) > return optionalBorderWidth.value(); >@@ -111,13 +111,13 @@ unsigned HTMLElement::parseBorderWidthAttribute(const AtomicString& value) const > return hasTagName(tableTag) ? 1 : 0; > } > >-void HTMLElement::applyBorderAttributeToStyle(const AtomicString& value, MutableStyleProperties& style) >+void HTMLElement::applyBorderAttributeToStyle(const AtomString& value, MutableStyleProperties& style) > { > addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderWidth, parseBorderWidthAttribute(value), CSSPrimitiveValue::CSS_PX); > addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderStyle, CSSValueSolid); > } > >-void HTMLElement::mapLanguageAttributeToLocale(const AtomicString& value, MutableStyleProperties& style) >+void HTMLElement::mapLanguageAttributeToLocale(const AtomString& value, MutableStyleProperties& style) > { > if (!value.isEmpty()) { > // Have to quote so the locale id is treated as a string instead of as a CSS keyword. >@@ -135,7 +135,7 @@ bool HTMLElement::isPresentationAttribute(const QualifiedName& name) const > return StyledElement::isPresentationAttribute(name); > } > >-static bool isLTROrRTLIgnoringCase(const AtomicString& dirAttributeValue) >+static bool isLTROrRTLIgnoringCase(const AtomString& dirAttributeValue) > { > return equalLettersIgnoringASCIICase(dirAttributeValue, "rtl") || equalLettersIgnoringASCIICase(dirAttributeValue, "ltr"); > } >@@ -147,7 +147,7 @@ enum class ContentEditableType { > PlaintextOnly > }; > >-static inline ContentEditableType contentEditableType(const AtomicString& value) >+static inline ContentEditableType contentEditableType(const AtomString& value) > { > if (value.isNull()) > return ContentEditableType::Inherit; >@@ -166,7 +166,7 @@ static ContentEditableType contentEditableType(const HTMLElement& element) > return contentEditableType(element.attributeWithoutSynchronization(contenteditableAttr)); > } > >-void HTMLElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == alignAttr) { > if (equalLettersIgnoringASCIICase(value, "middle")) >@@ -347,7 +347,7 @@ HTMLElement::EventHandlerNameMap HTMLElement::createEventHandlerNameMap() > > struct UnusualMapping { > const QualifiedName& attributeName; >- const AtomicString& eventName; >+ const AtomString& eventName; > }; > > const UnusualMapping unusualPairsTable[] = { >@@ -374,13 +374,13 @@ void HTMLElement::populateEventHandlerNameMap(EventHandlerNameMap& map, const Qu > > // Remove the "on" prefix. Requires some memory allocation and computing a hash, but by not > // using pointers from eventNames(), the passed-in table can be initialized at compile time. >- AtomicString eventName = attributeName.string().substring(2); >+ AtomString eventName = attributeName.string().substring(2); > > map.add(attributeName.impl(), WTFMove(eventName)); > } > } > >-const AtomicString& HTMLElement::eventNameForEventHandlerAttribute(const QualifiedName& attributeName, const EventHandlerNameMap& map) >+const AtomString& HTMLElement::eventNameForEventHandlerAttribute(const QualifiedName& attributeName, const EventHandlerNameMap& map) > { > ASSERT(!attributeName.localName().isNull()); > >@@ -389,7 +389,7 @@ const AtomicString& HTMLElement::eventNameForEventHandlerAttribute(const Qualifi > return nullAtom(); > > // Fast early return for names that don't start with "on". >- AtomicStringImpl& localName = *attributeName.localName().impl(); >+ AtomStringImpl& localName = *attributeName.localName().impl(); > if (localName.length() < 3 || localName[0] != 'o' || localName[1] != 'n') > return nullAtom(); > >@@ -397,7 +397,7 @@ const AtomicString& HTMLElement::eventNameForEventHandlerAttribute(const Qualifi > return it == map.end() ? nullAtom() : it->value; > } > >-const AtomicString& HTMLElement::eventNameForEventHandlerAttribute(const QualifiedName& attributeName) >+const AtomString& HTMLElement::eventNameForEventHandlerAttribute(const QualifiedName& attributeName) > { > static NeverDestroyed<EventHandlerNameMap> map = createEventHandlerNameMap(); > return eventNameForEventHandlerAttribute(attributeName, map.get()); >@@ -436,7 +436,7 @@ bool HTMLElement::matchesReadWritePseudoClass() const > return editabilityFromContentEditableAttr(*this) != Editability::ReadOnly; > } > >-void HTMLElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == dirAttr) { > dirAttributeChanged(value); >@@ -503,11 +503,11 @@ static Ref<DocumentFragment> textToFragment(Document& document, const String& te > // or the empty string if the attribute is in a state that has no associated keyword value or if the attribute is > // not in a defined state (e.g. the attribute is missing and there is no missing value default). > // http://www.whatwg.org/specs/web-apps/current-work/multipage/common-dom-interfaces.html#limited-to-only-known-values >-static inline const AtomicString& toValidDirValue(const AtomicString& value) >+static inline const AtomString& toValidDirValue(const AtomString& value) > { >- static NeverDestroyed<AtomicString> ltrValue("ltr", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> rtlValue("rtl", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> autoValue("auto", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> ltrValue("ltr", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> rtlValue("rtl", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> autoValue("auto", AtomString::ConstructFromLiteral); > if (equalLettersIgnoringASCIICase(value, "ltr")) > return ltrValue; > if (equalLettersIgnoringASCIICase(value, "rtl")) >@@ -517,12 +517,12 @@ static inline const AtomicString& toValidDirValue(const AtomicString& value) > return nullAtom(); > } > >-const AtomicString& HTMLElement::dir() const >+const AtomString& HTMLElement::dir() const > { > return toValidDirValue(attributeWithoutSynchronization(dirAttr)); > } > >-void HTMLElement::setDir(const AtomicString& value) >+void HTMLElement::setDir(const AtomString& value) > { > setAttributeWithoutSynchronization(dirAttr, value); > } >@@ -600,7 +600,7 @@ ExceptionOr<void> HTMLElement::setOuterText(const String& text) > return { }; > } > >-void HTMLElement::applyAlignmentAttributeToStyle(const AtomicString& alignment, MutableStyleProperties& style) >+void HTMLElement::applyAlignmentAttributeToStyle(const AtomString& alignment, MutableStyleProperties& style) > { > // Vertical alignment with respect to the current baseline of the text > // right or left means floating images. >@@ -663,11 +663,11 @@ String HTMLElement::contentEditable() const > ExceptionOr<void> HTMLElement::setContentEditable(const String& enabled) > { > if (equalLettersIgnoringASCIICase(enabled, "true")) >- setAttributeWithoutSynchronization(contenteditableAttr, AtomicString("true", AtomicString::ConstructFromLiteral)); >+ setAttributeWithoutSynchronization(contenteditableAttr, AtomString("true", AtomString::ConstructFromLiteral)); > else if (equalLettersIgnoringASCIICase(enabled, "false")) >- setAttributeWithoutSynchronization(contenteditableAttr, AtomicString("false", AtomicString::ConstructFromLiteral)); >+ setAttributeWithoutSynchronization(contenteditableAttr, AtomString("false", AtomString::ConstructFromLiteral)); > else if (equalLettersIgnoringASCIICase(enabled, "plaintext-only")) >- setAttributeWithoutSynchronization(contenteditableAttr, AtomicString("plaintext-only", AtomicString::ConstructFromLiteral)); >+ setAttributeWithoutSynchronization(contenteditableAttr, AtomString("plaintext-only", AtomString::ConstructFromLiteral)); > else if (equalLettersIgnoringASCIICase(enabled, "inherit")) > removeAttribute(contenteditableAttr); > else >@@ -683,8 +683,8 @@ bool HTMLElement::draggable() const > void HTMLElement::setDraggable(bool value) > { > setAttributeWithoutSynchronization(draggableAttr, value >- ? AtomicString("true", AtomicString::ConstructFromLiteral) >- : AtomicString("false", AtomicString::ConstructFromLiteral)); >+ ? AtomString("true", AtomString::ConstructFromLiteral) >+ : AtomString("false", AtomString::ConstructFromLiteral)); > } > > bool HTMLElement::spellcheck() const >@@ -695,8 +695,8 @@ bool HTMLElement::spellcheck() const > void HTMLElement::setSpellcheck(bool enable) > { > setAttributeWithoutSynchronization(spellcheckAttr, enable >- ? AtomicString("true", AtomicString::ConstructFromLiteral) >- : AtomicString("false", AtomicString::ConstructFromLiteral)); >+ ? AtomString("true", AtomString::ConstructFromLiteral) >+ : AtomString("false", AtomString::ConstructFromLiteral)); > } > > void HTMLElement::click() >@@ -724,7 +724,7 @@ int HTMLElement::tabIndex() const > bool HTMLElement::translate() const > { > for (auto& element : lineageOfType<HTMLElement>(*this)) { >- const AtomicString& value = element.attributeWithoutSynchronization(translateAttr); >+ const AtomString& value = element.attributeWithoutSynchronization(translateAttr); > if (equalLettersIgnoringASCIICase(value, "yes") || (value.isEmpty() && !value.isNull())) > return true; > if (equalLettersIgnoringASCIICase(value, "no")) >@@ -812,7 +812,7 @@ void HTMLElement::childrenChanged(const ChildChange& change) > > bool HTMLElement::hasDirectionAuto() const > { >- const AtomicString& direction = attributeWithoutSynchronization(dirAttr); >+ const AtomString& direction = attributeWithoutSynchronization(dirAttr); > return (hasTagName(bdiTag) && direction.isNull()) || equalLettersIgnoringASCIICase(direction, "auto"); > } > >@@ -872,7 +872,7 @@ TextDirection HTMLElement::directionality(Node** strongDirectionalityTextNode) c > return TextDirection::LTR; > } > >-void HTMLElement::dirAttributeChanged(const AtomicString& value) >+void HTMLElement::dirAttributeChanged(const AtomString& value) > { > RefPtr<Element> parent = parentElement(); > >@@ -1077,7 +1077,7 @@ bool HTMLElement::isActuallyDisabled() const > > #if ENABLE(IOS_AUTOCORRECT_AND_AUTOCAPITALIZE) > >-const AtomicString& HTMLElement::autocapitalize() const >+const AtomString& HTMLElement::autocapitalize() const > { > return stringForAutocapitalizeType(autocapitalizeType()); > } >@@ -1087,7 +1087,7 @@ AutocapitalizeType HTMLElement::autocapitalizeType() const > return autocapitalizeTypeForAttributeValue(attributeWithoutSynchronization(HTMLNames::autocapitalizeAttr)); > } > >-void HTMLElement::setAutocapitalize(const AtomicString& value) >+void HTMLElement::setAutocapitalize(const AtomString& value) > { > setAttributeWithoutSynchronization(autocapitalizeAttr, value); > } >@@ -1101,7 +1101,7 @@ bool HTMLElement::shouldAutocorrect() const > > void HTMLElement::setAutocorrect(bool autocorrect) > { >- setAttributeWithoutSynchronization(autocorrectAttr, autocorrect ? AtomicString("on", AtomicString::ConstructFromLiteral) : AtomicString("off", AtomicString::ConstructFromLiteral)); >+ setAttributeWithoutSynchronization(autocorrectAttr, autocorrect ? AtomString("on", AtomString::ConstructFromLiteral) : AtomString("off", AtomString::ConstructFromLiteral)); > } > > #endif >@@ -1116,12 +1116,12 @@ InputMode HTMLElement::canonicalInputMode() const > return mode; > } > >-const AtomicString& HTMLElement::inputMode() const >+const AtomString& HTMLElement::inputMode() const > { > return stringForInputMode(canonicalInputMode()); > } > >-void HTMLElement::setInputMode(const AtomicString& value) >+void HTMLElement::setInputMode(const AtomString& value) > { > setAttributeWithoutSynchronization(inputmodeAttr, value); > } >diff --git a/Source/WebCore/html/HTMLElement.h b/Source/WebCore/html/HTMLElement.h >index b3b923f59a97d448ac13e637e051a4dbb35f23cc..67bf6a6abee35a9fe5cd36a5bfdbe34e9dcfa106 100644 >--- a/Source/WebCore/html/HTMLElement.h >+++ b/Source/WebCore/html/HTMLElement.h >@@ -75,8 +75,8 @@ public: > > WEBCORE_EXPORT virtual HTMLFormElement* form() const; > >- WEBCORE_EXPORT const AtomicString& dir() const; >- WEBCORE_EXPORT void setDir(const AtomicString&); >+ WEBCORE_EXPORT const AtomString& dir() const; >+ WEBCORE_EXPORT void setDir(const AtomString&); > > bool hasDirectionAuto() const; > TextDirection directionalityIfhasDirAutoAttribute(bool& isAuto) const; >@@ -94,7 +94,7 @@ public: > > bool hasTagName(const HTMLQualifiedName& name) const { return hasLocalName(name.localName()); } > >- static const AtomicString& eventNameForEventHandlerAttribute(const QualifiedName& attributeName); >+ static const AtomString& eventNameForEventHandlerAttribute(const QualifiedName& attributeName); > > // Only some element types can be disabled: https://html.spec.whatwg.org/multipage/scripting.html#concept-element-disabled > bool canBeActuallyDisabled() const; >@@ -102,8 +102,8 @@ public: > > #if ENABLE(IOS_AUTOCORRECT_AND_AUTOCAPITALIZE) > WEBCORE_EXPORT virtual AutocapitalizeType autocapitalizeType() const; >- WEBCORE_EXPORT const AtomicString& autocapitalize() const; >- WEBCORE_EXPORT void setAutocapitalize(const AtomicString& value); >+ WEBCORE_EXPORT const AtomString& autocapitalize() const; >+ WEBCORE_EXPORT void setAutocapitalize(const AtomString& value); > > bool autocorrect() const { return shouldAutocorrect(); } > WEBCORE_EXPORT virtual bool shouldAutocorrect() const; >@@ -111,8 +111,8 @@ public: > #endif > > WEBCORE_EXPORT InputMode canonicalInputMode() const; >- const AtomicString& inputMode() const; >- void setInputMode(const AtomicString& value); >+ const AtomString& inputMode() const; >+ void setInputMode(const AtomString& value); > > protected: > HTMLElement(const QualifiedName& tagName, Document&, ConstructionType); >@@ -120,28 +120,28 @@ protected: > void addHTMLLengthToStyle(MutableStyleProperties&, CSSPropertyID, const String& value); > void addHTMLColorToStyle(MutableStyleProperties&, CSSPropertyID, const String& color); > >- void applyAlignmentAttributeToStyle(const AtomicString&, MutableStyleProperties&); >- void applyBorderAttributeToStyle(const AtomicString&, MutableStyleProperties&); >+ void applyAlignmentAttributeToStyle(const AtomString&, MutableStyleProperties&); >+ void applyBorderAttributeToStyle(const AtomString&, MutableStyleProperties&); > > bool matchesReadWritePseudoClass() const override; >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > bool isPresentationAttribute(const QualifiedName&) const override; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override; >- unsigned parseBorderWidthAttribute(const AtomicString&) const; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) override; >+ unsigned parseBorderWidthAttribute(const AtomString&) const; > > void childrenChanged(const ChildChange&) override; > void calculateAndAdjustDirectionality(); > >- typedef HashMap<AtomicStringImpl*, AtomicString> EventHandlerNameMap; >+ typedef HashMap<AtomStringImpl*, AtomString> EventHandlerNameMap; > template<size_t tableSize> static void populateEventHandlerNameMap(EventHandlerNameMap&, const QualifiedName* const (&table)[tableSize]); >- static const AtomicString& eventNameForEventHandlerAttribute(const QualifiedName& attributeName, const EventHandlerNameMap&); >+ static const AtomString& eventNameForEventHandlerAttribute(const QualifiedName& attributeName, const EventHandlerNameMap&); > > private: > String nodeName() const final; > >- void mapLanguageAttributeToLocale(const AtomicString&, MutableStyleProperties&); >+ void mapLanguageAttributeToLocale(const AtomString&, MutableStyleProperties&); > >- void dirAttributeChanged(const AtomicString&); >+ void dirAttributeChanged(const AtomString&); > void adjustDirectionalityIfNeededAfterChildAttributeChanged(Element* child); > void adjustDirectionalityIfNeededAfterChildrenChanged(Element* beforeChange, ChildChangeType); > TextDirection directionality(Node** strongDirectionalityTextNode= 0) const; >diff --git a/Source/WebCore/html/HTMLEmbedElement.cpp b/Source/WebCore/html/HTMLEmbedElement.cpp >index c7d7b00d12502b1fd639b5560d7fa4b6d761cf45..aac407be2a2426a08bd247e6e759a0f826f97852 100644 >--- a/Source/WebCore/html/HTMLEmbedElement.cpp >+++ b/Source/WebCore/html/HTMLEmbedElement.cpp >@@ -90,7 +90,7 @@ RenderWidget* HTMLEmbedElement::renderWidgetLoadingPlugin() const > return findWidgetRenderer(this); > } > >-void HTMLEmbedElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLEmbedElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == hiddenAttr) { > if (equalLettersIgnoringASCIICase(value, "yes") || equalLettersIgnoringASCIICase(value, "true")) { >@@ -106,7 +106,7 @@ static bool hasTypeOrSrc(const HTMLEmbedElement& embed) > return embed.hasAttributeWithoutSynchronization(typeAttr) || embed.hasAttributeWithoutSynchronization(srcAttr); > } > >-void HTMLEmbedElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLEmbedElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == typeAttr) { > m_serviceType = value.string().left(value.find(';')).convertToASCIILowercase(); >@@ -222,7 +222,7 @@ bool HTMLEmbedElement::isURLAttribute(const Attribute& attribute) const > return attribute.name() == srcAttr || HTMLPlugInImageElement::isURLAttribute(attribute); > } > >-const AtomicString& HTMLEmbedElement::imageSourceURL() const >+const AtomString& HTMLEmbedElement::imageSourceURL() const > { > return attributeWithoutSynchronization(srcAttr); > } >diff --git a/Source/WebCore/html/HTMLEmbedElement.h b/Source/WebCore/html/HTMLEmbedElement.h >index 8124aefcd01e69dadf037b195c8981c22513c8ae..4515705899be01a4a15a3b9d63394ab4464bea58 100644 >--- a/Source/WebCore/html/HTMLEmbedElement.h >+++ b/Source/WebCore/html/HTMLEmbedElement.h >@@ -35,13 +35,13 @@ public: > private: > HTMLEmbedElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > > bool rendererIsNeeded(const RenderStyle&) final; > > bool isURLAttribute(const Attribute&) const final; >- const AtomicString& imageSourceURL() const final; >+ const AtomString& imageSourceURL() const final; > > RenderWidget* renderWidgetLoadingPlugin() const final; > >diff --git a/Source/WebCore/html/HTMLFieldSetElement.cpp b/Source/WebCore/html/HTMLFieldSetElement.cpp >index 410170af825df98dd860a881385ff1a9f53de79b..51ab0187980487b3afd4e535e6afc5cae0d27fe2 100644 >--- a/Source/WebCore/html/HTMLFieldSetElement.cpp >+++ b/Source/WebCore/html/HTMLFieldSetElement.cpp >@@ -152,9 +152,9 @@ bool HTMLFieldSetElement::supportsFocus() const > return HTMLElement::supportsFocus(); > } > >-const AtomicString& HTMLFieldSetElement::formControlType() const >+const AtomString& HTMLFieldSetElement::formControlType() const > { >- static NeverDestroyed<const AtomicString> fieldset("fieldset", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> fieldset("fieldset", AtomString::ConstructFromLiteral); > return fieldset; > } > >diff --git a/Source/WebCore/html/HTMLFieldSetElement.h b/Source/WebCore/html/HTMLFieldSetElement.h >index d107b976b3f2a18ac48e23748084d73770bba36d..b0594ce94b4816c7f43853702afef9e83a6d01e2 100644 >--- a/Source/WebCore/html/HTMLFieldSetElement.h >+++ b/Source/WebCore/html/HTMLFieldSetElement.h >@@ -50,7 +50,7 @@ private: > bool isEnumeratable() const final { return true; } > bool supportsFocus() const final; > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > bool computeWillValidate() const final { return false; } > void disabledAttributeChanged() final; > void disabledStateChanged() final; >diff --git a/Source/WebCore/html/HTMLFontElement.cpp b/Source/WebCore/html/HTMLFontElement.cpp >index 3cab734e1393a0e4c662b2f4861e25d3ae9ddfe4..b1a6fd782d71d8d85be39fef6a750e8e32a53087 100644 >--- a/Source/WebCore/html/HTMLFontElement.cpp >+++ b/Source/WebCore/html/HTMLFontElement.cpp >@@ -186,7 +186,7 @@ bool HTMLFontElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLElement::isPresentationAttribute(name); > } > >-void HTMLFontElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLFontElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == sizeAttr) { > CSSValueID size = CSSValueInvalid; >diff --git a/Source/WebCore/html/HTMLFontElement.h b/Source/WebCore/html/HTMLFontElement.h >index a204871acf13a13812332d358ffc020ad36ab058..c981afb787def74e7a1baa302b5bc1a13da3fb7e 100644 >--- a/Source/WebCore/html/HTMLFontElement.h >+++ b/Source/WebCore/html/HTMLFontElement.h >@@ -38,7 +38,7 @@ private: > HTMLFontElement(const QualifiedName&, Document&); > > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/html/HTMLFormControlElement.cpp b/Source/WebCore/html/HTMLFormControlElement.cpp >index 0f762798ba86fb3c0473d831dbe3549708b3d584..43f3f48440efe0f0883756244306a78e75e3158a 100644 >--- a/Source/WebCore/html/HTMLFormControlElement.cpp >+++ b/Source/WebCore/html/HTMLFormControlElement.cpp >@@ -82,7 +82,7 @@ HTMLFormControlElement::~HTMLFormControlElement() > > String HTMLFormControlElement::formEnctype() const > { >- const AtomicString& formEnctypeAttr = attributeWithoutSynchronization(formenctypeAttr); >+ const AtomString& formEnctypeAttr = attributeWithoutSynchronization(formenctypeAttr); > if (formEnctypeAttr.isNull()) > return emptyString(); > return FormSubmission::Attributes::parseEncodingType(formEnctypeAttr); >@@ -113,13 +113,13 @@ bool HTMLFormControlElement::formNoValidate() const > > String HTMLFormControlElement::formAction() const > { >- const AtomicString& value = attributeWithoutSynchronization(formactionAttr); >+ const AtomString& value = attributeWithoutSynchronization(formactionAttr); > if (value.isEmpty()) > return document().url(); > return getURLAttribute(formactionAttr); > } > >-void HTMLFormControlElement::setFormAction(const AtomicString& value) >+void HTMLFormControlElement::setFormAction(const AtomString& value) > { > setAttributeWithoutSynchronization(formactionAttr, value); > } >@@ -147,7 +147,7 @@ void HTMLFormControlElement::setAncestorDisabled(bool isDisabled) > disabledStateChanged(); > } > >-void HTMLFormControlElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLFormControlElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == formAttr) > formAttributeChanged(); >@@ -620,7 +620,7 @@ void HTMLFormControlElement::dispatchBlurEvent(RefPtr<Element>&& newFocusedEleme > > bool HTMLFormControlElement::shouldAutocorrect() const > { >- const AtomicString& autocorrectValue = attributeWithoutSynchronization(autocorrectAttr); >+ const AtomString& autocorrectValue = attributeWithoutSynchronization(autocorrectAttr); > if (!autocorrectValue.isEmpty()) > return !equalLettersIgnoringASCIICase(autocorrectValue, "off"); > if (RefPtr<HTMLFormElement> form = this->form()) >diff --git a/Source/WebCore/html/HTMLFormControlElement.h b/Source/WebCore/html/HTMLFormControlElement.h >index 45fdac217794a9a9659dc0638f8f5cca208a8d2c..a58ade3c6158af9fd6c14a1289e20e21bf033586 100644 >--- a/Source/WebCore/html/HTMLFormControlElement.h >+++ b/Source/WebCore/html/HTMLFormControlElement.h >@@ -55,7 +55,7 @@ public: > WEBCORE_EXPORT void setFormMethod(const String&); > bool formNoValidate() const; > WEBCORE_EXPORT String formAction() const; >- WEBCORE_EXPORT void setFormAction(const AtomicString&); >+ WEBCORE_EXPORT void setFormAction(const AtomString&); > > void setAncestorDisabled(bool isDisabled); > >@@ -77,9 +77,9 @@ public: > > bool isRequired() const; > >- const AtomicString& type() const { return formControlType(); } >+ const AtomString& type() const { return formControlType(); } > >- virtual const AtomicString& formControlType() const = 0; >+ virtual const AtomString& formControlType() const = 0; > > virtual bool canTriggerImplicitSubmission() const { return false; } > >@@ -130,7 +130,7 @@ protected: > > bool disabledByAncestorFieldset() const { return m_disabledByAncestorFieldset; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > virtual void disabledAttributeChanged(); > virtual void disabledStateChanged(); > virtual void readOnlyStateChanged(); >diff --git a/Source/WebCore/html/HTMLFormControlsCollection.cpp b/Source/WebCore/html/HTMLFormControlsCollection.cpp >index da020c607d39eddd443f8364609461183a6ac99b..6ec22d7749f2f78bd31ef77ea636073b71c59ff2 100644 >--- a/Source/WebCore/html/HTMLFormControlsCollection.cpp >+++ b/Source/WebCore/html/HTMLFormControlsCollection.cpp >@@ -121,19 +121,19 @@ void HTMLFormControlsCollection::updateNamedElementCache() const > > auto cache = std::make_unique<CollectionNamedElementCache>(); > >- HashSet<AtomicStringImpl*> foundInputElements; >+ HashSet<AtomStringImpl*> foundInputElements; > > ScriptDisallowedScope::InMainThread scriptDisallowedScope; > for (auto& elementPtr : unsafeFormControlElements()) { > FormAssociatedElement& associatedElement = *elementPtr; > if (associatedElement.isEnumeratable()) { > HTMLElement& element = associatedElement.asHTMLElement(); >- const AtomicString& id = element.getIdAttribute(); >+ const AtomString& id = element.getIdAttribute(); > if (!id.isEmpty()) { > cache->appendToIdCache(id, element); > foundInputElements.add(id.impl()); > } >- const AtomicString& name = element.getNameAttribute(); >+ const AtomString& name = element.getNameAttribute(); > if (!name.isEmpty() && id != name) { > cache->appendToNameCache(name, element); > foundInputElements.add(name.impl()); >@@ -145,10 +145,10 @@ void HTMLFormControlsCollection::updateNamedElementCache() const > if (!elementPtr) > continue; > HTMLImageElement& element = *elementPtr; >- const AtomicString& id = element.getIdAttribute(); >+ const AtomString& id = element.getIdAttribute(); > if (!id.isEmpty() && !foundInputElements.contains(id.impl())) > cache->appendToIdCache(id, element); >- const AtomicString& name = element.getNameAttribute(); >+ const AtomString& name = element.getNameAttribute(); > if (!name.isEmpty() && id != name && !foundInputElements.contains(name.impl())) > cache->appendToNameCache(name, element); > } >diff --git a/Source/WebCore/html/HTMLFormElement.cpp b/Source/WebCore/html/HTMLFormElement.cpp >index 48fc4eb3c5c30b906d3fffb5d6d7da4f43bc3f48..0962d968d9780ddd837827a7af5f3f92d033c156 100644 >--- a/Source/WebCore/html/HTMLFormElement.cpp >+++ b/Source/WebCore/html/HTMLFormElement.cpp >@@ -166,7 +166,7 @@ HTMLElement* HTMLFormElement::item(unsigned index) > return elements()->item(index); > } > >-Optional<Variant<RefPtr<RadioNodeList>, RefPtr<Element>>> HTMLFormElement::namedItem(const AtomicString& name) >+Optional<Variant<RefPtr<RadioNodeList>, RefPtr<Element>>> HTMLFormElement::namedItem(const AtomString& name) > { > auto namedItems = namedElements(name); > >@@ -178,7 +178,7 @@ Optional<Variant<RefPtr<RadioNodeList>, RefPtr<Element>>> HTMLFormElement::named > return Variant<RefPtr<RadioNodeList>, RefPtr<Element>> { RefPtr<RadioNodeList> { radioNodeList(name) } }; > } > >-Vector<AtomicString> HTMLFormElement::supportedPropertyNames() const >+Vector<AtomString> HTMLFormElement::supportedPropertyNames() const > { > // FIXME: Should be implemented (only needed for enumeration with includeDontEnumProperties mode > // since this class is annotated with LegacyUnenumerableNamedProperties). >@@ -408,7 +408,7 @@ void HTMLFormElement::resetAssociatedFormControlElements() > > bool HTMLFormElement::shouldAutocorrect() const > { >- const AtomicString& autocorrectValue = attributeWithoutSynchronization(autocorrectAttr); >+ const AtomString& autocorrectValue = attributeWithoutSynchronization(autocorrectAttr); > if (!autocorrectValue.isEmpty()) > return !equalLettersIgnoringASCIICase(autocorrectValue, "off"); > if (RefPtr<HTMLFormElement> form = this->form()) >@@ -418,7 +418,7 @@ bool HTMLFormElement::shouldAutocorrect() const > > #endif > >-void HTMLFormElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLFormElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == actionAttr) { > m_attributes.parseAction(value); >@@ -774,7 +774,7 @@ inline void HTMLFormElement::assertItemCanBeInPastNamesMap(FormNamedItem*) const > } > #endif > >-RefPtr<HTMLElement> HTMLFormElement::elementFromPastNamesMap(const AtomicString& pastName) const >+RefPtr<HTMLElement> HTMLFormElement::elementFromPastNamesMap(const AtomString& pastName) const > { > if (pastName.isEmpty() || !m_pastNamesMap) > return nullptr; >@@ -785,7 +785,7 @@ RefPtr<HTMLElement> HTMLFormElement::elementFromPastNamesMap(const AtomicString& > return &item->asHTMLElement(); > } > >-void HTMLFormElement::addToPastNamesMap(FormNamedItem* item, const AtomicString& pastName) >+void HTMLFormElement::addToPastNamesMap(FormNamedItem* item, const AtomString& pastName) > { > assertItemCanBeInPastNamesMap(item); > if (pastName.isEmpty()) >@@ -818,7 +818,7 @@ bool HTMLFormElement::matchesInvalidPseudoClass() const > } > > // FIXME: Use Ref<HTMLElement> for the function result since there are no non-HTML elements returned here. >-Vector<Ref<Element>> HTMLFormElement::namedElements(const AtomicString& name) >+Vector<Ref<Element>> HTMLFormElement::namedElements(const AtomString& name) > { > // http://www.whatwg.org/specs/web-apps/current-work/multipage/forms.html#dom-form-nameditem > Vector<Ref<Element>> namedItems = elements()->namedItems(name); >@@ -886,15 +886,15 @@ HTMLFormElement* HTMLFormElement::findClosestFormAncestor(const Element& startEl > return const_cast<HTMLFormElement*>(ancestorsOfType<HTMLFormElement>(startElement).first()); > } > >-void HTMLFormElement::setAutocomplete(const AtomicString& value) >+void HTMLFormElement::setAutocomplete(const AtomString& value) > { > setAttributeWithoutSynchronization(autocompleteAttr, value); > } > >-const AtomicString& HTMLFormElement::autocomplete() const >+const AtomString& HTMLFormElement::autocomplete() const > { >- static NeverDestroyed<AtomicString> on("on", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> off("off", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> on("on", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> off("off", AtomString::ConstructFromLiteral); > > return equalIgnoringASCIICase(attributeWithoutSynchronization(autocompleteAttr), "off") ? off : on; > } >diff --git a/Source/WebCore/html/HTMLFormElement.h b/Source/WebCore/html/HTMLFormElement.h >index 19b039a63da56f843ef00211f7d7956ba9383007..ebcdc0a66233e4ff6eb4c4370cde7d7aa2142a61 100644 >--- a/Source/WebCore/html/HTMLFormElement.h >+++ b/Source/WebCore/html/HTMLFormElement.h >@@ -52,20 +52,20 @@ public: > > Ref<HTMLFormControlsCollection> elements(); > WEBCORE_EXPORT Ref<HTMLCollection> elementsForNativeBindings(); >- Vector<Ref<Element>> namedElements(const AtomicString&); >+ Vector<Ref<Element>> namedElements(const AtomString&); > > WEBCORE_EXPORT unsigned length() const; > HTMLElement* item(unsigned index); >- Optional<Variant<RefPtr<RadioNodeList>, RefPtr<Element>>> namedItem(const AtomicString&); >- Vector<AtomicString> supportedPropertyNames() const; >+ Optional<Variant<RefPtr<RadioNodeList>, RefPtr<Element>>> namedItem(const AtomString&); >+ Vector<AtomString> supportedPropertyNames() const; > > String enctype() const { return m_attributes.encodingType(); } > WEBCORE_EXPORT void setEnctype(const String&); > > bool shouldAutocomplete() const; > >- WEBCORE_EXPORT void setAutocomplete(const AtomicString&); >- WEBCORE_EXPORT const AtomicString& autocomplete() const; >+ WEBCORE_EXPORT void setAutocomplete(const AtomString&); >+ WEBCORE_EXPORT const AtomString& autocomplete() const; > > #if ENABLE(IOS_AUTOCORRECT_AND_AUTOCAPITALIZE) > WEBCORE_EXPORT bool shouldAutocorrect() const final; >@@ -137,7 +137,7 @@ private: > > void handleLocalEvents(Event&, EventInvokePhase) final; > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isURLAttribute(const Attribute&) const final; > > void resumeFromDocumentSuspension() final; >@@ -158,8 +158,8 @@ private: > // are any invalid controls in this form. > bool checkInvalidControlsAndCollectUnhandled(Vector<RefPtr<HTMLFormControlElement>>&); > >- RefPtr<HTMLElement> elementFromPastNamesMap(const AtomicString&) const; >- void addToPastNamesMap(FormNamedItem*, const AtomicString& pastName); >+ RefPtr<HTMLElement> elementFromPastNamesMap(const AtomString&) const; >+ void addToPastNamesMap(FormNamedItem*, const AtomString& pastName); > void assertItemCanBeInPastNamesMap(FormNamedItem*) const; > void removeFromPastNamesMap(FormNamedItem*); > >@@ -168,7 +168,7 @@ private: > > void resetAssociatedFormControlElements(); > >- typedef HashMap<RefPtr<AtomicStringImpl>, FormNamedItem*> PastNamesMap; >+ typedef HashMap<RefPtr<AtomStringImpl>, FormNamedItem*> PastNamesMap; > > FormSubmission::Attributes m_attributes; > std::unique_ptr<PastNamesMap> m_pastNamesMap; >diff --git a/Source/WebCore/html/HTMLFrameElement.cpp b/Source/WebCore/html/HTMLFrameElement.cpp >index 314e73327157cdf95a6492404d3f5dc5cddb9820..dcd92d0ac7eabf523f6327c438f91b958fec54a6 100644 >--- a/Source/WebCore/html/HTMLFrameElement.cpp >+++ b/Source/WebCore/html/HTMLFrameElement.cpp >@@ -74,7 +74,7 @@ void HTMLFrameElement::didAttachRenderers() > m_frameBorder = containingFrameSet->hasFrameBorder(); > } > >-void HTMLFrameElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLFrameElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == frameborderAttr) { > m_frameBorder = value.toInt(); >diff --git a/Source/WebCore/html/HTMLFrameElement.h b/Source/WebCore/html/HTMLFrameElement.h >index 92bf5981941c5a96735d49b74eac4d6216d37447..e9e125817a28bdb50dfa281c2d631feaac3bfa46 100644 >--- a/Source/WebCore/html/HTMLFrameElement.h >+++ b/Source/WebCore/html/HTMLFrameElement.h >@@ -45,7 +45,7 @@ private: > void didAttachRenderers() final; > bool rendererIsNeeded(const RenderStyle&) final; > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > bool m_frameBorder { true }; > bool m_frameBorderSet { false }; >diff --git a/Source/WebCore/html/HTMLFrameElementBase.cpp b/Source/WebCore/html/HTMLFrameElementBase.cpp >index 1526369a2e31b300ceabd70b07d223e733343640..b9030110b74e441239fbfe99e53a356d699442b3 100644 >--- a/Source/WebCore/html/HTMLFrameElementBase.cpp >+++ b/Source/WebCore/html/HTMLFrameElementBase.cpp >@@ -103,7 +103,7 @@ void HTMLFrameElementBase::openURL(LockHistory lockHistory, LockBackForwardList > parentFrame->loader().subframeLoader().requestFrame(*this, m_URL, frameName, lockHistory, lockBackForwardList); > } > >-void HTMLFrameElementBase::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLFrameElementBase::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == srcdocAttr) > setLocation("about:srcdoc"); >@@ -171,7 +171,7 @@ void HTMLFrameElementBase::setLocation(const String& str) > if (document().settings().needsAcrobatFrameReloadingQuirk() && m_URL == str) > return; > >- m_URL = AtomicString(str); >+ m_URL = AtomString(str); > > if (isConnected()) > openURL(LockHistory::No, LockBackForwardList::No); >diff --git a/Source/WebCore/html/HTMLFrameElementBase.h b/Source/WebCore/html/HTMLFrameElementBase.h >index 1669e7bbbe51371ba26f93117584a693e51b1da7..5016f8f6ce597857b4b6b96020ea853a415abfbd 100644 >--- a/Source/WebCore/html/HTMLFrameElementBase.h >+++ b/Source/WebCore/html/HTMLFrameElementBase.h >@@ -56,7 +56,7 @@ protected: > > bool isURLAllowed() const; > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; > void didFinishInsertingNode() final; > void didAttachRenderers() override; >@@ -72,7 +72,7 @@ private: > > void openURL(LockHistory = LockHistory::Yes, LockBackForwardList = LockBackForwardList::Yes); > >- AtomicString m_URL; >+ AtomString m_URL; > > ScrollbarMode m_scrolling; > >diff --git a/Source/WebCore/html/HTMLFrameSetElement.cpp b/Source/WebCore/html/HTMLFrameSetElement.cpp >index 5d237d4826c72f887b7db2fb51d6e97865679a99..83ac680d9048757150b5b6eb36b64d788f0ebc70 100644 >--- a/Source/WebCore/html/HTMLFrameSetElement.cpp >+++ b/Source/WebCore/html/HTMLFrameSetElement.cpp >@@ -75,7 +75,7 @@ bool HTMLFrameSetElement::isPresentationAttribute(const QualifiedName& name) con > return HTMLElement::isPresentationAttribute(name); > } > >-void HTMLFrameSetElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLFrameSetElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == bordercolorAttr) > addHTMLColorToStyle(style, CSSPropertyBorderColor, value); >@@ -83,7 +83,7 @@ void HTMLFrameSetElement::collectStyleForPresentationAttribute(const QualifiedNa > HTMLElement::collectStyleForPresentationAttribute(name, value, style); > } > >-void HTMLFrameSetElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLFrameSetElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == rowsAttr) { > // FIXME: What is the right thing to do when removing this attribute? >@@ -231,7 +231,7 @@ void HTMLFrameSetElement::removedFromAncestor(RemovalType removalType, Container > } > } > >-WindowProxy* HTMLFrameSetElement::namedItem(const AtomicString& name) >+WindowProxy* HTMLFrameSetElement::namedItem(const AtomString& name) > { > auto frameElement = makeRefPtr(children()->namedItem(name)); > if (!is<HTMLFrameElement>(frameElement)) >@@ -240,7 +240,7 @@ WindowProxy* HTMLFrameSetElement::namedItem(const AtomicString& name) > return downcast<HTMLFrameElement>(*frameElement).contentWindow(); > } > >-Vector<AtomicString> HTMLFrameSetElement::supportedPropertyNames() const >+Vector<AtomString> HTMLFrameSetElement::supportedPropertyNames() const > { > // NOTE: Left empty as no specification defines this named getter and we > // have not historically exposed these named items for enumeration. >diff --git a/Source/WebCore/html/HTMLFrameSetElement.h b/Source/WebCore/html/HTMLFrameSetElement.h >index c3c68b57bf977e7acea92ff3aec096496f7122b2..91135b08bc6d604b3d769e973ad27d48f83d984f 100644 >--- a/Source/WebCore/html/HTMLFrameSetElement.h >+++ b/Source/WebCore/html/HTMLFrameSetElement.h >@@ -47,15 +47,15 @@ public: > > static RefPtr<HTMLFrameSetElement> findContaining(Element* descendant); > >- Vector<AtomicString> supportedPropertyNames() const; >- WindowProxy* namedItem(const AtomicString&); >+ Vector<AtomString> supportedPropertyNames() const; >+ WindowProxy* namedItem(const AtomString&); > > private: > HTMLFrameSetElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > > void willAttachRenderers() final; > bool rendererIsNeeded(const RenderStyle&) final; >diff --git a/Source/WebCore/html/HTMLHRElement.cpp b/Source/WebCore/html/HTMLHRElement.cpp >index 3d35249f7c62560ad854e86ee238ff88d8d89966..63034c865a3051bf8d9a22aaeb80517b81b09c07 100644 >--- a/Source/WebCore/html/HTMLHRElement.cpp >+++ b/Source/WebCore/html/HTMLHRElement.cpp >@@ -59,7 +59,7 @@ bool HTMLHRElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLElement::isPresentationAttribute(name); > } > >-void HTMLHRElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLHRElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == alignAttr) { > if (equalLettersIgnoringASCIICase(value, "left")) { >diff --git a/Source/WebCore/html/HTMLHRElement.h b/Source/WebCore/html/HTMLHRElement.h >index ebecbd26dff26e24aad58f74c88748de962b8cc8..f836be5786bfe5d3db904038d003eed15e7c1e61 100644 >--- a/Source/WebCore/html/HTMLHRElement.h >+++ b/Source/WebCore/html/HTMLHRElement.h >@@ -36,7 +36,7 @@ private: > HTMLHRElement(const QualifiedName&, Document&); > > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > bool canContainRangeEndPoint() const final; > }; > >diff --git a/Source/WebCore/html/HTMLIFrameElement.cpp b/Source/WebCore/html/HTMLIFrameElement.cpp >index ee3d1dfb07eec7ef16d13404b67fefcc10a783fa..fa07d7185c07314764bd771c1b241de57af27514 100644 >--- a/Source/WebCore/html/HTMLIFrameElement.cpp >+++ b/Source/WebCore/html/HTMLIFrameElement.cpp >@@ -67,7 +67,7 @@ bool HTMLIFrameElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLFrameElementBase::isPresentationAttribute(name); > } > >-void HTMLIFrameElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLIFrameElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == widthAttr) > addHTMLLengthToStyle(style, CSSPropertyWidth, value); >@@ -86,7 +86,7 @@ void HTMLIFrameElement::collectStyleForPresentationAttribute(const QualifiedName > HTMLFrameElementBase::collectStyleForPresentationAttribute(name, value, style); > } > >-void HTMLIFrameElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLIFrameElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == sandboxAttr) { > if (m_sandbox) >@@ -112,7 +112,7 @@ RenderPtr<RenderElement> HTMLIFrameElement::createElementRenderer(RenderStyle&& > return createRenderer<RenderIFrame>(*this, WTFMove(style)); > } > >-void HTMLIFrameElement::setReferrerPolicyForBindings(const AtomicString& value) >+void HTMLIFrameElement::setReferrerPolicyForBindings(const AtomString& value) > { > setAttributeWithoutSynchronization(referrerpolicyAttr, value); > } >diff --git a/Source/WebCore/html/HTMLIFrameElement.h b/Source/WebCore/html/HTMLIFrameElement.h >index 77addb27190bfe3b2cd0410bf36a1e41e1fe75b6..08d92c8362958c6ea91c7887683dcf3918c3e14e 100644 >--- a/Source/WebCore/html/HTMLIFrameElement.h >+++ b/Source/WebCore/html/HTMLIFrameElement.h >@@ -41,7 +41,7 @@ public: > RenderIFrame* renderer() const; > const String& allow() const { return m_allow; } > >- void setReferrerPolicyForBindings(const AtomicString&); >+ void setReferrerPolicyForBindings(const AtomString&); > String referrerPolicyForBindings() const; > ReferrerPolicy referrerPolicy() const final; > >@@ -54,9 +54,9 @@ private: > bool isKeyboardFocusable(KeyboardEvent*) const final { return false; } > #endif > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > > bool rendererIsNeeded(const RenderStyle&) final; > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; >diff --git a/Source/WebCore/html/HTMLImageElement.cpp b/Source/WebCore/html/HTMLImageElement.cpp >index 5cdc709399920d69672a97ce7fe5e831f5892736..93ead5cccb0d27845536f7c7a73cfcd343efac45 100644 >--- a/Source/WebCore/html/HTMLImageElement.cpp >+++ b/Source/WebCore/html/HTMLImageElement.cpp >@@ -115,7 +115,7 @@ bool HTMLImageElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLElement::isPresentationAttribute(name); > } > >-void HTMLImageElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLImageElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == widthAttr) > addHTMLLengthToStyle(style, CSSPropertyWidth, value); >@@ -137,15 +137,15 @@ void HTMLImageElement::collectStyleForPresentationAttribute(const QualifiedName& > HTMLElement::collectStyleForPresentationAttribute(name, value, style); > } > >-const AtomicString& HTMLImageElement::imageSourceURL() const >+const AtomString& HTMLImageElement::imageSourceURL() const > { > return m_bestFitImageURL.isEmpty() ? attributeWithoutSynchronization(srcAttr) : m_bestFitImageURL; > } > > void HTMLImageElement::setBestFitURLAndDPRFromImageCandidate(const ImageCandidate& candidate) > { >- m_bestFitImageURL = candidate.string.toAtomicString(); >- m_currentSrc = AtomicString(document().completeURL(imageSourceURL()).string()); >+ m_bestFitImageURL = candidate.string.toAtomString(); >+ m_currentSrc = AtomString(document().completeURL(imageSourceURL()).string()); > if (candidate.density >= 0) > m_imageDevicePixelRatio = 1 / candidate.density; > if (is<RenderImage>(renderer())) >@@ -215,7 +215,7 @@ void HTMLImageElement::selectImageSource() > m_imageLoader.updateFromElementIgnoringPreviousError(); > } > >-void HTMLImageElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLImageElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == altAttr) { > if (is<RenderImage>(renderer())) >@@ -247,7 +247,7 @@ void HTMLImageElement::parseAttribute(const QualifiedName& name, const AtomicStr > bool willHaveName = !value.isNull(); > if (m_hadNameBeforeAttributeChanged != willHaveName && isConnected() && !isInShadowTree() && is<HTMLDocument>(document())) { > HTMLDocument& document = downcast<HTMLDocument>(this->document()); >- const AtomicString& id = getIdAttribute(); >+ const AtomString& id = getIdAttribute(); > if (!id.isEmpty() && id != getNameAttribute()) { > if (willHaveName) > document.addDocumentNamedItem(*id.impl(), *this); >@@ -261,12 +261,12 @@ void HTMLImageElement::parseAttribute(const QualifiedName& name, const AtomicStr > } > } > >-const AtomicString& HTMLImageElement::altText() const >+const AtomString& HTMLImageElement::altText() const > { > // lets figure out the alt text.. magic stuff > // http://www.w3.org/TR/1998/REC-html40-19980424/appendix/notes.html#altgen > // also heavily discussed by Hixie on bugzilla >- const AtomicString& alt = attributeWithoutSynchronization(altAttr); >+ const AtomString& alt = attributeWithoutSynchronization(altAttr); > if (!alt.isNull()) > return alt; > // fall back to title attribute >@@ -564,7 +564,7 @@ String HTMLImageElement::completeURLsInAttributeValue(const URL& base, const Att > return HTMLElement::completeURLsInAttributeValue(base, attribute); > } > >-bool HTMLImageElement::matchesUsemap(const AtomicStringImpl& name) const >+bool HTMLImageElement::matchesUsemap(const AtomStringImpl& name) const > { > return m_parsedUsemap.impl() == &name; > } >@@ -574,7 +574,7 @@ HTMLMapElement* HTMLImageElement::associatedMapElement() const > return treeScope().getImageMap(m_parsedUsemap); > } > >-const AtomicString& HTMLImageElement::alt() const >+const AtomString& HTMLImageElement::alt() const > { > return attributeWithoutSynchronization(altAttr); > } >@@ -634,7 +634,7 @@ bool HTMLImageElement::complete() const > > DecodingMode HTMLImageElement::decodingMode() const > { >- const AtomicString& decodingMode = attributeWithoutSynchronization(decodingAttr); >+ const AtomString& decodingMode = attributeWithoutSynchronization(decodingAttr); > if (equalLettersIgnoringASCIICase(decodingMode, "sync")) > return DecodingMode::Synchronous; > if (equalLettersIgnoringASCIICase(decodingMode, "async")) >@@ -667,7 +667,7 @@ bool HTMLImageElement::isServerMap() const > if (!hasAttributeWithoutSynchronization(ismapAttr)) > return false; > >- const AtomicString& usemap = attributeWithoutSynchronization(usemapAttr); >+ const AtomString& usemap = attributeWithoutSynchronization(usemapAttr); > > // If the usemap attribute starts with '#', it refers to a map element in the document. > if (usemap.string()[0] == '#') >@@ -676,7 +676,7 @@ bool HTMLImageElement::isServerMap() const > return document().completeURL(stripLeadingAndTrailingHTMLSpaces(usemap)).isEmpty(); > } > >-void HTMLImageElement::setCrossOrigin(const AtomicString& value) >+void HTMLImageElement::setCrossOrigin(const AtomString& value) > { > setAttributeWithoutSynchronization(crossoriginAttr, value); > } >diff --git a/Source/WebCore/html/HTMLImageElement.h b/Source/WebCore/html/HTMLImageElement.h >index 1869880df3bf44a122a880feead62cfaef44eb15..d4f214d351bc6fa18a7a16c83811e1f9bb57a2d2 100644 >--- a/Source/WebCore/html/HTMLImageElement.h >+++ b/Source/WebCore/html/HTMLImageElement.h >@@ -54,14 +54,14 @@ public: > > WEBCORE_EXPORT int naturalWidth() const; > WEBCORE_EXPORT int naturalHeight() const; >- const AtomicString& currentSrc() const { return m_currentSrc; } >+ const AtomString& currentSrc() const { return m_currentSrc; } > > bool supportsFocus() const override; > bool isFocusable() const override; > > bool isServerMap() const; > >- const AtomicString& altText() const; >+ const AtomString& altText() const; > > CompositeOperator compositeOperator() const { return m_compositeOperator; } > >@@ -69,17 +69,17 @@ public: > > void setLoadManually(bool loadManually) { m_imageLoader.setLoadManually(loadManually); } > >- bool matchesUsemap(const AtomicStringImpl&) const; >+ bool matchesUsemap(const AtomStringImpl&) const; > HTMLMapElement* associatedMapElement() const; > >- WEBCORE_EXPORT const AtomicString& alt() const; >+ WEBCORE_EXPORT const AtomString& alt() const; > > WEBCORE_EXPORT void setHeight(unsigned); > > URL src() const; > void setSrc(const String&); > >- WEBCORE_EXPORT void setCrossOrigin(const AtomicString&); >+ WEBCORE_EXPORT void setCrossOrigin(const AtomString&); > WEBCORE_EXPORT String crossOrigin() const; > > WEBCORE_EXPORT void setWidth(unsigned); >@@ -107,7 +107,7 @@ public: > > bool canContainRangeEndPoint() const override { return false; } > >- const AtomicString& imageSourceURL() const override; >+ const AtomString& imageSourceURL() const override; > > bool hasShadowControls() const { return m_experimentalImageMenuEnabled; } > >@@ -129,9 +129,9 @@ protected: > void didMoveToNewDocument(Document& oldDocument, Document& newDocument) override; > > private: >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > bool isPresentationAttribute(const QualifiedName&) const override; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) override; > > void didAttachRenderers() override; > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override; >@@ -177,9 +177,9 @@ private: > WeakPtr<HTMLFormElement> m_formSetByParser; > > CompositeOperator m_compositeOperator; >- AtomicString m_bestFitImageURL; >- AtomicString m_currentSrc; >- AtomicString m_parsedUsemap; >+ AtomString m_bestFitImageURL; >+ AtomString m_currentSrc; >+ AtomString m_parsedUsemap; > float m_imageDevicePixelRatio; > bool m_experimentalImageMenuEnabled; > bool m_hadNameBeforeAttributeChanged { false }; // FIXME: We only need this because parseAttribute() can't see the old value. >diff --git a/Source/WebCore/html/HTMLImageLoader.cpp b/Source/WebCore/html/HTMLImageLoader.cpp >index ee786ae85dfddf57abd1d3b3a730c93347eea660..b664940c3a321ac0f2c02e519852880a3a5d7528 100644 >--- a/Source/WebCore/html/HTMLImageLoader.cpp >+++ b/Source/WebCore/html/HTMLImageLoader.cpp >@@ -61,7 +61,7 @@ void HTMLImageLoader::dispatchLoadEvent() > element().dispatchEvent(Event::create(errorOccurred ? eventNames().errorEvent : eventNames().loadEvent, Event::CanBubble::No, Event::IsCancelable::No)); > } > >-String HTMLImageLoader::sourceURI(const AtomicString& attr) const >+String HTMLImageLoader::sourceURI(const AtomString& attr) const > { > return stripLeadingAndTrailingHTMLSpaces(attr); > } >diff --git a/Source/WebCore/html/HTMLImageLoader.h b/Source/WebCore/html/HTMLImageLoader.h >index a81589a0a83bb68b17139a13db2053adb798e3ef..f22742e6e29cc2b5402b4b0b1d149aafe4b86b72 100644 >--- a/Source/WebCore/html/HTMLImageLoader.h >+++ b/Source/WebCore/html/HTMLImageLoader.h >@@ -32,7 +32,7 @@ public: > virtual ~HTMLImageLoader(); > > void dispatchLoadEvent() override; >- String sourceURI(const AtomicString&) const override; >+ String sourceURI(const AtomString&) const override; > > void notifyFinished(CachedResource&) final; > }; >diff --git a/Source/WebCore/html/HTMLInputElement.cpp b/Source/WebCore/html/HTMLInputElement.cpp >index 096470b10faec1046197f2362cc18e67396be9ed..d3ee460291c877c0ffc35bd57cae74b8f52d43f1 100644 >--- a/Source/WebCore/html/HTMLInputElement.cpp >+++ b/Source/WebCore/html/HTMLInputElement.cpp >@@ -83,7 +83,7 @@ using namespace HTMLNames; > class ListAttributeTargetObserver : IdTargetObserver { > WTF_MAKE_FAST_ALLOCATED; > public: >- ListAttributeTargetObserver(const AtomicString& id, HTMLInputElement*); >+ ListAttributeTargetObserver(const AtomString& id, HTMLInputElement*); > > void idTargetChanged() override; > >@@ -180,7 +180,7 @@ HTMLInputElement::~HTMLInputElement() > #endif > } > >-const AtomicString& HTMLInputElement::name() const >+const AtomString& HTMLInputElement::name() const > { > return m_name.isNull() ? emptyAtom() : m_name; > } >@@ -507,7 +507,7 @@ void HTMLInputElement::handleBlurEvent() > m_inputType->handleBlurEvent(); > } > >-void HTMLInputElement::setType(const AtomicString& type) >+void HTMLInputElement::setType(const AtomString& type) > { > setAttributeWithoutSynchronization(typeAttr, type); > } >@@ -619,7 +619,7 @@ void HTMLInputElement::subtreeHasChanged() > calculateAndAdjustDirectionality(); > } > >-const AtomicString& HTMLInputElement::formControlType() const >+const AtomString& HTMLInputElement::formControlType() const > { > return m_inputType->formControlType(); > } >@@ -667,7 +667,7 @@ bool HTMLInputElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLTextFormControlElement::isPresentationAttribute(name); > } > >-void HTMLInputElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLInputElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == vspaceAttr) { > addHTMLLengthToStyle(style, CSSPropertyMarginTop, value); >@@ -695,7 +695,7 @@ inline void HTMLInputElement::initializeInputType() > ASSERT(m_parsingInProgress); > ASSERT(!m_inputType); > >- const AtomicString& type = attributeWithoutSynchronization(typeAttr); >+ const AtomString& type = attributeWithoutSynchronization(typeAttr); > if (type.isNull()) { > m_inputType = InputType::createText(*this); > ensureUserAgentShadowRoot(); >@@ -711,7 +711,7 @@ inline void HTMLInputElement::initializeInputType() > runPostTypeUpdateTasks(); > } > >-void HTMLInputElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLInputElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > ASSERT(m_inputType); > Ref<InputType> protectedInputType(*m_inputType); >@@ -1798,7 +1798,7 @@ bool HTMLInputElement::isEmptyValue() const > return m_inputType->isEmptyValue(); > } > >-void HTMLInputElement::maxLengthAttributeChanged(const AtomicString& newValue) >+void HTMLInputElement::maxLengthAttributeChanged(const AtomString& newValue) > { > unsigned oldEffectiveMaxLength = effectiveMaxLength(); > internalSetMaxLength(parseHTMLNonNegativeInteger(newValue).value_or(-1)); >@@ -1810,7 +1810,7 @@ void HTMLInputElement::maxLengthAttributeChanged(const AtomicString& newValue) > updateValidity(); > } > >-void HTMLInputElement::minLengthAttributeChanged(const AtomicString& newValue) >+void HTMLInputElement::minLengthAttributeChanged(const AtomString& newValue) > { > int oldMinLength = minLength(); > internalSetMinLength(parseHTMLNonNegativeInteger(newValue).value_or(-1)); >@@ -1936,7 +1936,7 @@ void HTMLInputElement::setWidth(unsigned width) > } > > #if ENABLE(DATALIST_ELEMENT) >-ListAttributeTargetObserver::ListAttributeTargetObserver(const AtomicString& id, HTMLInputElement* element) >+ListAttributeTargetObserver::ListAttributeTargetObserver(const AtomString& id, HTMLInputElement* element) > : IdTargetObserver(element->treeScope().idTargetObserverRegistry(), id) > , m_element(element) > { >@@ -2094,8 +2094,8 @@ bool HTMLInputElement::setupDateTimeChooserParameters(DateTimeChooserParameters& > if (!document().settings().langAttributeAwareFormControlUIEnabled()) > parameters.locale = defaultLanguage(); > else { >- AtomicString computedLocale = computeInheritedLanguage(); >- parameters.locale = computedLocale.isEmpty() ? AtomicString(defaultLanguage()) : computedLocale; >+ AtomString computedLocale = computeInheritedLanguage(); >+ parameters.locale = computedLocale.isEmpty() ? AtomString(defaultLanguage()) : computedLocale; > } > > StepRange stepRange = createStepRange(RejectAny); >diff --git a/Source/WebCore/html/HTMLInputElement.h b/Source/WebCore/html/HTMLInputElement.h >index 276dbc9430d5f12940d6b64a5d693d0631bf27cb..08114dd7babd17ab454024eafe027365b4bf9e4b 100644 >--- a/Source/WebCore/html/HTMLInputElement.h >+++ b/Source/WebCore/html/HTMLInputElement.h >@@ -168,7 +168,7 @@ public: > bool sizeShouldIncludeDecoration(int& preferredSize) const; > float decorationWidth() const; > >- WEBCORE_EXPORT void setType(const AtomicString&); >+ WEBCORE_EXPORT void setType(const AtomString&); > > WEBCORE_EXPORT String value() const final; > WEBCORE_EXPORT ExceptionOr<void> setValue(const String&, TextFieldEventBehavior = DispatchNoEvent); >@@ -311,7 +311,7 @@ public: > void blur() final; > void defaultBlur(); > >- const AtomicString& name() const final; >+ const AtomString& name() const final; > > void endEditing(); > >@@ -375,7 +375,7 @@ private: > > bool canTriggerImplicitSubmission() const final { return isTextField(); } > >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > > bool shouldSaveAndRestoreFormControlState() const final; > FormControlState saveFormControlState() const final; >@@ -387,9 +387,9 @@ private: > > void accessKeyAction(bool sendMouseEvents) final; > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > void finishParsingChildren() final; > void parserDidSetAttributes() final; > >@@ -445,8 +445,8 @@ private: > #if ENABLE(DATALIST_ELEMENT) > void resetListAttributeTargetObserver(); > #endif >- void maxLengthAttributeChanged(const AtomicString& newValue); >- void minLengthAttributeChanged(const AtomicString& newValue); >+ void maxLengthAttributeChanged(const AtomString& newValue); >+ void minLengthAttributeChanged(const AtomString& newValue); > void updateValueIfNeeded(); > > void addToRadioButtonGroup(); >@@ -454,7 +454,7 @@ private: > > void setDefaultSelectionAfterFocus(SelectionRevealMode); > >- AtomicString m_name; >+ AtomString m_name; > String m_valueIfDirty; > unsigned m_size; > short m_maxResults { -1 }; >diff --git a/Source/WebCore/html/HTMLKeygenElement.cpp b/Source/WebCore/html/HTMLKeygenElement.cpp >index bc35f57b4218bf4bffbc70f971d415e5e36a9d00..1f2b00a04e80ccc9efd19610509ea203cd63b175 100644 >--- a/Source/WebCore/html/HTMLKeygenElement.cpp >+++ b/Source/WebCore/html/HTMLKeygenElement.cpp >@@ -57,7 +57,7 @@ protected: > KeygenSelectElement(Document& document) > : HTMLSelectElement(selectTag, document, 0) > { >- static NeverDestroyed<AtomicString> pseudoId("-webkit-keygen-select", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> pseudoId("-webkit-keygen-select", AtomString::ConstructFromLiteral); > setPseudo(pseudoId); > } > >@@ -92,7 +92,7 @@ Ref<HTMLKeygenElement> HTMLKeygenElement::create(const QualifiedName& tagName, D > return adoptRef(*new HTMLKeygenElement(tagName, document, form)); > } > >-void HTMLKeygenElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLKeygenElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > // Reflect disabled attribute on the shadow select element > if (name == disabledAttr) >@@ -107,7 +107,7 @@ bool HTMLKeygenElement::isKeytypeRSA() const > return keyType.isNull() || equalLettersIgnoringASCIICase(keyType, "rsa"); > } > >-void HTMLKeygenElement::setKeytype(const AtomicString& value) >+void HTMLKeygenElement::setKeytype(const AtomString& value) > { > setAttributeWithoutSynchronization(keytypeAttr, value); > } >@@ -129,9 +129,9 @@ bool HTMLKeygenElement::appendFormData(DOMFormData& formData, bool) > return true; > } > >-const AtomicString& HTMLKeygenElement::formControlType() const >+const AtomString& HTMLKeygenElement::formControlType() const > { >- static NeverDestroyed<const AtomicString> keygen("keygen", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> keygen("keygen", AtomString::ConstructFromLiteral); > return keygen; > } > >diff --git a/Source/WebCore/html/HTMLKeygenElement.h b/Source/WebCore/html/HTMLKeygenElement.h >index 9c9c9e783c7d2b277a79c1c608842f377f90cc64..969227991d90bf9c0aa639100e5515709e6f5c50 100644 >--- a/Source/WebCore/html/HTMLKeygenElement.h >+++ b/Source/WebCore/html/HTMLKeygenElement.h >@@ -34,7 +34,7 @@ class HTMLKeygenElement final : public HTMLFormControlElementWithState { > public: > static Ref<HTMLKeygenElement> create(const QualifiedName&, Document&, HTMLFormElement*); > >- void setKeytype(const AtomicString&); >+ void setKeytype(const AtomString&); > String keytype() const; > > private: >@@ -43,10 +43,10 @@ private: > bool computeWillValidate() const final { return false; } > bool canStartSelection() const final { return false; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > bool appendFormData(DOMFormData&, bool) final; >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > bool isOptionalFormControl() const final { return false; } > > bool isEnumeratable() const final { return true; } >diff --git a/Source/WebCore/html/HTMLLIElement.cpp b/Source/WebCore/html/HTMLLIElement.cpp >index e92815b8f92043e5b78d4cd3300eaa2ddb763fdb..8e26b6108208dc58dc9ebd5caffb18e57437c890 100644 >--- a/Source/WebCore/html/HTMLLIElement.cpp >+++ b/Source/WebCore/html/HTMLLIElement.cpp >@@ -63,7 +63,7 @@ bool HTMLLIElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLElement::isPresentationAttribute(name); > } > >-void HTMLLIElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLLIElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == typeAttr) { > if (value == "a") >@@ -82,7 +82,7 @@ void HTMLLIElement::collectStyleForPresentationAttribute(const QualifiedName& na > HTMLElement::collectStyleForPresentationAttribute(name, value, style); > } > >-void HTMLLIElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLLIElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == valueAttr) { > if (renderer() && renderer()->isListItem()) >@@ -114,7 +114,7 @@ void HTMLLIElement::didAttachRenderers() > parseValue(attributeWithoutSynchronization(valueAttr)); > } > >-inline void HTMLLIElement::parseValue(const AtomicString& value) >+inline void HTMLLIElement::parseValue(const AtomString& value) > { > ASSERT(renderer()); > >diff --git a/Source/WebCore/html/HTMLLIElement.h b/Source/WebCore/html/HTMLLIElement.h >index 821215df09ddff45398d7d7dc706fa36f28aa090..8bf9b72b2de35485d2ab9f8a4a1541fb3895f8d5 100644 >--- a/Source/WebCore/html/HTMLLIElement.h >+++ b/Source/WebCore/html/HTMLLIElement.h >@@ -35,13 +35,13 @@ public: > private: > HTMLLIElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > > void didAttachRenderers() final; > >- void parseValue(const AtomicString&); >+ void parseValue(const AtomString&); > }; > > } // namespace WebCore >diff --git a/Source/WebCore/html/HTMLLabelElement.cpp b/Source/WebCore/html/HTMLLabelElement.cpp >index cae2e1790fb93ac10e4373cfbb49d5f93d77b639..bb3f08db6cbc73654551f12b733f748acfa6b90b 100644 >--- a/Source/WebCore/html/HTMLLabelElement.cpp >+++ b/Source/WebCore/html/HTMLLabelElement.cpp >@@ -40,7 +40,7 @@ WTF_MAKE_ISO_ALLOCATED_IMPL(HTMLLabelElement); > > using namespace HTMLNames; > >-static LabelableElement* firstElementWithIdIfLabelable(TreeScope& treeScope, const AtomicString& id) >+static LabelableElement* firstElementWithIdIfLabelable(TreeScope& treeScope, const AtomString& id) > { > auto element = makeRefPtr(treeScope.getElementById(id)); > if (!is<LabelableElement>(element)) >diff --git a/Source/WebCore/html/HTMLLinkElement.cpp b/Source/WebCore/html/HTMLLinkElement.cpp >index adec9ea082753435f923bfd15f1a2a7ed2a06e0e..63e0f89015ff26965f749a0279c8accdc5f00667 100644 >--- a/Source/WebCore/html/HTMLLinkElement.cpp >+++ b/Source/WebCore/html/HTMLLinkElement.cpp >@@ -158,7 +158,7 @@ void HTMLLinkElement::setDisabledState(bool disabled) > } > } > >-void HTMLLinkElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLLinkElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == relAttr) { > m_relAttribute = LinkRelAttribute(document(), value); >@@ -216,7 +216,7 @@ bool HTMLLinkElement::shouldLoadLink() > return true; > } > >-void HTMLLinkElement::setCrossOrigin(const AtomicString& value) >+void HTMLLinkElement::setCrossOrigin(const AtomString& value) > { > setAttributeWithoutSynchronization(crossoriginAttr, value); > } >@@ -226,7 +226,7 @@ String HTMLLinkElement::crossOrigin() const > return parseCORSSettingsAttribute(attributeWithoutSynchronization(crossoriginAttr)); > } > >-void HTMLLinkElement::setAs(const AtomicString& value) >+void HTMLLinkElement::setAs(const AtomString& value) > { > setAttributeWithoutSynchronization(asAttr, value); > } >@@ -565,7 +565,7 @@ URL HTMLLinkElement::href() const > return document().completeURL(attributeWithoutSynchronization(hrefAttr)); > } > >-const AtomicString& HTMLLinkElement::rel() const >+const AtomString& HTMLLinkElement::rel() const > { > return attributeWithoutSynchronization(relAttr); > } >@@ -575,7 +575,7 @@ String HTMLLinkElement::target() const > return attributeWithoutSynchronization(targetAttr); > } > >-const AtomicString& HTMLLinkElement::type() const >+const AtomString& HTMLLinkElement::type() const > { > return attributeWithoutSynchronization(typeAttr); > } >diff --git a/Source/WebCore/html/HTMLLinkElement.h b/Source/WebCore/html/HTMLLinkElement.h >index 61ab5b367c2504b0c62c7efb673aaa3c07e50f0b..c83ea397095b919daf07fd40197bfee71a9b8712 100644 >--- a/Source/WebCore/html/HTMLLinkElement.h >+++ b/Source/WebCore/html/HTMLLinkElement.h >@@ -48,11 +48,11 @@ public: > virtual ~HTMLLinkElement(); > > URL href() const; >- const AtomicString& rel() const; >+ const AtomString& rel() const; > > String target() const final; > >- const AtomicString& type() const; >+ const AtomString& type() const; > > Optional<LinkIconType> iconType() const; > >@@ -64,9 +64,9 @@ public: > bool isEnabledViaScript() const { return m_disabledState == EnabledViaScript; } > DOMTokenList& sizes(); > >- WEBCORE_EXPORT void setCrossOrigin(const AtomicString&); >+ WEBCORE_EXPORT void setCrossOrigin(const AtomString&); > WEBCORE_EXPORT String crossOrigin() const; >- WEBCORE_EXPORT void setAs(const AtomicString&); >+ WEBCORE_EXPORT void setAs(const AtomString&); > WEBCORE_EXPORT String as() const; > > void dispatchPendingEvent(LinkEventSender*); >@@ -79,7 +79,7 @@ public: > #endif > > private: >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > bool shouldLoadLink() final; > void process(); >diff --git a/Source/WebCore/html/HTMLMapElement.cpp b/Source/WebCore/html/HTMLMapElement.cpp >index 73242d5f2e5934058042ba16102357fb76d3bb4c..f009147ea33a79300bec4a94f3a6a2940a542ef1 100644 >--- a/Source/WebCore/html/HTMLMapElement.cpp >+++ b/Source/WebCore/html/HTMLMapElement.cpp >@@ -83,7 +83,7 @@ HTMLImageElement* HTMLMapElement::imageElement() > return treeScope().imageElementByUsemap(*m_name.impl()); > } > >-void HTMLMapElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLMapElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > // FIXME: This logic seems wrong for XML documents. > // Either the id or name will be used depending on the order the attributes are parsed. >diff --git a/Source/WebCore/html/HTMLMapElement.h b/Source/WebCore/html/HTMLMapElement.h >index bdf2e4e73acf593ffb6a2b21c290e7964e6d1869..7f7ece5ffda30a704e2dde2f19bae44fa01cb1cb 100644 >--- a/Source/WebCore/html/HTMLMapElement.h >+++ b/Source/WebCore/html/HTMLMapElement.h >@@ -36,7 +36,7 @@ public: > static Ref<HTMLMapElement> create(const QualifiedName&, Document&); > virtual ~HTMLMapElement(); > >- const AtomicString& getName() const { return m_name; } >+ const AtomString& getName() const { return m_name; } > > bool mapMouseEvent(LayoutPoint location, const LayoutSize&, HitTestResult&); > >@@ -46,12 +46,12 @@ public: > private: > HTMLMapElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; > void removedFromAncestor(RemovalType, ContainerNode&) final; > >- AtomicString m_name; >+ AtomString m_name; > }; > > } // namespaces >diff --git a/Source/WebCore/html/HTMLMarqueeElement.cpp b/Source/WebCore/html/HTMLMarqueeElement.cpp >index c443992c34d1677b3cb1f07ecb25532b162c1d83..1679e9b22d8f52166eca94fdaf764c4002b6c474 100644 >--- a/Source/WebCore/html/HTMLMarqueeElement.cpp >+++ b/Source/WebCore/html/HTMLMarqueeElement.cpp >@@ -68,7 +68,7 @@ bool HTMLMarqueeElement::isPresentationAttribute(const QualifiedName& name) cons > return HTMLElement::isPresentationAttribute(name); > } > >-void HTMLMarqueeElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLMarqueeElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == widthAttr) { > if (!value.isEmpty()) >diff --git a/Source/WebCore/html/HTMLMarqueeElement.h b/Source/WebCore/html/HTMLMarqueeElement.h >index 68490fd4526295830a29fb6a9b640e6682fd3c5d..040cc954a2a0b3802947b841071fbe22878a1bdf 100644 >--- a/Source/WebCore/html/HTMLMarqueeElement.h >+++ b/Source/WebCore/html/HTMLMarqueeElement.h >@@ -55,7 +55,7 @@ private: > HTMLMarqueeElement(const QualifiedName&, Document&); > > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > > bool canSuspendForDocumentSuspension() const final; > void suspend(ReasonForSuspension) final; >diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp >index 75f19383ad6145936d4d757f8fbd35fc9948a8ed..24c687e5b21c75ac4cb0a3b772a18c72dedc22a1 100644 >--- a/Source/WebCore/html/HTMLMediaElement.cpp >+++ b/Source/WebCore/html/HTMLMediaElement.cpp >@@ -804,7 +804,7 @@ bool HTMLMediaElement::isMouseFocusable() const > return false; > } > >-void HTMLMediaElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLMediaElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == srcAttr) { > // https://html.spec.whatwg.org/multipage/embedded-content.html#location-of-the-media-resource >@@ -1010,7 +1010,7 @@ void HTMLMediaElement::mediaPlayerActiveSourceBuffersChanged(const MediaPlayer*) > m_hasEverHadVideo |= hasVideo(); > } > >-void HTMLMediaElement::scheduleEvent(const AtomicString& eventName) >+void HTMLMediaElement::scheduleEvent(const AtomString& eventName) > { > auto event = Event::create(eventName, Event::CanBubble::No, Event::IsCancelable::Yes); > >@@ -1121,7 +1121,7 @@ void HTMLMediaElement::setSrcObject(MediaProvider&& mediaProvider) > prepareForLoad(); > } > >-void HTMLMediaElement::setCrossOrigin(const AtomicString& value) >+void HTMLMediaElement::setCrossOrigin(const AtomString& value) > { > setAttributeWithoutSynchronization(crossoriginAttr, value); > } >@@ -5922,7 +5922,7 @@ void HTMLMediaElement::dispatchEvent(Event& event) > HTMLElement::dispatchEvent(event); > } > >-bool HTMLMediaElement::addEventListener(const AtomicString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) >+bool HTMLMediaElement::addEventListener(const AtomString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) > { > if (eventType != eventNames().webkitplaybacktargetavailabilitychangedEvent) > return Node::addEventListener(eventType, WTFMove(listener), options); >@@ -5942,7 +5942,7 @@ bool HTMLMediaElement::addEventListener(const AtomicString& eventType, Ref<Event > return true; > } > >-bool HTMLMediaElement::removeEventListener(const AtomicString& eventType, EventListener& listener, const ListenerOptions& options) >+bool HTMLMediaElement::removeEventListener(const AtomString& eventType, EventListener& listener, const ListenerOptions& options) > { > if (eventType != eventNames().webkitplaybacktargetavailabilitychangedEvent) > return Node::removeEventListener(eventType, listener, options); >@@ -7875,7 +7875,7 @@ bool HTMLMediaElement::effectiveMuted() const > return muted() || (document().page() && document().page()->isAudioMuted()); > } > >-bool HTMLMediaElement::doesHaveAttribute(const AtomicString& attribute, AtomicString* value) const >+bool HTMLMediaElement::doesHaveAttribute(const AtomString& attribute, AtomString* value) const > { > QualifiedName attributeName(nullAtom(), attribute, nullAtom()); > >diff --git a/Source/WebCore/html/HTMLMediaElement.h b/Source/WebCore/html/HTMLMediaElement.h >index b6d1809392290378556b311e912998c907ee542b..2f7047efa3874467041ac89806090417f1781b4a 100644 >--- a/Source/WebCore/html/HTMLMediaElement.h >+++ b/Source/WebCore/html/HTMLMediaElement.h >@@ -174,7 +174,7 @@ public: > > bool canSaveMediaData() const; > >- bool doesHaveAttribute(const AtomicString&, AtomicString* value = nullptr) const override; >+ bool doesHaveAttribute(const AtomString&, AtomString* value = nullptr) const override; > > PlatformLayer* platformLayer() const; > bool isVideoLayerInline(); >@@ -215,7 +215,7 @@ public: > const MediaProvider& srcObject() const { return m_mediaProvider; } > void setSrcObject(MediaProvider&&); > >- WEBCORE_EXPORT void setCrossOrigin(const AtomicString&); >+ WEBCORE_EXPORT void setCrossOrigin(const AtomString&); > WEBCORE_EXPORT String crossOrigin() const; > > // network state >@@ -407,8 +407,8 @@ public: > > #if ENABLE(WIRELESS_PLAYBACK_TARGET) > void webkitShowPlaybackTargetPicker(); >- bool addEventListener(const AtomicString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) override; >- bool removeEventListener(const AtomicString& eventType, EventListener&, const ListenerOptions&) override; >+ bool addEventListener(const AtomString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) override; >+ bool removeEventListener(const AtomString& eventType, EventListener&, const ListenerOptions&) override; > > void wirelessRoutesAvailableDidChange() override; > void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&) override; >@@ -583,7 +583,7 @@ protected: > virtual void finishInitialization(); > virtual ~HTMLMediaElement(); > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void finishParsingChildren() override; > bool isURLAttribute(const Attribute&) const override; > void willAttachRenderers() override; >@@ -613,7 +613,7 @@ protected: > void updateMediaControlsAfterPresentationModeChange(); > #endif > >- void scheduleEvent(const AtomicString& eventName); >+ void scheduleEvent(const AtomString& eventName); > > private: > void createMediaPlayer(); >diff --git a/Source/WebCore/html/HTMLMenuElement.cpp b/Source/WebCore/html/HTMLMenuElement.cpp >index ba05bb94fc45291b558a632f3904366bc8ac4e2a..87220ff3380bff4899bc8689641e872b24ec34fc 100644 >--- a/Source/WebCore/html/HTMLMenuElement.cpp >+++ b/Source/WebCore/html/HTMLMenuElement.cpp >@@ -64,7 +64,7 @@ void HTMLMenuElement::removedFromAncestor(RemovalType type, ContainerNode& ances > } > } > >-void HTMLMenuElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLMenuElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name != typeAttr || !RuntimeEnabledFeatures::sharedFeatures().menuItemElementEnabled()) { > HTMLElement::parseAttribute(name, value); >diff --git a/Source/WebCore/html/HTMLMenuElement.h b/Source/WebCore/html/HTMLMenuElement.h >index e659f70805376b1bc5f2b31a964ddad09a3a8aa5..205b8f52c49538869a9fed477de12ebffcfde238 100644 >--- a/Source/WebCore/html/HTMLMenuElement.h >+++ b/Source/WebCore/html/HTMLMenuElement.h >@@ -38,7 +38,7 @@ private: > > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; > void removedFromAncestor(RemovalType, ContainerNode&) final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > bool m_isTouchBarMenu; > }; >diff --git a/Source/WebCore/html/HTMLMetaElement.cpp b/Source/WebCore/html/HTMLMetaElement.cpp >index 644804909c3c00eb3aa97d38fa3cf7e0c1e74204..af6e6c10311c409299b98b6f62fc8b4fd840a645 100644 >--- a/Source/WebCore/html/HTMLMetaElement.cpp >+++ b/Source/WebCore/html/HTMLMetaElement.cpp >@@ -52,7 +52,7 @@ Ref<HTMLMetaElement> HTMLMetaElement::create(const QualifiedName& tagName, Docum > return adoptRef(*new HTMLMetaElement(tagName, document)); > } > >-void HTMLMetaElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLMetaElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == http_equivAttr) > process(); >@@ -83,7 +83,7 @@ void HTMLMetaElement::process() > if (!isConnected()) > return; > >- const AtomicString& contentValue = attributeWithoutSynchronization(contentAttr); >+ const AtomString& contentValue = attributeWithoutSynchronization(contentAttr); > if (contentValue.isNull()) > return; > >@@ -104,22 +104,22 @@ void HTMLMetaElement::process() > else if (equalLettersIgnoringASCIICase(name(), "referrer")) > document().processReferrerPolicy(contentValue, ReferrerPolicySource::MetaTag); > >- const AtomicString& httpEquivValue = attributeWithoutSynchronization(http_equivAttr); >+ const AtomString& httpEquivValue = attributeWithoutSynchronization(http_equivAttr); > if (!httpEquivValue.isNull()) > document().processHttpEquiv(httpEquivValue, contentValue, isDescendantOf(document().head())); > } > >-const AtomicString& HTMLMetaElement::content() const >+const AtomString& HTMLMetaElement::content() const > { > return attributeWithoutSynchronization(contentAttr); > } > >-const AtomicString& HTMLMetaElement::httpEquiv() const >+const AtomString& HTMLMetaElement::httpEquiv() const > { > return attributeWithoutSynchronization(http_equivAttr); > } > >-const AtomicString& HTMLMetaElement::name() const >+const AtomString& HTMLMetaElement::name() const > { > return getNameAttribute(); > } >diff --git a/Source/WebCore/html/HTMLMetaElement.h b/Source/WebCore/html/HTMLMetaElement.h >index 156e19c6b40ba83edf896b87bb910d14b4dd1234..43e09ef8415993c66272b7542707c021baae8f60 100644 >--- a/Source/WebCore/html/HTMLMetaElement.h >+++ b/Source/WebCore/html/HTMLMetaElement.h >@@ -32,14 +32,14 @@ public: > static Ref<HTMLMetaElement> create(Document&); > static Ref<HTMLMetaElement> create(const QualifiedName&, Document&); > >- const AtomicString& content() const; >- const AtomicString& httpEquiv() const; >- const AtomicString& name() const; >+ const AtomString& content() const; >+ const AtomString& httpEquiv() const; >+ const AtomString& name() const; > > private: > HTMLMetaElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; > void didFinishInsertingNode(); > >diff --git a/Source/WebCore/html/HTMLMeterElement.cpp b/Source/WebCore/html/HTMLMeterElement.cpp >index bdc71836073ca3a4a608e0e2f54a1b706e0b03af..c52c471e18e67aa36007df862ea31f97938e8878 100644 >--- a/Source/WebCore/html/HTMLMeterElement.cpp >+++ b/Source/WebCore/html/HTMLMeterElement.cpp >@@ -71,7 +71,7 @@ bool HTMLMeterElement::childShouldCreateRenderer(const Node& child) const > return !is<RenderMeter>(renderer()) && HTMLElement::childShouldCreateRenderer(child); > } > >-void HTMLMeterElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLMeterElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == valueAttr || name == minAttr || name == maxAttr || name == lowAttr || name == highAttr || name == optimumAttr) > didElementStateChange(); >@@ -86,7 +86,7 @@ double HTMLMeterElement::min() const > > void HTMLMeterElement::setMin(double min) > { >- setAttributeWithoutSynchronization(minAttr, AtomicString::number(min)); >+ setAttributeWithoutSynchronization(minAttr, AtomString::number(min)); > } > > double HTMLMeterElement::max() const >@@ -96,7 +96,7 @@ double HTMLMeterElement::max() const > > void HTMLMeterElement::setMax(double max) > { >- setAttributeWithoutSynchronization(maxAttr, AtomicString::number(max)); >+ setAttributeWithoutSynchronization(maxAttr, AtomString::number(max)); > } > > double HTMLMeterElement::value() const >@@ -107,7 +107,7 @@ double HTMLMeterElement::value() const > > void HTMLMeterElement::setValue(double value) > { >- setAttributeWithoutSynchronization(valueAttr, AtomicString::number(value)); >+ setAttributeWithoutSynchronization(valueAttr, AtomString::number(value)); > } > > double HTMLMeterElement::low() const >@@ -118,7 +118,7 @@ double HTMLMeterElement::low() const > > void HTMLMeterElement::setLow(double low) > { >- setAttributeWithoutSynchronization(lowAttr, AtomicString::number(low)); >+ setAttributeWithoutSynchronization(lowAttr, AtomString::number(low)); > } > > double HTMLMeterElement::high() const >@@ -129,7 +129,7 @@ double HTMLMeterElement::high() const > > void HTMLMeterElement::setHigh(double high) > { >- setAttributeWithoutSynchronization(highAttr, AtomicString::number(high)); >+ setAttributeWithoutSynchronization(highAttr, AtomString::number(high)); > } > > double HTMLMeterElement::optimum() const >@@ -140,7 +140,7 @@ double HTMLMeterElement::optimum() const > > void HTMLMeterElement::setOptimum(double optimum) > { >- setAttributeWithoutSynchronization(optimumAttr, AtomicString::number(optimum)); >+ setAttributeWithoutSynchronization(optimumAttr, AtomString::number(optimum)); > } > > HTMLMeterElement::GaugeRegion HTMLMeterElement::gaugeRegion() const >diff --git a/Source/WebCore/html/HTMLMeterElement.h b/Source/WebCore/html/HTMLMeterElement.h >index ae16f827b5602238da2344fdc845ac5661157228..fe2ceaf3e214c0712182ec1cbe78424438b37fdb 100644 >--- a/Source/WebCore/html/HTMLMeterElement.h >+++ b/Source/WebCore/html/HTMLMeterElement.h >@@ -73,7 +73,7 @@ private: > > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; > bool childShouldCreateRenderer(const Node&) const final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > void didElementStateChange(); > void didAddUserAgentShadowRoot(ShadowRoot&) final; >diff --git a/Source/WebCore/html/HTMLNameCollection.cpp b/Source/WebCore/html/HTMLNameCollection.cpp >index cb8a15c2c9a8f5475f1a006a07db4ee1ccf97a1c..acc1dac7f1a8cabaca29f7f24cec0700e238ac28 100644 >--- a/Source/WebCore/html/HTMLNameCollection.cpp >+++ b/Source/WebCore/html/HTMLNameCollection.cpp >@@ -51,7 +51,7 @@ bool WindowNameCollection::elementMatchesIfNameAttributeMatch(const Element& ele > || is<HTMLObjectElement>(element); > } > >-bool WindowNameCollection::elementMatches(const Element& element, const AtomicStringImpl* name) >+bool WindowNameCollection::elementMatches(const Element& element, const AtomStringImpl* name) > { > // Find only images, forms, applets, embeds and objects by name, but anything by id. > return (elementMatchesIfNameAttributeMatch(element) && element.getNameAttribute().impl() == name) >@@ -81,7 +81,7 @@ bool DocumentNameCollection::elementMatchesIfNameAttributeMatch(const Element& e > || is<HTMLImageElement>(element); > } > >-bool DocumentNameCollection::elementMatches(const Element& element, const AtomicStringImpl* name) >+bool DocumentNameCollection::elementMatches(const Element& element, const AtomStringImpl* name) > { > // Find images, forms, applets, embeds, objects and iframes by name, applets and object by id, and images by id > // but only if they have a name attribute (this very strange rule matches IE). >diff --git a/Source/WebCore/html/HTMLNameCollection.h b/Source/WebCore/html/HTMLNameCollection.h >index 4588899400551b922a4b31a56e93373f487c9ce5..9b5ac5cef87eeda3d3dac9b6b14e27a707230df5 100644 >--- a/Source/WebCore/html/HTMLNameCollection.h >+++ b/Source/WebCore/html/HTMLNameCollection.h >@@ -25,7 +25,7 @@ > #include "CachedHTMLCollection.h" > #include "NodeRareData.h" > #include <wtf/IsoMalloc.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -40,13 +40,13 @@ public: > Document& document() { return downcast<Document>(this->ownerNode()); } > > protected: >- HTMLNameCollection(Document&, CollectionType, const AtomicString& name); >+ HTMLNameCollection(Document&, CollectionType, const AtomString& name); > >- AtomicString m_name; >+ AtomString m_name; > }; > > template <typename HTMLCollectionClass, CollectionTraversalType traversalType> >-HTMLNameCollection<HTMLCollectionClass, traversalType>::HTMLNameCollection(Document& document, CollectionType type, const AtomicString& name) >+HTMLNameCollection<HTMLCollectionClass, traversalType>::HTMLNameCollection(Document& document, CollectionType type, const AtomString& name) > : CachedHTMLCollection<HTMLCollectionClass, traversalType>(document, type) > , m_name(name) > { >@@ -63,7 +63,7 @@ HTMLNameCollection<HTMLCollectionClass, traversalType>::~HTMLNameCollection() > class WindowNameCollection final : public HTMLNameCollection<WindowNameCollection, CollectionTraversalType::Descendants> { > WTF_MAKE_ISO_ALLOCATED(WindowNameCollection); > public: >- static Ref<WindowNameCollection> create(Document& document, CollectionType type, const AtomicString& name) >+ static Ref<WindowNameCollection> create(Document& document, CollectionType type, const AtomString& name) > { > return adoptRef(*new WindowNameCollection(document, type, name)); > } >@@ -73,10 +73,10 @@ public: > > static bool elementMatchesIfIdAttributeMatch(const Element&) { return true; } > static bool elementMatchesIfNameAttributeMatch(const Element&); >- static bool elementMatches(const Element&, const AtomicStringImpl*); >+ static bool elementMatches(const Element&, const AtomStringImpl*); > > private: >- WindowNameCollection(Document& document, CollectionType type, const AtomicString& name) >+ WindowNameCollection(Document& document, CollectionType type, const AtomString& name) > : HTMLNameCollection<WindowNameCollection, CollectionTraversalType::Descendants>(document, type, name) > { > ASSERT(type == WindowNamedItems); >@@ -86,7 +86,7 @@ private: > class DocumentNameCollection final : public HTMLNameCollection<DocumentNameCollection, CollectionTraversalType::Descendants> { > WTF_MAKE_ISO_ALLOCATED(DocumentNameCollection); > public: >- static Ref<DocumentNameCollection> create(Document& document, CollectionType type, const AtomicString& name) >+ static Ref<DocumentNameCollection> create(Document& document, CollectionType type, const AtomString& name) > { > return adoptRef(*new DocumentNameCollection(document, type, name)); > } >@@ -97,10 +97,10 @@ public: > // For CachedHTMLCollection. > bool elementMatches(const Element& element) const { return elementMatches(element, m_name.impl()); } > >- static bool elementMatches(const Element&, const AtomicStringImpl*); >+ static bool elementMatches(const Element&, const AtomStringImpl*); > > private: >- DocumentNameCollection(Document& document, CollectionType type, const AtomicString& name) >+ DocumentNameCollection(Document& document, CollectionType type, const AtomString& name) > : HTMLNameCollection<DocumentNameCollection, CollectionTraversalType::Descendants>(document, type, name) > { > ASSERT(type == DocumentNamedItems); >diff --git a/Source/WebCore/html/HTMLOListElement.cpp b/Source/WebCore/html/HTMLOListElement.cpp >index 4cd8659e59c4aed0a08f3e5961c5adcc64b7cebd..be8cb5a98f87ba31b86623b6cdb0268e3c0ec82c 100644 >--- a/Source/WebCore/html/HTMLOListElement.cpp >+++ b/Source/WebCore/html/HTMLOListElement.cpp >@@ -66,7 +66,7 @@ bool HTMLOListElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLElement::isPresentationAttribute(name); > } > >-void HTMLOListElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLOListElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == typeAttr) { > if (value == "a") >@@ -83,7 +83,7 @@ void HTMLOListElement::collectStyleForPresentationAttribute(const QualifiedName& > HTMLElement::collectStyleForPresentationAttribute(name, value, style); > } > >-void HTMLOListElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLOListElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == startAttr) { > int oldStart = start(); >diff --git a/Source/WebCore/html/HTMLOListElement.h b/Source/WebCore/html/HTMLOListElement.h >index 813f5e062db25b54319acd325599b000f959c954..f305ca59b9961d6ec92d624a1a8866488f03cbed 100644 >--- a/Source/WebCore/html/HTMLOListElement.h >+++ b/Source/WebCore/html/HTMLOListElement.h >@@ -48,9 +48,9 @@ private: > > WEBCORE_EXPORT unsigned itemCount() const; > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > > Optional<int> m_start; > mutable Optional<unsigned> m_itemCount; >diff --git a/Source/WebCore/html/HTMLObjectElement.cpp b/Source/WebCore/html/HTMLObjectElement.cpp >index 797783ba86ecbdb7a0ace2c6cb3665c4ed52d566..31ea9c2ed6a173af01c3da0c2eff38be2f9d9818 100644 >--- a/Source/WebCore/html/HTMLObjectElement.cpp >+++ b/Source/WebCore/html/HTMLObjectElement.cpp >@@ -93,7 +93,7 @@ bool HTMLObjectElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLPlugInImageElement::isPresentationAttribute(name); > } > >-void HTMLObjectElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLObjectElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == borderAttr) > applyBorderAttributeToStyle(value, style); >@@ -101,7 +101,7 @@ void HTMLObjectElement::collectStyleForPresentationAttribute(const QualifiedName > HTMLPlugInImageElement::collectStyleForPresentationAttribute(name, value, style); > } > >-void HTMLObjectElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLObjectElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > bool invalidateRenderer = false; > >@@ -190,7 +190,7 @@ void HTMLObjectElement::parametersForPlugin(Vector<String>& paramNames, Vector<S > // Turn the attributes of the <object> element into arrays, but don't override <param> values. > if (hasAttributes()) { > for (const Attribute& attribute : attributesIterator()) { >- const AtomicString& name = attribute.name().localName(); >+ const AtomString& name = attribute.name().localName(); > if (!uniqueParamNames.contains(name.impl())) { > paramNames.append(name.string()); > paramValues.append(attribute.value().string()); >@@ -324,7 +324,7 @@ bool HTMLObjectElement::isURLAttribute(const Attribute& attribute) const > return attribute.name() == dataAttr || attribute.name() == codebaseAttr || (attribute.name() == usemapAttr && attribute.value().string()[0] != '#') || HTMLPlugInImageElement::isURLAttribute(attribute); > } > >-const AtomicString& HTMLObjectElement::imageSourceURL() const >+const AtomString& HTMLObjectElement::imageSourceURL() const > { > return attributeWithoutSynchronization(dataAttr); > } >@@ -457,7 +457,7 @@ void HTMLObjectElement::addSubresourceAttributeURLs(ListHashSet<URL>& urls) cons > > // FIXME: Passing a string that starts with "#" to the completeURL function does > // not seem like it would work. The image element has similar but not identical code. >- const AtomicString& useMap = attributeWithoutSynchronization(usemapAttr); >+ const AtomString& useMap = attributeWithoutSynchronization(usemapAttr); > if (useMap.startsWith('#')) > addSubresourceURL(urls, document().completeURL(useMap)); > } >diff --git a/Source/WebCore/html/HTMLObjectElement.h b/Source/WebCore/html/HTMLObjectElement.h >index bbbbc858a73ce9bf746b637019bf4e8ad4e5d913..1d6f285111a923ab99d624e432860c0012410114 100644 >--- a/Source/WebCore/html/HTMLObjectElement.h >+++ b/Source/WebCore/html/HTMLObjectElement.h >@@ -59,9 +59,9 @@ public: > private: > HTMLObjectElement(const QualifiedName&, Document&, HTMLFormElement*); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; > void didFinishInsertingNode() final; >@@ -72,7 +72,7 @@ private: > void childrenChanged(const ChildChange&) final; > > bool isURLAttribute(const Attribute&) const final; >- const AtomicString& imageSourceURL() const final; >+ const AtomString& imageSourceURL() const final; > > RenderWidget* renderWidgetLoadingPlugin() const final; > >diff --git a/Source/WebCore/html/HTMLOptGroupElement.cpp b/Source/WebCore/html/HTMLOptGroupElement.cpp >index 7387dd0321b861451de125204b42b1eac012d021..9e8cffdb91a51090428459effe865a48e07f4808 100644 >--- a/Source/WebCore/html/HTMLOptGroupElement.cpp >+++ b/Source/WebCore/html/HTMLOptGroupElement.cpp >@@ -66,9 +66,9 @@ bool HTMLOptGroupElement::isFocusable() const > return style && style->display() != DisplayType::None; > } > >-const AtomicString& HTMLOptGroupElement::formControlType() const >+const AtomString& HTMLOptGroupElement::formControlType() const > { >- static NeverDestroyed<const AtomicString> optgroup("optgroup", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> optgroup("optgroup", AtomString::ConstructFromLiteral); > return optgroup; > } > >@@ -78,7 +78,7 @@ void HTMLOptGroupElement::childrenChanged(const ChildChange& change) > HTMLElement::childrenChanged(change); > } > >-void HTMLOptGroupElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLOptGroupElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > HTMLElement::parseAttribute(name, value); > recalcSelectOptions(); >diff --git a/Source/WebCore/html/HTMLOptGroupElement.h b/Source/WebCore/html/HTMLOptGroupElement.h >index 2f88a73cfd716af5dd6dec10f0c1ba198b64f7b0..a233b3504da3e377f794798533deb69fdc7d2aa1 100644 >--- a/Source/WebCore/html/HTMLOptGroupElement.h >+++ b/Source/WebCore/html/HTMLOptGroupElement.h >@@ -42,9 +42,9 @@ public: > private: > HTMLOptGroupElement(const QualifiedName&, Document&); > >- const AtomicString& formControlType() const; >+ const AtomString& formControlType() const; > bool isFocusable() const final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool rendererIsNeeded(const RenderStyle&) final { return false; } > > void childrenChanged(const ChildChange&) final; >diff --git a/Source/WebCore/html/HTMLOptionElement.cpp b/Source/WebCore/html/HTMLOptionElement.cpp >index df9b1dd1e51d66fb1764bcea38ecb0ada54639dd..c3dd30d5dc62bf831709e57004688d4a88b3e2a6 100644 >--- a/Source/WebCore/html/HTMLOptionElement.cpp >+++ b/Source/WebCore/html/HTMLOptionElement.cpp >@@ -162,7 +162,7 @@ int HTMLOptionElement::index() const > return 0; > } > >-void HTMLOptionElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLOptionElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > #if ENABLE(DATALIST_ELEMENT) > if (name == valueAttr) { >@@ -194,7 +194,7 @@ void HTMLOptionElement::parseAttribute(const QualifiedName& name, const AtomicSt > > String HTMLOptionElement::value() const > { >- const AtomicString& value = attributeWithoutSynchronization(valueAttr); >+ const AtomString& value = attributeWithoutSynchronization(valueAttr); > if (!value.isNull()) > return value; > return stripLeadingAndTrailingHTMLSpaces(collectOptionInnerText()).simplifyWhiteSpace(isHTMLSpace); >diff --git a/Source/WebCore/html/HTMLOptionElement.h b/Source/WebCore/html/HTMLOptionElement.h >index 7b27fbde83953c5144d5c0811c4eb7e7a7c23201..f0d94c8a6b5f308334eaa11da9e4021b5c0e57e6 100644 >--- a/Source/WebCore/html/HTMLOptionElement.h >+++ b/Source/WebCore/html/HTMLOptionElement.h >@@ -73,7 +73,7 @@ private: > bool rendererIsNeeded(const RenderStyle&) final { return false; } > bool matchesDefaultPseudoClass() const final; > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; > void accessKeyAction(bool) final; >diff --git a/Source/WebCore/html/HTMLOptionsCollection.h b/Source/WebCore/html/HTMLOptionsCollection.h >index a3c11d6b6d0241bbd204691960defec23f20cc43..67652e9b494a63e12a77df9f5c5d14b40ec6116e 100644 >--- a/Source/WebCore/html/HTMLOptionsCollection.h >+++ b/Source/WebCore/html/HTMLOptionsCollection.h >@@ -40,7 +40,7 @@ public: > const HTMLSelectElement& selectElement() const { return downcast<HTMLSelectElement>(ownerNode()); } > > HTMLOptionElement* item(unsigned offset) const final; >- HTMLOptionElement* namedItem(const AtomicString& name) const final; >+ HTMLOptionElement* namedItem(const AtomString& name) const final; > > ExceptionOr<void> setItem(unsigned index, HTMLOptionElement*); > >@@ -66,7 +66,7 @@ inline HTMLOptionElement* HTMLOptionsCollection::item(unsigned offset) const > return downcast<HTMLOptionElement>(Base::item(offset)); > } > >-inline HTMLOptionElement* HTMLOptionsCollection::namedItem(const AtomicString& name) const >+inline HTMLOptionElement* HTMLOptionsCollection::namedItem(const AtomString& name) const > { > return downcast<HTMLOptionElement>(Base::namedItem(name)); > } >diff --git a/Source/WebCore/html/HTMLOutputElement.cpp b/Source/WebCore/html/HTMLOutputElement.cpp >index f30d9dafdce29f9e43f305bd9ff41186f2324bd8..dd4fa2d70e4f43f42b8222d37d4418f1a131ed87 100644 >--- a/Source/WebCore/html/HTMLOutputElement.cpp >+++ b/Source/WebCore/html/HTMLOutputElement.cpp >@@ -55,9 +55,9 @@ Ref<HTMLOutputElement> HTMLOutputElement::create(const QualifiedName& tagName, D > return adoptRef(*new HTMLOutputElement(tagName, document, form)); > } > >-const AtomicString& HTMLOutputElement::formControlType() const >+const AtomString& HTMLOutputElement::formControlType() const > { >- static NeverDestroyed<const AtomicString> output("output", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> output("output", AtomString::ConstructFromLiteral); > return output; > } > >@@ -66,7 +66,7 @@ bool HTMLOutputElement::supportsFocus() const > return HTMLElement::supportsFocus(); > } > >-void HTMLOutputElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLOutputElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == forAttr) { > if (m_tokens) >diff --git a/Source/WebCore/html/HTMLOutputElement.h b/Source/WebCore/html/HTMLOutputElement.h >index 0a72e45c49e886b4386b086e594556438b2ba86c..5034b0231396644cdc0474cddccb1039098f40dd 100644 >--- a/Source/WebCore/html/HTMLOutputElement.h >+++ b/Source/WebCore/html/HTMLOutputElement.h >@@ -52,8 +52,8 @@ private: > HTMLOutputElement(const QualifiedName&, Document&, HTMLFormElement*); > > bool computeWillValidate() const final { return false; } >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >- const AtomicString& formControlType() const final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; >+ const AtomString& formControlType() const final; > bool isEnumeratable() const final { return true; } > bool supportLabels() const final { return true; } > bool supportsFocus() const final; >diff --git a/Source/WebCore/html/HTMLParagraphElement.cpp b/Source/WebCore/html/HTMLParagraphElement.cpp >index 01c6bae817803e69a7eaf4031d13d23f0e8e3e37..efa9d7ad1e14439eaa1ef62dc62a804164b0d8c5 100644 >--- a/Source/WebCore/html/HTMLParagraphElement.cpp >+++ b/Source/WebCore/html/HTMLParagraphElement.cpp >@@ -51,7 +51,7 @@ Ref<HTMLParagraphElement> HTMLParagraphElement::create(const QualifiedName& tagN > return adoptRef(*new HTMLParagraphElement(tagName, document)); > } > >-void HTMLParagraphElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLParagraphElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == alignAttr) { > if (equalLettersIgnoringASCIICase(value, "middle") || equalLettersIgnoringASCIICase(value, "center")) >diff --git a/Source/WebCore/html/HTMLParagraphElement.h b/Source/WebCore/html/HTMLParagraphElement.h >index ad701d44771089a2b70ac13a3e36d9db1f661382..dc3aa8b9548a9087ab8a07db747e8f5522a8a1cc 100644 >--- a/Source/WebCore/html/HTMLParagraphElement.h >+++ b/Source/WebCore/html/HTMLParagraphElement.h >@@ -35,7 +35,7 @@ public: > private: > HTMLParagraphElement(const QualifiedName&, Document&); > >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/html/HTMLPlugInElement.cpp b/Source/WebCore/html/HTMLPlugInElement.cpp >index 653bbae4ff38fe50ab7ccc6cde857cd860aa5dcc..6532462bfbe13584a9b6ab2df3f4b6e404f57339 100644 >--- a/Source/WebCore/html/HTMLPlugInElement.cpp >+++ b/Source/WebCore/html/HTMLPlugInElement.cpp >@@ -165,7 +165,7 @@ bool HTMLPlugInElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLFrameOwnerElement::isPresentationAttribute(name); > } > >-void HTMLPlugInElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLPlugInElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == widthAttr) > addHTMLLengthToStyle(style, CSSPropertyWidth, value); >diff --git a/Source/WebCore/html/HTMLPlugInElement.h b/Source/WebCore/html/HTMLPlugInElement.h >index c42c0d3f0cf47258a112a5edf58da6bbaed42fc7..57c5c21daa56a83c8709ac1f82e3d8501bbada39 100644 >--- a/Source/WebCore/html/HTMLPlugInElement.h >+++ b/Source/WebCore/html/HTMLPlugInElement.h >@@ -95,7 +95,7 @@ protected: > > void willDetachRenderers() override; > bool isPresentationAttribute(const QualifiedName&) const override; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) override; > > virtual bool useFallbackContent() const { return false; } > >diff --git a/Source/WebCore/html/HTMLPlugInImageElement.cpp b/Source/WebCore/html/HTMLPlugInImageElement.cpp >index 31ab1c2724e5aae43810724639d410eaab152551..7f6289acbc10193fce85d45bd2e3459e86c04a8a 100644 >--- a/Source/WebCore/html/HTMLPlugInImageElement.cpp >+++ b/Source/WebCore/html/HTMLPlugInImageElement.cpp >@@ -414,7 +414,7 @@ void HTMLPlugInImageElement::didAddUserAgentShadowRoot(ShadowRoot& root) > > bool HTMLPlugInImageElement::partOfSnapshotOverlay(const EventTarget* target) const > { >- static NeverDestroyed<AtomicString> selector(".snapshot-overlay", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> selector(".snapshot-overlay", AtomString::ConstructFromLiteral); > auto shadow = userAgentShadowRoot(); > if (!shadow) > return false; >diff --git a/Source/WebCore/html/HTMLPreElement.cpp b/Source/WebCore/html/HTMLPreElement.cpp >index 5cf319da007e356bb784deb632afefb4c48fe049..c8b4f7ac3d0842a3ddb8006ad75531307241a7b5 100644 >--- a/Source/WebCore/html/HTMLPreElement.cpp >+++ b/Source/WebCore/html/HTMLPreElement.cpp >@@ -52,7 +52,7 @@ bool HTMLPreElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLElement::isPresentationAttribute(name); > } > >-void HTMLPreElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLPreElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == wrapAttr) > style.setProperty(CSSPropertyWhiteSpace, CSSValuePreWrap); >diff --git a/Source/WebCore/html/HTMLPreElement.h b/Source/WebCore/html/HTMLPreElement.h >index 70db482ce63d72f6f8da8de6c45915ca0cd2f8f2..ddcdc56bb6592714f75d614d857cc5556b90d74f 100644 >--- a/Source/WebCore/html/HTMLPreElement.h >+++ b/Source/WebCore/html/HTMLPreElement.h >@@ -35,7 +35,7 @@ private: > HTMLPreElement(const QualifiedName&, Document&); > > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/html/HTMLProgressElement.cpp b/Source/WebCore/html/HTMLProgressElement.cpp >index c2e750e9a278824ded83c528358a0c9f9fa048fa..6343abb59f6084bf4e4809c172439790fad8cffd 100644 >--- a/Source/WebCore/html/HTMLProgressElement.cpp >+++ b/Source/WebCore/html/HTMLProgressElement.cpp >@@ -75,7 +75,7 @@ RenderProgress* HTMLProgressElement::renderProgress() const > return downcast<RenderProgress>(descendantsOfType<Element>(*userAgentShadowRoot()).first()->renderer()); > } > >-void HTMLProgressElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLProgressElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == valueAttr) > didElementStateChange(); >@@ -99,7 +99,7 @@ double HTMLProgressElement::value() const > > void HTMLProgressElement::setValue(double value) > { >- setAttributeWithoutSynchronization(valueAttr, AtomicString::number(value)); >+ setAttributeWithoutSynchronization(valueAttr, AtomString::number(value)); > } > > double HTMLProgressElement::max() const >@@ -111,7 +111,7 @@ double HTMLProgressElement::max() const > void HTMLProgressElement::setMax(double max) > { > if (max > 0) >- setAttributeWithoutSynchronization(maxAttr, AtomicString::number(max)); >+ setAttributeWithoutSynchronization(maxAttr, AtomString::number(max)); > } > > double HTMLProgressElement::position() const >diff --git a/Source/WebCore/html/HTMLProgressElement.h b/Source/WebCore/html/HTMLProgressElement.h >index d1fa08c69d46618e0f2f5589c353ba802e5cb152..4fb0e7a3c38c6e584f59343ca7178a8fb019efab 100644 >--- a/Source/WebCore/html/HTMLProgressElement.h >+++ b/Source/WebCore/html/HTMLProgressElement.h >@@ -54,7 +54,7 @@ private: > bool childShouldCreateRenderer(const Node&) const final; > RenderProgress* renderProgress() const; > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > void didAttachRenderers() final; > >diff --git a/Source/WebCore/html/HTMLScriptElement.cpp b/Source/WebCore/html/HTMLScriptElement.cpp >index 60610984024c18dcceeb02a78c380d946feeaa74..f40d57d2fb4e31e6b80094ab44cde1387e924d31 100644 >--- a/Source/WebCore/html/HTMLScriptElement.cpp >+++ b/Source/WebCore/html/HTMLScriptElement.cpp >@@ -61,7 +61,7 @@ void HTMLScriptElement::childrenChanged(const ChildChange& change) > ScriptElement::childrenChanged(change); > } > >-void HTMLScriptElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLScriptElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == srcAttr) > handleSourceAttribute(value); >@@ -99,7 +99,7 @@ bool HTMLScriptElement::async() const > return hasAttributeWithoutSynchronization(asyncAttr) || forceAsync(); > } > >-void HTMLScriptElement::setCrossOrigin(const AtomicString& value) >+void HTMLScriptElement::setCrossOrigin(const AtomString& value) > { > setAttributeWithoutSynchronization(crossoriginAttr, value); > } >diff --git a/Source/WebCore/html/HTMLScriptElement.h b/Source/WebCore/html/HTMLScriptElement.h >index bd1e3ed2f25ede6d92398715d7914793fde0f516..5faec2cc273c063c5467da77de7860577fb0c3bd 100644 >--- a/Source/WebCore/html/HTMLScriptElement.h >+++ b/Source/WebCore/html/HTMLScriptElement.h >@@ -41,7 +41,7 @@ public: > WEBCORE_EXPORT void setAsync(bool); > WEBCORE_EXPORT bool async() const; > >- WEBCORE_EXPORT void setCrossOrigin(const AtomicString&); >+ WEBCORE_EXPORT void setCrossOrigin(const AtomString&); > WEBCORE_EXPORT String crossOrigin() const; > > using HTMLElement::ref; >@@ -50,7 +50,7 @@ public: > private: > HTMLScriptElement(const QualifiedName&, Document&, bool wasInsertedByParser, bool alreadyStarted); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; > void didFinishInsertingNode() final; > void childrenChanged(const ChildChange&) final; >diff --git a/Source/WebCore/html/HTMLSelectElement.cpp b/Source/WebCore/html/HTMLSelectElement.cpp >index 3ea01c073cf7f13395e2e8231281fcebcbb7639a..8ba30f2bcb2a1c3bb4dec29ab06f9589404be0dc 100644 >--- a/Source/WebCore/html/HTMLSelectElement.cpp >+++ b/Source/WebCore/html/HTMLSelectElement.cpp >@@ -98,10 +98,10 @@ void HTMLSelectElement::didRecalcStyle(Style::Change styleChange) > HTMLFormControlElement::didRecalcStyle(styleChange); > } > >-const AtomicString& HTMLSelectElement::formControlType() const >+const AtomString& HTMLSelectElement::formControlType() const > { >- static NeverDestroyed<const AtomicString> selectMultiple("select-multiple", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> selectOne("select-one", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> selectMultiple("select-multiple", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> selectOne("select-one", AtomString::ConstructFromLiteral); > return m_multiple ? selectMultiple : selectOne; > } > >@@ -288,7 +288,7 @@ bool HTMLSelectElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLFormControlElementWithState::isPresentationAttribute(name); > } > >-void HTMLSelectElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLSelectElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == sizeAttr) { > unsigned oldSize = m_size; >@@ -408,7 +408,7 @@ void HTMLSelectElement::setSize(unsigned size) > setUnsignedIntegralAttribute(sizeAttr, limitToOnlyHTMLNonNegative(size)); > } > >-HTMLOptionElement* HTMLSelectElement::namedItem(const AtomicString& name) >+HTMLOptionElement* HTMLSelectElement::namedItem(const AtomString& name) > { > return options()->namedItem(name); > } >@@ -1026,7 +1026,7 @@ void HTMLSelectElement::restoreFormControlState(const FormControlState& state) > updateValidity(); > } > >-void HTMLSelectElement::parseMultipleAttribute(const AtomicString& value) >+void HTMLSelectElement::parseMultipleAttribute(const AtomString& value) > { > bool oldUsesMenuList = usesMenuList(); > m_multiple = !value.isNull(); >@@ -1037,7 +1037,7 @@ void HTMLSelectElement::parseMultipleAttribute(const AtomicString& value) > > bool HTMLSelectElement::appendFormData(DOMFormData& formData, bool) > { >- const AtomicString& name = this->name(); >+ const AtomString& name = this->name(); > if (name.isEmpty()) > return false; > >diff --git a/Source/WebCore/html/HTMLSelectElement.h b/Source/WebCore/html/HTMLSelectElement.h >index 4eca39626d91fa7a32ea70ca2175e6a8f6575d22..fbe88776882dcd38456ab8d6dcc41660cf02eb1d 100644 >--- a/Source/WebCore/html/HTMLSelectElement.h >+++ b/Source/WebCore/html/HTMLSelectElement.h >@@ -84,7 +84,7 @@ public: > ExceptionOr<void> setItem(unsigned index, HTMLOptionElement*); > ExceptionOr<void> setLength(unsigned); > >- WEBCORE_EXPORT HTMLOptionElement* namedItem(const AtomicString& name); >+ WEBCORE_EXPORT HTMLOptionElement* namedItem(const AtomString& name); > WEBCORE_EXPORT HTMLOptionElement* item(unsigned index); > > void scrollToSelection(); >@@ -110,7 +110,7 @@ protected: > HTMLSelectElement(const QualifiedName&, Document&, HTMLFormElement*); > > private: >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > > bool isKeyboardFocusable(KeyboardEvent*) const final; > bool isMouseFocusable() const final; >@@ -126,7 +126,7 @@ private: > FormControlState saveFormControlState() const final; > void restoreFormControlState(const FormControlState&) final; > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isPresentationAttribute(const QualifiedName&) const final; > > bool childShouldCreateRenderer(const Node&) const final; >@@ -163,7 +163,7 @@ private: > typedef unsigned SelectOptionFlags; > void selectOption(int optionIndex, SelectOptionFlags = 0); > void deselectItemsWithoutValidation(HTMLElement* elementToExclude = nullptr); >- void parseMultipleAttribute(const AtomicString&); >+ void parseMultipleAttribute(const AtomString&); > int lastSelectedListIndex() const; > void updateSelectedState(int listIndex, bool multi, bool shift); > void menuListDefaultEventHandler(Event&); >diff --git a/Source/WebCore/html/HTMLSlotElement.cpp b/Source/WebCore/html/HTMLSlotElement.cpp >index 8190846802596e580d4a4b023b5011ff01fdad2b..7f4fa8b9a217e3d396643cd91567fff4a09f049b 100644 >--- a/Source/WebCore/html/HTMLSlotElement.cpp >+++ b/Source/WebCore/html/HTMLSlotElement.cpp >@@ -85,7 +85,7 @@ void HTMLSlotElement::childrenChanged(const ChildChange& childChange) > } > } > >-void HTMLSlotElement::attributeChanged(const QualifiedName& name, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason reason) >+void HTMLSlotElement::attributeChanged(const QualifiedName& name, const AtomString& oldValue, const AtomString& newValue, AttributeModificationReason reason) > { > HTMLElement::attributeChanged(name, oldValue, newValue, reason); > >diff --git a/Source/WebCore/html/HTMLSlotElement.h b/Source/WebCore/html/HTMLSlotElement.h >index ef8aecb54d83875e4a3941462e1c53f4c900d5b8..fd3de09e7d01fb16627c77fba32ec1a1b2095fa8 100644 >--- a/Source/WebCore/html/HTMLSlotElement.h >+++ b/Source/WebCore/html/HTMLSlotElement.h >@@ -53,7 +53,7 @@ private: > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; > void removedFromAncestor(RemovalType, ContainerNode&) final; > void childrenChanged(const ChildChange&) final; >- void attributeChanged(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason) final; >+ void attributeChanged(const QualifiedName&, const AtomString& oldValue, const AtomString& newValue, AttributeModificationReason) final; > > bool m_inSignalSlotList { false }; > }; >diff --git a/Source/WebCore/html/HTMLSourceElement.cpp b/Source/WebCore/html/HTMLSourceElement.cpp >index 29117283fba8edb0b352cb1d7aed40215b24d624..88ec5a76a60ecbf60ecd225811cbf332fe123bca 100644 >--- a/Source/WebCore/html/HTMLSourceElement.cpp >+++ b/Source/WebCore/html/HTMLSourceElement.cpp >@@ -154,7 +154,7 @@ void HTMLSourceElement::stop() > cancelPendingErrorEvent(); > } > >-void HTMLSourceElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLSourceElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > HTMLElement::parseAttribute(name, value); > if (name == srcsetAttr || name == sizesAttr || name == mediaAttr || name == typeAttr) { >diff --git a/Source/WebCore/html/HTMLSourceElement.h b/Source/WebCore/html/HTMLSourceElement.h >index 4f64854e28a2a950e84a23d7989c3cab5b775bbd..e122733e6d44d6c45a8ed16966d1b709e5bbb1d1 100644 >--- a/Source/WebCore/html/HTMLSourceElement.h >+++ b/Source/WebCore/html/HTMLSourceElement.h >@@ -57,7 +57,7 @@ private: > void resume() final; > void stop() final; > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > void errorEventTimerFired(); > >diff --git a/Source/WebCore/html/HTMLStyleElement.cpp b/Source/WebCore/html/HTMLStyleElement.cpp >index e528c5954cea7d31c674c4efac2c3b430748043b..5eb6371099f9f6bb0f4197a981b14e6dde8f3194 100644 >--- a/Source/WebCore/html/HTMLStyleElement.cpp >+++ b/Source/WebCore/html/HTMLStyleElement.cpp >@@ -76,7 +76,7 @@ Ref<HTMLStyleElement> HTMLStyleElement::create(Document& document) > return adoptRef(*new HTMLStyleElement(styleTag, document, false)); > } > >-void HTMLStyleElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLStyleElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == titleAttr && sheet() && !isInShadowTree()) > sheet()->setTitle(value); >diff --git a/Source/WebCore/html/HTMLStyleElement.h b/Source/WebCore/html/HTMLStyleElement.h >index af05b715f2017b85df8a20fb622b33968db70eb8..a553ea3567baa3d43f856c27c3ad3a37db7b86c2 100644 >--- a/Source/WebCore/html/HTMLStyleElement.h >+++ b/Source/WebCore/html/HTMLStyleElement.h >@@ -54,7 +54,7 @@ public: > private: > HTMLStyleElement(const QualifiedName&, Document&, bool createdByParser); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; > void removedFromAncestor(RemovalType, ContainerNode&) final; > void childrenChanged(const ChildChange&) final; >diff --git a/Source/WebCore/html/HTMLSummaryElement.cpp b/Source/WebCore/html/HTMLSummaryElement.cpp >index f098d5abf385c94d91dd7f590b1af4aa83796357..10bc09ff099c888b226269390b8e1f8be4ce3967 100644 >--- a/Source/WebCore/html/HTMLSummaryElement.cpp >+++ b/Source/WebCore/html/HTMLSummaryElement.cpp >@@ -47,7 +47,7 @@ private: > didChangeSlot(SlotAssignment::defaultSlotName(), shadowRoot); > } > >- const AtomicString& slotNameForHostChild(const Node&) const override { return SlotAssignment::defaultSlotName(); } >+ const AtomString& slotNameForHostChild(const Node&) const override { return SlotAssignment::defaultSlotName(); } > }; > > Ref<HTMLSummaryElement> HTMLSummaryElement::create(const QualifiedName& tagName, Document& document) >diff --git a/Source/WebCore/html/HTMLTableCaptionElement.cpp b/Source/WebCore/html/HTMLTableCaptionElement.cpp >index 210e1a73a0782de4c1a1c37505c5c2057dd4d5a9..9d97e286a8c1f380212357c2f28ee16b0efcb673 100644 >--- a/Source/WebCore/html/HTMLTableCaptionElement.cpp >+++ b/Source/WebCore/html/HTMLTableCaptionElement.cpp >@@ -46,7 +46,7 @@ Ref<HTMLTableCaptionElement> HTMLTableCaptionElement::create(const QualifiedName > return adoptRef(*new HTMLTableCaptionElement(tagName, document)); > } > >-void HTMLTableCaptionElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLTableCaptionElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == alignAttr) { > if (!value.isEmpty()) >diff --git a/Source/WebCore/html/HTMLTableCaptionElement.h b/Source/WebCore/html/HTMLTableCaptionElement.h >index 0020ea2fa95d4d7f6e41652f59986a190b8a2c36..801cde0bb1651e41a0ec3da86d8cb11ed9453bdd 100644 >--- a/Source/WebCore/html/HTMLTableCaptionElement.h >+++ b/Source/WebCore/html/HTMLTableCaptionElement.h >@@ -37,7 +37,7 @@ public: > private: > HTMLTableCaptionElement(const QualifiedName&, Document&); > >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/html/HTMLTableCellElement.cpp b/Source/WebCore/html/HTMLTableCellElement.cpp >index 1e1ebb994750a545a93ba33fdc5f1be08b3d6994..52a9b4fa6a67aeaf244d31e8120e14c04b4b29fb 100644 >--- a/Source/WebCore/html/HTMLTableCellElement.cpp >+++ b/Source/WebCore/html/HTMLTableCellElement.cpp >@@ -97,7 +97,7 @@ bool HTMLTableCellElement::isPresentationAttribute(const QualifiedName& name) co > return HTMLTablePartElement::isPresentationAttribute(name); > } > >-void HTMLTableCellElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLTableCellElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == nowrapAttr) > addPropertyToPresentationAttributeStyle(style, CSSPropertyWhiteSpace, CSSValueWebkitNowrap); >@@ -117,7 +117,7 @@ void HTMLTableCellElement::collectStyleForPresentationAttribute(const QualifiedN > HTMLTablePartElement::collectStyleForPresentationAttribute(name, value, style); > } > >-void HTMLTableCellElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLTableCellElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == rowspanAttr) { > if (is<RenderTableCell>(renderer())) >@@ -153,7 +153,7 @@ String HTMLTableCellElement::axis() const > > void HTMLTableCellElement::setColSpan(unsigned n) > { >- setAttributeWithoutSynchronization(colspanAttr, AtomicString::number(limitToOnlyHTMLNonNegative(n, 1))); >+ setAttributeWithoutSynchronization(colspanAttr, AtomString::number(limitToOnlyHTMLNonNegative(n, 1))); > } > > String HTMLTableCellElement::headers() const >@@ -163,18 +163,18 @@ String HTMLTableCellElement::headers() const > > void HTMLTableCellElement::setRowSpanForBindings(unsigned n) > { >- setAttributeWithoutSynchronization(rowspanAttr, AtomicString::number(limitToOnlyHTMLNonNegative(n, 1))); >+ setAttributeWithoutSynchronization(rowspanAttr, AtomString::number(limitToOnlyHTMLNonNegative(n, 1))); > } > >-const AtomicString& HTMLTableCellElement::scope() const >+const AtomString& HTMLTableCellElement::scope() const > { > // https://html.spec.whatwg.org/multipage/tables.html#attr-th-scope >- static NeverDestroyed<const AtomicString> row("row", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> col("col", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> rowgroup("rowgroup", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> colgroup("colgroup", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> row("row", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> col("col", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> rowgroup("rowgroup", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> colgroup("colgroup", AtomString::ConstructFromLiteral); > >- const AtomicString& value = attributeWithoutSynchronization(HTMLNames::scopeAttr); >+ const AtomString& value = attributeWithoutSynchronization(HTMLNames::scopeAttr); > > if (equalIgnoringASCIICase(value, row)) > return row; >@@ -187,7 +187,7 @@ const AtomicString& HTMLTableCellElement::scope() const > return emptyAtom(); > } > >-void HTMLTableCellElement::setScope(const AtomicString& scope) >+void HTMLTableCellElement::setScope(const AtomString& scope) > { > setAttributeWithoutSynchronization(scopeAttr, scope); > } >diff --git a/Source/WebCore/html/HTMLTableCellElement.h b/Source/WebCore/html/HTMLTableCellElement.h >index 84233b53c81c6fec804c6e0e95686b3d3bf77f2d..f04539313db75429dbe78343734885f94148ab6b 100644 >--- a/Source/WebCore/html/HTMLTableCellElement.h >+++ b/Source/WebCore/html/HTMLTableCellElement.h >@@ -46,17 +46,17 @@ public: > String abbr() const; > String axis() const; > String headers() const; >- WEBCORE_EXPORT const AtomicString& scope() const; >- WEBCORE_EXPORT void setScope(const AtomicString&); >+ WEBCORE_EXPORT const AtomString& scope() const; >+ WEBCORE_EXPORT void setScope(const AtomString&); > > WEBCORE_EXPORT HTMLTableCellElement* cellAbove() const; > > private: > HTMLTableCellElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > bool isPresentationAttribute(const QualifiedName&) const override; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) override; > const StyleProperties* additionalPresentationAttributeStyle() const override; > > bool isURLAttribute(const Attribute&) const override; >diff --git a/Source/WebCore/html/HTMLTableColElement.cpp b/Source/WebCore/html/HTMLTableColElement.cpp >index 209ff4efd37e15ae243fc4c075c262f19b6f803e..728b5f3d2b5523b04b399f2cc4b55aa4f8b1fc74 100644 >--- a/Source/WebCore/html/HTMLTableColElement.cpp >+++ b/Source/WebCore/html/HTMLTableColElement.cpp >@@ -61,7 +61,7 @@ bool HTMLTableColElement::isPresentationAttribute(const QualifiedName& name) con > return HTMLTablePartElement::isPresentationAttribute(name); > } > >-void HTMLTableColElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLTableColElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == widthAttr) > addHTMLLengthToStyle(style, CSSPropertyWidth, value); >@@ -69,7 +69,7 @@ void HTMLTableColElement::collectStyleForPresentationAttribute(const QualifiedNa > HTMLTablePartElement::collectStyleForPresentationAttribute(name, value, style); > } > >-void HTMLTableColElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLTableColElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == spanAttr) { > m_span = clampHTMLNonNegativeIntegerToRange(value, minSpan, maxSpan, defaultSpan); >diff --git a/Source/WebCore/html/HTMLTableColElement.h b/Source/WebCore/html/HTMLTableColElement.h >index dcf074d4cc026cffcfc833ee312bf7e23d622189..2f4f6382b64c7414a72813194971329dc249b412 100644 >--- a/Source/WebCore/html/HTMLTableColElement.h >+++ b/Source/WebCore/html/HTMLTableColElement.h >@@ -42,9 +42,9 @@ public: > private: > HTMLTableColElement(const QualifiedName& tagName, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > const StyleProperties* additionalPresentationAttributeStyle() const final; > > unsigned m_span; >diff --git a/Source/WebCore/html/HTMLTableElement.cpp b/Source/WebCore/html/HTMLTableElement.cpp >index be6ed0fea1bab2626e8036976b6074d5614364a9..238b9a949d7e99179cb9b85cf1309a60b0a77abe 100644 >--- a/Source/WebCore/html/HTMLTableElement.cpp >+++ b/Source/WebCore/html/HTMLTableElement.cpp >@@ -278,7 +278,7 @@ static bool setTableCellsChanged(Element& element) > return cellChanged; > } > >-static bool getBordersFromFrameAttributeValue(const AtomicString& value, bool& borderTop, bool& borderRight, bool& borderBottom, bool& borderLeft) >+static bool getBordersFromFrameAttributeValue(const AtomString& value, bool& borderTop, bool& borderRight, bool& borderBottom, bool& borderLeft) > { > borderTop = false; > borderRight = false; >@@ -304,7 +304,7 @@ static bool getBordersFromFrameAttributeValue(const AtomicString& value, bool& b > return true; > } > >-void HTMLTableElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLTableElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == widthAttr) > addHTMLLengthToStyle(style, CSSPropertyWidth, value); >@@ -368,7 +368,7 @@ bool HTMLTableElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLElement::isPresentationAttribute(name); > } > >-void HTMLTableElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLTableElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > CellBorders bordersBefore = cellBorders(); > unsigned short oldPadding = m_padding; >@@ -566,12 +566,12 @@ Ref<HTMLCollection> HTMLTableElement::tBodies() > return ensureRareData().ensureNodeLists().addCachedCollection<GenericCachedHTMLCollection<CollectionTypeTraits<TableTBodies>::traversalType>>(*this, TableTBodies); > } > >-const AtomicString& HTMLTableElement::rules() const >+const AtomString& HTMLTableElement::rules() const > { > return attributeWithoutSynchronization(rulesAttr); > } > >-const AtomicString& HTMLTableElement::summary() const >+const AtomString& HTMLTableElement::summary() const > { > return attributeWithoutSynchronization(summaryAttr); > } >diff --git a/Source/WebCore/html/HTMLTableElement.h b/Source/WebCore/html/HTMLTableElement.h >index a7b7f81ee4bcf071f8825e3bb674dc9521e93ca4..b3654209bda857885c6931c81b4ee3f986f38416 100644 >--- a/Source/WebCore/html/HTMLTableElement.h >+++ b/Source/WebCore/html/HTMLTableElement.h >@@ -62,8 +62,8 @@ public: > WEBCORE_EXPORT Ref<HTMLCollection> rows(); > WEBCORE_EXPORT Ref<HTMLCollection> tBodies(); > >- const AtomicString& rules() const; >- const AtomicString& summary() const; >+ const AtomString& rules() const; >+ const AtomString& summary() const; > > const StyleProperties* additionalCellStyle(); > const StyleProperties* additionalGroupStyle(bool rows); >@@ -71,9 +71,9 @@ public: > private: > HTMLTableElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > bool isURLAttribute(const Attribute&) const final; > > // Used to obtain either a solid or outset border decl and to deal with the frame and rules attributes. >diff --git a/Source/WebCore/html/HTMLTablePartElement.cpp b/Source/WebCore/html/HTMLTablePartElement.cpp >index 3bf2aac8bdfabb6b27761c8511d44419de4c77f2..35878016210fcaaff6090e695394155c455aea7c 100644 >--- a/Source/WebCore/html/HTMLTablePartElement.cpp >+++ b/Source/WebCore/html/HTMLTablePartElement.cpp >@@ -48,7 +48,7 @@ bool HTMLTablePartElement::isPresentationAttribute(const QualifiedName& name) co > return HTMLElement::isPresentationAttribute(name); > } > >-void HTMLTablePartElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLTablePartElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == bgcolorAttr) > addHTMLColorToStyle(style, CSSPropertyBackgroundColor, value); >diff --git a/Source/WebCore/html/HTMLTablePartElement.h b/Source/WebCore/html/HTMLTablePartElement.h >index 194fc5dfd4500b5a497efa4249b2322458bbea7c..d3bcf50bae21c358cde23f3363e5c692d56f11e6 100644 >--- a/Source/WebCore/html/HTMLTablePartElement.h >+++ b/Source/WebCore/html/HTMLTablePartElement.h >@@ -40,7 +40,7 @@ protected: > } > > bool isPresentationAttribute(const QualifiedName&) const override; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) override; > > RefPtr<HTMLTableElement> findParentTable() const; > }; >diff --git a/Source/WebCore/html/HTMLTextAreaElement.cpp b/Source/WebCore/html/HTMLTextAreaElement.cpp >index 86adeef778da0d88f383a7b41c9cca9bbcfe9978..125fdd3199266a6315f515fa1b4ea0b423774132 100644 >--- a/Source/WebCore/html/HTMLTextAreaElement.cpp >+++ b/Source/WebCore/html/HTMLTextAreaElement.cpp >@@ -109,9 +109,9 @@ void HTMLTextAreaElement::didAddUserAgentShadowRoot(ShadowRoot& root) > updateInnerTextElementEditability(); > } > >-const AtomicString& HTMLTextAreaElement::formControlType() const >+const AtomString& HTMLTextAreaElement::formControlType() const > { >- static NeverDestroyed<const AtomicString> textarea("textarea", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> textarea("textarea", AtomString::ConstructFromLiteral); > return textarea; > } > >@@ -148,7 +148,7 @@ bool HTMLTextAreaElement::isPresentationAttribute(const QualifiedName& name) con > return HTMLTextFormControlElement::isPresentationAttribute(name); > } > >-void HTMLTextAreaElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLTextAreaElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == wrapAttr) { > if (shouldWrapText()) { >@@ -162,7 +162,7 @@ void HTMLTextAreaElement::collectStyleForPresentationAttribute(const QualifiedNa > HTMLTextFormControlElement::collectStyleForPresentationAttribute(name, value, style); > } > >-void HTMLTextAreaElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLTextAreaElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == rowsAttr) { > unsigned rows = limitToOnlyHTMLNonNegativeNumbersGreaterThanZero(value, defaultRows); >@@ -201,13 +201,13 @@ void HTMLTextAreaElement::parseAttribute(const QualifiedName& name, const Atomic > HTMLTextFormControlElement::parseAttribute(name, value); > } > >-void HTMLTextAreaElement::maxLengthAttributeChanged(const AtomicString& newValue) >+void HTMLTextAreaElement::maxLengthAttributeChanged(const AtomString& newValue) > { > internalSetMaxLength(parseHTMLNonNegativeInteger(newValue).value_or(-1)); > updateValidity(); > } > >-void HTMLTextAreaElement::minLengthAttributeChanged(const AtomicString& newValue) >+void HTMLTextAreaElement::minLengthAttributeChanged(const AtomString& newValue) > { > internalSetMinLength(parseHTMLNonNegativeInteger(newValue).value_or(-1)); > updateValidity(); >diff --git a/Source/WebCore/html/HTMLTextAreaElement.h b/Source/WebCore/html/HTMLTextAreaElement.h >index a52bc62851b50a3cc54e9e7248c0d95aaa5ee9a3..01da69427dc59b4f1a1ab20f77ff40ee0b239ff6 100644 >--- a/Source/WebCore/html/HTMLTextAreaElement.h >+++ b/Source/WebCore/html/HTMLTextAreaElement.h >@@ -74,8 +74,8 @@ private: > > void didAddUserAgentShadowRoot(ShadowRoot&) final; > >- void maxLengthAttributeChanged(const AtomicString& newValue); >- void minLengthAttributeChanged(const AtomicString& newValue); >+ void maxLengthAttributeChanged(const AtomString& newValue); >+ void minLengthAttributeChanged(const AtomString& newValue); > > void handleBeforeTextInsertedEvent(BeforeTextInsertedEvent&) const; > static String sanitizeUserInputValue(const String&, unsigned maxLength); >@@ -98,7 +98,7 @@ private: > bool isEnumeratable() const final { return true; } > bool supportLabels() const final { return true; } > >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > > FormControlState saveFormControlState() const final; > void restoreFormControlState(const FormControlState&) final; >@@ -106,9 +106,9 @@ private: > bool isTextField() const final { return true; } > > void childrenChanged(const ChildChange&) final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; > bool appendFormData(DOMFormData&, bool) final; > void reset() final; >diff --git a/Source/WebCore/html/HTMLTextFormControlElement.cpp b/Source/WebCore/html/HTMLTextFormControlElement.cpp >index 8136933ad554c5a1f7e0c6ca7879d965efc3dca9..9722ff0e7d390126560005e3515a1b8b81ea998f 100644 >--- a/Source/WebCore/html/HTMLTextFormControlElement.cpp >+++ b/Source/WebCore/html/HTMLTextFormControlElement.cpp >@@ -130,7 +130,7 @@ String HTMLTextFormControlElement::strippedPlaceholder() const > { > // According to the HTML5 specification, we need to remove CR and LF from > // the attribute value. >- const AtomicString& attributeValue = attributeWithoutSynchronization(placeholderAttr); >+ const AtomString& attributeValue = attributeWithoutSynchronization(placeholderAttr); > if (!attributeValue.contains(newlineCharacter) && !attributeValue.contains(carriageReturn)) > return attributeValue; > >@@ -150,7 +150,7 @@ static bool isNotLineBreak(UChar ch) { return ch != newlineCharacter && ch != ca > > bool HTMLTextFormControlElement::isPlaceholderEmpty() const > { >- const AtomicString& attributeValue = attributeWithoutSynchronization(placeholderAttr); >+ const AtomString& attributeValue = attributeWithoutSynchronization(placeholderAttr); > return attributeValue.string().find(isNotLineBreak) == notFound; > } > >@@ -376,11 +376,11 @@ int HTMLTextFormControlElement::computeSelectionEnd() const > return indexForPosition(frame->selection().selection().end()); > } > >-static const AtomicString& directionString(TextFieldSelectionDirection direction) >+static const AtomString& directionString(TextFieldSelectionDirection direction) > { >- static NeverDestroyed<const AtomicString> none("none", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> forward("forward", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> backward("backward", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> none("none", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> forward("forward", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> backward("backward", AtomString::ConstructFromLiteral); > > switch (direction) { > case SelectionHasNoDirection: >@@ -395,7 +395,7 @@ static const AtomicString& directionString(TextFieldSelectionDirection direction > return none; > } > >-const AtomicString& HTMLTextFormControlElement::selectionDirection() const >+const AtomString& HTMLTextFormControlElement::selectionDirection() const > { > if (!isTextField()) > return directionString(SelectionHasNoDirection); >@@ -486,7 +486,7 @@ void HTMLTextFormControlElement::selectionChanged(bool shouldFireSelectEvent) > dispatchEvent(Event::create(eventNames().selectEvent, Event::CanBubble::Yes, Event::IsCancelable::No)); > } > >-void HTMLTextFormControlElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLTextFormControlElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == placeholderAttr) { > updatePlaceholderText(); >@@ -515,7 +515,7 @@ bool HTMLTextFormControlElement::isInnerTextElementEditable() const > void HTMLTextFormControlElement::updateInnerTextElementEditability() > { > if (auto innerText = innerTextElement()) { >- auto value = isInnerTextElementEditable() ? AtomicString { "plaintext-only", AtomicString::ConstructFromLiteral } : AtomicString { "false", AtomicString::ConstructFromLiteral }; >+ auto value = isInnerTextElementEditable() ? AtomString { "plaintext-only", AtomString::ConstructFromLiteral } : AtomString { "false", AtomString::ConstructFromLiteral }; > innerText->setAttributeWithoutSynchronization(contenteditableAttr, value); > } > } >@@ -758,7 +758,7 @@ static const Element* parentHTMLElement(const Element* element) > String HTMLTextFormControlElement::directionForFormData() const > { > for (const Element* element = this; element; element = parentHTMLElement(element)) { >- const AtomicString& dirAttributeValue = element->attributeWithoutSynchronization(dirAttr); >+ const AtomString& dirAttributeValue = element->attributeWithoutSynchronization(dirAttr); > if (dirAttributeValue.isNull()) > continue; > >diff --git a/Source/WebCore/html/HTMLTextFormControlElement.h b/Source/WebCore/html/HTMLTextFormControlElement.h >index cf8c744b703fc54eb59391403b619f2d563eef5e..7494d254d550ab543774925be9083823125bb99f 100644 >--- a/Source/WebCore/html/HTMLTextFormControlElement.h >+++ b/Source/WebCore/html/HTMLTextFormControlElement.h >@@ -66,7 +66,7 @@ public: > WEBCORE_EXPORT VisiblePosition visiblePositionForIndex(int index) const; > WEBCORE_EXPORT int selectionStart() const; > WEBCORE_EXPORT int selectionEnd() const; >- WEBCORE_EXPORT const AtomicString& selectionDirection() const; >+ WEBCORE_EXPORT const AtomString& selectionDirection() const; > WEBCORE_EXPORT void setSelectionStart(int); > WEBCORE_EXPORT void setSelectionEnd(int); > WEBCORE_EXPORT void setSelectionDirection(const String&); >@@ -105,7 +105,7 @@ protected: > bool isPlaceholderEmpty() const; > virtual void updatePlaceholderText() = 0; > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > > void disabledStateChanged() override; > void readOnlyStateChanged() override; >diff --git a/Source/WebCore/html/HTMLTrackElement.cpp b/Source/WebCore/html/HTMLTrackElement.cpp >index 011c16dfad876d7811aca8a864d923dfaa423fa3..ae7d80cc6fefef2e09048ee3734cd3d3e37b0f25 100644 >--- a/Source/WebCore/html/HTMLTrackElement.cpp >+++ b/Source/WebCore/html/HTMLTrackElement.cpp >@@ -99,7 +99,7 @@ void HTMLTrackElement::removedFromAncestor(RemovalType removalType, ContainerNod > downcast<HTMLMediaElement>(oldParentOfRemovedTree).didRemoveTextTrack(*this); > } > >-void HTMLTrackElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLTrackElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == srcAttr) { > scheduleLoad(); >@@ -118,22 +118,22 @@ void HTMLTrackElement::parseAttribute(const QualifiedName& name, const AtomicStr > HTMLElement::parseAttribute(name, value); > } > >-const AtomicString& HTMLTrackElement::kind() >+const AtomString& HTMLTrackElement::kind() > { > return track().kindKeyword(); > } > >-void HTMLTrackElement::setKind(const AtomicString& kind) >+void HTMLTrackElement::setKind(const AtomString& kind) > { > setAttributeWithoutSynchronization(kindAttr, kind); > } > >-const AtomicString& HTMLTrackElement::srclang() const >+const AtomString& HTMLTrackElement::srclang() const > { > return attributeWithoutSynchronization(srclangAttr); > } > >-const AtomicString& HTMLTrackElement::label() const >+const AtomString& HTMLTrackElement::label() const > { > return attributeWithoutSynchronization(labelAttr); > } >@@ -279,7 +279,7 @@ HTMLTrackElement::ReadyState HTMLTrackElement::readyState() > return static_cast<ReadyState>(track().readinessState()); > } > >-const AtomicString& HTMLTrackElement::mediaElementCrossOriginAttribute() const >+const AtomString& HTMLTrackElement::mediaElementCrossOriginAttribute() const > { > if (auto parent = mediaElement()) > return parent->attributeWithoutSynchronization(HTMLNames::crossoriginAttr); >diff --git a/Source/WebCore/html/HTMLTrackElement.h b/Source/WebCore/html/HTMLTrackElement.h >index 9cbdadb4c48e2665ada8f2fa3179b84e6e1ba324..c95db6ea28c7ff136f694f7ab6dfe4cbc39da750 100644 >--- a/Source/WebCore/html/HTMLTrackElement.h >+++ b/Source/WebCore/html/HTMLTrackElement.h >@@ -40,11 +40,11 @@ class HTMLTrackElement final : public HTMLElement, public TextTrackClient { > public: > static Ref<HTMLTrackElement> create(const QualifiedName&, Document&); > >- const AtomicString& kind(); >- void setKind(const AtomicString&); >+ const AtomString& kind(); >+ void setKind(const AtomString&); > >- const AtomicString& srclang() const; >- const AtomicString& label() const; >+ const AtomString& srclang() const; >+ const AtomString& label() const; > bool isDefault() const; > > enum ReadyState { NONE = 0, LOADING = 1, LOADED = 2, TRACK_ERROR = 3 }; >@@ -59,13 +59,13 @@ public: > void didCompleteLoad(LoadStatus); > > RefPtr<HTMLMediaElement> mediaElement() const; >- const AtomicString& mediaElementCrossOriginAttribute() const; >+ const AtomString& mediaElementCrossOriginAttribute() const; > > private: > HTMLTrackElement(const QualifiedName&, Document&); > virtual ~HTMLTrackElement(); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; > void removedFromAncestor(RemovalType, ContainerNode&) final; >diff --git a/Source/WebCore/html/HTMLUListElement.cpp b/Source/WebCore/html/HTMLUListElement.cpp >index d9cd6e3bcae47ccba817bbef68f4f8a3bd9c897e..570ea7fffeace269990901f64373b9f027411453 100644 >--- a/Source/WebCore/html/HTMLUListElement.cpp >+++ b/Source/WebCore/html/HTMLUListElement.cpp >@@ -56,7 +56,7 @@ bool HTMLUListElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLElement::isPresentationAttribute(name); > } > >-void HTMLUListElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLUListElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == typeAttr) > addPropertyToPresentationAttributeStyle(style, CSSPropertyListStyleType, value); >diff --git a/Source/WebCore/html/HTMLUListElement.h b/Source/WebCore/html/HTMLUListElement.h >index 6a0b72073121ff621143abd7b1b75e9d381c6a24..b52c2030e57cc6b1146625a20975ab61aeb5e863 100644 >--- a/Source/WebCore/html/HTMLUListElement.h >+++ b/Source/WebCore/html/HTMLUListElement.h >@@ -36,7 +36,7 @@ private: > HTMLUListElement(const QualifiedName&, Document&); > > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/html/HTMLVideoElement.cpp b/Source/WebCore/html/HTMLVideoElement.cpp >index a6f2f835bb7b55aeeaf4c084ddc7a8fe91943c12..a5e75aaff52ddf9f57545ba067eec789888dd9ab 100644 >--- a/Source/WebCore/html/HTMLVideoElement.cpp >+++ b/Source/WebCore/html/HTMLVideoElement.cpp >@@ -101,7 +101,7 @@ void HTMLVideoElement::didAttachRenderers() > } > } > >-void HTMLVideoElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void HTMLVideoElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == widthAttr) > addHTMLLengthToStyle(style, CSSPropertyWidth, value); >@@ -118,7 +118,7 @@ bool HTMLVideoElement::isPresentationAttribute(const QualifiedName& name) const > return HTMLMediaElement::isPresentationAttribute(name); > } > >-void HTMLVideoElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void HTMLVideoElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == posterAttr) { > // Force a poster recalc by setting m_displayMode to Unknown directly before calling updateDisplayState. >@@ -232,9 +232,9 @@ bool HTMLVideoElement::isURLAttribute(const Attribute& attribute) const > return attribute.name() == posterAttr || HTMLMediaElement::isURLAttribute(attribute); > } > >-const AtomicString& HTMLVideoElement::imageSourceURL() const >+const AtomString& HTMLVideoElement::imageSourceURL() const > { >- const AtomicString& url = attributeWithoutSynchronization(posterAttr); >+ const AtomString& url = attributeWithoutSynchronization(posterAttr); > if (!stripLeadingAndTrailingHTMLSpaces(url).isEmpty()) > return url; > return m_defaultPosterURL; >diff --git a/Source/WebCore/html/HTMLVideoElement.h b/Source/WebCore/html/HTMLVideoElement.h >index d4ba370b424a6961d99649a1736b597552acbcb4..1e95258fc75d232193762af5d84e6a0da4e3d0dc 100644 >--- a/Source/WebCore/html/HTMLVideoElement.h >+++ b/Source/WebCore/html/HTMLVideoElement.h >@@ -101,14 +101,14 @@ private: > void scheduleResizeEventIfSizeChanged() final; > bool rendererIsNeeded(const RenderStyle&) final; > void didAttachRenderers() final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > bool isVideo() const final { return true; } > bool hasVideo() const final { return player() && player()->hasVideo(); } > bool supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenMode) const final; > bool isURLAttribute(const Attribute&) const final; >- const AtomicString& imageSourceURL() const final; >+ const AtomString& imageSourceURL() const final; > > bool hasAvailableVideoFrame() const; > void updateDisplayState() final; >@@ -119,7 +119,7 @@ private: > > std::unique_ptr<HTMLImageLoader> m_imageLoader; > >- AtomicString m_defaultPosterURL; >+ AtomString m_defaultPosterURL; > > unsigned m_lastReportedVideoWidth { 0 }; > unsigned m_lastReportedVideoHeight { 0 }; >diff --git a/Source/WebCore/html/HiddenInputType.cpp b/Source/WebCore/html/HiddenInputType.cpp >index a882c8fc59394831ec804afa2c9c76b01e7bb766..14b63bf5fdb0b2e3d47296d276a862cd145e25d5 100644 >--- a/Source/WebCore/html/HiddenInputType.cpp >+++ b/Source/WebCore/html/HiddenInputType.cpp >@@ -43,7 +43,7 @@ namespace WebCore { > > using namespace HTMLNames; > >-const AtomicString& HiddenInputType::formControlType() const >+const AtomString& HiddenInputType::formControlType() const > { > return InputTypeNames::hidden(); > } >diff --git a/Source/WebCore/html/HiddenInputType.h b/Source/WebCore/html/HiddenInputType.h >index b6307c20fbab2b90d083783491870d88b431a326..dac62848ab4cdf4c951e500b0ada80428459e3ab 100644 >--- a/Source/WebCore/html/HiddenInputType.h >+++ b/Source/WebCore/html/HiddenInputType.h >@@ -39,7 +39,7 @@ public: > explicit HiddenInputType(HTMLInputElement& element) : InputType(element) { } > > private: >- const AtomicString& formControlType() const override; >+ const AtomString& formControlType() const override; > FormControlState saveFormControlState() const override; > void restoreFormControlState(const FormControlState&) override; > bool supportsValidation() const override; >diff --git a/Source/WebCore/html/ImageInputType.cpp b/Source/WebCore/html/ImageInputType.cpp >index 2b0f1ed66828f126a7e159a04b1cba8c08c5aaa0..5615b446df6ad102d85186e71820fd2f24bea0b5 100644 >--- a/Source/WebCore/html/ImageInputType.cpp >+++ b/Source/WebCore/html/ImageInputType.cpp >@@ -44,7 +44,7 @@ ImageInputType::ImageInputType(HTMLInputElement& element) > { > } > >-const AtomicString& ImageInputType::formControlType() const >+const AtomString& ImageInputType::formControlType() const > { > return InputTypeNames::image(); > } >diff --git a/Source/WebCore/html/ImageInputType.h b/Source/WebCore/html/ImageInputType.h >index 0e31dcf849dfe63af0339d712f3736e7831bd6a6..2678610f6cb8b9b71dca55d00e3fdb1cdb72034d 100644 >--- a/Source/WebCore/html/ImageInputType.h >+++ b/Source/WebCore/html/ImageInputType.h >@@ -42,7 +42,7 @@ public: > explicit ImageInputType(HTMLInputElement&); > > private: >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > bool isFormDataAppendable() const final; > bool appendFormData(DOMFormData&, bool) const final; > bool supportsValidation() const final; >diff --git a/Source/WebCore/html/InputMode.cpp b/Source/WebCore/html/InputMode.cpp >index bca35b4a31ff8bd0b67ac622c26dc95defde50e5..a20eaccff9c6d05769b98d68c73f5afc1b9be6be 100644 >--- a/Source/WebCore/html/InputMode.cpp >+++ b/Source/WebCore/html/InputMode.cpp >@@ -30,7 +30,7 @@ > > namespace WebCore { > >-InputMode inputModeForAttributeValue(const AtomicString& value) >+InputMode inputModeForAttributeValue(const AtomString& value) > { > if (equalIgnoringASCIICase(value, InputModeNames::none())) > return InputMode::None; >@@ -52,7 +52,7 @@ InputMode inputModeForAttributeValue(const AtomicString& value) > return InputMode::Unspecified; > } > >-const AtomicString& stringForInputMode(InputMode mode) >+const AtomString& stringForInputMode(InputMode mode) > { > switch (mode) { > case InputMode::Unspecified: >@@ -80,51 +80,51 @@ const AtomicString& stringForInputMode(InputMode mode) > > namespace InputModeNames { > >-const AtomicString& none() >+const AtomString& none() > { >- static NeverDestroyed<AtomicString> mode("none", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> mode("none", AtomString::ConstructFromLiteral); > return mode; > } > >-const AtomicString& text() >+const AtomString& text() > { >- static NeverDestroyed<AtomicString> mode("text", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> mode("text", AtomString::ConstructFromLiteral); > return mode; > } > >-const AtomicString& tel() >+const AtomString& tel() > { >- static NeverDestroyed<AtomicString> mode("tel", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> mode("tel", AtomString::ConstructFromLiteral); > return mode; > } > >-const AtomicString& url() >+const AtomString& url() > { >- static NeverDestroyed<AtomicString> mode("url", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> mode("url", AtomString::ConstructFromLiteral); > return mode; > } > >-const AtomicString& email() >+const AtomString& email() > { >- static NeverDestroyed<AtomicString> mode("email", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> mode("email", AtomString::ConstructFromLiteral); > return mode; > } > >-const AtomicString& numeric() >+const AtomString& numeric() > { >- static NeverDestroyed<AtomicString> mode("numeric", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> mode("numeric", AtomString::ConstructFromLiteral); > return mode; > } > >-const AtomicString& decimal() >+const AtomString& decimal() > { >- static NeverDestroyed<AtomicString> mode("decimal", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> mode("decimal", AtomString::ConstructFromLiteral); > return mode; > } > >-const AtomicString& search() >+const AtomString& search() > { >- static NeverDestroyed<AtomicString> mode("search", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> mode("search", AtomString::ConstructFromLiteral); > return mode; > } > >diff --git a/Source/WebCore/html/InputMode.h b/Source/WebCore/html/InputMode.h >index 73683701d66bec6a1d6e342d8b5923cde6beaed7..f966825f9604d935783c2bea823e7587999cd73d 100644 >--- a/Source/WebCore/html/InputMode.h >+++ b/Source/WebCore/html/InputMode.h >@@ -25,7 +25,7 @@ > > #pragma once > >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -41,19 +41,19 @@ enum class InputMode : uint8_t { > Search > }; > >-InputMode inputModeForAttributeValue(const AtomicString&); >-const AtomicString& stringForInputMode(InputMode); >+InputMode inputModeForAttributeValue(const AtomString&); >+const AtomString& stringForInputMode(InputMode); > > namespace InputModeNames { > >-const AtomicString& none(); >-const AtomicString& text(); >-const AtomicString& tel(); >-const AtomicString& url(); >-const AtomicString& email(); >-const AtomicString& numeric(); >-const AtomicString& decimal(); >-const AtomicString& search(); >+const AtomString& none(); >+const AtomString& text(); >+const AtomString& tel(); >+const AtomString& url(); >+const AtomString& email(); >+const AtomString& numeric(); >+const AtomString& decimal(); >+const AtomString& search(); > > } // namespace InputModeNames > >diff --git a/Source/WebCore/html/InputType.cpp b/Source/WebCore/html/InputType.cpp >index 04d325db07865f9b8ba09281a5a9a05ba6eee9f7..2198b8344c1d10f78ba0adb5650427c9a0eb729a 100644 >--- a/Source/WebCore/html/InputType.cpp >+++ b/Source/WebCore/html/InputType.cpp >@@ -84,9 +84,9 @@ namespace WebCore { > using namespace HTMLNames; > > typedef bool (RuntimeEnabledFeatures::*InputTypeConditionalFunction)() const; >-typedef const AtomicString& (*InputTypeNameFunction)(); >+typedef const AtomString& (*InputTypeNameFunction)(); > typedef Ref<InputType> (*InputTypeFactoryFunction)(HTMLInputElement&); >-typedef HashMap<AtomicString, InputTypeFactoryFunction, ASCIICaseInsensitiveHash> InputTypeFactoryMap; >+typedef HashMap<AtomString, InputTypeFactoryFunction, ASCIICaseInsensitiveHash> InputTypeFactoryMap; > > template<class T> > static Ref<InputType> createInputType(HTMLInputElement& element) >@@ -149,7 +149,7 @@ static InputTypeFactoryMap createInputTypeFactoryMap() > return map; > } > >-Ref<InputType> InputType::create(HTMLInputElement& element, const AtomicString& typeName) >+Ref<InputType> InputType::create(HTMLInputElement& element, const AtomString& typeName) > { > if (!typeName.isEmpty()) { > static const auto factoryMap = makeNeverDestroyed(createInputTypeFactoryMap()); >diff --git a/Source/WebCore/html/InputType.h b/Source/WebCore/html/InputType.h >index 643b59e47aa2cdd5207e44d26003e1e7e47ced45..665e66cf5a08633716696772023abab70894bebb 100644 >--- a/Source/WebCore/html/InputType.h >+++ b/Source/WebCore/html/InputType.h >@@ -73,7 +73,7 @@ class InputType : public RefCounted<InputType> { > WTF_MAKE_FAST_ALLOCATED; > > public: >- static Ref<InputType> create(HTMLInputElement&, const AtomicString&); >+ static Ref<InputType> create(HTMLInputElement&, const AtomString&); > static Ref<InputType> createText(HTMLInputElement&); > virtual ~InputType(); > >@@ -81,7 +81,7 @@ public: > > static bool themeSupportsDataListUI(InputType*); > >- virtual const AtomicString& formControlType() const = 0; >+ virtual const AtomString& formControlType() const = 0; > > // Type query functions. > >diff --git a/Source/WebCore/html/InputTypeNames.cpp b/Source/WebCore/html/InputTypeNames.cpp >index 4387618c78400a6b6d6a60b1913fae06a2d43bba..a8a6e79dcc68b296bfd87197ccf4b46e9a7f9ee4 100644 >--- a/Source/WebCore/html/InputTypeNames.cpp >+++ b/Source/WebCore/html/InputTypeNames.cpp >@@ -31,141 +31,141 @@ namespace InputTypeNames { > // The type names must be lowercased because they will be the return values of > // input.type and input.type must be lowercase according to DOM Level 2. > >-const AtomicString& button() >+const AtomString& button() > { >- static NeverDestroyed<AtomicString> name("button", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("button", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& checkbox() >+const AtomString& checkbox() > { >- static NeverDestroyed<AtomicString> name("checkbox", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("checkbox", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& color() >+const AtomString& color() > { >- static NeverDestroyed<AtomicString> name("color", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("color", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& date() >+const AtomString& date() > { >- static NeverDestroyed<AtomicString> name("date", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("date", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& datetime() >+const AtomString& datetime() > { >- static NeverDestroyed<AtomicString> name("datetime", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("datetime", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& datetimelocal() >+const AtomString& datetimelocal() > { >- static NeverDestroyed<AtomicString> name("datetime-local", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("datetime-local", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& email() >+const AtomString& email() > { >- static NeverDestroyed<AtomicString> name("email", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("email", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& file() >+const AtomString& file() > { >- static NeverDestroyed<AtomicString> name("file", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("file", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& hidden() >+const AtomString& hidden() > { >- static NeverDestroyed<AtomicString> name("hidden", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("hidden", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& image() >+const AtomString& image() > { >- static NeverDestroyed<AtomicString> name("image", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("image", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& month() >+const AtomString& month() > { >- static NeverDestroyed<AtomicString> name("month", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("month", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& number() >+const AtomString& number() > { >- static NeverDestroyed<AtomicString> name("number", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("number", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& password() >+const AtomString& password() > { >- static NeverDestroyed<AtomicString> name("password", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("password", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& radio() >+const AtomString& radio() > { >- static NeverDestroyed<AtomicString> name("radio", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("radio", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& range() >+const AtomString& range() > { >- static NeverDestroyed<AtomicString> name("range", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("range", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& reset() >+const AtomString& reset() > { >- static NeverDestroyed<AtomicString> name("reset", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("reset", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& search() >+const AtomString& search() > { >- static NeverDestroyed<AtomicString> name("search", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("search", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& submit() >+const AtomString& submit() > { >- static NeverDestroyed<AtomicString> name("submit", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("submit", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& telephone() >+const AtomString& telephone() > { >- static NeverDestroyed<AtomicString> name("tel", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("tel", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& text() >+const AtomString& text() > { >- static NeverDestroyed<AtomicString> name("text", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("text", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& time() >+const AtomString& time() > { >- static NeverDestroyed<AtomicString> name("time", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("time", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& url() >+const AtomString& url() > { >- static NeverDestroyed<AtomicString> name("url", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("url", AtomString::ConstructFromLiteral); > return name; > } > >-const AtomicString& week() >+const AtomString& week() > { >- static NeverDestroyed<AtomicString> name("week", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> name("week", AtomString::ConstructFromLiteral); > return name; > } > >diff --git a/Source/WebCore/html/InputTypeNames.h b/Source/WebCore/html/InputTypeNames.h >index 470030623a87eae03aa5d3e9aa65700d103b8e28..241ec28ba8f53569d3ae47c411f7ea145b7c4939 100644 >--- a/Source/WebCore/html/InputTypeNames.h >+++ b/Source/WebCore/html/InputTypeNames.h >@@ -20,35 +20,35 @@ > > #pragma once > >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > > namespace InputTypeNames { > >-const AtomicString& button(); >-const AtomicString& checkbox(); >-const AtomicString& color(); >-const AtomicString& date(); >-const AtomicString& datetime(); >-const AtomicString& datetimelocal(); >-const AtomicString& email(); >-const AtomicString& file(); >-const AtomicString& hidden(); >-const AtomicString& image(); >-const AtomicString& month(); >-const AtomicString& number(); >-const AtomicString& password(); >-const AtomicString& radio(); >-const AtomicString& range(); >-const AtomicString& reset(); >-const AtomicString& search(); >-const AtomicString& submit(); >-const AtomicString& telephone(); >-const AtomicString& text(); >-const AtomicString& time(); >-const AtomicString& url(); >-const AtomicString& week(); >+const AtomString& button(); >+const AtomString& checkbox(); >+const AtomString& color(); >+const AtomString& date(); >+const AtomString& datetime(); >+const AtomString& datetimelocal(); >+const AtomString& email(); >+const AtomString& file(); >+const AtomString& hidden(); >+const AtomString& image(); >+const AtomString& month(); >+const AtomString& number(); >+const AtomString& password(); >+const AtomString& radio(); >+const AtomString& range(); >+const AtomString& reset(); >+const AtomString& search(); >+const AtomString& submit(); >+const AtomString& telephone(); >+const AtomString& text(); >+const AtomString& time(); >+const AtomString& url(); >+const AtomString& week(); > > } > >diff --git a/Source/WebCore/html/LabelsNodeList.h b/Source/WebCore/html/LabelsNodeList.h >index e7d7d165c22c8303100472aff5133200c8fd3aa6..f539d79b0caa0500304888dc461772af7db16282 100644 >--- a/Source/WebCore/html/LabelsNodeList.h >+++ b/Source/WebCore/html/LabelsNodeList.h >@@ -32,7 +32,7 @@ namespace WebCore { > class LabelsNodeList final : public CachedLiveNodeList<LabelsNodeList> { > WTF_MAKE_ISO_ALLOCATED(LabelsNodeList); > public: >- static Ref<LabelsNodeList> create(LabelableElement& forNode, const AtomicString&) >+ static Ref<LabelsNodeList> create(LabelableElement& forNode, const AtomString&) > { > return adoptRef(*new LabelsNodeList(forNode)); > } >diff --git a/Source/WebCore/html/MediaController.cpp b/Source/WebCore/html/MediaController.cpp >index 51fa658c49100a9765f961de69c844d141e68e86..e482b362b18a7a549453764644ccfe7cbf5152b3 100644 >--- a/Source/WebCore/html/MediaController.cpp >+++ b/Source/WebCore/html/MediaController.cpp >@@ -35,7 +35,7 @@ > #include <wtf/IsoMallocInlines.h> > #include <wtf/NeverDestroyed.h> > #include <wtf/StdLibExtras.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -287,25 +287,25 @@ void MediaController::setMuted(bool flag) > mediaElement->updateVolume(); > } > >-static const AtomicString& playbackStateWaiting() >+static const AtomString& playbackStateWaiting() > { >- static NeverDestroyed<AtomicString> waiting("waiting", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> waiting("waiting", AtomString::ConstructFromLiteral); > return waiting; > } > >-static const AtomicString& playbackStatePlaying() >+static const AtomString& playbackStatePlaying() > { >- static NeverDestroyed<AtomicString> playing("playing", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> playing("playing", AtomString::ConstructFromLiteral); > return playing; > } > >-static const AtomicString& playbackStateEnded() >+static const AtomString& playbackStateEnded() > { >- static NeverDestroyed<AtomicString> ended("ended", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> ended("ended", AtomString::ConstructFromLiteral); > return ended; > } > >-const AtomicString& MediaController::playbackState() const >+const AtomString& MediaController::playbackState() const > { > switch (m_playbackState) { > case WAITING: >@@ -326,7 +326,7 @@ void MediaController::reportControllerState() > updatePlaybackState(); > } > >-static AtomicString eventNameForReadyState(MediaControllerInterface::ReadyState state) >+static AtomString eventNameForReadyState(MediaControllerInterface::ReadyState state) > { > switch (state) { > case MediaControllerInterface::HAVE_NOTHING: >@@ -436,7 +436,7 @@ void MediaController::updatePlaybackState() > // If the MediaController's most recently reported playback state is not equal to new playback state > // then queue a task to fire a simple event at the MediaController object, whose name is playing > // if new playback state is playing, ended if new playback state is ended, and waiting otherwise. >- AtomicString eventName; >+ AtomString eventName; > switch (newPlaybackState) { > case WAITING: > eventName = eventNames().waitingEvent; >@@ -533,7 +533,7 @@ bool MediaController::hasEnded() const > return allHaveEnded; > } > >-void MediaController::scheduleEvent(const AtomicString& eventName) >+void MediaController::scheduleEvent(const AtomString& eventName) > { > m_pendingEvents.append(Event::create(eventName, Event::CanBubble::No, Event::IsCancelable::Yes)); > if (!m_asyncEventTimer.isActive()) >diff --git a/Source/WebCore/html/MediaController.h b/Source/WebCore/html/MediaController.h >index e522c8ae329c36db9ba59e294c483bb7ced47a44..538dc2e78229447d9761a837f5e29649c810daeb 100644 >--- a/Source/WebCore/html/MediaController.h >+++ b/Source/WebCore/html/MediaController.h >@@ -72,7 +72,7 @@ public: > bool muted() const final { return m_muted; } > void setMuted(bool) final; > >- const AtomicString& playbackState() const; >+ const AtomString& playbackState() const; > > using RefCounted::ref; > using RefCounted::deref; >@@ -85,7 +85,7 @@ private: > void updatePlaybackState(); > void updateMediaElements(); > void bringElementUpToSpeed(HTMLMediaElement&); >- void scheduleEvent(const AtomicString& eventName); >+ void scheduleEvent(const AtomString& eventName); > void asyncEventTimerFired(); > void clearPositionTimerFired(); > bool hasEnded() const; >diff --git a/Source/WebCore/html/MediaDocument.cpp b/Source/WebCore/html/MediaDocument.cpp >index 03562e7f91cf5317855577526e7130ad6733f8ef..aaed5ae23d2881047d152745c7ef85a9984838e0 100644 >--- a/Source/WebCore/html/MediaDocument.cpp >+++ b/Source/WebCore/html/MediaDocument.cpp >@@ -100,8 +100,8 @@ void MediaDocumentParser::createDocumentStructure() > rootElement->appendChild(headElement); > > auto metaElement = HTMLMetaElement::create(document); >- metaElement->setAttributeWithoutSynchronization(nameAttr, AtomicString("viewport", AtomicString::ConstructFromLiteral)); >- metaElement->setAttributeWithoutSynchronization(contentAttr, AtomicString("width=device-width,initial-scale=1", AtomicString::ConstructFromLiteral)); >+ metaElement->setAttributeWithoutSynchronization(nameAttr, AtomString("viewport", AtomString::ConstructFromLiteral)); >+ metaElement->setAttributeWithoutSynchronization(contentAttr, AtomString("width=device-width,initial-scale=1", AtomString::ConstructFromLiteral)); > headElement->appendChild(metaElement); > #endif > >@@ -245,15 +245,15 @@ void MediaDocument::replaceMediaElementTimerFired() > return; > > // Set body margin width and height to 0 as that is what a PluginDocument uses. >- htmlBody->setAttributeWithoutSynchronization(marginwidthAttr, AtomicString("0", AtomicString::ConstructFromLiteral)); >- htmlBody->setAttributeWithoutSynchronization(marginheightAttr, AtomicString("0", AtomicString::ConstructFromLiteral)); >+ htmlBody->setAttributeWithoutSynchronization(marginwidthAttr, AtomString("0", AtomString::ConstructFromLiteral)); >+ htmlBody->setAttributeWithoutSynchronization(marginheightAttr, AtomString("0", AtomString::ConstructFromLiteral)); > > if (auto videoElement = makeRefPtr(descendantVideoElement(*htmlBody))) { > auto embedElement = HTMLEmbedElement::create(*this); > >- embedElement->setAttributeWithoutSynchronization(widthAttr, AtomicString("100%", AtomicString::ConstructFromLiteral)); >- embedElement->setAttributeWithoutSynchronization(heightAttr, AtomicString("100%", AtomicString::ConstructFromLiteral)); >- embedElement->setAttributeWithoutSynchronization(nameAttr, AtomicString("plugin", AtomicString::ConstructFromLiteral)); >+ embedElement->setAttributeWithoutSynchronization(widthAttr, AtomString("100%", AtomString::ConstructFromLiteral)); >+ embedElement->setAttributeWithoutSynchronization(heightAttr, AtomString("100%", AtomString::ConstructFromLiteral)); >+ embedElement->setAttributeWithoutSynchronization(nameAttr, AtomString("plugin", AtomString::ConstructFromLiteral)); > embedElement->setAttributeWithoutSynchronization(srcAttr, url().string()); > > ASSERT(loader()); >diff --git a/Source/WebCore/html/MediaEncryptedEvent.cpp b/Source/WebCore/html/MediaEncryptedEvent.cpp >index 48bb5a2f1fa85408dd918a767532365b38e612f6..f6e4ef8f7eb50e33c0df2e07dc3449600a30c9f6 100644 >--- a/Source/WebCore/html/MediaEncryptedEvent.cpp >+++ b/Source/WebCore/html/MediaEncryptedEvent.cpp >@@ -35,7 +35,7 @@ > > namespace WebCore { > >-MediaEncryptedEvent::MediaEncryptedEvent(const AtomicString& type, const MediaEncryptedEventInit& initializer, IsTrusted isTrusted) >+MediaEncryptedEvent::MediaEncryptedEvent(const AtomString& type, const MediaEncryptedEventInit& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_initDataType(initializer.initDataType) > , m_initData(initializer.initData) >diff --git a/Source/WebCore/html/MediaEncryptedEvent.h b/Source/WebCore/html/MediaEncryptedEvent.h >index b5219c1d0ce089570be1a97e895e9e898fa6f88f..45b344ebe7b2733c3340eb58a182defe46b1c6ba 100644 >--- a/Source/WebCore/html/MediaEncryptedEvent.h >+++ b/Source/WebCore/html/MediaEncryptedEvent.h >@@ -43,7 +43,7 @@ class MediaEncryptedEvent final : public Event { > public: > using Init = MediaEncryptedEventInit; > >- static Ref<MediaEncryptedEvent> create(const AtomicString& type, const MediaEncryptedEventInit& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<MediaEncryptedEvent> create(const AtomString& type, const MediaEncryptedEventInit& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new MediaEncryptedEvent(type, initializer, isTrusted)); > } >@@ -54,7 +54,7 @@ public: > JSC::ArrayBuffer* initData() { return m_initData.get(); } > > private: >- MediaEncryptedEvent(const AtomicString&, const MediaEncryptedEventInit&, IsTrusted); >+ MediaEncryptedEvent(const AtomString&, const MediaEncryptedEventInit&, IsTrusted); > > // Event > EventInterface eventInterface() const override; >diff --git a/Source/WebCore/html/MonthInputType.cpp b/Source/WebCore/html/MonthInputType.cpp >index f92b35535a1d6ea23367a696052f18a23f1e24e1..73ea6760688fccc411dfd0783acfc630963126f3 100644 >--- a/Source/WebCore/html/MonthInputType.cpp >+++ b/Source/WebCore/html/MonthInputType.cpp >@@ -48,7 +48,7 @@ static const int monthDefaultStepBase = 0; > static const int monthStepScaleFactor = 1; > static const StepRange::StepDescription monthStepDescription { monthDefaultStep, monthDefaultStepBase, monthStepScaleFactor, StepRange::ParsedStepValueShouldBeInteger }; > >-const AtomicString& MonthInputType::formControlType() const >+const AtomString& MonthInputType::formControlType() const > { > return InputTypeNames::month(); > } >diff --git a/Source/WebCore/html/MonthInputType.h b/Source/WebCore/html/MonthInputType.h >index 205621f29fe7d54336064538ab04afb975ea23f1..acf958861367a73a1c4dec2c89792b86223e83ae 100644 >--- a/Source/WebCore/html/MonthInputType.h >+++ b/Source/WebCore/html/MonthInputType.h >@@ -41,7 +41,7 @@ public: > explicit MonthInputType(HTMLInputElement& element) : BaseChooserOnlyDateAndTimeInputType(element) { } > > private: >- const AtomicString& formControlType() const override; >+ const AtomString& formControlType() const override; > DateComponents::Type dateType() const override; > double valueAsDate() const override; > String serializeWithMilliseconds(double) const override; >diff --git a/Source/WebCore/html/NumberInputType.cpp b/Source/WebCore/html/NumberInputType.cpp >index 05ff07d86883c1b2c60319a0c5da43f47768abc8..aa2ed2e3887ecef334d932883a663177b828cc1d 100644 >--- a/Source/WebCore/html/NumberInputType.cpp >+++ b/Source/WebCore/html/NumberInputType.cpp >@@ -86,7 +86,7 @@ static RealNumberRenderSize calculateRenderSize(const Decimal& value) > return { sizeOfSign + sizeOfZero , numberOfZeroAfterDecimalPoint + sizeOfDigits }; > } > >-const AtomicString& NumberInputType::formControlType() const >+const AtomString& NumberInputType::formControlType() const > { > return InputTypeNames::number(); > } >@@ -151,7 +151,7 @@ StepRange NumberInputType::createStepRange(AnyStepHandling anyStepHandling) cons > > RangeLimitations rangeLimitations = RangeLimitations::Invalid; > auto extractBound = [&] (const QualifiedName& attributeName, const Decimal& defaultValue) -> Decimal { >- const AtomicString& attributeValue = element.attributeWithoutSynchronization(attributeName); >+ const AtomString& attributeValue = element.attributeWithoutSynchronization(attributeName); > Decimal valueFromAttribute = parseToNumberOrNaN(attributeValue); > if (valueFromAttribute.isFinite()) { > rangeLimitations = RangeLimitations::Valid; >diff --git a/Source/WebCore/html/NumberInputType.h b/Source/WebCore/html/NumberInputType.h >index fed1aba035fc5870fc3eff60af2fc83737ca614b..de51a4a30d5300db252d820976cac2d24a15e070 100644 >--- a/Source/WebCore/html/NumberInputType.h >+++ b/Source/WebCore/html/NumberInputType.h >@@ -40,7 +40,7 @@ public: > explicit NumberInputType(HTMLInputElement& element) : TextFieldInputType(element) { } > > private: >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > void setValue(const String&, bool valueChanged, TextFieldEventBehavior) final; > double valueAsDouble() const final; > ExceptionOr<void> setValueAsDouble(double, TextFieldEventBehavior) const final; >diff --git a/Source/WebCore/html/PasswordInputType.cpp b/Source/WebCore/html/PasswordInputType.cpp >index af2e38cf347cce10e3742ff41577b4ebec3f85b1..f7b975e1d19fde6f566f6abc1c1a04a9fe098cdf 100644 >--- a/Source/WebCore/html/PasswordInputType.cpp >+++ b/Source/WebCore/html/PasswordInputType.cpp >@@ -39,7 +39,7 @@ > > namespace WebCore { > >-const AtomicString& PasswordInputType::formControlType() const >+const AtomString& PasswordInputType::formControlType() const > { > return InputTypeNames::password(); > } >diff --git a/Source/WebCore/html/PasswordInputType.h b/Source/WebCore/html/PasswordInputType.h >index 1e0f5e34c6713a47b3c73ef6e7149a7f1c04a3b6..d4fd0cf2255b2025ea1c2ac34173623536c29cdc 100644 >--- a/Source/WebCore/html/PasswordInputType.h >+++ b/Source/WebCore/html/PasswordInputType.h >@@ -39,7 +39,7 @@ public: > explicit PasswordInputType(HTMLInputElement& element) : BaseTextInputType(element) { } > > private: >- const AtomicString& formControlType() const override; >+ const AtomString& formControlType() const override; > bool shouldSaveAndRestoreFormControlState() const override; > FormControlState saveFormControlState() const override; > void restoreFormControlState(const FormControlState&) override; >diff --git a/Source/WebCore/html/PluginDocument.cpp b/Source/WebCore/html/PluginDocument.cpp >index 50e19df777c25fb8f54e202f2d2b5efa52af55ea..a7ac2f7c775c4afdee890bd3ddf6d2232f2dd20a 100644 >--- a/Source/WebCore/html/PluginDocument.cpp >+++ b/Source/WebCore/html/PluginDocument.cpp >@@ -82,12 +82,12 @@ void PluginDocumentParser::createDocumentStructure() > #endif > > auto body = HTMLBodyElement::create(document); >- body->setAttributeWithoutSynchronization(marginwidthAttr, AtomicString("0", AtomicString::ConstructFromLiteral)); >- body->setAttributeWithoutSynchronization(marginheightAttr, AtomicString("0", AtomicString::ConstructFromLiteral)); >+ body->setAttributeWithoutSynchronization(marginwidthAttr, AtomString("0", AtomString::ConstructFromLiteral)); >+ body->setAttributeWithoutSynchronization(marginheightAttr, AtomString("0", AtomString::ConstructFromLiteral)); > #if PLATFORM(IOS_FAMILY) >- body->setAttribute(styleAttr, AtomicString("background-color: rgb(217,224,233)", AtomicString::ConstructFromLiteral)); >+ body->setAttribute(styleAttr, AtomString("background-color: rgb(217,224,233)", AtomString::ConstructFromLiteral)); > #else >- body->setAttribute(styleAttr, AtomicString("background-color: rgb(38,38,38)", AtomicString::ConstructFromLiteral)); >+ body->setAttribute(styleAttr, AtomString("background-color: rgb(38,38,38)", AtomString::ConstructFromLiteral)); > #endif > > rootElement->appendChild(body); >@@ -95,10 +95,10 @@ void PluginDocumentParser::createDocumentStructure() > auto embedElement = HTMLEmbedElement::create(document); > > m_embedElement = embedElement.ptr(); >- embedElement->setAttributeWithoutSynchronization(widthAttr, AtomicString("100%", AtomicString::ConstructFromLiteral)); >- embedElement->setAttributeWithoutSynchronization(heightAttr, AtomicString("100%", AtomicString::ConstructFromLiteral)); >+ embedElement->setAttributeWithoutSynchronization(widthAttr, AtomString("100%", AtomString::ConstructFromLiteral)); >+ embedElement->setAttributeWithoutSynchronization(heightAttr, AtomString("100%", AtomString::ConstructFromLiteral)); > >- embedElement->setAttributeWithoutSynchronization(nameAttr, AtomicString("plugin", AtomicString::ConstructFromLiteral)); >+ embedElement->setAttributeWithoutSynchronization(nameAttr, AtomString("plugin", AtomString::ConstructFromLiteral)); > embedElement->setAttributeWithoutSynchronization(srcAttr, document.url().string()); > > ASSERT(document.loader()); >diff --git a/Source/WebCore/html/RadioInputType.cpp b/Source/WebCore/html/RadioInputType.cpp >index ac9a9c254681b1d331c7e4da40b42ad9ac534875..319f2572d128094e95ab024318e71ae4a4beb04d 100644 >--- a/Source/WebCore/html/RadioInputType.cpp >+++ b/Source/WebCore/html/RadioInputType.cpp >@@ -37,7 +37,7 @@ namespace WebCore { > > using namespace HTMLNames; > >-const AtomicString& RadioInputType::formControlType() const >+const AtomString& RadioInputType::formControlType() const > { > return InputTypeNames::radio(); > } >diff --git a/Source/WebCore/html/RadioInputType.h b/Source/WebCore/html/RadioInputType.h >index 720dd4e44ea2001d3af1d32f45edc4807359966a..702c27fc4bcf367723a1b2edb299e49e6b461088 100644 >--- a/Source/WebCore/html/RadioInputType.h >+++ b/Source/WebCore/html/RadioInputType.h >@@ -40,7 +40,7 @@ public: > explicit RadioInputType(HTMLInputElement& element) : BaseCheckableInputType(element) { } > > private: >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > bool valueMissing(const String&) const final; > String valueMissingText() const final; > void handleClickEvent(MouseEvent&) final; >diff --git a/Source/WebCore/html/RadioNodeList.cpp b/Source/WebCore/html/RadioNodeList.cpp >index a94f637933f2badff4991407fc84b2933baa2947..4c980fb3630feac77f8641620c3692a1ee7478be 100644 >--- a/Source/WebCore/html/RadioNodeList.cpp >+++ b/Source/WebCore/html/RadioNodeList.cpp >@@ -40,7 +40,7 @@ using namespace HTMLNames; > > WTF_MAKE_ISO_ALLOCATED_IMPL(RadioNodeList); > >-RadioNodeList::RadioNodeList(ContainerNode& rootNode, const AtomicString& name) >+RadioNodeList::RadioNodeList(ContainerNode& rootNode, const AtomString& name) > : CachedLiveNodeList(rootNode, InvalidateForFormControls) > , m_name(name) > , m_isRootedAtDocument(is<HTMLFormElement>(ownerNode())) >diff --git a/Source/WebCore/html/RadioNodeList.h b/Source/WebCore/html/RadioNodeList.h >index e0e336b05ccf7384c4fc345df78c1a7b70d76a96..a30276330c7fdb6ccf62b218e7b172d023d8a6a3 100644 >--- a/Source/WebCore/html/RadioNodeList.h >+++ b/Source/WebCore/html/RadioNodeList.h >@@ -28,14 +28,14 @@ > > #include "HTMLElement.h" > #include "LiveNodeList.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > > class RadioNodeList final : public CachedLiveNodeList<RadioNodeList> { > WTF_MAKE_ISO_ALLOCATED(RadioNodeList); > public: >- static Ref<RadioNodeList> create(ContainerNode& rootNode, const AtomicString& name) >+ static Ref<RadioNodeList> create(ContainerNode& rootNode, const AtomString& name) > { > return adoptRef(*new RadioNodeList(rootNode, name)); > } >@@ -51,10 +51,10 @@ public: > bool isRootedAtDocument() const override { return m_isRootedAtDocument; } > > private: >- RadioNodeList(ContainerNode&, const AtomicString& name); >+ RadioNodeList(ContainerNode&, const AtomString& name); > bool checkElementMatchesRadioNodeListFilter(const Element&) const; > >- AtomicString m_name; >+ AtomString m_name; > bool m_isRootedAtDocument; > }; > >diff --git a/Source/WebCore/html/RangeInputType.cpp b/Source/WebCore/html/RangeInputType.cpp >index 16df1d5a4a3b605aa2e82a04cda1adb37f0402ab..1e0f8be83a07d3eca7b9c43e660eec047c61c1ff 100644 >--- a/Source/WebCore/html/RangeInputType.cpp >+++ b/Source/WebCore/html/RangeInputType.cpp >@@ -86,7 +86,7 @@ bool RangeInputType::isRangeControl() const > return true; > } > >-const AtomicString& RangeInputType::formControlType() const >+const AtomString& RangeInputType::formControlType() const > { > return InputTypeNames::range(); > } >@@ -120,7 +120,7 @@ StepRange RangeInputType::createStepRange(AnyStepHandling anyStepHandling) const > const Decimal minimum = parseToNumber(element()->attributeWithoutSynchronization(minAttr), rangeDefaultMinimum); > const Decimal maximum = ensureMaximum(parseToNumber(element()->attributeWithoutSynchronization(maxAttr), rangeDefaultMaximum), minimum, rangeDefaultMaximum); > >- const AtomicString& precisionValue = element()->attributeWithoutSynchronization(precisionAttr); >+ const AtomString& precisionValue = element()->attributeWithoutSynchronization(precisionAttr); > if (!precisionValue.isNull()) { > const Decimal step = equalLettersIgnoringASCIICase(precisionValue, "float") ? Decimal::nan() : 1; > return StepRange(minimum, RangeLimitations::Valid, minimum, maximum, step, rangeStepDescription); >@@ -260,7 +260,7 @@ void RangeInputType::createShadowSubtree() > > Document& document = element()->document(); > auto track = HTMLDivElement::create(document); >- track->setPseudo(AtomicString("-webkit-slider-runnable-track", AtomicString::ConstructFromLiteral)); >+ track->setPseudo(AtomString("-webkit-slider-runnable-track", AtomString::ConstructFromLiteral)); > track->appendChild(SliderThumbElement::create(document)); > auto container = SliderContainerElement::create(document); > container->appendChild(track); >diff --git a/Source/WebCore/html/RangeInputType.h b/Source/WebCore/html/RangeInputType.h >index 08666f50e19f8b2e905ef1006969646f7cfa7f6e..32c88e769d0e1d44b7738bd6c23641aa3b5183fc 100644 >--- a/Source/WebCore/html/RangeInputType.h >+++ b/Source/WebCore/html/RangeInputType.h >@@ -43,7 +43,7 @@ public: > > private: > bool isRangeControl() const final; >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > double valueAsDouble() const final; > ExceptionOr<void> setValueAsDecimal(const Decimal&, TextFieldEventBehavior) const final; > bool typeMismatchFor(const String&) const final; >diff --git a/Source/WebCore/html/ResetInputType.cpp b/Source/WebCore/html/ResetInputType.cpp >index 405cb2cc594a3d331146a855dbfa195b3ab70915..f0cdbe7f8ad7a0799b938c354978d2b939d60043 100644 >--- a/Source/WebCore/html/ResetInputType.cpp >+++ b/Source/WebCore/html/ResetInputType.cpp >@@ -40,7 +40,7 @@ > > namespace WebCore { > >-const AtomicString& ResetInputType::formControlType() const >+const AtomString& ResetInputType::formControlType() const > { > return InputTypeNames::reset(); > } >diff --git a/Source/WebCore/html/ResetInputType.h b/Source/WebCore/html/ResetInputType.h >index 2ad6029be846f2460c18bae58d5e19e8a0103040..97ab12a8b9f50350d74937d2273c786ba358dd22 100644 >--- a/Source/WebCore/html/ResetInputType.h >+++ b/Source/WebCore/html/ResetInputType.h >@@ -39,7 +39,7 @@ public: > explicit ResetInputType(HTMLInputElement& element) : BaseButtonInputType(element) { } > > private: >- const AtomicString& formControlType() const override; >+ const AtomString& formControlType() const override; > bool supportsValidation() const override; > void handleDOMActivateEvent(Event&) override; > String defaultValue() const override; >diff --git a/Source/WebCore/html/SearchInputType.cpp b/Source/WebCore/html/SearchInputType.cpp >index 5343beda8f92640dac36d2ddaf7df0f1fce69737..2c306a203cc4d5874d14f7b3069efb2b8a2d26ac 100644 >--- a/Source/WebCore/html/SearchInputType.cpp >+++ b/Source/WebCore/html/SearchInputType.cpp >@@ -65,11 +65,11 @@ void SearchInputType::addSearchResult() > static void updateResultButtonPseudoType(SearchFieldResultsButtonElement& resultButton, int maxResults) > { > if (!maxResults) >- resultButton.setPseudo(AtomicString("-webkit-search-results-decoration", AtomicString::ConstructFromLiteral)); >+ resultButton.setPseudo(AtomString("-webkit-search-results-decoration", AtomString::ConstructFromLiteral)); > else if (maxResults < 0) >- resultButton.setPseudo(AtomicString("-webkit-search-decoration", AtomicString::ConstructFromLiteral)); >+ resultButton.setPseudo(AtomString("-webkit-search-decoration", AtomString::ConstructFromLiteral)); > else >- resultButton.setPseudo(AtomicString("-webkit-search-results-button", AtomicString::ConstructFromLiteral)); >+ resultButton.setPseudo(AtomString("-webkit-search-results-button", AtomString::ConstructFromLiteral)); > } > > void SearchInputType::attributeChanged(const QualifiedName& name) >@@ -89,7 +89,7 @@ RenderPtr<RenderElement> SearchInputType::createInputRenderer(RenderStyle&& styl > return createRenderer<RenderSearchField>(*element(), WTFMove(style)); > } > >-const AtomicString& SearchInputType::formControlType() const >+const AtomString& SearchInputType::formControlType() const > { > return InputTypeNames::search(); > } >diff --git a/Source/WebCore/html/SearchInputType.h b/Source/WebCore/html/SearchInputType.h >index 28d6a8b6483541c9fe74658e1944ed58cf745a50..6f360a3b88c5ec8df117581aecaa4e411a2e2fc9 100644 >--- a/Source/WebCore/html/SearchInputType.h >+++ b/Source/WebCore/html/SearchInputType.h >@@ -48,7 +48,7 @@ private: > void addSearchResult() final; > void attributeChanged(const QualifiedName&) final; > RenderPtr<RenderElement> createInputRenderer(RenderStyle&&) final; >- const AtomicString& formControlType() const final; >+ const AtomString& formControlType() const final; > bool isSearchField() const final; > bool needsContainer() const final; > void createShadowSubtree() final; >diff --git a/Source/WebCore/html/SubmitInputType.cpp b/Source/WebCore/html/SubmitInputType.cpp >index 1b1ea080e3807ac6542c5ca2491845cc0c753c9c..985af6672dca836f2261a0a3d736c629adb8453b 100644 >--- a/Source/WebCore/html/SubmitInputType.cpp >+++ b/Source/WebCore/html/SubmitInputType.cpp >@@ -41,7 +41,7 @@ > > namespace WebCore { > >-const AtomicString& SubmitInputType::formControlType() const >+const AtomString& SubmitInputType::formControlType() const > { > return InputTypeNames::submit(); > } >diff --git a/Source/WebCore/html/SubmitInputType.h b/Source/WebCore/html/SubmitInputType.h >index 02dcee09dd32e7a56b1bd5d4cc07c01b97ecf4c4..e1ede279e4756be833c3e57d77478b712875b149 100644 >--- a/Source/WebCore/html/SubmitInputType.h >+++ b/Source/WebCore/html/SubmitInputType.h >@@ -39,7 +39,7 @@ public: > explicit SubmitInputType(HTMLInputElement& element) : BaseButtonInputType(element) { } > > private: >- const AtomicString& formControlType() const override; >+ const AtomString& formControlType() const override; > bool appendFormData(DOMFormData&, bool) const override; > bool supportsRequired() const override; > void handleDOMActivateEvent(Event&) override; >diff --git a/Source/WebCore/html/TelephoneInputType.cpp b/Source/WebCore/html/TelephoneInputType.cpp >index c6fb41152eb415120cb64bd59c171c16fda971dd..828d30fb9e78d06029e3a794fa7b0d7332b78f05 100644 >--- a/Source/WebCore/html/TelephoneInputType.cpp >+++ b/Source/WebCore/html/TelephoneInputType.cpp >@@ -36,7 +36,7 @@ > > namespace WebCore { > >-const AtomicString& TelephoneInputType::formControlType() const >+const AtomString& TelephoneInputType::formControlType() const > { > return InputTypeNames::telephone(); > } >diff --git a/Source/WebCore/html/TelephoneInputType.h b/Source/WebCore/html/TelephoneInputType.h >index 1f8d5ea58febb26b671bad6fdb8771e42c785a1b..9106e58c9407380b9ebaad9b077bd457aa69612c 100644 >--- a/Source/WebCore/html/TelephoneInputType.h >+++ b/Source/WebCore/html/TelephoneInputType.h >@@ -39,7 +39,7 @@ public: > explicit TelephoneInputType(HTMLInputElement& element) : BaseTextInputType(element) { } > > private: >- const AtomicString& formControlType() const override; >+ const AtomString& formControlType() const override; > bool isTelephoneField() const override; > }; > >diff --git a/Source/WebCore/html/TextFieldInputType.cpp b/Source/WebCore/html/TextFieldInputType.cpp >index 3d053f143e5b7fc16dd7493e0b5bbac9fea4b1d7..fdb8e30ffec9bb09ace6b29ec6a301a390eed581 100644 >--- a/Source/WebCore/html/TextFieldInputType.cpp >+++ b/Source/WebCore/html/TextFieldInputType.cpp >@@ -349,7 +349,7 @@ void TextFieldInputType::createShadowSubtree() > > if (shouldHaveCapsLockIndicator) { > m_capsLockIndicator = HTMLDivElement::create(document); >- m_capsLockIndicator->setPseudo(AtomicString("-webkit-caps-lock-indicator", AtomicString::ConstructFromLiteral)); >+ m_capsLockIndicator->setPseudo(AtomString("-webkit-caps-lock-indicator", AtomString::ConstructFromLiteral)); > > bool shouldDrawCapsLockIndicator = this->shouldDrawCapsLockIndicator(); > m_capsLockIndicator->setInlineStyleProperty(CSSPropertyDisplay, shouldDrawCapsLockIndicator ? CSSValueBlock : CSSValueNone, true); >@@ -457,7 +457,7 @@ void TextFieldInputType::createDataListDropdownIndicator() > ScriptDisallowedScope::EventAllowedScope allowedScope(*m_container); > m_dataListDropdownIndicator = DataListButtonElement::create(element()->document(), *this); > m_container->appendChild(*m_dataListDropdownIndicator); >- m_dataListDropdownIndicator->setPseudo(AtomicString("-webkit-list-button", AtomicString::ConstructFromLiteral)); >+ m_dataListDropdownIndicator->setPseudo(AtomString("-webkit-list-button", AtomString::ConstructFromLiteral)); > m_dataListDropdownIndicator->setInlineStyleProperty(CSSPropertyDisplay, CSSValueNone, true); > > } >@@ -518,17 +518,17 @@ static String autoFillButtonTypeToAutoFillButtonText(AutoFillButtonType autoFill > return { }; > } > >-static AtomicString autoFillButtonTypeToAutoFillButtonPseudoClassName(AutoFillButtonType autoFillButtonType) >+static AtomString autoFillButtonTypeToAutoFillButtonPseudoClassName(AutoFillButtonType autoFillButtonType) > { > switch (autoFillButtonType) { > case AutoFillButtonType::Contacts: >- return { "-webkit-contacts-auto-fill-button", AtomicString::ConstructFromLiteral }; >+ return { "-webkit-contacts-auto-fill-button", AtomString::ConstructFromLiteral }; > case AutoFillButtonType::Credentials: >- return { "-webkit-credentials-auto-fill-button", AtomicString::ConstructFromLiteral }; >+ return { "-webkit-credentials-auto-fill-button", AtomString::ConstructFromLiteral }; > case AutoFillButtonType::StrongPassword: >- return { "-webkit-strong-password-auto-fill-button", AtomicString::ConstructFromLiteral }; >+ return { "-webkit-strong-password-auto-fill-button", AtomString::ConstructFromLiteral }; > case AutoFillButtonType::CreditCard: >- return { "-webkit-credit-card-auto-fill-button", AtomicString::ConstructFromLiteral }; >+ return { "-webkit-credit-card-auto-fill-button", AtomString::ConstructFromLiteral }; > case AutoFillButtonType::None: > ASSERT_NOT_REACHED(); > return emptyAtom(); >@@ -537,7 +537,7 @@ static AtomicString autoFillButtonTypeToAutoFillButtonPseudoClassName(AutoFillBu > return { }; > } > >-static bool isAutoFillButtonTypeChanged(const AtomicString& attribute, AutoFillButtonType autoFillButtonType) >+static bool isAutoFillButtonTypeChanged(const AtomString& attribute, AutoFillButtonType autoFillButtonType) > { > if (attribute == "-webkit-contacts-auto-fill-button" && autoFillButtonType != AutoFillButtonType::Contacts) > return true; >@@ -782,7 +782,7 @@ void TextFieldInputType::createContainer() > > m_container = TextControlInnerContainer::create(element()->document()); > element()->userAgentShadowRoot()->appendChild(*m_container); >- m_container->setPseudo(AtomicString("-webkit-textfield-decoration-container", AtomicString::ConstructFromLiteral)); >+ m_container->setPseudo(AtomString("-webkit-textfield-decoration-container", AtomString::ConstructFromLiteral)); > > m_innerBlock = TextControlInnerElement::create(element()->document()); > m_container->appendChild(*m_innerBlock); >@@ -799,7 +799,7 @@ void TextFieldInputType::createAutoFillButton(AutoFillButtonType autoFillButtonT > ASSERT(element()); > m_autoFillButton = AutoFillButtonElement::create(element()->document(), *this); > m_autoFillButton->setPseudo(autoFillButtonTypeToAutoFillButtonPseudoClassName(autoFillButtonType)); >- m_autoFillButton->setAttributeWithoutSynchronization(roleAttr, AtomicString("button", AtomicString::ConstructFromLiteral)); >+ m_autoFillButton->setAttributeWithoutSynchronization(roleAttr, AtomString("button", AtomString::ConstructFromLiteral)); > m_autoFillButton->setAttributeWithoutSynchronization(aria_labelAttr, autoFillButtonTypeToAccessibilityLabel(autoFillButtonType)); > m_autoFillButton->setTextContent(autoFillButtonTypeToAutoFillButtonText(autoFillButtonType)); > m_container->appendChild(*m_autoFillButton); >@@ -818,7 +818,7 @@ void TextFieldInputType::updateAutoFillButton() > if (!m_autoFillButton) > createAutoFillButton(autoFillButtonType); > >- const AtomicString& attribute = m_autoFillButton->attributeWithoutSynchronization(pseudoAttr); >+ const AtomString& attribute = m_autoFillButton->attributeWithoutSynchronization(pseudoAttr); > bool shouldUpdateAutoFillButtonType = isAutoFillButtonTypeChanged(attribute, autoFillButtonType); > if (shouldUpdateAutoFillButtonType) { > m_autoFillButton->setPseudo(autoFillButtonTypeToAutoFillButtonPseudoClassName(autoFillButtonType)); >diff --git a/Source/WebCore/html/TextInputType.cpp b/Source/WebCore/html/TextInputType.cpp >index 9032db6757f5cf2e137a940c96dc0e0121ea4920..784b65e0cd9d15f71f3ecabcce44aca5f263fd24 100644 >--- a/Source/WebCore/html/TextInputType.cpp >+++ b/Source/WebCore/html/TextInputType.cpp >@@ -38,7 +38,7 @@ namespace WebCore { > > using namespace HTMLNames; > >-const AtomicString& TextInputType::formControlType() const >+const AtomString& TextInputType::formControlType() const > { > return InputTypeNames::text(); > } >diff --git a/Source/WebCore/html/TextInputType.h b/Source/WebCore/html/TextInputType.h >index 6d7f39db85d1578baf3f14018151b0f8cb2b7dc4..ee89c8f6aa9f18acc79f5c2b1a85a027bee7d3ce 100644 >--- a/Source/WebCore/html/TextInputType.h >+++ b/Source/WebCore/html/TextInputType.h >@@ -39,7 +39,7 @@ public: > explicit TextInputType(HTMLInputElement& element) : BaseTextInputType(element) { } > > private: >- const AtomicString& formControlType() const override; >+ const AtomString& formControlType() const override; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/html/TimeInputType.cpp b/Source/WebCore/html/TimeInputType.cpp >index 42c3911ede22bf127f9c2c9adaeed1de369e2577..b4040d34f0c18e8c460f1bf5c71bbb836bc312de 100644 >--- a/Source/WebCore/html/TimeInputType.cpp >+++ b/Source/WebCore/html/TimeInputType.cpp >@@ -52,7 +52,7 @@ TimeInputType::TimeInputType(HTMLInputElement& element) > { > } > >-const AtomicString& TimeInputType::formControlType() const >+const AtomString& TimeInputType::formControlType() const > { > return InputTypeNames::time(); > } >diff --git a/Source/WebCore/html/TimeInputType.h b/Source/WebCore/html/TimeInputType.h >index 06486bca28b462e560a0875afd7e9863f11aa833..e985508edb99d574b58245b3c1a40dad7b6cc6db 100644 >--- a/Source/WebCore/html/TimeInputType.h >+++ b/Source/WebCore/html/TimeInputType.h >@@ -41,7 +41,7 @@ public: > explicit TimeInputType(HTMLInputElement&); > > private: >- const AtomicString& formControlType() const override; >+ const AtomString& formControlType() const override; > DateComponents::Type dateType() const override; > Decimal defaultValueForStepUp() const override; > StepRange createStepRange(AnyStepHandling) const override; >diff --git a/Source/WebCore/html/URLInputType.cpp b/Source/WebCore/html/URLInputType.cpp >index 63bb3cc2601a043d149c45a29ec18da140b5ad84..76818a26098e75cc88fef79f851a08bbc9ca9e6d 100644 >--- a/Source/WebCore/html/URLInputType.cpp >+++ b/Source/WebCore/html/URLInputType.cpp >@@ -40,7 +40,7 @@ > > namespace WebCore { > >-const AtomicString& URLInputType::formControlType() const >+const AtomString& URLInputType::formControlType() const > { > return InputTypeNames::url(); > } >diff --git a/Source/WebCore/html/URLInputType.h b/Source/WebCore/html/URLInputType.h >index 98b9f85a172ea925d6bf6c264e4773feb8f8833e..0d3bbb5a2d05855c8f125bc9faef8eb17f7990b2 100644 >--- a/Source/WebCore/html/URLInputType.h >+++ b/Source/WebCore/html/URLInputType.h >@@ -39,7 +39,7 @@ public: > explicit URLInputType(HTMLInputElement& element) : BaseTextInputType(element) { } > > private: >- const AtomicString& formControlType() const override; >+ const AtomString& formControlType() const override; > bool typeMismatchFor(const String&) const override; > bool typeMismatch() const override; > String typeMismatchText() const override; >diff --git a/Source/WebCore/html/URLUtils.h b/Source/WebCore/html/URLUtils.h >index 696c0051bd544723bb48e5f87e1d8703a829027d..3c5f2d26135b97e8a72b6a0cd632a72f6c6bfb0d 100644 >--- a/Source/WebCore/html/URLUtils.h >+++ b/Source/WebCore/html/URLUtils.h >@@ -297,7 +297,7 @@ String URLUtils<T>::hash() const > String fragmentIdentifier = href().fragmentIdentifier(); > if (fragmentIdentifier.isEmpty()) > return emptyString(); >- return AtomicString(String("#" + fragmentIdentifier)); >+ return AtomString(String("#" + fragmentIdentifier)); > } > > template <typename T> >diff --git a/Source/WebCore/html/ValidationMessage.cpp b/Source/WebCore/html/ValidationMessage.cpp >index dae9f126135f694c3ead1bd34641212773fdc31e..8af73a8a0054980ad17906956a8432a6f9cdb14b 100644 >--- a/Source/WebCore/html/ValidationMessage.cpp >+++ b/Source/WebCore/html/ValidationMessage.cpp >@@ -90,7 +90,7 @@ void ValidationMessage::updateValidationMessage(const String& message) > // with the validationMessage. However, this behavior is same as Opera > // and the specification describes such behavior as an example. > if (!updatedMessage.isEmpty()) { >- const AtomicString& title = m_element->attributeWithoutSynchronization(titleAttr); >+ const AtomString& title = m_element->attributeWithoutSynchronization(titleAttr); > if (!title.isEmpty()) > updatedMessage = updatedMessage + '\n' + title; > } >@@ -183,7 +183,7 @@ void ValidationMessage::buildBubbleTree() > > Document& document = m_element->document(); > m_bubble = HTMLDivElement::create(document); >- m_bubble->setPseudo(AtomicString("-webkit-validation-bubble", AtomicString::ConstructFromLiteral)); >+ m_bubble->setPseudo(AtomString("-webkit-validation-bubble", AtomString::ConstructFromLiteral)); > // Need to force position:absolute because RenderMenuList doesn't assume it > // contains non-absolute or non-fixed renderers as children. > m_bubble->setInlineStyleProperty(CSSPropertyPosition, CSSValueAbsolute); >@@ -199,24 +199,24 @@ void ValidationMessage::buildBubbleTree() > adjustBubblePosition(m_element->renderer()->absoluteBoundingBoxRect(), m_bubble.get()); > > auto clipper = HTMLDivElement::create(document); >- clipper->setPseudo(AtomicString("-webkit-validation-bubble-arrow-clipper", AtomicString::ConstructFromLiteral)); >+ clipper->setPseudo(AtomString("-webkit-validation-bubble-arrow-clipper", AtomString::ConstructFromLiteral)); > auto bubbleArrow = HTMLDivElement::create(document); >- bubbleArrow->setPseudo(AtomicString("-webkit-validation-bubble-arrow", AtomicString::ConstructFromLiteral)); >+ bubbleArrow->setPseudo(AtomString("-webkit-validation-bubble-arrow", AtomString::ConstructFromLiteral)); > clipper->appendChild(bubbleArrow); > m_bubble->appendChild(clipper); > > auto message = HTMLDivElement::create(document); >- message->setPseudo(AtomicString("-webkit-validation-bubble-message", AtomicString::ConstructFromLiteral)); >+ message->setPseudo(AtomString("-webkit-validation-bubble-message", AtomString::ConstructFromLiteral)); > auto icon = HTMLDivElement::create(document); >- icon->setPseudo(AtomicString("-webkit-validation-bubble-icon", AtomicString::ConstructFromLiteral)); >+ icon->setPseudo(AtomString("-webkit-validation-bubble-icon", AtomString::ConstructFromLiteral)); > message->appendChild(icon); > auto textBlock = HTMLDivElement::create(document); >- textBlock->setPseudo(AtomicString("-webkit-validation-bubble-text-block", AtomicString::ConstructFromLiteral)); >+ textBlock->setPseudo(AtomString("-webkit-validation-bubble-text-block", AtomString::ConstructFromLiteral)); > m_messageHeading = HTMLDivElement::create(document); >- m_messageHeading->setPseudo(AtomicString("-webkit-validation-bubble-heading", AtomicString::ConstructFromLiteral)); >+ m_messageHeading->setPseudo(AtomString("-webkit-validation-bubble-heading", AtomString::ConstructFromLiteral)); > textBlock->appendChild(*m_messageHeading); > m_messageBody = HTMLDivElement::create(document); >- m_messageBody->setPseudo(AtomicString("-webkit-validation-bubble-body", AtomicString::ConstructFromLiteral)); >+ m_messageBody->setPseudo(AtomString("-webkit-validation-bubble-body", AtomString::ConstructFromLiteral)); > textBlock->appendChild(*m_messageBody); > message->appendChild(textBlock); > m_bubble->appendChild(message); >diff --git a/Source/WebCore/html/WeekInputType.cpp b/Source/WebCore/html/WeekInputType.cpp >index bcb6af2caad5e5f3bea9454a5103eb951cd43d62..198cfcce68edd7a97884a11944d11bcdbd8d08a1 100644 >--- a/Source/WebCore/html/WeekInputType.cpp >+++ b/Source/WebCore/html/WeekInputType.cpp >@@ -45,7 +45,7 @@ static const int weekDefaultStep = 1; > static const int weekStepScaleFactor = 604800000; > static const StepRange::StepDescription weekStepDescription { weekDefaultStep, weekDefaultStepBase, weekStepScaleFactor, StepRange::ParsedStepValueShouldBeInteger }; > >-const AtomicString& WeekInputType::formControlType() const >+const AtomString& WeekInputType::formControlType() const > { > return InputTypeNames::week(); > } >diff --git a/Source/WebCore/html/WeekInputType.h b/Source/WebCore/html/WeekInputType.h >index ce3b1e6b291764ff976b1ffb90a52be5bc5da2a7..37190dfe79ea55081014c2e98a5283052b6dfba7 100644 >--- a/Source/WebCore/html/WeekInputType.h >+++ b/Source/WebCore/html/WeekInputType.h >@@ -41,7 +41,7 @@ public: > explicit WeekInputType(HTMLInputElement& element) : BaseChooserOnlyDateAndTimeInputType(element) { } > > private: >- const AtomicString& formControlType() const override; >+ const AtomString& formControlType() const override; > DateComponents::Type dateType() const override; > StepRange createStepRange(AnyStepHandling) const override; > bool parseToDateComponentsInternal(const UChar*, unsigned length, DateComponents*) const override; >diff --git a/Source/WebCore/html/canvas/WebGLContextEvent.cpp b/Source/WebCore/html/canvas/WebGLContextEvent.cpp >index 41a6ea6ac6b7db88b6c87186259fc43883b6c9f2..13df204627291feb574e407ea41383ebc7dd8176 100644 >--- a/Source/WebCore/html/canvas/WebGLContextEvent.cpp >+++ b/Source/WebCore/html/canvas/WebGLContextEvent.cpp >@@ -30,13 +30,13 @@ > > namespace WebCore { > >-WebGLContextEvent::WebGLContextEvent(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, const String& statusMessage) >+WebGLContextEvent::WebGLContextEvent(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, const String& statusMessage) > : Event(type, canBubble, cancelable) > , m_statusMessage(statusMessage) > { > } > >-WebGLContextEvent::WebGLContextEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+WebGLContextEvent::WebGLContextEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_statusMessage(initializer.statusMessage) > { >diff --git a/Source/WebCore/html/canvas/WebGLContextEvent.h b/Source/WebCore/html/canvas/WebGLContextEvent.h >index 99aad7efcb419d60cd71724f80cfe3a354b55383..5bfd0295901a3307924d649289e4a2c3b7bfa576 100644 >--- a/Source/WebCore/html/canvas/WebGLContextEvent.h >+++ b/Source/WebCore/html/canvas/WebGLContextEvent.h >@@ -31,7 +31,7 @@ namespace WebCore { > > class WebGLContextEvent final : public Event { > public: >- static Ref<WebGLContextEvent> create(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, const String& statusMessage) >+ static Ref<WebGLContextEvent> create(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, const String& statusMessage) > { > return adoptRef(*new WebGLContextEvent(type, canBubble, cancelable, statusMessage)); > } >@@ -40,7 +40,7 @@ public: > String statusMessage; > }; > >- static Ref<WebGLContextEvent> create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<WebGLContextEvent> create(const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new WebGLContextEvent(type, initializer, isTrusted)); > } >@@ -51,8 +51,8 @@ public: > EventInterface eventInterface() const override; > > private: >- WebGLContextEvent(const AtomicString& type, CanBubble, IsCancelable, const String& statusMessage); >- WebGLContextEvent(const AtomicString&, const Init&, IsTrusted); >+ WebGLContextEvent(const AtomString& type, CanBubble, IsCancelable, const String& statusMessage); >+ WebGLContextEvent(const AtomString&, const Init&, IsTrusted); > > String m_statusMessage; > }; >diff --git a/Source/WebCore/html/parser/AtomicHTMLToken.h b/Source/WebCore/html/parser/AtomicHTMLToken.h >index a070ce47f3bfbd97e59f34fd34544aae898c6abb..b95976f21e66efcca0ce1c474284568b5bc42a62 100644 >--- a/Source/WebCore/html/parser/AtomicHTMLToken.h >+++ b/Source/WebCore/html/parser/AtomicHTMLToken.h >@@ -33,7 +33,7 @@ namespace WebCore { > class AtomicHTMLToken { > public: > explicit AtomicHTMLToken(HTMLToken&); >- AtomicHTMLToken(HTMLToken::Type, const AtomicString& name, Vector<Attribute>&& = { }); // Only StartTag or EndTag. >+ AtomicHTMLToken(HTMLToken::Type, const AtomString& name, Vector<Attribute>&& = { }); // Only StartTag or EndTag. > > AtomicHTMLToken(const AtomicHTMLToken&) = delete; > AtomicHTMLToken(AtomicHTMLToken&&) = default; >@@ -42,9 +42,9 @@ public: > > // StartTag, EndTag, DOCTYPE. > >- void setName(const AtomicString&); >+ void setName(const AtomString&); > >- const AtomicString& name() const; >+ const AtomString& name() const; > > // DOCTYPE. > >@@ -74,7 +74,7 @@ private: > > void initializeAttributes(const HTMLToken::AttributeList& attributes); > >- AtomicString m_name; // StartTag, EndTag, DOCTYPE. >+ AtomString m_name; // StartTag, EndTag, DOCTYPE. > > String m_data; // Comment > >@@ -92,20 +92,20 @@ private: > }; > > const Attribute* findAttribute(const Vector<Attribute>&, const QualifiedName&); >-bool hasAttribute(const Vector<Attribute>&, const AtomicString& localName); >+bool hasAttribute(const Vector<Attribute>&, const AtomString& localName); > > inline HTMLToken::Type AtomicHTMLToken::type() const > { > return m_type; > } > >-inline const AtomicString& AtomicHTMLToken::name() const >+inline const AtomString& AtomicHTMLToken::name() const > { > ASSERT(m_type == HTMLToken::StartTag || m_type == HTMLToken::EndTag || m_type == HTMLToken::DOCTYPE); > return m_name; > } > >-inline void AtomicHTMLToken::setName(const AtomicString& name) >+inline void AtomicHTMLToken::setName(const AtomString& name) > { > ASSERT(m_type == HTMLToken::StartTag || m_type == HTMLToken::EndTag || m_type == HTMLToken::DOCTYPE); > m_name = name; >@@ -182,7 +182,7 @@ inline const Attribute* findAttribute(const Vector<Attribute>& attributes, const > return nullptr; > } > >-inline bool hasAttribute(const Vector<Attribute>& attributes, const AtomicString& localName) >+inline bool hasAttribute(const Vector<Attribute>& attributes, const AtomString& localName) > { > for (auto& attribute : attributes) { > if (attribute.localName() == localName) >@@ -202,11 +202,11 @@ inline void AtomicHTMLToken::initializeAttributes(const HTMLToken::AttributeList > if (attribute.name.isEmpty()) > continue; > >- AtomicString localName(attribute.name); >+ AtomString localName(attribute.name); > > // FIXME: This is N^2 for the number of attributes. > if (!hasAttribute(m_attributes, localName)) >- m_attributes.uncheckedAppend(Attribute(QualifiedName(nullAtom(), localName, nullAtom()), AtomicString(attribute.value))); >+ m_attributes.uncheckedAppend(Attribute(QualifiedName(nullAtom(), localName, nullAtom()), AtomString(attribute.value))); > } > } > >@@ -218,7 +218,7 @@ inline AtomicHTMLToken::AtomicHTMLToken(HTMLToken& token) > ASSERT_NOT_REACHED(); > return; > case HTMLToken::DOCTYPE: >- m_name = AtomicString(token.name()); >+ m_name = AtomString(token.name()); > m_doctypeData = token.releaseDoctypeData(); > return; > case HTMLToken::EndOfFile: >@@ -226,7 +226,7 @@ inline AtomicHTMLToken::AtomicHTMLToken(HTMLToken& token) > case HTMLToken::StartTag: > case HTMLToken::EndTag: > m_selfClosing = token.selfClosing(); >- m_name = AtomicString(token.name()); >+ m_name = AtomString(token.name()); > initializeAttributes(token.attributes()); > return; > case HTMLToken::Comment: >@@ -244,7 +244,7 @@ inline AtomicHTMLToken::AtomicHTMLToken(HTMLToken& token) > ASSERT_NOT_REACHED(); > } > >-inline AtomicHTMLToken::AtomicHTMLToken(HTMLToken::Type type, const AtomicString& name, Vector<Attribute>&& attributes) >+inline AtomicHTMLToken::AtomicHTMLToken(HTMLToken::Type type, const AtomString& name, Vector<Attribute>&& attributes) > : m_type(type) > , m_name(name) > , m_selfClosing(false) >diff --git a/Source/WebCore/html/parser/HTMLConstructionSite.cpp b/Source/WebCore/html/parser/HTMLConstructionSite.cpp >index cf1b53bdb23f798fb2138b96895048919bc4217c..51bae4c21cf940dcd8c6d320bc4dbd6626be7d9f 100644 >--- a/Source/WebCore/html/parser/HTMLConstructionSite.cpp >+++ b/Source/WebCore/html/parser/HTMLConstructionSite.cpp >@@ -509,7 +509,7 @@ std::unique_ptr<CustomElementConstructionData> HTMLConstructionSite::insertHTMLE > return nullptr; > } > >-void HTMLConstructionSite::insertCustomElement(Ref<Element>&& element, const AtomicString& localName, Vector<Attribute>&& attributes) >+void HTMLConstructionSite::insertCustomElement(Ref<Element>&& element, const AtomString& localName, Vector<Attribute>&& attributes) > { > setAttributes(element, attributes, m_parserContentPolicy); > attachLater(currentNode(), element.copyRef()); >@@ -554,7 +554,7 @@ void HTMLConstructionSite::insertScriptElement(AtomicHTMLToken&& token) > m_openElements.push(HTMLStackItem::create(WTFMove(element), WTFMove(token))); > } > >-void HTMLConstructionSite::insertForeignElement(AtomicHTMLToken&& token, const AtomicString& namespaceURI) >+void HTMLConstructionSite::insertForeignElement(AtomicHTMLToken&& token, const AtomString& namespaceURI) > { > ASSERT(token.type() == HTMLToken::StartTag); > notImplemented(); // parseError when xmlns or xmlns:xlink are wrong. >@@ -575,8 +575,8 @@ void HTMLConstructionSite::insertTextNode(const String& characters, WhitespaceMo > findFosterSite(task); > > // Strings composed entirely of whitespace are likely to be repeated. >- // Turn them into AtomicString so we share a single string for each. >- bool shouldUseAtomicString = whitespaceMode == AllWhitespace || (whitespaceMode == WhitespaceUnknown && isAllWhitespace(characters)); >+ // Turn them into AtomString so we share a single string for each. >+ bool shouldUseAtomString = whitespaceMode == AllWhitespace || (whitespaceMode == WhitespaceUnknown && isAllWhitespace(characters)); > > unsigned currentPosition = 0; > unsigned lengthLimit = shouldUseLengthLimit(*task.parent) ? Text::defaultLengthLimit : std::numeric_limits<unsigned>::max(); >@@ -592,11 +592,11 @@ void HTMLConstructionSite::insertTextNode(const String& characters, WhitespaceMo > } > > while (currentPosition < characters.length()) { >- auto textNode = Text::createWithLengthLimit(task.parent->document(), shouldUseAtomicString ? AtomicString(characters).string() : characters, currentPosition, lengthLimit); >+ auto textNode = Text::createWithLengthLimit(task.parent->document(), shouldUseAtomString ? AtomString(characters).string() : characters, currentPosition, lengthLimit); > // If we have a whole string of unbreakable characters the above could lead to an infinite loop. Exceeding the length limit is the lesser evil. > if (!textNode->length()) { > String substring = characters.substring(currentPosition); >- textNode = Text::create(task.parent->document(), shouldUseAtomicString ? AtomicString(substring).string() : substring); >+ textNode = Text::create(task.parent->document(), shouldUseAtomString ? AtomString(substring).string() : substring); > } > > currentPosition += textNode->length(); >@@ -635,7 +635,7 @@ void HTMLConstructionSite::takeAllChildrenAndReparent(HTMLStackItem& newParent, > m_taskQueue.append(WTFMove(task)); > } > >-Ref<Element> HTMLConstructionSite::createElement(AtomicHTMLToken& token, const AtomicString& namespaceURI) >+Ref<Element> HTMLConstructionSite::createElement(AtomicHTMLToken& token, const AtomString& namespaceURI) > { > QualifiedName tagName(nullAtom(), token.name(), namespaceURI); > auto element = ownerDocumentForCurrentNode().createElement(tagName, true); >@@ -650,7 +650,7 @@ inline Document& HTMLConstructionSite::ownerDocumentForCurrentNode() > return currentNode().document(); > } > >-static inline JSCustomElementInterface* findCustomElementInterface(Document& ownerDocument, const AtomicString& localName) >+static inline JSCustomElementInterface* findCustomElementInterface(Document& ownerDocument, const AtomString& localName) > { > auto* window = ownerDocument.domWindow(); > if (!window) >@@ -754,7 +754,7 @@ void HTMLConstructionSite::reconstructTheActiveFormattingElements() > } > } > >-void HTMLConstructionSite::generateImpliedEndTagsWithExclusion(const AtomicString& tagName) >+void HTMLConstructionSite::generateImpliedEndTagsWithExclusion(const AtomString& tagName) > { > while (hasImpliedEndTag(currentStackItem()) && !currentStackItem().matchesHTMLTag(tagName)) > m_openElements.pop(); >diff --git a/Source/WebCore/html/parser/HTMLConstructionSite.h b/Source/WebCore/html/parser/HTMLConstructionSite.h >index 3af622ee9ab4896efd3cfe8a225a99e1eb865b55..c08d667f7c812ca3bebbda3e9089681175fad08a 100644 >--- a/Source/WebCore/html/parser/HTMLConstructionSite.h >+++ b/Source/WebCore/html/parser/HTMLConstructionSite.h >@@ -104,7 +104,7 @@ public: > void insertCommentOnHTMLHtmlElement(AtomicHTMLToken&&); > void insertHTMLElement(AtomicHTMLToken&&); > std::unique_ptr<CustomElementConstructionData> insertHTMLElementOrFindCustomElementInterface(AtomicHTMLToken&&); >- void insertCustomElement(Ref<Element>&&, const AtomicString& localName, Vector<Attribute>&&); >+ void insertCustomElement(Ref<Element>&&, const AtomString& localName, Vector<Attribute>&&); > void insertSelfClosingHTMLElement(AtomicHTMLToken&&); > void insertFormattingElement(AtomicHTMLToken&&); > void insertHTMLHeadElement(AtomicHTMLToken&&); >@@ -112,7 +112,7 @@ public: > void insertHTMLFormElement(AtomicHTMLToken&&, bool isDemoted = false); > void insertScriptElement(AtomicHTMLToken&&); > void insertTextNode(const String&, WhitespaceMode = WhitespaceUnknown); >- void insertForeignElement(AtomicHTMLToken&&, const AtomicString& namespaceURI); >+ void insertForeignElement(AtomicHTMLToken&&, const AtomString& namespaceURI); > > void insertHTMLHtmlStartTagBeforeHTML(AtomicHTMLToken&&); > void insertHTMLHtmlStartTagInBody(AtomicHTMLToken&&); >@@ -134,7 +134,7 @@ public: > void reconstructTheActiveFormattingElements(); > > void generateImpliedEndTags(); >- void generateImpliedEndTagsWithExclusion(const AtomicString& tagName); >+ void generateImpliedEndTagsWithExclusion(const AtomString& tagName); > > bool inQuirksMode() { return m_inQuirksMode; } > >@@ -172,7 +172,7 @@ public: > SetForScope<bool> m_redirectAttachToFosterParentChange; > }; > >- static bool isFormattingTag(const AtomicString&); >+ static bool isFormattingTag(const AtomString&); > > private: > // In the common case, this queue will have only one task because most >@@ -188,7 +188,7 @@ private: > > RefPtr<Element> createHTMLElementOrFindCustomElementInterface(AtomicHTMLToken&, JSCustomElementInterface**); > Ref<Element> createHTMLElement(AtomicHTMLToken&); >- Ref<Element> createElement(AtomicHTMLToken&, const AtomicString& namespaceURI); >+ Ref<Element> createElement(AtomicHTMLToken&, const AtomString& namespaceURI); > > void mergeAttributesFromTokenIntoElement(AtomicHTMLToken&&, Element&); > void dispatchDocumentElementAvailableIfNeeded(); >diff --git a/Source/WebCore/html/parser/HTMLElementStack.cpp b/Source/WebCore/html/parser/HTMLElementStack.cpp >index 9ea63bc552988cae1cdc8feaa826703b07cc3728..30c5b46df103dbdf6f4b7ce409cc3aa16c546012 100644 >--- a/Source/WebCore/html/parser/HTMLElementStack.cpp >+++ b/Source/WebCore/html/parser/HTMLElementStack.cpp >@@ -190,7 +190,7 @@ void HTMLElementStack::pop() > popCommon(); > } > >-void HTMLElementStack::popUntil(const AtomicString& tagName) >+void HTMLElementStack::popUntil(const AtomString& tagName) > { > while (!topStackItem().matchesHTMLTag(tagName)) { > // pop() will ASSERT if a <body>, <head> or <html> will be popped. >@@ -198,7 +198,7 @@ void HTMLElementStack::popUntil(const AtomicString& tagName) > } > } > >-void HTMLElementStack::popUntilPopped(const AtomicString& tagName) >+void HTMLElementStack::popUntilPopped(const AtomString& tagName) > { > popUntil(tagName); > pop(); >@@ -392,7 +392,7 @@ auto HTMLElementStack::find(Element& element) const -> ElementRecord* > return nullptr; > } > >-auto HTMLElementStack::topmost(const AtomicString& tagName) const -> ElementRecord* >+auto HTMLElementStack::topmost(const AtomString& tagName) const -> ElementRecord* > { > for (auto* record = m_top.get(); record; record = record->next()) { > if (record->stackItem().matchesHTMLTag(tagName)) >@@ -406,12 +406,12 @@ bool HTMLElementStack::contains(Element& element) const > return !!find(element); > } > >-bool HTMLElementStack::contains(const AtomicString& tagName) const >+bool HTMLElementStack::contains(const AtomString& tagName) const > { > return !!topmost(tagName); > } > >-template <bool isMarker(HTMLStackItem&)> bool inScopeCommon(HTMLElementStack::ElementRecord* top, const AtomicString& targetTag) >+template <bool isMarker(HTMLStackItem&)> bool inScopeCommon(HTMLElementStack::ElementRecord* top, const AtomString& targetTag) > { > for (auto* record = top; record; record = record->next()) { > auto& item = record->stackItem(); >@@ -450,7 +450,7 @@ bool HTMLElementStack::inScope(Element& targetElement) const > return false; > } > >-bool HTMLElementStack::inScope(const AtomicString& targetTag) const >+bool HTMLElementStack::inScope(const AtomString& targetTag) const > { > return inScopeCommon<isScopeMarker>(m_top.get(), targetTag); > } >@@ -460,7 +460,7 @@ bool HTMLElementStack::inScope(const QualifiedName& tagName) const > return inScope(tagName.localName()); > } > >-bool HTMLElementStack::inListItemScope(const AtomicString& targetTag) const >+bool HTMLElementStack::inListItemScope(const AtomString& targetTag) const > { > return inScopeCommon<isListItemScopeMarker>(m_top.get(), targetTag); > } >@@ -470,7 +470,7 @@ bool HTMLElementStack::inListItemScope(const QualifiedName& tagName) const > return inListItemScope(tagName.localName()); > } > >-bool HTMLElementStack::inTableScope(const AtomicString& targetTag) const >+bool HTMLElementStack::inTableScope(const AtomString& targetTag) const > { > return inScopeCommon<isTableScopeMarker>(m_top.get(), targetTag); > } >@@ -480,7 +480,7 @@ bool HTMLElementStack::inTableScope(const QualifiedName& tagName) const > return inTableScope(tagName.localName()); > } > >-bool HTMLElementStack::inButtonScope(const AtomicString& targetTag) const >+bool HTMLElementStack::inButtonScope(const AtomString& targetTag) const > { > return inScopeCommon<isButtonScopeMarker>(m_top.get(), targetTag); > } >@@ -490,7 +490,7 @@ bool HTMLElementStack::inButtonScope(const QualifiedName& tagName) const > return inButtonScope(tagName.localName()); > } > >-bool HTMLElementStack::inSelectScope(const AtomicString& targetTag) const >+bool HTMLElementStack::inSelectScope(const AtomString& targetTag) const > { > return inScopeCommon<isSelectScopeMarker>(m_top.get(), targetTag); > } >diff --git a/Source/WebCore/html/parser/HTMLElementStack.h b/Source/WebCore/html/parser/HTMLElementStack.h >index 6d49927702efd6d699fd1dcd51ca62b69cbb41fe..11876aa1a028a78999eca59d42bfeb98528f353d 100644 >--- a/Source/WebCore/html/parser/HTMLElementStack.h >+++ b/Source/WebCore/html/parser/HTMLElementStack.h >@@ -53,7 +53,7 @@ public: > > Element& element() const { return m_item->element(); } > ContainerNode& node() const { return m_item->node(); } >- const AtomicString& namespaceURI() const { return m_item->namespaceURI(); } >+ const AtomString& namespaceURI() const { return m_item->namespaceURI(); } > HTMLStackItem& stackItem() { return m_item.get(); } > const HTMLStackItem& stackItem() const { return m_item.get(); } > >@@ -96,7 +96,7 @@ public: > ElementRecord& topRecord() const; > ElementRecord* find(Element&) const; > ElementRecord* furthestBlockForFormattingElement(Element&) const; >- ElementRecord* topmost(const AtomicString& tagName) const; >+ ElementRecord* topmost(const AtomString& tagName) const; > > void insertAbove(Ref<HTMLStackItem>&&, ElementRecord&); > >@@ -107,9 +107,9 @@ public: > void pushHTMLBodyElement(Ref<HTMLStackItem>&&); > > void pop(); >- void popUntil(const AtomicString& tagName); >+ void popUntil(const AtomString& tagName); > void popUntil(Element&); >- void popUntilPopped(const AtomicString& tagName); >+ void popUntilPopped(const AtomString& tagName); > void popUntilPopped(const QualifiedName& tagName) { popUntilPopped(tagName.localName()); } > > void popUntilPopped(Element&); >@@ -129,18 +129,18 @@ public: > void removeHTMLHeadElement(Element&); > > bool contains(Element&) const; >- bool contains(const AtomicString& tagName) const; >+ bool contains(const AtomString& tagName) const; > > bool inScope(Element&) const; >- bool inScope(const AtomicString& tagName) const; >+ bool inScope(const AtomString& tagName) const; > bool inScope(const QualifiedName&) const; >- bool inListItemScope(const AtomicString& tagName) const; >+ bool inListItemScope(const AtomString& tagName) const; > bool inListItemScope(const QualifiedName&) const; >- bool inTableScope(const AtomicString& tagName) const; >+ bool inTableScope(const AtomString& tagName) const; > bool inTableScope(const QualifiedName&) const; >- bool inButtonScope(const AtomicString& tagName) const; >+ bool inButtonScope(const AtomString& tagName) const; > bool inButtonScope(const QualifiedName&) const; >- bool inSelectScope(const AtomicString& tagName) const; >+ bool inSelectScope(const AtomString& tagName) const; > bool inSelectScope(const QualifiedName&) const; > > bool hasNumberedHeaderElementInScope() const; >diff --git a/Source/WebCore/html/parser/HTMLFormattingElementList.cpp b/Source/WebCore/html/parser/HTMLFormattingElementList.cpp >index cab16f11d839c99e3a9367b7bc4b935d452f4b7e..6574863896e8f886d7592bee1fa9c9ee96a3ff92 100644 >--- a/Source/WebCore/html/parser/HTMLFormattingElementList.cpp >+++ b/Source/WebCore/html/parser/HTMLFormattingElementList.cpp >@@ -41,7 +41,7 @@ HTMLFormattingElementList::HTMLFormattingElementList() = default; > > HTMLFormattingElementList::~HTMLFormattingElementList() = default; > >-Element* HTMLFormattingElementList::closestElementInScopeWithName(const AtomicString& targetName) >+Element* HTMLFormattingElementList::closestElementInScopeWithName(const AtomString& targetName) > { > for (unsigned i = 1; i <= m_entries.size(); ++i) { > const Entry& entry = m_entries[m_entries.size() - i]; >diff --git a/Source/WebCore/html/parser/HTMLFormattingElementList.h b/Source/WebCore/html/parser/HTMLFormattingElementList.h >index dfebea343cec058074094fc26bf35e418f2adc9a..e6ab1ea57b14d21d9813df7feda0c656c9d0a7f4 100644 >--- a/Source/WebCore/html/parser/HTMLFormattingElementList.h >+++ b/Source/WebCore/html/parser/HTMLFormattingElementList.h >@@ -101,7 +101,7 @@ public: > bool isEmpty() const { return !size(); } > size_t size() const { return m_entries.size(); } > >- Element* closestElementInScopeWithName(const AtomicString&); >+ Element* closestElementInScopeWithName(const AtomString&); > > Entry* find(Element&); > bool contains(Element&); >diff --git a/Source/WebCore/html/parser/HTMLMetaCharsetParser.cpp b/Source/WebCore/html/parser/HTMLMetaCharsetParser.cpp >index b5ca46c21fb6ca25cb9825c795f0887b444520d5..8e0bcb040c11337afc034919830f2d27ea994114 100644 >--- a/Source/WebCore/html/parser/HTMLMetaCharsetParser.cpp >+++ b/Source/WebCore/html/parser/HTMLMetaCharsetParser.cpp >@@ -160,7 +160,7 @@ bool HTMLMetaCharsetParser::checkForMetaCharset(const char* data, size_t length) > while (auto token = m_tokenizer.nextToken(m_input)) { > bool isEnd = token->type() == HTMLToken::EndTag; > if (isEnd || token->type() == HTMLToken::StartTag) { >- AtomicString tagName(token->name()); >+ AtomString tagName(token->name()); > if (!isEnd) { > m_tokenizer.updateStateFor(tagName); > if (tagName == metaTag && processMeta(*token)) { >diff --git a/Source/WebCore/html/parser/HTMLParserIdioms.cpp b/Source/WebCore/html/parser/HTMLParserIdioms.cpp >index 5442e0c4a067ba727b6295f9b918f3399db2eace..76798467e34046fcdb5e564fb91e7fa3424c42ab 100644 >--- a/Source/WebCore/html/parser/HTMLParserIdioms.cpp >+++ b/Source/WebCore/html/parser/HTMLParserIdioms.cpp >@@ -346,7 +346,7 @@ bool threadSafeMatch(const QualifiedName& a, const QualifiedName& b) > return threadSafeEqual(*a.localName().impl(), *b.localName().impl()); > } > >-String parseCORSSettingsAttribute(const AtomicString& value) >+String parseCORSSettingsAttribute(const AtomString& value) > { > if (value.isNull()) > return String(); >@@ -468,12 +468,12 @@ bool parseMetaHTTPEquivRefresh(const StringView& input, double& delay, String& u > } > > // https://html.spec.whatwg.org/#rules-for-parsing-a-hash-name-reference >-AtomicString parseHTMLHashNameReference(StringView usemap) >+AtomString parseHTMLHashNameReference(StringView usemap) > { > size_t numberSignIndex = usemap.find('#'); > if (numberSignIndex == notFound) > return nullAtom(); >- return usemap.substring(numberSignIndex + 1).toAtomicString(); >+ return usemap.substring(numberSignIndex + 1).toAtomString(); > } > > } >diff --git a/Source/WebCore/html/parser/HTMLParserIdioms.h b/Source/WebCore/html/parser/HTMLParserIdioms.h >index 69e894d108c1934a2068a39bd8f95d379b522850..5385c9652617692df662cb81f5fe88191b9ce16a 100644 >--- a/Source/WebCore/html/parser/HTMLParserIdioms.h >+++ b/Source/WebCore/html/parser/HTMLParserIdioms.h >@@ -80,11 +80,11 @@ Vector<double> parseHTMLListOfOfFloatingPointNumberValues(StringView); > bool parseMetaHTTPEquivRefresh(const StringView&, double& delay, String& url); > > // https://html.spec.whatwg.org/multipage/infrastructure.html#cors-settings-attribute >-String parseCORSSettingsAttribute(const AtomicString&); >+String parseCORSSettingsAttribute(const AtomString&); > > bool threadSafeMatch(const QualifiedName&, const QualifiedName&); > >-AtomicString parseHTMLHashNameReference(StringView); >+AtomString parseHTMLHashNameReference(StringView); > > // Inline implementations of some of the functions declared above. > >diff --git a/Source/WebCore/html/parser/HTMLPreloadScanner.cpp b/Source/WebCore/html/parser/HTMLPreloadScanner.cpp >index d71ec552505745816d55364e3fab6eb1c8e90c0b..3231496bf09a50eed2dab22645f22875b4ffa938 100644 >--- a/Source/WebCore/html/parser/HTMLPreloadScanner.cpp >+++ b/Source/WebCore/html/parser/HTMLPreloadScanner.cpp >@@ -51,7 +51,7 @@ using namespace HTMLNames; > > TokenPreloadScanner::TagId TokenPreloadScanner::tagIdFor(const HTMLToken::DataVector& data) > { >- AtomicString tagName(data); >+ AtomString tagName(data); > if (tagName == imgTag) > return TagId::Img; > if (tagName == inputTag) >@@ -120,7 +120,7 @@ public: > return; > > for (auto& attribute : attributes) { >- AtomicString attributeName(attribute.name); >+ AtomString attributeName(attribute.name); > String attributeValue = StringImpl::create8BitIfPossible(attribute.value); > processAttribute(attributeName, attributeValue, document, pictureState); > } >@@ -172,14 +172,14 @@ public: > return request; > } > >- static bool match(const AtomicString& name, const QualifiedName& qName) >+ static bool match(const AtomString& name, const QualifiedName& qName) > { > ASSERT(isMainThread()); > return qName.localName() == name; > } > > private: >- void processImageAndScriptAttribute(const AtomicString& attributeName, const String& attributeValue) >+ void processImageAndScriptAttribute(const AtomString& attributeName, const String& attributeValue) > { > if (match(attributeName, srcAttr)) > setUrlToLoad(attributeValue); >@@ -189,7 +189,7 @@ private: > m_charset = attributeValue; > } > >- void processAttribute(const AtomicString& attributeName, const String& attributeValue, Document& document, const Vector<bool>& pictureState) >+ void processAttribute(const AtomString& attributeName, const String& attributeValue, Document& document, const Vector<bool>& pictureState) > { > bool inPicture = !pictureState.isEmpty(); > bool alreadyMatchedSource = inPicture && pictureState.last(); >@@ -472,7 +472,7 @@ void HTMLPreloadScanner::scan(HTMLResourcePreloader& preloader, Document& docume > > while (auto token = m_tokenizer.nextToken(m_source)) { > if (token->type() == HTMLToken::StartTag) >- m_tokenizer.updateStateFor(AtomicString(token->name())); >+ m_tokenizer.updateStateFor(AtomString(token->name())); > m_scanner.scan(*token, requests, document); > } > >diff --git a/Source/WebCore/html/parser/HTMLSrcsetParser.cpp b/Source/WebCore/html/parser/HTMLSrcsetParser.cpp >index af426cdb41b0d8ff98877c3b8562afe19c8318be..4f4107890686222b59e93926989611bece3d69d3 100644 >--- a/Source/WebCore/html/parser/HTMLSrcsetParser.cpp >+++ b/Source/WebCore/html/parser/HTMLSrcsetParser.cpp >@@ -257,7 +257,7 @@ static ImageCandidate pickBestImageCandidate(float deviceScaleFactor, Vector<Ima > return imageCandidates[winner]; > } > >-ImageCandidate bestFitSourceForImageAttributes(float deviceScaleFactor, const AtomicString& srcAttribute, const AtomicString& srcsetAttribute, float sourceSize) >+ImageCandidate bestFitSourceForImageAttributes(float deviceScaleFactor, const AtomString& srcAttribute, const AtomString& srcsetAttribute, float sourceSize) > { > if (srcsetAttribute.isNull()) { > if (srcAttribute.isNull()) >diff --git a/Source/WebCore/html/parser/HTMLSrcsetParser.h b/Source/WebCore/html/parser/HTMLSrcsetParser.h >index 63aee53a3abedf34b69655a7d52da733bce3f0d2..03c57d360bed0fc859d8374c067c41da16b5e9a1 100644 >--- a/Source/WebCore/html/parser/HTMLSrcsetParser.h >+++ b/Source/WebCore/html/parser/HTMLSrcsetParser.h >@@ -102,7 +102,7 @@ struct ImageCandidate { > OriginAttribute originAttribute; > }; > >-ImageCandidate bestFitSourceForImageAttributes(float deviceScaleFactor, const AtomicString& srcAttribute, const AtomicString& srcsetAttribute, float sourceSize); >+ImageCandidate bestFitSourceForImageAttributes(float deviceScaleFactor, const AtomString& srcAttribute, const AtomString& srcsetAttribute, float sourceSize); > > Vector<ImageCandidate> parseImageCandidatesFromSrcsetAttribute(StringView attribute); > >diff --git a/Source/WebCore/html/parser/HTMLStackItem.h b/Source/WebCore/html/parser/HTMLStackItem.h >index 985319831b15329bba94fcfa90544e8cf37cfb6e..a3631520a7d31637cab7624547214e81b9f19582 100644 >--- a/Source/WebCore/html/parser/HTMLStackItem.h >+++ b/Source/WebCore/html/parser/HTMLStackItem.h >@@ -38,8 +38,8 @@ namespace WebCore { > class HTMLStackItem : public RefCounted<HTMLStackItem> { > public: > // Normal HTMLElementStack and HTMLFormattingElementList items. >- static Ref<HTMLStackItem> create(Ref<Element>&&, AtomicHTMLToken&&, const AtomicString& namespaceURI = HTMLNames::xhtmlNamespaceURI); >- static Ref<HTMLStackItem> create(Ref<Element>&&, const AtomicString&, Vector<Attribute>&&); >+ static Ref<HTMLStackItem> create(Ref<Element>&&, AtomicHTMLToken&&, const AtomString& namespaceURI = HTMLNames::xhtmlNamespaceURI); >+ static Ref<HTMLStackItem> create(Ref<Element>&&, const AtomString&, Vector<Attribute>&&); > > // Document fragment or element for parsing context. > static Ref<HTMLStackItem> create(Element&); >@@ -51,24 +51,24 @@ public: > ContainerNode& node() const; > Element& element() const; > >- const AtomicString& namespaceURI() const; >- const AtomicString& localName() const; >+ const AtomString& namespaceURI() const; >+ const AtomString& localName() const; > > const Vector<Attribute>& attributes() const; > const Attribute* findAttribute(const QualifiedName& attributeName) const; > > bool hasTagName(const QualifiedName&) const; >- bool matchesHTMLTag(const AtomicString&) const; >+ bool matchesHTMLTag(const AtomString&) const; > > private: >- HTMLStackItem(Ref<Element>&&, AtomicHTMLToken&&, const AtomicString& namespaceURI); >- HTMLStackItem(Ref<Element>&&, const AtomicString& localName, const AtomicString& namespaceURI, Vector<Attribute>&&); >+ HTMLStackItem(Ref<Element>&&, AtomicHTMLToken&&, const AtomString& namespaceURI); >+ HTMLStackItem(Ref<Element>&&, const AtomString& localName, const AtomString& namespaceURI, Vector<Attribute>&&); > explicit HTMLStackItem(Element&); > explicit HTMLStackItem(DocumentFragment&); > > const Ref<ContainerNode> m_node; >- const AtomicString m_namespaceURI; >- const AtomicString m_localName; >+ const AtomString m_namespaceURI; >+ const AtomString m_localName; > const Vector<Attribute> m_attributes; > }; > >@@ -76,7 +76,7 @@ bool isInHTMLNamespace(const HTMLStackItem&); > bool isNumberedHeaderElement(const HTMLStackItem&); > bool isSpecialNode(const HTMLStackItem&); > >-inline HTMLStackItem::HTMLStackItem(Ref<Element>&& element, AtomicHTMLToken&& token, const AtomicString& namespaceURI = HTMLNames::xhtmlNamespaceURI) >+inline HTMLStackItem::HTMLStackItem(Ref<Element>&& element, AtomicHTMLToken&& token, const AtomString& namespaceURI = HTMLNames::xhtmlNamespaceURI) > : m_node(WTFMove(element)) > , m_namespaceURI(namespaceURI) > , m_localName(token.name()) >@@ -84,12 +84,12 @@ inline HTMLStackItem::HTMLStackItem(Ref<Element>&& element, AtomicHTMLToken&& to > { > } > >-inline Ref<HTMLStackItem> HTMLStackItem::create(Ref<Element>&& element, AtomicHTMLToken&& token, const AtomicString& namespaceURI) >+inline Ref<HTMLStackItem> HTMLStackItem::create(Ref<Element>&& element, AtomicHTMLToken&& token, const AtomString& namespaceURI) > { > return adoptRef(*new HTMLStackItem(WTFMove(element), WTFMove(token), namespaceURI)); > } > >-inline HTMLStackItem::HTMLStackItem(Ref<Element>&& element, const AtomicString& localName, const AtomicString& namespaceURI, Vector<Attribute>&& attributes) >+inline HTMLStackItem::HTMLStackItem(Ref<Element>&& element, const AtomString& localName, const AtomString& namespaceURI, Vector<Attribute>&& attributes) > : m_node(WTFMove(element)) > , m_namespaceURI(namespaceURI) > , m_localName(localName) >@@ -97,7 +97,7 @@ inline HTMLStackItem::HTMLStackItem(Ref<Element>&& element, const AtomicString& > { > } > >-inline Ref<HTMLStackItem> HTMLStackItem::create(Ref<Element>&& element, const AtomicString& localName, Vector<Attribute>&& attributes) >+inline Ref<HTMLStackItem> HTMLStackItem::create(Ref<Element>&& element, const AtomString& localName, Vector<Attribute>&& attributes) > { > auto& namespaceURI = element.get().namespaceURI(); > return adoptRef(*new HTMLStackItem(WTFMove(element), localName, namespaceURI, WTFMove(attributes))); >@@ -145,12 +145,12 @@ inline bool HTMLStackItem::isElement() const > return !isDocumentFragment(); > } > >-inline const AtomicString& HTMLStackItem::namespaceURI() const >+inline const AtomString& HTMLStackItem::namespaceURI() const > { > return m_namespaceURI; > } > >-inline const AtomicString& HTMLStackItem::localName() const >+inline const AtomString& HTMLStackItem::localName() const > { > return m_localName; > } >@@ -171,7 +171,7 @@ inline bool HTMLStackItem::hasTagName(const QualifiedName& name) const > return m_localName == name.localName() && m_namespaceURI == name.namespaceURI(); > } > >-inline bool HTMLStackItem::matchesHTMLTag(const AtomicString& name) const >+inline bool HTMLStackItem::matchesHTMLTag(const AtomString& name) const > { > return m_localName == name && m_namespaceURI == HTMLNames::xhtmlNamespaceURI; > } >@@ -200,7 +200,7 @@ inline bool isSpecialNode(const HTMLStackItem& item) > { > if (item.isDocumentFragment()) > return true; >- const AtomicString& tagName = item.localName(); >+ const AtomString& tagName = item.localName(); > if (item.namespaceURI() == HTMLNames::xhtmlNamespaceURI) { > return tagName == HTMLNames::addressTag > || tagName == HTMLNames::appletTag >diff --git a/Source/WebCore/html/parser/HTMLTokenizer.cpp b/Source/WebCore/html/parser/HTMLTokenizer.cpp >index f537cf1b4d93f03f739316136ce03a16dfc3e0cd..663e0c1c7a95df9dd5b15b288c3f327278e42810 100644 >--- a/Source/WebCore/html/parser/HTMLTokenizer.cpp >+++ b/Source/WebCore/html/parser/HTMLTokenizer.cpp >@@ -1405,7 +1405,7 @@ String HTMLTokenizer::bufferedCharacters() const > return characters.toString(); > } > >-void HTMLTokenizer::updateStateFor(const AtomicString& tagName) >+void HTMLTokenizer::updateStateFor(const AtomString& tagName) > { > if (tagName == textareaTag || tagName == titleTag) > m_state = RCDATAState; >diff --git a/Source/WebCore/html/parser/HTMLTokenizer.h b/Source/WebCore/html/parser/HTMLTokenizer.h >index a553acbd91c6099726565e17ab2fe87ad7be9877..5d8191f44895442158cf7e254a3a1c5687a8044c 100644 >--- a/Source/WebCore/html/parser/HTMLTokenizer.h >+++ b/Source/WebCore/html/parser/HTMLTokenizer.h >@@ -62,7 +62,7 @@ public: > // > // This approximation is also the algorithm called for when parsing an HTML fragment. > // https://html.spec.whatwg.org/multipage/syntax.html#parsing-html-fragments >- void updateStateFor(const AtomicString& tagName); >+ void updateStateFor(const AtomString& tagName); > > void setForceNullCharacterReplacement(bool); > >diff --git a/Source/WebCore/html/parser/HTMLTreeBuilder.cpp b/Source/WebCore/html/parser/HTMLTreeBuilder.cpp >index 18fbe4042d4feec6f7fcf32a1372119b531534b8..0fb1fb6b2a6734e61e92621b26c0a6db6b4edada 100644 >--- a/Source/WebCore/html/parser/HTMLTreeBuilder.cpp >+++ b/Source/WebCore/html/parser/HTMLTreeBuilder.cpp >@@ -56,7 +56,7 @@ namespace WebCore { > > using namespace HTMLNames; > >-CustomElementConstructionData::CustomElementConstructionData(Ref<JSCustomElementInterface>&& customElementInterface, const AtomicString& name, Vector<Attribute>&& attributes) >+CustomElementConstructionData::CustomElementConstructionData(Ref<JSCustomElementInterface>&& customElementInterface, const AtomString& name, Vector<Attribute>&& attributes) > : elementInterface(WTFMove(customElementInterface)) > , name(name) > , attributes(WTFMove(attributes)) >@@ -89,7 +89,7 @@ static inline bool isAllWhitespaceOrReplacementCharacters(const String& string) > return string.isAllSpecialCharacters<isHTMLSpaceOrReplacementCharacter>(); > } > >-static bool isNumberedHeaderTag(const AtomicString& tagName) >+static bool isNumberedHeaderTag(const AtomString& tagName) > { > return tagName == h1Tag > || tagName == h2Tag >@@ -99,22 +99,22 @@ static bool isNumberedHeaderTag(const AtomicString& tagName) > || tagName == h6Tag; > } > >-static bool isCaptionColOrColgroupTag(const AtomicString& tagName) >+static bool isCaptionColOrColgroupTag(const AtomString& tagName) > { > return tagName == captionTag || tagName == colTag || tagName == colgroupTag; > } > >-static bool isTableCellContextTag(const AtomicString& tagName) >+static bool isTableCellContextTag(const AtomString& tagName) > { > return tagName == thTag || tagName == tdTag; > } > >-static bool isTableBodyContextTag(const AtomicString& tagName) >+static bool isTableBodyContextTag(const AtomString& tagName) > { > return tagName == tbodyTag || tagName == tfootTag || tagName == theadTag; > } > >-static bool isNonAnchorNonNobrFormattingTag(const AtomicString& tagName) >+static bool isNonAnchorNonNobrFormattingTag(const AtomString& tagName) > { > return tagName == bTag > || tagName == bigTag >@@ -130,13 +130,13 @@ static bool isNonAnchorNonNobrFormattingTag(const AtomicString& tagName) > || tagName == uTag; > } > >-static bool isNonAnchorFormattingTag(const AtomicString& tagName) >+static bool isNonAnchorFormattingTag(const AtomString& tagName) > { > return tagName == nobrTag || isNonAnchorNonNobrFormattingTag(tagName); > } > > // https://html.spec.whatwg.org/multipage/syntax.html#formatting >-bool HTMLConstructionSite::isFormattingTag(const AtomicString& tagName) >+bool HTMLConstructionSite::isFormattingTag(const AtomString& tagName) > { > return tagName == aTag || isNonAnchorFormattingTag(tagName); > } >@@ -420,7 +420,7 @@ void HTMLTreeBuilder::processFakeStartTag(const QualifiedName& tagName, Vector<A > processStartTag(WTFMove(fakeToken)); > } > >-void HTMLTreeBuilder::processFakeEndTag(const AtomicString& tagName) >+void HTMLTreeBuilder::processFakeEndTag(const AtomString& tagName) > { > AtomicHTMLToken fakeToken(HTMLToken::EndTag, tagName); > processEndTag(WTFMove(fakeToken)); >@@ -478,13 +478,13 @@ template <bool shouldClose(const HTMLStackItem&)> void HTMLTreeBuilder::processC > m_tree.insertHTMLElement(WTFMove(token)); > } > >-template <typename TableQualifiedName> static HashMap<AtomicString, QualifiedName> createCaseMap(const TableQualifiedName* const names[], unsigned length) >+template <typename TableQualifiedName> static HashMap<AtomString, QualifiedName> createCaseMap(const TableQualifiedName* const names[], unsigned length) > { >- HashMap<AtomicString, QualifiedName> map; >+ HashMap<AtomString, QualifiedName> map; > for (unsigned i = 0; i < length; ++i) { > const QualifiedName& name = *names[i]; >- const AtomicString& localName = name.localName(); >- AtomicString loweredLocalName = localName.convertToASCIILowercase(); >+ const AtomString& localName = name.localName(); >+ AtomString loweredLocalName = localName.convertToASCIILowercase(); > if (loweredLocalName != localName) > map.add(loweredLocalName, name); > } >@@ -493,14 +493,14 @@ template <typename TableQualifiedName> static HashMap<AtomicString, QualifiedNam > > static void adjustSVGTagNameCase(AtomicHTMLToken& token) > { >- static NeverDestroyed<HashMap<AtomicString, QualifiedName>> map = createCaseMap(SVGNames::getSVGTags(), SVGNames::SVGTagsCount); >+ static NeverDestroyed<HashMap<AtomString, QualifiedName>> map = createCaseMap(SVGNames::getSVGTags(), SVGNames::SVGTagsCount); > const QualifiedName& casedName = map.get().get(token.name()); > if (casedName.localName().isNull()) > return; > token.setName(casedName.localName()); > } > >-static inline void adjustAttributes(HashMap<AtomicString, QualifiedName>& map, AtomicHTMLToken& token) >+static inline void adjustAttributes(HashMap<AtomString, QualifiedName>& map, AtomicHTMLToken& token) > { > for (auto& attribute : token.attributes()) { > const QualifiedName& casedName = map.get(attribute.localName()); >@@ -511,7 +511,7 @@ static inline void adjustAttributes(HashMap<AtomicString, QualifiedName>& map, A > > template<const QualifiedName* const* attributesTable(), unsigned attributesTableLength> static void adjustAttributes(AtomicHTMLToken& token) > { >- static NeverDestroyed<HashMap<AtomicString, QualifiedName>> map = createCaseMap(attributesTable(), attributesTableLength); >+ static NeverDestroyed<HashMap<AtomString, QualifiedName>> map = createCaseMap(attributesTable(), attributesTableLength); > adjustAttributes(map, token); > } > >@@ -525,20 +525,20 @@ static inline void adjustMathMLAttributes(AtomicHTMLToken& token) > adjustAttributes<MathMLNames::getMathMLAttrs, MathMLNames::MathMLAttrsCount>(token); > } > >-static void addNamesWithPrefix(HashMap<AtomicString, QualifiedName>& map, const AtomicString& prefix, const QualifiedName* const names[], unsigned length) >+static void addNamesWithPrefix(HashMap<AtomString, QualifiedName>& map, const AtomString& prefix, const QualifiedName* const names[], unsigned length) > { > for (unsigned i = 0; i < length; ++i) { > const QualifiedName& name = *names[i]; >- const AtomicString& localName = name.localName(); >+ const AtomString& localName = name.localName(); > map.add(prefix + ':' + localName, QualifiedName(prefix, localName, name.namespaceURI())); > } > } > >-static HashMap<AtomicString, QualifiedName> createForeignAttributesMap() >+static HashMap<AtomString, QualifiedName> createForeignAttributesMap() > { >- HashMap<AtomicString, QualifiedName> map; >+ HashMap<AtomString, QualifiedName> map; > >- AtomicString xlinkName("xlink", AtomicString::ConstructFromLiteral); >+ AtomString xlinkName("xlink", AtomString::ConstructFromLiteral); > addNamesWithPrefix(map, xlinkName, XLinkNames::getXLinkAttrs(), XLinkNames::XLinkAttrsCount); > addNamesWithPrefix(map, xmlAtom(), XMLNames::getXMLAttrs(), XMLNames::XMLAttrsCount); > >@@ -550,7 +550,7 @@ static HashMap<AtomicString, QualifiedName> createForeignAttributesMap() > > static void adjustForeignAttributes(AtomicHTMLToken& token) > { >- static NeverDestroyed<HashMap<AtomicString, QualifiedName>> map = createForeignAttributesMap(); >+ static NeverDestroyed<HashMap<AtomString, QualifiedName>> map = createForeignAttributesMap(); > adjustAttributes(map, token); > } > >@@ -2200,7 +2200,7 @@ void HTMLTreeBuilder::insertPhoneNumberLink(const String& string) > Vector<Attribute> attributes; > attributes.append(Attribute(HTMLNames::hrefAttr, makeString("tel:"_s, string))); > >- const AtomicString& aTagLocalName = aTag->localName(); >+ const AtomString& aTagLocalName = aTag->localName(); > AtomicHTMLToken aStartToken(HTMLToken::StartTag, aTagLocalName, WTFMove(attributes)); > AtomicHTMLToken aEndToken(HTMLToken::EndTag, aTagLocalName); > >@@ -2774,7 +2774,7 @@ void HTMLTreeBuilder::processTokenInForeignContent(AtomicHTMLToken&& token) > processStartTag(WTFMove(token)); > return; > } >- const AtomicString& currentNamespace = adjustedCurrentNode.namespaceURI(); >+ const AtomString& currentNamespace = adjustedCurrentNode.namespaceURI(); > if (currentNamespace == MathMLNames::mathmlNamespaceURI) > adjustMathMLAttributes(token); > if (currentNamespace == SVGNames::svgNamespaceURI) { >diff --git a/Source/WebCore/html/parser/HTMLTreeBuilder.h b/Source/WebCore/html/parser/HTMLTreeBuilder.h >index 4a5e2b487396aaeed0a96aa2ee7a3812c3938aed..a6a391c18e76d1773a656ec567f8685c0b3cdb4b 100644 >--- a/Source/WebCore/html/parser/HTMLTreeBuilder.h >+++ b/Source/WebCore/html/parser/HTMLTreeBuilder.h >@@ -40,11 +40,11 @@ class ScriptElement; > struct CustomElementConstructionData { > WTF_MAKE_STRUCT_FAST_ALLOCATED; > >- CustomElementConstructionData(Ref<JSCustomElementInterface>&&, const AtomicString& name, Vector<Attribute>&&); >+ CustomElementConstructionData(Ref<JSCustomElementInterface>&&, const AtomString& name, Vector<Attribute>&&); > ~CustomElementConstructionData(); > > Ref<JSCustomElementInterface> elementInterface; >- AtomicString name; >+ AtomString name; > Vector<Attribute> attributes; > }; > >@@ -143,7 +143,7 @@ private: > > void processFakeStartTag(const QualifiedName&, Vector<Attribute>&& attributes = Vector<Attribute>()); > void processFakeEndTag(const QualifiedName&); >- void processFakeEndTag(const AtomicString&); >+ void processFakeEndTag(const AtomString&); > void processFakeCharacters(const String&); > void processFakePEndTagIfPInButtonScope(); > >diff --git a/Source/WebCore/html/shadow/DetailsMarkerControl.cpp b/Source/WebCore/html/shadow/DetailsMarkerControl.cpp >index b6507cd3281d1f3ce3678145fdaf7e6fa4dd3015..04a9ae644b8652869e2ab42c688208bba7048d48 100644 >--- a/Source/WebCore/html/shadow/DetailsMarkerControl.cpp >+++ b/Source/WebCore/html/shadow/DetailsMarkerControl.cpp >@@ -49,7 +49,7 @@ Ref<DetailsMarkerControl> DetailsMarkerControl::create(Document& document) > DetailsMarkerControl::DetailsMarkerControl(Document& document) > : HTMLDivElement(HTMLNames::divTag, document) > { >- setPseudo(AtomicString("-webkit-details-marker", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-details-marker", AtomString::ConstructFromLiteral)); > } > > RenderPtr<RenderElement> DetailsMarkerControl::createElementRenderer(RenderStyle&& style, const RenderTreePosition&) >diff --git a/Source/WebCore/html/shadow/MediaControlElements.cpp b/Source/WebCore/html/shadow/MediaControlElements.cpp >index 089e139348362827bb5ed0437b6720ce61dfc996..cddc5b795d62496aca1733069953ab282fea3161 100644 >--- a/Source/WebCore/html/shadow/MediaControlElements.cpp >+++ b/Source/WebCore/html/shadow/MediaControlElements.cpp >@@ -94,8 +94,8 @@ WTF_MAKE_ISO_ALLOCATED_IMPL(MediaControlTextTrackContainerElement); > > using namespace HTMLNames; > >-static const AtomicString& getMediaControlCurrentTimeDisplayElementShadowPseudoId(); >-static const AtomicString& getMediaControlTimeRemainingDisplayElementShadowPseudoId(); >+static const AtomString& getMediaControlCurrentTimeDisplayElementShadowPseudoId(); >+static const AtomString& getMediaControlTimeRemainingDisplayElementShadowPseudoId(); > > MediaControlPanelElement::MediaControlPanelElement(Document& document) > : MediaControlDivElement(document, MediaControlsPanel) >@@ -105,7 +105,7 @@ MediaControlPanelElement::MediaControlPanelElement(Document& document) > , m_opaque(true) > , m_transitionTimer(*this, &MediaControlPanelElement::transitionTimerFired) > { >- setPseudo(AtomicString("-webkit-media-controls-panel", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-panel", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlPanelElement> MediaControlPanelElement::create(Document& document) >@@ -287,7 +287,7 @@ MediaControlPanelEnclosureElement::MediaControlPanelEnclosureElement(Document& d > // Mapping onto same MediaControlElementType as panel element, since it has similar properties. > : MediaControlDivElement(document, MediaControlsPanel) > { >- setPseudo(AtomicString("-webkit-media-controls-enclosure", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-enclosure", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlPanelEnclosureElement> MediaControlPanelEnclosureElement::create(Document& document) >@@ -301,7 +301,7 @@ MediaControlOverlayEnclosureElement::MediaControlOverlayEnclosureElement(Documen > // Mapping onto same MediaControlElementType as panel element, since it has similar properties. > : MediaControlDivElement(document, MediaControlsPanel) > { >- setPseudo(AtomicString("-webkit-media-controls-overlay-enclosure", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-overlay-enclosure", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlOverlayEnclosureElement> MediaControlOverlayEnclosureElement::create(Document& document) >@@ -314,7 +314,7 @@ Ref<MediaControlOverlayEnclosureElement> MediaControlOverlayEnclosureElement::cr > MediaControlTimelineContainerElement::MediaControlTimelineContainerElement(Document& document) > : MediaControlDivElement(document, MediaTimelineContainer) > { >- setPseudo(AtomicString("-webkit-media-controls-timeline-container", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-timeline-container", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlTimelineContainerElement> MediaControlTimelineContainerElement::create(Document& document) >@@ -349,7 +349,7 @@ RenderPtr<RenderElement> MediaControlTimelineContainerElement::createElementRend > MediaControlVolumeSliderContainerElement::MediaControlVolumeSliderContainerElement(Document& document) > : MediaControlDivElement(document, MediaVolumeSliderContainer) > { >- setPseudo(AtomicString("-webkit-media-controls-volume-slider-container", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-volume-slider-container", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlVolumeSliderContainerElement> MediaControlVolumeSliderContainerElement::create(Document& document) >@@ -386,7 +386,7 @@ MediaControlStatusDisplayElement::MediaControlStatusDisplayElement(Document& doc > : MediaControlDivElement(document, MediaStatusDisplay) > , m_stateBeingDisplayed(Nothing) > { >- setPseudo(AtomicString("-webkit-media-controls-status-display", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-status-display", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlStatusDisplayElement> MediaControlStatusDisplayElement::create(Document& document) >@@ -435,7 +435,7 @@ MediaControlPanelMuteButtonElement::MediaControlPanelMuteButtonElement(Document& > : MediaControlMuteButtonElement(document, MediaMuteButton) > , m_controls(controls) > { >- setPseudo(AtomicString("-webkit-media-controls-mute-button", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-mute-button", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlPanelMuteButtonElement> MediaControlPanelMuteButtonElement::create(Document& document, MediaControls* controls) >@@ -461,7 +461,7 @@ void MediaControlPanelMuteButtonElement::defaultEventHandler(Event& event) > MediaControlVolumeSliderMuteButtonElement::MediaControlVolumeSliderMuteButtonElement(Document& document) > : MediaControlMuteButtonElement(document, MediaMuteButton) > { >- setPseudo(AtomicString("-webkit-media-controls-volume-slider-mute-button", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-volume-slider-mute-button", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlVolumeSliderMuteButtonElement> MediaControlVolumeSliderMuteButtonElement::create(Document& document) >@@ -477,7 +477,7 @@ Ref<MediaControlVolumeSliderMuteButtonElement> MediaControlVolumeSliderMuteButto > MediaControlPlayButtonElement::MediaControlPlayButtonElement(Document& document) > : MediaControlInputElement(document, MediaPlayButton) > { >- setPseudo(AtomicString("-webkit-media-controls-play-button", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-play-button", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlPlayButtonElement> MediaControlPlayButtonElement::create(Document& document) >@@ -511,7 +511,7 @@ void MediaControlPlayButtonElement::updateDisplayType() > MediaControlOverlayPlayButtonElement::MediaControlOverlayPlayButtonElement(Document& document) > : MediaControlInputElement(document, MediaOverlayPlayButton) > { >- setPseudo(AtomicString("-webkit-media-controls-overlay-play-button", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-overlay-play-button", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlOverlayPlayButtonElement> MediaControlOverlayPlayButtonElement::create(Document& document) >@@ -545,7 +545,7 @@ void MediaControlOverlayPlayButtonElement::updateDisplayType() > MediaControlSeekForwardButtonElement::MediaControlSeekForwardButtonElement(Document& document) > : MediaControlSeekButtonElement(document, MediaSeekForwardButton) > { >- setPseudo(AtomicString("-webkit-media-controls-seek-forward-button", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-seek-forward-button", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlSeekForwardButtonElement> MediaControlSeekForwardButtonElement::create(Document& document) >@@ -561,7 +561,7 @@ Ref<MediaControlSeekForwardButtonElement> MediaControlSeekForwardButtonElement:: > MediaControlSeekBackButtonElement::MediaControlSeekBackButtonElement(Document& document) > : MediaControlSeekButtonElement(document, MediaSeekBackButton) > { >- setPseudo(AtomicString("-webkit-media-controls-seek-back-button", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-seek-back-button", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlSeekBackButtonElement> MediaControlSeekBackButtonElement::create(Document& document) >@@ -577,7 +577,7 @@ Ref<MediaControlSeekBackButtonElement> MediaControlSeekBackButtonElement::create > MediaControlRewindButtonElement::MediaControlRewindButtonElement(Document& document) > : MediaControlInputElement(document, MediaRewindButton) > { >- setPseudo(AtomicString("-webkit-media-controls-rewind-button", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-rewind-button", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlRewindButtonElement> MediaControlRewindButtonElement::create(Document& document) >@@ -602,7 +602,7 @@ void MediaControlRewindButtonElement::defaultEventHandler(Event& event) > MediaControlReturnToRealtimeButtonElement::MediaControlReturnToRealtimeButtonElement(Document& document) > : MediaControlInputElement(document, MediaReturnToRealtimeButton) > { >- setPseudo(AtomicString("-webkit-media-controls-return-to-realtime-button", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-return-to-realtime-button", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlReturnToRealtimeButtonElement> MediaControlReturnToRealtimeButtonElement::create(Document& document) >@@ -634,7 +634,7 @@ MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsB > #if !PLATFORM(COCOA) && !PLATFORM(WIN) || !PLATFORM(GTK) > UNUSED_PARAM(controls); > #endif >- setPseudo(AtomicString("-webkit-media-controls-toggle-closed-captions-button", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-toggle-closed-captions-button", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlToggleClosedCaptionsButtonElement> MediaControlToggleClosedCaptionsButtonElement::create(Document& document, MediaControls* controls) >@@ -680,13 +680,13 @@ void MediaControlToggleClosedCaptionsButtonElement::defaultEventHandler(Event& e > MediaControlClosedCaptionsContainerElement::MediaControlClosedCaptionsContainerElement(Document& document) > : MediaControlDivElement(document, MediaClosedCaptionsContainer) > { >- setPseudo(AtomicString("-webkit-media-controls-closed-captions-container", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-closed-captions-container", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlClosedCaptionsContainerElement> MediaControlClosedCaptionsContainerElement::create(Document& document) > { > Ref<MediaControlClosedCaptionsContainerElement> element = adoptRef(*new MediaControlClosedCaptionsContainerElement(document)); >- element->setAttributeWithoutSynchronization(dirAttr, AtomicString("auto", AtomicString::ConstructFromLiteral)); >+ element->setAttributeWithoutSynchronization(dirAttr, AtomString("auto", AtomString::ConstructFromLiteral)); > element->hide(); > return element; > } >@@ -702,7 +702,7 @@ MediaControlClosedCaptionsTrackListElement::MediaControlClosedCaptionsTrackListE > #if !ENABLE(VIDEO_TRACK) > UNUSED_PARAM(controls); > #endif >- setPseudo(AtomicString("-webkit-media-controls-closed-captions-track-list", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-closed-captions-track-list", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlClosedCaptionsTrackListElement> MediaControlClosedCaptionsTrackListElement::create(Document& document, MediaControls* controls) >@@ -748,7 +748,7 @@ void MediaControlClosedCaptionsTrackListElement::defaultEventHandler(Event& even > void MediaControlClosedCaptionsTrackListElement::updateDisplay() > { > #if ENABLE(VIDEO_TRACK) >- static NeverDestroyed<AtomicString> selectedClassValue("selected", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> selectedClassValue("selected", AtomString::ConstructFromLiteral); > > if (!mediaController()->hasClosedCaptions()) > return; >@@ -854,7 +854,7 @@ MediaControlTimelineElement::MediaControlTimelineElement(Document& document, Med > : MediaControlInputElement(document, MediaSlider) > , m_controls(controls) > { >- setPseudo(AtomicString("-webkit-media-controls-timeline", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-timeline", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlTimelineElement> MediaControlTimelineElement::create(Document& document, MediaControls* controls) >@@ -864,7 +864,7 @@ Ref<MediaControlTimelineElement> MediaControlTimelineElement::create(Document& d > Ref<MediaControlTimelineElement> timeline = adoptRef(*new MediaControlTimelineElement(document, controls)); > timeline->ensureUserAgentShadowRoot(); > timeline->setType("range"); >- timeline->setAttributeWithoutSynchronization(precisionAttr, AtomicString("float", AtomicString::ConstructFromLiteral)); >+ timeline->setAttributeWithoutSynchronization(precisionAttr, AtomString("float", AtomString::ConstructFromLiteral)); > return timeline; > } > >@@ -914,7 +914,7 @@ void MediaControlTimelineElement::setPosition(double currentTime) > > void MediaControlTimelineElement::setDuration(double duration) > { >- setAttribute(maxAttr, AtomicString::number(duration)); >+ setAttribute(maxAttr, AtomString::number(duration)); > } > > // ---------------------------- >@@ -922,7 +922,7 @@ void MediaControlTimelineElement::setDuration(double duration) > MediaControlPanelVolumeSliderElement::MediaControlPanelVolumeSliderElement(Document& document) > : MediaControlVolumeSliderElement(document) > { >- setPseudo(AtomicString("-webkit-media-controls-volume-slider", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-volume-slider", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlPanelVolumeSliderElement> MediaControlPanelVolumeSliderElement::create(Document& document) >@@ -930,8 +930,8 @@ Ref<MediaControlPanelVolumeSliderElement> MediaControlPanelVolumeSliderElement:: > Ref<MediaControlPanelVolumeSliderElement> slider = adoptRef(*new MediaControlPanelVolumeSliderElement(document)); > slider->ensureUserAgentShadowRoot(); > slider->setType("range"); >- slider->setAttributeWithoutSynchronization(precisionAttr, AtomicString("float", AtomicString::ConstructFromLiteral)); >- slider->setAttributeWithoutSynchronization(maxAttr, AtomicString("1", AtomicString::ConstructFromLiteral)); >+ slider->setAttributeWithoutSynchronization(precisionAttr, AtomString("float", AtomString::ConstructFromLiteral)); >+ slider->setAttributeWithoutSynchronization(maxAttr, AtomString("1", AtomString::ConstructFromLiteral)); > return slider; > } > >@@ -940,7 +940,7 @@ Ref<MediaControlPanelVolumeSliderElement> MediaControlPanelVolumeSliderElement:: > MediaControlFullscreenVolumeSliderElement::MediaControlFullscreenVolumeSliderElement(Document& document) > : MediaControlVolumeSliderElement(document) > { >- setPseudo(AtomicString("-webkit-media-controls-fullscreen-volume-slider", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-fullscreen-volume-slider", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlFullscreenVolumeSliderElement> MediaControlFullscreenVolumeSliderElement::create(Document& document) >@@ -948,8 +948,8 @@ Ref<MediaControlFullscreenVolumeSliderElement> MediaControlFullscreenVolumeSlide > Ref<MediaControlFullscreenVolumeSliderElement> slider = adoptRef(*new MediaControlFullscreenVolumeSliderElement(document)); > slider->ensureUserAgentShadowRoot(); > slider->setType("range"); >- slider->setAttributeWithoutSynchronization(precisionAttr, AtomicString("float", AtomicString::ConstructFromLiteral)); >- slider->setAttributeWithoutSynchronization(maxAttr, AtomicString("1", AtomicString::ConstructFromLiteral)); >+ slider->setAttributeWithoutSynchronization(precisionAttr, AtomString("float", AtomString::ConstructFromLiteral)); >+ slider->setAttributeWithoutSynchronization(maxAttr, AtomString("1", AtomString::ConstructFromLiteral)); > return slider; > } > >@@ -958,7 +958,7 @@ Ref<MediaControlFullscreenVolumeSliderElement> MediaControlFullscreenVolumeSlide > MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement(Document& document) > : MediaControlInputElement(document, MediaEnterFullscreenButton) > { >- setPseudo(AtomicString("-webkit-media-controls-fullscreen-button", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-fullscreen-button", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlFullscreenButtonElement> MediaControlFullscreenButtonElement::create(Document& document) >@@ -1002,7 +1002,7 @@ void MediaControlFullscreenButtonElement::setIsFullscreen(bool isFullscreen) > MediaControlFullscreenVolumeMinButtonElement::MediaControlFullscreenVolumeMinButtonElement(Document& document) > : MediaControlInputElement(document, MediaUnMuteButton) > { >- setPseudo(AtomicString("-webkit-media-controls-fullscreen-volume-min-button", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-fullscreen-volume-min-button", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlFullscreenVolumeMinButtonElement> MediaControlFullscreenVolumeMinButtonElement::create(Document& document) >@@ -1027,7 +1027,7 @@ void MediaControlFullscreenVolumeMinButtonElement::defaultEventHandler(Event& ev > MediaControlFullscreenVolumeMaxButtonElement::MediaControlFullscreenVolumeMaxButtonElement(Document& document) > : MediaControlInputElement(document, MediaMuteButton) > { >- setPseudo(AtomicString("-webkit-media-controls-fullscreen-volume-max-button", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls-fullscreen-volume-max-button", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlFullscreenVolumeMaxButtonElement> MediaControlFullscreenVolumeMaxButtonElement::create(Document& document) >@@ -1060,9 +1060,9 @@ Ref<MediaControlTimeRemainingDisplayElement> MediaControlTimeRemainingDisplayEle > return adoptRef(*new MediaControlTimeRemainingDisplayElement(document)); > } > >-static const AtomicString& getMediaControlTimeRemainingDisplayElementShadowPseudoId() >+static const AtomString& getMediaControlTimeRemainingDisplayElementShadowPseudoId() > { >- static NeverDestroyed<AtomicString> id("-webkit-media-controls-time-remaining-display", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> id("-webkit-media-controls-time-remaining-display", AtomString::ConstructFromLiteral); > return id; > } > >@@ -1079,9 +1079,9 @@ Ref<MediaControlCurrentTimeDisplayElement> MediaControlCurrentTimeDisplayElement > return adoptRef(*new MediaControlCurrentTimeDisplayElement(document)); > } > >-static const AtomicString& getMediaControlCurrentTimeDisplayElementShadowPseudoId() >+static const AtomString& getMediaControlCurrentTimeDisplayElementShadowPseudoId() > { >- static NeverDestroyed<AtomicString> id("-webkit-media-controls-current-time-display", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> id("-webkit-media-controls-current-time-display", AtomString::ConstructFromLiteral); > return id; > } > >@@ -1096,7 +1096,7 @@ MediaControlTextTrackContainerElement::MediaControlTextTrackContainerElement(Doc > , m_fontSizeIsImportant(false) > , m_updateTextTrackRepresentationStyle(false) > { >- setPseudo(AtomicString("-webkit-media-text-track-container", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-text-track-container", AtomString::ConstructFromLiteral)); > } > > Ref<MediaControlTextTrackContainerElement> MediaControlTextTrackContainerElement::create(Document& document) >diff --git a/Source/WebCore/html/shadow/MediaControls.cpp b/Source/WebCore/html/shadow/MediaControls.cpp >index 631b88238dcc93928467852477d83bdcfc69c59f..a7dbdadb3288ec3bf7d090dcc56b279320b92fc0 100644 >--- a/Source/WebCore/html/shadow/MediaControls.cpp >+++ b/Source/WebCore/html/shadow/MediaControls.cpp >@@ -59,7 +59,7 @@ MediaControls::MediaControls(Document& document) > , m_isFullscreen(false) > , m_isMouseOverControls(false) > { >- setPseudo(AtomicString("-webkit-media-controls", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-media-controls", AtomString::ConstructFromLiteral)); > } > > void MediaControls::setMediaController(MediaControllerInterface* controller) >diff --git a/Source/WebCore/html/shadow/ProgressShadowElement.h b/Source/WebCore/html/shadow/ProgressShadowElement.h >index 900d72c1bf549dc475fe02e3e16857fd626d1ef5..6dc89c9dc3c5c519d30c8c532663b29204106fd1 100644 >--- a/Source/WebCore/html/shadow/ProgressShadowElement.h >+++ b/Source/WebCore/html/shadow/ProgressShadowElement.h >@@ -67,7 +67,7 @@ private: > inline Ref<ProgressInnerElement> ProgressInnerElement::create(Document& document) > { > Ref<ProgressInnerElement> result = adoptRef(*new ProgressInnerElement(document)); >- result->setPseudo(AtomicString("-webkit-progress-inner-element", AtomicString::ConstructFromLiteral)); >+ result->setPseudo(AtomString("-webkit-progress-inner-element", AtomString::ConstructFromLiteral)); > return result; > } > >@@ -82,7 +82,7 @@ private: > inline Ref<ProgressBarElement> ProgressBarElement::create(Document& document) > { > Ref<ProgressBarElement> result = adoptRef(*new ProgressBarElement(document)); >- result->setPseudo(AtomicString("-webkit-progress-bar", AtomicString::ConstructFromLiteral)); >+ result->setPseudo(AtomString("-webkit-progress-bar", AtomString::ConstructFromLiteral)); > return result; > } > >@@ -98,7 +98,7 @@ private: > inline Ref<ProgressValueElement> ProgressValueElement::create(Document& document) > { > Ref<ProgressValueElement> result = adoptRef(*new ProgressValueElement(document)); >- result->setPseudo(AtomicString("-webkit-progress-value", AtomicString::ConstructFromLiteral)); >+ result->setPseudo(AtomString("-webkit-progress-value", AtomString::ConstructFromLiteral)); > return result; > } > >diff --git a/Source/WebCore/html/shadow/SliderThumbElement.cpp b/Source/WebCore/html/shadow/SliderThumbElement.cpp >index 0d443c172348579255d6978de78d55fc7f6930c5..f23adba38e8ebe51d391752b22f1a85322d50ecd 100644 >--- a/Source/WebCore/html/shadow/SliderThumbElement.cpp >+++ b/Source/WebCore/html/shadow/SliderThumbElement.cpp >@@ -356,7 +356,7 @@ void SliderThumbElement::defaultEventHandler(Event& event) > > MouseEvent& mouseEvent = downcast<MouseEvent>(event); > bool isLeftButton = mouseEvent.button() == LeftButton; >- const AtomicString& eventType = mouseEvent.type(); >+ const AtomString& eventType = mouseEvent.type(); > > // We intentionally do not call event->setDefaultHandled() here because > // MediaControlTimelineElement::defaultEventHandler() wants to handle these >@@ -523,7 +523,7 @@ void SliderThumbElement::handleTouchEvent(TouchEvent& touchEvent) > return; > } > >- const AtomicString& eventType = touchEvent.type(); >+ const AtomString& eventType = touchEvent.type(); > if (eventType == eventNames().touchstartEvent) { > handleTouchStart(touchEvent); > return; >@@ -594,8 +594,8 @@ Optional<ElementStyle> SliderThumbElement::resolveCustomStyle(const RenderStyle& > { > // This doesn't actually compute style. This is just a hack to pick shadow pseudo id when host style is known. > >- static NeverDestroyed<const AtomicString> sliderThumbShadowPseudoId("-webkit-slider-thumb", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> mediaSliderThumbShadowPseudoId("-webkit-media-slider-thumb", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> sliderThumbShadowPseudoId("-webkit-slider-thumb", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> mediaSliderThumbShadowPseudoId("-webkit-media-slider-thumb", AtomString::ConstructFromLiteral); > > if (!hostStyle) > return WTF::nullopt; >@@ -616,7 +616,7 @@ Optional<ElementStyle> SliderThumbElement::resolveCustomStyle(const RenderStyle& > return WTF::nullopt; > } > >-const AtomicString& SliderThumbElement::shadowPseudoId() const >+const AtomString& SliderThumbElement::shadowPseudoId() const > { > return m_shadowPseudoId; > } >@@ -648,8 +648,8 @@ Optional<ElementStyle> SliderContainerElement::resolveCustomStyle(const RenderSt > { > // This doesn't actually compute style. This is just a hack to pick shadow pseudo id when host style is known. > >- static NeverDestroyed<const AtomicString> mediaSliderContainer("-webkit-media-slider-container", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> sliderContainer("-webkit-slider-container", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> mediaSliderContainer("-webkit-media-slider-container", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> sliderContainer("-webkit-slider-container", AtomString::ConstructFromLiteral); > > if (!hostStyle) > return WTF::nullopt; >@@ -670,7 +670,7 @@ Optional<ElementStyle> SliderContainerElement::resolveCustomStyle(const RenderSt > return WTF::nullopt; > } > >-const AtomicString& SliderContainerElement::shadowPseudoId() const >+const AtomString& SliderContainerElement::shadowPseudoId() const > { > return m_shadowPseudoId; > } >diff --git a/Source/WebCore/html/shadow/SliderThumbElement.h b/Source/WebCore/html/shadow/SliderThumbElement.h >index 6bab3f292e6a7d9c5465e091d8e9ba801c8991e8..b018b98b25a95fe226847c55876f9415ab4ad77c 100644 >--- a/Source/WebCore/html/shadow/SliderThumbElement.h >+++ b/Source/WebCore/html/shadow/SliderThumbElement.h >@@ -78,7 +78,7 @@ private: > void willDetachRenderers() final; > > Optional<ElementStyle> resolveCustomStyle(const RenderStyle&, const RenderStyle*) final; >- const AtomicString& shadowPseudoId() const final; >+ const AtomString& shadowPseudoId() const final; > > void startDragging(); > void stopDragging(); >@@ -97,7 +97,7 @@ private: > void unregisterForTouchEvents(); > #endif > >- AtomicString m_shadowPseudoId; >+ AtomString m_shadowPseudoId; > bool m_inDragMode { false }; > > #if ENABLE(IOS_TOUCH_EVENTS) >@@ -137,10 +137,10 @@ private: > SliderContainerElement(Document&); > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; > Optional<ElementStyle> resolveCustomStyle(const RenderStyle&, const RenderStyle*) final; >- const AtomicString& shadowPseudoId() const final; >+ const AtomString& shadowPseudoId() const final; > bool isSliderContainerElement() const final { return true; } > >- AtomicString m_shadowPseudoId; >+ AtomString m_shadowPseudoId; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/html/shadow/SpinButtonElement.cpp b/Source/WebCore/html/shadow/SpinButtonElement.cpp >index 782bdc037617aa79e9f298addbe40584be4ad115..f605483445e455a7650088e849a5a9c145d9972e 100644 >--- a/Source/WebCore/html/shadow/SpinButtonElement.cpp >+++ b/Source/WebCore/html/shadow/SpinButtonElement.cpp >@@ -56,7 +56,7 @@ inline SpinButtonElement::SpinButtonElement(Document& document, SpinButtonOwner& > , m_repeatingTimer(*this, &SpinButtonElement::repeatingTimerFired) > { > setHasCustomStyleResolveCallbacks(); >- setPseudo(AtomicString("-webkit-inner-spin-button", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-inner-spin-button", AtomString::ConstructFromLiteral)); > } > > Ref<SpinButtonElement> SpinButtonElement::create(Document& document, SpinButtonOwner& spinButtonOwner) >diff --git a/Source/WebCore/html/shadow/TextControlInnerElements.cpp b/Source/WebCore/html/shadow/TextControlInnerElements.cpp >index a2a2f0b09ee61938fd88fac76325b2420a29aa9a..3a637daef0124e2e4ed336b663752d0022b5be01 100644 >--- a/Source/WebCore/html/shadow/TextControlInnerElements.cpp >+++ b/Source/WebCore/html/shadow/TextControlInnerElements.cpp >@@ -182,7 +182,7 @@ Optional<ElementStyle> TextControlInnerTextElement::resolveCustomStyle(const Ren > inline TextControlPlaceholderElement::TextControlPlaceholderElement(Document& document) > : HTMLDivElement(divTag, document) > { >- setPseudo(AtomicString("placeholder", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("placeholder", AtomString::ConstructFromLiteral)); > setHasCustomStyleResolveCallbacks(); > } > >@@ -252,11 +252,11 @@ bool SearchFieldResultsButtonElement::willRespondToMouseClickEvents() > inline SearchFieldCancelButtonElement::SearchFieldCancelButtonElement(Document& document) > : HTMLDivElement(divTag, document) > { >- setPseudo(AtomicString("-webkit-search-cancel-button", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-search-cancel-button", AtomString::ConstructFromLiteral)); > #if !PLATFORM(IOS_FAMILY) > setAttributeWithoutSynchronization(aria_labelAttr, AXSearchFieldCancelButtonText()); > #endif >- setAttributeWithoutSynchronization(roleAttr, AtomicString("button", AtomicString::ConstructFromLiteral)); >+ setAttributeWithoutSynchronization(roleAttr, AtomString("button", AtomString::ConstructFromLiteral)); > } > > Ref<SearchFieldCancelButtonElement> SearchFieldCancelButtonElement::create(Document& document) >diff --git a/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp b/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp >index 4551cd40e0b8a3905872a565073dc0fa703f5d8e..88026014ffef200a5b6c338a127374a60b1bff63 100644 >--- a/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp >+++ b/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp >@@ -41,7 +41,7 @@ Ref<YouTubeEmbedShadowElement> YouTubeEmbedShadowElement::create(Document& doc) > YouTubeEmbedShadowElement::YouTubeEmbedShadowElement(Document& document) > : HTMLDivElement(HTMLNames::divTag, document) > { >- setPseudo(AtomicString("-webkit-plugin-replacement", AtomicString::ConstructFromLiteral)); >+ setPseudo(AtomString("-webkit-plugin-replacement", AtomString::ConstructFromLiteral)); > } > > RenderPtr<RenderElement> YouTubeEmbedShadowElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&) >diff --git a/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp b/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp >index 3eab5a01be9e80247b3953fc5e2e787892a19378..8ee2392396e31dca92f7e25b15aa3274f291390e 100644 >--- a/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp >+++ b/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp >@@ -95,7 +95,7 @@ RefPtr<ImageControlsButtonElementMac> ImageControlsButtonElementMac::tryCreate(D > return nullptr; > > auto button = adoptRef(*new ImageControlsButtonElementMac(document)); >- button->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomicString("x-webkit-image-controls-button", AtomicString::ConstructFromLiteral)); >+ button->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomString("x-webkit-image-controls-button", AtomString::ConstructFromLiteral)); > > IntSize positionOffset = RenderTheme::singleton().imageControlsButtonPositionOffset(); > button->setInlineStyleProperty(CSSPropertyTop, positionOffset.height(), CSSPrimitiveValue::CSS_PX); >diff --git a/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp b/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp >index 88ef2baaa922c3584c670c7ea2590f5de34b8af4..88d39e15fed8779a6ee320f94beec96bbc8058c0 100644 >--- a/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp >+++ b/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp >@@ -87,7 +87,7 @@ RefPtr<ImageControlsRootElement> ImageControlsRootElement::tryCreate(Document& d > return nullptr; > > Ref<ImageControlsRootElementMac> controls = adoptRef(*new ImageControlsRootElementMac(document)); >- controls->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomicString("x-webkit-image-controls", AtomicString::ConstructFromLiteral)); >+ controls->setAttributeWithoutSynchronization(HTMLNames::classAttr, AtomString("x-webkit-image-controls", AtomString::ConstructFromLiteral)); > > if (RefPtr<ImageControlsButtonElementMac> button = ImageControlsButtonElementMac::tryCreate(document)) > controls->appendChild(*button); >diff --git a/Source/WebCore/html/track/AudioTrack.cpp b/Source/WebCore/html/track/AudioTrack.cpp >index 7e5abd34fd0fa8a50be2f03a0a312ace87bb8670..f8a7eb531e3706922a3a9a97415a3563d09857a7 100644 >--- a/Source/WebCore/html/track/AudioTrack.cpp >+++ b/Source/WebCore/html/track/AudioTrack.cpp >@@ -39,39 +39,39 @@ > > namespace WebCore { > >-const AtomicString& AudioTrack::alternativeKeyword() >+const AtomString& AudioTrack::alternativeKeyword() > { >- static NeverDestroyed<AtomicString> alternative("alternative", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> alternative("alternative", AtomString::ConstructFromLiteral); > return alternative; > } > >-const AtomicString& AudioTrack::descriptionKeyword() >+const AtomString& AudioTrack::descriptionKeyword() > { >- static NeverDestroyed<AtomicString> description("description", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> description("description", AtomString::ConstructFromLiteral); > return description; > } > >-const AtomicString& AudioTrack::mainKeyword() >+const AtomString& AudioTrack::mainKeyword() > { >- static NeverDestroyed<AtomicString> main("main", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> main("main", AtomString::ConstructFromLiteral); > return main; > } > >-const AtomicString& AudioTrack::mainDescKeyword() >+const AtomString& AudioTrack::mainDescKeyword() > { >- static NeverDestroyed<AtomicString> mainDesc("main-desc", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> mainDesc("main-desc", AtomString::ConstructFromLiteral); > return mainDesc; > } > >-const AtomicString& AudioTrack::translationKeyword() >+const AtomString& AudioTrack::translationKeyword() > { >- static NeverDestroyed<AtomicString> translation("translation", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> translation("translation", AtomString::ConstructFromLiteral); > return translation; > } > >-const AtomicString& AudioTrack::commentaryKeyword() >+const AtomString& AudioTrack::commentaryKeyword() > { >- static NeverDestroyed<AtomicString> commentary("commentary", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> commentary("commentary", AtomString::ConstructFromLiteral); > return commentary; > } > >@@ -109,7 +109,7 @@ void AudioTrack::setPrivate(AudioTrackPrivate& trackPrivate) > updateKindFromPrivate(); > } > >-bool AudioTrack::isValidKind(const AtomicString& value) const >+bool AudioTrack::isValidKind(const AtomString& value) const > { > return value == alternativeKeyword() > || value == commentaryKeyword() >@@ -143,17 +143,17 @@ void AudioTrack::enabledChanged(bool enabled) > m_client->audioTrackEnabledChanged(*this); > } > >-void AudioTrack::idChanged(const AtomicString& id) >+void AudioTrack::idChanged(const AtomString& id) > { > setId(id); > } > >-void AudioTrack::labelChanged(const AtomicString& label) >+void AudioTrack::labelChanged(const AtomString& label) > { > setLabel(label); > } > >-void AudioTrack::languageChanged(const AtomicString& language) >+void AudioTrack::languageChanged(const AtomString& language) > { > setLanguage(language); > } >diff --git a/Source/WebCore/html/track/AudioTrack.h b/Source/WebCore/html/track/AudioTrack.h >index 56ad1487a68d4ca57974bc15843366cf15c25010..5695300f6db1ebe600b71d39bc4715eeb5925959 100644 >--- a/Source/WebCore/html/track/AudioTrack.h >+++ b/Source/WebCore/html/track/AudioTrack.h >@@ -49,12 +49,12 @@ public: > } > virtual ~AudioTrack(); > >- static const AtomicString& alternativeKeyword(); >- static const AtomicString& descriptionKeyword(); >- static const AtomicString& mainKeyword(); >- static const AtomicString& mainDescKeyword(); >- static const AtomicString& translationKeyword(); >- static const AtomicString& commentaryKeyword(); >+ static const AtomString& alternativeKeyword(); >+ static const AtomString& descriptionKeyword(); >+ static const AtomString& mainKeyword(); >+ static const AtomString& mainDescKeyword(); >+ static const AtomString& translationKeyword(); >+ static const AtomString& commentaryKeyword(); > > bool enabled() const final { return m_enabled; } > void setEnabled(const bool); >@@ -70,15 +70,15 @@ public: > private: > AudioTrack(AudioTrackClient&, AudioTrackPrivate&); > >- bool isValidKind(const AtomicString&) const final; >+ bool isValidKind(const AtomString&) const final; > > // AudioTrackPrivateClient > void enabledChanged(bool) final; > > // TrackPrivateBaseClient >- void idChanged(const AtomicString&) final; >- void labelChanged(const AtomicString&) final; >- void languageChanged(const AtomicString&) final; >+ void idChanged(const AtomString&) final; >+ void labelChanged(const AtomString&) final; >+ void languageChanged(const AtomString&) final; > void willRemove() final; > > void updateKindFromPrivate(); >diff --git a/Source/WebCore/html/track/AudioTrackList.cpp b/Source/WebCore/html/track/AudioTrackList.cpp >index aaddcde357567622a4d78b5c1f288f75f415d6dc..2e0361e27f9711a834b9dba246e6d722cf653d04 100644 >--- a/Source/WebCore/html/track/AudioTrackList.cpp >+++ b/Source/WebCore/html/track/AudioTrackList.cpp >@@ -66,7 +66,7 @@ AudioTrack* AudioTrackList::item(unsigned index) const > return nullptr; > } > >-AudioTrack* AudioTrackList::getTrackById(const AtomicString& id) const >+AudioTrack* AudioTrackList::getTrackById(const AtomString& id) const > { > for (auto& inbandTrack : m_inbandTracks) { > auto& track = downcast<AudioTrack>(*inbandTrack); >diff --git a/Source/WebCore/html/track/AudioTrackList.h b/Source/WebCore/html/track/AudioTrackList.h >index dbe0145724a6d46d7951f22e402957a483506bab..6ed8778e6ebf2988f3447efc8781cecfd7e93983 100644 >--- a/Source/WebCore/html/track/AudioTrackList.h >+++ b/Source/WebCore/html/track/AudioTrackList.h >@@ -41,7 +41,7 @@ public: > } > virtual ~AudioTrackList(); > >- AudioTrack* getTrackById(const AtomicString&) const; >+ AudioTrack* getTrackById(const AtomString&) const; > > AudioTrack* item(unsigned index) const; > AudioTrack* lastItem() const { return item(length() - 1); } >diff --git a/Source/WebCore/html/track/InbandTextTrack.cpp b/Source/WebCore/html/track/InbandTextTrack.cpp >index ecbb2e2441f5591cb3296219433eeb8e989b287f..4cf1c85763684f4535f2c5b224f83db821693391 100644 >--- a/Source/WebCore/html/track/InbandTextTrack.cpp >+++ b/Source/WebCore/html/track/InbandTextTrack.cpp >@@ -137,22 +137,22 @@ size_t InbandTextTrack::inbandTrackIndex() > return m_private->trackIndex(); > } > >-AtomicString InbandTextTrack::inBandMetadataTrackDispatchType() const >+AtomString InbandTextTrack::inBandMetadataTrackDispatchType() const > { > return m_private->inBandMetadataTrackDispatchType(); > } > >-void InbandTextTrack::idChanged(const AtomicString& id) >+void InbandTextTrack::idChanged(const AtomString& id) > { > setId(id); > } > >-void InbandTextTrack::labelChanged(const AtomicString& label) >+void InbandTextTrack::labelChanged(const AtomString& label) > { > setLabel(label); > } > >-void InbandTextTrack::languageChanged(const AtomicString& language) >+void InbandTextTrack::languageChanged(const AtomString& language) > { > setLanguage(language); > } >diff --git a/Source/WebCore/html/track/InbandTextTrack.h b/Source/WebCore/html/track/InbandTextTrack.h >index 23c8aa8afaa56d1fbd8494847893cd18e31ed331..e2ae9b239f302976b7cdd3f344dfd2c14a638a8a 100644 >--- a/Source/WebCore/html/track/InbandTextTrack.h >+++ b/Source/WebCore/html/track/InbandTextTrack.h >@@ -46,7 +46,7 @@ public: > void setMode(Mode) override; > size_t inbandTrackIndex(); > >- AtomicString inBandMetadataTrackDispatchType() const override; >+ AtomString inBandMetadataTrackDispatchType() const override; > > void setPrivate(InbandTextTrackPrivate&); > void setMediaElement(HTMLMediaElement*) override; >@@ -61,9 +61,9 @@ protected: > > private: > bool isInband() const final { return true; } >- void idChanged(const AtomicString&) override; >- void labelChanged(const AtomicString&) override; >- void languageChanged(const AtomicString&) override; >+ void idChanged(const AtomString&) override; >+ void labelChanged(const AtomString&) override; >+ void languageChanged(const AtomString&) override; > void willRemove() override; > > void addDataCue(const MediaTime&, const MediaTime&, const void*, unsigned) override { ASSERT_NOT_REACHED(); } >diff --git a/Source/WebCore/html/track/LoadableTextTrack.cpp b/Source/WebCore/html/track/LoadableTextTrack.cpp >index 3151b7fac32e4fad9c81fd85abc205e7b06f9a02..8f29c7f1679a0fa2918decfa513e2d80271a35e2 100644 >--- a/Source/WebCore/html/track/LoadableTextTrack.cpp >+++ b/Source/WebCore/html/track/LoadableTextTrack.cpp >@@ -140,7 +140,7 @@ void LoadableTextTrack::newStyleSheetsAvailable(TextTrackLoader& loader) > m_styleSheets = m_loader->getNewStyleSheets(); > } > >-AtomicString LoadableTextTrack::id() const >+AtomString LoadableTextTrack::id() const > { > if (!m_trackElement) > return emptyAtom(); >diff --git a/Source/WebCore/html/track/LoadableTextTrack.h b/Source/WebCore/html/track/LoadableTextTrack.h >index b415536e41bc011fecaa954b92597d10e8edc31c..dc471243087d6752cbd7cda655a496b56a4539dc 100644 >--- a/Source/WebCore/html/track/LoadableTextTrack.h >+++ b/Source/WebCore/html/track/LoadableTextTrack.h >@@ -59,7 +59,7 @@ private: > void newRegionsAvailable(TextTrackLoader&) final; > void newStyleSheetsAvailable(TextTrackLoader&) final; > >- AtomicString id() const final; >+ AtomString id() const final; > bool isDefault() const final { return m_isDefault; } > Element* element() final; > >diff --git a/Source/WebCore/html/track/TextTrack.cpp b/Source/WebCore/html/track/TextTrack.cpp >index 6aff838d004bbab83dcdff7148b311fbc8620050..59a19246209b009ac014aba9b720f322d5617977 100644 >--- a/Source/WebCore/html/track/TextTrack.cpp >+++ b/Source/WebCore/html/track/TextTrack.cpp >@@ -49,39 +49,39 @@ namespace WebCore { > > WTF_MAKE_ISO_ALLOCATED_IMPL(TextTrack); > >-const AtomicString& TextTrack::subtitlesKeyword() >+const AtomString& TextTrack::subtitlesKeyword() > { >- static NeverDestroyed<const AtomicString> subtitles("subtitles", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> subtitles("subtitles", AtomString::ConstructFromLiteral); > return subtitles; > } > >-static const AtomicString& captionsKeyword() >+static const AtomString& captionsKeyword() > { >- static NeverDestroyed<const AtomicString> captions("captions", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> captions("captions", AtomString::ConstructFromLiteral); > return captions; > } > >-static const AtomicString& descriptionsKeyword() >+static const AtomString& descriptionsKeyword() > { >- static NeverDestroyed<const AtomicString> descriptions("descriptions", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> descriptions("descriptions", AtomString::ConstructFromLiteral); > return descriptions; > } > >-static const AtomicString& chaptersKeyword() >+static const AtomString& chaptersKeyword() > { >- static NeverDestroyed<const AtomicString> chapters("chapters", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> chapters("chapters", AtomString::ConstructFromLiteral); > return chapters; > } > >-static const AtomicString& metadataKeyword() >+static const AtomString& metadataKeyword() > { >- static NeverDestroyed<const AtomicString> metadata("metadata", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> metadata("metadata", AtomString::ConstructFromLiteral); > return metadata; > } > >-static const AtomicString& forcedKeyword() >+static const AtomString& forcedKeyword() > { >- static NeverDestroyed<const AtomicString> forced("forced", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> forced("forced", AtomString::ConstructFromLiteral); > return forced; > } > >@@ -97,7 +97,7 @@ TextTrack* TextTrack::captionMenuAutomaticItem() > return &automatic; > } > >-TextTrack::TextTrack(ScriptExecutionContext* context, TextTrackClient* client, const AtomicString& kind, const AtomicString& id, const AtomicString& label, const AtomicString& language, TextTrackType type) >+TextTrack::TextTrack(ScriptExecutionContext* context, TextTrackClient* client, const AtomString& kind, const AtomString& id, const AtomString& label, const AtomString& language, TextTrackType type) > : TrackBase(TrackBase::TextTrack, id, label, language) > , ContextDestructionObserver(context) > , m_client(client) >@@ -134,7 +134,7 @@ bool TextTrack::enabled() const > return m_mode != Mode::Disabled; > } > >-bool TextTrack::isValidKindKeyword(const AtomicString& value) >+bool TextTrack::isValidKindKeyword(const AtomString& value) > { > if (value == subtitlesKeyword()) > return true; >@@ -152,7 +152,7 @@ bool TextTrack::isValidKindKeyword(const AtomicString& value) > return false; > } > >-const AtomicString& TextTrack::kindKeyword() const >+const AtomString& TextTrack::kindKeyword() const > { > switch (m_kind) { > case Kind::Captions: >@@ -548,7 +548,7 @@ bool TextTrack::containsOnlyForcedSubtitles() const > } > > #if ENABLE(MEDIA_SOURCE) >-void TextTrack::setLanguage(const AtomicString& language) >+void TextTrack::setLanguage(const AtomString& language) > { > // 11.1 language, on setting: > // 1. If the value being assigned to this attribute is not an empty string or a BCP 47 language >diff --git a/Source/WebCore/html/track/TextTrack.h b/Source/WebCore/html/track/TextTrack.h >index 346b737b960a87505de76e9b0e2080b39bc524e0..ed5b83aff92dfc1048fed154c12ad29701230e29 100644 >--- a/Source/WebCore/html/track/TextTrack.h >+++ b/Source/WebCore/html/track/TextTrack.h >@@ -54,7 +54,7 @@ public: > class TextTrack : public TrackBase, public EventTargetWithInlineData, public ContextDestructionObserver { > WTF_MAKE_ISO_ALLOCATED(TextTrack); > public: >- static Ref<TextTrack> create(ScriptExecutionContext* context, TextTrackClient* client, const AtomicString& kind, const AtomicString& id, const AtomicString& label, const AtomicString& language) >+ static Ref<TextTrack> create(ScriptExecutionContext* context, TextTrackClient* client, const AtomString& kind, const AtomString& id, const AtomString& label, const AtomString& language) > { > return adoptRef(*new TextTrack(context, client, kind, id, label, language, AddTrack)); > } >@@ -66,12 +66,12 @@ public: > static TextTrack* captionMenuOffItem(); > static TextTrack* captionMenuAutomaticItem(); > >- static const AtomicString& subtitlesKeyword(); >- static bool isValidKindKeyword(const AtomicString&); >+ static const AtomString& subtitlesKeyword(); >+ static bool isValidKindKeyword(const AtomString&); > >- static const AtomicString& disabledKeyword(); >- static const AtomicString& hiddenKeyword(); >- static const AtomicString& showingKeyword(); >+ static const AtomString& disabledKeyword(); >+ static const AtomString& hiddenKeyword(); >+ static const AtomString& showingKeyword(); > > enum class Kind { Subtitles, Captions, Descriptions, Chapters, Metadata, Forced }; > Kind kind() const; >@@ -80,10 +80,10 @@ public: > Kind kindForBindings() const; > void setKindForBindings(Kind); > >- const AtomicString& kindKeyword() const; >+ const AtomString& kindKeyword() const; > void setKindKeywordIgnoringASCIICase(StringView); > >- virtual AtomicString inBandMetadataTrackDispatchType() const { return emptyString(); } >+ virtual AtomString inBandMetadataTrackDispatchType() const { return emptyString(); } > > enum class Mode { Disabled, Hidden, Showing }; > Mode mode() const; >@@ -135,7 +135,7 @@ public: > void removeAllCues(); > > #if ENABLE(MEDIA_SOURCE) >- void setLanguage(const AtomicString&) override; >+ void setLanguage(const AtomString&) override; > #endif > > virtual bool isInband() const { return false; } >@@ -148,7 +148,7 @@ public: > const Optional<Vector<String>>& styleSheets() const { return m_styleSheets; } > > protected: >- TextTrack(ScriptExecutionContext*, TextTrackClient*, const AtomicString& kind, const AtomicString& id, const AtomicString& label, const AtomicString& language, TextTrackType); >+ TextTrack(ScriptExecutionContext*, TextTrackClient*, const AtomString& kind, const AtomString& id, const AtomString& label, const AtomString& language, TextTrackType); > > #if !RELEASE_LOG_DISABLED > const char* logClassName() const override { return "TextTrack"; } >diff --git a/Source/WebCore/html/track/TextTrackCue.cpp b/Source/WebCore/html/track/TextTrackCue.cpp >index 636744bbc0dd3f03f9e4cd91b9ee5ff111ada311..8eac751cd7ca689819aa06c2e3aeef379b3e5409 100644 >--- a/Source/WebCore/html/track/TextTrackCue.cpp >+++ b/Source/WebCore/html/track/TextTrackCue.cpp >@@ -54,9 +54,9 @@ namespace WebCore { > > WTF_MAKE_ISO_ALLOCATED_IMPL(TextTrackCue); > >-const AtomicString& TextTrackCue::cueShadowPseudoId() >+const AtomString& TextTrackCue::cueShadowPseudoId() > { >- static NeverDestroyed<const AtomicString> cue("cue", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> cue("cue", AtomString::ConstructFromLiteral); > return cue; > } > >diff --git a/Source/WebCore/html/track/TextTrackCue.h b/Source/WebCore/html/track/TextTrackCue.h >index 2b4d42475c5c6b78e5fc6903724dfb4522bba2fa..aeddbd3d791fe8c252909a96b263fe2286b73f24 100644 >--- a/Source/WebCore/html/track/TextTrackCue.h >+++ b/Source/WebCore/html/track/TextTrackCue.h >@@ -44,7 +44,7 @@ class TextTrack; > class TextTrackCue : public RefCounted<TextTrackCue>, public EventTargetWithInlineData { > WTF_MAKE_ISO_ALLOCATED(TextTrackCue); > public: >- static const AtomicString& cueShadowPseudoId(); >+ static const AtomString& cueShadowPseudoId(); > > TextTrack* track() const; > void setTrack(TextTrack*); >diff --git a/Source/WebCore/html/track/TextTrackList.cpp b/Source/WebCore/html/track/TextTrackList.cpp >index 99a9b32235b1a0ba8f428467237cbce88a45c3e9..b66fad9a59673afd6b0c627d33d383785c8a1555 100644 >--- a/Source/WebCore/html/track/TextTrackList.cpp >+++ b/Source/WebCore/html/track/TextTrackList.cpp >@@ -138,7 +138,7 @@ TextTrack* TextTrackList::item(unsigned index) const > return nullptr; > } > >-TextTrack* TextTrackList::getTrackById(const AtomicString& id) >+TextTrack* TextTrackList::getTrackById(const AtomString& id) > { > // 4.8.10.12.5 Text track API > // The getTrackById(id) method must return the first TextTrack in the >diff --git a/Source/WebCore/html/track/TextTrackList.h b/Source/WebCore/html/track/TextTrackList.h >index 1f73927b84aa2bc34e544fbc5855c682e2e21f17..5d016d13d79640c0d499a68af52c73460e4a901e 100644 >--- a/Source/WebCore/html/track/TextTrackList.h >+++ b/Source/WebCore/html/track/TextTrackList.h >@@ -50,7 +50,7 @@ public: > bool contains(TrackBase&) const override; > > TextTrack* item(unsigned index) const; >- TextTrack* getTrackById(const AtomicString&); >+ TextTrack* getTrackById(const AtomString&); > TextTrack* lastItem() const { return item(length() - 1); } > > void append(Ref<TextTrack>&&); >diff --git a/Source/WebCore/html/track/TrackBase.cpp b/Source/WebCore/html/track/TrackBase.cpp >index ff5f41afc32373aabfe5b8986fe07911483529be..1819e8dde81f7e695eb9e7c98762966ddf652407 100644 >--- a/Source/WebCore/html/track/TrackBase.cpp >+++ b/Source/WebCore/html/track/TrackBase.cpp >@@ -52,7 +52,7 @@ static RefPtr<Logger>& nullLogger() > } > #endif > >-TrackBase::TrackBase(Type type, const AtomicString& id, const AtomicString& label, const AtomicString& language) >+TrackBase::TrackBase(Type type, const AtomString& id, const AtomString& label, const AtomString& language) > : m_uniqueId(++s_uniqueId) > , m_id(id) > , m_label(label) >@@ -141,7 +141,7 @@ static bool isValidBCP47LanguageTag(const String& languageTag) > return true; > } > >-void TrackBase::setLanguage(const AtomicString& language) >+void TrackBase::setLanguage(const AtomString& language) > { > if (!language.isEmpty() && !isValidBCP47LanguageTag(language)) { > String message; >@@ -162,7 +162,7 @@ void TrackBase::setLanguage(const AtomicString& language) > m_language = language; > } > >-AtomicString TrackBase::validBCP47Language() const >+AtomString TrackBase::validBCP47Language() const > { > return m_validBCP47Language; > } >@@ -174,17 +174,17 @@ WTFLogChannel& TrackBase::logChannel() const > } > #endif > >-MediaTrackBase::MediaTrackBase(Type type, const AtomicString& id, const AtomicString& label, const AtomicString& language) >+MediaTrackBase::MediaTrackBase(Type type, const AtomString& id, const AtomString& label, const AtomString& language) > : TrackBase(type, id, label, language) > { > } > >-void MediaTrackBase::setKind(const AtomicString& kind) >+void MediaTrackBase::setKind(const AtomString& kind) > { > setKindInternal(kind); > } > >-void MediaTrackBase::setKindInternal(const AtomicString& kind) >+void MediaTrackBase::setKindInternal(const AtomString& kind) > { > if (isValidKind(kind)) > m_kind = kind; >diff --git a/Source/WebCore/html/track/TrackBase.h b/Source/WebCore/html/track/TrackBase.h >index 0168c51934498de23249e9fc3caa73721bc50670..3225e552adacbd314d6a0f85f2961fc9bd556dfa 100644 >--- a/Source/WebCore/html/track/TrackBase.h >+++ b/Source/WebCore/html/track/TrackBase.h >@@ -28,7 +28,7 @@ > #if ENABLE(VIDEO_TRACK) > > #include <wtf/LoggerHelper.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -52,15 +52,15 @@ public: > HTMLMediaElement* mediaElement() { return m_mediaElement; } > virtual Element* element(); > >- virtual AtomicString id() const { return m_id; } >- virtual void setId(const AtomicString& id) { m_id = id; } >+ virtual AtomString id() const { return m_id; } >+ virtual void setId(const AtomString& id) { m_id = id; } > >- AtomicString label() const { return m_label; } >- void setLabel(const AtomicString& label) { m_label = label; } >+ AtomString label() const { return m_label; } >+ void setLabel(const AtomString& label) { m_label = label; } > >- AtomicString validBCP47Language() const; >- AtomicString language() const { return m_language; } >- virtual void setLanguage(const AtomicString&); >+ AtomString validBCP47Language() const; >+ AtomString language() const { return m_language; } >+ virtual void setLanguage(const AtomString&); > > virtual void clearClient() = 0; > >@@ -80,7 +80,7 @@ public: > #endif > > protected: >- TrackBase(Type, const AtomicString& id, const AtomicString& label, const AtomicString& language); >+ TrackBase(Type, const AtomString& id, const AtomString& label, const AtomString& language); > > HTMLMediaElement* m_mediaElement { nullptr }; > >@@ -91,10 +91,10 @@ protected: > private: > Type m_type; > int m_uniqueId; >- AtomicString m_id; >- AtomicString m_label; >- AtomicString m_language; >- AtomicString m_validBCP47Language; >+ AtomString m_id; >+ AtomString m_label; >+ AtomString m_language; >+ AtomString m_validBCP47Language; > #if !RELEASE_LOG_DISABLED > RefPtr<const Logger> m_logger; > const void* m_logIdentifier; >@@ -103,18 +103,18 @@ private: > > class MediaTrackBase : public TrackBase { > public: >- const AtomicString& kind() const { return m_kind; } >- virtual void setKind(const AtomicString&); >+ const AtomString& kind() const { return m_kind; } >+ virtual void setKind(const AtomString&); > > protected: >- MediaTrackBase(Type, const AtomicString& id, const AtomicString& label, const AtomicString& language); >+ MediaTrackBase(Type, const AtomString& id, const AtomString& label, const AtomString& language); > >- void setKindInternal(const AtomicString&); >+ void setKindInternal(const AtomString&); > > private: >- virtual bool isValidKind(const AtomicString&) const = 0; >+ virtual bool isValidKind(const AtomString&) const = 0; > >- AtomicString m_kind; >+ AtomString m_kind; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/html/track/TrackEvent.cpp b/Source/WebCore/html/track/TrackEvent.cpp >index b9a90da3fd6fe124b5e4084122a8e0365abc1561..850024aa2060d877d995aa7c0ab21b6c041b0d57 100644 >--- a/Source/WebCore/html/track/TrackEvent.cpp >+++ b/Source/WebCore/html/track/TrackEvent.cpp >@@ -48,13 +48,13 @@ static inline Optional<TrackEvent::TrackEventTrack> convertToTrackEventTrack(Ref > return WTF::nullopt; > } > >-TrackEvent::TrackEvent(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, Ref<TrackBase>&& track) >+TrackEvent::TrackEvent(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, Ref<TrackBase>&& track) > : Event(type, canBubble, cancelable) > , m_track(convertToTrackEventTrack(WTFMove(track))) > { > } > >-TrackEvent::TrackEvent(const AtomicString& type, Init&& initializer, IsTrusted isTrusted) >+TrackEvent::TrackEvent(const AtomString& type, Init&& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_track(WTFMove(initializer.track)) > { >diff --git a/Source/WebCore/html/track/TrackEvent.h b/Source/WebCore/html/track/TrackEvent.h >index a8ec68c4d00c1df92d12d9973ddcdfb480a1d1cc..b647982ce499e2bcd019a1d4a5ca86ab16541d97 100644 >--- a/Source/WebCore/html/track/TrackEvent.h >+++ b/Source/WebCore/html/track/TrackEvent.h >@@ -38,7 +38,7 @@ class TrackEvent final : public Event { > public: > virtual ~TrackEvent(); > >- static Ref<TrackEvent> create(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable, Ref<TrackBase>&& track) >+ static Ref<TrackEvent> create(const AtomString& type, CanBubble canBubble, IsCancelable cancelable, Ref<TrackBase>&& track) > { > return adoptRef(*new TrackEvent(type, canBubble, cancelable, WTFMove(track))); > } >@@ -49,7 +49,7 @@ public: > Optional<TrackEventTrack> track; > }; > >- static Ref<TrackEvent> create(const AtomicString& type, Init&& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<TrackEvent> create(const AtomString& type, Init&& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new TrackEvent(type, WTFMove(initializer), isTrusted)); > } >@@ -57,8 +57,8 @@ public: > Optional<TrackEventTrack> track() const { return m_track; } > > private: >- TrackEvent(const AtomicString& type, CanBubble, IsCancelable, Ref<TrackBase>&&); >- TrackEvent(const AtomicString& type, Init&& initializer, IsTrusted); >+ TrackEvent(const AtomString& type, CanBubble, IsCancelable, Ref<TrackBase>&&); >+ TrackEvent(const AtomString& type, Init&& initializer, IsTrusted); > > EventInterface eventInterface() const override; > >diff --git a/Source/WebCore/html/track/TrackListBase.cpp b/Source/WebCore/html/track/TrackListBase.cpp >index 00522658bdbc1e94a581814a5db03ecc4d8b8b07..6d3118be7429398c07aae0f959fecdc1267ffd03 100644 >--- a/Source/WebCore/html/track/TrackListBase.cpp >+++ b/Source/WebCore/html/track/TrackListBase.cpp >@@ -96,7 +96,7 @@ bool TrackListBase::contains(TrackBase& track) const > return m_inbandTracks.find(&track) != notFound; > } > >-void TrackListBase::scheduleTrackEvent(const AtomicString& eventName, Ref<TrackBase>&& track) >+void TrackListBase::scheduleTrackEvent(const AtomString& eventName, Ref<TrackBase>&& track) > { > m_asyncEventQueue.enqueueEvent(TrackEvent::create(eventName, Event::CanBubble::No, Event::IsCancelable::No, WTFMove(track))); > } >diff --git a/Source/WebCore/html/track/TrackListBase.h b/Source/WebCore/html/track/TrackListBase.h >index ed43496e1eaa314a230182ac76c157cfefd9609b..3cde88dcc4afd5407b08c68ad9c2f1936858a230 100644 >--- a/Source/WebCore/html/track/TrackListBase.h >+++ b/Source/WebCore/html/track/TrackListBase.h >@@ -73,7 +73,7 @@ protected: > Vector<RefPtr<TrackBase>> m_inbandTracks; > > private: >- void scheduleTrackEvent(const AtomicString& eventName, Ref<TrackBase>&&); >+ void scheduleTrackEvent(const AtomString& eventName, Ref<TrackBase>&&); > > bool canSuspendForDocumentSuspension() const final; > void suspend(ReasonForSuspension) final; >diff --git a/Source/WebCore/html/track/VTTCue.cpp b/Source/WebCore/html/track/VTTCue.cpp >index 10d5cc0625a906ee58a5192582261b0ce11f1297..e8e2182ff984828e0e593757eac94c31964c70a7 100644 >--- a/Source/WebCore/html/track/VTTCue.cpp >+++ b/Source/WebCore/html/track/VTTCue.cpp >@@ -242,9 +242,9 @@ void VTTCueBox::applyCSSProperties(const IntSize& videoSize) > cue->element().setInlineStyleProperty(CSSPropertyOverflow, CSSValueVisible); > } > >-const AtomicString& VTTCueBox::vttCueBoxShadowPseudoId() >+const AtomString& VTTCueBox::vttCueBoxShadowPseudoId() > { >- static NeverDestroyed<const AtomicString> trackDisplayBoxShadowPseudoId("-webkit-media-text-track-display", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> trackDisplayBoxShadowPseudoId("-webkit-media-text-track-display", AtomString::ConstructFromLiteral); > return trackDisplayBoxShadowPseudoId; > } > >@@ -255,9 +255,9 @@ RenderPtr<RenderElement> VTTCueBox::createElementRenderer(RenderStyle&& style, c > > // ---------------------------- > >-const AtomicString& VTTCue::cueBackdropShadowPseudoId() >+const AtomString& VTTCue::cueBackdropShadowPseudoId() > { >- static NeverDestroyed<const AtomicString> cueBackdropShadowPseudoId("-webkit-media-text-track-display-backdrop", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> cueBackdropShadowPseudoId("-webkit-media-text-track-display-backdrop", AtomString::ConstructFromLiteral); > return cueBackdropShadowPseudoId; > } > >diff --git a/Source/WebCore/html/track/VTTCue.h b/Source/WebCore/html/track/VTTCue.h >index 2e374959a52ba5ea7bb9a2192ba83e7901b8f15e..1bf7f553a26804a8f85b0b255983ec2337322e71 100644 >--- a/Source/WebCore/html/track/VTTCue.h >+++ b/Source/WebCore/html/track/VTTCue.h >@@ -57,7 +57,7 @@ public: > VTTCue* getCue() const; > virtual void applyCSSProperties(const IntSize& videoSize); > >- static const AtomicString& vttCueBoxShadowPseudoId(); >+ static const AtomString& vttCueBoxShadowPseudoId(); > void setFontSizeFromCaptionUserPrefs(int fontSize) { m_fontSizeFromCaptionUserPrefs = fontSize; } > > protected: >@@ -89,7 +89,7 @@ public: > > static Ref<VTTCue> create(ScriptExecutionContext&, const WebVTTCueData&); > >- static const AtomicString& cueBackdropShadowPseudoId(); >+ static const AtomString& cueBackdropShadowPseudoId(); > > virtual ~VTTCue(); > >diff --git a/Source/WebCore/html/track/VTTRegion.cpp b/Source/WebCore/html/track/VTTRegion.cpp >index 885bf79a1c88d9f7527b73c99c4bb11bcad68c5a..760724178296df026f40bcda827f78d6ab753baa 100644 >--- a/Source/WebCore/html/track/VTTRegion.cpp >+++ b/Source/WebCore/html/track/VTTRegion.cpp >@@ -124,18 +124,18 @@ ExceptionOr<void> VTTRegion::setViewportAnchorY(double value) > return { }; > } > >-static const AtomicString& upKeyword() >+static const AtomString& upKeyword() > { >- static NeverDestroyed<const AtomicString> upKeyword("up", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> upKeyword("up", AtomString::ConstructFromLiteral); > return upKeyword; > } > >-const AtomicString& VTTRegion::scroll() const >+const AtomString& VTTRegion::scroll() const > { > return m_scroll ? upKeyword() : emptyAtom(); > } > >-ExceptionOr<void> VTTRegion::setScroll(const AtomicString& value) >+ExceptionOr<void> VTTRegion::setScroll(const AtomString& value) > { > if (value.isEmpty()) { > m_scroll = false; >@@ -260,23 +260,23 @@ void VTTRegion::parseSettingValue(RegionSetting setting, VTTScanner& input) > input.skipRun(valueRun); > } > >-const AtomicString& VTTRegion::textTrackCueContainerScrollingClass() >+const AtomString& VTTRegion::textTrackCueContainerScrollingClass() > { >- static NeverDestroyed<const AtomicString> trackRegionCueContainerScrollingClass("scrolling", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> trackRegionCueContainerScrollingClass("scrolling", AtomString::ConstructFromLiteral); > > return trackRegionCueContainerScrollingClass; > } > >-const AtomicString& VTTRegion::textTrackCueContainerShadowPseudoId() >+const AtomString& VTTRegion::textTrackCueContainerShadowPseudoId() > { >- static NeverDestroyed<const AtomicString> trackRegionCueContainerPseudoId("-webkit-media-text-track-region-container", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> trackRegionCueContainerPseudoId("-webkit-media-text-track-region-container", AtomString::ConstructFromLiteral); > > return trackRegionCueContainerPseudoId; > } > >-const AtomicString& VTTRegion::textTrackRegionShadowPseudoId() >+const AtomString& VTTRegion::textTrackRegionShadowPseudoId() > { >- static NeverDestroyed<const AtomicString> trackRegionShadowPseudoId("-webkit-media-text-track-region", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> trackRegionShadowPseudoId("-webkit-media-text-track-region", AtomString::ConstructFromLiteral); > > return trackRegionShadowPseudoId; > } >diff --git a/Source/WebCore/html/track/VTTRegion.h b/Source/WebCore/html/track/VTTRegion.h >index 77a7b00d32252412ede2111263fa6170937d5878..6fcc4f33913e264b84c2bf6bc4ff6bf2cc732ecb 100644 >--- a/Source/WebCore/html/track/VTTRegion.h >+++ b/Source/WebCore/html/track/VTTRegion.h >@@ -76,8 +76,8 @@ public: > double viewportAnchorY() const { return m_viewportAnchor.y(); } > ExceptionOr<void> setViewportAnchorY(double); > >- const AtomicString& scroll() const; >- ExceptionOr<void> setScroll(const AtomicString&); >+ const AtomString& scroll() const; >+ ExceptionOr<void> setScroll(const AtomString&); > > void updateParametersFromRegion(const VTTRegion&); > >@@ -116,9 +116,9 @@ private: > > void parseSettingValue(RegionSetting, VTTScanner&); > >- static const AtomicString& textTrackCueContainerShadowPseudoId(); >- static const AtomicString& textTrackCueContainerScrollingClass(); >- static const AtomicString& textTrackRegionShadowPseudoId(); >+ static const AtomString& textTrackCueContainerShadowPseudoId(); >+ static const AtomString& textTrackCueContainerScrollingClass(); >+ static const AtomString& textTrackRegionShadowPseudoId(); > > String m_id; > String m_settings; >diff --git a/Source/WebCore/html/track/VideoTrack.cpp b/Source/WebCore/html/track/VideoTrack.cpp >index 75c97e6ce90b628dc23647d22a6ffd9fa98512b3..511eddb759f759519d86f60f2c24616c46c7a24b 100644 >--- a/Source/WebCore/html/track/VideoTrack.cpp >+++ b/Source/WebCore/html/track/VideoTrack.cpp >@@ -44,39 +44,39 @@ > > namespace WebCore { > >-const AtomicString& VideoTrack::alternativeKeyword() >+const AtomString& VideoTrack::alternativeKeyword() > { >- static NeverDestroyed<const AtomicString> alternative("alternative", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> alternative("alternative", AtomString::ConstructFromLiteral); > return alternative; > } > >-const AtomicString& VideoTrack::captionsKeyword() >+const AtomString& VideoTrack::captionsKeyword() > { >- static NeverDestroyed<const AtomicString> captions("captions", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> captions("captions", AtomString::ConstructFromLiteral); > return captions; > } > >-const AtomicString& VideoTrack::mainKeyword() >+const AtomString& VideoTrack::mainKeyword() > { >- static NeverDestroyed<const AtomicString> captions("main", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> captions("main", AtomString::ConstructFromLiteral); > return captions; > } > >-const AtomicString& VideoTrack::signKeyword() >+const AtomString& VideoTrack::signKeyword() > { >- static NeverDestroyed<const AtomicString> sign("sign", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> sign("sign", AtomString::ConstructFromLiteral); > return sign; > } > >-const AtomicString& VideoTrack::subtitlesKeyword() >+const AtomString& VideoTrack::subtitlesKeyword() > { >- static NeverDestroyed<const AtomicString> subtitles("subtitles", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> subtitles("subtitles", AtomString::ConstructFromLiteral); > return subtitles; > } > >-const AtomicString& VideoTrack::commentaryKeyword() >+const AtomString& VideoTrack::commentaryKeyword() > { >- static NeverDestroyed<const AtomicString> commentary("commentary", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> commentary("commentary", AtomString::ConstructFromLiteral); > return commentary; > } > >@@ -114,7 +114,7 @@ void VideoTrack::setPrivate(VideoTrackPrivate& trackPrivate) > updateKindFromPrivate(); > } > >-bool VideoTrack::isValidKind(const AtomicString& value) const >+bool VideoTrack::isValidKind(const AtomString& value) const > { > return value == alternativeKeyword() > || value == commentaryKeyword() >@@ -146,17 +146,17 @@ void VideoTrack::selectedChanged(bool selected) > setSelected(selected); > } > >-void VideoTrack::idChanged(const AtomicString& id) >+void VideoTrack::idChanged(const AtomString& id) > { > setId(id); > } > >-void VideoTrack::labelChanged(const AtomicString& label) >+void VideoTrack::labelChanged(const AtomString& label) > { > setLabel(label); > } > >-void VideoTrack::languageChanged(const AtomicString& language) >+void VideoTrack::languageChanged(const AtomString& language) > { > setLanguage(language); > } >@@ -171,7 +171,7 @@ void VideoTrack::willRemove() > > #if ENABLE(MEDIA_SOURCE) > >-void VideoTrack::setKind(const AtomicString& kind) >+void VideoTrack::setKind(const AtomString& kind) > { > // 10.1 kind, on setting: > // 1. If the value being assigned to this attribute does not match one of the video track kinds, >@@ -192,7 +192,7 @@ void VideoTrack::setKind(const AtomicString& kind) > mediaElement()->ensureVideoTracks().scheduleChangeEvent(); > } > >-void VideoTrack::setLanguage(const AtomicString& language) >+void VideoTrack::setLanguage(const AtomString& language) > { > // 10.1 language, on setting: > // 1. If the value being assigned to this attribute is not an empty string or a BCP 47 language >diff --git a/Source/WebCore/html/track/VideoTrack.h b/Source/WebCore/html/track/VideoTrack.h >index ebab024a4ca912656b9ab5aa77ea0af0380bf378..5eff43b6b89a3aa4e3de9c7dd5827f6fb59b389d 100644 >--- a/Source/WebCore/html/track/VideoTrack.h >+++ b/Source/WebCore/html/track/VideoTrack.h >@@ -50,12 +50,12 @@ public: > } > virtual ~VideoTrack(); > >- static const AtomicString& alternativeKeyword(); >- static const AtomicString& captionsKeyword(); >- static const AtomicString& mainKeyword(); >- static const AtomicString& signKeyword(); >- static const AtomicString& subtitlesKeyword(); >- static const AtomicString& commentaryKeyword(); >+ static const AtomString& alternativeKeyword(); >+ static const AtomString& captionsKeyword(); >+ static const AtomString& mainKeyword(); >+ static const AtomString& signKeyword(); >+ static const AtomString& subtitlesKeyword(); >+ static const AtomString& commentaryKeyword(); > > bool selected() const { return m_selected; } > virtual void setSelected(const bool); >@@ -66,8 +66,8 @@ public: > size_t inbandTrackIndex(); > > #if ENABLE(MEDIA_SOURCE) >- void setKind(const AtomicString&) final; >- void setLanguage(const AtomicString&) final; >+ void setKind(const AtomString&) final; >+ void setLanguage(const AtomString&) final; > #endif > > const MediaDescription& description() const; >@@ -78,15 +78,15 @@ public: > private: > VideoTrack(VideoTrackClient&, VideoTrackPrivate&); > >- bool isValidKind(const AtomicString&) const final; >+ bool isValidKind(const AtomString&) const final; > > // VideoTrackPrivateClient > void selectedChanged(bool) final; > > // TrackPrivateBaseClient >- void idChanged(const AtomicString&) final; >- void labelChanged(const AtomicString&) final; >- void languageChanged(const AtomicString&) final; >+ void idChanged(const AtomString&) final; >+ void labelChanged(const AtomString&) final; >+ void languageChanged(const AtomString&) final; > void willRemove() final; > > bool enabled() const final { return selected(); } >diff --git a/Source/WebCore/html/track/VideoTrackList.cpp b/Source/WebCore/html/track/VideoTrackList.cpp >index 4d8b32553f7ae66b7bcf3d72c4e1bed79236125c..78813b3cffc53adb6be67be1fecb43c627d18991 100644 >--- a/Source/WebCore/html/track/VideoTrackList.cpp >+++ b/Source/WebCore/html/track/VideoTrackList.cpp >@@ -65,7 +65,7 @@ VideoTrack* VideoTrackList::item(unsigned index) const > return nullptr; > } > >-VideoTrack* VideoTrackList::getTrackById(const AtomicString& id) const >+VideoTrack* VideoTrackList::getTrackById(const AtomString& id) const > { > for (auto& inbandTracks : m_inbandTracks) { > auto& track = downcast<VideoTrack>(*inbandTracks); >diff --git a/Source/WebCore/html/track/VideoTrackList.h b/Source/WebCore/html/track/VideoTrackList.h >index cb6a9cf0820036f90ef9a534e1f8a679cb486f1a..467c6bd24529cba412b307ced079478bf724797f 100644 >--- a/Source/WebCore/html/track/VideoTrackList.h >+++ b/Source/WebCore/html/track/VideoTrackList.h >@@ -41,7 +41,7 @@ public: > } > virtual ~VideoTrackList(); > >- VideoTrack* getTrackById(const AtomicString&) const; >+ VideoTrack* getTrackById(const AtomString&) const; > int selectedIndex() const; > > VideoTrack* item(unsigned) const; >diff --git a/Source/WebCore/html/track/WebVTTElement.h b/Source/WebCore/html/track/WebVTTElement.h >index 64135e2ac1541c37260ec06d2ec5df16febec9f4..28471d6ad72c8c96402576ba75164b21d5feb047 100644 >--- a/Source/WebCore/html/track/WebVTTElement.h >+++ b/Source/WebCore/html/track/WebVTTElement.h >@@ -58,8 +58,8 @@ public: > bool isPastNode() const { return m_isPastNode; } > void setIsPastNode(bool value) { m_isPastNode = value; } > >- AtomicString language() const { return m_language; } >- void setLanguage(const AtomicString& value) { m_language = value; } >+ AtomString language() const { return m_language; } >+ void setLanguage(const AtomString& value) { m_language = value; } > > static const QualifiedName& voiceAttributeName() > { >@@ -81,7 +81,7 @@ private: > unsigned m_isPastNode : 1; > unsigned m_webVTTNodeType : 4; > >- AtomicString m_language; >+ AtomString m_language; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/html/track/WebVTTParser.cpp b/Source/WebCore/html/track/WebVTTParser.cpp >index 19762a160e762ff29798bd5b79a8f7fe5f638672..c2f880615d9d0dbaeb0f533ee19b23d0d125ea7b 100644 >--- a/Source/WebCore/html/track/WebVTTParser.cpp >+++ b/Source/WebCore/html/track/WebVTTParser.cpp >@@ -501,7 +501,7 @@ private: > > WebVTTToken m_token; > RefPtr<ContainerNode> m_currentNode; >- Vector<AtomicString> m_languageStack; >+ Vector<AtomString> m_languageStack; > Document& m_document; > }; > >diff --git a/Source/WebCore/html/track/WebVTTParser.h b/Source/WebCore/html/track/WebVTTParser.h >index cfc5717fd2bd529ea54dc8c8a9f8dc652ba9d45a..d1a441d114d72289938326d924f752c2eacb24b7 100644 >--- a/Source/WebCore/html/track/WebVTTParser.h >+++ b/Source/WebCore/html/track/WebVTTParser.h >@@ -113,7 +113,7 @@ public: > > WebVTTParser(WebVTTParserClient*, ScriptExecutionContext*); > >- static inline bool isRecognizedTag(const AtomicString& tagName) >+ static inline bool isRecognizedTag(const AtomString& tagName) > { > return tagName == iTag > || tagName == bTag >diff --git a/Source/WebCore/html/track/WebVTTToken.h b/Source/WebCore/html/track/WebVTTToken.h >index 9600945ea61b7df9c07f6ccb13fa16ce58fc5492..73eacbabbc4b26606f8736679fbb5e25ae2574d5 100644 >--- a/Source/WebCore/html/track/WebVTTToken.h >+++ b/Source/WebCore/html/track/WebVTTToken.h >@@ -58,7 +58,7 @@ public: > return WebVTTToken(Type::Character, characterData); > } > >- static WebVTTToken StartTag(const String& tagName, const AtomicString& classes = emptyAtom(), const AtomicString& annotation = emptyAtom()) >+ static WebVTTToken StartTag(const String& tagName, const AtomString& classes = emptyAtom(), const AtomString& annotation = emptyAtom()) > { > WebVTTToken token(Type::StartTag, tagName); > token.m_classes = classes; >@@ -79,8 +79,8 @@ public: > Type::Type type() const { return m_type; } > const String& name() const { return m_data; } > const String& characters() const { return m_data; } >- const AtomicString& classes() const { return m_classes; } >- const AtomicString& annotation() const { return m_annotation; } >+ const AtomString& classes() const { return m_classes; } >+ const AtomString& annotation() const { return m_annotation; } > > private: > WebVTTToken(Type::Type type, const String& data) >@@ -89,8 +89,8 @@ private: > > Type::Type m_type; > String m_data; >- AtomicString m_annotation; >- AtomicString m_classes; >+ AtomString m_annotation; >+ AtomString m_classes; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/html/track/WebVTTTokenizer.cpp b/Source/WebCore/html/track/WebVTTTokenizer.cpp >index 024c04a096c8a331702751e7ed1f3c3c77d801ce..f200cbabe947136926bea68c05a1d2432a1086fb 100644 >--- a/Source/WebCore/html/track/WebVTTTokenizer.cpp >+++ b/Source/WebCore/html/track/WebVTTTokenizer.cpp >@@ -202,7 +202,7 @@ StartTagClassState: > } else if (character == '>' || character == kEndOfFileMarker) { > addNewClass(classes, buffer); > buffer.clear(); >- return advanceAndEmitToken(m_input, token, WebVTTToken::StartTag(result.toString(), classes.toAtomicString())); >+ return advanceAndEmitToken(m_input, token, WebVTTToken::StartTag(result.toString(), classes.toAtomString())); > } else { > buffer.append(character); > WEBVTT_ADVANCE_TO(StartTagClassState); >@@ -210,7 +210,7 @@ StartTagClassState: > > StartTagAnnotationState: > if (character == '>' || character == kEndOfFileMarker) >- return advanceAndEmitToken(m_input, token, WebVTTToken::StartTag(result.toString(), classes.toAtomicString(), buffer.toAtomicString())); >+ return advanceAndEmitToken(m_input, token, WebVTTToken::StartTag(result.toString(), classes.toAtomString(), buffer.toAtomString())); > buffer.append(character); > WEBVTT_ADVANCE_TO(StartTagAnnotationState); > >diff --git a/Source/WebCore/inspector/DOMEditor.cpp b/Source/WebCore/inspector/DOMEditor.cpp >index 451668041c039812c76705dc3b21c0c551a6b046..6c31e498e434d300b0f1c6eab84346776cf0a2fc 100644 >--- a/Source/WebCore/inspector/DOMEditor.cpp >+++ b/Source/WebCore/inspector/DOMEditor.cpp >@@ -159,7 +159,7 @@ private: > class DOMEditor::SetAttributeAction final : public InspectorHistory::Action { > WTF_MAKE_NONCOPYABLE(SetAttributeAction); > public: >- SetAttributeAction(Element& element, const AtomicString& name, const AtomicString& value) >+ SetAttributeAction(Element& element, const AtomString& name, const AtomString& value) > : InspectorHistory::Action() > , m_element(element) > , m_name(name) >@@ -189,9 +189,9 @@ private: > } > > Ref<Element> m_element; >- AtomicString m_name; >- AtomicString m_value; >- AtomicString m_oldValue; >+ AtomString m_name; >+ AtomString m_value; >+ AtomString m_oldValue; > }; > > class DOMEditor::SetOuterHTMLAction final : public InspectorHistory::Action { >diff --git a/Source/WebCore/inspector/InspectorAuditDOMObject.cpp b/Source/WebCore/inspector/InspectorAuditDOMObject.cpp >index 923287d3d2fc14a7c64590636ff4f1305574eb42..f1dfa40b99dace4643e1a825292867717f68eda4 100644 >--- a/Source/WebCore/inspector/InspectorAuditDOMObject.cpp >+++ b/Source/WebCore/inspector/InspectorAuditDOMObject.cpp >@@ -28,7 +28,7 @@ > #include "InspectorAuditDOMObject.h" > > #include "Node.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/WTFString.h> > > namespace WebCore { >@@ -49,13 +49,13 @@ ExceptionOr<bool> InspectorAuditDOMObject::hasEventListeners(Node& node, const S > ERROR_IF_NO_ACTIVE_AUDIT(); > > if (EventTargetData* eventTargetData = node.eventTargetData()) { >- Vector<AtomicString> eventTypes; >+ Vector<AtomString> eventTypes; > if (type.isNull()) > eventTypes = eventTargetData->eventListenerMap.eventTypes(); > else > eventTypes.append(type); > >- for (AtomicString& type : eventTypes) { >+ for (AtomString& type : eventTypes) { > for (const RefPtr<RegisteredEventListener>& listener : node.eventListeners(type)) { > if (listener->callback().type() == EventListener::JSEventListenerType) > return true; >diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp >index fb75d19c8b6981c6c10100bddd63f2a01b9c515b..9b1d2fcf3dbc21f2e1657a946697ac96716e2c28 100644 >--- a/Source/WebCore/inspector/InspectorInstrumentation.cpp >+++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp >@@ -169,7 +169,7 @@ void InspectorInstrumentation::didRemoveDOMNodeImpl(InstrumentingAgents& instrum > domAgent->didRemoveDOMNode(node); > } > >-void InspectorInstrumentation::willModifyDOMAttrImpl(InstrumentingAgents& instrumentingAgents, Element& element, const AtomicString& oldValue, const AtomicString& newValue) >+void InspectorInstrumentation::willModifyDOMAttrImpl(InstrumentingAgents& instrumentingAgents, Element& element, const AtomString& oldValue, const AtomString& newValue) > { > if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents.inspectorDOMDebuggerAgent()) > domDebuggerAgent->willModifyDOMAttr(element); >@@ -177,13 +177,13 @@ void InspectorInstrumentation::willModifyDOMAttrImpl(InstrumentingAgents& instru > domAgent->willModifyDOMAttr(element, oldValue, newValue); > } > >-void InspectorInstrumentation::didModifyDOMAttrImpl(InstrumentingAgents& instrumentingAgents, Element& element, const AtomicString& name, const AtomicString& value) >+void InspectorInstrumentation::didModifyDOMAttrImpl(InstrumentingAgents& instrumentingAgents, Element& element, const AtomString& name, const AtomString& value) > { > if (InspectorDOMAgent* domAgent = instrumentingAgents.inspectorDOMAgent()) > domAgent->didModifyDOMAttr(element, name, value); > } > >-void InspectorInstrumentation::didRemoveDOMAttrImpl(InstrumentingAgents& instrumentingAgents, Element& element, const AtomicString& name) >+void InspectorInstrumentation::didRemoveDOMAttrImpl(InstrumentingAgents& instrumentingAgents, Element& element, const AtomString& name) > { > if (InspectorDOMAgent* domAgent = instrumentingAgents.inspectorDOMAgent()) > domAgent->didRemoveDOMAttr(element, name); >@@ -328,7 +328,7 @@ void InspectorInstrumentation::didRemoveTimerImpl(InstrumentingAgents& instrumen > timelineAgent->didRemoveTimer(timerId, frameForScriptExecutionContext(context)); > } > >-void InspectorInstrumentation::didAddEventListenerImpl(InstrumentingAgents& instrumentingAgents, EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture) >+void InspectorInstrumentation::didAddEventListenerImpl(InstrumentingAgents& instrumentingAgents, EventTarget& target, const AtomString& eventType, EventListener& listener, bool capture) > { > if (PageDebuggerAgent* pageDebuggerAgent = instrumentingAgents.pageDebuggerAgent()) > pageDebuggerAgent->didAddEventListener(target, eventType, listener, capture); >@@ -336,7 +336,7 @@ void InspectorInstrumentation::didAddEventListenerImpl(InstrumentingAgents& inst > domAgent->didAddEventListener(target); > } > >-void InspectorInstrumentation::willRemoveEventListenerImpl(InstrumentingAgents& instrumentingAgents, EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture) >+void InspectorInstrumentation::willRemoveEventListenerImpl(InstrumentingAgents& instrumentingAgents, EventTarget& target, const AtomString& eventType, EventListener& listener, bool capture) > { > if (PageDebuggerAgent* pageDebuggerAgent = instrumentingAgents.pageDebuggerAgent()) > pageDebuggerAgent->willRemoveEventListener(target, eventType, listener, capture); >@@ -344,7 +344,7 @@ void InspectorInstrumentation::willRemoveEventListenerImpl(InstrumentingAgents& > domAgent->willRemoveEventListener(target, eventType, listener, capture); > } > >-bool InspectorInstrumentation::isEventListenerDisabledImpl(InstrumentingAgents& instrumentingAgents, EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture) >+bool InspectorInstrumentation::isEventListenerDisabledImpl(InstrumentingAgents& instrumentingAgents, EventTarget& target, const AtomString& eventType, EventListener& listener, bool capture) > { > if (InspectorDOMAgent* domAgent = instrumentingAgents.inspectorDOMAgent()) > return domAgent->isEventListenerDisabled(target, eventType, listener, capture); >diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h >index c86453f142599f0a385775a1700667da4745df2d..9d132c5d7618a3a54adb19187ab573d6a442a053 100644 >--- a/Source/WebCore/inspector/InspectorInstrumentation.h >+++ b/Source/WebCore/inspector/InspectorInstrumentation.h >@@ -111,9 +111,9 @@ public: > static void didInsertDOMNode(Document&, Node&); > static void willRemoveDOMNode(Document&, Node&); > static void didRemoveDOMNode(Document&, Node&); >- static void willModifyDOMAttr(Document&, Element&, const AtomicString& oldValue, const AtomicString& newValue); >- static void didModifyDOMAttr(Document&, Element&, const AtomicString& name, const AtomicString& value); >- static void didRemoveDOMAttr(Document&, Element&, const AtomicString& name); >+ static void willModifyDOMAttr(Document&, Element&, const AtomString& oldValue, const AtomString& newValue); >+ static void didModifyDOMAttr(Document&, Element&, const AtomString& name, const AtomString& value); >+ static void didRemoveDOMAttr(Document&, Element&, const AtomString& name); > static void characterDataModified(Document&, CharacterData&); > static void willInvalidateStyleAttr(Element&); > static void didInvalidateStyleAttr(Element&); >@@ -149,9 +149,9 @@ public: > > static InspectorInstrumentationCookie willCallFunction(ScriptExecutionContext*, const String& scriptName, int scriptLine, int scriptColumn); > static void didCallFunction(const InspectorInstrumentationCookie&, ScriptExecutionContext*); >- static void didAddEventListener(EventTarget&, const AtomicString& eventType, EventListener&, bool capture); >- static void willRemoveEventListener(EventTarget&, const AtomicString& eventType, EventListener&, bool capture); >- static bool isEventListenerDisabled(EventTarget&, const AtomicString& eventType, EventListener&, bool capture); >+ static void didAddEventListener(EventTarget&, const AtomString& eventType, EventListener&, bool capture); >+ static void willRemoveEventListener(EventTarget&, const AtomString& eventType, EventListener&, bool capture); >+ static bool isEventListenerDisabled(EventTarget&, const AtomString& eventType, EventListener&, bool capture); > static InspectorInstrumentationCookie willDispatchEvent(Document&, const Event&, bool hasEventListeners); > static void didDispatchEvent(const InspectorInstrumentationCookie&, bool defaultPrevented); > static void willHandleEvent(ScriptExecutionContext&, Event&, const RegisteredEventListener&); >@@ -305,9 +305,9 @@ private: > static void didInsertDOMNodeImpl(InstrumentingAgents&, Node&); > static void willRemoveDOMNodeImpl(InstrumentingAgents&, Node&); > static void didRemoveDOMNodeImpl(InstrumentingAgents&, Node&); >- static void willModifyDOMAttrImpl(InstrumentingAgents&, Element&, const AtomicString& oldValue, const AtomicString& newValue); >- static void didModifyDOMAttrImpl(InstrumentingAgents&, Element&, const AtomicString& name, const AtomicString& value); >- static void didRemoveDOMAttrImpl(InstrumentingAgents&, Element&, const AtomicString& name); >+ static void willModifyDOMAttrImpl(InstrumentingAgents&, Element&, const AtomString& oldValue, const AtomString& newValue); >+ static void didModifyDOMAttrImpl(InstrumentingAgents&, Element&, const AtomString& name, const AtomString& value); >+ static void didRemoveDOMAttrImpl(InstrumentingAgents&, Element&, const AtomString& name); > static void characterDataModifiedImpl(InstrumentingAgents&, CharacterData&); > static void willInvalidateStyleAttrImpl(InstrumentingAgents&, Element&); > static void didInvalidateStyleAttrImpl(InstrumentingAgents&, Element&); >@@ -343,9 +343,9 @@ private: > > static InspectorInstrumentationCookie willCallFunctionImpl(InstrumentingAgents&, const String& scriptName, int scriptLine, int scriptColumn, ScriptExecutionContext*); > static void didCallFunctionImpl(const InspectorInstrumentationCookie&, ScriptExecutionContext*); >- static void didAddEventListenerImpl(InstrumentingAgents&, EventTarget&, const AtomicString& eventType, EventListener&, bool capture); >- static void willRemoveEventListenerImpl(InstrumentingAgents&, EventTarget&, const AtomicString& eventType, EventListener&, bool capture); >- static bool isEventListenerDisabledImpl(InstrumentingAgents&, EventTarget&, const AtomicString& eventType, EventListener&, bool capture); >+ static void didAddEventListenerImpl(InstrumentingAgents&, EventTarget&, const AtomString& eventType, EventListener&, bool capture); >+ static void willRemoveEventListenerImpl(InstrumentingAgents&, EventTarget&, const AtomString& eventType, EventListener&, bool capture); >+ static bool isEventListenerDisabledImpl(InstrumentingAgents&, EventTarget&, const AtomString& eventType, EventListener&, bool capture); > static InspectorInstrumentationCookie willDispatchEventImpl(InstrumentingAgents&, Document&, const Event&, bool hasEventListeners); > static void willHandleEventImpl(InstrumentingAgents&, Event&, const RegisteredEventListener&); > static void didHandleEventImpl(InstrumentingAgents&); >@@ -533,21 +533,21 @@ inline void InspectorInstrumentation::didRemoveDOMNode(Document& document, Node& > didRemoveDOMNodeImpl(*instrumentingAgents, node); > } > >-inline void InspectorInstrumentation::willModifyDOMAttr(Document& document, Element& element, const AtomicString& oldValue, const AtomicString& newValue) >+inline void InspectorInstrumentation::willModifyDOMAttr(Document& document, Element& element, const AtomString& oldValue, const AtomString& newValue) > { > FAST_RETURN_IF_NO_FRONTENDS(void()); > if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document)) > willModifyDOMAttrImpl(*instrumentingAgents, element, oldValue, newValue); > } > >-inline void InspectorInstrumentation::didModifyDOMAttr(Document& document, Element& element, const AtomicString& name, const AtomicString& value) >+inline void InspectorInstrumentation::didModifyDOMAttr(Document& document, Element& element, const AtomString& name, const AtomString& value) > { > FAST_RETURN_IF_NO_FRONTENDS(void()); > if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document)) > didModifyDOMAttrImpl(*instrumentingAgents, element, name, value); > } > >-inline void InspectorInstrumentation::didRemoveDOMAttr(Document& document, Element& element, const AtomicString& name) >+inline void InspectorInstrumentation::didRemoveDOMAttr(Document& document, Element& element, const AtomString& name) > { > FAST_RETURN_IF_NO_FRONTENDS(void()); > if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document)) >@@ -730,21 +730,21 @@ inline void InspectorInstrumentation::didRemoveTimer(ScriptExecutionContext& con > didRemoveTimerImpl(*instrumentingAgents, timerId, context); > } > >-inline void InspectorInstrumentation::didAddEventListener(EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture) >+inline void InspectorInstrumentation::didAddEventListener(EventTarget& target, const AtomString& eventType, EventListener& listener, bool capture) > { > FAST_RETURN_IF_NO_FRONTENDS(void()); > if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(target.scriptExecutionContext())) > didAddEventListenerImpl(*instrumentingAgents, target, eventType, listener, capture); > } > >-inline void InspectorInstrumentation::willRemoveEventListener(EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture) >+inline void InspectorInstrumentation::willRemoveEventListener(EventTarget& target, const AtomString& eventType, EventListener& listener, bool capture) > { > FAST_RETURN_IF_NO_FRONTENDS(void()); > if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(target.scriptExecutionContext())) > willRemoveEventListenerImpl(*instrumentingAgents, target, eventType, listener, capture); > } > >-inline bool InspectorInstrumentation::isEventListenerDisabled(EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture) >+inline bool InspectorInstrumentation::isEventListenerDisabled(EventTarget& target, const AtomString& eventType, EventListener& listener, bool capture) > { > FAST_RETURN_IF_NO_FRONTENDS(false); > if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(target.scriptExecutionContext())) >diff --git a/Source/WebCore/inspector/agents/InspectorCSSAgent.cpp b/Source/WebCore/inspector/agents/InspectorCSSAgent.cpp >index 0e56ecfff3c12db6bdb0488dfcfad8817d36681a..5c3f2b114942ba0ed2a830c83b72e998085a888c 100644 >--- a/Source/WebCore/inspector/agents/InspectorCSSAgent.cpp >+++ b/Source/WebCore/inspector/agents/InspectorCSSAgent.cpp >@@ -714,7 +714,7 @@ InspectorStyleSheet* InspectorCSSAgent::createInspectorStyleSheetForDocument(Doc > return nullptr; > > auto styleElement = HTMLStyleElement::create(document); >- styleElement->setAttributeWithoutSynchronization(HTMLNames::typeAttr, AtomicString("text/css", AtomicString::ConstructFromLiteral)); >+ styleElement->setAttributeWithoutSynchronization(HTMLNames::typeAttr, AtomString("text/css", AtomString::ConstructFromLiteral)); > > ContainerNode* targetNode; > // HEAD is absent in ImageDocuments, for example. >diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp >index 7d98960e36eff6abdcc25ace8ff2cfe38cf319cb..0d59785c1ec682b59ba0972ca9604dcbcd97d124 100644 >--- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp >+++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp >@@ -894,7 +894,7 @@ void InspectorDOMAgent::getEventListenersForNode(ErrorString& errorString, int n > > struct EventListenerInfo { > RefPtr<EventTarget> eventTarget; >- const AtomicString eventType; >+ const AtomString eventType; > const EventListenerVector eventListeners; > }; > >@@ -1677,7 +1677,7 @@ RefPtr<JSON::ArrayOf<Inspector::Protocol::DOM::Node>> InspectorDOMAgent::buildAr > return pseudoElements; > } > >-Ref<Inspector::Protocol::DOM::EventListener> InspectorDOMAgent::buildObjectForEventListener(const RegisteredEventListener& registeredEventListener, int identifier, EventTarget& eventTarget, const AtomicString& eventType, bool disabled, bool hasBreakpoint) >+Ref<Inspector::Protocol::DOM::EventListener> InspectorDOMAgent::buildObjectForEventListener(const RegisteredEventListener& registeredEventListener, int identifier, EventTarget& eventTarget, const AtomString& eventType, bool disabled, bool hasBreakpoint) > { > Ref<EventListener> eventListener = registeredEventListener.callback(); > >@@ -2176,7 +2176,7 @@ void InspectorDOMAgent::addEventListenersToNode(Node& node) > #if ENABLE(VIDEO) > auto callback = EventFiredCallback::create(*this); > >- auto createEventListener = [&] (const AtomicString& eventName) { >+ auto createEventListener = [&] (const AtomString& eventName) { > node.addEventListener(eventName, callback.copyRef(), false); > }; > >@@ -2262,12 +2262,12 @@ void InspectorDOMAgent::didRemoveDOMNode(Node& node) > unbind(&node, &m_documentNodeToIdMap); > } > >-void InspectorDOMAgent::willModifyDOMAttr(Element&, const AtomicString& oldValue, const AtomicString& newValue) >+void InspectorDOMAgent::willModifyDOMAttr(Element&, const AtomString& oldValue, const AtomString& newValue) > { > m_suppressAttributeModifiedEvent = (oldValue == newValue); > } > >-void InspectorDOMAgent::didModifyDOMAttr(Element& element, const AtomicString& name, const AtomicString& value) >+void InspectorDOMAgent::didModifyDOMAttr(Element& element, const AtomString& name, const AtomString& value) > { > bool shouldSuppressEvent = m_suppressAttributeModifiedEvent; > m_suppressAttributeModifiedEvent = false; >@@ -2284,7 +2284,7 @@ void InspectorDOMAgent::didModifyDOMAttr(Element& element, const AtomicString& n > m_frontendDispatcher->attributeModified(id, name, value); > } > >-void InspectorDOMAgent::didRemoveDOMAttr(Element& element, const AtomicString& name) >+void InspectorDOMAgent::didRemoveDOMAttr(Element& element, const AtomString& name) > { > int id = boundNodeId(&element); > if (!id) >@@ -2423,7 +2423,7 @@ void InspectorDOMAgent::didAddEventListener(EventTarget& target) > m_frontendDispatcher->didAddEventListener(nodeId); > } > >-void InspectorDOMAgent::willRemoveEventListener(EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture) >+void InspectorDOMAgent::willRemoveEventListener(EventTarget& target, const AtomString& eventType, EventListener& listener, bool capture) > { > if (!is<Node>(target)) > return; >@@ -2459,7 +2459,7 @@ void InspectorDOMAgent::willRemoveEventListener(EventTarget& target, const Atomi > m_frontendDispatcher->willRemoveEventListener(nodeId); > } > >-bool InspectorDOMAgent::isEventListenerDisabled(EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture) >+bool InspectorDOMAgent::isEventListenerDisabled(EventTarget& target, const AtomString& eventType, EventListener& listener, bool capture) > { > for (auto& inspectorEventListener : m_eventListenerEntries.values()) { > if (inspectorEventListener.matches(target, eventType, listener, capture)) >@@ -2473,7 +2473,7 @@ void InspectorDOMAgent::eventDidResetAfterDispatch(const Event& event) > m_dispatchedEvents.remove(&event); > } > >-bool InspectorDOMAgent::hasBreakpointForEventListener(EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture) >+bool InspectorDOMAgent::hasBreakpointForEventListener(EventTarget& target, const AtomString& eventType, EventListener& listener, bool capture) > { > for (auto& inspectorEventListener : m_eventListenerEntries.values()) { > if (inspectorEventListener.matches(target, eventType, listener, capture)) >@@ -2482,7 +2482,7 @@ bool InspectorDOMAgent::hasBreakpointForEventListener(EventTarget& target, const > return false; > } > >-int InspectorDOMAgent::idForEventListener(EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture) >+int InspectorDOMAgent::idForEventListener(EventTarget& target, const AtomString& eventType, EventListener& listener, bool capture) > { > for (auto& inspectorEventListener : m_eventListenerEntries.values()) { > if (inspectorEventListener.matches(target, eventType, listener, capture)) >diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.h b/Source/WebCore/inspector/agents/InspectorDOMAgent.h >index 58d3a20767f1fd7a1e395180c3b19ca749948506..73fe203ed32e4716516aec785ff88adb104fd53b 100644 >--- a/Source/WebCore/inspector/agents/InspectorDOMAgent.h >+++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.h >@@ -39,7 +39,7 @@ > #include <wtf/JSONValues.h> > #include <wtf/RefPtr.h> > #include <wtf/Vector.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace Inspector { > class InjectedScriptManager; >@@ -142,9 +142,9 @@ public: > void addEventListenersToNode(Node&); > void didInsertDOMNode(Node&); > void didRemoveDOMNode(Node&); >- void willModifyDOMAttr(Element&, const AtomicString& oldValue, const AtomicString& newValue); >- void didModifyDOMAttr(Element&, const AtomicString& name, const AtomicString& value); >- void didRemoveDOMAttr(Element&, const AtomicString& name); >+ void willModifyDOMAttr(Element&, const AtomString& oldValue, const AtomString& newValue); >+ void didModifyDOMAttr(Element&, const AtomString& name, const AtomString& value); >+ void didRemoveDOMAttr(Element&, const AtomString& name); > void characterDataModified(CharacterData&); > void didInvalidateStyleAttr(Element&); > void didPushShadowRoot(Element& host, ShadowRoot&); >@@ -156,8 +156,8 @@ public: > void pseudoElementCreated(PseudoElement&); > void pseudoElementDestroyed(PseudoElement&); > void didAddEventListener(EventTarget&); >- void willRemoveEventListener(EventTarget&, const AtomicString& eventType, EventListener&, bool capture); >- bool isEventListenerDisabled(EventTarget&, const AtomicString& eventType, EventListener&, bool capture); >+ void willRemoveEventListener(EventTarget&, const AtomString& eventType, EventListener&, bool capture); >+ bool isEventListenerDisabled(EventTarget&, const AtomString& eventType, EventListener&, bool capture); > void eventDidResetAfterDispatch(const Event&); > > // Callbacks that don't directly correspond to an instrumentation entry point. >@@ -195,8 +195,8 @@ public: > static Node* scriptValueAsNode(JSC::JSValue); > static JSC::JSValue nodeAsScriptValue(JSC::ExecState&, Node*); > >- bool hasBreakpointForEventListener(EventTarget&, const AtomicString& eventType, EventListener&, bool capture); >- int idForEventListener(EventTarget&, const AtomicString& eventType, EventListener&, bool capture); >+ bool hasBreakpointForEventListener(EventTarget&, const AtomString& eventType, EventListener&, bool capture); >+ int idForEventListener(EventTarget&, const AtomString& eventType, EventListener&, bool capture); > > private: > #if ENABLE(VIDEO) >@@ -222,7 +222,7 @@ private: > Ref<JSON::ArrayOf<String>> buildArrayForElementAttributes(Element*); > Ref<JSON::ArrayOf<Inspector::Protocol::DOM::Node>> buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap); > RefPtr<JSON::ArrayOf<Inspector::Protocol::DOM::Node>> buildArrayForPseudoElements(const Element&, NodeToIdMap* nodesMap); >- Ref<Inspector::Protocol::DOM::EventListener> buildObjectForEventListener(const RegisteredEventListener&, int identifier, EventTarget&, const AtomicString& eventType, bool disabled, bool hasBreakpoint); >+ Ref<Inspector::Protocol::DOM::EventListener> buildObjectForEventListener(const RegisteredEventListener&, int identifier, EventTarget&, const AtomString& eventType, bool disabled, bool hasBreakpoint); > RefPtr<Inspector::Protocol::DOM::AccessibilityProperties> buildObjectForAccessibilityProperties(Node*); > void processAccessibilityChildren(AccessibilityObject&, JSON::ArrayOf<int>&); > >@@ -282,14 +282,14 @@ private: > int identifier { 1 }; > RefPtr<EventTarget> eventTarget; > RefPtr<EventListener> eventListener; >- AtomicString eventType; >+ AtomString eventType; > bool useCapture { false }; > bool disabled { false }; > bool hasBreakpoint { false }; > > InspectorEventListener() { } > >- InspectorEventListener(int identifier, EventTarget& target, const AtomicString& type, EventListener& listener, bool capture) >+ InspectorEventListener(int identifier, EventTarget& target, const AtomString& type, EventListener& listener, bool capture) > : identifier(identifier) > , eventTarget(&target) > , eventListener(&listener) >@@ -298,7 +298,7 @@ private: > { > } > >- bool matches(EventTarget& target, const AtomicString& type, EventListener& listener, bool capture) >+ bool matches(EventTarget& target, const AtomString& type, EventListener& listener, bool capture) > { > if (eventTarget.get() != &target) > return false; >diff --git a/Source/WebCore/inspector/agents/page/PageDebuggerAgent.cpp b/Source/WebCore/inspector/agents/page/PageDebuggerAgent.cpp >index e8cf48fd6d044f72e67975717dd34c110fac1aaf..4f443227acd527c9afc0a515b39a12c7d3634c92 100644 >--- a/Source/WebCore/inspector/agents/page/PageDebuggerAgent.cpp >+++ b/Source/WebCore/inspector/agents/page/PageDebuggerAgent.cpp >@@ -156,7 +156,7 @@ void PageDebuggerAgent::mainFrameNavigated() > setSuppressAllPauses(false); > } > >-void PageDebuggerAgent::didAddEventListener(EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture) >+void PageDebuggerAgent::didAddEventListener(EventTarget& target, const AtomString& eventType, EventListener& listener, bool capture) > { > if (!breakpointsActive()) > return; >@@ -182,7 +182,7 @@ void PageDebuggerAgent::didAddEventListener(EventTarget& target, const AtomicStr > didScheduleAsyncCall(scriptState, InspectorDebuggerAgent::AsyncCallType::EventListener, identifier, registeredListener->isOnce()); > } > >-void PageDebuggerAgent::willRemoveEventListener(EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture) >+void PageDebuggerAgent::willRemoveEventListener(EventTarget& target, const AtomString& eventType, EventListener& listener, bool capture) > { > auto& eventListeners = target.eventListeners(eventType); > size_t listenerIndex = eventListeners.findMatching([&](auto& registeredListener) { >diff --git a/Source/WebCore/inspector/agents/page/PageDebuggerAgent.h b/Source/WebCore/inspector/agents/page/PageDebuggerAgent.h >index a2acc2df00aa22efc598f0d243a849789532fed8..085de07654b995828d7056929a64e2534cb3bbc1 100644 >--- a/Source/WebCore/inspector/agents/page/PageDebuggerAgent.h >+++ b/Source/WebCore/inspector/agents/page/PageDebuggerAgent.h >@@ -59,8 +59,8 @@ public: > void willFireAnimationFrame(int callbackId); > void didCancelAnimationFrame(int callbackId); > >- void didAddEventListener(EventTarget&, const AtomicString& eventType, EventListener&, bool capture); >- void willRemoveEventListener(EventTarget&, const AtomicString& eventType, EventListener&, bool capture); >+ void didAddEventListener(EventTarget&, const AtomString& eventType, EventListener&, bool capture); >+ void willRemoveEventListener(EventTarget&, const AtomString& eventType, EventListener&, bool capture); > void willHandleEvent(const RegisteredEventListener&); > > void didPostMessage(const TimerBase&, JSC::ExecState&); >diff --git a/Source/WebCore/loader/CrossOriginAccessControl.cpp b/Source/WebCore/loader/CrossOriginAccessControl.cpp >index 1f67c1de5889e067994ad47148ca390685d77b08..d0d54b97eae720426f961c8dae895e20369cedcc 100644 >--- a/Source/WebCore/loader/CrossOriginAccessControl.cpp >+++ b/Source/WebCore/loader/CrossOriginAccessControl.cpp >@@ -38,7 +38,7 @@ > #include "SecurityPolicy.h" > #include <mutex> > #include <wtf/NeverDestroyed.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/StringBuilder.h> > > namespace WebCore { >diff --git a/Source/WebCore/loader/EmptyClients.cpp b/Source/WebCore/loader/EmptyClients.cpp >index a57101caa581a733cf691b6fa85db2ce80e8f963..603e57efe0f74cae9ce99bbbd2cfa3baa7b4b5d7 100644 >--- a/Source/WebCore/loader/EmptyClients.cpp >+++ b/Source/WebCore/loader/EmptyClients.cpp >@@ -370,8 +370,8 @@ public: > > private: > PopupMenu* popupMenu() final { return m_popup.ptr(); } >- void saveRecentSearches(const AtomicString&, const Vector<RecentSearch>&) final { } >- void loadRecentSearches(const AtomicString&, Vector<RecentSearch>&) final { } >+ void saveRecentSearches(const AtomString&, const Vector<RecentSearch>&) final { } >+ void loadRecentSearches(const AtomString&, Vector<RecentSearch>&) final { } > bool enabled() final { return false; } > > Ref<EmptyPopupMenu> m_popup; >@@ -414,7 +414,7 @@ class EmptyUserContentProvider final : public UserContentProvider { > }; > > class EmptyVisitedLinkStore final : public VisitedLinkStore { >- bool isLinkVisited(Page&, SharedStringHash, const URL&, const AtomicString&) final { return false; } >+ bool isLinkVisited(Page&, SharedStringHash, const URL&, const AtomString&) final { return false; } > void addVisitedLink(Page&, SharedStringHash) final { } > }; > >diff --git a/Source/WebCore/loader/FormSubmission.cpp b/Source/WebCore/loader/FormSubmission.cpp >index 9b8e60473cc63b12d835c99307606a0b88c24b23..be03e4a19e117225fce8127af174c1b04f9554f4 100644 >--- a/Source/WebCore/loader/FormSubmission.cpp >+++ b/Source/WebCore/loader/FormSubmission.cpp >@@ -147,7 +147,7 @@ Ref<FormSubmission> FormSubmission::create(HTMLFormElement& form, const Attribut > auto copiedAttributes = attributes; > > if (auto* submitButton = form.findSubmitButton(event)) { >- AtomicString attributeValue; >+ AtomString attributeValue; > if (!(attributeValue = submitButton->attributeWithoutSynchronization(formactionAttr)).isNull()) > copiedAttributes.parseAction(attributeValue); > if (!(attributeValue = submitButton->attributeWithoutSynchronization(formenctypeAttr)).isNull()) >diff --git a/Source/WebCore/loader/FrameLoadRequest.cpp b/Source/WebCore/loader/FrameLoadRequest.cpp >index aaacbaccc1fc9263984f649369dd159673cf2d91..827e49382fc6d8f26d80552d1f2d2f72808f236c 100644 >--- a/Source/WebCore/loader/FrameLoadRequest.cpp >+++ b/Source/WebCore/loader/FrameLoadRequest.cpp >@@ -37,7 +37,7 @@ > > namespace WebCore { > >-FrameLoadRequest::FrameLoadRequest(Document& requester, SecurityOrigin& requesterSecurityOrigin, const ResourceRequest& resourceRequest, const String& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer, AllowNavigationToInvalidURL allowNavigationToInvalidURL, NewFrameOpenerPolicy newFrameOpenerPolicy, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, InitiatedByMainFrame initiatedByMainFrame, ShouldReplaceDocumentIfJavaScriptURL shouldReplaceDocumentIfJavaScriptURL, const AtomicString& downloadAttribute, const SystemPreviewInfo& systemPreviewInfo) >+FrameLoadRequest::FrameLoadRequest(Document& requester, SecurityOrigin& requesterSecurityOrigin, const ResourceRequest& resourceRequest, const String& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer, AllowNavigationToInvalidURL allowNavigationToInvalidURL, NewFrameOpenerPolicy newFrameOpenerPolicy, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, InitiatedByMainFrame initiatedByMainFrame, ShouldReplaceDocumentIfJavaScriptURL shouldReplaceDocumentIfJavaScriptURL, const AtomString& downloadAttribute, const SystemPreviewInfo& systemPreviewInfo) > : m_requester { makeRef(requester) } > , m_requesterSecurityOrigin { makeRef(requesterSecurityOrigin) } > , m_resourceRequest { resourceRequest } >diff --git a/Source/WebCore/loader/FrameLoadRequest.h b/Source/WebCore/loader/FrameLoadRequest.h >index a74c490a5c20fbaf414af677a50ba87a51765c2b..1d81fe47a30418b9225d27ab1b4977d3dcbf0697 100644 >--- a/Source/WebCore/loader/FrameLoadRequest.h >+++ b/Source/WebCore/loader/FrameLoadRequest.h >@@ -38,7 +38,7 @@ class SecurityOrigin; > > class FrameLoadRequest { > public: >- WEBCORE_EXPORT FrameLoadRequest(Document&, SecurityOrigin&, const ResourceRequest&, const String& frameName, LockHistory, LockBackForwardList, ShouldSendReferrer, AllowNavigationToInvalidURL, NewFrameOpenerPolicy, ShouldOpenExternalURLsPolicy, InitiatedByMainFrame, ShouldReplaceDocumentIfJavaScriptURL = ReplaceDocumentIfJavaScriptURL, const AtomicString& downloadAttribute = { }, const SystemPreviewInfo& = { }); >+ WEBCORE_EXPORT FrameLoadRequest(Document&, SecurityOrigin&, const ResourceRequest&, const String& frameName, LockHistory, LockBackForwardList, ShouldSendReferrer, AllowNavigationToInvalidURL, NewFrameOpenerPolicy, ShouldOpenExternalURLsPolicy, InitiatedByMainFrame, ShouldReplaceDocumentIfJavaScriptURL = ReplaceDocumentIfJavaScriptURL, const AtomString& downloadAttribute = { }, const SystemPreviewInfo& = { }); > WEBCORE_EXPORT FrameLoadRequest(Frame&, const ResourceRequest&, ShouldOpenExternalURLsPolicy, const SubstituteData& = SubstituteData()); > > WEBCORE_EXPORT ~FrameLoadRequest(); >@@ -87,7 +87,7 @@ public: > void setShouldOpenExternalURLsPolicy(ShouldOpenExternalURLsPolicy policy) { m_shouldOpenExternalURLsPolicy = policy; } > ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy() const { return m_shouldOpenExternalURLsPolicy; } > >- const AtomicString& downloadAttribute() const { return m_downloadAttribute; } >+ const AtomString& downloadAttribute() const { return m_downloadAttribute; } > > InitiatedByMainFrame initiatedByMainFrame() const { return m_initiatedByMainFrame; } > >@@ -114,7 +114,7 @@ private: > NewFrameOpenerPolicy m_newFrameOpenerPolicy; > ShouldReplaceDocumentIfJavaScriptURL m_shouldReplaceDocumentIfJavaScriptURL; > ShouldOpenExternalURLsPolicy m_shouldOpenExternalURLsPolicy { ShouldOpenExternalURLsPolicy::ShouldNotAllow }; >- AtomicString m_downloadAttribute; >+ AtomString m_downloadAttribute; > InitiatedByMainFrame m_initiatedByMainFrame { InitiatedByMainFrame::Unknown }; > SystemPreviewInfo m_systemPreviewInfo; > bool m_isRequestFromClientOrUserInput { false }; >diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp >index a1e0d9378deefeddc0111b75a3d90bd4d425126a..7e4136038a53a1a0d64035cdb895a4bc2ab05739 100644 >--- a/Source/WebCore/loader/FrameLoader.cpp >+++ b/Source/WebCore/loader/FrameLoader.cpp >@@ -381,7 +381,7 @@ void FrameLoader::changeLocation(FrameLoadRequest&& request) > urlSelected(WTFMove(request), nullptr); > } > >-void FrameLoader::urlSelected(const URL& url, const String& passedTarget, Event* triggeringEvent, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, Optional<NewFrameOpenerPolicy> openerPolicy, const AtomicString& downloadAttribute, const SystemPreviewInfo& systemPreviewInfo, Optional<AdClickAttribution>&& adClickAttribution) >+void FrameLoader::urlSelected(const URL& url, const String& passedTarget, Event* triggeringEvent, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, Optional<NewFrameOpenerPolicy> openerPolicy, const AtomString& downloadAttribute, const SystemPreviewInfo& systemPreviewInfo, Optional<AdClickAttribution>&& adClickAttribution) > { > auto* frame = lexicalFrameFromCommonVM(); > auto initiatedByMainFrame = frame && frame->isMainFrame() ? InitiatedByMainFrame::Yes : InitiatedByMainFrame::Unknown; >@@ -3677,7 +3677,7 @@ bool FrameLoader::shouldTreatURLAsSrcdocDocument(const URL& url) const > return ownerElement->hasAttributeWithoutSynchronization(srcdocAttr); > } > >-Frame* FrameLoader::findFrameForNavigation(const AtomicString& name, Document* activeDocument) >+Frame* FrameLoader::findFrameForNavigation(const AtomString& name, Document* activeDocument) > { > // FIXME: Eventually all callers should supply the actual activeDocument so we can call canNavigate with the right document. > if (!activeDocument) >diff --git a/Source/WebCore/loader/FrameLoader.h b/Source/WebCore/loader/FrameLoader.h >index dedbbbcd5252ccf1e3b420168ae3a3565b1d50f0..d47326987d82417cafe25032b6f5534699b388b1 100644 >--- a/Source/WebCore/loader/FrameLoader.h >+++ b/Source/WebCore/loader/FrameLoader.h >@@ -126,7 +126,7 @@ public: > unsigned long loadResourceSynchronously(const ResourceRequest&, ClientCredentialPolicy, const FetchOptions&, const HTTPHeaderMap&, ResourceError&, ResourceResponse&, RefPtr<SharedBuffer>& data); > > void changeLocation(FrameLoadRequest&&); >- WEBCORE_EXPORT void urlSelected(const URL&, const String& target, Event*, LockHistory, LockBackForwardList, ShouldSendReferrer, ShouldOpenExternalURLsPolicy, Optional<NewFrameOpenerPolicy> = WTF::nullopt, const AtomicString& downloadAttribute = nullAtom(), const SystemPreviewInfo& = { }, Optional<AdClickAttribution>&& = WTF::nullopt); >+ WEBCORE_EXPORT void urlSelected(const URL&, const String& target, Event*, LockHistory, LockBackForwardList, ShouldSendReferrer, ShouldOpenExternalURLsPolicy, Optional<NewFrameOpenerPolicy> = WTF::nullopt, const AtomString& downloadAttribute = nullAtom(), const SystemPreviewInfo& = { }, Optional<AdClickAttribution>&& = WTF::nullopt); > void submitForm(Ref<FormSubmission>&&); > > WEBCORE_EXPORT void reload(OptionSet<ReloadOption> = { }); >@@ -275,7 +275,7 @@ public: > > FrameLoaderStateMachine& stateMachine() { return m_stateMachine; } > >- WEBCORE_EXPORT Frame* findFrameForNavigation(const AtomicString& name, Document* activeDocument = nullptr); >+ WEBCORE_EXPORT Frame* findFrameForNavigation(const AtomString& name, Document* activeDocument = nullptr); > > void applyUserAgentIfNeeded(ResourceRequest&); > >diff --git a/Source/WebCore/loader/ImageLoader.cpp b/Source/WebCore/loader/ImageLoader.cpp >index 03fbb318c3e2d3608e77463277d1613803b3e00c..86d64ea39ac43ed9f1562c34fe82ee7323f864d3 100644 >--- a/Source/WebCore/loader/ImageLoader.cpp >+++ b/Source/WebCore/loader/ImageLoader.cpp >@@ -165,7 +165,7 @@ void ImageLoader::updateFromElement() > if (!document.hasLivingRenderTree()) > return; > >- AtomicString attr = element().imageSourceURL(); >+ AtomString attr = element().imageSourceURL(); > > // Avoid loading a URL we already failed to load. > if (!m_failedLoadURL.isEmpty() && attr == m_failedLoadURL) >@@ -392,7 +392,7 @@ void ImageLoader::decode(Ref<DeferredPromise>&& promise) > return; > } > >- AtomicString attr = element().imageSourceURL(); >+ AtomString attr = element().imageSourceURL(); > if (stripLeadingAndTrailingHTMLSpaces(attr).isEmpty()) { > decodeError("Missing source URL."); > return; >@@ -445,7 +445,7 @@ void ImageLoader::timerFired() > void ImageLoader::dispatchPendingEvent(ImageEventSender* eventSender) > { > ASSERT(eventSender == &beforeLoadEventSender() || eventSender == &loadEventSender() || eventSender == &errorEventSender()); >- const AtomicString& eventType = eventSender->eventType(); >+ const AtomString& eventType = eventSender->eventType(); > if (eventType == eventNames().beforeloadEvent) > dispatchPendingBeforeLoadEvent(); > if (eventType == eventNames().loadEvent) >diff --git a/Source/WebCore/loader/ImageLoader.h b/Source/WebCore/loader/ImageLoader.h >index bd4ba9e664dacc066969fdffa3bc51c39b964cae..0cdfaad75bbdf7b0bc7dd265d5bf0e32118f057e 100644 >--- a/Source/WebCore/loader/ImageLoader.h >+++ b/Source/WebCore/loader/ImageLoader.h >@@ -27,7 +27,7 @@ > #include "JSDOMPromiseDeferred.h" > #include "Timer.h" > #include <wtf/Vector.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -80,7 +80,7 @@ protected: > > private: > virtual void dispatchLoadEvent() = 0; >- virtual String sourceURI(const AtomicString&) const = 0; >+ virtual String sourceURI(const AtomString&) const = 0; > > void updatedHasPendingEvent(); > >@@ -104,7 +104,7 @@ private: > CachedResourceHandle<CachedImage> m_image; > Timer m_derefElementTimer; > RefPtr<Element> m_protectedElement; >- AtomicString m_failedLoadURL; >+ AtomString m_failedLoadURL; > Vector<RefPtr<DeferredPromise>, 1> m_decodingPromises; > bool m_hasPendingBeforeLoadEvent : 1; > bool m_hasPendingLoadEvent : 1; >diff --git a/Source/WebCore/loader/NavigationAction.cpp b/Source/WebCore/loader/NavigationAction.cpp >index f26a9aaf2fd7974cd3e71c859ab43fee20f803ff..62ba2dd2f770a406e15c90395e417c42c28f520e 100644 >--- a/Source/WebCore/loader/NavigationAction.cpp >+++ b/Source/WebCore/loader/NavigationAction.cpp >@@ -94,7 +94,7 @@ static Optional<NavigationAction::MouseEventData> mouseEventDataForFirstMouseEve > return WTF::nullopt; > } > >-NavigationAction::NavigationAction(Document& requester, const ResourceRequest& resourceRequest, InitiatedByMainFrame initiatedByMainFrame, NavigationType type, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, Event* event, const AtomicString& downloadAttribute) >+NavigationAction::NavigationAction(Document& requester, const ResourceRequest& resourceRequest, InitiatedByMainFrame initiatedByMainFrame, NavigationType type, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, Event* event, const AtomString& downloadAttribute) > : m_requester { requester } > , m_resourceRequest { resourceRequest } > , m_type { type } >@@ -120,7 +120,7 @@ static NavigationType navigationType(FrameLoadType frameLoadType, bool isFormSub > return NavigationType::Other; > } > >-NavigationAction::NavigationAction(Document& requester, const ResourceRequest& resourceRequest, InitiatedByMainFrame initiatedByMainFrame, FrameLoadType frameLoadType, bool isFormSubmission, Event* event, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, const AtomicString& downloadAttribute) >+NavigationAction::NavigationAction(Document& requester, const ResourceRequest& resourceRequest, InitiatedByMainFrame initiatedByMainFrame, FrameLoadType frameLoadType, bool isFormSubmission, Event* event, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, const AtomString& downloadAttribute) > : m_requester { requester } > , m_resourceRequest { resourceRequest } > , m_type { navigationType(frameLoadType, isFormSubmission, !!event) } >diff --git a/Source/WebCore/loader/NavigationAction.h b/Source/WebCore/loader/NavigationAction.h >index 4b611bf5be67ba7e01314639902fce79a84499ec..35c961aa1547b8ea0c4b9040703c85d3ea8e7e57 100644 >--- a/Source/WebCore/loader/NavigationAction.h >+++ b/Source/WebCore/loader/NavigationAction.h >@@ -53,8 +53,8 @@ class UIEventWithKeyState; > class NavigationAction { > public: > NavigationAction(); >- WEBCORE_EXPORT NavigationAction(Document&, const ResourceRequest&, InitiatedByMainFrame, NavigationType = NavigationType::Other, ShouldOpenExternalURLsPolicy = ShouldOpenExternalURLsPolicy::ShouldNotAllow, Event* = nullptr, const AtomicString& downloadAttribute = nullAtom()); >- NavigationAction(Document&, const ResourceRequest&, InitiatedByMainFrame, FrameLoadType, bool isFormSubmission, Event* = nullptr, ShouldOpenExternalURLsPolicy = ShouldOpenExternalURLsPolicy::ShouldNotAllow, const AtomicString& downloadAttribute = nullAtom()); >+ WEBCORE_EXPORT NavigationAction(Document&, const ResourceRequest&, InitiatedByMainFrame, NavigationType = NavigationType::Other, ShouldOpenExternalURLsPolicy = ShouldOpenExternalURLsPolicy::ShouldNotAllow, Event* = nullptr, const AtomString& downloadAttribute = nullAtom()); >+ NavigationAction(Document&, const ResourceRequest&, InitiatedByMainFrame, FrameLoadType, bool isFormSubmission, Event* = nullptr, ShouldOpenExternalURLsPolicy = ShouldOpenExternalURLsPolicy::ShouldNotAllow, const AtomString& downloadAttribute = nullAtom()); > > WEBCORE_EXPORT ~NavigationAction(); > >@@ -117,7 +117,7 @@ public: > void setShouldOpenExternalURLsPolicy(ShouldOpenExternalURLsPolicy policy) { m_shouldOpenExternalURLsPolicy = policy; } > InitiatedByMainFrame initiatedByMainFrame() const { return m_initiatedByMainFrame; } > >- const AtomicString& downloadAttribute() const { return m_downloadAttribute; } >+ const AtomString& downloadAttribute() const { return m_downloadAttribute; } > > bool treatAsSameOriginNavigation() const { return m_treatAsSameOriginNavigation; } > >@@ -153,7 +153,7 @@ private: > Optional<UIEventWithKeyStateData> m_keyStateEventData; > Optional<MouseEventData> m_mouseEventData; > RefPtr<UserGestureToken> m_userGestureToken { UserGestureIndicator::currentUserGesture() }; >- AtomicString m_downloadAttribute; >+ AtomString m_downloadAttribute; > bool m_treatAsSameOriginNavigation; > bool m_hasOpenedFrames { false }; > bool m_openedByDOMWithOpener { false }; >diff --git a/Source/WebCore/loader/ResourceTimingInformation.cpp b/Source/WebCore/loader/ResourceTimingInformation.cpp >index f31e3565e143ac36e6c5deaee4fdf6a57dc38c36..ac35bed76c12b887b59ef9f0f1f7ee7699b99c10 100644 >--- a/Source/WebCore/loader/ResourceTimingInformation.cpp >+++ b/Source/WebCore/loader/ResourceTimingInformation.cpp >@@ -89,7 +89,7 @@ void ResourceTimingInformation::addResourceTiming(CachedResource& resource, Docu > info.added = Added; > } > >-void ResourceTimingInformation::storeResourceTimingInitiatorInformation(const CachedResourceHandle<CachedResource>& resource, const AtomicString& initiatorName, Frame* frame) >+void ResourceTimingInformation::storeResourceTimingInitiatorInformation(const CachedResourceHandle<CachedResource>& resource, const AtomString& initiatorName, Frame* frame) > { > ASSERT(RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled()); > ASSERT(resource.get()); >diff --git a/Source/WebCore/loader/ResourceTimingInformation.h b/Source/WebCore/loader/ResourceTimingInformation.h >index 8154efad17c57f183ae96c69680c20c44993207c..6824431313b7d9a50a939abf7d3efe989fd612df 100644 >--- a/Source/WebCore/loader/ResourceTimingInformation.h >+++ b/Source/WebCore/loader/ResourceTimingInformation.h >@@ -41,12 +41,12 @@ public: > static bool shouldAddResourceTiming(CachedResource&); > > void addResourceTiming(CachedResource&, Document&, ResourceTiming&&); >- void storeResourceTimingInitiatorInformation(const CachedResourceHandle<CachedResource>&, const AtomicString&, Frame*); >+ void storeResourceTimingInitiatorInformation(const CachedResourceHandle<CachedResource>&, const AtomString&, Frame*); > > private: > enum AlreadyAdded { NotYetAdded, Added }; > struct InitiatorInfo { >- AtomicString name; >+ AtomString name; > AlreadyAdded added; > }; > HashMap<CachedResource*, InitiatorInfo> m_initiatorMap; >diff --git a/Source/WebCore/loader/SubframeLoader.cpp b/Source/WebCore/loader/SubframeLoader.cpp >index 5f98d556f55fb310d29022d9c2ff46ab5726f8cf..9622c4648367d90e46bab108ff54787f33943669 100644 >--- a/Source/WebCore/loader/SubframeLoader.cpp >+++ b/Source/WebCore/loader/SubframeLoader.cpp >@@ -73,7 +73,7 @@ void SubframeLoader::clear() > m_containsPlugins = false; > } > >-bool SubframeLoader::requestFrame(HTMLFrameOwnerElement& ownerElement, const String& urlString, const AtomicString& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList) >+bool SubframeLoader::requestFrame(HTMLFrameOwnerElement& ownerElement, const String& urlString, const AtomString& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList) > { > // Support for <frame src="javascript:string"> > URL scriptURL; >@@ -218,7 +218,7 @@ static void logPluginRequest(Page* page, const String& mimeType, const String& u > page->sawPlugin(description); > } > >-bool SubframeLoader::requestObject(HTMLPlugInImageElement& ownerElement, const String& url, const AtomicString& frameName, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues) >+bool SubframeLoader::requestObject(HTMLPlugInImageElement& ownerElement, const String& url, const AtomString& frameName, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues) > { > if (url.isEmpty() && mimeType.isEmpty()) > return false; >@@ -296,7 +296,7 @@ RefPtr<Widget> SubframeLoader::createJavaAppletWidget(const IntSize& size, HTMLA > return widget; > } > >-Frame* SubframeLoader::loadOrRedirectSubframe(HTMLFrameOwnerElement& ownerElement, const URL& requestURL, const AtomicString& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList) >+Frame* SubframeLoader::loadOrRedirectSubframe(HTMLFrameOwnerElement& ownerElement, const URL& requestURL, const AtomString& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList) > { > auto& initiatingDocument = ownerElement.document(); > >diff --git a/Source/WebCore/loader/SubframeLoader.h b/Source/WebCore/loader/SubframeLoader.h >index 2caae9ca6098a7533c3093896dc203126e689476..cc7cc4243776168c8cd1d93d7a563c701a0d0668 100644 >--- a/Source/WebCore/loader/SubframeLoader.h >+++ b/Source/WebCore/loader/SubframeLoader.h >@@ -55,8 +55,8 @@ public: > > void clear(); > >- bool requestFrame(HTMLFrameOwnerElement&, const String& url, const AtomicString& frameName, LockHistory = LockHistory::Yes, LockBackForwardList = LockBackForwardList::Yes); >- bool requestObject(HTMLPlugInImageElement&, const String& url, const AtomicString& frameName, >+ bool requestFrame(HTMLFrameOwnerElement&, const String& url, const AtomString& frameName, LockHistory = LockHistory::Yes, LockBackForwardList = LockBackForwardList::Yes); >+ bool requestObject(HTMLPlugInImageElement&, const String& url, const AtomString& frameName, > const String& serviceType, const Vector<String>& paramNames, const Vector<String>& paramValues); > > RefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement&, const Vector<String>& paramNames, const Vector<String>& paramValues); >@@ -69,7 +69,7 @@ public: > > private: > bool requestPlugin(HTMLPlugInImageElement&, const URL&, const String& serviceType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback); >- Frame* loadOrRedirectSubframe(HTMLFrameOwnerElement&, const URL&, const AtomicString& frameName, LockHistory, LockBackForwardList); >+ Frame* loadOrRedirectSubframe(HTMLFrameOwnerElement&, const URL&, const AtomString& frameName, LockHistory, LockBackForwardList); > Frame* loadSubframe(HTMLFrameOwnerElement&, const URL&, const String& name, const String& referrer); > bool loadPlugin(HTMLPlugInImageElement&, const URL&, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback); > >diff --git a/Source/WebCore/loader/ThreadableLoader.h b/Source/WebCore/loader/ThreadableLoader.h >index 861748b7c7b5b32757889c0f1a3ce0520fddcced..5c2a08e5e8684574ee94c7b7c09656a0383f3118 100644 >--- a/Source/WebCore/loader/ThreadableLoader.h >+++ b/Source/WebCore/loader/ThreadableLoader.h >@@ -33,7 +33,7 @@ > #include "ResourceLoaderOptions.h" > #include <wtf/Noncopyable.h> > #include <wtf/RefPtr.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -64,7 +64,7 @@ namespace WebCore { > ThreadableLoaderOptions isolatedCopy() const; > > ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement { ContentSecurityPolicyEnforcement::EnforceConnectSrcDirective }; >- String initiator; // This cannot be an AtomicString, as isolatedCopy() wouldn't create an object that's safe for passing to another thread. >+ String initiator; // This cannot be an AtomString, as isolatedCopy() wouldn't create an object that's safe for passing to another thread. > ResponseFilteringPolicy filteringPolicy { ResponseFilteringPolicy::Disable }; > }; > >diff --git a/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp b/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp >index 8e384693bf5df4a573f7f3fe5088a73c63b4888e..044d7c89c4385de020f2b1caebc8f9808b5ce4c6 100644 >--- a/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp >+++ b/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp >@@ -1000,13 +1000,13 @@ void ApplicationCacheGroup::scheduleReachedMaxAppCacheSizeCallback() > // The timer will delete itself once it fires. > } > >-void ApplicationCacheGroup::postListenerTask(const AtomicString& eventType, int progressTotal, int progressDone, const HashSet<DocumentLoader*>& loaderSet) >+void ApplicationCacheGroup::postListenerTask(const AtomString& eventType, int progressTotal, int progressDone, const HashSet<DocumentLoader*>& loaderSet) > { > for (auto& loader : loaderSet) > postListenerTask(eventType, progressTotal, progressDone, *loader); > } > >-void ApplicationCacheGroup::postListenerTask(const AtomicString& eventType, int progressTotal, int progressDone, DocumentLoader& loader) >+void ApplicationCacheGroup::postListenerTask(const AtomString& eventType, int progressTotal, int progressDone, DocumentLoader& loader) > { > auto* frame = loader.frame(); > if (!frame) >diff --git a/Source/WebCore/loader/appcache/ApplicationCacheGroup.h b/Source/WebCore/loader/appcache/ApplicationCacheGroup.h >index 47d8934ba9914a5a56d1146a797edeb84df2dbc5..f4f3c2da59b4540e4d16ec0d96c86bea50bb25b5 100644 >--- a/Source/WebCore/loader/appcache/ApplicationCacheGroup.h >+++ b/Source/WebCore/loader/appcache/ApplicationCacheGroup.h >@@ -94,10 +94,10 @@ public: > void disassociateDocumentLoader(DocumentLoader&); > > private: >- static void postListenerTask(const AtomicString& eventType, const HashSet<DocumentLoader*>& set) { postListenerTask(eventType, 0, 0, set); } >- static void postListenerTask(const AtomicString& eventType, DocumentLoader& loader) { postListenerTask(eventType, 0, 0, loader); } >- static void postListenerTask(const AtomicString& eventType, int progressTotal, int progressDone, const HashSet<DocumentLoader*>&); >- static void postListenerTask(const AtomicString& eventType, int progressTotal, int progressDone, DocumentLoader&); >+ static void postListenerTask(const AtomString& eventType, const HashSet<DocumentLoader*>& set) { postListenerTask(eventType, 0, 0, set); } >+ static void postListenerTask(const AtomString& eventType, DocumentLoader& loader) { postListenerTask(eventType, 0, 0, loader); } >+ static void postListenerTask(const AtomString& eventType, int progressTotal, int progressDone, const HashSet<DocumentLoader*>&); >+ static void postListenerTask(const AtomString& eventType, int progressTotal, int progressDone, DocumentLoader&); > > void scheduleReachedMaxAppCacheSizeCallback(); > >diff --git a/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp b/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp >index 91f003178abe122874354bbd91091a835d7b3adf..fcae7c66a9d51f67c32c2cce086557ae0dfd9dd6 100644 >--- a/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp >+++ b/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp >@@ -300,7 +300,7 @@ void ApplicationCacheHost::setDOMApplicationCache(DOMApplicationCache* domApplic > m_domApplicationCache = makeWeakPtr(domApplicationCache); > } > >-void ApplicationCacheHost::notifyDOMApplicationCache(const AtomicString& eventType, int total, int done) >+void ApplicationCacheHost::notifyDOMApplicationCache(const AtomString& eventType, int total, int done) > { > if (eventType != eventNames().progressEvent) > InspectorInstrumentation::updateApplicationCacheStatus(m_documentLoader.frame()); >@@ -371,14 +371,14 @@ ApplicationCacheHost::CacheInfo ApplicationCacheHost::applicationCacheInfo() > return { cache->manifestResource()->url(), 0, 0, cache->estimatedSizeInStorage() }; > } > >-static Ref<Event> createApplicationCacheEvent(const AtomicString& eventType, int total, int done) >+static Ref<Event> createApplicationCacheEvent(const AtomString& eventType, int total, int done) > { > if (eventType == eventNames().progressEvent) > return ProgressEvent::create(eventType, true, done, total); > return Event::create(eventType, Event::CanBubble::No, Event::IsCancelable::No); > } > >-void ApplicationCacheHost::dispatchDOMEvent(const AtomicString& eventType, int total, int done) >+void ApplicationCacheHost::dispatchDOMEvent(const AtomString& eventType, int total, int done) > { > if (!m_domApplicationCache || !m_domApplicationCache->frame()) > return; >diff --git a/Source/WebCore/loader/appcache/ApplicationCacheHost.h b/Source/WebCore/loader/appcache/ApplicationCacheHost.h >index 01f273598a995550bc0afdf534cd108545388f35..12cfe368c05216885189fd7bd37f90f02fcccb07 100644 >--- a/Source/WebCore/loader/appcache/ApplicationCacheHost.h >+++ b/Source/WebCore/loader/appcache/ApplicationCacheHost.h >@@ -113,7 +113,7 @@ public: > void abort(); > > void setDOMApplicationCache(DOMApplicationCache*); >- void notifyDOMApplicationCache(const AtomicString& eventType, int progressTotal, int progressDone); >+ void notifyDOMApplicationCache(const AtomString& eventType, int progressTotal, int progressDone); > > void stopLoadingInFrame(Frame&); > >@@ -129,7 +129,7 @@ private: > friend class ApplicationCacheGroup; > > struct DeferredEvent { >- AtomicString eventType; >+ AtomString eventType; > int progressTotal; > int progressDone; > }; >@@ -137,7 +137,7 @@ private: > bool isApplicationCacheEnabled(); > bool isApplicationCacheBlockedForRequest(const ResourceRequest&); > >- void dispatchDOMEvent(const AtomicString& eventType, int progressTotal, int progressDone); >+ void dispatchDOMEvent(const AtomString& eventType, int progressTotal, int progressDone); > > bool scheduleLoadFallbackResourceFromApplicationCache(ResourceLoader*, ApplicationCache* = nullptr); > void setCandidateApplicationCacheGroup(ApplicationCacheGroup*); >diff --git a/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp b/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp >index d2021575f12a4e42289ab5f19721441aae6bdd5b..da62d66cea4cf62042ad03b5a51683b8e18361c2 100644 >--- a/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp >+++ b/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp >@@ -1061,7 +1061,7 @@ static inline void parseHeader(const CharacterType* header, unsigned headerLengt > > // Save memory by putting the header names into atomic strings so each is stored only once, > // even though the setHTTPHeaderField function does not require an atomic string. >- AtomicString headerName { header, colonPosition }; >+ AtomString headerName { header, colonPosition }; > String headerValue { header + colonPosition + 1, headerLength - colonPosition - 1 }; > > response.setHTTPHeaderField(headerName, headerValue); >diff --git a/Source/WebCore/loader/cache/CachedFont.cpp b/Source/WebCore/loader/cache/CachedFont.cpp >index dc59500e57d0a59c8dee40303f2a44e846f6bd74..693dda0c724a9720b589f3b911eec50e36e56b86 100644 >--- a/Source/WebCore/loader/cache/CachedFont.cpp >+++ b/Source/WebCore/loader/cache/CachedFont.cpp >@@ -83,7 +83,7 @@ void CachedFont::beginLoadIfNeeded(CachedResourceLoader& loader) > } > } > >-bool CachedFont::ensureCustomFontData(const AtomicString&) >+bool CachedFont::ensureCustomFontData(const AtomString&) > { > return ensureCustomFontData(m_data.get()); > } >@@ -128,7 +128,7 @@ std::unique_ptr<FontCustomPlatformData> CachedFont::createCustomFontData(SharedB > return createFontCustomPlatformData(bytes, itemInCollection); > } > >-RefPtr<Font> CachedFont::createFont(const FontDescription& fontDescription, const AtomicString&, bool syntheticBold, bool syntheticItalic, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities) >+RefPtr<Font> CachedFont::createFont(const FontDescription& fontDescription, const AtomString&, bool syntheticBold, bool syntheticItalic, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities) > { > return Font::create(platformDataFromCustomData(fontDescription, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings, fontFaceCapabilities), Font::Origin::Remote); > } >diff --git a/Source/WebCore/loader/cache/CachedFont.h b/Source/WebCore/loader/cache/CachedFont.h >index fac06da1579379e341f24a8b67d80447e64c9cee..580e9be925605cb2ec3ae7e0a850cb9669bea858 100644 >--- a/Source/WebCore/loader/cache/CachedFont.h >+++ b/Source/WebCore/loader/cache/CachedFont.h >@@ -51,11 +51,11 @@ public: > void beginLoadIfNeeded(CachedResourceLoader&); > bool stillNeedsLoad() const override { return !m_loadInitiated; } > >- virtual bool ensureCustomFontData(const AtomicString& remoteURI); >+ virtual bool ensureCustomFontData(const AtomString& remoteURI); > static std::unique_ptr<FontCustomPlatformData> createCustomFontData(SharedBuffer&, const String& itemInCollection, bool& wrapping); > static FontPlatformData platformDataFromCustomData(FontCustomPlatformData&, const FontDescription&, bool bold, bool italic, const FontFeatureSettings&, const FontVariantSettings&, FontSelectionSpecifiedCapabilities); > >- virtual RefPtr<Font> createFont(const FontDescription&, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, const FontFeatureSettings&, const FontVariantSettings&, FontSelectionSpecifiedCapabilities); >+ virtual RefPtr<Font> createFont(const FontDescription&, const AtomString& remoteURI, bool syntheticBold, bool syntheticItalic, const FontFeatureSettings&, const FontVariantSettings&, FontSelectionSpecifiedCapabilities); > > protected: > FontPlatformData platformDataFromCustomData(const FontDescription&, bool bold, bool italic, const FontFeatureSettings&, const FontVariantSettings&, FontSelectionSpecifiedCapabilities); >diff --git a/Source/WebCore/loader/cache/CachedResource.h b/Source/WebCore/loader/cache/CachedResource.h >index 9bf51e0b22744aa62e775d9ee75537f31ba88204..229a142d64413cebaefac52710bb2bf8ddedf7be 100644 >--- a/Source/WebCore/loader/cache/CachedResource.h >+++ b/Source/WebCore/loader/cache/CachedResource.h >@@ -217,7 +217,7 @@ public: > void loadFrom(const CachedResource&); > > SecurityOrigin* origin() const { return m_origin.get(); } >- AtomicString initiatorName() const { return m_initiatorName; } >+ AtomString initiatorName() const { return m_initiatorName; } > > bool canDelete() const { return !hasClients() && !m_loader && !m_preloadCount && !m_handleCount && !m_resourceToRevalidate && !m_proxyResource; } > bool hasOneHandle() const { return m_handleCount == 1; } >@@ -347,7 +347,7 @@ private: > > ResourceError m_error; > RefPtr<SecurityOrigin> m_origin; >- AtomicString m_initiatorName; >+ AtomString m_initiatorName; > > RedirectChainCacheStatus m_redirectChainCacheStatus; > >diff --git a/Source/WebCore/loader/cache/CachedResourceRequest.cpp b/Source/WebCore/loader/cache/CachedResourceRequest.cpp >index 39bbca27d2047997cf916cbbad1e466466590438..526b2248181289cea95b4a3c72c9620dc0d749a0 100644 >--- a/Source/WebCore/loader/cache/CachedResourceRequest.cpp >+++ b/Source/WebCore/loader/cache/CachedResourceRequest.cpp >@@ -67,21 +67,21 @@ void CachedResourceRequest::setInitiator(Element& element) > m_initiatorElement = &element; > } > >-void CachedResourceRequest::setInitiator(const AtomicString& name) >+void CachedResourceRequest::setInitiator(const AtomString& name) > { > ASSERT(!m_initiatorElement); > ASSERT(m_initiatorName.isEmpty()); > m_initiatorName = name; > } > >-const AtomicString& CachedResourceRequest::initiatorName() const >+const AtomString& CachedResourceRequest::initiatorName() const > { > if (m_initiatorElement) > return m_initiatorElement->localName(); > if (!m_initiatorName.isEmpty()) > return m_initiatorName; > >- static NeverDestroyed<AtomicString> defaultName("other", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> defaultName("other", AtomString::ConstructFromLiteral); > return defaultName; > } > >diff --git a/Source/WebCore/loader/cache/CachedResourceRequest.h b/Source/WebCore/loader/cache/CachedResourceRequest.h >index 613f274edf79054a2e868bde26c304117c111bc5..fbe6da517e5162e276257031ec3d336a44b0baf9 100644 >--- a/Source/WebCore/loader/cache/CachedResourceRequest.h >+++ b/Source/WebCore/loader/cache/CachedResourceRequest.h >@@ -33,7 +33,7 @@ > #include "SecurityOrigin.h" > #include "ServiceWorkerIdentifier.h" > #include <wtf/RefPtr.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -63,8 +63,8 @@ public: > void setPriority(Optional<ResourceLoadPriority>&& priority) { m_priority = WTFMove(priority); } > > void setInitiator(Element&); >- void setInitiator(const AtomicString& name); >- const AtomicString& initiatorName() const; >+ void setInitiator(const AtomString& name); >+ const AtomString& initiatorName() const; > > bool allowsCaching() const { return m_options.cachingPolicy == CachingPolicy::AllowCaching; } > void setCachingPolicy(CachingPolicy policy) { m_options.cachingPolicy = policy; } >@@ -116,7 +116,7 @@ private: > ResourceLoaderOptions m_options; > Optional<ResourceLoadPriority> m_priority; > RefPtr<Element> m_initiatorElement; >- AtomicString m_initiatorName; >+ AtomString m_initiatorName; > RefPtr<SecurityOrigin> m_origin; > String m_fragmentIdentifier; > bool m_isLinkPreload { false }; >diff --git a/Source/WebCore/loader/cache/CachedResourceRequestInitiators.cpp b/Source/WebCore/loader/cache/CachedResourceRequestInitiators.cpp >index dd110c7d5f43a9395208e06113d82ef0a9da3b8b..13f5b46df93722379e8c9899b03b6a21f9df6527 100644 >--- a/Source/WebCore/loader/cache/CachedResourceRequestInitiators.cpp >+++ b/Source/WebCore/loader/cache/CachedResourceRequestInitiators.cpp >@@ -29,11 +29,11 @@ > namespace WebCore { > > CachedResourceRequestInitiators::CachedResourceRequestInitiators() >- : css("css", AtomicString::ConstructFromLiteral) >- , eventsource("eventsource", AtomicString::ConstructFromLiteral) >- , fetch("fetch", AtomicString::ConstructFromLiteral) >- , icon("icon", AtomicString::ConstructFromLiteral) >- , xmlhttprequest("xmlhttprequest", AtomicString::ConstructFromLiteral) >+ : css("css", AtomString::ConstructFromLiteral) >+ , eventsource("eventsource", AtomString::ConstructFromLiteral) >+ , fetch("fetch", AtomString::ConstructFromLiteral) >+ , icon("icon", AtomString::ConstructFromLiteral) >+ , xmlhttprequest("xmlhttprequest", AtomString::ConstructFromLiteral) > { > } > >diff --git a/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h b/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h >index 2a4008fe7fdc8d4621edf68632b70997ccee04c7..064a831fb9cd67567fec5e237264850b96924ef3 100644 >--- a/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h >+++ b/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h >@@ -26,18 +26,18 @@ > #pragma once > > #include "ThreadGlobalData.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > > struct CachedResourceRequestInitiators { > CachedResourceRequestInitiators(); > >- const AtomicString css; >- const AtomicString eventsource; >- const AtomicString fetch; >- const AtomicString icon; >- const AtomicString xmlhttprequest; >+ const AtomString css; >+ const AtomString eventsource; >+ const AtomString fetch; >+ const AtomString icon; >+ const AtomString xmlhttprequest; > WTF_MAKE_NONCOPYABLE(CachedResourceRequestInitiators); WTF_MAKE_FAST_ALLOCATED; > private: > friend class ThreadGlobalData; >diff --git a/Source/WebCore/loader/cache/CachedSVGFont.cpp b/Source/WebCore/loader/cache/CachedSVGFont.cpp >index 5ee3fc1850c01e9c82bca2e7a8963aba391dd065..e53bd110bc416cf61b1abec6ab3610102c07e794 100644 >--- a/Source/WebCore/loader/cache/CachedSVGFont.cpp >+++ b/Source/WebCore/loader/cache/CachedSVGFont.cpp >@@ -52,7 +52,7 @@ CachedSVGFont::CachedSVGFont(CachedResourceRequest&& request, const PAL::Session > { > } > >-RefPtr<Font> CachedSVGFont::createFont(const FontDescription& fontDescription, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities) >+RefPtr<Font> CachedSVGFont::createFont(const FontDescription& fontDescription, const AtomString& remoteURI, bool syntheticBold, bool syntheticItalic, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities) > { > ASSERT(firstFontFace(remoteURI)); > return CachedFont::createFont(fontDescription, remoteURI, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings, fontFaceCapabilities); >@@ -65,7 +65,7 @@ FontPlatformData CachedSVGFont::platformDataFromCustomData(const FontDescription > return CachedFont::platformDataFromCustomData(fontDescription, bold, italic, fontFaceFeatures, fontFaceVariantSettings, fontFaceCapabilities); > } > >-bool CachedSVGFont::ensureCustomFontData(const AtomicString& remoteURI) >+bool CachedSVGFont::ensureCustomFontData(const AtomString& remoteURI) > { > if (!m_externalSVGDocument && !errorOccurred() && !isLoading() && m_data) { > bool sawError = false; >@@ -114,7 +114,7 @@ SVGFontElement* CachedSVGFont::getSVGFontById(const String& fontName) const > return nullptr; > } > >-SVGFontElement* CachedSVGFont::maybeInitializeExternalSVGFontElement(const AtomicString& remoteURI) >+SVGFontElement* CachedSVGFont::maybeInitializeExternalSVGFontElement(const AtomString& remoteURI) > { > if (m_externalSVGFontElement) > return m_externalSVGFontElement; >@@ -126,7 +126,7 @@ SVGFontElement* CachedSVGFont::maybeInitializeExternalSVGFontElement(const Atomi > return m_externalSVGFontElement; > } > >-SVGFontFaceElement* CachedSVGFont::firstFontFace(const AtomicString& remoteURI) >+SVGFontFaceElement* CachedSVGFont::firstFontFace(const AtomString& remoteURI) > { > if (!maybeInitializeExternalSVGFontElement(remoteURI)) > return nullptr; >diff --git a/Source/WebCore/loader/cache/CachedSVGFont.h b/Source/WebCore/loader/cache/CachedSVGFont.h >index 0db63292a9c8345b4e76b2c36e201c160f66d181..42cf134789bf37b60ee850a7178c85250c50d111 100644 >--- a/Source/WebCore/loader/cache/CachedSVGFont.h >+++ b/Source/WebCore/loader/cache/CachedSVGFont.h >@@ -37,17 +37,17 @@ class CachedSVGFont final : public CachedFont { > public: > CachedSVGFont(CachedResourceRequest&&, const PAL::SessionID&, const CookieJar*); > >- bool ensureCustomFontData(const AtomicString& remoteURI) override; >+ bool ensureCustomFontData(const AtomString& remoteURI) override; > >- RefPtr<Font> createFont(const FontDescription&, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, const FontFeatureSettings&, const FontVariantSettings&, FontSelectionSpecifiedCapabilities) override; >+ RefPtr<Font> createFont(const FontDescription&, const AtomString& remoteURI, bool syntheticBold, bool syntheticItalic, const FontFeatureSettings&, const FontVariantSettings&, FontSelectionSpecifiedCapabilities) override; > > private: > FontPlatformData platformDataFromCustomData(const FontDescription&, bool bold, bool italic, const FontFeatureSettings&, const FontVariantSettings&, FontSelectionSpecifiedCapabilities); > > SVGFontElement* getSVGFontById(const String&) const; > >- SVGFontElement* maybeInitializeExternalSVGFontElement(const AtomicString& remoteURI); >- SVGFontFaceElement* firstFontFace(const AtomicString& remoteURI); >+ SVGFontElement* maybeInitializeExternalSVGFontElement(const AtomString& remoteURI); >+ SVGFontFaceElement* firstFontFace(const AtomString& remoteURI); > > RefPtr<SharedBuffer> m_convertedFont; > RefPtr<SVGDocument> m_externalSVGDocument; >diff --git a/Source/WebCore/mathml/MathMLAnnotationElement.cpp b/Source/WebCore/mathml/MathMLAnnotationElement.cpp >index 3ff4abbee7ecaee3d3040ba6c14683e0f3ec9f10..7e0e799b02cc367f5255cd418162efeb779ec746 100644 >--- a/Source/WebCore/mathml/MathMLAnnotationElement.cpp >+++ b/Source/WebCore/mathml/MathMLAnnotationElement.cpp >@@ -95,7 +95,7 @@ bool MathMLAnnotationElement::childShouldCreateRenderer(const Node& child) const > return false; > } > >-void MathMLAnnotationElement::attributeChanged(const QualifiedName& name, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason reason) >+void MathMLAnnotationElement::attributeChanged(const QualifiedName& name, const AtomString& oldValue, const AtomString& newValue, AttributeModificationReason reason) > { > if (name == MathMLNames::srcAttr || name == MathMLNames::encodingAttr) { > auto* parent = parentElement(); >diff --git a/Source/WebCore/mathml/MathMLAnnotationElement.h b/Source/WebCore/mathml/MathMLAnnotationElement.h >index 13a267a7e3717c61b7a1f66dce4ec81b69f8caaa..7074606a526d0c3435566d65841cd1a83f6caf08 100644 >--- a/Source/WebCore/mathml/MathMLAnnotationElement.h >+++ b/Source/WebCore/mathml/MathMLAnnotationElement.h >@@ -42,7 +42,7 @@ private: > bool isSemanticAnnotation() const final { return true; } > > bool childShouldCreateRenderer(const Node&) const final; >- void attributeChanged(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason) final; >+ void attributeChanged(const QualifiedName&, const AtomString& oldValue, const AtomString& newValue, AttributeModificationReason) final; > }; > > } >diff --git a/Source/WebCore/mathml/MathMLElement.cpp b/Source/WebCore/mathml/MathMLElement.cpp >index 95d2182726e9fcfebfcc575999d35025189a74be..ef59d63bd072677097af579926b6ca653d7edcd3 100644 >--- a/Source/WebCore/mathml/MathMLElement.cpp >+++ b/Source/WebCore/mathml/MathMLElement.cpp >@@ -74,7 +74,7 @@ unsigned MathMLElement::rowSpan() const > return std::max(1u, std::min(limitToOnlyHTMLNonNegative(rowSpanValue, 1u), maxRowspan)); > } > >-void MathMLElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void MathMLElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == hrefAttr) { > bool wasLink = isLink(); >@@ -98,7 +98,7 @@ bool MathMLElement::isPresentationAttribute(const QualifiedName& name) const > return StyledElement::isPresentationAttribute(name); > } > >-static String convertMathSizeIfNeeded(const AtomicString& value) >+static String convertMathSizeIfNeeded(const AtomString& value) > { > if (value == "small") > return "0.75em"; >@@ -117,7 +117,7 @@ static String convertMathSizeIfNeeded(const AtomicString& value) > return makeString(FormattedNumber::fixedWidth(unitlessValue * 100, 3), '%'); > } > >-void MathMLElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void MathMLElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == mathbackgroundAttr) > addPropertyToPresentationAttributeStyle(style, CSSPropertyBackgroundColor, value); >diff --git a/Source/WebCore/mathml/MathMLElement.h b/Source/WebCore/mathml/MathMLElement.h >index 0679f029e396aba0850dc687b1a31eab5b918a11..1965b1a354bb30a9a0f099728f11ea24818be990 100644 >--- a/Source/WebCore/mathml/MathMLElement.h >+++ b/Source/WebCore/mathml/MathMLElement.h >@@ -93,11 +93,11 @@ public: > protected: > MathMLElement(const QualifiedName& tagName, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > bool childShouldCreateRenderer(const Node&) const override; > > bool isPresentationAttribute(const QualifiedName&) const override; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) override; > > bool willRespondToMouseClickEvents() override; > void defaultEventHandler(Event&) override; >diff --git a/Source/WebCore/mathml/MathMLFractionElement.cpp b/Source/WebCore/mathml/MathMLFractionElement.cpp >index 5311934b1988a8a88fcff751cb0ac3cd0b95446a..bb4add4cbe92561d89bd0ab1523fe4c7c9519dcb 100644 >--- a/Source/WebCore/mathml/MathMLFractionElement.cpp >+++ b/Source/WebCore/mathml/MathMLFractionElement.cpp >@@ -103,7 +103,7 @@ MathMLFractionElement::FractionAlignment MathMLFractionElement::denominatorAlign > return cachedFractionAlignment(denomalignAttr, m_denominatorAlignment); > } > >-void MathMLFractionElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void MathMLFractionElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == linethicknessAttr) > m_lineThickness = WTF::nullopt; >diff --git a/Source/WebCore/mathml/MathMLFractionElement.h b/Source/WebCore/mathml/MathMLFractionElement.h >index e20680648cb73dca4514ac52edb72852349a82a3..d8c66a3864b6355f7a8e75147d34b38cf2105e5b 100644 >--- a/Source/WebCore/mathml/MathMLFractionElement.h >+++ b/Source/WebCore/mathml/MathMLFractionElement.h >@@ -47,7 +47,7 @@ public: > private: > MathMLFractionElement(const QualifiedName& tagName, Document&); > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > FractionAlignment cachedFractionAlignment(const QualifiedName&, Optional<FractionAlignment>&); > >diff --git a/Source/WebCore/mathml/MathMLMathElement.cpp b/Source/WebCore/mathml/MathMLMathElement.cpp >index aeb28dffe4c95cf596f6c88011177eba0e5f013d..d833b48c9a8c590b83d817efaa3534be6dc8c716 100644 >--- a/Source/WebCore/mathml/MathMLMathElement.cpp >+++ b/Source/WebCore/mathml/MathMLMathElement.cpp >@@ -69,7 +69,7 @@ Optional<bool> MathMLMathElement::specifiedDisplayStyle() > return toOptionalBool(m_displayStyle.value()); > } > >-void MathMLMathElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void MathMLMathElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > bool displayStyleAttribute = (name == displaystyleAttr || name == displayAttr); > bool mathVariantAttribute = name == mathvariantAttr; >diff --git a/Source/WebCore/mathml/MathMLMathElement.h b/Source/WebCore/mathml/MathMLMathElement.h >index d7d0a69732013b563dc934839e04d1799c3d2099..f9a0a7fe2be70fccab7d9908a5b1769a5229ef52 100644 >--- a/Source/WebCore/mathml/MathMLMathElement.h >+++ b/Source/WebCore/mathml/MathMLMathElement.h >@@ -40,7 +40,7 @@ public: > > private: > MathMLMathElement(const QualifiedName& tagName, Document&); >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void didAttachRenderers() final; > > bool acceptsDisplayStyleAttribute() final { return true; } >diff --git a/Source/WebCore/mathml/MathMLMencloseElement.cpp b/Source/WebCore/mathml/MathMLMencloseElement.cpp >index f6444f8a10873300761908c33674d50abcfd734a..cc849fe8ebf2ef52b3d1c46fc57790d32c7f19ac 100644 >--- a/Source/WebCore/mathml/MathMLMencloseElement.cpp >+++ b/Source/WebCore/mathml/MathMLMencloseElement.cpp >@@ -132,7 +132,7 @@ bool MathMLMencloseElement::hasNotation(MencloseNotationFlag notationFlag) > return m_notationFlags.value() & notationFlag; > } > >-void MathMLMencloseElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void MathMLMencloseElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == notationAttr) > m_notationFlags = WTF::nullopt; >diff --git a/Source/WebCore/mathml/MathMLMencloseElement.h b/Source/WebCore/mathml/MathMLMencloseElement.h >index 57e0de6ecee80b0417ff8018eb70fe2fb2c63ed8..a0e32a81fc0de2c6911fddcde7aa04d30c1e9d13 100644 >--- a/Source/WebCore/mathml/MathMLMencloseElement.h >+++ b/Source/WebCore/mathml/MathMLMencloseElement.h >@@ -59,7 +59,7 @@ public: > private: > MathMLMencloseElement(const QualifiedName&, Document&); > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void parseNotationAttribute(); > void clearNotations() { m_notationFlags = 0; } > void addNotation(MencloseNotationFlag notationFlag) { m_notationFlags.value() |= notationFlag; } >diff --git a/Source/WebCore/mathml/MathMLOperatorElement.cpp b/Source/WebCore/mathml/MathMLOperatorElement.cpp >index 7f00dadf487172ab08688b735ee74487a07603ee..7a7b43be509d7f9741ab268eb2b81501fa9c469c 100644 >--- a/Source/WebCore/mathml/MathMLOperatorElement.cpp >+++ b/Source/WebCore/mathml/MathMLOperatorElement.cpp >@@ -201,7 +201,7 @@ const MathMLElement::Length& MathMLOperatorElement::maxSize() > if (m_maxSize) > return m_maxSize.value(); > >- const AtomicString& value = attributeWithoutSynchronization(MathMLNames::maxsizeAttr); >+ const AtomString& value = attributeWithoutSynchronization(MathMLNames::maxsizeAttr); > if (value == "infinity") { > Length maxsize; > maxsize.type = LengthType::Infinity; >@@ -239,7 +239,7 @@ static Optional<MathMLOperatorDictionary::Flag> attributeNameToPropertyFlag(cons > return WTF::nullopt; > } > >-void MathMLOperatorElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void MathMLOperatorElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == formAttr) { > m_dictionaryProperty = WTF::nullopt; >diff --git a/Source/WebCore/mathml/MathMLOperatorElement.h b/Source/WebCore/mathml/MathMLOperatorElement.h >index e20ded871cc374c31e8672060103c7a4fb62718c..c7d8d669bfc60c3e193f54bc089d6b763822aa87 100644 >--- a/Source/WebCore/mathml/MathMLOperatorElement.h >+++ b/Source/WebCore/mathml/MathMLOperatorElement.h >@@ -56,7 +56,7 @@ private: > MathMLOperatorElement(const QualifiedName& tagName, Document&); > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; > void childrenChanged(const ChildChange&) final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > Optional<OperatorChar> m_operatorChar; > >diff --git a/Source/WebCore/mathml/MathMLPaddedElement.cpp b/Source/WebCore/mathml/MathMLPaddedElement.cpp >index 6e42866bb07dcc9ad26271b32d38a1a289fadcf3..f759459b9253495cc9756b12ab7eb9d74b34bfed 100644 >--- a/Source/WebCore/mathml/MathMLPaddedElement.cpp >+++ b/Source/WebCore/mathml/MathMLPaddedElement.cpp >@@ -73,7 +73,7 @@ const MathMLElement::Length& MathMLPaddedElement::voffset() > return cachedMathMLLength(MathMLNames::voffsetAttr, m_voffset); > } > >-void MathMLPaddedElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void MathMLPaddedElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == widthAttr) > m_width = WTF::nullopt; >diff --git a/Source/WebCore/mathml/MathMLPaddedElement.h b/Source/WebCore/mathml/MathMLPaddedElement.h >index e1c23ba48d400bbebdcdaa2b409573d44c2130f6..5972c48dbca05e4c8cbb2bfc3dcd6d492f2b4266 100644 >--- a/Source/WebCore/mathml/MathMLPaddedElement.h >+++ b/Source/WebCore/mathml/MathMLPaddedElement.h >@@ -44,7 +44,7 @@ public: > private: > MathMLPaddedElement(const QualifiedName& tagName, Document&); > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > Optional<Length> m_width; > Optional<Length> m_height; >diff --git a/Source/WebCore/mathml/MathMLPresentationElement.cpp b/Source/WebCore/mathml/MathMLPresentationElement.cpp >index 7bbbbfb6078decaf3a966bcc8957caee7dad6763..36c1daeb108736805127690ca47800a51edb59fd 100644 >--- a/Source/WebCore/mathml/MathMLPresentationElement.cpp >+++ b/Source/WebCore/mathml/MathMLPresentationElement.cpp >@@ -191,7 +191,7 @@ const MathMLElement::BooleanValue& MathMLPresentationElement::cachedBooleanAttri > return attribute.value(); > > // In MathML, attribute values are case-sensitive. >- const AtomicString& value = attributeWithoutSynchronization(name); >+ const AtomString& value = attributeWithoutSynchronization(name); > if (value == "true") > attribute = BooleanValue::True; > else if (value == "false") >@@ -331,7 +331,7 @@ Optional<bool> MathMLPresentationElement::specifiedDisplayStyle() > return toOptionalBool(specifiedDisplayStyle); > } > >-MathMLElement::MathVariant MathMLPresentationElement::parseMathVariantAttribute(const AtomicString& attributeValue) >+MathMLElement::MathVariant MathMLPresentationElement::parseMathVariantAttribute(const AtomString& attributeValue) > { > // The mathvariant attribute values is case-sensitive. > if (attributeValue == "normal") >@@ -382,7 +382,7 @@ Optional<MathMLElement::MathVariant> MathMLPresentationElement::specifiedMathVar > return m_mathVariant.value() == MathVariant::None ? WTF::nullopt : m_mathVariant; > } > >-void MathMLPresentationElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void MathMLPresentationElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > bool displayStyleAttribute = name == displaystyleAttr && acceptsDisplayStyleAttribute(); > bool mathVariantAttribute = name == mathvariantAttr && acceptsMathVariantAttribute(); >diff --git a/Source/WebCore/mathml/MathMLPresentationElement.h b/Source/WebCore/mathml/MathMLPresentationElement.h >index c538a1e8b63501f665559cb7bb44e38e4f53392e..45519cf40667d407a31a5710c7ca3ada8ad6399f 100644 >--- a/Source/WebCore/mathml/MathMLPresentationElement.h >+++ b/Source/WebCore/mathml/MathMLPresentationElement.h >@@ -40,7 +40,7 @@ public: > > protected: > MathMLPresentationElement(const QualifiedName& tagName, Document&); >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > > static bool isPhrasingContent(const Node&); > static bool isFlowContent(const Node&); >@@ -66,7 +66,7 @@ private: > > static Length parseNumberAndUnit(const StringView&); > static Length parseNamedSpace(const StringView&); >- static MathVariant parseMathVariantAttribute(const AtomicString& attributeValue); >+ static MathVariant parseMathVariantAttribute(const AtomString& attributeValue); > }; > > } >diff --git a/Source/WebCore/mathml/MathMLScriptsElement.cpp b/Source/WebCore/mathml/MathMLScriptsElement.cpp >index d22228cc5130a5e1792f3b7dc6a62be33079ec2f..d8cbb22546b7f5c1faafeb18b48fdce06b5d45cb 100644 >--- a/Source/WebCore/mathml/MathMLScriptsElement.cpp >+++ b/Source/WebCore/mathml/MathMLScriptsElement.cpp >@@ -77,7 +77,7 @@ const MathMLElement::Length& MathMLScriptsElement::superscriptShift() > return cachedMathMLLength(superscriptshiftAttr, m_superscriptShift); > } > >-void MathMLScriptsElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void MathMLScriptsElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == subscriptshiftAttr) > m_subscriptShift = WTF::nullopt; >diff --git a/Source/WebCore/mathml/MathMLScriptsElement.h b/Source/WebCore/mathml/MathMLScriptsElement.h >index e4fb5428e2ec3f7b4ee593654b1169fec9dddeaa..43dc4fc9f27152dd77c6b5efce5f45ce1fe9639b 100644 >--- a/Source/WebCore/mathml/MathMLScriptsElement.h >+++ b/Source/WebCore/mathml/MathMLScriptsElement.h >@@ -46,7 +46,7 @@ protected: > > private: > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override; >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > > const ScriptType m_scriptType; > Optional<Length> m_subscriptShift; >diff --git a/Source/WebCore/mathml/MathMLSelectElement.cpp b/Source/WebCore/mathml/MathMLSelectElement.cpp >index b4a4ae83078c965e404ab88697efc35fae673cad..80aea10d00ccf9e47ea39d84e17170cc91d6ee87 100644 >--- a/Source/WebCore/mathml/MathMLSelectElement.cpp >+++ b/Source/WebCore/mathml/MathMLSelectElement.cpp >@@ -68,17 +68,17 @@ RenderPtr<RenderElement> MathMLSelectElement::createElementRenderer(RenderStyle& > // - Other MIME Content-Types for MathML, SVG and HTML. > // > // We exclude "application/mathml+xml" which is ambiguous about whether it is Presentation or Content MathML. Authors must use a more explicit encoding value. >-bool MathMLSelectElement::isMathMLEncoding(const AtomicString& value) >+bool MathMLSelectElement::isMathMLEncoding(const AtomString& value) > { > return value == "application/mathml-presentation+xml" || value == "MathML-Presentation"; > } > >-bool MathMLSelectElement::isSVGEncoding(const AtomicString& value) >+bool MathMLSelectElement::isSVGEncoding(const AtomString& value) > { > return value == "image/svg+xml" || value == "SVG1.1"; > } > >-bool MathMLSelectElement::isHTMLEncoding(const AtomicString& value) >+bool MathMLSelectElement::isHTMLEncoding(const AtomString& value) > { > return value == "application/xhtml+xml" || value == "text/html"; > } >@@ -100,7 +100,7 @@ void MathMLSelectElement::childrenChanged(const ChildChange& change) > MathMLRowElement::childrenChanged(change); > } > >-void MathMLSelectElement::attributeChanged(const QualifiedName& name, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason reason) >+void MathMLSelectElement::attributeChanged(const QualifiedName& name, const AtomString& oldValue, const AtomString& newValue, AttributeModificationReason reason) > { > if (hasTagName(mactionTag) && (name == MathMLNames::actiontypeAttr || name == MathMLNames::selectionAttr)) > updateSelectedChild(); >@@ -240,7 +240,7 @@ void MathMLSelectElement::toggle() > > // We update the attribute value of the selection attribute. > // This will also call MathMLSelectElement::attributeChanged to update the selected child. >- setAttributeWithoutSynchronization(MathMLNames::selectionAttr, AtomicString::number(newSelectedChildIndex)); >+ setAttributeWithoutSynchronization(MathMLNames::selectionAttr, AtomString::number(newSelectedChildIndex)); > } > > } >diff --git a/Source/WebCore/mathml/MathMLSelectElement.h b/Source/WebCore/mathml/MathMLSelectElement.h >index f7a0d21e38fa6a47811911b09b74a1a1c306d756..07c488ec42a041c431b15e283e5e70116aa6e76b 100644 >--- a/Source/WebCore/mathml/MathMLSelectElement.h >+++ b/Source/WebCore/mathml/MathMLSelectElement.h >@@ -35,9 +35,9 @@ class MathMLSelectElement final : public MathMLRowElement { > WTF_MAKE_ISO_ALLOCATED(MathMLSelectElement); > public: > static Ref<MathMLSelectElement> create(const QualifiedName& tagName, Document&); >- static bool isMathMLEncoding(const AtomicString& value); >- static bool isSVGEncoding(const AtomicString& value); >- static bool isHTMLEncoding(const AtomicString& value); >+ static bool isMathMLEncoding(const AtomString& value); >+ static bool isSVGEncoding(const AtomString& value); >+ static bool isHTMLEncoding(const AtomString& value); > > private: > MathMLSelectElement(const QualifiedName& tagName, Document&); >@@ -47,7 +47,7 @@ private: > > void finishParsingChildren() final; > void childrenChanged(const ChildChange&) final; >- void attributeChanged(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason = ModifiedDirectly) final; >+ void attributeChanged(const QualifiedName&, const AtomString& oldValue, const AtomString& newValue, AttributeModificationReason = ModifiedDirectly) final; > void defaultEventHandler(Event&) final; > bool willRespondToMouseClickEvents() final; > >diff --git a/Source/WebCore/mathml/MathMLSpaceElement.cpp b/Source/WebCore/mathml/MathMLSpaceElement.cpp >index 4ab1a0556db8fe4523abf58ae3aec0ba2462b65a..ccd788615e338edb75ae4c34b18fa105c845a868 100644 >--- a/Source/WebCore/mathml/MathMLSpaceElement.cpp >+++ b/Source/WebCore/mathml/MathMLSpaceElement.cpp >@@ -63,7 +63,7 @@ const MathMLElement::Length& MathMLSpaceElement::depth() > return cachedMathMLLength(MathMLNames::depthAttr, m_depth); > } > >-void MathMLSpaceElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void MathMLSpaceElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == widthAttr) > m_width = WTF::nullopt; >diff --git a/Source/WebCore/mathml/MathMLSpaceElement.h b/Source/WebCore/mathml/MathMLSpaceElement.h >index 8a85acb4baf392b74fd1af962fbbd4ec86af3f1d..c12808d491ea0e664b3a92a432c9237d77b85ddd 100644 >--- a/Source/WebCore/mathml/MathMLSpaceElement.h >+++ b/Source/WebCore/mathml/MathMLSpaceElement.h >@@ -41,7 +41,7 @@ public: > private: > MathMLSpaceElement(const QualifiedName& tagName, Document&); > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > bool acceptsDisplayStyleAttribute() final { return false; } > >diff --git a/Source/WebCore/mathml/MathMLUnderOverElement.cpp b/Source/WebCore/mathml/MathMLUnderOverElement.cpp >index 0c1dfeab957a9968e3ebbe3d967ff90f0654608f..539fbd85cf86aaf723eeefb073c7fe0d9a0fe278 100644 >--- a/Source/WebCore/mathml/MathMLUnderOverElement.cpp >+++ b/Source/WebCore/mathml/MathMLUnderOverElement.cpp >@@ -58,7 +58,7 @@ const MathMLElement::BooleanValue& MathMLUnderOverElement::accentUnder() > return cachedBooleanAttribute(accentunderAttr, m_accentUnder); > } > >-void MathMLUnderOverElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void MathMLUnderOverElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == accentAttr) > m_accent = WTF::nullopt; >diff --git a/Source/WebCore/mathml/MathMLUnderOverElement.h b/Source/WebCore/mathml/MathMLUnderOverElement.h >index bd64fa4c9581559207dee07c49987f46c7dfc54b..f63402f0d762f4a086c32495895cd44c73a72c23 100644 >--- a/Source/WebCore/mathml/MathMLUnderOverElement.h >+++ b/Source/WebCore/mathml/MathMLUnderOverElement.h >@@ -41,7 +41,7 @@ public: > private: > MathMLUnderOverElement(const QualifiedName& tagName, Document&); > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > Optional<BooleanValue> m_accent; > Optional<BooleanValue> m_accentUnder; >diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp >index cfcbb1d821ace8cebfbb3e28f3af51f4fcc7d516..29476b00b7e5cacd29f8a4517c2d5287bcbf39b0 100644 >--- a/Source/WebCore/page/DOMWindow.cpp >+++ b/Source/WebCore/page/DOMWindow.cpp >@@ -1810,7 +1810,7 @@ bool DOMWindow::isSameSecurityOriginAsMainFrame() const > return false; > } > >-bool DOMWindow::addEventListener(const AtomicString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) >+bool DOMWindow::addEventListener(const AtomString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) > { > if (!EventTarget::addEventListener(eventType, WTFMove(listener), options)) > return false; >@@ -2031,7 +2031,7 @@ void DOMWindow::resetAllGeolocationPermission() > #endif > } > >-bool DOMWindow::removeEventListener(const AtomicString& eventType, EventListener& listener, const ListenerOptions& options) >+bool DOMWindow::removeEventListener(const AtomString& eventType, EventListener& listener, const ListenerOptions& options) > { > if (!EventTarget::removeEventListener(eventType, listener, options.capture)) > return false; >@@ -2313,7 +2313,7 @@ bool DOMWindow::isInsecureScriptAccess(DOMWindow& activeWindow, const String& ur > return true; > } > >-ExceptionOr<RefPtr<Frame>> DOMWindow::createWindow(const String& urlString, const AtomicString& frameName, const WindowFeatures& windowFeatures, DOMWindow& activeWindow, Frame& firstFrame, Frame& openerFrame, const WTF::Function<void(DOMWindow&)>& prepareDialogFunction) >+ExceptionOr<RefPtr<Frame>> DOMWindow::createWindow(const String& urlString, const AtomString& frameName, const WindowFeatures& windowFeatures, DOMWindow& activeWindow, Frame& firstFrame, Frame& openerFrame, const WTF::Function<void(DOMWindow&)>& prepareDialogFunction) > { > Frame* activeFrame = activeWindow.frame(); > if (!activeFrame) >@@ -2372,7 +2372,7 @@ ExceptionOr<RefPtr<Frame>> DOMWindow::createWindow(const String& urlString, cons > return noopener ? RefPtr<Frame> { nullptr } : newFrame; > } > >-ExceptionOr<RefPtr<WindowProxy>> DOMWindow::open(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& urlString, const AtomicString& frameName, const String& windowFeaturesString) >+ExceptionOr<RefPtr<WindowProxy>> DOMWindow::open(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& urlString, const AtomString& frameName, const String& windowFeaturesString) > { > if (!isCurrentlyDisplayedInFrame()) > return RefPtr<WindowProxy> { nullptr }; >diff --git a/Source/WebCore/page/DOMWindow.h b/Source/WebCore/page/DOMWindow.h >index fac795476e6e9a55e8c78dbd8574ddac5e5c2071..6e562a901d00d5f69ac07f3313aeb9261d9cc4dd 100644 >--- a/Source/WebCore/page/DOMWindow.h >+++ b/Source/WebCore/page/DOMWindow.h >@@ -177,7 +177,7 @@ public: > void print(); > void stop(); > >- WEBCORE_EXPORT ExceptionOr<RefPtr<WindowProxy>> open(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& urlString, const AtomicString& frameName, const String& windowFeaturesString); >+ WEBCORE_EXPORT ExceptionOr<RefPtr<WindowProxy>> open(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& urlString, const AtomString& frameName, const String& windowFeaturesString); > > void showModalDialog(const String& urlString, const String& dialogFeaturesString, DOMWindow& activeWindow, DOMWindow& firstWindow, const WTF::Function<void(DOMWindow&)>& prepareDialogFunction); > >@@ -282,8 +282,8 @@ public: > > // Events > // EventTarget API >- bool addEventListener(const AtomicString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) final; >- bool removeEventListener(const AtomicString& eventType, EventListener&, const ListenerOptions&) final; >+ bool addEventListener(const AtomString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) final; >+ bool removeEventListener(const AtomString& eventType, EventListener&, const ListenerOptions&) final; > void removeAllEventListeners() final; > > using EventTarget::dispatchEvent; >@@ -377,7 +377,7 @@ private: > Page* page(); > bool allowedToChangeWindowGeometry() const; > >- static ExceptionOr<RefPtr<Frame>> createWindow(const String& urlString, const AtomicString& frameName, const WindowFeatures&, DOMWindow& activeWindow, Frame& firstFrame, Frame& openerFrame, const WTF::Function<void(DOMWindow&)>& prepareDialogFunction = nullptr); >+ static ExceptionOr<RefPtr<Frame>> createWindow(const String& urlString, const AtomString& frameName, const WindowFeatures&, DOMWindow& activeWindow, Frame& firstFrame, Frame& openerFrame, const WTF::Function<void(DOMWindow&)>& prepareDialogFunction = nullptr); > bool isInsecureScriptAccess(DOMWindow& activeWindow, const String& urlString); > > #if ENABLE(DEVICE_ORIENTATION) >diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp >index a1f85110a0e81d0fa4a8538dfea35f0ed832f75e..a30c9e9437e75a0b25ee7d8530855b25a54a08be 100644 >--- a/Source/WebCore/page/EventHandler.cpp >+++ b/Source/WebCore/page/EventHandler.cpp >@@ -2248,7 +2248,7 @@ bool EventHandler::handlePasteGlobalSelection(const PlatformMouseEvent& platform > > #if ENABLE(DRAG_SUPPORT) > >-bool EventHandler::dispatchDragEvent(const AtomicString& eventType, Element& dragTarget, const PlatformMouseEvent& event, DataTransfer& dataTransfer) >+bool EventHandler::dispatchDragEvent(const AtomString& eventType, Element& dragTarget, const PlatformMouseEvent& event, DataTransfer& dataTransfer) > { > Ref<Frame> protectedFrame(m_frame); > FrameView* view = m_frame.view(); >@@ -2343,7 +2343,7 @@ static bool findDropZone(Node& target, DataTransfer& dataTransfer) > return false; > } > >-EventHandler::DragTargetResponse EventHandler::dispatchDragEnterOrDragOverEvent(const AtomicString& eventType, Element& target, const PlatformMouseEvent& event, >+EventHandler::DragTargetResponse EventHandler::dispatchDragEnterOrDragOverEvent(const AtomString& eventType, Element& target, const PlatformMouseEvent& event, > std::unique_ptr<Pasteboard>&& pasteboard, DragOperation sourceOperation, bool draggingFiles) > { > auto dataTransfer = DataTransfer::createForUpdatingDropTarget(target.document(), WTFMove(pasteboard), sourceOperation, draggingFiles); >@@ -2489,7 +2489,7 @@ MouseEventWithHitTestResults EventHandler::prepareMouseEvent(const HitTestReques > return m_frame.document()->prepareMouseEvent(request, documentPointForWindowPoint(m_frame, mouseEvent.position()), mouseEvent); > } > >-static bool hierarchyHasCapturingEventListeners(Element* element, const AtomicString& pointerEventName, const AtomicString& compatibilityMouseEventName) >+static bool hierarchyHasCapturingEventListeners(Element* element, const AtomString& pointerEventName, const AtomString& compatibilityMouseEventName) > { > for (ContainerNode* curr = element; curr; curr = curr->parentInComposedTree()) { > if (curr->hasCapturingEventListeners(pointerEventName) || curr->hasCapturingEventListeners(compatibilityMouseEventName)) >@@ -2603,7 +2603,7 @@ void EventHandler::updateMouseEventTargetNode(Node* targetNode, const PlatformMo > } > } > >-bool EventHandler::dispatchMouseEvent(const AtomicString& eventType, Node* targetNode, bool /*cancelable*/, int clickCount, const PlatformMouseEvent& platformMouseEvent, bool setUnder) >+bool EventHandler::dispatchMouseEvent(const AtomString& eventType, Node* targetNode, bool /*cancelable*/, int clickCount, const PlatformMouseEvent& platformMouseEvent, bool setUnder) > { > Ref<Frame> protectedFrame(m_frame); > >@@ -3355,12 +3355,12 @@ bool EventHandler::internalKeyEvent(const PlatformKeyboardEvent& initialKeyEvent > return keydownResult || keypress->defaultPrevented() || keypress->defaultHandled(); > } > >-static FocusDirection focusDirectionForKey(const AtomicString& keyIdentifier) >+static FocusDirection focusDirectionForKey(const AtomString& keyIdentifier) > { >- static NeverDestroyed<AtomicString> Down("Down", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> Up("Up", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> Left("Left", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> Right("Right", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> Down("Down", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> Up("Up", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> Left("Left", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> Right("Right", AtomString::ConstructFromLiteral); > > FocusDirection retVal = FocusDirectionNone; > >@@ -3637,7 +3637,7 @@ void EventHandler::updateDragStateAfterEditDragIfNeeded(Element& rootEditableEle > dragState().source = &rootEditableElement; > } > >-void EventHandler::dispatchDragSrcEvent(const AtomicString& eventType, const PlatformMouseEvent& event) >+void EventHandler::dispatchDragSrcEvent(const AtomString& eventType, const PlatformMouseEvent& event) > { > ASSERT(dragState().dataTransfer); > dispatchDragEvent(eventType, *dragState().source, event, *dragState().dataTransfer); >@@ -4026,7 +4026,7 @@ void EventHandler::updateLastScrollbarUnderMouse(Scrollbar* scrollbar, SetOrClea > } > > #if ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS) >-static const AtomicString& eventNameForTouchPointState(PlatformTouchPoint::State state) >+static const AtomString& eventNameForTouchPointState(PlatformTouchPoint::State state) > { > switch (state) { > case PlatformTouchPoint::TouchReleased: >@@ -4240,7 +4240,7 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) > // When sending a touch cancel event, use empty touches and targetTouches lists. > bool isTouchCancelEvent = (state == PlatformTouchPoint::TouchCancelled); > RefPtr<TouchList>& effectiveTouches(isTouchCancelEvent ? emptyList : touches); >- const AtomicString& stateName(eventNameForTouchPointState(static_cast<PlatformTouchPoint::State>(state))); >+ const AtomString& stateName(eventNameForTouchPointState(static_cast<PlatformTouchPoint::State>(state))); > > for (auto& target : changedTouches[state].m_targets) { > ASSERT(is<Node>(target)); >diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h >index 2bd3deb72c20fb2dbf4d9d191460a12a1c584f1a..34149e11cbe5d26a42eb50ae805652d7f115b66c 100644 >--- a/Source/WebCore/page/EventHandler.h >+++ b/Source/WebCore/page/EventHandler.h >@@ -226,16 +226,16 @@ public: > #endif > > #if ENABLE(IOS_TOUCH_EVENTS) >- bool dispatchTouchEvent(const PlatformTouchEvent&, const AtomicString&, const EventTargetTouchMap&, float, float); >+ bool dispatchTouchEvent(const PlatformTouchEvent&, const AtomString&, const EventTargetTouchMap&, float, float); > bool dispatchSimulatedTouchEvent(IntPoint location); > Frame* touchEventTargetSubframe() const { return m_touchEventTargetSubframe.get(); } > const TouchArray& touches() const { return m_touches; } > #endif > > #if ENABLE(IOS_GESTURE_EVENTS) >- bool dispatchGestureEvent(const PlatformTouchEvent&, const AtomicString&, const EventTargetSet&, float, float); >+ bool dispatchGestureEvent(const PlatformTouchEvent&, const AtomString&, const EventTargetSet&, float, float); > #elif ENABLE(MAC_GESTURE_EVENTS) >- bool dispatchGestureEvent(const PlatformGestureEvent&, const AtomicString&, const EventTargetSet&, float, float); >+ bool dispatchGestureEvent(const PlatformGestureEvent&, const AtomString&, const EventTargetSet&, float, float); > WEBCORE_EXPORT bool handleGestureEvent(const PlatformGestureEvent&); > #endif > >@@ -412,11 +412,11 @@ private: > > MouseEventWithHitTestResults prepareMouseEvent(const HitTestRequest&, const PlatformMouseEvent&); > >- bool dispatchMouseEvent(const AtomicString& eventType, Node* target, bool cancelable, int clickCount, const PlatformMouseEvent&, bool setUnder); >+ bool dispatchMouseEvent(const AtomString& eventType, Node* target, bool cancelable, int clickCount, const PlatformMouseEvent&, bool setUnder); > > #if ENABLE(DRAG_SUPPORT) >- bool dispatchDragEvent(const AtomicString& eventType, Element& target, const PlatformMouseEvent&, DataTransfer&); >- DragTargetResponse dispatchDragEnterOrDragOverEvent(const AtomicString& eventType, Element& target, const PlatformMouseEvent&, std::unique_ptr<Pasteboard>&& , DragOperation, bool draggingFiles); >+ bool dispatchDragEvent(const AtomString& eventType, Element& target, const PlatformMouseEvent&, DataTransfer&); >+ DragTargetResponse dispatchDragEnterOrDragOverEvent(const AtomString& eventType, Element& target, const PlatformMouseEvent&, std::unique_ptr<Pasteboard>&& , DragOperation, bool draggingFiles); > void invalidateDataTransfer(); > > bool handleDrag(const MouseEventWithHitTestResults&, CheckDragHysteresis); >@@ -427,7 +427,7 @@ private: > #if ENABLE(DRAG_SUPPORT) > void clearDragState(); > >- void dispatchDragSrcEvent(const AtomicString& eventType, const PlatformMouseEvent&); >+ void dispatchDragSrcEvent(const AtomString& eventType, const PlatformMouseEvent&); > bool dispatchDragStartEventOnSourceElement(DataTransfer&); > > bool dragHysteresisExceeded(const FloatPoint&) const; >diff --git a/Source/WebCore/page/EventSource.h b/Source/WebCore/page/EventSource.h >index dd67cc3731361eff610d2a51b36b80998ea89f0e..9413b6ab334ec96d8d8843db13f38f71c6658d4c 100644 >--- a/Source/WebCore/page/EventSource.h >+++ b/Source/WebCore/page/EventSource.h >@@ -112,7 +112,7 @@ private: > bool m_discardTrailingNewline { false }; > bool m_requestInFlight { false }; > >- AtomicString m_eventName; >+ AtomString m_eventName; > Vector<UChar> m_data; > String m_currentlyParsedEventId; > String m_lastEventId; >diff --git a/Source/WebCore/page/FrameTree.cpp b/Source/WebCore/page/FrameTree.cpp >index 24511da24b0da9e52b55781825fba5775a82021a..f875ff36b29cf1bbf86633c5f8f357b84bf86f80 100644 >--- a/Source/WebCore/page/FrameTree.cpp >+++ b/Source/WebCore/page/FrameTree.cpp >@@ -42,7 +42,7 @@ FrameTree::~FrameTree() > child->setView(nullptr); > } > >-void FrameTree::setName(const AtomicString& name) >+void FrameTree::setName(const AtomString& name) > { > m_name = name; > if (!parent()) { >@@ -94,7 +94,7 @@ void FrameTree::removeChild(Frame& child) > m_scopedChildCount = invalidCount; > } > >-AtomicString FrameTree::uniqueChildName(const AtomicString& requestedName) const >+AtomString FrameTree::uniqueChildName(const AtomString& requestedName) const > { > // If the requested name (the frame's "name" attribute) is unique, just use that. > if (!requestedName.isEmpty() && !child(requestedName) && !equalIgnoringASCIICase(requestedName, "_blank")) >@@ -105,7 +105,7 @@ AtomicString FrameTree::uniqueChildName(const AtomicString& requestedName) const > return generateUniqueName(); > } > >-AtomicString FrameTree::generateUniqueName() const >+AtomString FrameTree::generateUniqueName() const > { > auto& top = this->top(); > if (&top.tree() != this) >@@ -142,7 +142,7 @@ inline Frame* FrameTree::scopedChild(unsigned index, TreeScope* scope) const > return nullptr; > } > >-inline Frame* FrameTree::scopedChild(const AtomicString& name, TreeScope* scope) const >+inline Frame* FrameTree::scopedChild(const AtomString& name, TreeScope* scope) const > { > if (!scope) > return nullptr; >@@ -173,7 +173,7 @@ Frame* FrameTree::scopedChild(unsigned index) const > return scopedChild(index, m_thisFrame.document()); > } > >-Frame* FrameTree::scopedChild(const AtomicString& name) const >+Frame* FrameTree::scopedChild(const AtomString& name) const > { > return scopedChild(name, m_thisFrame.document()); > } >@@ -201,7 +201,7 @@ Frame* FrameTree::child(unsigned index) const > return result; > } > >-Frame* FrameTree::child(const AtomicString& name) const >+Frame* FrameTree::child(const AtomString& name) const > { > for (Frame* child = firstChild(); child; child = child->tree().nextSibling()) > if (child->tree().uniqueName() == name) >@@ -221,7 +221,7 @@ static bool isFrameFamiliarWith(Frame& frameA, Frame& frameB) > return (frameAOpener && frameAOpener->page() == frameB.page()) || (frameBOpener && frameBOpener->page() == frameA.page()) || (frameAOpener && frameBOpener && frameAOpener->page() == frameBOpener->page()); > } > >-Frame* FrameTree::find(const AtomicString& name, Frame& activeFrame) const >+Frame* FrameTree::find(const AtomString& name, Frame& activeFrame) const > { > // FIXME: _current is not part of the HTML specification. > if (equalIgnoringASCIICase(name, "_self") || name == "_current" || name.isEmpty()) >diff --git a/Source/WebCore/page/FrameTree.h b/Source/WebCore/page/FrameTree.h >index 97c8f2b7a46ef1cd1d00170bd2758196c3bed7d4..7afb5ca1ef7d9492855cd99ced936465ca0614a8 100644 >--- a/Source/WebCore/page/FrameTree.h >+++ b/Source/WebCore/page/FrameTree.h >@@ -19,7 +19,7 @@ > > #pragma once > >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -45,9 +45,9 @@ public: > > ~FrameTree(); > >- const AtomicString& name() const { return m_name; } >- const AtomicString& uniqueName() const { return m_uniqueName; } >- WEBCORE_EXPORT void setName(const AtomicString&); >+ const AtomString& name() const { return m_name; } >+ const AtomString& uniqueName() const { return m_uniqueName; } >+ WEBCORE_EXPORT void setName(const AtomString&); > WEBCORE_EXPORT void clearName(); > WEBCORE_EXPORT Frame* parent() const; > >@@ -74,13 +74,13 @@ public: > void removeChild(Frame&); > > Frame* child(unsigned index) const; >- Frame* child(const AtomicString& name) const; >- WEBCORE_EXPORT Frame* find(const AtomicString& name, Frame& activeFrame) const; >+ Frame* child(const AtomString& name) const; >+ WEBCORE_EXPORT Frame* find(const AtomString& name, Frame& activeFrame) const; > WEBCORE_EXPORT unsigned childCount() const; > WEBCORE_EXPORT Frame& top() const; > > WEBCORE_EXPORT Frame* scopedChild(unsigned index) const; >- WEBCORE_EXPORT Frame* scopedChild(const AtomicString& name) const; >+ WEBCORE_EXPORT Frame* scopedChild(const AtomString& name) const; > unsigned scopedChildCount() const; > > void resetFrameIdentifiers() { m_frameIDGenerator = 0; } >@@ -91,17 +91,17 @@ private: > > bool scopedBy(TreeScope*) const; > Frame* scopedChild(unsigned index, TreeScope*) const; >- Frame* scopedChild(const AtomicString& name, TreeScope*) const; >+ Frame* scopedChild(const AtomString& name, TreeScope*) const; > unsigned scopedChildCount(TreeScope*) const; > >- AtomicString uniqueChildName(const AtomicString& requestedName) const; >- AtomicString generateUniqueName() const; >+ AtomString uniqueChildName(const AtomString& requestedName) const; >+ AtomString generateUniqueName() const; > > Frame& m_thisFrame; > > Frame* m_parent; >- AtomicString m_name; // The actual frame name (may be empty). >- AtomicString m_uniqueName; >+ AtomString m_name; // The actual frame name (may be empty). >+ AtomString m_uniqueName; > > RefPtr<Frame> m_nextSibling; > Frame* m_previousSibling; >diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp >index dea5ea2ffe6dcde034a528ff05c66955b58583ed..90e4c935dcd0bcde2fc4c57fe222cc721f51d3c2 100644 >--- a/Source/WebCore/page/Page.cpp >+++ b/Source/WebCore/page/Page.cpp >@@ -2949,7 +2949,7 @@ void Page::removeLatchingStateForTarget(Element& targetNode) > } > #endif // PLATFORM(MAC) > >-static void dispatchPrintEvent(Frame& mainFrame, const AtomicString& eventType) >+static void dispatchPrintEvent(Frame& mainFrame, const AtomString& eventType) > { > Vector<Ref<Frame>> frames; > for (auto* frame = &mainFrame; frame; frame = frame->tree().traverseNext()) >diff --git a/Source/WebCore/page/PerformanceResourceTiming.h b/Source/WebCore/page/PerformanceResourceTiming.h >index bbb3f349b6d7bb7da27772d59428324ce393d9b8..8b321f1b1ee112e09a16988194d7a8322532db62 100644 >--- a/Source/WebCore/page/PerformanceResourceTiming.h >+++ b/Source/WebCore/page/PerformanceResourceTiming.h >@@ -46,7 +46,7 @@ class PerformanceResourceTiming final : public PerformanceEntry { > public: > static Ref<PerformanceResourceTiming> create(MonotonicTime timeOrigin, ResourceTiming&&); > >- AtomicString initiatorType() const { return m_initiatorType; } >+ AtomString initiatorType() const { return m_initiatorType; } > String nextHopProtocol() const; > > double workerStart() const; >@@ -69,7 +69,7 @@ private: > > double networkLoadTimeToDOMHighResTimeStamp(Seconds) const; > >- AtomicString m_initiatorType; >+ AtomString m_initiatorType; > MonotonicTime m_timeOrigin; > LoadTiming m_loadTiming; > NetworkLoadMetrics m_networkLoadMetrics; >diff --git a/Source/WebCore/page/PointerLockController.cpp b/Source/WebCore/page/PointerLockController.cpp >index 764a79cb495fc10c159f94322acfb396e2ac8853..a3913a4d5dc28d197318a8e50a10297a6e07c77c 100644 >--- a/Source/WebCore/page/PointerLockController.cpp >+++ b/Source/WebCore/page/PointerLockController.cpp >@@ -182,7 +182,7 @@ void PointerLockController::didLosePointerLock() > } > } > >-void PointerLockController::dispatchLockedMouseEvent(const PlatformMouseEvent& event, const AtomicString& eventType) >+void PointerLockController::dispatchLockedMouseEvent(const PlatformMouseEvent& event, const AtomString& eventType) > { > if (!m_element || !m_element->document().frame()) > return; >@@ -208,13 +208,13 @@ void PointerLockController::clearElement() > m_element = nullptr; > } > >-void PointerLockController::enqueueEvent(const AtomicString& type, Element* element) >+void PointerLockController::enqueueEvent(const AtomString& type, Element* element) > { > if (element) > enqueueEvent(type, &element->document()); > } > >-void PointerLockController::enqueueEvent(const AtomicString& type, Document* document) >+void PointerLockController::enqueueEvent(const AtomString& type, Document* document) > { > if (document) > document->enqueueDocumentEvent(Event::create(type, Event::CanBubble::Yes, Event::IsCancelable::No)); >diff --git a/Source/WebCore/page/PointerLockController.h b/Source/WebCore/page/PointerLockController.h >index 5077465fb5456dfbf286a00313429e891a87febb..fd1bc5a36a9998197163d08320718280431b8d5c 100644 >--- a/Source/WebCore/page/PointerLockController.h >+++ b/Source/WebCore/page/PointerLockController.h >@@ -28,7 +28,7 @@ > > #include <wtf/RefPtr.h> > #include <wtf/WeakPtr.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -57,13 +57,13 @@ public: > WEBCORE_EXPORT void didAcquirePointerLock(); > WEBCORE_EXPORT void didNotAcquirePointerLock(); > WEBCORE_EXPORT void didLosePointerLock(); >- void dispatchLockedMouseEvent(const PlatformMouseEvent&, const AtomicString& eventType); >+ void dispatchLockedMouseEvent(const PlatformMouseEvent&, const AtomString& eventType); > void dispatchLockedWheelEvent(const PlatformWheelEvent&); > > private: > void clearElement(); >- void enqueueEvent(const AtomicString& type, Element*); >- void enqueueEvent(const AtomicString& type, Document*); >+ void enqueueEvent(const AtomString& type, Element*); >+ void enqueueEvent(const AtomString& type, Document*); > Page& m_page; > bool m_lockPending { false }; > bool m_unlockPending { false }; >diff --git a/Source/WebCore/page/ProcessWarming.cpp b/Source/WebCore/page/ProcessWarming.cpp >index b3d6a95a0c32fa9e1c4c22504f3014956ce33297..a158990a92263a29cb68cb5a49da9087d14293a5 100644 >--- a/Source/WebCore/page/ProcessWarming.cpp >+++ b/Source/WebCore/page/ProcessWarming.cpp >@@ -47,7 +47,7 @@ namespace WebCore { > > void ProcessWarming::initializeNames() > { >- AtomicString::init(); >+ AtomString::init(); > HTMLNames::init(); > QualifiedName::init(); > MediaFeatureNames::init(); >diff --git a/Source/WebCore/page/SettingsBase.cpp b/Source/WebCore/page/SettingsBase.cpp >index a3533e910eb3583057c2129f8a9c3ed2559122cb..57be09cd1c09b88880dd2cc5a7f12345afec3107 100644 >--- a/Source/WebCore/page/SettingsBase.cpp >+++ b/Source/WebCore/page/SettingsBase.cpp >@@ -73,9 +73,9 @@ SettingsBase::SettingsBase(Page* page) > , m_minimumDOMTimerInterval(DOMTimer::defaultMinimumInterval()) > , m_setImageLoadingSettingsTimer(*this, &SettingsBase::imageLoadingSettingsTimerFired) > { >- // A Frame may not have been created yet, so we initialize the AtomicString >+ // A Frame may not have been created yet, so we initialize the AtomString > // hash before trying to use it. >- AtomicString::init(); >+ AtomString::init(); > initializeDefaultFontFamilies(); > m_page = page; // Page is not yet fully initialized when constructing Settings, so keeping m_page null over initializeDefaultFontFamilies() call. > } >@@ -137,84 +137,84 @@ bool SettingsBase::platformDefaultMediaSourceEnabled() > } > #endif > >-const AtomicString& SettingsBase::standardFontFamily(UScriptCode script) const >+const AtomString& SettingsBase::standardFontFamily(UScriptCode script) const > { > return m_fontGenericFamilies->standardFontFamily(script); > } > >-void SettingsBase::setStandardFontFamily(const AtomicString& family, UScriptCode script) >+void SettingsBase::setStandardFontFamily(const AtomString& family, UScriptCode script) > { > bool changes = m_fontGenericFamilies->setStandardFontFamily(family, script); > if (changes) > invalidateAfterGenericFamilyChange(m_page); > } > >-const AtomicString& SettingsBase::fixedFontFamily(UScriptCode script) const >+const AtomString& SettingsBase::fixedFontFamily(UScriptCode script) const > { > return m_fontGenericFamilies->fixedFontFamily(script); > } > >-void SettingsBase::setFixedFontFamily(const AtomicString& family, UScriptCode script) >+void SettingsBase::setFixedFontFamily(const AtomString& family, UScriptCode script) > { > bool changes = m_fontGenericFamilies->setFixedFontFamily(family, script); > if (changes) > invalidateAfterGenericFamilyChange(m_page); > } > >-const AtomicString& SettingsBase::serifFontFamily(UScriptCode script) const >+const AtomString& SettingsBase::serifFontFamily(UScriptCode script) const > { > return m_fontGenericFamilies->serifFontFamily(script); > } > >-void SettingsBase::setSerifFontFamily(const AtomicString& family, UScriptCode script) >+void SettingsBase::setSerifFontFamily(const AtomString& family, UScriptCode script) > { > bool changes = m_fontGenericFamilies->setSerifFontFamily(family, script); > if (changes) > invalidateAfterGenericFamilyChange(m_page); > } > >-const AtomicString& SettingsBase::sansSerifFontFamily(UScriptCode script) const >+const AtomString& SettingsBase::sansSerifFontFamily(UScriptCode script) const > { > return m_fontGenericFamilies->sansSerifFontFamily(script); > } > >-void SettingsBase::setSansSerifFontFamily(const AtomicString& family, UScriptCode script) >+void SettingsBase::setSansSerifFontFamily(const AtomString& family, UScriptCode script) > { > bool changes = m_fontGenericFamilies->setSansSerifFontFamily(family, script); > if (changes) > invalidateAfterGenericFamilyChange(m_page); > } > >-const AtomicString& SettingsBase::cursiveFontFamily(UScriptCode script) const >+const AtomString& SettingsBase::cursiveFontFamily(UScriptCode script) const > { > return m_fontGenericFamilies->cursiveFontFamily(script); > } > >-void SettingsBase::setCursiveFontFamily(const AtomicString& family, UScriptCode script) >+void SettingsBase::setCursiveFontFamily(const AtomString& family, UScriptCode script) > { > bool changes = m_fontGenericFamilies->setCursiveFontFamily(family, script); > if (changes) > invalidateAfterGenericFamilyChange(m_page); > } > >-const AtomicString& SettingsBase::fantasyFontFamily(UScriptCode script) const >+const AtomString& SettingsBase::fantasyFontFamily(UScriptCode script) const > { > return m_fontGenericFamilies->fantasyFontFamily(script); > } > >-void SettingsBase::setFantasyFontFamily(const AtomicString& family, UScriptCode script) >+void SettingsBase::setFantasyFontFamily(const AtomString& family, UScriptCode script) > { > bool changes = m_fontGenericFamilies->setFantasyFontFamily(family, script); > if (changes) > invalidateAfterGenericFamilyChange(m_page); > } > >-const AtomicString& SettingsBase::pictographFontFamily(UScriptCode script) const >+const AtomString& SettingsBase::pictographFontFamily(UScriptCode script) const > { > return m_fontGenericFamilies->pictographFontFamily(script); > } > >-void SettingsBase::setPictographFontFamily(const AtomicString& family, UScriptCode script) >+void SettingsBase::setPictographFontFamily(const AtomString& family, UScriptCode script) > { > bool changes = m_fontGenericFamilies->setPictographFontFamily(family, script); > if (changes) >diff --git a/Source/WebCore/page/SettingsBase.h b/Source/WebCore/page/SettingsBase.h >index 7cacf7534e684920d5d68c22228c620e3154b017..b8501cb71a94c1aa07bf1a12fbf59351736ddb0f 100644 >--- a/Source/WebCore/page/SettingsBase.h >+++ b/Source/WebCore/page/SettingsBase.h >@@ -40,8 +40,8 @@ > #include <unicode/uscript.h> > #include <wtf/HashMap.h> > #include <wtf/RefCounted.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > #if ENABLE(DATA_DETECTION) > #include "DataDetection.h" >@@ -133,26 +133,26 @@ public: > constexpr static const float defaultMaxTextAutosizingScaleIncrease = 1.7f; > #endif > >- WEBCORE_EXPORT void setStandardFontFamily(const AtomicString&, UScriptCode = USCRIPT_COMMON); >- WEBCORE_EXPORT const AtomicString& standardFontFamily(UScriptCode = USCRIPT_COMMON) const; >+ WEBCORE_EXPORT void setStandardFontFamily(const AtomString&, UScriptCode = USCRIPT_COMMON); >+ WEBCORE_EXPORT const AtomString& standardFontFamily(UScriptCode = USCRIPT_COMMON) const; > >- WEBCORE_EXPORT void setFixedFontFamily(const AtomicString&, UScriptCode = USCRIPT_COMMON); >- WEBCORE_EXPORT const AtomicString& fixedFontFamily(UScriptCode = USCRIPT_COMMON) const; >+ WEBCORE_EXPORT void setFixedFontFamily(const AtomString&, UScriptCode = USCRIPT_COMMON); >+ WEBCORE_EXPORT const AtomString& fixedFontFamily(UScriptCode = USCRIPT_COMMON) const; > >- WEBCORE_EXPORT void setSerifFontFamily(const AtomicString&, UScriptCode = USCRIPT_COMMON); >- WEBCORE_EXPORT const AtomicString& serifFontFamily(UScriptCode = USCRIPT_COMMON) const; >+ WEBCORE_EXPORT void setSerifFontFamily(const AtomString&, UScriptCode = USCRIPT_COMMON); >+ WEBCORE_EXPORT const AtomString& serifFontFamily(UScriptCode = USCRIPT_COMMON) const; > >- WEBCORE_EXPORT void setSansSerifFontFamily(const AtomicString&, UScriptCode = USCRIPT_COMMON); >- WEBCORE_EXPORT const AtomicString& sansSerifFontFamily(UScriptCode = USCRIPT_COMMON) const; >+ WEBCORE_EXPORT void setSansSerifFontFamily(const AtomString&, UScriptCode = USCRIPT_COMMON); >+ WEBCORE_EXPORT const AtomString& sansSerifFontFamily(UScriptCode = USCRIPT_COMMON) const; > >- WEBCORE_EXPORT void setCursiveFontFamily(const AtomicString&, UScriptCode = USCRIPT_COMMON); >- WEBCORE_EXPORT const AtomicString& cursiveFontFamily(UScriptCode = USCRIPT_COMMON) const; >+ WEBCORE_EXPORT void setCursiveFontFamily(const AtomString&, UScriptCode = USCRIPT_COMMON); >+ WEBCORE_EXPORT const AtomString& cursiveFontFamily(UScriptCode = USCRIPT_COMMON) const; > >- WEBCORE_EXPORT void setFantasyFontFamily(const AtomicString&, UScriptCode = USCRIPT_COMMON); >- WEBCORE_EXPORT const AtomicString& fantasyFontFamily(UScriptCode = USCRIPT_COMMON) const; >+ WEBCORE_EXPORT void setFantasyFontFamily(const AtomString&, UScriptCode = USCRIPT_COMMON); >+ WEBCORE_EXPORT const AtomString& fantasyFontFamily(UScriptCode = USCRIPT_COMMON) const; > >- WEBCORE_EXPORT void setPictographFontFamily(const AtomicString&, UScriptCode = USCRIPT_COMMON); >- WEBCORE_EXPORT const AtomicString& pictographFontFamily(UScriptCode = USCRIPT_COMMON) const; >+ WEBCORE_EXPORT void setPictographFontFamily(const AtomString&, UScriptCode = USCRIPT_COMMON); >+ WEBCORE_EXPORT const AtomString& pictographFontFamily(UScriptCode = USCRIPT_COMMON) const; > > WEBCORE_EXPORT void setMinimumDOMTimerInterval(Seconds); // Initialized to DOMTimer::defaultMinimumInterval(). > Seconds minimumDOMTimerInterval() const { return m_minimumDOMTimerInterval; } >diff --git a/Source/WebCore/page/UserMessageHandlerDescriptor.cpp b/Source/WebCore/page/UserMessageHandlerDescriptor.cpp >index d939f7ee649cad5e4f11ebe618c9aabb72b25a53..ca125ed89f6f5e210de527ab79d1634ad17fdc5d 100644 >--- a/Source/WebCore/page/UserMessageHandlerDescriptor.cpp >+++ b/Source/WebCore/page/UserMessageHandlerDescriptor.cpp >@@ -32,7 +32,7 @@ > > namespace WebCore { > >-UserMessageHandlerDescriptor::UserMessageHandlerDescriptor(const AtomicString& name, DOMWrapperWorld& world) >+UserMessageHandlerDescriptor::UserMessageHandlerDescriptor(const AtomString& name, DOMWrapperWorld& world) > : m_name(name) > , m_world(world) > { >@@ -40,7 +40,7 @@ UserMessageHandlerDescriptor::UserMessageHandlerDescriptor(const AtomicString& n > > UserMessageHandlerDescriptor::~UserMessageHandlerDescriptor() = default; > >-const AtomicString& UserMessageHandlerDescriptor::name() const >+const AtomString& UserMessageHandlerDescriptor::name() const > { > return m_name; > } >diff --git a/Source/WebCore/page/UserMessageHandlerDescriptor.h b/Source/WebCore/page/UserMessageHandlerDescriptor.h >index d297a8294320dfb740b67e6d01752268e37b66f1..45e1557e06b6bb106d2492279f92907a88ce8fa7 100644 >--- a/Source/WebCore/page/UserMessageHandlerDescriptor.h >+++ b/Source/WebCore/page/UserMessageHandlerDescriptor.h >@@ -29,7 +29,7 @@ > > #include <wtf/Ref.h> > #include <wtf/RefCounted.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -39,17 +39,17 @@ class UserMessageHandler; > > class UserMessageHandlerDescriptor : public RefCounted<UserMessageHandlerDescriptor> { > public: >- WEBCORE_EXPORT explicit UserMessageHandlerDescriptor(const AtomicString&, DOMWrapperWorld&); >+ WEBCORE_EXPORT explicit UserMessageHandlerDescriptor(const AtomString&, DOMWrapperWorld&); > WEBCORE_EXPORT virtual ~UserMessageHandlerDescriptor(); > >- WEBCORE_EXPORT const AtomicString& name() const; >+ WEBCORE_EXPORT const AtomString& name() const; > WEBCORE_EXPORT DOMWrapperWorld& world(); > WEBCORE_EXPORT const DOMWrapperWorld& world() const; > > virtual void didPostMessage(UserMessageHandler&, SerializedScriptValue*) = 0; > > private: >- AtomicString m_name; >+ AtomString m_name; > Ref<DOMWrapperWorld> m_world; > }; > >diff --git a/Source/WebCore/page/UserMessageHandlerDescriptorTypes.h b/Source/WebCore/page/UserMessageHandlerDescriptorTypes.h >index 681605483731c9a18f0a2bc21cc933dca927d3eb..a148b613161f588cb695d0ffe57fe4b1e1d6d2a3 100644 >--- a/Source/WebCore/page/UserMessageHandlerDescriptorTypes.h >+++ b/Source/WebCore/page/UserMessageHandlerDescriptorTypes.h >@@ -29,15 +29,15 @@ > > #include <wtf/HashMap.h> > #include <wtf/RefPtr.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > > class DOMWrapperWorld; > class UserMessageHandlerDescriptor; > >-typedef HashMap<std::pair<AtomicString, RefPtr<DOMWrapperWorld>>, RefPtr<UserMessageHandlerDescriptor>> UserMessageHandlerDescriptorMap; >+typedef HashMap<std::pair<AtomString, RefPtr<DOMWrapperWorld>>, RefPtr<UserMessageHandlerDescriptor>> UserMessageHandlerDescriptorMap; > > } // namespace WebCore > >diff --git a/Source/WebCore/page/UserMessageHandlersNamespace.cpp b/Source/WebCore/page/UserMessageHandlersNamespace.cpp >index 6b1d81fe4d4058890c299c807102ba18c07a9a45..e6b289717bed9a05a51361f0cb79f70bb6178ec7 100644 >--- a/Source/WebCore/page/UserMessageHandlersNamespace.cpp >+++ b/Source/WebCore/page/UserMessageHandlersNamespace.cpp >@@ -64,14 +64,14 @@ void UserMessageHandlersNamespace::didInvalidate(UserContentProvider& provider) > userMessageHandler->invalidateDescriptor(); > } > >-Vector<AtomicString> UserMessageHandlersNamespace::supportedPropertyNames() const >+Vector<AtomString> UserMessageHandlersNamespace::supportedPropertyNames() const > { > // FIXME: Consider adding support for iterating the registered UserMessageHandlers. This would > // require adding support for passing the DOMWrapperWorld to supportedPropertyNames. > return { }; > } > >-UserMessageHandler* UserMessageHandlersNamespace::namedItem(DOMWrapperWorld& world, const AtomicString& name) >+UserMessageHandler* UserMessageHandlersNamespace::namedItem(DOMWrapperWorld& world, const AtomString& name) > { > Frame* frame = this->frame(); > if (!frame) >@@ -81,7 +81,7 @@ UserMessageHandler* UserMessageHandlersNamespace::namedItem(DOMWrapperWorld& wor > if (!page) > return nullptr; > >- UserMessageHandler* handler = m_messageHandlers.get(std::pair<AtomicString, RefPtr<DOMWrapperWorld>>(name, &world)); >+ UserMessageHandler* handler = m_messageHandlers.get(std::pair<AtomString, RefPtr<DOMWrapperWorld>>(name, &world)); > if (handler) > return handler; > >diff --git a/Source/WebCore/page/UserMessageHandlersNamespace.h b/Source/WebCore/page/UserMessageHandlersNamespace.h >index 35e8fcbf8f2b8fc23aff88a1fa382eb6cf1974d2..50940e9fd0f8eeac1d2037d377e3fbc35ae0fbd0 100644 >--- a/Source/WebCore/page/UserMessageHandlersNamespace.h >+++ b/Source/WebCore/page/UserMessageHandlersNamespace.h >@@ -33,8 +33,8 @@ > #include <wtf/HashMap.h> > #include <wtf/RefCounted.h> > #include <wtf/RefPtr.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -51,8 +51,8 @@ public: > > virtual ~UserMessageHandlersNamespace(); > >- Vector<AtomicString> supportedPropertyNames() const; >- UserMessageHandler* namedItem(DOMWrapperWorld&, const AtomicString&); >+ Vector<AtomString> supportedPropertyNames() const; >+ UserMessageHandler* namedItem(DOMWrapperWorld&, const AtomString&); > > private: > explicit UserMessageHandlersNamespace(Frame&, UserContentProvider&); >@@ -61,7 +61,7 @@ private: > void didInvalidate(UserContentProvider&) override; > > Ref<UserContentProvider> m_userContentProvider; >- HashMap<std::pair<AtomicString, RefPtr<DOMWrapperWorld>>, RefPtr<UserMessageHandler>> m_messageHandlers; >+ HashMap<std::pair<AtomString, RefPtr<DOMWrapperWorld>>, RefPtr<UserMessageHandler>> m_messageHandlers; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/page/VisitedLinkStore.h b/Source/WebCore/page/VisitedLinkStore.h >index 26d650dba74dc502cf9309a3f3d1c05da6b649b3..c663ba94b9ce0c51fd11d15738b0a88c8ae41265 100644 >--- a/Source/WebCore/page/VisitedLinkStore.h >+++ b/Source/WebCore/page/VisitedLinkStore.h >@@ -40,7 +40,7 @@ public: > WEBCORE_EXPORT virtual ~VisitedLinkStore(); > > // FIXME: These two members should only take the link hash. >- virtual bool isLinkVisited(Page&, SharedStringHash, const URL& baseURL, const AtomicString& attributeURL) = 0; >+ virtual bool isLinkVisited(Page&, SharedStringHash, const URL& baseURL, const AtomString& attributeURL) = 0; > virtual void addVisitedLink(Page&, SharedStringHash) = 0; > > void addPage(Page&); >diff --git a/Source/WebCore/page/VisualViewport.cpp b/Source/WebCore/page/VisualViewport.cpp >index 0ffbe0ae88157c1bee3601734deca95ddda4c3af..bb07f8452093f930c5b10b7d18ec957ab746820d 100644 >--- a/Source/WebCore/page/VisualViewport.cpp >+++ b/Source/WebCore/page/VisualViewport.cpp >@@ -59,7 +59,7 @@ ScriptExecutionContext* VisualViewport::scriptExecutionContext() const > return static_cast<ContextDestructionObserver*>(window)->scriptExecutionContext(); > } > >-bool VisualViewport::addEventListener(const AtomicString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) >+bool VisualViewport::addEventListener(const AtomString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) > { > if (!EventTarget::addEventListener(eventType, WTFMove(listener), options)) > return false; >diff --git a/Source/WebCore/page/VisualViewport.h b/Source/WebCore/page/VisualViewport.h >index a433adb76e18307e84c1aedbeda750215e9bc34b..f7b9c125bfe02f8cca8c0b46f0af0df09ef3afe5 100644 >--- a/Source/WebCore/page/VisualViewport.h >+++ b/Source/WebCore/page/VisualViewport.h >@@ -39,7 +39,7 @@ public: > // EventTarget > EventTargetInterface eventTargetInterface() const final; > ScriptExecutionContext* scriptExecutionContext() const final; >- bool addEventListener(const AtomicString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) final; >+ bool addEventListener(const AtomString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) final; > > double offsetLeft() const; > double offsetTop() const; >diff --git a/Source/WebCore/page/animation/CSSAnimationController.cpp b/Source/WebCore/page/animation/CSSAnimationController.cpp >index 8bb94e998abe5a65cdb2832d75dff1e6c5a597b0..d51264161e34ba92ade76c302e3c586cd3a8ef67 100644 >--- a/Source/WebCore/page/animation/CSSAnimationController.cpp >+++ b/Source/WebCore/page/animation/CSSAnimationController.cpp >@@ -240,7 +240,7 @@ void CSSAnimationControllerPrivate::startUpdateStyleIfNeededDispatcher() > m_updateStyleIfNeededDispatcher.startOneShot(0_s); > } > >-void CSSAnimationControllerPrivate::addEventToDispatch(Element& element, const AtomicString& eventType, const String& name, double elapsedTime) >+void CSSAnimationControllerPrivate::addEventToDispatch(Element& element, const AtomString& eventType, const String& name, double elapsedTime) > { > m_eventsToDispatch.append({ element, eventType, name, elapsedTime }); > startUpdateStyleIfNeededDispatcher(); >@@ -409,7 +409,7 @@ void CSSAnimationControllerPrivate::setAllowsNewAnimationsWhileSuspended(bool al > m_allowsNewAnimationsWhileSuspended = allowed; > } > >-bool CSSAnimationControllerPrivate::pauseAnimationAtTime(Element& element, const AtomicString& name, double t) >+bool CSSAnimationControllerPrivate::pauseAnimationAtTime(Element& element, const AtomString& name, double t) > { > CompositeAnimation& compositeAnimation = ensureCompositeAnimation(element); > if (compositeAnimation.pauseAnimationAtTime(name, t)) { >@@ -673,7 +673,7 @@ void CSSAnimationController::notifyAnimationStarted(RenderElement& renderer, Mon > m_data->receivedStartTimeResponse(startTime); > } > >-bool CSSAnimationController::pauseAnimationAtTime(Element& element, const AtomicString& name, double t) >+bool CSSAnimationController::pauseAnimationAtTime(Element& element, const AtomString& name, double t) > { > AnimationUpdateBlock animationUpdateBlock(this); > return m_data->pauseAnimationAtTime(element, name, t); >diff --git a/Source/WebCore/page/animation/CSSAnimationController.h b/Source/WebCore/page/animation/CSSAnimationController.h >index cbe88500afae65ce2ea2a70d9d71ef5995e27c03..ec7b9c7d27f9c9d2e85a30ff6fabab1d9ba0b22f 100644 >--- a/Source/WebCore/page/animation/CSSAnimationController.h >+++ b/Source/WebCore/page/animation/CSSAnimationController.h >@@ -65,7 +65,7 @@ public: > // This is called when an accelerated animation or transition has actually started to animate. > void notifyAnimationStarted(RenderElement&, MonotonicTime startTime); > >- WEBCORE_EXPORT bool pauseAnimationAtTime(Element&, const AtomicString& name, double t); // To be used only for testing >+ WEBCORE_EXPORT bool pauseAnimationAtTime(Element&, const AtomString& name, double t); // To be used only for testing > WEBCORE_EXPORT bool pauseTransitionAtTime(Element&, const String& property, double t); // To be used only for testing > WEBCORE_EXPORT unsigned numberOfActiveAnimations(Document*) const; // To be used only for testing > >diff --git a/Source/WebCore/page/animation/CSSAnimationControllerPrivate.h b/Source/WebCore/page/animation/CSSAnimationControllerPrivate.h >index 55f586852c731e720ab3fba3259fa6032c55f5fb..d320377decc9c534deeb7b4e95ce0ed2d85aedb1 100644 >--- a/Source/WebCore/page/animation/CSSAnimationControllerPrivate.h >+++ b/Source/WebCore/page/animation/CSSAnimationControllerPrivate.h >@@ -57,7 +57,7 @@ public: > > void updateStyleIfNeededDispatcherFired(); > void startUpdateStyleIfNeededDispatcher(); >- void addEventToDispatch(Element&, const AtomicString& eventType, const String& name, double elapsedTime); >+ void addEventToDispatch(Element&, const AtomString& eventType, const String& name, double elapsedTime); > void addElementChangeToDispatch(Element&); > > bool hasAnimations() const { return !m_compositeAnimations.isEmpty(); } >@@ -79,7 +79,7 @@ public: > bool isRunningAnimationOnRenderer(RenderElement&, CSSPropertyID) const; > bool isRunningAcceleratedAnimationOnRenderer(RenderElement&, CSSPropertyID) const; > >- bool pauseAnimationAtTime(Element&, const AtomicString& name, double t); >+ bool pauseAnimationAtTime(Element&, const AtomString& name, double t); > bool pauseTransitionAtTime(Element&, const String& property, double t); > unsigned numberOfActiveAnimations(Document*) const; > >@@ -122,7 +122,7 @@ private: > > struct EventToDispatch { > Ref<Element> element; >- AtomicString eventType; >+ AtomString eventType; > String name; > double elapsedTime; > }; >diff --git a/Source/WebCore/page/animation/CompositeAnimation.cpp b/Source/WebCore/page/animation/CompositeAnimation.cpp >index a7816317533e8806914b90dee0289bfb3a9a211b..e57629358a424d8e002c8eecaebdc3307a3002c9 100644 >--- a/Source/WebCore/page/animation/CompositeAnimation.cpp >+++ b/Source/WebCore/page/animation/CompositeAnimation.cpp >@@ -220,14 +220,14 @@ void CompositeAnimation::updateKeyframeAnimations(Element& element, const Render > // Toss the animation order map. > m_keyframeAnimationOrderMap.clear(); > >- static NeverDestroyed<const AtomicString> none("none", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> none("none", AtomString::ConstructFromLiteral); > > // Now mark any still active animations as active and add any new animations. > if (targetStyle.animations()) { > int numAnims = targetStyle.animations()->size(); > for (int i = 0; i < numAnims; ++i) { > auto& animation = targetStyle.animations()->animation(i); >- AtomicString animationName(animation.name()); >+ AtomString animationName(animation.name()); > > if (!animation.isValidAnimation()) > continue; >@@ -526,7 +526,7 @@ bool CompositeAnimation::isAnimatingProperty(CSSPropertyID property, bool accele > return false; > } > >-bool CompositeAnimation::pauseAnimationAtTime(const AtomicString& name, double t) >+bool CompositeAnimation::pauseAnimationAtTime(const AtomString& name, double t) > { > m_keyframeAnimations.checkConsistency(); > >diff --git a/Source/WebCore/page/animation/CompositeAnimation.h b/Source/WebCore/page/animation/CompositeAnimation.h >index 4052b93d4b149aad83d512765cc5dd5bdd443beb..9422692396d2fba6880d1cd9f9c8d69b82e7b0c5 100644 >--- a/Source/WebCore/page/animation/CompositeAnimation.h >+++ b/Source/WebCore/page/animation/CompositeAnimation.h >@@ -32,7 +32,7 @@ > #include "ImplicitAnimation.h" > #include "KeyframeAnimation.h" > #include <wtf/HashMap.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -76,7 +76,7 @@ public: > void overrideImplicitAnimations(CSSPropertyID); > void resumeOverriddenImplicitAnimations(CSSPropertyID); > >- bool pauseAnimationAtTime(const AtomicString& name, double t); >+ bool pauseAnimationAtTime(const AtomString& name, double t); > bool pauseTransitionAtTime(CSSPropertyID, double); > unsigned numberOfActiveAnimations() const; > >@@ -89,7 +89,7 @@ private: > void updateKeyframeAnimations(Element&, const RenderStyle* currentStyle, const RenderStyle& targetStyle); > > typedef HashMap<int, RefPtr<ImplicitAnimation>> CSSPropertyTransitionsMap; >- typedef HashMap<AtomicStringImpl*, RefPtr<KeyframeAnimation>> AnimationNameMap; >+ typedef HashMap<AtomStringImpl*, RefPtr<KeyframeAnimation>> AnimationNameMap; > > bool m_suspended { false }; > bool m_hasAnimationThatDependsOnLayout { false }; >@@ -97,7 +97,7 @@ private: > CSSAnimationControllerPrivate& m_animationController; > CSSPropertyTransitionsMap m_transitions; > AnimationNameMap m_keyframeAnimations; >- Vector<AtomicStringImpl*> m_keyframeAnimationOrderMap; >+ Vector<AtomStringImpl*> m_keyframeAnimationOrderMap; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/page/animation/ImplicitAnimation.cpp b/Source/WebCore/page/animation/ImplicitAnimation.cpp >index 4f7c13ec8a134cc5658f1f8449815c6835520c8e..0477a9e7d085e2777dafb2cb1cf9d9b399dc974c 100644 >--- a/Source/WebCore/page/animation/ImplicitAnimation.cpp >+++ b/Source/WebCore/page/animation/ImplicitAnimation.cpp >@@ -201,7 +201,7 @@ void ImplicitAnimation::onAnimationEnd(double elapsedTime) > endAnimation(); > } > >-bool ImplicitAnimation::sendTransitionEvent(const AtomicString& eventType, double elapsedTime) >+bool ImplicitAnimation::sendTransitionEvent(const AtomString& eventType, double elapsedTime) > { > if (eventType == eventNames().transitionendEvent) { > Document::ListenerType listenerType = Document::TRANSITIONEND_LISTENER; >diff --git a/Source/WebCore/page/animation/ImplicitAnimation.h b/Source/WebCore/page/animation/ImplicitAnimation.h >index 72d4cbf330d6a93e0bb74ce76937336bfd44eead..72b84adcecf928d84e15a40c5c8857605f3e6462 100644 >--- a/Source/WebCore/page/animation/ImplicitAnimation.h >+++ b/Source/WebCore/page/animation/ImplicitAnimation.h >@@ -83,7 +83,7 @@ public: > > protected: > bool shouldSendEventForListener(Document::ListenerType) const; >- bool sendTransitionEvent(const AtomicString&, double elapsedTime); >+ bool sendTransitionEvent(const AtomString&, double elapsedTime); > > void validateTransformFunctionList(); > void checkForMatchingFilterFunctionLists(); >diff --git a/Source/WebCore/page/animation/KeyframeAnimation.cpp b/Source/WebCore/page/animation/KeyframeAnimation.cpp >index 609691935d6f41829f764eee20505a6afff3ee33..9af5f084c50136603d524b20fba16f595bb979fa 100644 >--- a/Source/WebCore/page/animation/KeyframeAnimation.cpp >+++ b/Source/WebCore/page/animation/KeyframeAnimation.cpp >@@ -343,7 +343,7 @@ void KeyframeAnimation::onAnimationEnd(double elapsedTime) > endAnimation(m_animation->fillsForwards()); > } > >-bool KeyframeAnimation::sendAnimationEvent(const AtomicString& eventType, double elapsedTime) >+bool KeyframeAnimation::sendAnimationEvent(const AtomString& eventType, double elapsedTime) > { > Document::ListenerType listenerType; > if (eventType == eventNames().webkitAnimationIterationEvent || eventType == eventNames().animationiterationEvent) >diff --git a/Source/WebCore/page/animation/KeyframeAnimation.h b/Source/WebCore/page/animation/KeyframeAnimation.h >index 3889fee25fc9a9334592a7c60eafdaa75bb2e2cb..a1c3e66627958e482729d749cd355cb191f40c10 100644 >--- a/Source/WebCore/page/animation/KeyframeAnimation.h >+++ b/Source/WebCore/page/animation/KeyframeAnimation.h >@@ -52,7 +52,7 @@ public: > > const KeyframeList& keyframes() const { return m_keyframes; } > >- const AtomicString& name() const { return m_keyframes.animationName(); } >+ const AtomString& name() const { return m_keyframes.animationName(); } > > bool hasAnimationForProperty(CSSPropertyID) const; > >@@ -77,7 +77,7 @@ protected: > void resumeOverriddenAnimations() override; > > bool shouldSendEventForListener(Document::ListenerType inListenerType) const; >- bool sendAnimationEvent(const AtomicString&, double elapsedTime); >+ bool sendAnimationEvent(const AtomString&, double elapsedTime); > > bool affectsProperty(CSSPropertyID) const override; > >diff --git a/Source/WebCore/page/scrolling/ScrollingTree.cpp b/Source/WebCore/page/scrolling/ScrollingTree.cpp >index ada2d44652543e4dc1fa3496ebb3f17416a5a764..7d393984b0dffb70ca83c548f60f05e3a6c3fac7 100644 >--- a/Source/WebCore/page/scrolling/ScrollingTree.cpp >+++ b/Source/WebCore/page/scrolling/ScrollingTree.cpp >@@ -340,7 +340,7 @@ void ScrollingTree::setMainFrameScrollPosition(FloatPoint position) > m_treeState.mainFrameScrollPosition = position; > } > >-TrackingType ScrollingTree::eventTrackingTypeForPoint(const AtomicString& eventName, IntPoint p) >+TrackingType ScrollingTree::eventTrackingTypeForPoint(const AtomString& eventName, IntPoint p) > { > LockHolder lock(m_treeStateMutex); > return m_treeState.eventTrackingRegions.trackingTypeForPoint(eventName, p); >diff --git a/Source/WebCore/page/scrolling/ScrollingTree.h b/Source/WebCore/page/scrolling/ScrollingTree.h >index 1e3aca320da6af2607abb973fbb4f62544b658f5..8eda675e9c3d1d9518d2dc40dd11213cd8fdb757 100644 >--- a/Source/WebCore/page/scrolling/ScrollingTree.h >+++ b/Source/WebCore/page/scrolling/ScrollingTree.h >@@ -100,7 +100,7 @@ public: > virtual void scrollingTreeNodeDidEndScroll() { } > #endif > >- WEBCORE_EXPORT TrackingType eventTrackingTypeForPoint(const AtomicString& eventName, IntPoint); >+ WEBCORE_EXPORT TrackingType eventTrackingTypeForPoint(const AtomString& eventName, IntPoint); > #if ENABLE(POINTER_EVENTS) > WEBCORE_EXPORT Optional<TouchActionData> touchActionDataAtPoint(IntPoint) const; > #endif >diff --git a/Source/WebCore/platform/DateTimeChooser.h b/Source/WebCore/platform/DateTimeChooser.h >index e5c5fad4ce1966074aad7e1e6a8f52c9f018890e..23b05d7c824f5568c8f87f9785374abc13a010eb 100644 >--- a/Source/WebCore/platform/DateTimeChooser.h >+++ b/Source/WebCore/platform/DateTimeChooser.h >@@ -39,12 +39,12 @@ > namespace WebCore { > > struct DateTimeChooserParameters { >- AtomicString type; >+ AtomString type; > IntRect anchorRectInRootView; > // Locale name for which the chooser should be localized. This > // might be an invalid name because it comes from HTML lang > // attributes. >- AtomicString locale; >+ AtomString locale; > String currentValue; > Vector<String> suggestionValues; > Vector<String> localizedSuggestionValues; >diff --git a/Source/WebCore/platform/MediaDescription.h b/Source/WebCore/platform/MediaDescription.h >index ca4a09b0c4960690f6e0e05c196ef949f20fcf23..21a885205ef7fb80c03e3b51bfdc7ae62754168b 100644 >--- a/Source/WebCore/platform/MediaDescription.h >+++ b/Source/WebCore/platform/MediaDescription.h >@@ -35,7 +35,7 @@ class MediaDescription : public RefCounted<MediaDescription> { > public: > virtual ~MediaDescription() = default; > >- virtual AtomicString codec() const = 0; >+ virtual AtomString codec() const = 0; > virtual bool isVideo() const = 0; > virtual bool isAudio() const = 0; > virtual bool isText() const = 0; >diff --git a/Source/WebCore/platform/MediaSample.h b/Source/WebCore/platform/MediaSample.h >index 094522c43d065aeaa25bb3fdd5137a10f0243172..6c495c66ba71fca8fc9617f1b1665e17bfa27d7e 100644 >--- a/Source/WebCore/platform/MediaSample.h >+++ b/Source/WebCore/platform/MediaSample.h >@@ -31,7 +31,7 @@ > #include <wtf/EnumTraits.h> > #include <wtf/MediaTime.h> > #include <wtf/RefCounted.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > typedef struct opaqueCMSampleBuffer *CMSampleBufferRef; > typedef struct _GstSample GstSample; >@@ -63,7 +63,7 @@ public: > virtual MediaTime decodeTime() const = 0; > virtual MediaTime duration() const = 0; > virtual MediaTime outputDuration() const { return duration(); } >- virtual AtomicString trackID() const = 0; >+ virtual AtomString trackID() const = 0; > virtual void setTrackID(const String&) = 0; > virtual size_t sizeInBytes() const = 0; > virtual FloatSize presentationSize() const = 0; >diff --git a/Source/WebCore/platform/SearchPopupMenu.h b/Source/WebCore/platform/SearchPopupMenu.h >index 61583eea891d47f37bb5a2f088f9bc4d07f5ce9d..ce4db828cd240d67201d609dbe4004727bbc2640 100644 >--- a/Source/WebCore/platform/SearchPopupMenu.h >+++ b/Source/WebCore/platform/SearchPopupMenu.h >@@ -38,8 +38,8 @@ class SearchPopupMenu : public RefCounted<SearchPopupMenu> { > public: > virtual ~SearchPopupMenu() = default; > virtual PopupMenu* popupMenu() = 0; >- virtual void saveRecentSearches(const AtomicString& name, const Vector<RecentSearch>&) = 0; >- virtual void loadRecentSearches(const AtomicString& name, Vector<RecentSearch>&) = 0; >+ virtual void saveRecentSearches(const AtomString& name, const Vector<RecentSearch>&) = 0; >+ virtual void loadRecentSearches(const AtomString& name, Vector<RecentSearch>&) = 0; > virtual bool enabled() = 0; > }; > >diff --git a/Source/WebCore/platform/SharedStringHash.cpp b/Source/WebCore/platform/SharedStringHash.cpp >index afb757cbe4022fedfc4793eabc2569e860e95956..b934e6fa3af3fcfb11d497023560162bdb5bfc52 100644 >--- a/Source/WebCore/platform/SharedStringHash.cpp >+++ b/Source/WebCore/platform/SharedStringHash.cpp >@@ -25,7 +25,7 @@ > #include "SharedStringHash.h" > > #include <wtf/URL.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/StringHash.h> > #include <wtf/text/StringView.h> > >@@ -280,7 +280,7 @@ static ALWAYS_INLINE void computeSharedStringHashInline(const URL& base, const C > return; > } > >-SharedStringHash computeVisitedLinkHash(const URL& base, const AtomicString& attributeURL) >+SharedStringHash computeVisitedLinkHash(const URL& base, const AtomString& attributeURL) > { > if (attributeURL.isEmpty()) > return 0; >diff --git a/Source/WebCore/platform/SharedStringHash.h b/Source/WebCore/platform/SharedStringHash.h >index 3603cf0f2e7f9214b3e253f5479d9cb346b27af8..1261d77cbef4b65c522328fbabe397cc69ea13fa 100644 >--- a/Source/WebCore/platform/SharedStringHash.h >+++ b/Source/WebCore/platform/SharedStringHash.h >@@ -58,6 +58,6 @@ WEBCORE_EXPORT SharedStringHash computeSharedStringHash(const UChar* url, unsign > // base URL, and returns the hash of the string that will be used for visited > // link coloring. It will return the special value of 0 if attributeURL does not > // look like a relative URL. >-SharedStringHash computeVisitedLinkHash(const URL& base, const AtomicString& attributeURL); >+SharedStringHash computeVisitedLinkHash(const URL& base, const AtomString& attributeURL); > > } // namespace WebCore >diff --git a/Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.h b/Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.h >index 1a2e1511e9681c342293446b3853cf5ac4875358..d41ec3780875523a6f8050023942c8be855e881f 100644 >--- a/Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.h >+++ b/Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.h >@@ -52,7 +52,7 @@ public: > HTMLMediaElement* mediaElement() const { return m_mediaElement.get(); } > > WEBCORE_EXPORT void handleEvent(WebCore::ScriptExecutionContext&, WebCore::Event&) final; >- void updateForEventName(const WTF::AtomicString&); >+ void updateForEventName(const WTF::AtomString&); > bool operator==(const EventListener& rhs) const final { return static_cast<const WebCore::EventListener*>(this) == &rhs; } > > WEBCORE_EXPORT void addClient(PlaybackSessionModelClient&); >@@ -103,8 +103,8 @@ protected: > > private: > void progressEventTimerFired(); >- static const Vector<WTF::AtomicString>& observedEventNames(); >- const WTF::AtomicString& eventNameAll(); >+ static const Vector<WTF::AtomString>& observedEventNames(); >+ const WTF::AtomString& eventNameAll(); > > RefPtr<HTMLMediaElement> m_mediaElement; > bool m_isListening { false }; >diff --git a/Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm b/Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm >index 332fcb15c449a1a3b144f7aca757fd0b9a1b1387..50541ce7a4168e05a0ae04aa9a9e7a485aa6f605 100644 >--- a/Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm >+++ b/Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm >@@ -111,7 +111,7 @@ void PlaybackSessionModelMediaElement::handleEvent(WebCore::ScriptExecutionConte > updateForEventName(event.type()); > } > >-void PlaybackSessionModelMediaElement::updateForEventName(const WTF::AtomicString& eventName) >+void PlaybackSessionModelMediaElement::updateForEventName(const WTF::AtomString& eventName) > { > if (m_clients.isEmpty()) > return; >@@ -385,10 +385,10 @@ double PlaybackSessionModelMediaElement::playbackStartedTime() const > return m_mediaElement->playbackStartedTime(); > } > >-const Vector<AtomicString>& PlaybackSessionModelMediaElement::observedEventNames() >+const Vector<AtomString>& PlaybackSessionModelMediaElement::observedEventNames() > { > // FIXME(157452): Remove the right-hand constructor notation once NeverDestroyed supports initializer_lists. >- static NeverDestroyed<Vector<AtomicString>> names = Vector<AtomicString>({ >+ static NeverDestroyed<Vector<AtomString>> names = Vector<AtomString>({ > eventNames().durationchangeEvent, > eventNames().pauseEvent, > eventNames().playEvent, >@@ -401,9 +401,9 @@ const Vector<AtomicString>& PlaybackSessionModelMediaElement::observedEventNames > return names.get(); > } > >-const AtomicString& PlaybackSessionModelMediaElement::eventNameAll() >+const AtomString& PlaybackSessionModelMediaElement::eventNameAll() > { >- static NeverDestroyed<AtomicString> eventNameAll("allEvents", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> eventNameAll("allEvents", AtomString::ConstructFromLiteral); > return eventNameAll; > } > >@@ -505,7 +505,7 @@ uint64_t PlaybackSessionModelMediaElement::legibleMediaSelectedIndex() const > if (!host) > return selectedIndex; > >- AtomicString displayMode = host->captionDisplayMode(); >+ AtomString displayMode = host->captionDisplayMode(); > TextTrack* offItem = host->captionMenuOffItem(); > TextTrack* automaticItem = host->captionMenuAutomaticItem(); > >diff --git a/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.h b/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.h >index bfa29f62e91275b65b6674cd67c3f4c0cd0ddf69..0e9a454b4d88ace35542265bfb00f4167227124e 100644 >--- a/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.h >+++ b/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.h >@@ -60,7 +60,7 @@ public: > WEBCORE_EXPORT void waitForPreparedForInlineThen(WTF::Function<void()>&& completionHandler = [] { }); > > WEBCORE_EXPORT void handleEvent(WebCore::ScriptExecutionContext&, WebCore::Event&) override; >- void updateForEventName(const WTF::AtomicString&); >+ void updateForEventName(const WTF::AtomString&); > bool operator==(const EventListener& rhs) const override { return static_cast<const WebCore::EventListener*>(this) == &rhs; } > > WEBCORE_EXPORT void addClient(VideoFullscreenModelClient&) override; >@@ -87,8 +87,8 @@ private: > void willExitPictureInPicture() override; > void didExitPictureInPicture() override; > >- static const Vector<WTF::AtomicString>& observedEventNames(); >- const WTF::AtomicString& eventNameAll(); >+ static const Vector<WTF::AtomString>& observedEventNames(); >+ const WTF::AtomString& eventNameAll(); > > RefPtr<HTMLVideoElement> m_videoElement; > RetainPtr<PlatformLayer> m_videoFullscreenLayer; >diff --git a/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm b/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm >index 936bd95cd03b807a5d84b4a4a8d6b82db0d2a70b..a48807ec3be037a801da8ba9b052e4b4704f873f 100644 >--- a/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm >+++ b/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm >@@ -90,7 +90,7 @@ void VideoFullscreenModelVideoElement::handleEvent(WebCore::ScriptExecutionConte > updateForEventName(event.type()); > } > >-void VideoFullscreenModelVideoElement::updateForEventName(const WTF::AtomicString& eventName) >+void VideoFullscreenModelVideoElement::updateForEventName(const WTF::AtomString& eventName) > { > if (m_clients.isEmpty()) > return; >@@ -169,15 +169,15 @@ void VideoFullscreenModelVideoElement::setVideoLayerGravity(MediaPlayerEnums::Vi > m_videoElement->setVideoFullscreenGravity(gravity); > } > >-const Vector<AtomicString>& VideoFullscreenModelVideoElement::observedEventNames() >+const Vector<AtomString>& VideoFullscreenModelVideoElement::observedEventNames() > { >- static const auto names = makeNeverDestroyed(Vector<AtomicString> { eventNames().resizeEvent }); >+ static const auto names = makeNeverDestroyed(Vector<AtomString> { eventNames().resizeEvent }); > return names; > } > >-const AtomicString& VideoFullscreenModelVideoElement::eventNameAll() >+const AtomString& VideoFullscreenModelVideoElement::eventNameAll() > { >- static NeverDestroyed<AtomicString> sEventNameAll = "allEvents"; >+ static NeverDestroyed<AtomString> sEventNameAll = "allEvents"; > return sEventNameAll; > } > >diff --git a/Source/WebCore/platform/encryptedmedia/CDMInstanceSession.h b/Source/WebCore/platform/encryptedmedia/CDMInstanceSession.h >index a71ab8ea6a36856f168c36bf756765649d6c1875..8725a31d8bb3e22be21df07e320b36e750386e1a 100644 >--- a/Source/WebCore/platform/encryptedmedia/CDMInstanceSession.h >+++ b/Source/WebCore/platform/encryptedmedia/CDMInstanceSession.h >@@ -67,7 +67,7 @@ public: > }; > > using LicenseCallback = CompletionHandler<void(Ref<SharedBuffer>&& message, const String& sessionId, bool needsIndividualization, SuccessValue succeeded)>; >- virtual void requestLicense(LicenseType, const AtomicString& initDataType, Ref<SharedBuffer>&& initData, LicenseCallback&&) = 0; >+ virtual void requestLicense(LicenseType, const AtomString& initDataType, Ref<SharedBuffer>&& initData, LicenseCallback&&) = 0; > > using KeyStatusVector = CDMInstanceSessionClient::KeyStatusVector; > using Message = std::pair<MessageType, Ref<SharedBuffer>>; >diff --git a/Source/WebCore/platform/encryptedmedia/CDMPrivate.h b/Source/WebCore/platform/encryptedmedia/CDMPrivate.h >index e058b07712bfe84c4648e8faca37e1f81df2525c..25f7816a2fe1da6f90c2fef777551406aa0f4a03 100644 >--- a/Source/WebCore/platform/encryptedmedia/CDMPrivate.h >+++ b/Source/WebCore/platform/encryptedmedia/CDMPrivate.h >@@ -41,7 +41,7 @@ class CDMPrivate { > public: > virtual ~CDMPrivate() = default; > >- virtual bool supportsInitDataType(const AtomicString&) const = 0; >+ virtual bool supportsInitDataType(const AtomString&) const = 0; > virtual bool supportsConfiguration(const CDMKeySystemConfiguration&) const = 0; > virtual bool supportsConfigurationWithRestrictions(const CDMKeySystemConfiguration&, const CDMRestrictions&) const = 0; > virtual bool supportsSessionTypeWithConfiguration(CDMSessionType&, const CDMKeySystemConfiguration&) const = 0; >@@ -53,7 +53,7 @@ public: > virtual void loadAndInitialize() = 0; > virtual bool supportsServerCertificates() const = 0; > virtual bool supportsSessions() const = 0; >- virtual bool supportsInitData(const AtomicString&, const SharedBuffer&) const = 0; >+ virtual bool supportsInitData(const AtomString&, const SharedBuffer&) const = 0; > virtual RefPtr<SharedBuffer> sanitizeResponse(const SharedBuffer&) const = 0; > virtual Optional<String> sanitizeSessionId(const String&) const = 0; > }; >diff --git a/Source/WebCore/platform/encryptedmedia/clearkey/CDMClearKey.cpp b/Source/WebCore/platform/encryptedmedia/clearkey/CDMClearKey.cpp >index 697699a3a7e4d75d4321137112c5d8f89effde89..503f97b92018da87c248891b22679abb7005b300 100644 >--- a/Source/WebCore/platform/encryptedmedia/clearkey/CDMClearKey.cpp >+++ b/Source/WebCore/platform/encryptedmedia/clearkey/CDMClearKey.cpp >@@ -315,7 +315,7 @@ bool CDMFactoryClearKey::supportsKeySystem(const String& keySystem) > CDMPrivateClearKey::CDMPrivateClearKey() = default; > CDMPrivateClearKey::~CDMPrivateClearKey() = default; > >-bool CDMPrivateClearKey::supportsInitDataType(const AtomicString& initDataType) const >+bool CDMPrivateClearKey::supportsInitDataType(const AtomString& initDataType) const > { > // `keyids` and 'cenc' are the only supported init data type. > return (equalLettersIgnoringASCIICase(initDataType, "keyids") || equalLettersIgnoringASCIICase(initDataType, "cenc") || equalLettersIgnoringASCIICase(initDataType, "webm")); >@@ -419,7 +419,7 @@ bool CDMPrivateClearKey::supportsSessions() const > return true; > } > >-bool CDMPrivateClearKey::supportsInitData(const AtomicString& initDataType, const SharedBuffer& initData) const >+bool CDMPrivateClearKey::supportsInitData(const AtomString& initDataType, const SharedBuffer& initData) const > { > // Validate the initData buffer as an JSON object in keyids case. > if (equalLettersIgnoringASCIICase(initDataType, "keyids") && parseJSONObject(initData)) >@@ -519,7 +519,7 @@ const Vector<CDMInstanceClearKey::Key> CDMInstanceClearKey::keys() const > return allKeys; > } > >-void CDMInstanceSessionClearKey::requestLicense(LicenseType, const AtomicString& initDataType, Ref<SharedBuffer>&& initData, LicenseCallback&& callback) >+void CDMInstanceSessionClearKey::requestLicense(LicenseType, const AtomString& initDataType, Ref<SharedBuffer>&& initData, LicenseCallback&& callback) > { > static uint32_t s_sessionIdValue = 0; > ++s_sessionIdValue; >diff --git a/Source/WebCore/platform/encryptedmedia/clearkey/CDMClearKey.h b/Source/WebCore/platform/encryptedmedia/clearkey/CDMClearKey.h >index e3aa0328c1a34111005d677c747387236f439576..d47304c95b26ef204f5da4adcbb8a0864de18bb3 100644 >--- a/Source/WebCore/platform/encryptedmedia/clearkey/CDMClearKey.h >+++ b/Source/WebCore/platform/encryptedmedia/clearkey/CDMClearKey.h >@@ -58,7 +58,7 @@ public: > CDMPrivateClearKey(); > virtual ~CDMPrivateClearKey(); > >- bool supportsInitDataType(const AtomicString&) const final; >+ bool supportsInitDataType(const AtomString&) const final; > bool supportsConfiguration(const CDMKeySystemConfiguration&) const final; > bool supportsConfigurationWithRestrictions(const CDMKeySystemConfiguration&, const CDMRestrictions&) const final; > bool supportsSessionTypeWithConfiguration(CDMSessionType&, const CDMKeySystemConfiguration&) const final; >@@ -70,7 +70,7 @@ public: > void loadAndInitialize() final; > bool supportsServerCertificates() const final; > bool supportsSessions() const final; >- bool supportsInitData(const AtomicString&, const SharedBuffer&) const final; >+ bool supportsInitData(const AtomString&, const SharedBuffer&) const final; > RefPtr<SharedBuffer> sanitizeResponse(const SharedBuffer&) const final; > Optional<String> sanitizeSessionId(const String&) const final; > }; >@@ -104,7 +104,7 @@ private: > > class CDMInstanceSessionClearKey final : public CDMInstanceSession, public CanMakeWeakPtr<CDMInstanceSessionClearKey> { > public: >- void requestLicense(LicenseType, const AtomicString& initDataType, Ref<SharedBuffer>&& initData, LicenseCallback&&) final; >+ void requestLicense(LicenseType, const AtomString& initDataType, Ref<SharedBuffer>&& initData, LicenseCallback&&) final; > void updateLicense(const String&, LicenseType, const SharedBuffer&, LicenseUpdateCallback&&) final; > void loadSession(LicenseType, const String&, const String&, LoadSessionCallback&&) final; > void closeSession(const String&, CloseSessionCallback&&) final; >diff --git a/Source/WebCore/platform/graphics/Font.cpp b/Source/WebCore/platform/graphics/Font.cpp >index a743e9cc031744c87392e26574507ed05f311881..184b44b07a412216b9ec598422f0787f0e6c7aeb 100644 >--- a/Source/WebCore/platform/graphics/Font.cpp >+++ b/Source/WebCore/platform/graphics/Font.cpp >@@ -39,7 +39,7 @@ > #include "OpenTypeMathData.h" > #include <wtf/MathExtras.h> > #include <wtf/NeverDestroyed.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > #if ENABLE(OPENTYPE_VERTICAL) > #include "OpenTypeVerticalData.h" >@@ -517,7 +517,7 @@ public: > { > } > >- CharacterFallbackMapKey(const AtomicString& locale, UChar32 character, IsForPlatformFont isForPlatformFont) >+ CharacterFallbackMapKey(const AtomString& locale, UChar32 character, IsForPlatformFont isForPlatformFont) > : locale(locale) > , character(character) > , isForPlatformFont(isForPlatformFont == IsForPlatformFont::Yes) >@@ -541,7 +541,7 @@ public: > private: > friend struct CharacterFallbackMapKeyHash; > >- AtomicString locale; >+ AtomString locale; > UChar32 character { 0 }; > bool isForPlatformFont { false }; > }; >diff --git a/Source/WebCore/platform/graphics/FontCache.cpp b/Source/WebCore/platform/graphics/FontCache.cpp >index bf3036fe0ce76135aaa7a772f7291dcb20270743..d2d0b79a5acf0c362f8d59cc3c605364b2c57f93 100644 >--- a/Source/WebCore/platform/graphics/FontCache.cpp >+++ b/Source/WebCore/platform/graphics/FontCache.cpp >@@ -39,7 +39,7 @@ > #include <wtf/MemoryPressureHandler.h> > #include <wtf/NeverDestroyed.h> > #include <wtf/StdLibExtras.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/StringHash.h> > > #if ENABLE(OPENTYPE_VERTICAL) >@@ -77,7 +77,7 @@ struct FontPlatformDataCacheKey { > WTF_MAKE_FAST_ALLOCATED; > public: > FontPlatformDataCacheKey() { } >- FontPlatformDataCacheKey(const AtomicString& family, const FontDescription& description, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities) >+ FontPlatformDataCacheKey(const AtomString& family, const FontDescription& description, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities) > : m_fontDescriptionKey(description) > , m_family(family) > , m_fontFaceFeatures(fontFaceFeatures ? *fontFaceFeatures : FontFeatureSettings()) >@@ -106,7 +106,7 @@ public: > } > > FontDescriptionKey m_fontDescriptionKey; >- AtomicString m_family; >+ AtomString m_family; > FontFeatureSettings m_fontFaceFeatures; > FontVariantSettings m_fontFaceVariantSettings; > FontSelectionSpecifiedCapabilities m_fontFaceCapabilities; >@@ -155,16 +155,16 @@ static FontPlatformDataCache& fontPlatformDataCache() > return cache; > } > >-const AtomicString& FontCache::alternateFamilyName(const AtomicString& familyName) >+const AtomString& FontCache::alternateFamilyName(const AtomString& familyName) > { >- static NeverDestroyed<AtomicString> arial("Arial", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> courier("Courier", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> courierNew("Courier New", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> helvetica("Helvetica", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> times("Times", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> timesNewRoman("Times New Roman", AtomicString::ConstructFromLiteral); >- >- const AtomicString& platformSpecificAlternate = platformAlternateFamilyName(familyName); >+ static NeverDestroyed<AtomString> arial("Arial", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> courier("Courier", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> courierNew("Courier New", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> helvetica("Helvetica", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> times("Times", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> timesNewRoman("Times New Roman", AtomString::ConstructFromLiteral); >+ >+ const AtomString& platformSpecificAlternate = platformAlternateFamilyName(familyName); > if (!platformSpecificAlternate.isNull()) > return platformSpecificAlternate; > >@@ -203,7 +203,7 @@ const AtomicString& FontCache::alternateFamilyName(const AtomicString& familyNam > return nullAtom(); > } > >-FontPlatformData* FontCache::getCachedFontPlatformData(const FontDescription& fontDescription, const AtomicString& passedFamilyName, >+FontPlatformData* FontCache::getCachedFontPlatformData(const FontDescription& fontDescription, const AtomString& passedFamilyName, > const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities, bool checkingAlternateName) > { > #if PLATFORM(IOS_FAMILY) >@@ -214,10 +214,10 @@ FontPlatformData* FontCache::getCachedFontPlatformData(const FontDescription& fo > // Leading "@" in the font name enables Windows vertical flow flag for the font. > // Because we do vertical flow by ourselves, we don't want to use the Windows feature. > // IE disregards "@" regardless of the orientatoin, so we follow the behavior. >- const AtomicString& familyName = (passedFamilyName.isEmpty() || passedFamilyName[0] != '@') ? >- passedFamilyName : AtomicString(passedFamilyName.impl()->substring(1)); >+ const AtomString& familyName = (passedFamilyName.isEmpty() || passedFamilyName[0] != '@') ? >+ passedFamilyName : AtomString(passedFamilyName.impl()->substring(1)); > #else >- const AtomicString& familyName = passedFamilyName; >+ const AtomString& familyName = passedFamilyName; > #endif > > static bool initialized; >@@ -236,7 +236,7 @@ FontPlatformData* FontCache::getCachedFontPlatformData(const FontDescription& fo > if (!it->value && !checkingAlternateName) { > // We were unable to find a font. We have a small set of fonts that we alias to other names, > // e.g., Arial/Helvetica, Courier/Courier New, etc. Try looking up the font under the aliased name. >- const AtomicString& alternateName = alternateFamilyName(familyName); >+ const AtomString& alternateName = alternateFamilyName(familyName); > if (!alternateName.isNull()) { > FontPlatformData* fontPlatformDataForAlternateName = getCachedFontPlatformData(fontDescription, alternateName, fontFaceFeatures, fontFaceVariantSettings, fontFaceCapabilities, true); > // Lookup the key in the hash table again as the previous iterator may have >@@ -320,7 +320,7 @@ const unsigned cTargetInactiveFontData = 200; > const unsigned cMaxUnderMemoryPressureInactiveFontData = 50; > const unsigned cTargetUnderMemoryPressureInactiveFontData = 30; > >-RefPtr<Font> FontCache::fontForFamily(const FontDescription& fontDescription, const AtomicString& family, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities, bool checkingAlternateName) >+RefPtr<Font> FontCache::fontForFamily(const FontDescription& fontDescription, const AtomString& family, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities, bool checkingAlternateName) > { > if (!m_purgeTimer.isActive()) > m_purgeTimer.startOneShot(0_s); >@@ -492,7 +492,7 @@ void FontCache::prewarm(const PrewarmInformation&) > { > } > >-RefPtr<Font> FontCache::similarFont(const FontDescription&, const AtomicString&) >+RefPtr<Font> FontCache::similarFont(const FontDescription&, const AtomString&) > { > return nullptr; > } >diff --git a/Source/WebCore/platform/graphics/FontCache.h b/Source/WebCore/platform/graphics/FontCache.h >index 5aa41df9525027b3df529681ae1e356e5e1e9315..f65bf3ac14b0adf586755ca79949d9bd28dc76d6 100644 >--- a/Source/WebCore/platform/graphics/FontCache.h >+++ b/Source/WebCore/platform/graphics/FontCache.h >@@ -40,7 +40,7 @@ > #include <wtf/RefPtr.h> > #include <wtf/Vector.h> > #include <wtf/WorkQueue.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/WTFString.h> > > #if PLATFORM(COCOA) >@@ -162,7 +162,7 @@ private: > unsigned m_size { 0 }; > FontSelectionRequest m_fontSelectionRequest; > std::array<unsigned, 2> m_flags {{ 0, 0 }}; >- AtomicString m_locale; >+ AtomString m_locale; > FontFeatureSettings m_featureSettings; > #if ENABLE(VARIATION_FONTS) > FontVariationSettings m_variationSettings; >@@ -208,12 +208,12 @@ public: > > // This function exists so CSSFontSelector can have a unified notion of preinstalled fonts and @font-face. > // It comes into play when you create an @font-face which shares a family name as a preinstalled font. >- Vector<FontSelectionCapabilities> getFontSelectionCapabilitiesInFamily(const AtomicString&, AllowUserInstalledFonts); >+ Vector<FontSelectionCapabilities> getFontSelectionCapabilitiesInFamily(const AtomString&, AllowUserInstalledFonts); > >- WEBCORE_EXPORT RefPtr<Font> fontForFamily(const FontDescription&, const AtomicString&, const FontFeatureSettings* fontFaceFeatures = nullptr, const FontVariantSettings* fontFaceVariantSettings = nullptr, FontSelectionSpecifiedCapabilities fontFaceCapabilities = { }, bool checkingAlternateName = false); >+ WEBCORE_EXPORT RefPtr<Font> fontForFamily(const FontDescription&, const AtomString&, const FontFeatureSettings* fontFaceFeatures = nullptr, const FontVariantSettings* fontFaceVariantSettings = nullptr, FontSelectionSpecifiedCapabilities fontFaceCapabilities = { }, bool checkingAlternateName = false); > WEBCORE_EXPORT Ref<Font> lastResortFallbackFont(const FontDescription&); > WEBCORE_EXPORT Ref<Font> fontForPlatformData(const FontPlatformData&); >- RefPtr<Font> similarFont(const FontDescription&, const AtomicString& family); >+ RefPtr<Font> similarFont(const FontDescription&, const AtomString& family); > > void addClient(FontSelector&); > void removeClient(FontSelector&); >@@ -227,14 +227,14 @@ public: > void platformPurgeInactiveFontData(); > > #if PLATFORM(WIN) >- RefPtr<Font> fontFromDescriptionAndLogFont(const FontDescription&, const LOGFONT&, AtomicString& outFontFamilyName); >+ RefPtr<Font> fontFromDescriptionAndLogFont(const FontDescription&, const LOGFONT&, AtomString& outFontFamilyName); > #endif > > #if ENABLE(OPENTYPE_VERTICAL) > RefPtr<OpenTypeVerticalData> verticalData(const FontPlatformData&); > #endif > >- std::unique_ptr<FontPlatformData> createFontPlatformDataForTesting(const FontDescription&, const AtomicString& family); >+ std::unique_ptr<FontPlatformData> createFontPlatformDataForTesting(const FontDescription&, const AtomString& family); > > bool shouldMockBoldSystemFontForAccessibility() const { return m_shouldMockBoldSystemFontForAccessibility; } > void setShouldMockBoldSystemFontForAccessibility(bool shouldMockBoldSystemFontForAccessibility) { m_shouldMockBoldSystemFontForAccessibility = shouldMockBoldSystemFontForAccessibility; } >@@ -259,16 +259,16 @@ private: > WEBCORE_EXPORT void purgeInactiveFontDataIfNeeded(); > > // FIXME: This method should eventually be removed. >- FontPlatformData* getCachedFontPlatformData(const FontDescription&, const AtomicString& family, const FontFeatureSettings* fontFaceFeatures = nullptr, const FontVariantSettings* fontFaceVariantSettings = nullptr, FontSelectionSpecifiedCapabilities fontFaceCapabilities = { }, bool checkingAlternateName = false); >+ FontPlatformData* getCachedFontPlatformData(const FontDescription&, const AtomString& family, const FontFeatureSettings* fontFaceFeatures = nullptr, const FontVariantSettings* fontFaceVariantSettings = nullptr, FontSelectionSpecifiedCapabilities fontFaceCapabilities = { }, bool checkingAlternateName = false); > > // These methods are implemented by each platform. > #if PLATFORM(COCOA) > FontPlatformData* getCustomFallbackFont(const UInt32, const FontDescription&); > #endif >- WEBCORE_EXPORT std::unique_ptr<FontPlatformData> createFontPlatformData(const FontDescription&, const AtomicString& family, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities); >+ WEBCORE_EXPORT std::unique_ptr<FontPlatformData> createFontPlatformData(const FontDescription&, const AtomString& family, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities); > >- static const AtomicString& alternateFamilyName(const AtomicString&); >- static const AtomicString& platformAlternateFamilyName(const AtomicString&); >+ static const AtomString& alternateFamilyName(const AtomString&); >+ static const AtomString& platformAlternateFamilyName(const AtomString&); > > Timer m_purgeTimer; > >@@ -284,7 +284,7 @@ private: > friend class Font; > }; > >-inline std::unique_ptr<FontPlatformData> FontCache::createFontPlatformDataForTesting(const FontDescription& fontDescription, const AtomicString& family) >+inline std::unique_ptr<FontPlatformData> FontCache::createFontPlatformDataForTesting(const FontDescription& fontDescription, const AtomString& family) > { > return createFontPlatformData(fontDescription, family, nullptr, nullptr, { }); > } >diff --git a/Source/WebCore/platform/graphics/FontCascade.cpp b/Source/WebCore/platform/graphics/FontCascade.cpp >index b99179a4f598e57d1bf03194e623fb559d58ff9c..7274db0db32b3b41b3e0e1b1ed0fb2aea8b36a3b 100644 >--- a/Source/WebCore/platform/graphics/FontCascade.cpp >+++ b/Source/WebCore/platform/graphics/FontCascade.cpp >@@ -38,7 +38,7 @@ > #include <wtf/MainThread.h> > #include <wtf/MathExtras.h> > #include <wtf/NeverDestroyed.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/StringBuilder.h> > > #if PLATFORM(WIN) >@@ -49,17 +49,17 @@ namespace WebCore { > > using namespace WTF::Unicode; > >-static bool useBackslashAsYenSignForFamily(const AtomicString& family) >+static bool useBackslashAsYenSignForFamily(const AtomString& family) > { > if (family.isEmpty()) > return false; > static const auto set = makeNeverDestroyed([] { >- HashSet<AtomicString> set; >+ HashSet<AtomString> set; > auto add = [&set] (const char* name, std::initializer_list<UChar> unicodeName) { > unsigned nameLength = strlen(name); >- set.add(AtomicString { name, nameLength, AtomicString::ConstructFromLiteral }); >+ set.add(AtomString { name, nameLength, AtomString::ConstructFromLiteral }); > unsigned unicodeNameLength = unicodeName.size(); >- set.add(AtomicString { unicodeName.begin(), unicodeNameLength }); >+ set.add(AtomString { unicodeName.begin(), unicodeNameLength }); > }; > add("MS PGothic", { 0xFF2D, 0xFF33, 0x0020, 0xFF30, 0x30B4, 0x30B7, 0x30C3, 0x30AF }); > add("MS PMincho", { 0xFF2D, 0xFF33, 0x0020, 0xFF30, 0x660E, 0x671D }); >@@ -152,7 +152,7 @@ bool FontCascade::operator==(const FontCascade& other) const > > struct FontCascadeCacheKey { > FontDescriptionKey fontDescriptionKey; // Shared with the lower level FontCache (caching Font objects) >- Vector<AtomicString, 3> families; >+ Vector<AtomString, 3> families; > unsigned fontSelectorId; > unsigned fontSelectorVersion; > }; >@@ -298,7 +298,7 @@ float FontCascade::drawText(GraphicsContext& context, const TextRun& run, const > return startPoint.x() - startX; > } > >-void FontCascade::drawEmphasisMarks(GraphicsContext& context, const TextRun& run, const AtomicString& mark, const FloatPoint& point, unsigned from, Optional<unsigned> to) const >+void FontCascade::drawEmphasisMarks(GraphicsContext& context, const TextRun& run, const AtomString& mark, const FloatPoint& point, unsigned from, Optional<unsigned> to) const > { > if (isLoadingCustomFonts()) > return; >@@ -486,7 +486,7 @@ GlyphData FontCascade::glyphDataForCharacter(UChar32 c, bool mirror, FontVariant > // all platforms. > bool FontCascade::hasValidAverageCharWidth() const > { >- const AtomicString& family = firstFamily(); >+ const AtomString& family = firstFamily(); > if (family.isEmpty()) > return false; > >@@ -496,7 +496,7 @@ bool FontCascade::hasValidAverageCharWidth() const > return false; > #endif > >- static const auto map = makeNeverDestroyed(HashSet<AtomicString> { >+ static const auto map = makeNeverDestroyed(HashSet<AtomString> { > "American Typewriter", > "Arial Hebrew", > "Chalkboard", >@@ -1307,7 +1307,7 @@ static GlyphUnderlineType computeUnderlineType(const TextRun& textRun, const Gly > > // FIXME: This function may not work if the emphasis mark uses a complex script, but none of the > // standard emphasis marks do so. >-Optional<GlyphData> FontCascade::getEmphasisMarkGlyphData(const AtomicString& mark) const >+Optional<GlyphData> FontCascade::getEmphasisMarkGlyphData(const AtomString& mark) const > { > if (mark.isEmpty()) > return WTF::nullopt; >@@ -1325,7 +1325,7 @@ Optional<GlyphData> FontCascade::getEmphasisMarkGlyphData(const AtomicString& ma > return glyphData.value().isValid() ? glyphData : WTF::nullopt; > } > >-int FontCascade::emphasisMarkAscent(const AtomicString& mark) const >+int FontCascade::emphasisMarkAscent(const AtomString& mark) const > { > Optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark); > if (!markGlyphData) >@@ -1339,7 +1339,7 @@ int FontCascade::emphasisMarkAscent(const AtomicString& mark) const > return markFontData->fontMetrics().ascent(); > } > >-int FontCascade::emphasisMarkDescent(const AtomicString& mark) const >+int FontCascade::emphasisMarkDescent(const AtomString& mark) const > { > Optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark); > if (!markGlyphData) >@@ -1353,7 +1353,7 @@ int FontCascade::emphasisMarkDescent(const AtomicString& mark) const > return markFontData->fontMetrics().descent(); > } > >-int FontCascade::emphasisMarkHeight(const AtomicString& mark) const >+int FontCascade::emphasisMarkHeight(const AtomString& mark) const > { > Optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark); > if (!markGlyphData) >@@ -1429,7 +1429,7 @@ float FontCascade::getGlyphsAndAdvancesForComplexText(const TextRun& run, unsign > } > #endif > >-void FontCascade::drawEmphasisMarksForSimpleText(GraphicsContext& context, const TextRun& run, const AtomicString& mark, const FloatPoint& point, unsigned from, unsigned to) const >+void FontCascade::drawEmphasisMarksForSimpleText(GraphicsContext& context, const TextRun& run, const AtomString& mark, const FloatPoint& point, unsigned from, unsigned to) const > { > GlyphBuffer glyphBuffer; > float initialAdvance = getGlyphsAndAdvancesForSimpleText(run, from, to, glyphBuffer, ForTextEmphasis); >@@ -1500,7 +1500,7 @@ inline static float offsetToMiddleOfGlyphAtIndex(const GlyphBuffer& glyphBuffer, > return offsetToMiddleOfGlyph(glyphBuffer.fontAt(i), glyphBuffer.glyphAt(i)); > } > >-void FontCascade::drawEmphasisMarks(GraphicsContext& context, const GlyphBuffer& glyphBuffer, const AtomicString& mark, const FloatPoint& point) const >+void FontCascade::drawEmphasisMarks(GraphicsContext& context, const GlyphBuffer& glyphBuffer, const AtomString& mark, const FloatPoint& point) const > { > Optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark); > if (!markGlyphData) >@@ -1661,7 +1661,7 @@ const Font* FontCascade::fontForCombiningCharacterSequence(const UChar* characte > } > #endif > >-void FontCascade::drawEmphasisMarksForComplexText(GraphicsContext& context, const TextRun& run, const AtomicString& mark, const FloatPoint& point, unsigned from, unsigned to) const >+void FontCascade::drawEmphasisMarksForComplexText(GraphicsContext& context, const TextRun& run, const AtomString& mark, const FloatPoint& point, unsigned from, unsigned to) const > { > GlyphBuffer glyphBuffer; > float initialAdvance = getGlyphsAndAdvancesForComplexText(run, from, to, glyphBuffer, ForTextEmphasis); >diff --git a/Source/WebCore/platform/graphics/FontCascade.h b/Source/WebCore/platform/graphics/FontCascade.h >index 22be5ea21610a04256137802200106751d30260c..2bcdf106e6c4d6b3c94775d2dd8ee9468f95f6cd 100644 >--- a/Source/WebCore/platform/graphics/FontCascade.h >+++ b/Source/WebCore/platform/graphics/FontCascade.h >@@ -109,7 +109,7 @@ public: > enum CustomFontNotReadyAction { DoNotPaintIfFontNotReady, UseFallbackIfFontNotReady }; > WEBCORE_EXPORT float drawText(GraphicsContext&, const TextRun&, const FloatPoint&, unsigned from = 0, Optional<unsigned> to = WTF::nullopt, CustomFontNotReadyAction = DoNotPaintIfFontNotReady) const; > static void drawGlyphs(GraphicsContext&, const Font&, const GlyphBuffer&, unsigned from, unsigned numGlyphs, const FloatPoint&, FontSmoothingMode); >- void drawEmphasisMarks(GraphicsContext&, const TextRun&, const AtomicString& mark, const FloatPoint&, unsigned from = 0, Optional<unsigned> to = WTF::nullopt) const; >+ void drawEmphasisMarks(GraphicsContext&, const TextRun&, const AtomString& mark, const FloatPoint&, unsigned from = 0, Optional<unsigned> to = WTF::nullopt) const; > > DashArray dashesForIntersectionsWithRect(const TextRun&, const FloatPoint& textOrigin, const FloatRect& lineExtents) const; > >@@ -136,9 +136,9 @@ public: > bool enableKerning() const { return m_enableKerning; } > bool requiresShaping() const { return m_requiresShaping; } > >- const AtomicString& firstFamily() const { return m_fontDescription.firstFamily(); } >+ const AtomString& firstFamily() const { return m_fontDescription.firstFamily(); } > unsigned familyCount() const { return m_fontDescription.familyCount(); } >- const AtomicString& familyAt(unsigned i) const { return m_fontDescription.familyAt(i); } >+ const AtomString& familyAt(unsigned i) const { return m_fontDescription.familyAt(i); } > > // A WTF::nullopt return value indicates "font-style: normal". > Optional<FontSelectionValue> italic() const { return m_fontDescription.italic(); } >@@ -154,9 +154,9 @@ public: > bool hasValidAverageCharWidth() const; > bool fastAverageCharWidthIfAvailable(float &width) const; // returns true on success > >- int emphasisMarkAscent(const AtomicString&) const; >- int emphasisMarkDescent(const AtomicString&) const; >- int emphasisMarkHeight(const AtomicString&) const; >+ int emphasisMarkAscent(const AtomString&) const; >+ int emphasisMarkDescent(const AtomString&) const; >+ int emphasisMarkHeight(const AtomString&) const; > > const Font& primaryFont() const; > const FontRanges& fallbackRangesAt(unsigned) const; >@@ -206,21 +206,21 @@ private: > float glyphBufferForTextRun(CodePath, const TextRun&, unsigned from, unsigned to, GlyphBuffer&) const; > // Returns the initial in-stream advance. > float getGlyphsAndAdvancesForSimpleText(const TextRun&, unsigned from, unsigned to, GlyphBuffer&, ForTextEmphasisOrNot = NotForTextEmphasis) const; >- void drawEmphasisMarksForSimpleText(GraphicsContext&, const TextRun&, const AtomicString& mark, const FloatPoint&, unsigned from, unsigned to) const; >+ void drawEmphasisMarksForSimpleText(GraphicsContext&, const TextRun&, const AtomString& mark, const FloatPoint&, unsigned from, unsigned to) const; > void drawGlyphBuffer(GraphicsContext&, const GlyphBuffer&, FloatPoint&, CustomFontNotReadyAction) const; >- void drawEmphasisMarks(GraphicsContext&, const GlyphBuffer&, const AtomicString&, const FloatPoint&) const; >+ void drawEmphasisMarks(GraphicsContext&, const GlyphBuffer&, const AtomString&, const FloatPoint&) const; > float floatWidthForSimpleText(const TextRun&, HashSet<const Font*>* fallbackFonts = 0, GlyphOverflow* = 0) const; > int offsetForPositionForSimpleText(const TextRun&, float position, bool includePartialGlyphs) const; > void adjustSelectionRectForSimpleText(const TextRun&, LayoutRect& selectionRect, unsigned from, unsigned to) const; > >- Optional<GlyphData> getEmphasisMarkGlyphData(const AtomicString&) const; >+ Optional<GlyphData> getEmphasisMarkGlyphData(const AtomString&) const; > > static bool canReturnFallbackFontsForComplexText(); > static bool canExpandAroundIdeographsInComplexText(); > > // Returns the initial in-stream advance. > float getGlyphsAndAdvancesForComplexText(const TextRun&, unsigned from, unsigned to, GlyphBuffer&, ForTextEmphasisOrNot = NotForTextEmphasis) const; >- void drawEmphasisMarksForComplexText(GraphicsContext&, const TextRun&, const AtomicString& mark, const FloatPoint&, unsigned from, unsigned to) const; >+ void drawEmphasisMarksForComplexText(GraphicsContext&, const TextRun&, const AtomString& mark, const FloatPoint&, unsigned from, unsigned to) const; > float floatWidthForComplexText(const TextRun&, HashSet<const Font*>* fallbackFonts = 0, GlyphOverflow* = 0) const; > int offsetForPositionForComplexText(const TextRun&, float position, bool includePartialGlyphs) const; > void adjustSelectionRectForComplexText(const TextRun&, LayoutRect& selectionRect, unsigned from, unsigned to) const; >diff --git a/Source/WebCore/platform/graphics/FontCascadeDescription.cpp b/Source/WebCore/platform/graphics/FontCascadeDescription.cpp >index 3fc96bff9cdf3a57047d73180cdd931d3a8733d0..34e5b8fce99bfbe67c25631741be968a74671308 100644 >--- a/Source/WebCore/platform/graphics/FontCascadeDescription.cpp >+++ b/Source/WebCore/platform/graphics/FontCascadeDescription.cpp >@@ -41,7 +41,7 @@ struct SameSizeAsFontCascadeDescription { > #else > char c; > #endif >- AtomicString string; >+ AtomString string; > int16_t fontSelectionRequest[3]; > float size; > unsigned bitfields1; >@@ -118,7 +118,7 @@ bool FontCascadeDescription::familiesEqualForTextAutoSizing(const FontCascadeDes > > #endif // ENABLE(TEXT_AUTOSIZING) > >-bool FontCascadeDescription::familyNamesAreEqual(const AtomicString& family1, const AtomicString& family2) >+bool FontCascadeDescription::familyNamesAreEqual(const AtomString& family1, const AtomString& family2) > { > #if PLATFORM(COCOA) > if (family1.startsWith('.')) >@@ -127,7 +127,7 @@ bool FontCascadeDescription::familyNamesAreEqual(const AtomicString& family1, co > return ASCIICaseInsensitiveHash::equal(family1, family2); > } > >-unsigned FontCascadeDescription::familyNameHash(const AtomicString& family) >+unsigned FontCascadeDescription::familyNameHash(const AtomString& family) > { > #if PLATFORM(COCOA) > if (family.startsWith('.')) >diff --git a/Source/WebCore/platform/graphics/FontCascadeDescription.h b/Source/WebCore/platform/graphics/FontCascadeDescription.h >index 0d51c5a1819549b42f4563842c562b1561c9abda..5b04052fa655db81809832be1f154c16c629b08d 100644 >--- a/Source/WebCore/platform/graphics/FontCascadeDescription.h >+++ b/Source/WebCore/platform/graphics/FontCascadeDescription.h >@@ -43,7 +43,7 @@ typedef FontFamilySpecificationCoreText FontFamilyPlatformSpecification; > typedef FontFamilySpecificationNull FontFamilyPlatformSpecification; > #endif > >-typedef Variant<AtomicString, FontFamilyPlatformSpecification> FontFamilySpecification; >+typedef Variant<AtomString, FontFamilyPlatformSpecification> FontFamilySpecification; > > class FontCascadeDescription : public FontDescription { > public: >@@ -53,12 +53,12 @@ public: > bool operator!=(const FontCascadeDescription& other) const { return !(*this == other); } > > unsigned familyCount() const { return m_families.size(); } >- const AtomicString& firstFamily() const { return familyAt(0); } >- const AtomicString& familyAt(unsigned i) const { return m_families[i]; } >- const RefCountedArray<AtomicString>& families() const { return m_families; } >+ const AtomString& firstFamily() const { return familyAt(0); } >+ const AtomString& familyAt(unsigned i) const { return m_families[i]; } >+ const RefCountedArray<AtomString>& families() const { return m_families; } > >- static bool familyNamesAreEqual(const AtomicString&, const AtomicString&); >- static unsigned familyNameHash(const AtomicString&); >+ static bool familyNamesAreEqual(const AtomString&, const AtomString&); >+ static unsigned familyNameHash(const AtomString&); > static String foldedFamilyName(const String&); > > unsigned effectiveFamilyCount() const; >@@ -85,9 +85,9 @@ public: > FontSmoothingMode fontSmoothing() const { return static_cast<FontSmoothingMode>(m_fontSmoothing); } > bool isSpecifiedFont() const { return m_isSpecifiedFont; } > >- void setOneFamily(const AtomicString& family) { ASSERT(m_families.size() == 1); m_families[0] = family; } >- void setFamilies(const Vector<AtomicString>& families) { m_families = RefCountedArray<AtomicString>(families); } >- void setFamilies(const RefCountedArray<AtomicString>& families) { m_families = families; } >+ void setOneFamily(const AtomString& family) { ASSERT(m_families.size() == 1); m_families[0] = family; } >+ void setFamilies(const Vector<AtomString>& families) { m_families = RefCountedArray<AtomString>(families); } >+ void setFamilies(const RefCountedArray<AtomString>& families) { m_families = families; } > void setSpecifiedSize(float s) { m_specifiedSize = clampToFloat(s); } > void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; } > void setKerning(Kerning kerning) { m_kerning = static_cast<unsigned>(kerning); } >@@ -132,10 +132,10 @@ public: > static FontVariantCaps initialVariantCaps() { return FontVariantCaps::Normal; } > static FontVariantAlternates initialVariantAlternates() { return FontVariantAlternates::Normal; } > static FontOpticalSizing initialOpticalSizing() { return FontOpticalSizing::Enabled; } >- static const AtomicString& initialLocale() { return nullAtom(); } >+ static const AtomString& initialLocale() { return nullAtom(); } > > private: >- RefCountedArray<AtomicString> m_families { 1 }; >+ RefCountedArray<AtomString> m_families { 1 }; > > // Specified CSS value. Independent of rendering issues such as integer rounding, minimum font sizes, and zooming. > float m_specifiedSize { 0 }; >diff --git a/Source/WebCore/platform/graphics/FontCascadeFonts.cpp b/Source/WebCore/platform/graphics/FontCascadeFonts.cpp >index a9f41e1773b0014d5cbbd2f7ee1446dad4dd821d..694469c0eb62ad9c84e9bbd08fa13426409069a9 100644 >--- a/Source/WebCore/platform/graphics/FontCascadeFonts.cpp >+++ b/Source/WebCore/platform/graphics/FontCascadeFonts.cpp >@@ -140,7 +140,7 @@ static FontRanges realizeNextFallback(const FontCascadeDescription& description, > > auto& fontCache = FontCache::singleton(); > while (index < description.effectiveFamilyCount()) { >- auto visitor = WTF::makeVisitor([&](const AtomicString& family) -> FontRanges { >+ auto visitor = WTF::makeVisitor([&](const AtomString& family) -> FontRanges { > if (family.isEmpty()) > return FontRanges(); > if (fontSelector) { >diff --git a/Source/WebCore/platform/graphics/FontDescription.cpp b/Source/WebCore/platform/graphics/FontDescription.cpp >index b8b46e775cd91b1c6fee68c142298450ec2d60cf..8a924f9a650c44d7ef05879ad3fe5175e2fd0896 100644 >--- a/Source/WebCore/platform/graphics/FontDescription.cpp >+++ b/Source/WebCore/platform/graphics/FontDescription.cpp >@@ -65,14 +65,14 @@ FontDescription::FontDescription() > { > } > >-void FontDescription::setLocale(const AtomicString& locale) >+void FontDescription::setLocale(const AtomString& locale) > { > m_locale = locale; > m_script = localeToScriptCodeForFontSelection(m_locale); > } > > #if !PLATFORM(COCOA) >-AtomicString FontDescription::platformResolveGenericFamily(UScriptCode, const AtomicString&, const AtomicString&) >+AtomString FontDescription::platformResolveGenericFamily(UScriptCode, const AtomString&, const AtomString&) > { > return nullAtom(); > } >diff --git a/Source/WebCore/platform/graphics/FontDescription.h b/Source/WebCore/platform/graphics/FontDescription.h >index cb05cf5aeb9557851b4f309be6edb4ce6328d05f..18f1de187f51f1cc7c7ca08f9a88193db8274567 100644 >--- a/Source/WebCore/platform/graphics/FontDescription.h >+++ b/Source/WebCore/platform/graphics/FontDescription.h >@@ -53,7 +53,7 @@ public: > FontRenderingMode renderingMode() const { return static_cast<FontRenderingMode>(m_renderingMode); } > TextRenderingMode textRenderingMode() const { return static_cast<TextRenderingMode>(m_textRendering); } > UScriptCode script() const { return static_cast<UScriptCode>(m_script); } >- const AtomicString& locale() const { return m_locale; } >+ const AtomString& locale() const { return m_locale; } > > FontOrientation orientation() const { return static_cast<FontOrientation>(m_orientation); } > NonCJKGlyphOrientation nonCJKGlyphOrientation() const { return static_cast<NonCJKGlyphOrientation>(m_nonCJKGlyphOrientation); } >@@ -108,7 +108,7 @@ public: > void setOrientation(FontOrientation orientation) { m_orientation = static_cast<unsigned>(orientation); } > void setNonCJKGlyphOrientation(NonCJKGlyphOrientation orientation) { m_nonCJKGlyphOrientation = static_cast<unsigned>(orientation); } > void setWidthVariant(FontWidthVariant widthVariant) { m_widthVariant = static_cast<unsigned>(widthVariant); } // Make sure new callers of this sync with FontPlatformData::isForTextCombine()! >- void setLocale(const AtomicString&); >+ void setLocale(const AtomString&); > void setFeatureSettings(FontFeatureSettings&& settings) { m_featureSettings = WTFMove(settings); } > #if ENABLE(VARIATION_FONTS) > void setVariationSettings(FontVariationSettings&& settings) { m_variationSettings = WTFMove(settings); } >@@ -133,13 +133,13 @@ public: > void setFontStyleAxis(FontStyleAxis axis) { m_fontStyleAxis = axis == FontStyleAxis::ital; } > void setShouldAllowUserInstalledFonts(AllowUserInstalledFonts shouldAllowUserInstalledFonts) { m_shouldAllowUserInstalledFonts = static_cast<unsigned>(shouldAllowUserInstalledFonts); } > >- static AtomicString platformResolveGenericFamily(UScriptCode, const AtomicString& locale, const AtomicString& familyName); >+ static AtomString platformResolveGenericFamily(UScriptCode, const AtomString& locale, const AtomString& familyName); > > private: > // FIXME: Investigate moving these into their own object on the heap (to save memory). > FontFeatureSettings m_featureSettings; > FontVariationSettings m_variationSettings; >- AtomicString m_locale; >+ AtomString m_locale; > > FontSelectionRequest m_fontSelectionRequest; > float m_computedSize { 0 }; // Computed size adjusted for the minimum font size and the zoom factor. >diff --git a/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp b/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp >index 15c0387698260f405e22e5bf527800308c7fe3bf..81ba158d97b082d6cdfbf0c3215d7d24eef09157 100644 >--- a/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp >+++ b/Source/WebCore/platform/graphics/FontFamilySpecificationNull.cpp >@@ -27,7 +27,7 @@ > #include "FontFamilySpecificationNull.h" > > #include "FontSelector.h" >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >diff --git a/Source/WebCore/platform/graphics/FontGenericFamilies.cpp b/Source/WebCore/platform/graphics/FontGenericFamilies.cpp >index d43c0bdbdaf84ea13390fbf6003e38239a2c24dc..172b721acf5e821c4301c2f282a9f8215fdbaac1 100644 >--- a/Source/WebCore/platform/graphics/FontGenericFamilies.cpp >+++ b/Source/WebCore/platform/graphics/FontGenericFamilies.cpp >@@ -30,11 +30,11 @@ > > namespace WebCore { > >-static bool setGenericFontFamilyForScript(ScriptFontFamilyMap& fontMap, const AtomicString& family, UScriptCode script) >+static bool setGenericFontFamilyForScript(ScriptFontFamilyMap& fontMap, const AtomString& family, UScriptCode script) > { > if (family.isEmpty()) > return fontMap.remove(static_cast<int>(script)); >- auto& familyInMap = fontMap.add(static_cast<int>(script), AtomicString { }).iterator->value; >+ auto& familyInMap = fontMap.add(static_cast<int>(script), AtomString { }).iterator->value; > if (familyInMap == family) > return false; > familyInMap = family; >@@ -64,7 +64,7 @@ static void languageChanged(void*) > cachedUserPrefersSimplified() = computeUserPrefersSimplified(); > } > >-static const AtomicString& genericFontFamilyForScript(const ScriptFontFamilyMap& fontMap, UScriptCode script) >+static const AtomString& genericFontFamilyForScript(const ScriptFontFamilyMap& fontMap, UScriptCode script) > { > ScriptFontFamilyMap::const_iterator it = fontMap.find(static_cast<int>(script)); > if (it != fontMap.end()) >@@ -87,72 +87,72 @@ FontGenericFamilies::FontGenericFamilies() > languageChanged(nullptr); > } > >-const AtomicString& FontGenericFamilies::standardFontFamily(UScriptCode script) const >+const AtomString& FontGenericFamilies::standardFontFamily(UScriptCode script) const > { > return genericFontFamilyForScript(m_standardFontFamilyMap, script); > } > >-const AtomicString& FontGenericFamilies::fixedFontFamily(UScriptCode script) const >+const AtomString& FontGenericFamilies::fixedFontFamily(UScriptCode script) const > { > return genericFontFamilyForScript(m_fixedFontFamilyMap, script); > } > >-const AtomicString& FontGenericFamilies::serifFontFamily(UScriptCode script) const >+const AtomString& FontGenericFamilies::serifFontFamily(UScriptCode script) const > { > return genericFontFamilyForScript(m_serifFontFamilyMap, script); > } > >-const AtomicString& FontGenericFamilies::sansSerifFontFamily(UScriptCode script) const >+const AtomString& FontGenericFamilies::sansSerifFontFamily(UScriptCode script) const > { > return genericFontFamilyForScript(m_sansSerifFontFamilyMap, script); > } > >-const AtomicString& FontGenericFamilies::cursiveFontFamily(UScriptCode script) const >+const AtomString& FontGenericFamilies::cursiveFontFamily(UScriptCode script) const > { > return genericFontFamilyForScript(m_cursiveFontFamilyMap, script); > } > >-const AtomicString& FontGenericFamilies::fantasyFontFamily(UScriptCode script) const >+const AtomString& FontGenericFamilies::fantasyFontFamily(UScriptCode script) const > { > return genericFontFamilyForScript(m_fantasyFontFamilyMap, script); > } > >-const AtomicString& FontGenericFamilies::pictographFontFamily(UScriptCode script) const >+const AtomString& FontGenericFamilies::pictographFontFamily(UScriptCode script) const > { > return genericFontFamilyForScript(m_pictographFontFamilyMap, script); > } > >-bool FontGenericFamilies::setStandardFontFamily(const AtomicString& family, UScriptCode script) >+bool FontGenericFamilies::setStandardFontFamily(const AtomString& family, UScriptCode script) > { > return setGenericFontFamilyForScript(m_standardFontFamilyMap, family, script); > } > >-bool FontGenericFamilies::setFixedFontFamily(const AtomicString& family, UScriptCode script) >+bool FontGenericFamilies::setFixedFontFamily(const AtomString& family, UScriptCode script) > { > return setGenericFontFamilyForScript(m_fixedFontFamilyMap, family, script); > } > >-bool FontGenericFamilies::setSerifFontFamily(const AtomicString& family, UScriptCode script) >+bool FontGenericFamilies::setSerifFontFamily(const AtomString& family, UScriptCode script) > { > return setGenericFontFamilyForScript(m_serifFontFamilyMap, family, script); > } > >-bool FontGenericFamilies::setSansSerifFontFamily(const AtomicString& family, UScriptCode script) >+bool FontGenericFamilies::setSansSerifFontFamily(const AtomString& family, UScriptCode script) > { > return setGenericFontFamilyForScript(m_sansSerifFontFamilyMap, family, script); > } > >-bool FontGenericFamilies::setCursiveFontFamily(const AtomicString& family, UScriptCode script) >+bool FontGenericFamilies::setCursiveFontFamily(const AtomString& family, UScriptCode script) > { > return setGenericFontFamilyForScript(m_cursiveFontFamilyMap, family, script); > } > >-bool FontGenericFamilies::setFantasyFontFamily(const AtomicString& family, UScriptCode script) >+bool FontGenericFamilies::setFantasyFontFamily(const AtomString& family, UScriptCode script) > { > return setGenericFontFamilyForScript(m_fantasyFontFamilyMap, family, script); > } > >-bool FontGenericFamilies::setPictographFontFamily(const AtomicString& family, UScriptCode script) >+bool FontGenericFamilies::setPictographFontFamily(const AtomString& family, UScriptCode script) > { > return setGenericFontFamilyForScript(m_pictographFontFamilyMap, family, script); > } >diff --git a/Source/WebCore/platform/graphics/FontGenericFamilies.h b/Source/WebCore/platform/graphics/FontGenericFamilies.h >index 42f42b2e5cd11204f8c6c154267e4b8ce24c5b7a..685868dda527fd8a0d06f1dcdea5bf4a1b0fdad2 100644 >--- a/Source/WebCore/platform/graphics/FontGenericFamilies.h >+++ b/Source/WebCore/platform/graphics/FontGenericFamilies.h >@@ -28,8 +28,8 @@ > > #include <unicode/uscript.h> > #include <wtf/HashMap.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -42,28 +42,28 @@ struct UScriptCodeHashTraits : WTF::GenericHashTraits<int> { > static bool isDeletedValue(int value) { return value == -3; } > }; > >-typedef HashMap<int, AtomicString, DefaultHash<int>::Hash, UScriptCodeHashTraits> ScriptFontFamilyMap; >+typedef HashMap<int, AtomString, DefaultHash<int>::Hash, UScriptCodeHashTraits> ScriptFontFamilyMap; > > class FontGenericFamilies { > WTF_MAKE_FAST_ALLOCATED; > public: > FontGenericFamilies(); > >- const AtomicString& standardFontFamily(UScriptCode = USCRIPT_COMMON) const; >- const AtomicString& fixedFontFamily(UScriptCode = USCRIPT_COMMON) const; >- const AtomicString& serifFontFamily(UScriptCode = USCRIPT_COMMON) const; >- const AtomicString& sansSerifFontFamily(UScriptCode = USCRIPT_COMMON) const; >- const AtomicString& cursiveFontFamily(UScriptCode = USCRIPT_COMMON) const; >- const AtomicString& fantasyFontFamily(UScriptCode = USCRIPT_COMMON) const; >- const AtomicString& pictographFontFamily(UScriptCode = USCRIPT_COMMON) const; >+ const AtomString& standardFontFamily(UScriptCode = USCRIPT_COMMON) const; >+ const AtomString& fixedFontFamily(UScriptCode = USCRIPT_COMMON) const; >+ const AtomString& serifFontFamily(UScriptCode = USCRIPT_COMMON) const; >+ const AtomString& sansSerifFontFamily(UScriptCode = USCRIPT_COMMON) const; >+ const AtomString& cursiveFontFamily(UScriptCode = USCRIPT_COMMON) const; >+ const AtomString& fantasyFontFamily(UScriptCode = USCRIPT_COMMON) const; >+ const AtomString& pictographFontFamily(UScriptCode = USCRIPT_COMMON) const; > >- bool setStandardFontFamily(const AtomicString&, UScriptCode); >- bool setFixedFontFamily(const AtomicString&, UScriptCode); >- bool setSerifFontFamily(const AtomicString&, UScriptCode); >- bool setSansSerifFontFamily(const AtomicString&, UScriptCode); >- bool setCursiveFontFamily(const AtomicString&, UScriptCode); >- bool setFantasyFontFamily(const AtomicString&, UScriptCode); >- bool setPictographFontFamily(const AtomicString&, UScriptCode); >+ bool setStandardFontFamily(const AtomString&, UScriptCode); >+ bool setFixedFontFamily(const AtomString&, UScriptCode); >+ bool setSerifFontFamily(const AtomString&, UScriptCode); >+ bool setSansSerifFontFamily(const AtomString&, UScriptCode); >+ bool setCursiveFontFamily(const AtomString&, UScriptCode); >+ bool setFantasyFontFamily(const AtomString&, UScriptCode); >+ bool setPictographFontFamily(const AtomString&, UScriptCode); > > private: > ScriptFontFamilyMap m_standardFontFamilyMap; >diff --git a/Source/WebCore/platform/graphics/FontPlatformData.h b/Source/WebCore/platform/graphics/FontPlatformData.h >index 6cd022ceec64ef9309702bd4a38818db76346cea..1ca975e9f788d3b3049e300ef484d3b2b45c7be3 100644 >--- a/Source/WebCore/platform/graphics/FontPlatformData.h >+++ b/Source/WebCore/platform/graphics/FontPlatformData.h >@@ -80,7 +80,7 @@ public: > FontPlatformData(WTF::HashTableDeletedValueType); > FontPlatformData(); > >- FontPlatformData(const FontDescription&, const AtomicString& family); >+ FontPlatformData(const FontDescription&, const AtomString& family); > FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, FontOrientation = FontOrientation::Horizontal, FontWidthVariant = FontWidthVariant::RegularWidth, TextRenderingMode = TextRenderingMode::AutoTextRendering); > > #if PLATFORM(COCOA) >diff --git a/Source/WebCore/platform/graphics/FontSelector.h b/Source/WebCore/platform/graphics/FontSelector.h >index 04dd33ea4805abce37296bc273f68da5089735fa..ac9c1696d1437fc5481aa63980b61006d85c2f50 100644 >--- a/Source/WebCore/platform/graphics/FontSelector.h >+++ b/Source/WebCore/platform/graphics/FontSelector.h >@@ -47,12 +47,12 @@ class FontSelector : public RefCounted<FontSelector> { > public: > virtual ~FontSelector() = default; > >- virtual FontRanges fontRangesForFamily(const FontDescription&, const AtomicString&) = 0; >+ virtual FontRanges fontRangesForFamily(const FontDescription&, const AtomString&) = 0; > virtual RefPtr<Font> fallbackFontAt(const FontDescription&, size_t) = 0; > > virtual size_t fallbackFontCount() = 0; > >- virtual void opportunisticallyStartFontDataURLLoading(const FontCascadeDescription&, const AtomicString& family) = 0; >+ virtual void opportunisticallyStartFontDataURLLoading(const FontCascadeDescription&, const AtomString& family) = 0; > > virtual void fontCacheInvalidated() { } > >diff --git a/Source/WebCore/platform/graphics/FontTaggedSettings.cpp b/Source/WebCore/platform/graphics/FontTaggedSettings.cpp >index d35eb16ba52ad03f07a4efed041bfbe884033610..4e608f1925a578adc06a819798ab557ccd31571c 100644 >--- a/Source/WebCore/platform/graphics/FontTaggedSettings.cpp >+++ b/Source/WebCore/platform/graphics/FontTaggedSettings.cpp >@@ -28,7 +28,7 @@ > #include "FontTaggedSettings.h" > > #include <wtf/Hasher.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/TextStream.h> > > namespace WebCore { >diff --git a/Source/WebCore/platform/graphics/GraphicsContext.cpp b/Source/WebCore/platform/graphics/GraphicsContext.cpp >index 1332c940fd102763df4d08dd26f8caa241cefad5..7d1db7d3db2be971962198d4f936e9a418ba81e4 100644 >--- a/Source/WebCore/platform/graphics/GraphicsContext.cpp >+++ b/Source/WebCore/platform/graphics/GraphicsContext.cpp >@@ -666,7 +666,7 @@ void GraphicsContext::drawGlyphs(const Font& font, const GlyphBuffer& buffer, un > FontCascade::drawGlyphs(*this, font, buffer, from, numGlyphs, point, fontSmoothingMode); > } > >-void GraphicsContext::drawEmphasisMarks(const FontCascade& font, const TextRun& run, const AtomicString& mark, const FloatPoint& point, unsigned from, Optional<unsigned> to) >+void GraphicsContext::drawEmphasisMarks(const FontCascade& font, const TextRun& run, const AtomString& mark, const FloatPoint& point, unsigned from, Optional<unsigned> to) > { > if (paintingDisabled()) > return; >diff --git a/Source/WebCore/platform/graphics/GraphicsContext.h b/Source/WebCore/platform/graphics/GraphicsContext.h >index 638b7671c9ecb53ab8efb5b8f3ed3a2c3f36e4c4..b8407ef9345f7b7d5e3865cc458f43d46e40d5b3 100644 >--- a/Source/WebCore/platform/graphics/GraphicsContext.h >+++ b/Source/WebCore/platform/graphics/GraphicsContext.h >@@ -423,7 +423,7 @@ public: > > float drawText(const FontCascade&, const TextRun&, const FloatPoint&, unsigned from = 0, Optional<unsigned> to = WTF::nullopt); > void drawGlyphs(const Font&, const GlyphBuffer&, unsigned from, unsigned numGlyphs, const FloatPoint&, FontSmoothingMode); >- void drawEmphasisMarks(const FontCascade&, const TextRun&, const AtomicString& mark, const FloatPoint&, unsigned from = 0, Optional<unsigned> to = WTF::nullopt); >+ void drawEmphasisMarks(const FontCascade&, const TextRun&, const AtomString& mark, const FloatPoint&, unsigned from = 0, Optional<unsigned> to = WTF::nullopt); > void drawBidiText(const FontCascade&, const TextRun&, const FloatPoint&, FontCascade::CustomFontNotReadyAction = FontCascade::DoNotPaintIfFontNotReady); > > void applyState(const GraphicsContextState&); >diff --git a/Source/WebCore/platform/graphics/InbandTextTrackPrivate.h b/Source/WebCore/platform/graphics/InbandTextTrackPrivate.h >index 13f187893b440ffb58d3beb1f63f4b4d213b5685..b33423583da6b5a4f7bcc59d0107f7966d6e6f03 100644 >--- a/Source/WebCore/platform/graphics/InbandTextTrackPrivate.h >+++ b/Source/WebCore/platform/graphics/InbandTextTrackPrivate.h >@@ -69,10 +69,10 @@ public: > virtual bool isMainProgramContent() const { return true; } > virtual bool isEasyToRead() const { return false; } > virtual bool isDefault() const { return false; } >- AtomicString label() const override { return emptyAtom(); } >- AtomicString language() const override { return emptyAtom(); } >- AtomicString id() const override { return emptyAtom(); } >- virtual AtomicString inBandMetadataTrackDispatchType() const { return emptyAtom(); } >+ AtomString label() const override { return emptyAtom(); } >+ AtomString language() const override { return emptyAtom(); } >+ AtomString id() const override { return emptyAtom(); } >+ virtual AtomString inBandMetadataTrackDispatchType() const { return emptyAtom(); } > > virtual int textTrackIndex() const { return 0; } > >diff --git a/Source/WebCore/platform/graphics/MediaPlayer.cpp b/Source/WebCore/platform/graphics/MediaPlayer.cpp >index 5a704b3222c5bc68ba4a61406c95d78cbb408334..01149c452e3774be5bd76ad0f9e31e4e6628fe5a 100644 >--- a/Source/WebCore/platform/graphics/MediaPlayer.cpp >+++ b/Source/WebCore/platform/graphics/MediaPlayer.cpp >@@ -287,15 +287,15 @@ static void addMediaEngine(CreateMediaEnginePlayer&& constructor, MediaEngineSup > mutableInstalledMediaEnginesVector().append(MediaPlayerFactory { WTFMove(constructor), getSupportedTypes, supportsType, originsInMediaCache, clearMediaCache, clearMediaCacheForOrigins, supportsKeySystem }); > } > >-static const AtomicString& applicationOctetStream() >+static const AtomString& applicationOctetStream() > { >- static NeverDestroyed<const AtomicString> applicationOctetStream("application/octet-stream", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> applicationOctetStream("application/octet-stream", AtomString::ConstructFromLiteral); > return applicationOctetStream; > } > >-static const AtomicString& textPlain() >+static const AtomString& textPlain() > { >- static NeverDestroyed<const AtomicString> textPlain("text/plain", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> textPlain("text/plain", AtomString::ConstructFromLiteral); > return textPlain; > } > >@@ -390,7 +390,7 @@ bool MediaPlayer::load(const URL& url, const ContentType& contentType, const Str > #endif > > // If the MIME type is missing or is not meaningful, try to figure it out from the URL. >- AtomicString containerType = m_contentType.containerType(); >+ AtomString containerType = m_contentType.containerType(); > if (containerType.isEmpty() || containerType == applicationOctetStream() || containerType == textPlain()) { > if (m_url.protocolIsData()) > m_contentType = ContentType(mimeTypeFromDataURL(m_url.string())); >@@ -920,7 +920,7 @@ MediaPlayer::SupportsType MediaPlayer::supportsType(const MediaEngineSupportPara > { > // 4.8.10.3 MIME types - The canPlayType(type) method must return the empty string if type is a type that the > // user agent knows it cannot render or is the type "application/octet-stream" >- AtomicString containerType = parameters.type.containerType(); >+ AtomString containerType = parameters.type.containerType(); > if (containerType == applicationOctetStream()) > return IsNotSupported; > >@@ -1498,7 +1498,7 @@ void MediaPlayerFactorySupport::callRegisterMediaEngine(MediaEngineRegister regi > registerMediaEngine(addMediaEngine); > } > >-bool MediaPlayer::doesHaveAttribute(const AtomicString& attribute, AtomicString* value) const >+bool MediaPlayer::doesHaveAttribute(const AtomString& attribute, AtomString* value) const > { > return client().doesHaveAttribute(attribute, value); > } >diff --git a/Source/WebCore/platform/graphics/MediaPlayer.h b/Source/WebCore/platform/graphics/MediaPlayer.h >index 3e1263bbb63a387fe2c2fb4e16d0d07f7fce6de6..7fe84d793706cd408c0e5aa71c3d458f06e4edf7 100644 >--- a/Source/WebCore/platform/graphics/MediaPlayer.h >+++ b/Source/WebCore/platform/graphics/MediaPlayer.h >@@ -194,7 +194,7 @@ public: > virtual bool mediaPlayerIsLooping() const { return false; } > virtual CachedResourceLoader* mediaPlayerCachedResourceLoader() { return nullptr; } > virtual RefPtr<PlatformMediaResourceLoader> mediaPlayerCreateResourceLoader() { return nullptr; } >- virtual bool doesHaveAttribute(const AtomicString&, AtomicString* = nullptr) const { return false; } >+ virtual bool doesHaveAttribute(const AtomString&, AtomString* = nullptr) const { return false; } > virtual bool mediaPlayerShouldUsePersistentCache() const { return true; } > virtual const String& mediaPlayerMediaCacheDirectory() const { return emptyString(); } > >@@ -267,7 +267,7 @@ public: > bool supportsScanning() const; > bool canSaveMediaData() const; > bool requiresImmediateCompositing() const; >- bool doesHaveAttribute(const AtomicString&, AtomicString* value = nullptr) const; >+ bool doesHaveAttribute(const AtomString&, AtomString* value = nullptr) const; > PlatformLayer* platformLayer() const; > > #if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)) >diff --git a/Source/WebCore/platform/graphics/SourceBufferPrivate.h b/Source/WebCore/platform/graphics/SourceBufferPrivate.h >index 594770337da60490d773b295d245602de3f78934..46e302d318e6b5ad6779397a2e8ff1583a0d131c 100644 >--- a/Source/WebCore/platform/graphics/SourceBufferPrivate.h >+++ b/Source/WebCore/platform/graphics/SourceBufferPrivate.h >@@ -55,14 +55,14 @@ public: > virtual MediaPlayer::ReadyState readyState() const = 0; > virtual void setReadyState(MediaPlayer::ReadyState) = 0; > >- virtual void flush(const AtomicString&) { } >- virtual void enqueueSample(Ref<MediaSample>&&, const AtomicString&) { } >- virtual void allSamplesInTrackEnqueued(const AtomicString&) { } >- virtual bool isReadyForMoreSamples(const AtomicString&) { return false; } >+ virtual void flush(const AtomString&) { } >+ virtual void enqueueSample(Ref<MediaSample>&&, const AtomString&) { } >+ virtual void allSamplesInTrackEnqueued(const AtomString&) { } >+ virtual bool isReadyForMoreSamples(const AtomString&) { return false; } > virtual void setActive(bool) { } >- virtual void notifyClientWhenReadyForMoreSamples(const AtomicString&) { } >+ virtual void notifyClientWhenReadyForMoreSamples(const AtomString&) { } > >- virtual Vector<String> enqueuedSamplesForTrackID(const AtomicString&) { return { }; } >+ virtual Vector<String> enqueuedSamplesForTrackID(const AtomString&) { return { }; } > > virtual bool canSwitchToType(const ContentType&) { return false; } > >diff --git a/Source/WebCore/platform/graphics/SourceBufferPrivateClient.h b/Source/WebCore/platform/graphics/SourceBufferPrivateClient.h >index 0b6adbeeca414160804d21b9d7a29c2aa83a0878..00565a91fea98a6418a44620cbc366e9e8f10ad5 100644 >--- a/Source/WebCore/platform/graphics/SourceBufferPrivateClient.h >+++ b/Source/WebCore/platform/graphics/SourceBufferPrivateClient.h >@@ -68,8 +68,8 @@ public: > virtual bool sourceBufferPrivateHasAudio() const = 0; > virtual bool sourceBufferPrivateHasVideo() const = 0; > >- virtual void sourceBufferPrivateReenqueSamples(const AtomicString& trackID) = 0; >- virtual void sourceBufferPrivateDidBecomeReadyForMoreSamples(const AtomicString& trackID) = 0; >+ virtual void sourceBufferPrivateReenqueSamples(const AtomString& trackID) = 0; >+ virtual void sourceBufferPrivateDidBecomeReadyForMoreSamples(const AtomString& trackID) = 0; > > virtual MediaTime sourceBufferPrivateFastSeekTimeForMediaTime(const MediaTime&, const MediaTime&, const MediaTime&) = 0; > >diff --git a/Source/WebCore/platform/graphics/TrackPrivateBase.h b/Source/WebCore/platform/graphics/TrackPrivateBase.h >index 4766622bbea8c41398e9b77156ba5cc6d4f6a4f1..ed7993d8ada465adf38628485c47713f14c62bfd 100644 >--- a/Source/WebCore/platform/graphics/TrackPrivateBase.h >+++ b/Source/WebCore/platform/graphics/TrackPrivateBase.h >@@ -32,16 +32,16 @@ > #include <wtf/LoggerHelper.h> > #include <wtf/MediaTime.h> > #include <wtf/ThreadSafeRefCounted.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > > class TrackPrivateBaseClient { > public: > virtual ~TrackPrivateBaseClient() = default; >- virtual void idChanged(const AtomicString&) = 0; >- virtual void labelChanged(const AtomicString&) = 0; >- virtual void languageChanged(const AtomicString&) = 0; >+ virtual void idChanged(const AtomString&) = 0; >+ virtual void labelChanged(const AtomString&) = 0; >+ virtual void languageChanged(const AtomString&) = 0; > virtual void willRemove() = 0; > }; > >@@ -58,9 +58,9 @@ public: > > virtual TrackPrivateBaseClient* client() const = 0; > >- virtual AtomicString id() const { return emptyAtom(); } >- virtual AtomicString label() const { return emptyAtom(); } >- virtual AtomicString language() const { return emptyAtom(); } >+ virtual AtomString id() const { return emptyAtom(); } >+ virtual AtomString label() const { return emptyAtom(); } >+ virtual AtomString language() const { return emptyAtom(); } > > virtual int trackIndex() const { return 0; } > >diff --git a/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h b/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h >index 3810c5fa6269f69900fc3ccf4446cf603776dd1d..a9ecd32136da87702f478afcd8acc8eb97c23940 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h >+++ b/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h >@@ -61,9 +61,9 @@ public: > VideoTrackPrivate::Kind videoKind() const; > > int index() const; >- AtomicString id() const; >- AtomicString label() const; >- AtomicString language() const; >+ AtomString id() const; >+ AtomString label() const; >+ AtomString language() const; > > int trackID() const; > >diff --git a/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm b/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm >index 01502cdb0beabe3880bf33d5432f2f6526f36c7f..c5e3280bb1157cf3d33d7e068d11ed4c00e55be6 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm >+++ b/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm >@@ -153,17 +153,17 @@ int AVTrackPrivateAVFObjCImpl::index() const > return 0; > } > >-AtomicString AVTrackPrivateAVFObjCImpl::id() const >+AtomString AVTrackPrivateAVFObjCImpl::id() const > { > if (m_assetTrack) >- return AtomicString::number([m_assetTrack trackID]); >+ return AtomString::number([m_assetTrack trackID]); > if (m_mediaSelectionOption) > return [[m_mediaSelectionOption->avMediaSelectionOption() optionID] stringValue]; > ASSERT_NOT_REACHED(); > return emptyAtom(); > } > >-AtomicString AVTrackPrivateAVFObjCImpl::label() const >+AtomString AVTrackPrivateAVFObjCImpl::label() const > { > NSArray *commonMetadata = nil; > if (m_assetTrack) >@@ -184,7 +184,7 @@ AtomicString AVTrackPrivateAVFObjCImpl::label() const > return [[titles objectAtIndex:0] stringValue]; > } > >-AtomicString AVTrackPrivateAVFObjCImpl::language() const >+AtomString AVTrackPrivateAVFObjCImpl::language() const > { > if (m_assetTrack) > return languageForAVAssetTrack(m_assetTrack.get()); >diff --git a/Source/WebCore/platform/graphics/avfoundation/AudioTrackPrivateAVF.h b/Source/WebCore/platform/graphics/avfoundation/AudioTrackPrivateAVF.h >index 19b560bccba58195ce45ef6ef81c8dcdec295bc4..8c1509eb2fe34464009223f36a24dc56e032c7f6 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/AudioTrackPrivateAVF.h >+++ b/Source/WebCore/platform/graphics/avfoundation/AudioTrackPrivateAVF.h >@@ -35,22 +35,22 @@ class AudioTrackPrivateAVF : public AudioTrackPrivate { > WTF_MAKE_NONCOPYABLE(AudioTrackPrivateAVF) > public: > virtual Kind kind() const { return m_kind; } >- virtual AtomicString id() const { return m_id; } >- virtual AtomicString label() const { return m_label; } >- virtual AtomicString language() const { return m_language; } >+ virtual AtomString id() const { return m_id; } >+ virtual AtomString label() const { return m_label; } >+ virtual AtomString language() const { return m_language; } > virtual int trackIndex() const { return m_index; } > > protected: > void setKind(Kind kind) { m_kind = kind; } >- void setId(const AtomicString& newId) { m_id = newId; } >- void setLabel(const AtomicString& label) { m_label = label; } >- void setLanguage(const AtomicString& language) { m_language = language; } >+ void setId(const AtomString& newId) { m_id = newId; } >+ void setLabel(const AtomString& label) { m_label = label; } >+ void setLanguage(const AtomString& language) { m_language = language; } > void setTrackIndex(int index) { m_index = index; } > > Kind m_kind { None }; >- AtomicString m_id; >- AtomicString m_label; >- AtomicString m_language; >+ AtomString m_id; >+ AtomString m_label; >+ AtomString m_language; > int m_index { 0 }; > > AudioTrackPrivateAVF() = default; >diff --git a/Source/WebCore/platform/graphics/avfoundation/CDMFairPlayStreaming.cpp b/Source/WebCore/platform/graphics/avfoundation/CDMFairPlayStreaming.cpp >index 1b8535480e4228b6155a155eff826145e1c2320c..21b93de8881b5de767fa04c66b120a093683719f 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/CDMFairPlayStreaming.cpp >+++ b/Source/WebCore/platform/graphics/avfoundation/CDMFairPlayStreaming.cpp >@@ -62,15 +62,15 @@ const Vector<FourCC>& CDMPrivateFairPlayStreaming::validFairPlayStreamingSchemes > return validSchemes; > } > >-const AtomicString& CDMPrivateFairPlayStreaming::sinfName() >+const AtomString& CDMPrivateFairPlayStreaming::sinfName() > { >- static NeverDestroyed<AtomicString> sinf { MAKE_STATIC_STRING_IMPL("sinf") }; >+ static NeverDestroyed<AtomString> sinf { MAKE_STATIC_STRING_IMPL("sinf") }; > return sinf; > } > >-const AtomicString& CDMPrivateFairPlayStreaming::skdName() >+const AtomString& CDMPrivateFairPlayStreaming::skdName() > { >- static NeverDestroyed<AtomicString> skd { MAKE_STATIC_STRING_IMPL("skd") }; >+ static NeverDestroyed<AtomString> skd { MAKE_STATIC_STRING_IMPL("skd") }; > return skd; > } > >@@ -200,9 +200,9 @@ Optional<Vector<Ref<SharedBuffer>>> CDMPrivateFairPlayStreaming::extractKeyIDsSk > return keyIDs; > } > >-static const HashSet<AtomicString>& validInitDataTypes() >+static const HashSet<AtomString>& validInitDataTypes() > { >- static NeverDestroyed<HashSet<AtomicString>> validTypes = HashSet<AtomicString>({ >+ static NeverDestroyed<HashSet<AtomString>> validTypes = HashSet<AtomString>({ > CDMPrivateFairPlayStreaming::sinfName(), > CDMPrivateFairPlayStreaming::skdName(), > }); >@@ -245,7 +245,7 @@ bool CDMFactoryFairPlayStreaming::supportsKeySystem(const String& keySystem) > CDMPrivateFairPlayStreaming::CDMPrivateFairPlayStreaming() = default; > CDMPrivateFairPlayStreaming::~CDMPrivateFairPlayStreaming() = default; > >-bool CDMPrivateFairPlayStreaming::supportsInitDataType(const AtomicString& initDataType) const >+bool CDMPrivateFairPlayStreaming::supportsInitDataType(const AtomString& initDataType) const > { > return validInitDataTypes().contains(initDataType); > } >@@ -362,7 +362,7 @@ bool CDMPrivateFairPlayStreaming::supportsSessions() const > return true; > } > >-bool CDMPrivateFairPlayStreaming::supportsInitData(const AtomicString& initDataType, const SharedBuffer& initData) const >+bool CDMPrivateFairPlayStreaming::supportsInitData(const AtomString& initDataType, const SharedBuffer& initData) const > { > if (!supportsInitDataType(initDataType)) > return false; >diff --git a/Source/WebCore/platform/graphics/avfoundation/CDMFairPlayStreaming.h b/Source/WebCore/platform/graphics/avfoundation/CDMFairPlayStreaming.h >index 9167b6e18b4622fb8a52a04f25e84cba5e6aa715..4c8a6ce0aced56902a7d1d5c08d42711c28a4d75 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/CDMFairPlayStreaming.h >+++ b/Source/WebCore/platform/graphics/avfoundation/CDMFairPlayStreaming.h >@@ -53,7 +53,7 @@ public: > CDMPrivateFairPlayStreaming(); > virtual ~CDMPrivateFairPlayStreaming(); > >- bool supportsInitDataType(const AtomicString&) const override; >+ bool supportsInitDataType(const AtomString&) const override; > bool supportsConfiguration(const CDMKeySystemConfiguration&) const override; > bool supportsConfigurationWithRestrictions(const CDMKeySystemConfiguration&, const CDMRestrictions&) const override; > bool supportsSessionTypeWithConfiguration(CDMSessionType&, const CDMKeySystemConfiguration&) const override; >@@ -65,15 +65,15 @@ public: > void loadAndInitialize() override; > bool supportsServerCertificates() const override; > bool supportsSessions() const override; >- bool supportsInitData(const AtomicString&, const SharedBuffer&) const override; >+ bool supportsInitData(const AtomString&, const SharedBuffer&) const override; > RefPtr<SharedBuffer> sanitizeResponse(const SharedBuffer&) const override; > Optional<String> sanitizeSessionId(const String&) const override; > >- static const AtomicString& sinfName(); >+ static const AtomString& sinfName(); > static Optional<Vector<Ref<SharedBuffer>>> extractKeyIDsSinf(const SharedBuffer&); > static RefPtr<SharedBuffer> sanitizeSinf(const SharedBuffer&); > >- static const AtomicString& skdName(); >+ static const AtomString& skdName(); > static Optional<Vector<Ref<SharedBuffer>>> extractKeyIDsSkd(const SharedBuffer&); > static RefPtr<SharedBuffer> sanitizeSkd(const SharedBuffer&); > >diff --git a/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp b/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp >index ac3422e7c80330b75ec3f9fd8c3105664eb60628..0263c64fdf057362128a8690950850fbf16ffe68 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp >+++ b/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp >@@ -38,12 +38,12 @@ > > namespace WebCore { > >-Ref<InbandMetadataTextTrackPrivateAVF> InbandMetadataTextTrackPrivateAVF::create(InbandTextTrackPrivate::Kind kind, InbandTextTrackPrivate::CueFormat cueFormat, const AtomicString& id) >+Ref<InbandMetadataTextTrackPrivateAVF> InbandMetadataTextTrackPrivateAVF::create(InbandTextTrackPrivate::Kind kind, InbandTextTrackPrivate::CueFormat cueFormat, const AtomString& id) > { > return adoptRef(*new InbandMetadataTextTrackPrivateAVF(kind, cueFormat, id)); > } > >-InbandMetadataTextTrackPrivateAVF::InbandMetadataTextTrackPrivateAVF(InbandTextTrackPrivate::Kind kind, InbandTextTrackPrivate::CueFormat cueFormat, const AtomicString& id) >+InbandMetadataTextTrackPrivateAVF::InbandMetadataTextTrackPrivateAVF(InbandTextTrackPrivate::Kind kind, InbandTextTrackPrivate::CueFormat cueFormat, const AtomString& id) > : InbandTextTrackPrivate(cueFormat) > , m_kind(kind) > , m_id(id) >diff --git a/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.h b/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.h >index 17c8b50452bffab811fd47aad6720543de768417..2ec7d5c0530d778b94907316caf7abd1ecb387af 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.h >+++ b/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.h >@@ -41,14 +41,14 @@ struct IncompleteMetaDataCue { > > class InbandMetadataTextTrackPrivateAVF : public InbandTextTrackPrivate { > public: >- static Ref<InbandMetadataTextTrackPrivateAVF> create(Kind, CueFormat, const AtomicString& id = emptyAtom()); >+ static Ref<InbandMetadataTextTrackPrivateAVF> create(Kind, CueFormat, const AtomString& id = emptyAtom()); > > ~InbandMetadataTextTrackPrivateAVF(); > > Kind kind() const override { return m_kind; } >- AtomicString id() const override { return m_id; } >- AtomicString inBandMetadataTrackDispatchType() const override { return m_inBandMetadataTrackDispatchType; } >- void setInBandMetadataTrackDispatchType(const AtomicString& value) { m_inBandMetadataTrackDispatchType = value; } >+ AtomString id() const override { return m_id; } >+ AtomString inBandMetadataTrackDispatchType() const override { return m_inBandMetadataTrackDispatchType; } >+ void setInBandMetadataTrackDispatchType(const AtomString& value) { m_inBandMetadataTrackDispatchType = value; } > > #if ENABLE(DATACUE_VALUE) > void addDataCue(const MediaTime& start, const MediaTime& end, Ref<SerializedPlatformRepresentation>&&, const String&); >@@ -58,15 +58,15 @@ public: > void flushPartialCues(); > > private: >- InbandMetadataTextTrackPrivateAVF(Kind, CueFormat, const AtomicString&); >+ InbandMetadataTextTrackPrivateAVF(Kind, CueFormat, const AtomString&); > > #if !RELEASE_LOG_DISABLED > const char* logClassName() const final { return "InbandMetadataTextTrackPrivateAVF"; } > #endif > > Kind m_kind; >- AtomicString m_id; >- AtomicString m_inBandMetadataTrackDispatchType; >+ AtomString m_id; >+ AtomString m_inBandMetadataTrackDispatchType; > MediaTime m_currentCueStartTime; > #if ENABLE(DATACUE_VALUE) > Vector<IncompleteMetaDataCue> m_incompleteCues; >diff --git a/Source/WebCore/platform/graphics/avfoundation/VideoTrackPrivateAVF.h b/Source/WebCore/platform/graphics/avfoundation/VideoTrackPrivateAVF.h >index a3f0f4eca0573dd82fb947f4b9f9f071a0f3c2fd..cbedb5347cb794c93f8455894d0d57906130cd28 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/VideoTrackPrivateAVF.h >+++ b/Source/WebCore/platform/graphics/avfoundation/VideoTrackPrivateAVF.h >@@ -36,21 +36,21 @@ class VideoTrackPrivateAVF : public VideoTrackPrivate { > public: > int trackIndex() const override { return m_index; } > Kind kind() const override { return m_kind; } >- AtomicString id() const override { return m_id; } >- AtomicString label() const override { return m_label; } >- AtomicString language() const override { return m_language; } >+ AtomString id() const override { return m_id; } >+ AtomString label() const override { return m_label; } >+ AtomString language() const override { return m_language; } > > protected: > void setKind(Kind kind) { m_kind = kind; } >- void setId(const AtomicString& newId) { m_id = newId; } >- void setLabel(const AtomicString& label) { m_label = label; } >- void setLanguage(const AtomicString& language) { m_language = language; } >+ void setId(const AtomString& newId) { m_id = newId; } >+ void setLabel(const AtomString& label) { m_label = label; } >+ void setLanguage(const AtomString& language) { m_language = language; } > void setTrackIndex(int index) { m_index = index; } > > Kind m_kind { None }; >- AtomicString m_id; >- AtomicString m_label; >- AtomicString m_language; >+ AtomString m_id; >+ AtomString m_label; >+ AtomString m_language; > int m_index { 0 }; > > VideoTrackPrivateAVF() = default; >diff --git a/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp b/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp >index 9fb9656aea304c11e8aa921875bfb363405c9fc0..8b5ec16d58da606eca76bb699c62956ffa069cd6 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp >+++ b/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp >@@ -137,7 +137,7 @@ bool InbandTextTrackPrivateAVCF::isEasyToRead() const > return AVCFMediaSelectionOptionHasMediaCharacteristic(mediaSelectionOption(), AVCFMediaCharacteristicEasyToRead); > } > >-AtomicString InbandTextTrackPrivateAVCF::label() const >+AtomString InbandTextTrackPrivateAVCF::label() const > { > if (!m_mediaSelectionOption) > return emptyAtom(); >@@ -167,10 +167,10 @@ AtomicString InbandTextTrackPrivateAVCF::label() const > title = adoptCF(AVCFMetadataItemCopyStringValue(titleMetadata)); > } > >- return title ? AtomicString(title.get()) : emptyAtom(); >+ return title ? AtomString(title.get()) : emptyAtom(); > } > >-AtomicString InbandTextTrackPrivateAVCF::language() const >+AtomString InbandTextTrackPrivateAVCF::language() const > { > if (!m_mediaSelectionOption) > return emptyAtom(); >diff --git a/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.h b/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.h >index 4b80735aa251cee1313d9ff2ec0214326dca11ae..9aade617e3de975c13007e5167986afba9ed20db 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.h >+++ b/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.h >@@ -49,8 +49,8 @@ public: > bool containsOnlyForcedSubtitles() const override; > bool isMainProgramContent() const override; > bool isEasyToRead() const override; >- AtomicString label() const override; >- AtomicString language() const override; >+ AtomString label() const override; >+ AtomString language() const override; > bool isDefault() const override; > > void disconnect() override; >diff --git a/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.cpp b/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.cpp >index 16993dbcf925fa2bc005f2f13ca31696d582b9f6..19701c022cd34e056be42b35b31018aa3bb827bc 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.cpp >+++ b/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.cpp >@@ -83,7 +83,7 @@ bool InbandTextTrackPrivateLegacyAVCF::isEasyToRead() const > return false; > } > >-AtomicString InbandTextTrackPrivateLegacyAVCF::label() const >+AtomString InbandTextTrackPrivateLegacyAVCF::label() const > { > if (!m_playerItemTrack) > return emptyAtom(); >@@ -109,10 +109,10 @@ AtomicString InbandTextTrackPrivateLegacyAVCF::label() const > } > } > >- return title ? AtomicString(title.get()) : emptyAtom(); >+ return title ? AtomString(title.get()) : emptyAtom(); > } > >-AtomicString InbandTextTrackPrivateLegacyAVCF::language() const >+AtomString InbandTextTrackPrivateLegacyAVCF::language() const > { > if (!m_playerItemTrack) > return emptyAtom(); >diff --git a/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.h b/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.h >index 65d45506931af54b953bdecf16c96cd92762426f..1708e997355061db16ff1f59a216fccda7e19149 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.h >+++ b/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.h >@@ -50,8 +50,8 @@ public: > bool containsOnlyForcedSubtitles() const override; > bool isMainProgramContent() const override; > bool isEasyToRead() const override; >- AtomicString label() const override; >- AtomicString language() const override; >+ AtomString label() const override; >+ AtomString language() const override; > > void disconnect() override; > >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h >index 61ffc5205bd2ad42ebc86c327f5594bb6c7d1174..66f4e2fd78a0d3039af8b07b6a5a2ba9c4f08f48 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h >@@ -86,7 +86,7 @@ public: > virtual ~CDMInstanceSessionFairPlayStreamingAVFObjC(); > > // CDMInstanceSession >- void requestLicense(LicenseType, const AtomicString& initDataType, Ref<SharedBuffer>&& initData, LicenseCallback&&) final; >+ void requestLicense(LicenseType, const AtomString& initDataType, Ref<SharedBuffer>&& initData, LicenseCallback&&) final; > void updateLicense(const String&, LicenseType, const SharedBuffer&, LicenseUpdateCallback&&) final; > void loadSession(LicenseType, const String&, const String&, LoadSessionCallback&&) final; > void closeSession(const String&, CloseSessionCallback&&) final; >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm >index 43ef2cd70004902653e431dd2b08ac342abe7ebd..bd8a6153de3a919b702a3275da16ed37071dce56 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm >@@ -294,7 +294,7 @@ Vector<Ref<SharedBuffer>> CDMInstanceSessionFairPlayStreamingAVFObjC::keyIDs() > return keyIDs; > } > >-void CDMInstanceSessionFairPlayStreamingAVFObjC::requestLicense(LicenseType licenseType, const AtomicString& initDataType, Ref<SharedBuffer>&& initData, LicenseCallback&& callback) >+void CDMInstanceSessionFairPlayStreamingAVFObjC::requestLicense(LicenseType licenseType, const AtomString& initDataType, Ref<SharedBuffer>&& initData, LicenseCallback&& callback) > { > if (!isLicenseTypeSupported(licenseType)) { > callback(SharedBuffer::create(), emptyString(), false, Failed); >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.h >index d3535e47de0e2615cc26ebbdf42797cd21ca23cc..3fd0ff93ba3a69f726b915208df43e02ef5c9ed2 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.h >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.h >@@ -51,8 +51,8 @@ public: > bool containsOnlyForcedSubtitles() const override; > bool isMainProgramContent() const override; > bool isEasyToRead() const override; >- AtomicString label() const override; >- AtomicString language() const override; >+ AtomString label() const override; >+ AtomString language() const override; > bool isDefault() const override; > > void disconnect() override; >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm >index 3067273ed62e5a1fa6fec4adbd228258f5c0b540..3a8325b47d8f7e21244193a9f4f0f4b30fe7a017 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm >@@ -129,7 +129,7 @@ bool InbandTextTrackPrivateAVFObjC::isEasyToRead() const > return [m_mediaSelectionOption hasMediaCharacteristic:AVMediaCharacteristicEasyToRead]; > } > >-AtomicString InbandTextTrackPrivateAVFObjC::label() const >+AtomString InbandTextTrackPrivateAVFObjC::label() const > { > if (!m_mediaSelectionOption) > return emptyAtom(); >@@ -147,10 +147,10 @@ AtomicString InbandTextTrackPrivateAVFObjC::label() const > title = [[titles objectAtIndex:0] stringValue]; > } > >- return title ? AtomicString(title) : emptyAtom(); >+ return title ? AtomString(title) : emptyAtom(); > } > >-AtomicString InbandTextTrackPrivateAVFObjC::language() const >+AtomString InbandTextTrackPrivateAVFObjC::language() const > { > if (!m_mediaSelectionOption) > return emptyAtom(); >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.h >index 6334883da9ab9c5054ad208e042cfe0994032879..596895c4deb3f833ae9b91809bb3961f9f9d12cb 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.h >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.h >@@ -51,8 +51,8 @@ public: > bool containsOnlyForcedSubtitles() const override; > bool isMainProgramContent() const override; > bool isEasyToRead() const override; >- AtomicString label() const override; >- AtomicString language() const override; >+ AtomString label() const override; >+ AtomString language() const override; > > void disconnect() override; > >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm >index ba0dfdea3e4ab45d71ab790e931f4764a31ba427..40fc3171bfde42bc6c6a4e1ef4a02688ef08e108 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm >@@ -78,7 +78,7 @@ bool InbandTextTrackPrivateLegacyAVFObjC::isEasyToRead() const > return false; > } > >-AtomicString InbandTextTrackPrivateLegacyAVFObjC::label() const >+AtomString InbandTextTrackPrivateLegacyAVFObjC::label() const > { > if (!m_playerItemTrack) > return emptyAtom(); >@@ -96,10 +96,10 @@ AtomicString InbandTextTrackPrivateLegacyAVFObjC::label() const > title = [[titles objectAtIndex:0] stringValue]; > } > >- return title ? AtomicString(title) : emptyAtom(); >+ return title ? AtomString(title) : emptyAtom(); > } > >-AtomicString InbandTextTrackPrivateLegacyAVFObjC::language() const >+AtomString InbandTextTrackPrivateLegacyAVFObjC::language() const > { > if (!m_playerItemTrack) > return emptyAtom(); >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm >index 94365fe10e2f574075308eaa158aed890998d1aa..8b474644fd2b5b86e73d04f9e410902fbd5a344d 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm >@@ -2935,13 +2935,13 @@ void MediaPlayerPrivateAVFoundationObjC::setBufferingPolicy(MediaPlayer::Bufferi > > #if ENABLE(DATACUE_VALUE) > >-static const AtomicString& metadataType(NSString *avMetadataKeySpace) >+static const AtomString& metadataType(NSString *avMetadataKeySpace) > { >- static NeverDestroyed<const AtomicString> quickTimeUserData("com.apple.quicktime.udta", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> isoUserData("org.mp4ra", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> quickTimeMetadata("com.apple.quicktime.mdta", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> iTunesMetadata("com.apple.itunes", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> id3Metadata("org.id3", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> quickTimeUserData("com.apple.quicktime.udta", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> isoUserData("org.mp4ra", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> quickTimeMetadata("com.apple.quicktime.mdta", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> iTunesMetadata("com.apple.itunes", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> id3Metadata("org.id3", AtomString::ConstructFromLiteral); > > if ([avMetadataKeySpace isEqualToString:AVMetadataKeySpaceQuickTimeUserData]) > return quickTimeUserData; >@@ -2992,7 +2992,7 @@ void MediaPlayerPrivateAVFoundationObjC::metadataDidArrive(const RetainPtr<NSArr > if (CMTIME_IS_VALID(item.duration)) > end = start + PAL::toMediaTime(item.duration); > >- AtomicString type = nullAtom(); >+ AtomString type = nullAtom(); > if (item.keySpace) > type = metadataType(item.keySpace); > >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.h >index 06eb4684d891cb4dd06c7173e7fe86536a2d90a5..4b97a9a0c30ae2f7ff68b49c27913d0d3e24a14d 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.h >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.h >@@ -35,7 +35,7 @@ namespace WebCore { > class MediaSampleAVFObjC : public MediaSample { > public: > static Ref<MediaSampleAVFObjC> create(CMSampleBufferRef sample, int trackID) { return adoptRef(*new MediaSampleAVFObjC(sample, trackID)); } >- static Ref<MediaSampleAVFObjC> create(CMSampleBufferRef sample, AtomicString trackID) { return adoptRef(*new MediaSampleAVFObjC(sample, trackID)); } >+ static Ref<MediaSampleAVFObjC> create(CMSampleBufferRef sample, AtomString trackID) { return adoptRef(*new MediaSampleAVFObjC(sample, trackID)); } > static Ref<MediaSampleAVFObjC> create(CMSampleBufferRef sample, VideoRotation rotation = VideoRotation::None, bool mirrored = false) { return adoptRef(*new MediaSampleAVFObjC(sample, rotation, mirrored)); } > static RefPtr<MediaSampleAVFObjC> createImageSample(Vector<uint8_t>&&, unsigned long width, unsigned long height); > >@@ -47,7 +47,7 @@ public: > MediaTime duration() const override; > MediaTime outputDuration() const override; > >- AtomicString trackID() const override { return m_id; } >+ AtomString trackID() const override { return m_id; } > void setTrackID(const String& id) override { m_id = id; } > > size_t sizeInBytes() const override; >@@ -79,14 +79,14 @@ protected: > : m_sample(sample) > { > } >- MediaSampleAVFObjC(CMSampleBufferRef sample, AtomicString trackID) >+ MediaSampleAVFObjC(CMSampleBufferRef sample, AtomString trackID) > : m_sample(sample) > , m_id(trackID) > { > } > MediaSampleAVFObjC(CMSampleBufferRef sample, int trackID) > : m_sample(sample) >- , m_id(AtomicString::number(trackID)) >+ , m_id(AtomString::number(trackID)) > { > } > MediaSampleAVFObjC(CMSampleBufferRef sample, VideoRotation rotation, bool mirrored) >@@ -98,7 +98,7 @@ protected: > > virtual ~MediaSampleAVFObjC() = default; > RetainPtr<CMSampleBufferRef> m_sample; >- AtomicString m_id; >+ AtomString m_id; > VideoRotation m_rotation { VideoRotation::None }; > bool m_mirrored { false }; > }; >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm >index 163297b5ebf315b5bb0a4dac0f85df060a521bde..4da09d2b178c22e63d1eee5bf3b1b9fa7ecb28e6 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm >@@ -38,7 +38,7 @@ > #import <objc/runtime.h> > #import <wtf/Algorithms.h> > #import <wtf/SoftLinking.h> >-#import <wtf/text/AtomicString.h> >+#import <wtf/text/AtomString.h> > > namespace WebCore { > >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h >index 705082e2c1d46c655ad005d16d36cf474203b2e1..7f75af956b67247ec11d25be8017cfb1340cfacb 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h >@@ -39,7 +39,7 @@ > #include <wtf/RetainPtr.h> > #include <wtf/Vector.h> > #include <wtf/WeakPtr.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/threads/BinarySemaphore.h> > > OBJC_CLASS AVAsset; >@@ -158,11 +158,11 @@ private: > void removedFromMediaSource() final; > MediaPlayer::ReadyState readyState() const final; > void setReadyState(MediaPlayer::ReadyState) final; >- void flush(const AtomicString& trackID) final; >- void enqueueSample(Ref<MediaSample>&&, const AtomicString& trackID) final; >- bool isReadyForMoreSamples(const AtomicString& trackID) final; >+ void flush(const AtomString& trackID) final; >+ void enqueueSample(Ref<MediaSample>&&, const AtomString& trackID) final; >+ bool isReadyForMoreSamples(const AtomString& trackID) final; > void setActive(bool) final; >- void notifyClientWhenReadyForMoreSamples(const AtomicString& trackID) final; >+ void notifyClientWhenReadyForMoreSamples(const AtomString& trackID) final; > bool canSwitchToType(const ContentType&) final; > > void didBecomeReadyForMoreSamples(int trackID); >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm >index 4b877b98622b80b551b1b539de6a79d2ce9a102d..7d829f023edc1bc9047d9e97b89a49309fa587f1 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm >@@ -59,7 +59,7 @@ > #import <wtf/SoftLinking.h> > #import <wtf/WTFSemaphore.h> > #import <wtf/WeakPtr.h> >-#import <wtf/text/AtomicString.h> >+#import <wtf/text/AtomString.h> > #import <wtf/text/CString.h> > > #pragma mark - Soft Linking >@@ -396,7 +396,7 @@ public: > static Ref<MediaDescriptionAVFObjC> create(AVAssetTrack* track) { return adoptRef(*new MediaDescriptionAVFObjC(track)); } > virtual ~MediaDescriptionAVFObjC() { } > >- AtomicString codec() const override { return m_codec; } >+ AtomString codec() const override { return m_codec; } > bool isVideo() const override { return m_isVideo; } > bool isAudio() const override { return m_isAudio; } > bool isText() const override { return m_isText; } >@@ -411,11 +411,11 @@ protected: > CMFormatDescriptionRef description = [formatDescriptions count] ? (__bridge CMFormatDescriptionRef)[formatDescriptions objectAtIndex:0] : 0; > if (description) { > FourCharCode codec = CMFormatDescriptionGetMediaSubType(description); >- m_codec = AtomicString(reinterpret_cast<LChar*>(&codec), 4); >+ m_codec = AtomString(reinterpret_cast<LChar*>(&codec), 4); > } > } > >- AtomicString m_codec; >+ AtomString m_codec; > bool m_isVideo; > bool m_isAudio; > bool m_isText; >@@ -1046,7 +1046,7 @@ ALLOW_NEW_API_WITHOUT_GUARDS_END > return; > } > >-void SourceBufferPrivateAVFObjC::flush(const AtomicString& trackIDString) >+void SourceBufferPrivateAVFObjC::flush(const AtomString& trackIDString) > { > int trackID = trackIDString.toInt(); > DEBUG_LOG(LOGIDENTIFIER, trackID); >@@ -1088,7 +1088,7 @@ ALLOW_NEW_API_WITHOUT_GUARDS_END > m_mediaSource->player()->setHasAvailableAudioSample(renderer, false); > } > >-void SourceBufferPrivateAVFObjC::enqueueSample(Ref<MediaSample>&& sample, const AtomicString& trackIDString) >+void SourceBufferPrivateAVFObjC::enqueueSample(Ref<MediaSample>&& sample, const AtomString& trackIDString) > { > int trackID = trackIDString.toInt(); > if (trackID != m_enabledVideoTrackID && !m_audioRenderers.contains(trackID)) >@@ -1168,7 +1168,7 @@ void SourceBufferPrivateAVFObjC::bufferWasConsumed() > m_mediaSource->player()->setHasAvailableVideoFrame(true); > } > >-bool SourceBufferPrivateAVFObjC::isReadyForMoreSamples(const AtomicString& trackIDString) >+bool SourceBufferPrivateAVFObjC::isReadyForMoreSamples(const AtomString& trackIDString) > { > int trackID = trackIDString.toInt(); > if (trackID == m_enabledVideoTrackID) { >@@ -1223,10 +1223,10 @@ void SourceBufferPrivateAVFObjC::didBecomeReadyForMoreSamples(int trackID) > return; > > if (m_client) >- m_client->sourceBufferPrivateDidBecomeReadyForMoreSamples(AtomicString::number(trackID)); >+ m_client->sourceBufferPrivateDidBecomeReadyForMoreSamples(AtomString::number(trackID)); > } > >-void SourceBufferPrivateAVFObjC::notifyClientWhenReadyForMoreSamples(const AtomicString& trackIDString) >+void SourceBufferPrivateAVFObjC::notifyClientWhenReadyForMoreSamples(const AtomString& trackIDString) > { > int trackID = trackIDString.toInt(); > if (trackID == m_enabledVideoTrackID) { >@@ -1284,7 +1284,7 @@ void SourceBufferPrivateAVFObjC::setVideoLayer(AVSampleBufferDisplayLayer* layer > }]; > [m_errorListener beginObservingLayer:m_displayLayer.get()]; > if (m_client) >- m_client->sourceBufferPrivateReenqueSamples(AtomicString::number(m_enabledVideoTrackID)); >+ m_client->sourceBufferPrivateReenqueSamples(AtomString::number(m_enabledVideoTrackID)); > } > } > >@@ -1314,7 +1314,7 @@ void SourceBufferPrivateAVFObjC::setDecompressionSession(WebCoreDecompressionSes > weakThis->m_mediaSource->player()->setHasAvailableVideoFrame(true); > }); > if (m_client) >- m_client->sourceBufferPrivateReenqueSamples(AtomicString::number(m_enabledVideoTrackID)); >+ m_client->sourceBufferPrivateReenqueSamples(AtomString::number(m_enabledVideoTrackID)); > } > > #if !RELEASE_LOG_DISABLED >diff --git a/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp b/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp >index 8d9d1f0f3cc6ab9f5074bbe3550a98c07edffaa1..cf281a7444f9e72a4e1a0a6644ee5dcdf3db3085 100644 >--- a/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp >+++ b/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp >@@ -690,7 +690,7 @@ RetainPtr<CTFontRef> preparePlatformFont(CTFontRef originalFont, const FontDescr > return result; > } > >-RefPtr<Font> FontCache::similarFont(const FontDescription& description, const AtomicString& family) >+RefPtr<Font> FontCache::similarFont(const FontDescription& description, const AtomString& family) > { > // Attempt to find an appropriate font using a match based on the presence of keywords in > // the requested names. For example, we'll match any name that contains "Arabic" to Geeza Pro. >@@ -700,13 +700,13 @@ RefPtr<Font> FontCache::similarFont(const FontDescription& description, const At > #if PLATFORM(IOS_FAMILY) > // Substitute the default monospace font for well-known monospace fonts. > if (equalLettersIgnoringASCIICase(family, "monaco") || equalLettersIgnoringASCIICase(family, "menlo")) { >- static NeverDestroyed<AtomicString> courier("courier", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> courier("courier", AtomString::ConstructFromLiteral); > return fontForFamily(description, courier); > } > > // Substitute Verdana for Lucida Grande. > if (equalLettersIgnoringASCIICase(family, "lucida grande")) { >- static NeverDestroyed<AtomicString> verdana("verdana", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> verdana("verdana", AtomString::ConstructFromLiteral); > return fontForFamily(description, verdana); > } > #endif >@@ -715,8 +715,8 @@ RefPtr<Font> FontCache::similarFont(const FontDescription& description, const At > static NeverDestroyed<String> pashto(MAKE_STATIC_STRING_IMPL("Pashto")); > static NeverDestroyed<String> urdu(MAKE_STATIC_STRING_IMPL("Urdu")); > static String* matchWords[3] = { &arabic.get(), &pashto.get(), &urdu.get() }; >- static NeverDestroyed<AtomicString> geezaPlain("GeezaPro", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> geezaBold("GeezaPro-Bold", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> geezaPlain("GeezaPro", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> geezaBold("GeezaPro-Bold", AtomString::ConstructFromLiteral); > for (String* matchWord : matchWords) { > if (family.containsIgnoringASCIICase(*matchWord)) > return fontForFamily(description, isFontWeightBold(description.weight()) ? geezaBold : geezaPlain); >@@ -830,9 +830,9 @@ void FontCache::setFontWhitelist(const Vector<String>& inputWhitelist) > whitelist.add(item); > } > >-static inline bool isSystemFont(const AtomicString& family) >+static inline bool isSystemFont(const AtomString& family) > { >- // AtomicString's operator[] handles out-of-bounds by returning 0. >+ // AtomString's operator[] handles out-of-bounds by returning 0. > return family[0] == '.'; > } > >@@ -945,7 +945,7 @@ public: > return m_familyNameToFontDescriptors.add(folded.isolatedCopy(), WTFMove(installedFontFamily)).iterator->value; > } > >- const InstalledFont& fontForPostScriptName(const AtomicString& postScriptName) >+ const InstalledFont& fontForPostScriptName(const AtomString& postScriptName) > { > const auto& folded = FontCascadeDescription::foldedFamilyName(postScriptName); > return m_postScriptNameToFontDescriptors.ensure(folded, [&] { >@@ -1156,7 +1156,7 @@ static const FontDatabase::InstalledFont* findClosestFont(const FontDatabase::In > return &familyFonts.installedFonts[fontSelectionAlgorithm.indexOfBestCapabilities()]; > } > >-Vector<FontSelectionCapabilities> FontCache::getFontSelectionCapabilitiesInFamily(const AtomicString& familyName, AllowUserInstalledFonts allowUserInstalledFonts) >+Vector<FontSelectionCapabilities> FontCache::getFontSelectionCapabilitiesInFamily(const AtomString& familyName, AllowUserInstalledFonts allowUserInstalledFonts) > { > auto& fontDatabase = allowUserInstalledFonts == AllowUserInstalledFonts::Yes ? FontDatabase::singletonAllowingUserInstalledFonts() : FontDatabase::singletonDisallowingUserInstalledFonts(); > const auto& fonts = fontDatabase.collectionForFamily(familyName.string()); >@@ -1175,7 +1175,7 @@ struct FontLookup { > bool createdFromPostScriptName { false }; > }; > >-static FontLookup platformFontLookupWithFamily(const AtomicString& family, FontSelectionRequest request, float size, AllowUserInstalledFonts allowUserInstalledFonts) >+static FontLookup platformFontLookupWithFamily(const AtomString& family, FontSelectionRequest request, float size, AllowUserInstalledFonts allowUserInstalledFonts) > { > const auto& whitelist = fontWhitelist(); > if (!isSystemFont(family) && whitelist.size() && !whitelist.contains(family)) >@@ -1238,7 +1238,7 @@ static void invalidateFontCache() > FontCache::singleton().invalidate(); > } > >-static RetainPtr<CTFontRef> fontWithFamily(const AtomicString& family, const FontDescription& fontDescription, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities, float size) >+static RetainPtr<CTFontRef> fontWithFamily(const AtomString& family, const FontDescription& fontDescription, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities, float size) > { > if (family.isEmpty()) > return nullptr; >@@ -1252,7 +1252,7 @@ static RetainPtr<CTFontRef> fontWithFamily(const AtomicString& family, const Fon > } > > #if PLATFORM(MAC) >-static bool shouldAutoActivateFontIfNeeded(const AtomicString& family) >+static bool shouldAutoActivateFontIfNeeded(const AtomString& family) > { > #ifndef NDEBUG > // This cache is not thread safe so the following assertion is there to >@@ -1261,7 +1261,7 @@ static bool shouldAutoActivateFontIfNeeded(const AtomicString& family) > ASSERT(initThread == &Thread::current()); > #endif > >- static NeverDestroyed<HashSet<AtomicString>> knownFamilies; >+ static NeverDestroyed<HashSet<AtomString>> knownFamilies; > static const unsigned maxCacheSize = 128; > ASSERT(knownFamilies.get().size() <= maxCacheSize); > if (knownFamilies.get().size() == maxCacheSize) >@@ -1283,7 +1283,7 @@ static void autoActivateFont(const String& name, CGFloat size) > } > #endif > >-std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomicString& family, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities) >+std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomString& family, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities) > { > float size = fontDescription.computedPixelSize(); > >@@ -1339,7 +1339,7 @@ static inline bool isArabicCharacter(UChar character) > } > #endif > >-static RetainPtr<CTFontRef> lookupFallbackFont(CTFontRef font, FontSelectionValue fontWeight, const AtomicString& locale, const UChar* characters, unsigned length) >+static RetainPtr<CTFontRef> lookupFallbackFont(CTFontRef font, FontSelectionValue fontWeight, const AtomString& locale, const UChar* characters, unsigned length) > { > ASSERT(length > 0); > >@@ -1417,7 +1417,7 @@ RefPtr<Font> FontCache::systemFallbackForCharacters(const FontDescription& descr > return fontForPlatformData(alternateFont); > } > >-const AtomicString& FontCache::platformAlternateFamilyName(const AtomicString& familyName) >+const AtomString& FontCache::platformAlternateFamilyName(const AtomString& familyName) > { > static const UChar heitiString[] = { 0x9ed1, 0x4f53 }; > static const UChar songtiString[] = { 0x5b8b, 0x4f53 }; >@@ -1425,10 +1425,10 @@ const AtomicString& FontCache::platformAlternateFamilyName(const AtomicString& f > static const UChar weiruanYaHeiString[] = { 0x5fae, 0x8f6f, 0x96c5, 0x9ed1 }; > static const UChar weiruanZhengHeitiString[] = { 0x5fae, 0x8edf, 0x6b63, 0x9ed1, 0x9ad4 }; > >- static NeverDestroyed<AtomicString> songtiSC("Songti SC", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> songtiTC("Songti TC", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> heitiSCReplacement("PingFang SC", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> heitiTCReplacement("PingFang TC", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> songtiSC("Songti SC", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> songtiTC("Songti TC", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> heitiSCReplacement("PingFang SC", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> heitiTCReplacement("PingFang TC", AtomString::ConstructFromLiteral); > > switch (familyName.length()) { > case 2: >@@ -1534,7 +1534,7 @@ Ref<Font> FontCache::lastResortFallbackFont(const FontDescription& fontDescripti > { > // FIXME: Would be even better to somehow get the user's default font here. For now we'll pick > // the default that the user would get without changing any prefs. >- if (auto result = fontForFamily(fontDescription, AtomicString("Times", AtomicString::ConstructFromLiteral))) >+ if (auto result = fontForFamily(fontDescription, AtomString("Times", AtomString::ConstructFromLiteral))) > return *result; > > // LastResort is guaranteed to be non-null. >diff --git a/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.h b/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.h >index d11db980743d518fc2eb39ed7f13ace66bf7e07b..b7a806611f778bd136d8bf0dd8a84eb58cd02346 100644 >--- a/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.h >+++ b/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.h >@@ -52,8 +52,8 @@ struct SynthesisPair { > > RetainPtr<CTFontRef> preparePlatformFont(CTFontRef, const FontDescription&, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities, bool applyWeightWidthSlopeVariations = true); > SynthesisPair computeNecessarySynthesis(CTFontRef, const FontDescription&, bool isPlatformFont = false); >-RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontSelectionRequest, float size, AllowUserInstalledFonts); >-RetainPtr<CTFontRef> platformFontWithFamily(const AtomicString& family, FontSelectionRequest, TextRenderingMode, float size); >+RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomString& family, FontSelectionRequest, float size, AllowUserInstalledFonts); >+RetainPtr<CTFontRef> platformFontWithFamily(const AtomString& family, FontSelectionRequest, TextRenderingMode, float size); > bool requiresCustomFallbackFont(UChar32 character); > FontSelectionCapabilities capabilitiesForFontDescriptor(CTFontDescriptorRef); > void addAttributesForInstalledFonts(CFMutableDictionaryRef attributes, AllowUserInstalledFonts); >diff --git a/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp b/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp >index 8b9c4348d4743358cef0b658a42f58fa2e6c9761..19c76360165a4bbbe8b958e936b273f8a114b5bf 100644 >--- a/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp >+++ b/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp >@@ -34,7 +34,7 @@ namespace WebCore { > > #if USE_PLATFORM_SYSTEM_FALLBACK_LIST > >-static inline bool isSystemFontString(const AtomicString& string) >+static inline bool isSystemFontString(const AtomString& string) > { > return equalLettersIgnoringASCIICase(string, "-webkit-system-font") > || equalLettersIgnoringASCIICase(string, "-apple-system") >@@ -54,7 +54,7 @@ template<typename T, typename U, std::size_t size> inline std::array<T, size> co > return convertArray<T>(array, std::make_index_sequence<size> { }); > } > >-static inline bool isUIFontTextStyle(const AtomicString& string) >+static inline bool isUIFontTextStyle(const AtomString& string) > { > static const CFStringRef styles[] = { > kCTUIFontTextStyleHeadline, >@@ -78,12 +78,12 @@ static inline bool isUIFontTextStyle(const AtomicString& string) > #endif > }; > >- static auto strings { makeNeverDestroyed(convertArray<AtomicString>(styles)) }; >+ static auto strings { makeNeverDestroyed(convertArray<AtomString>(styles)) }; > return std::find(strings.get().begin(), strings.get().end(), string) != strings.get().end(); > } > #endif > >-static inline Vector<RetainPtr<CTFontDescriptorRef>> systemFontCascadeList(const FontCascadeDescription& description, const AtomicString& cssFamily, SystemFontDatabaseCoreText::ClientUse clientUse, AllowUserInstalledFonts allowUserInstalledFonts) >+static inline Vector<RetainPtr<CTFontDescriptorRef>> systemFontCascadeList(const FontCascadeDescription& description, const AtomString& cssFamily, SystemFontDatabaseCoreText::ClientUse clientUse, AllowUserInstalledFonts allowUserInstalledFonts) > { > return SystemFontDatabaseCoreText::singleton().cascadeList(description, cssFamily, clientUse, allowUserInstalledFonts); > } >@@ -163,7 +163,7 @@ static void languageChanged(void*) > cachedSpecializedChineseLocale() = computeSpecializedChineseLocale(); > } > >-AtomicString FontDescription::platformResolveGenericFamily(UScriptCode script, const AtomicString& locale, const AtomicString& familyName) >+AtomString FontDescription::platformResolveGenericFamily(UScriptCode script, const AtomString& locale, const AtomString& familyName) > { > ASSERT((locale.isNull() && script == USCRIPT_COMMON) || !locale.isNull()); > if (script == USCRIPT_COMMON) >diff --git a/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp b/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp >index b1346815e9e0c049433cc6609a3ce7b2a9b2f73b..b3d02ff855a89ae493dabe9380870248911fd8aa 100644 >--- a/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp >+++ b/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp >@@ -129,7 +129,7 @@ Vector<RetainPtr<CTFontDescriptorRef>> SystemFontDatabaseCoreText::computeCascad > return result; > } > >-SystemFontDatabaseCoreText::CascadeListParameters SystemFontDatabaseCoreText::systemFontParameters(const FontCascadeDescription& description, const AtomicString& familyName, ClientUse clientUse, AllowUserInstalledFonts allowUserInstalledFonts) >+SystemFontDatabaseCoreText::CascadeListParameters SystemFontDatabaseCoreText::systemFontParameters(const FontCascadeDescription& description, const AtomString& familyName, ClientUse clientUse, AllowUserInstalledFonts allowUserInstalledFonts) > { > CascadeListParameters result; > result.locale = description.locale(); >@@ -160,7 +160,7 @@ SystemFontDatabaseCoreText::CascadeListParameters SystemFontDatabaseCoreText::sy > result.weight = kCTFontWeightBlack; > > if (clientUse == ClientUse::ForSystemUI) { >- static NeverDestroyed<AtomicString> systemUI = AtomicString("system-ui", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> systemUI = AtomString("system-ui", AtomString::ConstructFromLiteral); > result.fontName = systemUI.get(); > } else { > ASSERT(clientUse == ClientUse::ForTextStyle); >@@ -172,7 +172,7 @@ SystemFontDatabaseCoreText::CascadeListParameters SystemFontDatabaseCoreText::sy > return result; > } > >-Vector<RetainPtr<CTFontDescriptorRef>> SystemFontDatabaseCoreText::cascadeList(const FontCascadeDescription& description, const AtomicString& cssFamily, ClientUse clientUse, AllowUserInstalledFonts allowUserInstalledFonts) >+Vector<RetainPtr<CTFontDescriptorRef>> SystemFontDatabaseCoreText::cascadeList(const FontCascadeDescription& description, const AtomString& cssFamily, ClientUse clientUse, AllowUserInstalledFonts allowUserInstalledFonts) > { > return cascadeList(systemFontParameters(description, cssFamily, clientUse, allowUserInstalledFonts), clientUse); > } >diff --git a/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.h b/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.h >index 35e354670b5dba4ac556e1f8d2de7e5323579e2c..323ab298f0632eaa755c8fa7c0285f08b13fb6b0 100644 >--- a/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.h >+++ b/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.h >@@ -29,8 +29,8 @@ > #include <pal/spi/cocoa/CoreTextSPI.h> > #include <wtf/HashMap.h> > #include <wtf/HashTraits.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -74,7 +74,7 @@ public: > return hasher.hash(); > } > >- struct CascadeListParametersHash : WTF::PairHash<AtomicString, float> { >+ struct CascadeListParametersHash : WTF::PairHash<AtomString, float> { > static unsigned hash(const CascadeListParameters& parameters) > { > return parameters.hash(); >@@ -86,8 +86,8 @@ public: > static const bool safeToCompareToEmptyOrDeleted = true; > }; > >- AtomicString fontName; >- AtomicString locale; >+ AtomString fontName; >+ AtomString locale; > CGFloat weight { 0 }; > float size { 0 }; > AllowUserInstalledFonts allowUserInstalledFonts { AllowUserInstalledFonts::No }; >@@ -98,7 +98,7 @@ public: > > enum class ClientUse { ForSystemUI, ForTextStyle }; > >- Vector<RetainPtr<CTFontDescriptorRef>> cascadeList(const FontCascadeDescription&, const AtomicString& cssFamily, ClientUse, AllowUserInstalledFonts); >+ Vector<RetainPtr<CTFontDescriptorRef>> cascadeList(const FontCascadeDescription&, const AtomString& cssFamily, ClientUse, AllowUserInstalledFonts); > > String serifFamily(const String& locale); > String sansSerifFamily(const String& locale); >@@ -116,7 +116,7 @@ private: > static RetainPtr<CTFontRef> applyWeightItalicsAndFallbackBehavior(CTFontRef, CGFloat weight, bool italic, float size, AllowUserInstalledFonts); > static RetainPtr<CTFontDescriptorRef> removeCascadeList(CTFontDescriptorRef); > static Vector<RetainPtr<CTFontDescriptorRef>> computeCascadeList(CTFontRef, CFStringRef locale); >- static CascadeListParameters systemFontParameters(const FontCascadeDescription&, const AtomicString& familyName, ClientUse, AllowUserInstalledFonts); >+ static CascadeListParameters systemFontParameters(const FontCascadeDescription&, const AtomString& familyName, ClientUse, AllowUserInstalledFonts); > > HashMap<CascadeListParameters, Vector<RetainPtr<CTFontDescriptorRef>>, CascadeListParameters::CascadeListParametersHash, SimpleClassHashTraits<CascadeListParameters>> m_systemFontCache; > >diff --git a/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp b/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp >index acb73823a7a9e7b8120d879fa4581cbd47f1b559..3a680a298536855e7b1651d1fded841580893f8a 100644 >--- a/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp >+++ b/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp >@@ -35,9 +35,9 @@ Ref<SourceAlpha> SourceAlpha::create(FilterEffect& sourceEffect) > return adoptRef(*new SourceAlpha(sourceEffect)); > } > >-const AtomicString& SourceAlpha::effectName() >+const AtomString& SourceAlpha::effectName() > { >- static NeverDestroyed<const AtomicString> s_effectName("SourceAlpha", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> s_effectName("SourceAlpha", AtomString::ConstructFromLiteral); > return s_effectName; > } > >diff --git a/Source/WebCore/platform/graphics/filters/SourceAlpha.h b/Source/WebCore/platform/graphics/filters/SourceAlpha.h >index 7d1a311efa42672e66ad5661eef63a62536fb5d1..6629a367fd43242d1c4aade64c561e864a39490f 100644 >--- a/Source/WebCore/platform/graphics/filters/SourceAlpha.h >+++ b/Source/WebCore/platform/graphics/filters/SourceAlpha.h >@@ -28,7 +28,7 @@ class SourceAlpha : public FilterEffect { > public: > static Ref<SourceAlpha> create(FilterEffect&); > >- static const AtomicString& effectName(); >+ static const AtomString& effectName(); > > private: > explicit SourceAlpha(FilterEffect&); >diff --git a/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp b/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp >index 7521a5eb61b22162af94494891208864674f5997..045ee01f223e422fff046fea2f4ca2dde0ddd712 100644 >--- a/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp >+++ b/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp >@@ -34,9 +34,9 @@ Ref<SourceGraphic> SourceGraphic::create(Filter& filter) > return adoptRef(*new SourceGraphic(filter)); > } > >-const AtomicString& SourceGraphic::effectName() >+const AtomString& SourceGraphic::effectName() > { >- static NeverDestroyed<const AtomicString> s_effectName("SourceGraphic", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> s_effectName("SourceGraphic", AtomString::ConstructFromLiteral); > return s_effectName; > } > >diff --git a/Source/WebCore/platform/graphics/filters/SourceGraphic.h b/Source/WebCore/platform/graphics/filters/SourceGraphic.h >index 1a0e9c82a8315c377f5937a029377d77a0ab7a91..3615f0e9b61a833ab1d4687aba68ab3214558fdf 100644 >--- a/Source/WebCore/platform/graphics/filters/SourceGraphic.h >+++ b/Source/WebCore/platform/graphics/filters/SourceGraphic.h >@@ -30,7 +30,7 @@ class SourceGraphic : public FilterEffect { > public: > static Ref<SourceGraphic> create(Filter&); > >- static const AtomicString& effectName(); >+ static const AtomString& effectName(); > > private: > SourceGraphic(Filter& filter) >diff --git a/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp b/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp >index db0485dbc33ae86c03abf0f3f79dd89fb9a8de5b..53b777ea6b7ea73f675e6505d21f55c8112f5c1b 100644 >--- a/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp >+++ b/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp >@@ -190,7 +190,7 @@ Ref<Font> FontCache::lastResortFallbackFont(const FontDescription& fontDescripti > { > // We want to return a fallback font here, otherwise the logic preventing FontConfig > // matches for non-fallback fonts might return 0. See isFallbackFontAllowed. >- static AtomicString timesStr("serif"); >+ static AtomString timesStr("serif"); > if (RefPtr<Font> font = fontForFamily(fontDescription, timesStr)) > return *font; > >@@ -198,12 +198,12 @@ Ref<Font> FontCache::lastResortFallbackFont(const FontDescription& fontDescripti > RELEASE_ASSERT_NOT_REACHED(); > } > >-Vector<FontSelectionCapabilities> FontCache::getFontSelectionCapabilitiesInFamily(const AtomicString&, AllowUserInstalledFonts) >+Vector<FontSelectionCapabilities> FontCache::getFontSelectionCapabilitiesInFamily(const AtomString&, AllowUserInstalledFonts) > { > return { }; > } > >-static String getFamilyNameStringFromFamily(const AtomicString& family) >+static String getFamilyNameStringFromFamily(const AtomString& family) > { > // If we're creating a fallback font (e.g. "-webkit-monospace"), convert the name into > // the fallback name (like "monospace") that fontconfig understands. >@@ -371,7 +371,7 @@ static inline bool isCommonlyUsedGenericFamily(const String& familyNameString) > || equalLettersIgnoringASCIICase(familyNameString, "cursive"); > } > >-std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomicString& family, const FontFeatureSettings*, const FontVariantSettings*, FontSelectionSpecifiedCapabilities) >+std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomString& family, const FontFeatureSettings*, const FontVariantSettings*, FontSelectionSpecifiedCapabilities) > { > // The CSS font matching algorithm (http://www.w3.org/TR/css3-fonts/#font-matching-algorithm) > // says that we must find an exact match for font family, slant (italic or oblique can be used) >@@ -460,7 +460,7 @@ std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDe > return platformData; > } > >-const AtomicString& FontCache::platformAlternateFamilyName(const AtomicString&) >+const AtomString& FontCache::platformAlternateFamilyName(const AtomString&) > { > return nullAtom(); > } >diff --git a/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h >index 8b954ae609f807c6ff48089d2fa085f9aaa8d8c3..4d98dd48b19a435d73fac0cf99ed6d2f25e7e857 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h >+++ b/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h >@@ -60,9 +60,9 @@ public: > > int trackIndex() const override { return m_index; } > >- AtomicString id() const override { return m_id; } >- AtomicString label() const override { return m_label; } >- AtomicString language() const override { return m_language; } >+ AtomString id() const override { return m_id; } >+ AtomString label() const override { return m_label; } >+ AtomString language() const override { return m_language; } > > private: > AudioTrackPrivateGStreamer(WeakPtr<MediaPlayerPrivateGStreamer>, gint index, GRefPtr<GstPad>); >@@ -70,7 +70,7 @@ private: > AudioTrackPrivateGStreamer(WeakPtr<MediaPlayerPrivateGStreamer>, gint index, GRefPtr<GstStream>); > #endif > >- AtomicString m_id; >+ AtomString m_id; > WeakPtr<MediaPlayerPrivateGStreamer> m_player; > }; > >diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp >index 55ad0ff145017619eec7a0c1d22a143f138b4b23..84870ccc99ad23315616a61591af845212565b3f 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp >+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp >@@ -131,7 +131,7 @@ void GStreamerRegistryScanner::fillMimeTypeSetFromCapsMapping(Vector<GstCapsWebK > for (const auto& mimeType : current.webkitMimeTypes) > m_mimeTypeSet.add(mimeType); > } else >- m_mimeTypeSet.add(AtomicString(current.capsString)); >+ m_mimeTypeSet.add(AtomString(current.capsString)); > } > } > } >@@ -139,24 +139,24 @@ void GStreamerRegistryScanner::fillMimeTypeSetFromCapsMapping(Vector<GstCapsWebK > void GStreamerRegistryScanner::initialize() > { > if (hasElementForMediaType(m_audioDecoderFactories, "audio/mpeg, mpegversion=(int)4")) { >- m_mimeTypeSet.add(AtomicString("audio/aac")); >- m_mimeTypeSet.add(AtomicString("audio/mp4")); >- m_mimeTypeSet.add(AtomicString("audio/x-m4a")); >- m_codecMap.add(AtomicString("mpeg"), false); >- m_codecMap.add(AtomicString("mp4a*"), false); >+ m_mimeTypeSet.add(AtomString("audio/aac")); >+ m_mimeTypeSet.add(AtomString("audio/mp4")); >+ m_mimeTypeSet.add(AtomString("audio/x-m4a")); >+ m_codecMap.add(AtomString("mpeg"), false); >+ m_codecMap.add(AtomString("mp4a*"), false); > } > > auto opusSupported = hasElementForMediaType(m_audioDecoderFactories, "audio/x-opus"); > if (opusSupported && (!m_isMediaSource || hasElementForMediaType(m_audioParserFactories, "audio/x-opus"))) { >- m_mimeTypeSet.add(AtomicString("audio/opus")); >- m_codecMap.add(AtomicString("opus"), false); >- m_codecMap.add(AtomicString("x-opus"), false); >+ m_mimeTypeSet.add(AtomString("audio/opus")); >+ m_codecMap.add(AtomString("opus"), false); >+ m_codecMap.add(AtomString("x-opus"), false); > } > > auto vorbisSupported = hasElementForMediaType(m_audioDecoderFactories, "audio/x-vorbis"); > if (vorbisSupported && (!m_isMediaSource || hasElementForMediaType(m_audioParserFactories, "audio/x-vorbis"))) { >- m_codecMap.add(AtomicString("vorbis"), false); >- m_codecMap.add(AtomicString("x-vorbis"), false); >+ m_codecMap.add(AtomString("vorbis"), false); >+ m_codecMap.add(AtomString("x-vorbis"), false); > } > > if (hasElementForMediaType(m_demuxerFactories, "video/x-matroska")) { >@@ -164,29 +164,29 @@ void GStreamerRegistryScanner::initialize() > auto vp9DecoderAvailable = hasElementForMediaType(m_videoDecoderFactories, "video/x-vp9", true); > > if (vp8DecoderAvailable || vp9DecoderAvailable) >- m_mimeTypeSet.add(AtomicString("video/webm")); >+ m_mimeTypeSet.add(AtomString("video/webm")); > > if (vp8DecoderAvailable) { >- m_codecMap.add(AtomicString("vp8"), vp8DecoderAvailable.isUsingHardware); >- m_codecMap.add(AtomicString("x-vp8"), vp8DecoderAvailable.isUsingHardware); >- m_codecMap.add(AtomicString("vp8.0"), vp8DecoderAvailable.isUsingHardware); >+ m_codecMap.add(AtomString("vp8"), vp8DecoderAvailable.isUsingHardware); >+ m_codecMap.add(AtomString("x-vp8"), vp8DecoderAvailable.isUsingHardware); >+ m_codecMap.add(AtomString("vp8.0"), vp8DecoderAvailable.isUsingHardware); > } > if (vp9DecoderAvailable) { >- m_codecMap.add(AtomicString("vp9"), vp9DecoderAvailable.isUsingHardware); >- m_codecMap.add(AtomicString("x-vp9"), vp9DecoderAvailable.isUsingHardware); >- m_codecMap.add(AtomicString("vp9.0"), vp9DecoderAvailable.isUsingHardware); >+ m_codecMap.add(AtomString("vp9"), vp9DecoderAvailable.isUsingHardware); >+ m_codecMap.add(AtomString("x-vp9"), vp9DecoderAvailable.isUsingHardware); >+ m_codecMap.add(AtomString("vp9.0"), vp9DecoderAvailable.isUsingHardware); > } > if (opusSupported) >- m_mimeTypeSet.add(AtomicString("audio/webm")); >+ m_mimeTypeSet.add(AtomString("audio/webm")); > } > > auto h264DecoderAvailable = hasElementForMediaType(m_videoDecoderFactories, "video/x-h264, profile=(string){ constrained-baseline, baseline, high }", true); > if (h264DecoderAvailable && (!m_isMediaSource || hasElementForMediaType(m_videoParserFactories, "video/x-h264"))) { >- m_mimeTypeSet.add(AtomicString("video/mp4")); >- m_mimeTypeSet.add(AtomicString("video/x-m4v")); >- m_codecMap.add(AtomicString("x-h264"), h264DecoderAvailable.isUsingHardware); >- m_codecMap.add(AtomicString("avc*"), h264DecoderAvailable.isUsingHardware); >- m_codecMap.add(AtomicString("mp4v*"), h264DecoderAvailable.isUsingHardware); >+ m_mimeTypeSet.add(AtomString("video/mp4")); >+ m_mimeTypeSet.add(AtomString("video/x-m4v")); >+ m_codecMap.add(AtomString("x-h264"), h264DecoderAvailable.isUsingHardware); >+ m_codecMap.add(AtomString("avc*"), h264DecoderAvailable.isUsingHardware); >+ m_codecMap.add(AtomString("mp4v*"), h264DecoderAvailable.isUsingHardware); > } > > if (m_isMediaSource) >@@ -223,54 +223,54 @@ void GStreamerRegistryScanner::initialize() > fillMimeTypeSetFromCapsMapping(mapping); > > if (hasElementForMediaType(m_demuxerFactories, "application/ogg")) { >- m_mimeTypeSet.add(AtomicString("application/ogg")); >+ m_mimeTypeSet.add(AtomString("application/ogg")); > > if (vorbisSupported) { >- m_mimeTypeSet.add(AtomicString("audio/ogg")); >- m_mimeTypeSet.add(AtomicString("audio/x-vorbis+ogg")); >+ m_mimeTypeSet.add(AtomString("audio/ogg")); >+ m_mimeTypeSet.add(AtomString("audio/x-vorbis+ogg")); > } > > if (hasElementForMediaType(m_audioDecoderFactories, "audio/x-speex")) { >- m_mimeTypeSet.add(AtomicString("audio/ogg")); >- m_codecMap.add(AtomicString("speex"), false); >+ m_mimeTypeSet.add(AtomString("audio/ogg")); >+ m_codecMap.add(AtomString("speex"), false); > } > > if (hasElementForMediaType(m_videoDecoderFactories, "video/x-theora")) { >- m_mimeTypeSet.add(AtomicString("video/ogg")); >- m_codecMap.add(AtomicString("theora"), false); >+ m_mimeTypeSet.add(AtomString("video/ogg")); >+ m_codecMap.add(AtomString("theora"), false); > } > } > > bool audioMpegSupported = false; > if (hasElementForMediaType(m_audioDecoderFactories, "audio/mpeg, mpegversion=(int)1, layer=(int)[1, 3]")) { > audioMpegSupported = true; >- m_mimeTypeSet.add(AtomicString("audio/mp1")); >- m_mimeTypeSet.add(AtomicString("audio/mp3")); >- m_mimeTypeSet.add(AtomicString("audio/x-mp3")); >- m_codecMap.add(AtomicString("audio/mp3"), false); >+ m_mimeTypeSet.add(AtomString("audio/mp1")); >+ m_mimeTypeSet.add(AtomString("audio/mp3")); >+ m_mimeTypeSet.add(AtomString("audio/x-mp3")); >+ m_codecMap.add(AtomString("audio/mp3"), false); > } > > if (hasElementForMediaType(m_audioDecoderFactories, "audio/mpeg, mpegversion=(int)2")) { > audioMpegSupported = true; >- m_mimeTypeSet.add(AtomicString("audio/mp2")); >+ m_mimeTypeSet.add(AtomString("audio/mp2")); > } > > audioMpegSupported |= isContainerTypeSupported("audio/mp4"); > if (audioMpegSupported) { >- m_mimeTypeSet.add(AtomicString("audio/mpeg")); >- m_mimeTypeSet.add(AtomicString("audio/x-mpeg")); >+ m_mimeTypeSet.add(AtomString("audio/mpeg")); >+ m_mimeTypeSet.add(AtomString("audio/x-mpeg")); > } > > bool matroskaSupported = hasElementForMediaType(m_demuxerFactories, "video/x-matroska"); > if (matroskaSupported) { >- m_mimeTypeSet.add(AtomicString("video/x-matroska")); >+ m_mimeTypeSet.add(AtomString("video/x-matroska")); > > if (hasElementForMediaType(m_videoDecoderFactories, "video/x-vp10")) >- m_mimeTypeSet.add(AtomicString("video/webm")); >+ m_mimeTypeSet.add(AtomString("video/webm")); > } > > if ((matroskaSupported || isContainerTypeSupported("video/mp4")) && hasElementForMediaType(m_videoDecoderFactories, "video/x-av1")) >- m_codecMap.add(AtomicString("av01*"), false); >+ m_codecMap.add(AtomString("av01*"), false); > } > > bool GStreamerRegistryScanner::isCodecSupported(String codec, bool shouldCheckForHardwareUse) const >diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.h b/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.h >index ee84df5ff295596929b346cb076999c98cef3e01..2ddaec69045799a6a58ab49fae3d7da836e18468 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.h >+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.h >@@ -26,8 +26,8 @@ > #include <wtf/Forward.h> > #include <wtf/HashMap.h> > #include <wtf/HashSet.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/StringHash.h> > > namespace WebCore { >@@ -67,8 +67,8 @@ protected: > struct GstCapsWebKitMapping { > ElementType elementType; > const char* capsString; >- Vector<AtomicString> webkitMimeTypes; >- Vector<AtomicString> webkitCodecPatterns; >+ Vector<AtomString> webkitMimeTypes; >+ Vector<AtomString> webkitCodecPatterns; > }; > void fillMimeTypeSetFromCapsMapping(Vector<GstCapsWebKitMapping>&); > >@@ -84,7 +84,7 @@ private: > GList* m_videoParserFactories; > GList* m_demuxerFactories; > HashSet<String, ASCIICaseInsensitiveHash> m_mimeTypeSet; >- HashMap<AtomicString, bool> m_codecMap; >+ HashMap<AtomString, bool> m_codecMap; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/platform/graphics/gstreamer/InbandMetadataTextTrackPrivateGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/InbandMetadataTextTrackPrivateGStreamer.h >index 313b40d1dc2fb5f332b45154ebf545378179e3d8..8346892262227906427ca5947985af4bcd4926fa 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/InbandMetadataTextTrackPrivateGStreamer.h >+++ b/Source/WebCore/platform/graphics/gstreamer/InbandMetadataTextTrackPrivateGStreamer.h >@@ -33,7 +33,7 @@ namespace WebCore { > > class InbandMetadataTextTrackPrivateGStreamer : public InbandTextTrackPrivate { > public: >- static Ref<InbandMetadataTextTrackPrivateGStreamer> create(Kind kind, CueFormat cueFormat, const AtomicString& id = emptyAtom()) >+ static Ref<InbandMetadataTextTrackPrivateGStreamer> create(Kind kind, CueFormat cueFormat, const AtomString& id = emptyAtom()) > { > return adoptRef(*new InbandMetadataTextTrackPrivateGStreamer(kind, cueFormat, id)); > } >@@ -41,9 +41,9 @@ public: > ~InbandMetadataTextTrackPrivateGStreamer() = default; > > Kind kind() const override { return m_kind; } >- AtomicString id() const override { return m_id; } >- AtomicString inBandMetadataTrackDispatchType() const override { return m_inBandMetadataTrackDispatchType; } >- void setInBandMetadataTrackDispatchType(const AtomicString& value) { m_inBandMetadataTrackDispatchType = value; } >+ AtomString id() const override { return m_id; } >+ AtomString inBandMetadataTrackDispatchType() const override { return m_inBandMetadataTrackDispatchType; } >+ void setInBandMetadataTrackDispatchType(const AtomString& value) { m_inBandMetadataTrackDispatchType = value; } > > void addDataCue(const MediaTime& start, const MediaTime& end, const void* data, unsigned length) > { >@@ -58,7 +58,7 @@ public: > } > > private: >- InbandMetadataTextTrackPrivateGStreamer(Kind kind, CueFormat cueFormat, const AtomicString& id) >+ InbandMetadataTextTrackPrivateGStreamer(Kind kind, CueFormat cueFormat, const AtomString& id) > : InbandTextTrackPrivate(cueFormat) > , m_kind(kind) > , m_id(id) >@@ -67,8 +67,8 @@ private: > } > > Kind m_kind; >- AtomicString m_id; >- AtomicString m_inBandMetadataTrackDispatchType; >+ AtomString m_id; >+ AtomString m_inBandMetadataTrackDispatchType; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h >index e5735b429f327fc6bc29e7bf282514cfd5bb6f1f..f4e2a9789db0761caad40a1c5b63f632e9b15a10 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h >+++ b/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h >@@ -53,8 +53,8 @@ public: > > void disconnect() override; > >- AtomicString label() const override { return m_label; } >- AtomicString language() const override { return m_language; } >+ AtomString label() const override { return m_label; } >+ AtomString language() const override { return m_language; } > > int trackIndex() const override { return m_index; } > String streamId() const { return m_streamId; } >diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp >index 4a6dabfbd48957dd47bb1ca55496a89646f858d1..0e0835b01f8acd9d03300520686f05a270e13b2d 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp >+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp >@@ -1485,7 +1485,7 @@ void MediaPlayerPrivateGStreamer::processMpegTsSection(GstMpegtsSection* section > for (guint i = 0; i < pmt->streams->len; ++i) { > const GstMpegtsPMTStream* stream = static_cast<const GstMpegtsPMTStream*>(g_ptr_array_index(pmt->streams, i)); > if (stream->stream_type == 0x05 || stream->stream_type >= 0x80) { >- AtomicString pid = String::number(stream->pid); >+ AtomString pid = String::number(stream->pid); > auto track = InbandMetadataTextTrackPrivateGStreamer::create( > InbandTextTrackPrivate::Metadata, InbandTextTrackPrivate::Data, pid); > >@@ -1513,7 +1513,7 @@ void MediaPlayerPrivateGStreamer::processMpegTsSection(GstMpegtsSection* section > } > } > } else { >- AtomicString pid = String::number(section->pid); >+ AtomString pid = String::number(section->pid); > RefPtr<InbandMetadataTextTrackPrivateGStreamer> track = m_metadataTracks.get(pid); > if (!track) > return; >diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h >index 14d9e23d0fa05405fb74828a6372ba4542feeefe..2ed7c8989575eeda2f6a7acfcf1bc0160a376827 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h >+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h >@@ -38,7 +38,7 @@ > > #if ENABLE(VIDEO_TRACK) > #include "TrackPrivateBaseGStreamer.h" >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > #endif > > typedef struct _GstMpegtsSection GstMpegtsSection; >@@ -277,12 +277,12 @@ private: > GRefPtr<GstElement> m_downloadBuffer; > Vector<RefPtr<MediaPlayerRequestInstallMissingPluginsCallback>> m_missingPluginCallbacks; > #if ENABLE(VIDEO_TRACK) >- HashMap<AtomicString, RefPtr<AudioTrackPrivateGStreamer>> m_audioTracks; >- HashMap<AtomicString, RefPtr<InbandTextTrackPrivateGStreamer>> m_textTracks; >- HashMap<AtomicString, RefPtr<VideoTrackPrivateGStreamer>> m_videoTracks; >+ HashMap<AtomString, RefPtr<AudioTrackPrivateGStreamer>> m_audioTracks; >+ HashMap<AtomString, RefPtr<InbandTextTrackPrivateGStreamer>> m_textTracks; >+ HashMap<AtomString, RefPtr<VideoTrackPrivateGStreamer>> m_videoTracks; > RefPtr<InbandMetadataTextTrackPrivateGStreamer> m_chaptersTrack; > #if USE(GSTREAMER_MPEGTS) >- HashMap<AtomicString, RefPtr<InbandMetadataTextTrackPrivateGStreamer>> m_metadataTracks; >+ HashMap<AtomString, RefPtr<InbandMetadataTextTrackPrivateGStreamer>> m_metadataTracks; > #endif > #endif > virtual bool isMediaSource() const { return false; } >diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp >index 496619bcf4e07941f453f7f978ed0eb20ad8cd82..6ea36580f2d50e8b380f7d515c6a4017343aa8fd 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp >+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp >@@ -38,7 +38,7 @@ > #include "VideoSinkGStreamer.h" > #include "WebKitWebSourceGStreamer.h" > #include <wtf/glib/GUniquePtr.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/CString.h> > #include <wtf/MathExtras.h> > #include <wtf/StringPrintStream.h> >diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.cpp >index b66c553f69c0e6d313efd97d4bad433cc39ae524..f5a7dd66d218e47fbd59a2394a918c50d28a5424 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.cpp >+++ b/Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.cpp >@@ -29,7 +29,7 @@ > > namespace WebCore { > >-MediaSampleGStreamer::MediaSampleGStreamer(GRefPtr<GstSample>&& sample, const FloatSize& presentationSize, const AtomicString& trackId) >+MediaSampleGStreamer::MediaSampleGStreamer(GRefPtr<GstSample>&& sample, const FloatSize& presentationSize, const AtomString& trackId) > : m_pts(MediaTime::zeroTime()) > , m_dts(MediaTime::zeroTime()) > , m_duration(MediaTime::zeroTime()) >@@ -76,7 +76,7 @@ MediaSampleGStreamer::MediaSampleGStreamer(GRefPtr<GstSample>&& sample, const Fl > m_flags = static_cast<MediaSample::SampleFlags>(m_flags | MediaSample::IsNonDisplaying); > } > >-MediaSampleGStreamer::MediaSampleGStreamer(const FloatSize& presentationSize, const AtomicString& trackId) >+MediaSampleGStreamer::MediaSampleGStreamer(const FloatSize& presentationSize, const AtomString& trackId) > : m_pts(MediaTime::zeroTime()) > , m_dts(MediaTime::zeroTime()) > , m_duration(MediaTime::zeroTime()) >@@ -85,7 +85,7 @@ MediaSampleGStreamer::MediaSampleGStreamer(const FloatSize& presentationSize, co > { > } > >-Ref<MediaSampleGStreamer> MediaSampleGStreamer::createFakeSample(GstCaps*, MediaTime pts, MediaTime dts, MediaTime duration, const FloatSize& presentationSize, const AtomicString& trackId) >+Ref<MediaSampleGStreamer> MediaSampleGStreamer::createFakeSample(GstCaps*, MediaTime pts, MediaTime dts, MediaTime duration, const FloatSize& presentationSize, const AtomString& trackId) > { > MediaSampleGStreamer* gstreamerMediaSample = new MediaSampleGStreamer(presentationSize, trackId); > gstreamerMediaSample->m_pts = pts; >diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h >index 2b156e97f2b0f95a8f530009b85f1e2b11dd837b..1df4435a793f8d0b9357b4ec673e3977c6de5d6c 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h >+++ b/Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h >@@ -25,24 +25,24 @@ > #include "FloatSize.h" > #include "GStreamerCommon.h" > #include "MediaSample.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > > class MediaSampleGStreamer final : public MediaSample { > public: >- static Ref<MediaSampleGStreamer> create(GRefPtr<GstSample>&& sample, const FloatSize& presentationSize, const AtomicString& trackId) >+ static Ref<MediaSampleGStreamer> create(GRefPtr<GstSample>&& sample, const FloatSize& presentationSize, const AtomString& trackId) > { > return adoptRef(*new MediaSampleGStreamer(WTFMove(sample), presentationSize, trackId)); > } > >- static Ref<MediaSampleGStreamer> createFakeSample(GstCaps*, MediaTime pts, MediaTime dts, MediaTime duration, const FloatSize& presentationSize, const AtomicString& trackId); >+ static Ref<MediaSampleGStreamer> createFakeSample(GstCaps*, MediaTime pts, MediaTime dts, MediaTime duration, const FloatSize& presentationSize, const AtomString& trackId); > > void applyPtsOffset(MediaTime); > MediaTime presentationTime() const override { return m_pts; } > MediaTime decodeTime() const override { return m_dts; } > MediaTime duration() const override { return m_duration; } >- AtomicString trackID() const override { return m_trackId; } >+ AtomString trackID() const override { return m_trackId; } > void setTrackID(const String& trackId) override { m_trackId = trackId; } > size_t sizeInBytes() const override { return m_size; } > FloatSize presentationSize() const override { return m_presentationSize; } >@@ -56,14 +56,14 @@ public: > void dump(PrintStream&) const override; > > private: >- MediaSampleGStreamer(GRefPtr<GstSample>&&, const FloatSize& presentationSize, const AtomicString& trackId); >- MediaSampleGStreamer(const FloatSize& presentationSize, const AtomicString& trackId); >+ MediaSampleGStreamer(GRefPtr<GstSample>&&, const FloatSize& presentationSize, const AtomString& trackId); >+ MediaSampleGStreamer(const FloatSize& presentationSize, const AtomString& trackId); > virtual ~MediaSampleGStreamer() = default; > > MediaTime m_pts; > MediaTime m_dts; > MediaTime m_duration; >- AtomicString m_trackId; >+ AtomString m_trackId; > size_t m_size { 0 }; > GRefPtr<GstSample> m_sample; > FloatSize m_presentationSize; >diff --git a/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp >index 05ba1e5b12383d127ec0d655377bfaaf6dfd9758..6da49518bda11c470ca0ab47293f09120a4eb967 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp >+++ b/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp >@@ -143,7 +143,7 @@ void TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged() > setActive(active); > } > >-bool TrackPrivateBaseGStreamer::getLanguageCode(GstTagList* tags, AtomicString& value) >+bool TrackPrivateBaseGStreamer::getLanguageCode(GstTagList* tags, AtomString& value) > { > String language; > if (getTag(tags, GST_TAG_LANGUAGE_CODE, language)) { >@@ -185,7 +185,7 @@ void TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged() > if (getTag(tags.get(), GST_TAG_TITLE, m_label) && client) > client->labelChanged(m_label); > >- AtomicString language; >+ AtomString language; > if (!getLanguageCode(tags.get(), language)) > return; > >diff --git a/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h >index e80576d91bd3e8c0370a1130512aa6e050bb89fa..c8cfeb54358510fa1b3c57f919c3748be9e7d466 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h >+++ b/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h >@@ -80,15 +80,15 @@ protected: > > Ref<MainThreadNotifier<MainThreadNotification>> m_notifier; > gint m_index; >- AtomicString m_label; >- AtomicString m_language; >+ AtomString m_label; >+ AtomString m_language; > GRefPtr<GstPad> m_pad; > #if GST_CHECK_VERSION(1, 10, 0) > GRefPtr<GstStream> m_stream; > #endif > > private: >- bool getLanguageCode(GstTagList* tags, AtomicString& value); >+ bool getLanguageCode(GstTagList* tags, AtomString& value); > > template<class StringType> > bool getTag(GstTagList* tags, const gchar* tagName, StringType& value); >diff --git a/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h >index 74ba71762001d052046d9294ecc5cf1545628703..6e7188b345371bd449cb90ea205f7bd0bf5bc24f 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h >+++ b/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h >@@ -59,16 +59,16 @@ public: > > int trackIndex() const override { return m_index; } > >- AtomicString id() const override { return m_id; } >- AtomicString label() const override { return m_label; } >- AtomicString language() const override { return m_language; } >+ AtomString id() const override { return m_id; } >+ AtomString label() const override { return m_label; } >+ AtomString language() const override { return m_language; } > > private: > VideoTrackPrivateGStreamer(WeakPtr<MediaPlayerPrivateGStreamer>, gint index, GRefPtr<GstPad>); > #if GST_CHECK_VERSION(1, 10, 0) > VideoTrackPrivateGStreamer(WeakPtr<MediaPlayerPrivateGStreamer>, gint index, GRefPtr<GstStream>); > #endif >- AtomicString m_id; >+ AtomString m_id; > WeakPtr<MediaPlayerPrivateGStreamer> m_player; > }; > >diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp b/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp >index b72dd5c297f32f3cc2287b05d8bbcea05c14f763..7bb1059629b6d92f920e7c9201dc2debc09631dd 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp >+++ b/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp >@@ -509,12 +509,12 @@ void AppendPipeline::didReceiveInitializationSegment() > m_sourceBufferPrivate->didReceiveInitializationSegment(initializationSegment); > } > >-AtomicString AppendPipeline::trackId() >+AtomString AppendPipeline::trackId() > { > ASSERT(isMainThread()); > > if (!m_track) >- return AtomicString(); >+ return AtomString(); > > return m_track->id(); > } >diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h b/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h >index 00211a678816b3257cd84d9bbdfd0276f9f0df9d..080d2f756db6c468b61039a57d29914b6d78ac68 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h >+++ b/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h >@@ -73,7 +73,7 @@ private: > void appsinkNewSample(GRefPtr<GstSample>&&); > void handleEndOfAppend(); > void didReceiveInitializationSegment(); >- AtomicString trackId(); >+ AtomString trackId(); > > GstBus* bus() { return m_bus.get(); } > GstElement* pipeline() { return m_pipeline.get(); } >diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/GStreamerMediaDescription.cpp b/Source/WebCore/platform/graphics/gstreamer/mse/GStreamerMediaDescription.cpp >index 2b766ba3671b2b7a58fde11cccdf0358207c868f..f1ec631a97e3bdb29ba41b4cd5fc66a6110134a0 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/mse/GStreamerMediaDescription.cpp >+++ b/Source/WebCore/platform/graphics/gstreamer/mse/GStreamerMediaDescription.cpp >@@ -23,14 +23,14 @@ > #include "GStreamerCommon.h" > > #include <gst/pbutils/pbutils.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/WTFString.h> > > #if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(MEDIA_SOURCE) > > namespace WebCore { > >-AtomicString GStreamerMediaDescription::codec() const >+AtomString GStreamerMediaDescription::codec() const > { > return m_codecName; > } >@@ -51,7 +51,7 @@ bool GStreamerMediaDescription::isText() const > return false; > } > >-AtomicString GStreamerMediaDescription::extractCodecName() >+AtomString GStreamerMediaDescription::extractCodecName() > { > GRefPtr<GstCaps> originalCaps = m_caps; > >@@ -60,7 +60,7 @@ AtomicString GStreamerMediaDescription::extractCodecName() > GstStructure* structure = gst_caps_get_structure(originalCaps.get(), 0); > > if (!gst_structure_has_field(structure, "original-media-type")) >- return AtomicString(); >+ return AtomString(); > > gst_structure_set_name(structure, gst_structure_get_string(structure, "original-media-type")); > // Remove the DRM related fields from the caps. >diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/GStreamerMediaDescription.h b/Source/WebCore/platform/graphics/gstreamer/mse/GStreamerMediaDescription.h >index 85a89aad8248a4b97a540fe66b86322f59cd166c..dfca556a2d3ea3dc245f96a37fc8863342ca1330 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/mse/GStreamerMediaDescription.h >+++ b/Source/WebCore/platform/graphics/gstreamer/mse/GStreamerMediaDescription.h >@@ -26,7 +26,7 @@ > #include "MediaDescription.h" > > #include <gst/gst.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -39,7 +39,7 @@ public: > > virtual ~GStreamerMediaDescription() = default; > >- AtomicString codec() const override; >+ AtomString codec() const override; > bool isVideo() const override; > bool isAudio() const override; > bool isText() const override; >@@ -52,9 +52,9 @@ private: > m_codecName = extractCodecName(); > } > >- AtomicString extractCodecName(); >+ AtomString extractCodecName(); > GRefPtr<GstCaps> m_caps; >- AtomicString m_codecName; >+ AtomString m_codecName; > }; > > } // namespace WebCore. >diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp b/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp >index 7181b382b72ac1f146c283a78244bf71cc8c2895..a88fc8b252a620b361f569be3a8ef313eb32ba74 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp >+++ b/Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp >@@ -52,8 +52,8 @@ > #include <wtf/NeverDestroyed.h> > #include <wtf/StringPrintStream.h> > #include <wtf/URL.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > static const char* dumpReadyState(WebCore::MediaPlayer::ReadyState readyState) > { >diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp >index 76ffb0d7703063f0b7d622b419a01515e98e3ba0..fae74f4ba4c1791dc65e535feff333f42f06c334 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp >+++ b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp >@@ -158,7 +158,7 @@ void MediaSourceClientGStreamerMSE::removedFromMediaSource(RefPtr<SourceBufferPr > m_playerPrivate.m_playbackPipeline->removeSourceBuffer(sourceBufferPrivate); > } > >-void MediaSourceClientGStreamerMSE::flush(AtomicString trackId) >+void MediaSourceClientGStreamerMSE::flush(AtomString trackId) > { > ASSERT(WTF::isMainThread()); > >@@ -174,7 +174,7 @@ void MediaSourceClientGStreamerMSE::enqueueSample(Ref<MediaSample>&& sample) > m_playerPrivate.m_playbackPipeline->enqueueSample(WTFMove(sample)); > } > >-void MediaSourceClientGStreamerMSE::allSamplesInTrackEnqueued(const AtomicString& trackId) >+void MediaSourceClientGStreamerMSE::allSamplesInTrackEnqueued(const AtomString& trackId) > { > ASSERT(WTF::isMainThread()); > >diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h >index b381e69a1808374c577ce39e2623525fd41f4274..5008a0613accd4061b2fcfde3621a29b4a15b915 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h >+++ b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h >@@ -50,9 +50,9 @@ public: > void resetParserState(RefPtr<SourceBufferPrivateGStreamer>); > void append(RefPtr<SourceBufferPrivateGStreamer>, Vector<unsigned char>&&); > void removedFromMediaSource(RefPtr<SourceBufferPrivateGStreamer>); >- void flush(AtomicString); >+ void flush(AtomString); > void enqueueSample(Ref<MediaSample>&&); >- void allSamplesInTrackEnqueued(const AtomicString&); >+ void allSamplesInTrackEnqueued(const AtomString&); > > const MediaTime& duration(); > GRefPtr<WebKitMediaSrc> webKitMediaSrc(); >diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/PlaybackPipeline.cpp b/Source/WebCore/platform/graphics/gstreamer/mse/PlaybackPipeline.cpp >index 8ab025ae2d3665acfccb99deb5df47659ad857bd..b005d0d3352664f7f9bed9f70209772ab0027450 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/mse/PlaybackPipeline.cpp >+++ b/Source/WebCore/platform/graphics/gstreamer/mse/PlaybackPipeline.cpp >@@ -37,15 +37,15 @@ > #include <wtf/RefCounted.h> > #include <wtf/glib/GRefPtr.h> > #include <wtf/glib/GUniquePtr.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > GST_DEBUG_CATEGORY_EXTERN(webkit_mse_debug); > #define GST_CAT_DEFAULT webkit_mse_debug > >-static Stream* getStreamByTrackId(WebKitMediaSrc*, AtomicString); >+static Stream* getStreamByTrackId(WebKitMediaSrc*, AtomString); > static Stream* getStreamBySourceBufferPrivate(WebKitMediaSrc*, WebCore::SourceBufferPrivateGStreamer*); > >-static Stream* getStreamByTrackId(WebKitMediaSrc* source, AtomicString trackIdString) >+static Stream* getStreamByTrackId(WebKitMediaSrc* source, AtomString trackIdString) > { > // WebKitMediaSrc should be locked at this point. > for (Stream* stream : source->priv->streams) { >@@ -289,7 +289,7 @@ void PlaybackPipeline::markEndOfStream(MediaSourcePrivate::EndOfStreamStatus) > gst_app_src_end_of_stream(appsrc); > } > >-void PlaybackPipeline::flush(AtomicString trackId) >+void PlaybackPipeline::flush(AtomString trackId) > { > ASSERT(WTF::isMainThread()); > >@@ -337,7 +337,7 @@ void PlaybackPipeline::enqueueSample(Ref<MediaSample>&& mediaSample) > { > ASSERT(WTF::isMainThread()); > >- AtomicString trackId = mediaSample->trackID(); >+ AtomString trackId = mediaSample->trackID(); > > GST_TRACE("enqueing sample trackId=%s PTS=%f presentationSize=%.0fx%.0f at %" GST_TIME_FORMAT " duration: %" GST_TIME_FORMAT, > trackId.string().utf8().data(), mediaSample->presentationTime().toFloat(), >@@ -381,7 +381,7 @@ void PlaybackPipeline::enqueueSample(Ref<MediaSample>&& mediaSample) > } > } > >-void PlaybackPipeline::allSamplesInTrackEnqueued(const AtomicString& trackId) >+void PlaybackPipeline::allSamplesInTrackEnqueued(const AtomString& trackId) > { > Stream* stream = getStreamByTrackId(m_webKitMediaSrc.get(), trackId); > gst_app_src_end_of_stream(GST_APP_SRC(stream->appsrc)); >diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/PlaybackPipeline.h b/Source/WebCore/platform/graphics/gstreamer/mse/PlaybackPipeline.h >index 3d21588bfa868bce279a02fc5f5814ce6cf5b2bb..fc7ca0ead4f1bea11e14c7f47099d5712765536e 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/mse/PlaybackPipeline.h >+++ b/Source/WebCore/platform/graphics/gstreamer/mse/PlaybackPipeline.h >@@ -65,9 +65,9 @@ public: > void markEndOfStream(MediaSourcePrivate::EndOfStreamStatus); > > // From SourceBufferPrivateGStreamer. >- void flush(AtomicString); >+ void flush(AtomString); > void enqueueSample(Ref<MediaSample>&&); >- void allSamplesInTrackEnqueued(const AtomicString&); >+ void allSamplesInTrackEnqueued(const AtomString&); > > GstElement* pipeline(); > private: >diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp >index 8fc9ee0203ed4425762288dfc43f9917f63f6f73..7c1e79916d93f8af111dca83ad52c5c4e5c8f7fd 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp >+++ b/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp >@@ -104,24 +104,24 @@ void SourceBufferPrivateGStreamer::setReadyState(MediaPlayer::ReadyState state) > m_mediaSource->setReadyState(state); > } > >-void SourceBufferPrivateGStreamer::flush(const AtomicString& trackId) >+void SourceBufferPrivateGStreamer::flush(const AtomString& trackId) > { > m_client->flush(trackId); > } > >-void SourceBufferPrivateGStreamer::enqueueSample(Ref<MediaSample>&& sample, const AtomicString&) >+void SourceBufferPrivateGStreamer::enqueueSample(Ref<MediaSample>&& sample, const AtomString&) > { > m_notifyWhenReadyForMoreSamples = false; > > m_client->enqueueSample(WTFMove(sample)); > } > >-void SourceBufferPrivateGStreamer::allSamplesInTrackEnqueued(const AtomicString& trackId) >+void SourceBufferPrivateGStreamer::allSamplesInTrackEnqueued(const AtomString& trackId) > { > m_client->allSamplesInTrackEnqueued(trackId); > } > >-bool SourceBufferPrivateGStreamer::isReadyForMoreSamples(const AtomicString&) >+bool SourceBufferPrivateGStreamer::isReadyForMoreSamples(const AtomString&) > { > return m_isReadyForMoreSamples; > } >@@ -146,7 +146,7 @@ void SourceBufferPrivateGStreamer::setActive(bool isActive) > m_mediaSource->sourceBufferPrivateDidChangeActiveState(this, isActive); > } > >-void SourceBufferPrivateGStreamer::notifyClientWhenReadyForMoreSamples(const AtomicString& trackId) >+void SourceBufferPrivateGStreamer::notifyClientWhenReadyForMoreSamples(const AtomString& trackId) > { > ASSERT(WTF::isMainThread()); > m_notifyWhenReadyForMoreSamples = true; >diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.h >index ead1ac47ba346df41e1488212874ae96d2642edf..e5fe4068a82a7d22ecf9457fde2b98e117cb90b4 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.h >+++ b/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.h >@@ -62,12 +62,12 @@ public: > MediaPlayer::ReadyState readyState() const final; > void setReadyState(MediaPlayer::ReadyState) final; > >- void flush(const AtomicString&) final; >- void enqueueSample(Ref<MediaSample>&&, const AtomicString&) final; >- void allSamplesInTrackEnqueued(const AtomicString&) final; >- bool isReadyForMoreSamples(const AtomicString&) final; >+ void flush(const AtomString&) final; >+ void enqueueSample(Ref<MediaSample>&&, const AtomString&) final; >+ void allSamplesInTrackEnqueued(const AtomString&) final; >+ bool isReadyForMoreSamples(const AtomString&) final; > void setActive(bool) final; >- void notifyClientWhenReadyForMoreSamples(const AtomicString&) final; >+ void notifyClientWhenReadyForMoreSamples(const AtomString&) final; > > void setReadyForMoreSamples(bool); > void notifyReadyForMoreSamples(); >@@ -89,7 +89,7 @@ private: > SourceBufferPrivateClient* m_sourceBufferPrivateClient { nullptr }; > bool m_isReadyForMoreSamples = true; > bool m_notifyWhenReadyForMoreSamples = false; >- AtomicString m_trackId; >+ AtomString m_trackId; > }; > > } >diff --git a/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm b/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm >index 8fdb8ba1edf42ecd47a8c676e12a2cb6d8320869..8ba3960b387e33dcbe9942c44e6ab52a70fa7537 100644 >--- a/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm >+++ b/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm >@@ -52,10 +52,10 @@ FontPlatformData* FontCache::getCustomFallbackFont(const UInt32 c, const FontDes > { > ASSERT(requiresCustomFallbackFont(c)); > >- static NeverDestroyed<AtomicString> helveticaFamily("Helvetica Neue", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> timesNewRomanPSMTFamily("TimesNewRomanPSMT", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> helveticaFamily("Helvetica Neue", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> timesNewRomanPSMTFamily("TimesNewRomanPSMT", AtomString::ConstructFromLiteral); > >- AtomicString* family = nullptr; >+ AtomString* family = nullptr; > switch (c) { > case AppleLogo: > family = &helveticaFamily.get(); >@@ -128,7 +128,7 @@ static RetainPtr<CTFontDescriptorRef> systemFontDescriptor(FontSelectionValue we > return adoptCF(CTFontDescriptorCreateCopyWithAttributes(fontDescriptor.get(), static_cast<CFDictionaryRef>(attributes.get()))); > } > >-RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontSelectionRequest request, float size, AllowUserInstalledFonts allowUserInstalledFonts) >+RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomString& family, FontSelectionRequest request, float size, AllowUserInstalledFonts allowUserInstalledFonts) > { > // FIXME: See comment in FontCascadeDescription::effectiveFamilyAt() in FontDescriptionCocoa.cpp > if (family.startsWith("UICTFontTextStyle")) { >diff --git a/Source/WebCore/platform/graphics/mac/FontCacheMac.mm b/Source/WebCore/platform/graphics/mac/FontCacheMac.mm >index 211d899cab7fb5cbb7597085a884d6d1b0c5efca..b3dcdcc7fb5658b4610fd215c37fecce0fe3e08c 100644 >--- a/Source/WebCore/platform/graphics/mac/FontCacheMac.mm >+++ b/Source/WebCore/platform/graphics/mac/FontCacheMac.mm >@@ -43,7 +43,7 @@ > #import <wtf/NeverDestroyed.h> > #import <wtf/StdLibExtras.h> > #import <wtf/Threading.h> >-#import <wtf/text/AtomicStringHash.h> >+#import <wtf/text/AtomStringHash.h> > #endif > > #import <wtf/SoftLinking.h> >@@ -73,7 +73,7 @@ static CGFloat toNSFontWeight(FontSelectionValue fontWeight) > return NSFontWeightBlack; > } > >-RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontSelectionRequest request, float size, AllowUserInstalledFonts allowUserInstalledFonts) >+RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomString& family, FontSelectionRequest request, float size, AllowUserInstalledFonts allowUserInstalledFonts) > { > // FIXME: See comment in FontCascadeDescription::effectiveFamilyAt() in FontDescriptionCocoa.cpp > if (equalLettersIgnoringASCIICase(family, "-webkit-system-font") || equalLettersIgnoringASCIICase(family, "-apple-system") || equalLettersIgnoringASCIICase(family, "-apple-system-font") || equalLettersIgnoringASCIICase(family, "system-ui")) { >diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp >index e1c97fe42f7db7eb20d0cc13c0442f596cfc19e5..eb8788d4ff5e889fbaf46c6016995300a78d710d 100644 >--- a/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp >+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp >@@ -525,7 +525,7 @@ void TextureMapperShaderProgram::setMatrix(GLuint location, const Transformation > glUniformMatrix4fv(location, 1, false, floatMatrix.data()); > } > >-GLuint TextureMapperShaderProgram::getLocation(const AtomicString& name, VariableType type) >+GLuint TextureMapperShaderProgram::getLocation(const AtomString& name, VariableType type) > { > auto addResult = m_variables.ensure(name, > [this, &name, type] { >diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h b/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h >index 8da1e42819e0d174787b37fa0f56f41f21f26ced..4a3420c0602cb4d60a498b9475a3f397d2d71f19 100644 >--- a/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h >+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h >@@ -28,13 +28,13 @@ > #include <wtf/HashMap.h> > #include <wtf/NeverDestroyed.h> > #include <wtf/Ref.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > > #define TEXMAP_DECLARE_VARIABLE(Accessor, Name, Type) \ > GLuint Accessor##Location() { \ >- static NeverDestroyed<const AtomicString> name(Name, AtomicString::ConstructFromLiteral); \ >+ static NeverDestroyed<const AtomString> name(Name, AtomString::ConstructFromLiteral); \ > return getLocation(name.get(), Type); \ > } > >@@ -98,10 +98,10 @@ private: > GLuint m_fragmentShader; > > enum VariableType { UniformVariable, AttribVariable }; >- GLuint getLocation(const AtomicString&, VariableType); >+ GLuint getLocation(const AtomString&, VariableType); > > GLuint m_id; >- HashMap<AtomicString, GLuint> m_variables; >+ HashMap<AtomString, GLuint> m_variables; > }; > > } >diff --git a/Source/WebCore/platform/graphics/win/FontCacheWin.cpp b/Source/WebCore/platform/graphics/win/FontCacheWin.cpp >index 9a85640bdf91079ea340395b8e227201bd91d412..d9723838e3b6050b9a4caa8e97fa6c12cbbdda7f 100644 >--- a/Source/WebCore/platform/graphics/win/FontCacheWin.cpp >+++ b/Source/WebCore/platform/graphics/win/FontCacheWin.cpp >@@ -328,9 +328,9 @@ Vector<String> FontCache::systemFontFamilies() > return fontFamilies; > } > >-RefPtr<Font> FontCache::fontFromDescriptionAndLogFont(const FontDescription& fontDescription, const LOGFONT& font, AtomicString& outFontFamilyName) >+RefPtr<Font> FontCache::fontFromDescriptionAndLogFont(const FontDescription& fontDescription, const LOGFONT& font, AtomString& outFontFamilyName) > { >- AtomicString familyName(font.lfFaceName, wcsnlen(font.lfFaceName, LF_FACESIZE)); >+ AtomString familyName(font.lfFaceName, wcsnlen(font.lfFaceName, LF_FACESIZE)); > RefPtr<Font> fontData = fontForFamily(fontDescription, familyName); > if (fontData) > outFontFamilyName = familyName; >@@ -339,7 +339,7 @@ RefPtr<Font> FontCache::fontFromDescriptionAndLogFont(const FontDescription& fon > > Ref<Font> FontCache::lastResortFallbackFont(const FontDescription& fontDescription) > { >- static NeverDestroyed<AtomicString> fallbackFontName; >+ static NeverDestroyed<AtomString> fallbackFontName; > > if (!fallbackFontName.get().isEmpty()) > return *fontForFamily(fontDescription, fallbackFontName); >@@ -350,12 +350,12 @@ Ref<Font> FontCache::lastResortFallbackFont(const FontDescription& fontDescripti > // Search all typical Windows-installed full Unicode fonts. > // Sorted by most to least glyphs according to http://en.wikipedia.org/wiki/Unicode_typefaces > // Start with Times New Roman also since it is the default if the user doesn't change prefs. >- static NeverDestroyed<AtomicString> fallbackFonts[] = { >- AtomicString("Times New Roman", AtomicString::ConstructFromLiteral), >- AtomicString("Microsoft Sans Serif", AtomicString::ConstructFromLiteral), >- AtomicString("Tahoma", AtomicString::ConstructFromLiteral), >- AtomicString("Lucida Sans Unicode", AtomicString::ConstructFromLiteral), >- AtomicString("Arial", AtomicString::ConstructFromLiteral) >+ static NeverDestroyed<AtomString> fallbackFonts[] = { >+ AtomString("Times New Roman", AtomString::ConstructFromLiteral), >+ AtomString("Microsoft Sans Serif", AtomString::ConstructFromLiteral), >+ AtomString("Tahoma", AtomString::ConstructFromLiteral), >+ AtomString("Lucida Sans Unicode", AtomString::ConstructFromLiteral), >+ AtomString("Arial", AtomString::ConstructFromLiteral) > }; > RefPtr<Font> simpleFont; > for (size_t i = 0; i < WTF_ARRAY_LENGTH(fallbackFonts); ++i) { >@@ -477,7 +477,7 @@ static int CALLBACK matchImprovingEnumProc(CONST LOGFONT* candidate, CONST TEXTM > return 1; > } > >-static GDIObject<HFONT> createGDIFont(const AtomicString& family, LONG desiredWeight, bool desiredItalic, int size, bool synthesizeItalic) >+static GDIObject<HFONT> createGDIFont(const AtomString& family, LONG desiredWeight, bool desiredItalic, int size, bool synthesizeItalic) > { > HWndDC hdc(0); > >@@ -535,12 +535,12 @@ static GDIObject<HFONT> createGDIFont(const AtomicString& family, LONG desiredWe > } > > struct TraitsInFamilyProcData { >- TraitsInFamilyProcData(const AtomicString& familyName) >+ TraitsInFamilyProcData(const AtomString& familyName) > : m_familyName(familyName) > { > } > >- const AtomicString& m_familyName; >+ const AtomString& m_familyName; > Vector<FontSelectionCapabilities> m_capabilities; > }; > >@@ -591,7 +591,7 @@ static int CALLBACK traitsInFamilyEnumProc(CONST LOGFONT* logFont, CONST TEXTMET > return 1; > } > >-Vector<FontSelectionCapabilities> FontCache::getFontSelectionCapabilitiesInFamily(const AtomicString& familyName, AllowUserInstalledFonts) >+Vector<FontSelectionCapabilities> FontCache::getFontSelectionCapabilitiesInFamily(const AtomString& familyName, AllowUserInstalledFonts) > { > HWndDC hdc(0); > >@@ -611,7 +611,7 @@ Vector<FontSelectionCapabilities> FontCache::getFontSelectionCapabilitiesInFamil > return result; > } > >-std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomicString& family, const FontFeatureSettings*, const FontVariantSettings*, FontSelectionSpecifiedCapabilities) >+std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomString& family, const FontFeatureSettings*, const FontVariantSettings*, FontSelectionSpecifiedCapabilities) > { > bool isLucidaGrande = equalLettersIgnoringASCIICase(family, "lucida grande"); > >@@ -657,10 +657,10 @@ std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDe > return result; > } > >-const AtomicString& FontCache::platformAlternateFamilyName(const AtomicString& familyName) >+const AtomString& FontCache::platformAlternateFamilyName(const AtomString& familyName) > { >- static NeverDestroyed<AtomicString> timesNewRoman("Times New Roman", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<AtomicString> microsoftSansSerif("Microsoft Sans Serif", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> timesNewRoman("Times New Roman", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> microsoftSansSerif("Microsoft Sans Serif", AtomString::ConstructFromLiteral); > > switch (familyName.length()) { > // On Windows, we don't support bitmap fonts, but legacy content expects support. >diff --git a/Source/WebCore/platform/ios/wak/WebCoreThread.mm b/Source/WebCore/platform/ios/wak/WebCoreThread.mm >index 664736f9506e0f3b5167e1fcfbe95af008129ee9..195408dbd7ad426961dd4c5211165d23cc6ee955 100644 >--- a/Source/WebCore/platform/ios/wak/WebCoreThread.mm >+++ b/Source/WebCore/platform/ios/wak/WebCoreThread.mm >@@ -50,7 +50,7 @@ > #import <wtf/ThreadSpecific.h> > #import <wtf/Threading.h> > #import <wtf/spi/cocoa/objcSPI.h> >-#import <wtf/text/AtomicString.h> >+#import <wtf/text/AtomString.h> > > #define LOG_MESSAGES 0 > #define LOG_WEB_LOCK 0 >@@ -632,11 +632,11 @@ static void StartWebThread() > { > webThreadStarted = TRUE; > >- // ThreadGlobalData touches AtomicString, which requires Threading initialization. >+ // ThreadGlobalData touches AtomString, which requires Threading initialization. > WTF::initializeThreading(); > >- // Initialize AtomicString on the main thread. >- WTF::AtomicString::init(); >+ // Initialize AtomString on the main thread. >+ WTF::AtomString::init(); > > // Initialize ThreadGlobalData on the main UI thread so that the WebCore thread > // can later set it's thread-specific data to point to the same objects. >diff --git a/Source/WebCore/platform/mac/ThemeMac.mm b/Source/WebCore/platform/mac/ThemeMac.mm >index b4a8162ddb3e947c7f79adf03feeb85503f378e9..272824ec88bbbc10369477ed098ac484413ab9af 100644 >--- a/Source/WebCore/platform/mac/ThemeMac.mm >+++ b/Source/WebCore/platform/mac/ThemeMac.mm >@@ -771,7 +771,7 @@ Optional<FontCascadeDescription> ThemeMac::controlFont(ControlPart part, const F > fontDescription.setIsAbsoluteSize(true); > > NSFont* nsFont = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:controlSizeForFont(font)]]; >- fontDescription.setOneFamily(AtomicString("-apple-system", AtomicString::ConstructFromLiteral)); >+ fontDescription.setOneFamily(AtomString("-apple-system", AtomString::ConstructFromLiteral)); > fontDescription.setComputedSize([nsFont pointSize] * zoomFactor); > fontDescription.setSpecifiedSize([nsFont pointSize] * zoomFactor); > return fontDescription; >diff --git a/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.h b/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.h >index be47695ac3b2e2a59c3df756cf4b1b82bdaca62a..dcd3aec2549f36ed3eac81b3e049d64249f8b8fb 100644 >--- a/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.h >+++ b/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.h >@@ -41,9 +41,9 @@ public: > } > > Kind kind() const override { return Kind::Main; } >- AtomicString id() const override { return m_id; } >- AtomicString label() const override { return m_label; } >- AtomicString language() const override { return emptyAtom(); } >+ AtomString id() const override { return m_id; } >+ AtomString label() const override { return m_label; } >+ AtomString language() const override { return emptyAtom(); } > int trackIndex() const override { return m_index; } > > void setTrackIndex(int index) { m_index = index; } >@@ -63,8 +63,8 @@ protected: > } > > Ref<MediaStreamTrackPrivate> m_streamTrack; >- AtomicString m_id; >- AtomicString m_label; >+ AtomString m_id; >+ AtomString m_label; > int m_index { 0 }; > MediaTime m_timelineOffset; > }; >diff --git a/Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h b/Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h >index 141ed119ddf7144769f0dccf2a70104b6cf874dc..9c2bf650ae1ef5ce71ffd14421c824eaffc0737b 100644 >--- a/Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h >+++ b/Source/WebCore/platform/mediastream/RealtimeMediaSourceCapabilities.h >@@ -32,7 +32,7 @@ > #include <wtf/NeverDestroyed.h> > #include <wtf/RefCounted.h> > #include <wtf/Vector.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -184,12 +184,12 @@ public: > void setEchoCancellation(EchoCancellation echoCancellation) { m_echoCancellation = echoCancellation; } > > bool supportsDeviceId() const { return m_supportedConstraints.supportsDeviceId(); } >- const AtomicString& deviceId() const { return m_deviceId; } >- void setDeviceId(const AtomicString& id) { m_deviceId = id; } >+ const AtomString& deviceId() const { return m_deviceId; } >+ void setDeviceId(const AtomString& id) { m_deviceId = id; } > > bool supportsGroupId() const { return m_supportedConstraints.supportsGroupId(); } >- const AtomicString& groupId() const { return m_groupId; } >- void setGroupId(const AtomicString& id) { m_groupId = id; } >+ const AtomString& groupId() const { return m_groupId; } >+ void setGroupId(const AtomString& id) { m_groupId = id; } > > const RealtimeMediaSourceSupportedConstraints& supportedConstraints() const { return m_supportedConstraints; } > void setSupportedConstraints(const RealtimeMediaSourceSupportedConstraints& constraints) { m_supportedConstraints = constraints; } >@@ -207,8 +207,8 @@ private: > CapabilityValueOrRange m_sampleRate; > CapabilityValueOrRange m_sampleSize; > EchoCancellation m_echoCancellation; >- AtomicString m_deviceId; >- AtomicString m_groupId; >+ AtomString m_deviceId; >+ AtomString m_groupId; > > RealtimeMediaSourceSupportedConstraints m_supportedConstraints; > }; >diff --git a/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h b/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h >index 395a64cbd3cfaee405555f36721ab3c24e301864..f04db454367386e4705d8bd855475f29993ba923 100644 >--- a/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h >+++ b/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h >@@ -31,7 +31,7 @@ > #include <wtf/OptionSet.h> > #include <wtf/RefCounted.h> > #include <wtf/Vector.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -102,12 +102,12 @@ public: > void setEchoCancellation(bool echoCancellation) { m_echoCancellation = echoCancellation; } > > bool supportsDeviceId() const { return m_supportedConstraints.supportsDeviceId(); } >- const AtomicString& deviceId() const { return m_deviceId; } >- void setDeviceId(const AtomicString& deviceId) { m_deviceId = deviceId; } >+ const AtomString& deviceId() const { return m_deviceId; } >+ void setDeviceId(const AtomString& deviceId) { m_deviceId = deviceId; } > > bool supportsGroupId() const { return m_supportedConstraints.supportsGroupId(); } >- const AtomicString& groupId() const { return m_groupId; } >- void setGroupId(const AtomicString& groupId) { m_groupId = groupId; } >+ const AtomString& groupId() const { return m_groupId; } >+ void setGroupId(const AtomString& groupId) { m_groupId = groupId; } > > enum class DisplaySurfaceType { > Monitor, >@@ -128,8 +128,8 @@ public: > const RealtimeMediaSourceSupportedConstraints& supportedConstraints() const { return m_supportedConstraints; } > void setSupportedConstraints(const RealtimeMediaSourceSupportedConstraints& supportedConstraints) { m_supportedConstraints = supportedConstraints; } > >- const AtomicString& label() const { return m_label; } >- void setLabel(const AtomicString& label) { m_label = label; } >+ const AtomString& label() const { return m_label; } >+ void setLabel(const AtomString& label) { m_label = label; } > > template<class Encoder> void encode(Encoder&) const; > template<class Decoder> static bool decode(Decoder&, RealtimeMediaSourceSettings&); >@@ -147,9 +147,9 @@ private: > uint32_t m_sampleSize { 0 }; > bool m_echoCancellation { 0 }; > >- AtomicString m_deviceId; >- AtomicString m_groupId; >- AtomicString m_label; >+ AtomString m_deviceId; >+ AtomString m_groupId; >+ AtomString m_label; > > DisplaySurfaceType m_displaySurface { DisplaySurfaceType::Invalid }; > bool m_logicalSurface { 0 }; >diff --git a/Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp b/Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp >index 605d3887cb4c2e306ccff83138de53f30bcd034e..3e61cad37d18f1d5addd100e4918bca8e2d50c95 100644 >--- a/Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp >+++ b/Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.cpp >@@ -29,8 +29,8 @@ > #if ENABLE(MEDIA_STREAM) > > #include <wtf/HashMap.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >diff --git a/Source/WebCore/platform/mediastream/VideoTrackPrivateMediaStream.h b/Source/WebCore/platform/mediastream/VideoTrackPrivateMediaStream.h >index 4b86c1bac9070073751e373a9cf1e33eca6fc366..10631f062e37dd2dc8ee928ef0edf4f555f87b6d 100644 >--- a/Source/WebCore/platform/mediastream/VideoTrackPrivateMediaStream.h >+++ b/Source/WebCore/platform/mediastream/VideoTrackPrivateMediaStream.h >@@ -57,14 +57,14 @@ private: > } > > Kind kind() const final { return Kind::Main; } >- AtomicString id() const final { return m_id; } >- AtomicString label() const final { return m_label; } >- AtomicString language() const final { return emptyAtom(); } >+ AtomString id() const final { return m_id; } >+ AtomString label() const final { return m_label; } >+ AtomString language() const final { return emptyAtom(); } > int trackIndex() const final { return m_index; } > > Ref<MediaStreamTrackPrivate> m_streamTrack; >- AtomicString m_id; >- AtomicString m_label; >+ AtomString m_id; >+ AtomString m_label; > int m_index { 0 }; > MediaTime m_timelineOffset; > }; >diff --git a/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp b/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp >index d0f9dce85fe94525adcf8ff9fe9f2a87b24b9c36..b42f04bedf01ed07abe09c53f9b89f610dbfafea 100644 >--- a/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp >+++ b/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp >@@ -49,14 +49,14 @@ public: > private: > MockMediaSample(const MockSampleBox& box) > : m_box(box) >- , m_id(AtomicString::number(box.trackID())) >+ , m_id(AtomString::number(box.trackID())) > { > } > > MediaTime presentationTime() const override { return m_box.presentationTimestamp(); } > MediaTime decodeTime() const override { return m_box.decodeTimestamp(); } > MediaTime duration() const override { return m_box.duration(); } >- AtomicString trackID() const override { return m_id; } >+ AtomString trackID() const override { return m_id; } > void setTrackID(const String& id) override { m_id = id; } > size_t sizeInBytes() const override { return sizeof(m_box); } > SampleFlags flags() const override; >@@ -72,7 +72,7 @@ private: > unsigned generation() const { return m_box.generation(); } > > MockSampleBox m_box; >- AtomicString m_id; >+ AtomString m_id; > }; > > MediaSample::SampleFlags MockMediaSample::flags() const >@@ -108,7 +108,7 @@ public: > static Ref<MockMediaDescription> create(const MockTrackBox& box) { return adoptRef(*new MockMediaDescription(box)); } > virtual ~MockMediaDescription() = default; > >- AtomicString codec() const override { return m_box.codec(); } >+ AtomString codec() const override { return m_box.codec(); } > bool isVideo() const override { return m_box.kind() == MockTrackBox::Video; } > bool isAudio() const override { return m_box.kind() == MockTrackBox::Audio; } > bool isText() const override { return m_box.kind() == MockTrackBox::Text; } >@@ -235,7 +235,7 @@ void MockSourceBufferPrivate::setActive(bool isActive) > m_mediaSource->sourceBufferPrivateDidChangeActiveState(this, isActive); > } > >-Vector<String> MockSourceBufferPrivate::enqueuedSamplesForTrackID(const AtomicString&) >+Vector<String> MockSourceBufferPrivate::enqueuedSamplesForTrackID(const AtomString&) > { > return m_enqueuedSamples; > } >@@ -248,7 +248,7 @@ bool MockSourceBufferPrivate::canSwitchToType(const ContentType& contentType) > return MockMediaPlayerMediaSource::supportsType(parameters) != MediaPlayer::IsNotSupported; > } > >-void MockSourceBufferPrivate::enqueueSample(Ref<MediaSample>&& sample, const AtomicString&) >+void MockSourceBufferPrivate::enqueueSample(Ref<MediaSample>&& sample, const AtomString&) > { > if (!m_mediaSource) > return; >diff --git a/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.h b/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.h >index f89a80b50d0761c7186fc9cb4c9767f0b768d400..e4b9599de9a96d79091fa2c8650c5efbbfbe316d 100644 >--- a/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.h >+++ b/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.h >@@ -64,12 +64,12 @@ private: > void setReadyState(MediaPlayer::ReadyState) final; > bool canSwitchToType(const ContentType&) final; > >- void flush(const AtomicString&) final { m_enqueuedSamples.clear(); } >- void enqueueSample(Ref<MediaSample>&&, const AtomicString&) final; >- bool isReadyForMoreSamples(const AtomicString&) final { return true; } >+ void flush(const AtomString&) final { m_enqueuedSamples.clear(); } >+ void enqueueSample(Ref<MediaSample>&&, const AtomString&) final; >+ bool isReadyForMoreSamples(const AtomString&) final { return true; } > void setActive(bool) final; > >- Vector<String> enqueuedSamplesForTrackID(const AtomicString&) final; >+ Vector<String> enqueuedSamplesForTrackID(const AtomString&) final; > > void didReceiveInitializationSegment(const MockInitializationBox&); > void didReceiveSample(const MockSampleBox&); >diff --git a/Source/WebCore/platform/mock/mediasource/MockTracks.h b/Source/WebCore/platform/mock/mediasource/MockTracks.h >index f4c0092294881a4faef1c0df7520834c69e22023..86e29363da5af0bb3b7e512e16d59622a62456fc 100644 >--- a/Source/WebCore/platform/mock/mediasource/MockTracks.h >+++ b/Source/WebCore/platform/mock/mediasource/MockTracks.h >@@ -39,16 +39,16 @@ public: > static Ref<MockAudioTrackPrivate> create(const MockTrackBox& box) { return adoptRef(*new MockAudioTrackPrivate(box)); } > virtual ~MockAudioTrackPrivate() = default; > >- virtual AtomicString id() const { return m_id; } >+ virtual AtomString id() const { return m_id; } > > protected: > MockAudioTrackPrivate(const MockTrackBox& box) > : m_box(box) >- , m_id(AtomicString::number(box.trackID())) >+ , m_id(AtomString::number(box.trackID())) > { > } > MockTrackBox m_box; >- AtomicString m_id; >+ AtomString m_id; > }; > > class MockTextTrackPrivate : public InbandTextTrackPrivate { >@@ -56,17 +56,17 @@ public: > static Ref<MockTextTrackPrivate> create(const MockTrackBox& box) { return adoptRef(*new MockTextTrackPrivate(box)); } > virtual ~MockTextTrackPrivate() = default; > >- virtual AtomicString id() const { return m_id; } >+ virtual AtomString id() const { return m_id; } > > protected: > MockTextTrackPrivate(const MockTrackBox& box) > : InbandTextTrackPrivate(InbandTextTrackPrivate::Generic) > , m_box(box) >- , m_id(AtomicString::number(box.trackID())) >+ , m_id(AtomString::number(box.trackID())) > { > } > MockTrackBox m_box; >- AtomicString m_id; >+ AtomString m_id; > }; > > >@@ -75,16 +75,16 @@ public: > static Ref<MockVideoTrackPrivate> create(const MockTrackBox& box) { return adoptRef(*new MockVideoTrackPrivate(box)); } > virtual ~MockVideoTrackPrivate() = default; > >- virtual AtomicString id() const { return m_id; } >+ virtual AtomString id() const { return m_id; } > > protected: > MockVideoTrackPrivate(const MockTrackBox& box) > : m_box(box) >- , m_id(AtomicString::number(box.trackID())) >+ , m_id(AtomString::number(box.trackID())) > { > } > MockTrackBox m_box; >- AtomicString m_id; >+ AtomString m_id; > }; > > } >diff --git a/Source/WebCore/platform/network/HTTPParsers.cpp b/Source/WebCore/platform/network/HTTPParsers.cpp >index 474a1a2e0c54a3a75e1e6b4bfc744c0282bca10f..58a55c0fa9e6738b4e6c9587222c0dc2d9a5f6fd 100644 >--- a/Source/WebCore/platform/network/HTTPParsers.cpp >+++ b/Source/WebCore/platform/network/HTTPParsers.cpp >@@ -485,7 +485,7 @@ ContentTypeOptionsDisposition parseContentTypeOptionsHeader(StringView header) > > // For example: "HTTP/1.1 200 OK" => "OK". > // Note that HTTP/2 does not include a reason phrase, so we return the empty atom. >-AtomicString extractReasonPhraseFromHTTPStatusLine(const String& statusLine) >+AtomString extractReasonPhraseFromHTTPStatusLine(const String& statusLine) > { > StringView view = statusLine; > size_t spacePos = view.find(' '); >@@ -495,7 +495,7 @@ AtomicString extractReasonPhraseFromHTTPStatusLine(const String& statusLine) > if (spacePos == notFound) > return emptyAtom(); > >- return view.substring(spacePos + 1).toAtomicString(); >+ return view.substring(spacePos + 1).toAtomString(); > } > > XFrameOptionsDisposition parseXFrameOptionsHeader(const String& header) >diff --git a/Source/WebCore/platform/network/HTTPParsers.h b/Source/WebCore/platform/network/HTTPParsers.h >index b7ee045bce3115c88ab7f80309f93dbd90304605..e3e192705c71fe2b2ef10770ddd125606fc3df9d 100644 >--- a/Source/WebCore/platform/network/HTTPParsers.h >+++ b/Source/WebCore/platform/network/HTTPParsers.h >@@ -80,7 +80,7 @@ String extractMIMETypeFromMediaType(const String&); > String extractCharsetFromMediaType(const String&); > void findCharsetInMediaType(const String& mediaType, unsigned int& charsetPos, unsigned int& charsetLen, unsigned int start = 0); > XSSProtectionDisposition parseXSSProtectionHeader(const String& header, String& failureReason, unsigned& failurePosition, String& reportURL); >-AtomicString extractReasonPhraseFromHTTPStatusLine(const String&); >+AtomString extractReasonPhraseFromHTTPStatusLine(const String&); > WEBCORE_EXPORT XFrameOptionsDisposition parseXFrameOptionsHeader(const String&); > > // -1 could be set to one of the return parameters to indicate the value is not specified. >diff --git a/Source/WebCore/platform/network/ResourceHandle.cpp b/Source/WebCore/platform/network/ResourceHandle.cpp >index 70ee4e7711fd748b68f7d9a0f2aa36bb03dc35b0..30c27f576a177e6b6ab194740a7d9025b659fcad 100644 >--- a/Source/WebCore/platform/network/ResourceHandle.cpp >+++ b/Source/WebCore/platform/network/ResourceHandle.cpp >@@ -36,14 +36,14 @@ > #include <wtf/CompletionHandler.h> > #include <wtf/MainThread.h> > #include <wtf/NeverDestroyed.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/CString.h> > > namespace WebCore { > > static bool shouldForceContentSniffing; > >-typedef HashMap<AtomicString, ResourceHandle::BuiltinConstructor> BuiltinResourceHandleConstructorMap; >+typedef HashMap<AtomString, ResourceHandle::BuiltinConstructor> BuiltinResourceHandleConstructorMap; > static BuiltinResourceHandleConstructorMap& builtinResourceHandleConstructorMap() > { > #if PLATFORM(IOS_FAMILY) >@@ -55,12 +55,12 @@ static BuiltinResourceHandleConstructorMap& builtinResourceHandleConstructorMap( > return map; > } > >-void ResourceHandle::registerBuiltinConstructor(const AtomicString& protocol, ResourceHandle::BuiltinConstructor constructor) >+void ResourceHandle::registerBuiltinConstructor(const AtomString& protocol, ResourceHandle::BuiltinConstructor constructor) > { > builtinResourceHandleConstructorMap().add(protocol, constructor); > } > >-typedef HashMap<AtomicString, ResourceHandle::BuiltinSynchronousLoader> BuiltinResourceHandleSynchronousLoaderMap; >+typedef HashMap<AtomString, ResourceHandle::BuiltinSynchronousLoader> BuiltinResourceHandleSynchronousLoaderMap; > static BuiltinResourceHandleSynchronousLoaderMap& builtinResourceHandleSynchronousLoaderMap() > { > ASSERT(isMainThread()); >@@ -68,7 +68,7 @@ static BuiltinResourceHandleSynchronousLoaderMap& builtinResourceHandleSynchrono > return map; > } > >-void ResourceHandle::registerBuiltinSynchronousLoader(const AtomicString& protocol, ResourceHandle::BuiltinSynchronousLoader loader) >+void ResourceHandle::registerBuiltinSynchronousLoader(const AtomString& protocol, ResourceHandle::BuiltinSynchronousLoader loader) > { > builtinResourceHandleSynchronousLoaderMap().add(protocol, loader); > } >diff --git a/Source/WebCore/platform/network/ResourceHandle.h b/Source/WebCore/platform/network/ResourceHandle.h >index 9e25d9e2b4496ed16c9a93d2bb87252f19be4ad0..983024ff5d867415c4083cc7b8fbf573885bcd74 100644 >--- a/Source/WebCore/platform/network/ResourceHandle.h >+++ b/Source/WebCore/platform/network/ResourceHandle.h >@@ -30,7 +30,7 @@ > #include <wtf/MonotonicTime.h> > #include <wtf/RefCounted.h> > #include <wtf/RefPtr.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > #if PLATFORM(COCOA) || USE(CFURLCONNECTION) > #include <wtf/RetainPtr.h> >@@ -204,10 +204,10 @@ public: > #endif > > typedef Ref<ResourceHandle> (*BuiltinConstructor)(const ResourceRequest& request, ResourceHandleClient* client); >- static void registerBuiltinConstructor(const AtomicString& protocol, BuiltinConstructor); >+ static void registerBuiltinConstructor(const AtomString& protocol, BuiltinConstructor); > > typedef void (*BuiltinSynchronousLoader)(NetworkingContext*, const ResourceRequest&, StoredCredentialsPolicy, ResourceError&, ResourceResponse&, Vector<char>& data); >- static void registerBuiltinSynchronousLoader(const AtomicString& protocol, BuiltinSynchronousLoader); >+ static void registerBuiltinSynchronousLoader(const AtomString& protocol, BuiltinSynchronousLoader); > > protected: > ResourceHandle(NetworkingContext*, const ResourceRequest&, ResourceHandleClient*, bool defersLoading, bool shouldContentSniff, bool shouldContentEncodingSniff); >diff --git a/Source/WebCore/platform/network/ResourceResponseBase.h b/Source/WebCore/platform/network/ResourceResponseBase.h >index ce75e9c814bda0b7f46bafa2e59d2378f30a77bf..9f1b3b2e7fc67935bf788d4977190dee5305855d 100644 >--- a/Source/WebCore/platform/network/ResourceResponseBase.h >+++ b/Source/WebCore/platform/network/ResourceResponseBase.h >@@ -206,11 +206,11 @@ private: > > protected: > URL m_url; >- AtomicString m_mimeType; >+ AtomString m_mimeType; > long long m_expectedContentLength { 0 }; >- AtomicString m_textEncodingName; >- AtomicString m_httpStatusText; >- AtomicString m_httpVersion; >+ AtomString m_textEncodingName; >+ AtomString m_httpStatusText; >+ AtomString m_httpVersion; > HTTPHeaderMap m_httpHeaderFields; > mutable NetworkLoadMetrics m_networkLoadMetrics; > >diff --git a/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm b/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm >index 3241c66b1bb2e003878fc454d710fd1132cf16d2..5ef9ab9f32ec892088e2b07b5745f06c21881ae3 100644 >--- a/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm >+++ b/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm >@@ -124,13 +124,13 @@ static void addToHTTPHeaderMap(const void* key, const void* value, void* context > httpHeaderMap->set((CFStringRef)key, (CFStringRef)value); > } > >-static inline AtomicString stripLeadingAndTrailingDoubleQuote(const String& value) >+static inline AtomString stripLeadingAndTrailingDoubleQuote(const String& value) > { > unsigned length = value.length(); > if (length < 2 || value[0u] != '"' || value[length - 1] != '"') > return value; > >- return StringView(value).substring(1, length - 2).toAtomicString(); >+ return StringView(value).substring(1, length - 2).toAtomString(); > } > > static inline HTTPHeaderMap initializeHTTPHeaders(CFHTTPMessageRef messageRef) >@@ -143,12 +143,12 @@ static inline HTTPHeaderMap initializeHTTPHeaders(CFHTTPMessageRef messageRef) > return headersMap; > } > >-static inline AtomicString extractHTTPStatusText(CFHTTPMessageRef messageRef) >+static inline AtomString extractHTTPStatusText(CFHTTPMessageRef messageRef) > { > if (auto httpStatusLine = adoptCF(CFHTTPMessageCopyResponseStatusLine(messageRef))) > return extractReasonPhraseFromHTTPStatusLine(httpStatusLine.get()); > >- static NeverDestroyed<AtomicString> defaultStatusText("OK", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<AtomString> defaultStatusText("OK", AtomString::ConstructFromLiteral); > return defaultStatusText; > } > >diff --git a/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp b/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp >index 03b350db3a178863a5eaacae511c170f4676c7ef..bcb490ede320e38e13a4c2f51d240c0ec63c261f 100644 >--- a/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp >+++ b/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp >@@ -45,10 +45,10 @@ void ResourceResponse::updateFromSoupMessage(SoupMessage* soupMessage) > > switch (soup_message_get_http_version(soupMessage)) { > case SOUP_HTTP_1_0: >- m_httpVersion = AtomicString("HTTP/1.0", AtomicString::ConstructFromLiteral); >+ m_httpVersion = AtomString("HTTP/1.0", AtomString::ConstructFromLiteral); > break; > case SOUP_HTTP_1_1: >- m_httpVersion = AtomicString("HTTP/1.1", AtomicString::ConstructFromLiteral); >+ m_httpVersion = AtomString("HTTP/1.1", AtomString::ConstructFromLiteral); > break; > } > m_httpStatusCode = soupMessage->status_code; >diff --git a/Source/WebCore/platform/text/Hyphenation.cpp b/Source/WebCore/platform/text/Hyphenation.cpp >index ec07637e14dce2f246f28d16c606f0dc60a4cab8..30ed7b06c2c7bf6a85e245a3acf4573189395b1d 100644 >--- a/Source/WebCore/platform/text/Hyphenation.cpp >+++ b/Source/WebCore/platform/text/Hyphenation.cpp >@@ -33,12 +33,12 @@ > > namespace WebCore { > >-bool canHyphenate(const AtomicString& /* localeIdentifier */) >+bool canHyphenate(const AtomString& /* localeIdentifier */) > { > return false; > } > >-size_t lastHyphenLocation(StringView, size_t /* beforeIndex */, const AtomicString& /* localeIdentifier */) >+size_t lastHyphenLocation(StringView, size_t /* beforeIndex */, const AtomString& /* localeIdentifier */) > { > ASSERT_NOT_REACHED(); > return 0; >diff --git a/Source/WebCore/platform/text/Hyphenation.h b/Source/WebCore/platform/text/Hyphenation.h >index 27f4305914ad452bd9d7f790779e9595aab5642a..45d1e59a94e3d2232e1b78bf7cff64d0614449e7 100644 >--- a/Source/WebCore/platform/text/Hyphenation.h >+++ b/Source/WebCore/platform/text/Hyphenation.h >@@ -38,8 +38,8 @@ inline static bool enoughWidthForHyphenation(float availableWidth, float fontPix > return availableWidth > fontPixelSize * 5 / 4; > > } >-bool canHyphenate(const AtomicString& localeIdentifier); >-size_t lastHyphenLocation(StringView, size_t beforeIndex, const AtomicString& localeIdentifier); >+bool canHyphenate(const AtomString& localeIdentifier); >+size_t lastHyphenLocation(StringView, size_t beforeIndex, const AtomString& localeIdentifier); > > } // namespace WebCore > >diff --git a/Source/WebCore/platform/text/LocaleICU.cpp b/Source/WebCore/platform/text/LocaleICU.cpp >index 11684b8066c9eb509b4add4618b7388fb55ac1e5..59e1fc72a2bf296945a86f8552b86376a9ea586d 100644 >--- a/Source/WebCore/platform/text/LocaleICU.cpp >+++ b/Source/WebCore/platform/text/LocaleICU.cpp >@@ -42,7 +42,7 @@ > namespace WebCore { > using namespace icu; > >-std::unique_ptr<Locale> Locale::create(const AtomicString& locale) >+std::unique_ptr<Locale> Locale::create(const AtomString& locale) > { > return std::make_unique<LocaleICU>(locale.string().utf8().data()); > } >diff --git a/Source/WebCore/platform/text/LocaleNone.cpp b/Source/WebCore/platform/text/LocaleNone.cpp >index 7693ed9af242a17acd84b8472f79a1a487f9a6b1..bb6b26ba59cb36b989b7e6f58630c7a7b3b56ea7 100644 >--- a/Source/WebCore/platform/text/LocaleNone.cpp >+++ b/Source/WebCore/platform/text/LocaleNone.cpp >@@ -55,7 +55,7 @@ private: > #endif > }; > >-std::unique_ptr<Locale> Locale::create(const AtomicString&) >+std::unique_ptr<Locale> Locale::create(const AtomString&) > { > return std::make_unique<LocaleNone>(); > } >diff --git a/Source/WebCore/platform/text/PlatformLocale.h b/Source/WebCore/platform/text/PlatformLocale.h >index e6f5eb74c1d6e55f33713ef2c2d3be89277918d2..a369ea314a875ba651ac11c2b67cac3bd576d9c3 100644 >--- a/Source/WebCore/platform/text/PlatformLocale.h >+++ b/Source/WebCore/platform/text/PlatformLocale.h >@@ -40,7 +40,7 @@ class Locale { > WTF_MAKE_NONCOPYABLE(Locale); WTF_MAKE_FAST_ALLOCATED; > > public: >- static std::unique_ptr<Locale> create(const AtomicString& localeIdentifier); >+ static std::unique_ptr<Locale> create(const AtomString& localeIdentifier); > static std::unique_ptr<Locale> createDefault(); > > // Converts the specified number string to another number string localized >diff --git a/Source/WebCore/platform/text/cf/HyphenationCF.cpp b/Source/WebCore/platform/text/cf/HyphenationCF.cpp >index 1c70c413d8cc225004b17d7b2a669a737057f36d..3d02f28f685d43784d394695fcbe24f9e762918a 100644 >--- a/Source/WebCore/platform/text/cf/HyphenationCF.cpp >+++ b/Source/WebCore/platform/text/cf/HyphenationCF.cpp >@@ -35,16 +35,16 @@ > namespace WTF { > > template<> >-class TinyLRUCachePolicy<AtomicString, RetainPtr<CFLocaleRef>> >+class TinyLRUCachePolicy<AtomString, RetainPtr<CFLocaleRef>> > { > public: >- static TinyLRUCache<AtomicString, RetainPtr<CFLocaleRef>>& cache() >+ static TinyLRUCache<AtomString, RetainPtr<CFLocaleRef>>& cache() > { >- static NeverDestroyed<TinyLRUCache<AtomicString, RetainPtr<CFLocaleRef>>> cache; >+ static NeverDestroyed<TinyLRUCache<AtomString, RetainPtr<CFLocaleRef>>> cache; > return cache; > } > >- static bool isKeyNull(const AtomicString& localeIdentifier) >+ static bool isKeyNull(const AtomString& localeIdentifier) > { > return localeIdentifier.isNull(); > } >@@ -57,7 +57,7 @@ public: > return CFStringIsHyphenationAvailableForLocale(locale.get()) ? locale : nullptr; > } > >- static RetainPtr<CFLocaleRef> createValueForKey(const AtomicString& localeIdentifier) >+ static RetainPtr<CFLocaleRef> createValueForKey(const AtomString& localeIdentifier) > { > RetainPtr<CFLocaleRef> locale = adoptCF(CFLocaleCreate(kCFAllocatorDefault, localeIdentifier.string().createCFString().get())); > >@@ -68,14 +68,14 @@ public: > > namespace WebCore { > >-bool canHyphenate(const AtomicString& localeIdentifier) >+bool canHyphenate(const AtomString& localeIdentifier) > { >- return TinyLRUCachePolicy<AtomicString, RetainPtr<CFLocaleRef>>::cache().get(localeIdentifier); >+ return TinyLRUCachePolicy<AtomString, RetainPtr<CFLocaleRef>>::cache().get(localeIdentifier); > } > >-size_t lastHyphenLocation(StringView text, size_t beforeIndex, const AtomicString& localeIdentifier) >+size_t lastHyphenLocation(StringView text, size_t beforeIndex, const AtomString& localeIdentifier) > { >- RetainPtr<CFLocaleRef> locale = TinyLRUCachePolicy<AtomicString, RetainPtr<CFLocaleRef>>::cache().get(localeIdentifier); >+ RetainPtr<CFLocaleRef> locale = TinyLRUCachePolicy<AtomString, RetainPtr<CFLocaleRef>>::cache().get(localeIdentifier); > > CFOptionFlags searchAcrossWordBoundaries = 1; > CFIndex result = CFStringGetHyphenationLocationBeforeIndex(text.createCFStringWithoutCopying().get(), beforeIndex, CFRangeMake(0, text.length()), searchAcrossWordBoundaries, locale.get(), nullptr); >diff --git a/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp b/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp >index 5eeb9bfa7400f7215c026c552d82aa38a763f942..fe40fb259b93f9d34e56f23cd1dd1103c65cc9a8 100644 >--- a/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp >+++ b/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp >@@ -38,7 +38,7 @@ > #include <wtf/TinyLRUCache.h> > #include <wtf/glib/GLibUtilities.h> > #include <wtf/glib/GUniquePtr.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/CString.h> > #include <wtf/text/StringView.h> > >@@ -59,7 +59,7 @@ static String extractLocaleFromDictionaryFilePath(const String& filePath) > return fileName.substring(prefixLength, fileName.length() - prefixLength - suffixLength); > } > >-static void scanDirectoryForDictionaries(const char* directoryPath, HashMap<AtomicString, Vector<String>>& availableLocales) >+static void scanDirectoryForDictionaries(const char* directoryPath, HashMap<AtomString, Vector<String>>& availableLocales) > { > for (auto& filePath : FileSystem::listDirectory(directoryPath, "hyph_*.dic")) { > String locale = extractLocaleFromDictionaryFilePath(filePath).convertToASCIILowercase(); >@@ -109,7 +109,7 @@ static CString webkitBuildDirectory() > return outputDir.get(); > } > >-static void scanTestDictionariesDirectoryIfNecessary(HashMap<AtomicString, Vector<String>>& availableLocales) >+static void scanTestDictionariesDirectoryIfNecessary(HashMap<AtomString, Vector<String>>& availableLocales) > { > // It's unfortunate that we need to look for the dictionaries this way, but > // libhyphen doesn't have the concept of installed dictionaries. Instead, >@@ -133,10 +133,10 @@ static void scanTestDictionariesDirectoryIfNecessary(HashMap<AtomicString, Vecto > } > #endif > >-static HashMap<AtomicString, Vector<String>>& availableLocales() >+static HashMap<AtomString, Vector<String>>& availableLocales() > { > static bool scannedLocales = false; >- static HashMap<AtomicString, Vector<String>> availableLocales; >+ static HashMap<AtomString, Vector<String>> availableLocales; > > if (!scannedLocales) { > for (size_t i = 0; i < WTF_ARRAY_LENGTH(gDictionaryDirectories); i++) >@@ -152,13 +152,13 @@ static HashMap<AtomicString, Vector<String>>& availableLocales() > return availableLocales; > } > >-bool canHyphenate(const AtomicString& localeIdentifier) >+bool canHyphenate(const AtomString& localeIdentifier) > { > if (localeIdentifier.isNull()) > return false; > if (availableLocales().contains(localeIdentifier)) > return true; >- return availableLocales().contains(AtomicString(localeIdentifier.string().convertToASCIILowercase())); >+ return availableLocales().contains(AtomString(localeIdentifier.string().convertToASCIILowercase())); > } > > class HyphenationDictionary : public RefCounted<HyphenationDictionary> { >@@ -203,16 +203,16 @@ private: > namespace WTF { > > template<> >-class TinyLRUCachePolicy<AtomicString, RefPtr<WebCore::HyphenationDictionary>> >+class TinyLRUCachePolicy<AtomString, RefPtr<WebCore::HyphenationDictionary>> > { > public: >- static TinyLRUCache<AtomicString, RefPtr<WebCore::HyphenationDictionary>, 32>& cache() >+ static TinyLRUCache<AtomString, RefPtr<WebCore::HyphenationDictionary>, 32>& cache() > { >- static NeverDestroyed<TinyLRUCache<AtomicString, RefPtr<WebCore::HyphenationDictionary>, 32>> cache; >+ static NeverDestroyed<TinyLRUCache<AtomString, RefPtr<WebCore::HyphenationDictionary>, 32>> cache; > return cache; > } > >- static bool isKeyNull(const AtomicString& localeIdentifier) >+ static bool isKeyNull(const AtomString& localeIdentifier) > { > return localeIdentifier.isNull(); > } >@@ -222,7 +222,7 @@ public: > return WebCore::HyphenationDictionary::createNull(); > } > >- static RefPtr<WebCore::HyphenationDictionary> createValueForKey(const AtomicString& dictionaryPath) >+ static RefPtr<WebCore::HyphenationDictionary> createValueForKey(const AtomString& dictionaryPath) > { > return WebCore::HyphenationDictionary::create(FileSystem::fileSystemRepresentation(dictionaryPath.string())); > } >@@ -250,7 +250,7 @@ static void countLeadingSpaces(const CString& utf8String, int32_t& pointerOffset > } > } > >-size_t lastHyphenLocation(StringView string, size_t beforeIndex, const AtomicString& localeIdentifier) >+size_t lastHyphenLocation(StringView string, size_t beforeIndex, const AtomString& localeIdentifier) > { > // libhyphen accepts strings in UTF-8 format, but WebCore can only provide StringView > // which stores either UTF-16 or Latin1 data. This is unfortunate for performance >@@ -270,14 +270,14 @@ size_t lastHyphenLocation(StringView string, size_t beforeIndex, const AtomicStr > Vector<char> hyphenArray(utf8StringCopy.length() - leadingSpaceBytes + 5); > char* hyphenArrayData = hyphenArray.data(); > >- String lowercaseLocaleIdentifier = AtomicString(localeIdentifier.string().convertToASCIILowercase()); >+ String lowercaseLocaleIdentifier = AtomString(localeIdentifier.string().convertToASCIILowercase()); > > // Web content may specify strings for locales which do not exist or that we do not have. > if (!availableLocales().contains(lowercaseLocaleIdentifier)) > return 0; > > for (const auto& dictionaryPath : availableLocales().get(lowercaseLocaleIdentifier)) { >- RefPtr<HyphenationDictionary> dictionary = WTF::TinyLRUCachePolicy<AtomicString, RefPtr<HyphenationDictionary>>::cache().get(AtomicString(dictionaryPath)); >+ RefPtr<HyphenationDictionary> dictionary = WTF::TinyLRUCachePolicy<AtomString, RefPtr<HyphenationDictionary>>::cache().get(AtomString(dictionaryPath)); > > char** replacements = nullptr; > int* positions = nullptr; >diff --git a/Source/WebCore/platform/text/mac/LocaleMac.mm b/Source/WebCore/platform/text/mac/LocaleMac.mm >index ef5537ad6f8073ca46d453ffa7e73095e14f338e..a517be341f6ac4be8e893cfad7c228845d6a8280 100644 >--- a/Source/WebCore/platform/text/mac/LocaleMac.mm >+++ b/Source/WebCore/platform/text/mac/LocaleMac.mm >@@ -65,7 +65,7 @@ static RetainPtr<NSLocale> determineLocale(const String& locale) > return adoptNS([[NSLocale alloc] initWithLocaleIdentifier:locale]); > } > >-std::unique_ptr<Locale> Locale::create(const AtomicString& locale) >+std::unique_ptr<Locale> Locale::create(const AtomString& locale) > { > return std::make_unique<LocaleMac>(determineLocale(locale.string()).get()); > } >diff --git a/Source/WebCore/platform/text/win/LocaleWin.cpp b/Source/WebCore/platform/text/win/LocaleWin.cpp >index a61aa8c53682afdd2e41006357d6dcff420c1adb..6a160deccfc926aef37de23e97f62e8f5c67906a 100644 >--- a/Source/WebCore/platform/text/win/LocaleWin.cpp >+++ b/Source/WebCore/platform/text/win/LocaleWin.cpp >@@ -62,7 +62,7 @@ static LCID LCIDFromLocaleInternal(LCID userDefaultLCID, const String& userDefau > return LocaleNameToLCID(locale.wideCharacters().data(), 0); > } > >-static LCID LCIDFromLocale(const AtomicString& locale) >+static LCID LCIDFromLocale(const AtomString& locale) > { > // According to MSDN, 9 is enough for LOCALE_SISO639LANGNAME. > const size_t languageCodeBufferSize = 9; >@@ -76,7 +76,7 @@ static LCID LCIDFromLocale(const AtomicString& locale) > return lcid; > } > >-std::unique_ptr<Locale> Locale::create(const AtomicString& locale) >+std::unique_ptr<Locale> Locale::create(const AtomString& locale) > { > return std::make_unique<LocaleWin>(LCIDFromLocale(locale)); > } >diff --git a/Source/WebCore/platform/win/BString.cpp b/Source/WebCore/platform/win/BString.cpp >index 027cddd32a7d57a308b42b8883d2b5b3941068a3..db8a1a1211a413425f611f1ebf7b74027b1729da 100644 >--- a/Source/WebCore/platform/win/BString.cpp >+++ b/Source/WebCore/platform/win/BString.cpp >@@ -28,7 +28,7 @@ > > #include <windows.h> > #include <wtf/URL.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > #include <wtf/text/StringView.h> > #include <wtf/text/win/WCharStringExtras.h> > >@@ -77,7 +77,7 @@ BString::BString(const URL& url) > m_bstr = SysAllocStringLen(wcharFrom(StringView(url.string()).upconvertedCharacters()), url.string().length()); > } > >-BString::BString(const AtomicString& s) >+BString::BString(const AtomString& s) > { > if (s.isNull()) > m_bstr = 0; >diff --git a/Source/WebCore/platform/win/BString.h b/Source/WebCore/platform/win/BString.h >index 184b551d48e9c231ea02a78756fe96fed3e56665..6cf238773ca45469cc9c945bcf24de226bacdd01 100644 >--- a/Source/WebCore/platform/win/BString.h >+++ b/Source/WebCore/platform/win/BString.h >@@ -46,7 +46,7 @@ namespace WebCore { > BString(const wchar_t*); > BString(const wchar_t*, size_t length); > BString(const String&); >- BString(const AtomicString&); >+ BString(const AtomString&); > BString(const URL&); > #if USE(CF) > BString(CFStringRef); >diff --git a/Source/WebCore/platform/win/SearchPopupMenuWin.cpp b/Source/WebCore/platform/win/SearchPopupMenuWin.cpp >index 8e74b076935aa0dccd7ea837ace67b3ce7ce155a..8718c69352926b9155e83ccfdbd7941456012700 100644 >--- a/Source/WebCore/platform/win/SearchPopupMenuWin.cpp >+++ b/Source/WebCore/platform/win/SearchPopupMenuWin.cpp >@@ -22,7 +22,7 @@ > #include "SearchPopupMenuWin.h" > > #include "SearchPopupMenuDB.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -41,7 +41,7 @@ bool SearchPopupMenuWin::enabled() > return true; > } > >-void SearchPopupMenuWin::saveRecentSearches(const AtomicString& name, const Vector<RecentSearch>& searchItems) >+void SearchPopupMenuWin::saveRecentSearches(const AtomString& name, const Vector<RecentSearch>& searchItems) > { > if (name.isEmpty()) > return; >@@ -49,7 +49,7 @@ void SearchPopupMenuWin::saveRecentSearches(const AtomicString& name, const Vect > SearchPopupMenuDB::singleton().saveRecentSearches(name, searchItems); > } > >-void SearchPopupMenuWin::loadRecentSearches(const AtomicString& name, Vector<RecentSearch>& searchItems) >+void SearchPopupMenuWin::loadRecentSearches(const AtomString& name, Vector<RecentSearch>& searchItems) > { > if (name.isEmpty()) > return; >diff --git a/Source/WebCore/platform/win/SearchPopupMenuWin.h b/Source/WebCore/platform/win/SearchPopupMenuWin.h >index 9a7ae8823c5c43ff946a6157afc57b59dc1543e0..5b3075ec56f7baf45fdc16ee4511dfb5d8b6a22a 100644 >--- a/Source/WebCore/platform/win/SearchPopupMenuWin.h >+++ b/Source/WebCore/platform/win/SearchPopupMenuWin.h >@@ -31,8 +31,8 @@ public: > SearchPopupMenuWin(PopupMenuClient*); > > virtual PopupMenu* popupMenu(); >- virtual void saveRecentSearches(const AtomicString& name, const Vector<RecentSearch>&); >- virtual void loadRecentSearches(const AtomicString& name, Vector<RecentSearch>&); >+ virtual void saveRecentSearches(const AtomString& name, const Vector<RecentSearch>&); >+ virtual void loadRecentSearches(const AtomString& name, Vector<RecentSearch>&); > virtual bool enabled(); > > private: >diff --git a/Source/WebCore/plugins/DOMMimeTypeArray.cpp b/Source/WebCore/plugins/DOMMimeTypeArray.cpp >index 98503c38be635c217aa4e5e0189f199be0e793f8..eb79a3696ccdfd58959023bb9cf2743992b7055c 100644 >--- a/Source/WebCore/plugins/DOMMimeTypeArray.cpp >+++ b/Source/WebCore/plugins/DOMMimeTypeArray.cpp >@@ -25,7 +25,7 @@ > #include "Page.h" > #include "PluginData.h" > #include <wtf/IsoMallocInlines.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -65,7 +65,7 @@ RefPtr<DOMMimeType> DOMMimeTypeArray::item(unsigned index) > return DOMMimeType::create(data, frame(), index); > } > >-RefPtr<DOMMimeType> DOMMimeTypeArray::namedItem(const AtomicString& propertyName) >+RefPtr<DOMMimeType> DOMMimeTypeArray::namedItem(const AtomString& propertyName) > { > PluginData* data = getPluginData(); > if (!data) >@@ -81,7 +81,7 @@ RefPtr<DOMMimeType> DOMMimeTypeArray::namedItem(const AtomicString& propertyName > return nullptr; > } > >-Vector<AtomicString> DOMMimeTypeArray::supportedPropertyNames() >+Vector<AtomString> DOMMimeTypeArray::supportedPropertyNames() > { > PluginData* data = getPluginData(); > if (!data) >@@ -91,7 +91,7 @@ Vector<AtomicString> DOMMimeTypeArray::supportedPropertyNames() > Vector<size_t> mimePluginIndices; > data->getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices); > >- Vector<AtomicString> result; >+ Vector<AtomString> result; > result.reserveInitialCapacity(mimes.size()); > for (auto& info : mimes) > result.uncheckedAppend(WTFMove(info.type)); >diff --git a/Source/WebCore/plugins/DOMMimeTypeArray.h b/Source/WebCore/plugins/DOMMimeTypeArray.h >index 5e1d41e2e6aa5fe7ae2497a3eff77cd606be10c0..a786d634c63cd62e919db5238cecfb632496d4e6 100644 >--- a/Source/WebCore/plugins/DOMMimeTypeArray.h >+++ b/Source/WebCore/plugins/DOMMimeTypeArray.h >@@ -37,8 +37,8 @@ public: > > unsigned length() const; > RefPtr<DOMMimeType> item(unsigned index); >- RefPtr<DOMMimeType> namedItem(const AtomicString& propertyName); >- Vector<AtomicString> supportedPropertyNames(); >+ RefPtr<DOMMimeType> namedItem(const AtomString& propertyName); >+ Vector<AtomString> supportedPropertyNames(); > > private: > explicit DOMMimeTypeArray(DOMWindow*); >diff --git a/Source/WebCore/plugins/DOMPlugin.cpp b/Source/WebCore/plugins/DOMPlugin.cpp >index a45caf86f73b73259e44c3c638ba83298a0fc6c3..9448806b892def94d1ebcb0f117f46c110fe2f39 100644 >--- a/Source/WebCore/plugins/DOMPlugin.cpp >+++ b/Source/WebCore/plugins/DOMPlugin.cpp >@@ -22,7 +22,7 @@ > #include "PluginData.h" > #include "Frame.h" > #include <wtf/IsoMallocInlines.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -75,7 +75,7 @@ RefPtr<DOMMimeType> DOMPlugin::item(unsigned index) > return nullptr; > } > >-RefPtr<DOMMimeType> DOMPlugin::namedItem(const AtomicString& propertyName) >+RefPtr<DOMMimeType> DOMPlugin::namedItem(const AtomString& propertyName) > { > if (!m_frame || !m_frame->page()) > return nullptr; >@@ -89,10 +89,10 @@ RefPtr<DOMMimeType> DOMPlugin::namedItem(const AtomicString& propertyName) > return nullptr; > } > >-Vector<AtomicString> DOMPlugin::supportedPropertyNames() >+Vector<AtomString> DOMPlugin::supportedPropertyNames() > { > // FIXME: Should be implemented. >- return Vector<AtomicString>(); >+ return Vector<AtomString>(); > } > > } // namespace WebCore >diff --git a/Source/WebCore/plugins/DOMPlugin.h b/Source/WebCore/plugins/DOMPlugin.h >index 35706c8d59cb24201cc58d9635d0ff8dd8bfea32..165437dd8bc59386d91407b2da074ecfebc5c490 100644 >--- a/Source/WebCore/plugins/DOMPlugin.h >+++ b/Source/WebCore/plugins/DOMPlugin.h >@@ -43,8 +43,8 @@ public: > unsigned length() const; > > RefPtr<DOMMimeType> item(unsigned index); >- RefPtr<DOMMimeType> namedItem(const AtomicString& propertyName); >- Vector<AtomicString> supportedPropertyNames(); >+ RefPtr<DOMMimeType> namedItem(const AtomString& propertyName); >+ Vector<AtomString> supportedPropertyNames(); > > private: > DOMPlugin(PluginData*, Frame*, PluginInfo); >diff --git a/Source/WebCore/plugins/DOMPluginArray.cpp b/Source/WebCore/plugins/DOMPluginArray.cpp >index 0dfd37ad3b8f30a875042125478acda5ce25e9c1..40361e21940ce1c65f3cab313f5f6653f15a0494 100644 >--- a/Source/WebCore/plugins/DOMPluginArray.cpp >+++ b/Source/WebCore/plugins/DOMPluginArray.cpp >@@ -25,7 +25,7 @@ > #include "Page.h" > #include "PluginData.h" > #include <wtf/IsoMallocInlines.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -59,7 +59,7 @@ RefPtr<DOMPlugin> DOMPluginArray::item(unsigned index) > return DOMPlugin::create(data, frame(), plugins[index]); > } > >-RefPtr<DOMPlugin> DOMPluginArray::namedItem(const AtomicString& propertyName) >+RefPtr<DOMPlugin> DOMPluginArray::namedItem(const AtomString& propertyName) > { > PluginData* data = pluginData(); > if (!data) >@@ -72,7 +72,7 @@ RefPtr<DOMPlugin> DOMPluginArray::namedItem(const AtomicString& propertyName) > return nullptr; > } > >-Vector<AtomicString> DOMPluginArray::supportedPropertyNames() >+Vector<AtomString> DOMPluginArray::supportedPropertyNames() > { > PluginData* data = pluginData(); > if (!data) >@@ -80,7 +80,7 @@ Vector<AtomicString> DOMPluginArray::supportedPropertyNames() > > const auto& plugins = data->publiclyVisiblePlugins(); > >- Vector<AtomicString> result; >+ Vector<AtomString> result; > result.reserveInitialCapacity(plugins.size()); > for (auto& plugin : plugins) > result.uncheckedAppend(plugin.name); >diff --git a/Source/WebCore/plugins/DOMPluginArray.h b/Source/WebCore/plugins/DOMPluginArray.h >index d2c7fbda47f9d6b56015330d22b594b8e4816e59..8cb1e0a44ebcffdc4a42ac72ed0338c6655bcc17 100644 >--- a/Source/WebCore/plugins/DOMPluginArray.h >+++ b/Source/WebCore/plugins/DOMPluginArray.h >@@ -37,8 +37,8 @@ public: > > unsigned length() const; > RefPtr<DOMPlugin> item(unsigned index); >- RefPtr<DOMPlugin> namedItem(const AtomicString& propertyName); >- Vector<AtomicString> supportedPropertyNames(); >+ RefPtr<DOMPlugin> namedItem(const AtomString& propertyName); >+ Vector<AtomString> supportedPropertyNames(); > > void refresh(bool reloadPages); > >diff --git a/Source/WebCore/rendering/CounterNode.cpp b/Source/WebCore/rendering/CounterNode.cpp >index dc0726a0768ba92f591da5adea21adad33fff4f4..250da8774a565f15e8ad893af101fe10a491980a 100644 >--- a/Source/WebCore/rendering/CounterNode.cpp >+++ b/Source/WebCore/rendering/CounterNode.cpp >@@ -211,7 +211,7 @@ void CounterNode::recount() > } > } > >-void CounterNode::insertAfter(CounterNode& newChild, CounterNode* beforeChild, const AtomicString& identifier) >+void CounterNode::insertAfter(CounterNode& newChild, CounterNode* beforeChild, const AtomString& identifier) > { > ASSERT(!newChild.m_parent); > ASSERT(!newChild.m_previousSibling); >diff --git a/Source/WebCore/rendering/CounterNode.h b/Source/WebCore/rendering/CounterNode.h >index 2575dda4e4bd0298195c687ee5bc3ed165c7f7ed..fe7eb207a97ffbd7f74812a066349bfa7edd0ab2 100644 >--- a/Source/WebCore/rendering/CounterNode.h >+++ b/Source/WebCore/rendering/CounterNode.h >@@ -63,7 +63,7 @@ public: > CounterNode* nextInPreOrder(const CounterNode* stayWithin = nullptr) const; > CounterNode* nextInPreOrderAfterChildren(const CounterNode* stayWithin = nullptr) const; > >- void insertAfter(CounterNode& newChild, CounterNode* beforeChild, const AtomicString& identifier); >+ void insertAfter(CounterNode& newChild, CounterNode* beforeChild, const AtomString& identifier); > // identifier must match the identifier of this counter. > void removeChild(CounterNode&); > >diff --git a/Source/WebCore/rendering/EllipsisBox.cpp b/Source/WebCore/rendering/EllipsisBox.cpp >index 35728d870cdd1c1ef1ea9ab689e4cd03f2532f18..2274e7b4bfa6f11eee74e43e54ad025aa7bf1b60 100644 >--- a/Source/WebCore/rendering/EllipsisBox.cpp >+++ b/Source/WebCore/rendering/EllipsisBox.cpp >@@ -34,7 +34,7 @@ namespace WebCore { > > WTF_MAKE_ISO_ALLOCATED_IMPL(EllipsisBox); > >-EllipsisBox::EllipsisBox(RenderBlockFlow& renderer, const AtomicString& ellipsisStr, InlineFlowBox* parent, int width, int height, int y, bool firstLine, bool isHorizontal, InlineBox* markupBox) >+EllipsisBox::EllipsisBox(RenderBlockFlow& renderer, const AtomString& ellipsisStr, InlineFlowBox* parent, int width, int height, int y, bool firstLine, bool isHorizontal, InlineBox* markupBox) > : InlineElementBox(renderer, FloatPoint(0, y), width, firstLine, true, false, false, isHorizontal, 0, 0, parent) > , m_shouldPaintMarkupBox(markupBox) > , m_height(height) >diff --git a/Source/WebCore/rendering/EllipsisBox.h b/Source/WebCore/rendering/EllipsisBox.h >index ebe1941441a9f3f59b9a75e414b543f007407514..3f98b7d87fe22d5293287730c86bc2288ca406a6 100644 >--- a/Source/WebCore/rendering/EllipsisBox.h >+++ b/Source/WebCore/rendering/EllipsisBox.h >@@ -30,7 +30,7 @@ class HitTestResult; > class EllipsisBox final : public InlineElementBox { > WTF_MAKE_ISO_ALLOCATED(EllipsisBox); > public: >- EllipsisBox(RenderBlockFlow&, const AtomicString& ellipsisStr, InlineFlowBox* parent, int width, int height, int y, bool firstLine, bool isHorizontal, InlineBox* markupBox); >+ EllipsisBox(RenderBlockFlow&, const AtomString& ellipsisStr, InlineFlowBox* parent, int width, int height, int y, bool firstLine, bool isHorizontal, InlineBox* markupBox); > void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override; > bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom, HitTestAction) final; > void setSelectionState(RenderObject::SelectionState s) { m_selectionState = s; } >@@ -48,7 +48,7 @@ private: > bool m_shouldPaintMarkupBox; > RenderObject::SelectionState m_selectionState { RenderObject::SelectionNone }; > int m_height; >- AtomicString m_str; >+ AtomString m_str; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/rendering/HitTestResult.cpp b/Source/WebCore/rendering/HitTestResult.cpp >index b8218cade09da2567b97cc65e1c47003ddf275b1..73b3654767140a0370e4d56956e54f2674b58b36 100644 >--- a/Source/WebCore/rendering/HitTestResult.cpp >+++ b/Source/WebCore/rendering/HitTestResult.cpp >@@ -349,7 +349,7 @@ URL HitTestResult::absoluteImageURL() const > if (!(m_innerNonSharedNode->renderer() && m_innerNonSharedNode->renderer()->isImage())) > return URL(); > >- AtomicString urlString; >+ AtomString urlString; > if (is<HTMLEmbedElement>(*m_innerNonSharedNode) > || is<HTMLImageElement>(*m_innerNonSharedNode) > || is<HTMLInputElement>(*m_innerNonSharedNode) >diff --git a/Source/WebCore/rendering/InlineTextBox.cpp b/Source/WebCore/rendering/InlineTextBox.cpp >index 83566aeedf2d11deeaea3f29d66fcc476c50470d..5f5bd62802d1580f005ff6be02e01ceec71ccc50 100644 >--- a/Source/WebCore/rendering/InlineTextBox.cpp >+++ b/Source/WebCore/rendering/InlineTextBox.cpp >@@ -1039,7 +1039,7 @@ void InlineTextBox::paintMarkedTextForeground(PaintInfo& paintInfo, const FloatR > > float emphasisMarkOffset = 0; > Optional<bool> markExistsAndIsAbove = emphasisMarkExistsAndIsAbove(lineStyle); >- const AtomicString& emphasisMark = markExistsAndIsAbove ? lineStyle.textEmphasisMarkString() : nullAtom(); >+ const AtomString& emphasisMark = markExistsAndIsAbove ? lineStyle.textEmphasisMarkString() : nullAtom(); > if (!emphasisMark.isEmpty()) > emphasisMarkOffset = *markExistsAndIsAbove ? -font.fontMetrics().ascent() - font.emphasisMarkDescent(emphasisMark) : font.fontMetrics().descent() + font.emphasisMarkAscent(emphasisMark); > >diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp >index 14a16e99d8c23650675432bf12fd474c44c1b1ad..a143ed04774d0c9898364b70b41a95f748b68b19 100644 >--- a/Source/WebCore/rendering/RenderBlock.cpp >+++ b/Source/WebCore/rendering/RenderBlock.cpp >@@ -3129,9 +3129,9 @@ TextRun RenderBlock::constructTextRun(const String& string, const RenderStyle& s > return constructTextRun(StringView(string), style, expansion, flags); > } > >-TextRun RenderBlock::constructTextRun(const AtomicString& atomicString, const RenderStyle& style, ExpansionBehavior expansion, TextRunFlags flags) >+TextRun RenderBlock::constructTextRun(const AtomString& atomString, const RenderStyle& style, ExpansionBehavior expansion, TextRunFlags flags) > { >- return constructTextRun(StringView(atomicString), style, expansion, flags); >+ return constructTextRun(StringView(atomString), style, expansion, flags); > } > > TextRun RenderBlock::constructTextRun(const RenderText& text, const RenderStyle& style, ExpansionBehavior expansion) >diff --git a/Source/WebCore/rendering/RenderBlock.h b/Source/WebCore/rendering/RenderBlock.h >index fd74af17824db3f7f9c240f2ed64a7dd352f7d39..01ffc8d0deb0f2eb3ff29d5f05057e7f48d8a34b 100644 >--- a/Source/WebCore/rendering/RenderBlock.h >+++ b/Source/WebCore/rendering/RenderBlock.h >@@ -201,7 +201,7 @@ public: > ExpansionBehavior = DefaultExpansion, TextRunFlags = DefaultTextRunFlags); > static TextRun constructTextRun(const String&, const RenderStyle&, > ExpansionBehavior = DefaultExpansion, TextRunFlags = DefaultTextRunFlags); >- static TextRun constructTextRun(const AtomicString&, const RenderStyle&, >+ static TextRun constructTextRun(const AtomString&, const RenderStyle&, > ExpansionBehavior = DefaultExpansion, TextRunFlags = DefaultTextRunFlags); > static TextRun constructTextRun(const RenderText&, const RenderStyle&, > ExpansionBehavior = DefaultExpansion); >diff --git a/Source/WebCore/rendering/RenderBlockLineLayout.cpp b/Source/WebCore/rendering/RenderBlockLineLayout.cpp >index 612b5a5b7287e0ac29aaec4245495a2df028df9c..f94725a65510a13806fefdc8dc1e2b33b641a66c 100644 >--- a/Source/WebCore/rendering/RenderBlockLineLayout.cpp >+++ b/Source/WebCore/rendering/RenderBlockLineLayout.cpp >@@ -2127,7 +2127,7 @@ void RenderBlockFlow::checkLinesForTextOverflow() > // Determine the width of the ellipsis using the current font. > // FIXME: CSS3 says this is configurable, also need to use 0x002E (FULL STOP) if horizontal ellipsis is "not renderable" > const FontCascade& font = style().fontCascade(); >- static NeverDestroyed<AtomicString> ellipsisStr(&horizontalEllipsis, 1); >+ static NeverDestroyed<AtomString> ellipsisStr(&horizontalEllipsis, 1); > const FontCascade& firstLineFont = firstLineStyle().fontCascade(); > float firstLineEllipsisWidth = firstLineFont.width(constructTextRun(&horizontalEllipsis, 1, firstLineStyle())); > float ellipsisWidth = (font == firstLineFont) ? firstLineEllipsisWidth : font.width(constructTextRun(&horizontalEllipsis, 1, style())); >diff --git a/Source/WebCore/rendering/RenderCounter.cpp b/Source/WebCore/rendering/RenderCounter.cpp >index e5cde49006529a3aa7c8388cacc72cdf6532c07f..22104434e45d6c98476ffd29ab550bd62ac408fe 100644 >--- a/Source/WebCore/rendering/RenderCounter.cpp >+++ b/Source/WebCore/rendering/RenderCounter.cpp >@@ -46,10 +46,10 @@ using namespace HTMLNames; > > WTF_MAKE_ISO_ALLOCATED_IMPL(RenderCounter); > >-using CounterMap = HashMap<AtomicString, Ref<CounterNode>>; >+using CounterMap = HashMap<AtomString, Ref<CounterNode>>; > using CounterMaps = HashMap<const RenderElement*, std::unique_ptr<CounterMap>>; > >-static CounterNode* makeCounterNode(RenderElement&, const AtomicString& identifier, bool alwaysCreateCounter); >+static CounterNode* makeCounterNode(RenderElement&, const AtomString& identifier, bool alwaysCreateCounter); > > static CounterMaps& counterMaps() > { >@@ -130,7 +130,7 @@ struct CounterPlan { > int value; > }; > >-static Optional<CounterPlan> planCounter(RenderElement& renderer, const AtomicString& identifier) >+static Optional<CounterPlan> planCounter(RenderElement& renderer, const AtomString& identifier) > { > // We must have a generating node or else we cannot have a counter. > Element* generatingElement = renderer.generatingElement(); >@@ -194,7 +194,7 @@ struct CounterInsertionPoint { > RefPtr<CounterNode> previousSibling; > }; > >-static CounterInsertionPoint findPlaceForCounter(RenderElement& counterOwner, const AtomicString& identifier, bool isReset) >+static CounterInsertionPoint findPlaceForCounter(RenderElement& counterOwner, const AtomString& identifier, bool isReset) > { > // We cannot stop searching for counters with the same identifier before we also > // check this renderer, because it may affect the positioning in the tree of our counter. >@@ -292,7 +292,7 @@ static CounterInsertionPoint findPlaceForCounter(RenderElement& counterOwner, co > return { }; > } > >-static CounterNode* makeCounterNode(RenderElement& renderer, const AtomicString& identifier, bool alwaysCreateCounter) >+static CounterNode* makeCounterNode(RenderElement& renderer, const AtomString& identifier, bool alwaysCreateCounter) > { > if (renderer.hasCounterNodeMap()) { > ASSERT(counterMaps().contains(&renderer)); >@@ -430,7 +430,7 @@ void RenderCounter::computePreferredLogicalWidths(float lead) > RenderText::computePreferredLogicalWidths(lead); > } > >-static void destroyCounterNodeWithoutMapRemoval(const AtomicString& identifier, CounterNode& node) >+static void destroyCounterNodeWithoutMapRemoval(const AtomString& identifier, CounterNode& node) > { > RefPtr<CounterNode> previous; > for (RefPtr<CounterNode> child = node.lastDescendant(); child && child != &node; child = WTFMove(previous)) { >@@ -454,7 +454,7 @@ void RenderCounter::destroyCounterNodes(RenderElement& owner) > owner.setHasCounterNodeMap(false); > } > >-void RenderCounter::destroyCounterNode(RenderElement& owner, const AtomicString& identifier) >+void RenderCounter::destroyCounterNode(RenderElement& owner, const AtomString& identifier) > { > auto map = counterMaps().find(&owner); > if (map == counterMaps().end()) >@@ -592,7 +592,7 @@ void showCounterRendererTree(const WebCore::RenderObject* renderer, const char* > while (root->parent()) > root = root->parent(); > >- AtomicString identifier(counterName); >+ AtomString identifier(counterName); > for (auto* current = root; current; current = current->nextInPreOrder()) { > if (!is<WebCore::RenderElement>(*current)) > continue; >diff --git a/Source/WebCore/rendering/RenderCounter.h b/Source/WebCore/rendering/RenderCounter.h >index 8a90202d450961a158711491d5705562e8548b94..dd96a2e410f6e3a17a2e70e0bea1cbac2c015620 100644 >--- a/Source/WebCore/rendering/RenderCounter.h >+++ b/Source/WebCore/rendering/RenderCounter.h >@@ -35,7 +35,7 @@ public: > virtual ~RenderCounter(); > > static void destroyCounterNodes(RenderElement&); >- static void destroyCounterNode(RenderElement&, const AtomicString& identifier); >+ static void destroyCounterNode(RenderElement&, const AtomString& identifier); > static void rendererSubtreeAttached(RenderElement&); > static void rendererRemovedFromTree(RenderElement&); > static void rendererStyleChanged(RenderElement&, const RenderStyle* oldStyle, const RenderStyle* newStyle); >diff --git a/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp b/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp >index 5e848e2700c868beceff1845149af41fee8b711c..0e7e42b84b096baf55265b374f876e1e20198d3b 100644 >--- a/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp >+++ b/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp >@@ -990,8 +990,8 @@ void RenderDeprecatedFlexibleBox::applyLineClamp(FlexBoxIterator& iterator, bool > continue; > > const UChar ellipsisAndSpace[2] = { horizontalEllipsis, ' ' }; >- static NeverDestroyed<AtomicString> ellipsisAndSpaceStr(ellipsisAndSpace, 2); >- static NeverDestroyed<AtomicString> ellipsisStr(&horizontalEllipsis, 1); >+ static NeverDestroyed<AtomString> ellipsisAndSpaceStr(ellipsisAndSpace, 2); >+ static NeverDestroyed<AtomString> ellipsisStr(&horizontalEllipsis, 1); > const RenderStyle& lineStyle = numVisibleLines == 1 ? firstLineStyle() : style(); > const FontCascade& font = lineStyle.fontCascade(); > >diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp >index b9310df2d50f6f3903cbbff45a5dc0968d2b84de..aab3f46ec403e2f5421e8156545ca44d0ecb1b83 100644 >--- a/Source/WebCore/rendering/RenderObject.cpp >+++ b/Source/WebCore/rendering/RenderObject.cpp >@@ -657,7 +657,7 @@ void RenderObject::addPDFURLRect(PaintInfo& paintInfo, const LayoutPoint& paintO > if (!is<Element>(node) || !node->isLink()) > return; > Element& element = downcast<Element>(*node); >- const AtomicString& href = element.getAttribute(hrefAttr); >+ const AtomString& href = element.getAttribute(hrefAttr); > if (href.isNull()) > return; > >diff --git a/Source/WebCore/rendering/RenderSearchField.cpp b/Source/WebCore/rendering/RenderSearchField.cpp >index b37fecc8b9cd4bcc58c2fe9b200ed2850003eb42..8e2dcb0353ed94f60bd4c4adceb353c63c777940 100644 >--- a/Source/WebCore/rendering/RenderSearchField.cpp >+++ b/Source/WebCore/rendering/RenderSearchField.cpp >@@ -105,7 +105,7 @@ void RenderSearchField::addSearchResult() > while (static_cast<int>(m_recentSearches.size()) > inputElement().maxResults()) > m_recentSearches.removeLast(); > >- const AtomicString& name = autosaveName(); >+ const AtomString& name = autosaveName(); > if (!m_searchPopup) > m_searchPopup = page().chrome().createSearchPopupMenu(*this); > >@@ -125,7 +125,7 @@ void RenderSearchField::showPopup() > > m_searchPopupIsVisible = true; > >- const AtomicString& name = autosaveName(); >+ const AtomString& name = autosaveName(); > m_searchPopup->loadRecentSearches(name, m_recentSearches); > > // Trim the recent searches list if the maximum size has changed since we last saved. >@@ -199,7 +199,7 @@ Visibility RenderSearchField::visibilityForCancelButton() const > return (style().visibility() == Visibility::Hidden || inputElement().value().isEmpty()) ? Visibility::Hidden : Visibility::Visible; > } > >-const AtomicString& RenderSearchField::autosaveName() const >+const AtomString& RenderSearchField::autosaveName() const > { > return inputElement().attributeWithoutSynchronization(autosaveAttr); > } >@@ -211,7 +211,7 @@ void RenderSearchField::valueChanged(unsigned listIndex, bool fireEvents) > if (static_cast<int>(listIndex) == (listSize() - 1)) { > if (fireEvents) { > m_recentSearches.clear(); >- const AtomicString& name = autosaveName(); >+ const AtomString& name = autosaveName(); > if (!name.isEmpty()) { > if (!m_searchPopup) > m_searchPopup = page().chrome().createSearchPopupMenu(*this); >diff --git a/Source/WebCore/rendering/RenderSearchField.h b/Source/WebCore/rendering/RenderSearchField.h >index 90987196daa433e58061f716e56ffe910ecd6774..2ad616eb59710874cbe04fbdd4133ec73c648f0c 100644 >--- a/Source/WebCore/rendering/RenderSearchField.h >+++ b/Source/WebCore/rendering/RenderSearchField.h >@@ -52,7 +52,7 @@ private: > LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const override; > void updateFromElement() override; > Visibility visibilityForCancelButton() const; >- const AtomicString& autosaveName() const; >+ const AtomString& autosaveName() const; > > // PopupMenuClient methods > void valueChanged(unsigned listIndex, bool fireEvents = true) override; >diff --git a/Source/WebCore/rendering/RenderTextControlSingleLine.cpp b/Source/WebCore/rendering/RenderTextControlSingleLine.cpp >index a3018fd077d9960c27a040eb0be331891092aaed..9ee888867110b566529e8fba1025cd5191e1ac39 100644 >--- a/Source/WebCore/rendering/RenderTextControlSingleLine.cpp >+++ b/Source/WebCore/rendering/RenderTextControlSingleLine.cpp >@@ -312,7 +312,7 @@ LayoutUnit RenderTextControlSingleLine::preferredContentLogicalWidth(float charW > float maxCharWidth = 0.f; > > #if !PLATFORM(IOS_FAMILY) >- const AtomicString& family = style().fontCascade().firstFamily(); >+ const AtomString& family = style().fontCascade().firstFamily(); > // Since Lucida Grande is the default font, we want this to match the width > // of MS Shell Dlg, the default font for textareas in Firefox, Safari Win and > // IE for some encodings (in IE, the default font is encoding specific). >diff --git a/Source/WebCore/rendering/RenderTheme.h b/Source/WebCore/rendering/RenderTheme.h >index 1d61e48471ec8df57421d68bca61ed2c5b9b9edd..3af56ae56b941882421709c701dcfef8a5a981cd 100644 >--- a/Source/WebCore/rendering/RenderTheme.h >+++ b/Source/WebCore/rendering/RenderTheme.h >@@ -140,7 +140,7 @@ public: > virtual bool supportsHover(const RenderStyle&) const { return false; } > > // A method asking if the platform is able to show datalist suggestions for a given input type. >- virtual bool supportsDataListUI(const AtomicString&) const { return false; } >+ virtual bool supportsDataListUI(const AtomString&) const { return false; } > > // Text selection colors. > Color activeSelectionBackgroundColor(OptionSet<StyleColor::Options>) const; >diff --git a/Source/WebCore/rendering/RenderThemeMac.mm b/Source/WebCore/rendering/RenderThemeMac.mm >index 3e379cf750d8bdd713effa72409daaf816d12d2f..e8ca22f0d5301cbc877c953863798ae63f787541 100644 >--- a/Source/WebCore/rendering/RenderThemeMac.mm >+++ b/Source/WebCore/rendering/RenderThemeMac.mm >@@ -539,18 +539,18 @@ void RenderThemeMac::updateCachedSystemFontDescription(CSSValueID cssValueId, Fo > // System-font-ness can't be encapsulated by simply a font name. Instead, we must use a token > // which FontCache will look for. > // Make sure we keep this list of possible tokens in sync with FontCascade::primaryFontIsSystemFont() >- AtomicString fontName; >+ AtomString fontName; > switch (cssValueId) { > case CSSValueSmallCaption: > font = [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]; > break; > case CSSValueMenu: > font = [NSFont menuFontOfSize:[NSFont systemFontSize]]; >- fontName = AtomicString("-apple-menu", AtomicString::ConstructFromLiteral); >+ fontName = AtomString("-apple-menu", AtomString::ConstructFromLiteral); > break; > case CSSValueStatusBar: > font = [NSFont labelFontOfSize:[NSFont labelFontSize]]; >- fontName = AtomicString("-apple-status-bar", AtomicString::ConstructFromLiteral); >+ fontName = AtomString("-apple-status-bar", AtomString::ConstructFromLiteral); > break; > case CSSValueWebkitMiniControl: > font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSControlSizeMini]]; >@@ -569,7 +569,7 @@ void RenderThemeMac::updateCachedSystemFontDescription(CSSValueID cssValueId, Fo > return; > > if (fontName.isNull()) >- fontName = AtomicString("system-ui", AtomicString::ConstructFromLiteral); >+ fontName = AtomString("system-ui", AtomString::ConstructFromLiteral); > > NSFontManager *fontManager = [NSFontManager sharedFontManager]; > fontDescription.setIsAbsoluteSize(true); >@@ -1096,7 +1096,7 @@ void RenderThemeMac::setFontFromControlSize(StyleResolver&, RenderStyle& style, > fontDescription.setIsAbsoluteSize(true); > > NSFont* font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:controlSize]]; >- fontDescription.setOneFamily(AtomicString("-apple-system", AtomicString::ConstructFromLiteral)); >+ fontDescription.setOneFamily(AtomString("-apple-system", AtomString::ConstructFromLiteral)); > fontDescription.setComputedSize([font pointSize] * style.effectiveZoom()); > fontDescription.setSpecifiedSize([font pointSize] * style.effectiveZoom()); > >diff --git a/Source/WebCore/rendering/RootInlineBox.cpp b/Source/WebCore/rendering/RootInlineBox.cpp >index c2554d46fc97f971e8ba9ee88f38b95fb963a698..eb76f4b269fbaec45942636797f94107d54b8271 100644 >--- a/Source/WebCore/rendering/RootInlineBox.cpp >+++ b/Source/WebCore/rendering/RootInlineBox.cpp >@@ -123,7 +123,7 @@ bool RootInlineBox::lineCanAccommodateEllipsis(bool ltr, int blockEdge, int line > return InlineFlowBox::canAccommodateEllipsis(ltr, blockEdge, ellipsisWidth); > } > >-float RootInlineBox::placeEllipsis(const AtomicString& ellipsisStr, bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, InlineBox* markupBox) >+float RootInlineBox::placeEllipsis(const AtomString& ellipsisStr, bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, InlineBox* markupBox) > { > if (!gEllipsisBoxMap) > gEllipsisBoxMap = new EllipsisBoxMap(); >diff --git a/Source/WebCore/rendering/RootInlineBox.h b/Source/WebCore/rendering/RootInlineBox.h >index a6795a4093b6749a0935a949914822592112a962..7df28288a4d55c2c7d26ad4bc0176d0b76178364 100644 >--- a/Source/WebCore/rendering/RootInlineBox.h >+++ b/Source/WebCore/rendering/RootInlineBox.h >@@ -104,7 +104,7 @@ public: > > bool lineCanAccommodateEllipsis(bool ltr, int blockEdge, int lineBoxEdge, int ellipsisWidth); > // Return the truncatedWidth, the width of the truncated text + ellipsis. >- float placeEllipsis(const AtomicString& ellipsisStr, bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, InlineBox* markupBox = nullptr); >+ float placeEllipsis(const AtomString& ellipsisStr, bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, InlineBox* markupBox = nullptr); > // Return the position of the EllipsisBox or -1. > float placeEllipsisBox(bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, float &truncatedWidth, bool& foundBox) final; > >diff --git a/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h b/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h >index 9ecfd9df1f8539025d3eb3692e7f6faa758f881d..cfc9c37d63cbd14934d04f57e72ab137a61f083e 100644 >--- a/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h >+++ b/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h >@@ -123,7 +123,7 @@ public: > float hyphenStringWidth; > unsigned hyphenLimitBefore; > unsigned hyphenLimitAfter; >- AtomicString locale; >+ AtomString locale; > Optional<unsigned> hyphenLimitLines; > }; > const Style& style() const { return m_style; } >diff --git a/Source/WebCore/rendering/TextPainter.cpp b/Source/WebCore/rendering/TextPainter.cpp >index b0ecb92020f09857de643e3578221b60fb61aaa2..5a1c984e1968bd2aec6707cdb641643b7374fdab 100644 >--- a/Source/WebCore/rendering/TextPainter.cpp >+++ b/Source/WebCore/rendering/TextPainter.cpp >@@ -99,7 +99,7 @@ TextPainter::TextPainter(GraphicsContext& context) > { > } > >-void TextPainter::paintTextOrEmphasisMarks(const FontCascade& font, const TextRun& textRun, const AtomicString& emphasisMark, >+void TextPainter::paintTextOrEmphasisMarks(const FontCascade& font, const TextRun& textRun, const AtomString& emphasisMark, > float emphasisMarkOffset, const FloatPoint& textOrigin, unsigned startOffset, unsigned endOffset) > { > ASSERT(startOffset < endOffset); >@@ -118,7 +118,7 @@ void TextPainter::paintTextOrEmphasisMarks(const FontCascade& font, const TextRu > } > > void TextPainter::paintTextWithShadows(const ShadowData* shadow, const FilterOperations* colorFilter, const FontCascade& font, const TextRun& textRun, const FloatRect& boxRect, const FloatPoint& textOrigin, >- unsigned startOffset, unsigned endOffset, const AtomicString& emphasisMark, float emphasisMarkOffset, bool stroked) >+ unsigned startOffset, unsigned endOffset, const AtomString& emphasisMark, float emphasisMarkOffset, bool stroked) > { > if (!shadow) { > paintTextOrEmphasisMarks(font, textRun, emphasisMark, emphasisMarkOffset, textOrigin, startOffset, endOffset); >diff --git a/Source/WebCore/rendering/TextPainter.h b/Source/WebCore/rendering/TextPainter.h >index 0ee0c85b4b05316597dde3b5642506d6c70d4f16..e4534cbfbf18701764747a583385d798d0715982 100644 >--- a/Source/WebCore/rendering/TextPainter.h >+++ b/Source/WebCore/rendering/TextPainter.h >@@ -27,7 +27,7 @@ > #include "GlyphDisplayListCache.h" > #include "TextFlags.h" > #include "TextPaintStyle.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -56,7 +56,7 @@ public: > void setShadowColorFilter(const FilterOperations* colorFilter) { m_shadowColorFilter = colorFilter; } > void setFont(const FontCascade& font) { m_font = &font; } > void setIsHorizontal(bool isHorizontal) { m_textBoxIsHorizontal = isHorizontal; } >- void setEmphasisMark(const AtomicString& mark, float offset, const RenderCombineText*); >+ void setEmphasisMark(const AtomString& mark, float offset, const RenderCombineText*); > > void paint(const TextRun&, const FloatRect& boxRect, const FloatPoint& textOrigin); > void paintRange(const TextRun&, const FloatRect& boxRect, const FloatPoint& textOrigin, unsigned start, unsigned end); >@@ -77,17 +77,17 @@ public: > static bool shouldUseGlyphDisplayList(const PaintInfo&); > > private: >- void paintTextOrEmphasisMarks(const FontCascade&, const TextRun&, const AtomicString& emphasisMark, float emphasisMarkOffset, >+ void paintTextOrEmphasisMarks(const FontCascade&, const TextRun&, const AtomString& emphasisMark, float emphasisMarkOffset, > const FloatPoint& textOrigin, unsigned startOffset, unsigned endOffset); > void paintTextWithShadows(const ShadowData*, const FilterOperations*, const FontCascade&, const TextRun&, const FloatRect& boxRect, const FloatPoint& textOrigin, >- unsigned startOffset, unsigned endOffset, const AtomicString& emphasisMark, float emphasisMarkOffset, bool stroked); >+ unsigned startOffset, unsigned endOffset, const AtomString& emphasisMark, float emphasisMarkOffset, bool stroked); > void paintTextAndEmphasisMarksIfNeeded(const TextRun&, const FloatRect& boxRect, const FloatPoint& textOrigin, unsigned startOffset, unsigned endOffset, > const TextPaintStyle&, const ShadowData*, const FilterOperations*); > > GraphicsContext& m_context; > const FontCascade* m_font { nullptr }; > TextPaintStyle m_style; >- AtomicString m_emphasisMark; >+ AtomString m_emphasisMark; > const ShadowData* m_shadow { nullptr }; > const FilterOperations* m_shadowColorFilter { nullptr }; > const RenderCombineText* m_combinedText { nullptr }; >@@ -96,7 +96,7 @@ private: > bool m_textBoxIsHorizontal { true }; > }; > >-inline void TextPainter::setEmphasisMark(const AtomicString& mark, float offset, const RenderCombineText* combinedText) >+inline void TextPainter::setEmphasisMark(const AtomString& mark, float offset, const RenderCombineText* combinedText) > { > m_emphasisMark = mark; > m_emphasisMarkOffset = offset; >diff --git a/Source/WebCore/rendering/line/BreakingContext.h b/Source/WebCore/rendering/line/BreakingContext.h >index d6f5ccd9956f14ff52744cdd725d98cc2f5f6d36..e1ab8d9a58d98e6071c47663bde4c896b06c52b1 100644 >--- a/Source/WebCore/rendering/line/BreakingContext.h >+++ b/Source/WebCore/rendering/line/BreakingContext.h >@@ -576,7 +576,7 @@ inline void ensureCharacterGetsLineBox(LineWhitespaceCollapsingState& lineWhites > lineWhitespaceCollapsingState.stopIgnoringSpaces(InlineIterator(0, textParagraphSeparator.renderer(), textParagraphSeparator.offset())); > } > >-inline void tryHyphenating(RenderText& text, const FontCascade& font, const AtomicString& localeIdentifier, unsigned consecutiveHyphenatedLines, int consecutiveHyphenatedLinesLimit, int minimumPrefixLimit, int minimumSuffixLimit, unsigned lastSpace, unsigned pos, float xPos, float availableWidth, bool isFixedPitch, bool collapseWhiteSpace, int lastSpaceWordSpacing, InlineIterator& lineBreak, Optional<unsigned> nextBreakable, bool& hyphenated) >+inline void tryHyphenating(RenderText& text, const FontCascade& font, const AtomString& localeIdentifier, unsigned consecutiveHyphenatedLines, int consecutiveHyphenatedLinesLimit, int minimumPrefixLimit, int minimumSuffixLimit, unsigned lastSpace, unsigned pos, float xPos, float availableWidth, bool isFixedPitch, bool collapseWhiteSpace, int lastSpaceWordSpacing, InlineIterator& lineBreak, Optional<unsigned> nextBreakable, bool& hyphenated) > { > // Map 'hyphenate-limit-{before,after}: auto;' to 2. > unsigned minimumPrefixLength; >diff --git a/Source/WebCore/rendering/style/CounterContent.h b/Source/WebCore/rendering/style/CounterContent.h >index 9a7d659f3fb3ecad21e2ed4ecd7e0c0f65383bb9..e9280c0311addc598bcdd15d42750e9d3c3d6164 100644 >--- a/Source/WebCore/rendering/style/CounterContent.h >+++ b/Source/WebCore/rendering/style/CounterContent.h >@@ -25,28 +25,28 @@ > #pragma once > > #include "RenderStyleConstants.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > > class CounterContent { > WTF_MAKE_FAST_ALLOCATED; > public: >- CounterContent(const AtomicString& identifier, ListStyleType style, const AtomicString& separator) >+ CounterContent(const AtomString& identifier, ListStyleType style, const AtomString& separator) > : m_identifier(identifier) > , m_listStyle(style) > , m_separator(separator) > { > } > >- const AtomicString& identifier() const { return m_identifier; } >+ const AtomString& identifier() const { return m_identifier; } > ListStyleType listStyle() const { return m_listStyle; } >- const AtomicString& separator() const { return m_separator; } >+ const AtomString& separator() const { return m_separator; } > > private: >- AtomicString m_identifier; >+ AtomString m_identifier; > ListStyleType m_listStyle; >- AtomicString m_separator; >+ AtomString m_separator; > }; > > static inline bool operator==(const CounterContent& a, const CounterContent& b) >diff --git a/Source/WebCore/rendering/style/CounterDirectives.h b/Source/WebCore/rendering/style/CounterDirectives.h >index 5503e9fe4667720e7318f723176c226741287bce..1402491e08af9704128f712e2a8ddf228d933edd 100644 >--- a/Source/WebCore/rendering/style/CounterDirectives.h >+++ b/Source/WebCore/rendering/style/CounterDirectives.h >@@ -21,7 +21,7 @@ > #pragma once > > #include <wtf/HashMap.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -40,6 +40,6 @@ constexpr bool operator!=(const CounterDirectives& a, const CounterDirectives& b > return !(a == b); > } > >-using CounterDirectiveMap = HashMap<AtomicString, CounterDirectives>; >+using CounterDirectiveMap = HashMap<AtomString, CounterDirectives>; > > } // namespace WebCore >diff --git a/Source/WebCore/rendering/style/KeyframeList.h b/Source/WebCore/rendering/style/KeyframeList.h >index d66f298fdcdd60e95ce16ac9e6ddbf1af348df07..c932cd56ad1ababc2d6c1b98d408736cfe1de9c2 100644 >--- a/Source/WebCore/rendering/style/KeyframeList.h >+++ b/Source/WebCore/rendering/style/KeyframeList.h >@@ -27,7 +27,7 @@ > #include "CSSPropertyNames.h" > #include <wtf/Vector.h> > #include <wtf/HashSet.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -64,7 +64,7 @@ private: > > class KeyframeList { > public: >- explicit KeyframeList(const AtomicString& animationName) >+ explicit KeyframeList(const AtomString& animationName) > : m_animationName(animationName) > { > } >@@ -74,7 +74,7 @@ public: > bool operator==(const KeyframeList& o) const; > bool operator!=(const KeyframeList& o) const { return !(*this == o); } > >- const AtomicString& animationName() const { return m_animationName; } >+ const AtomString& animationName() const { return m_animationName; } > > void insert(KeyframeValue&&); > >@@ -89,7 +89,7 @@ public: > const Vector<KeyframeValue>& keyframes() const { return m_keyframes; } > > private: >- AtomicString m_animationName; >+ AtomString m_animationName; > Vector<KeyframeValue> m_keyframes; // Kept sorted by key. > HashSet<CSSPropertyID> m_properties; // The properties being animated. > }; >diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp >index 0aa79711e9be4458ca7567233493251bef8b7d90..14b1ca03874bc8d7261673d4071a23b74fb6ff77 100644 >--- a/Source/WebCore/rendering/style/RenderStyle.cpp >+++ b/Source/WebCore/rendering/style/RenderStyle.cpp >@@ -1477,7 +1477,7 @@ CounterDirectiveMap& RenderStyle::accessCounterDirectives() > return *map; > } > >-const AtomicString& RenderStyle::hyphenString() const >+const AtomString& RenderStyle::hyphenString() const > { > ASSERT(hyphens() != Hyphens::None); > >@@ -1486,12 +1486,12 @@ const AtomicString& RenderStyle::hyphenString() const > return hyphenationString; > > // FIXME: This should depend on locale. >- static NeverDestroyed<AtomicString> hyphenMinusString(&hyphenMinus, 1); >- static NeverDestroyed<AtomicString> hyphenString(&hyphen, 1); >+ static NeverDestroyed<AtomString> hyphenMinusString(&hyphenMinus, 1); >+ static NeverDestroyed<AtomString> hyphenString(&hyphen, 1); > return fontCascade().primaryFont().glyphForCharacter(hyphen) ? hyphenString : hyphenMinusString; > } > >-const AtomicString& RenderStyle::textEmphasisMarkString() const >+const AtomString& RenderStyle::textEmphasisMarkString() const > { > switch (textEmphasisMark()) { > case TextEmphasisMark::None: >@@ -1499,28 +1499,28 @@ const AtomicString& RenderStyle::textEmphasisMarkString() const > case TextEmphasisMark::Custom: > return textEmphasisCustomMark(); > case TextEmphasisMark::Dot: { >- static NeverDestroyed<AtomicString> filledDotString(&bullet, 1); >- static NeverDestroyed<AtomicString> openDotString(&whiteBullet, 1); >+ static NeverDestroyed<AtomString> filledDotString(&bullet, 1); >+ static NeverDestroyed<AtomString> openDotString(&whiteBullet, 1); > return textEmphasisFill() == TextEmphasisFill::Filled ? filledDotString : openDotString; > } > case TextEmphasisMark::Circle: { >- static NeverDestroyed<AtomicString> filledCircleString(&blackCircle, 1); >- static NeverDestroyed<AtomicString> openCircleString(&whiteCircle, 1); >+ static NeverDestroyed<AtomString> filledCircleString(&blackCircle, 1); >+ static NeverDestroyed<AtomString> openCircleString(&whiteCircle, 1); > return textEmphasisFill() == TextEmphasisFill::Filled ? filledCircleString : openCircleString; > } > case TextEmphasisMark::DoubleCircle: { >- static NeverDestroyed<AtomicString> filledDoubleCircleString(&fisheye, 1); >- static NeverDestroyed<AtomicString> openDoubleCircleString(&bullseye, 1); >+ static NeverDestroyed<AtomString> filledDoubleCircleString(&fisheye, 1); >+ static NeverDestroyed<AtomString> openDoubleCircleString(&bullseye, 1); > return textEmphasisFill() == TextEmphasisFill::Filled ? filledDoubleCircleString : openDoubleCircleString; > } > case TextEmphasisMark::Triangle: { >- static NeverDestroyed<AtomicString> filledTriangleString(&blackUpPointingTriangle, 1); >- static NeverDestroyed<AtomicString> openTriangleString(&whiteUpPointingTriangle, 1); >+ static NeverDestroyed<AtomString> filledTriangleString(&blackUpPointingTriangle, 1); >+ static NeverDestroyed<AtomString> openTriangleString(&whiteUpPointingTriangle, 1); > return textEmphasisFill() == TextEmphasisFill::Filled ? filledTriangleString : openTriangleString; > } > case TextEmphasisMark::Sesame: { >- static NeverDestroyed<AtomicString> filledSesameString(&sesameDot, 1); >- static NeverDestroyed<AtomicString> openSesameString(&whiteSesameDot, 1); >+ static NeverDestroyed<AtomString> filledSesameString(&sesameDot, 1); >+ static NeverDestroyed<AtomString> openSesameString(&whiteSesameDot, 1); > return textEmphasisFill() == TextEmphasisFill::Filled ? filledSesameString : openSesameString; > } > case TextEmphasisMark::Auto: >diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h >index 2c55d012de2be8d7903908d1e641d2dc52f78afd..ec30ea63fa8507972363e1d4b8a113fb71b5eed6 100644 >--- a/Source/WebCore/rendering/style/RenderStyle.h >+++ b/Source/WebCore/rendering/style/RenderStyle.h >@@ -186,9 +186,9 @@ public: > > const CustomPropertyValueMap& inheritedCustomProperties() const { return m_rareInheritedData->customProperties->values; } > const CustomPropertyValueMap& nonInheritedCustomProperties() const { return m_rareNonInheritedData->customProperties->values; } >- const CSSCustomPropertyValue* getCustomProperty(const AtomicString&) const; >- void setInheritedCustomPropertyValue(const AtomicString& name, Ref<CSSCustomPropertyValue>&& value) { return m_rareInheritedData.access().customProperties.access().setCustomPropertyValue(name, WTFMove(value)); } >- void setNonInheritedCustomPropertyValue(const AtomicString& name, Ref<CSSCustomPropertyValue>&& value) { return m_rareNonInheritedData.access().customProperties.access().setCustomPropertyValue(name, WTFMove(value)); } >+ const CSSCustomPropertyValue* getCustomProperty(const AtomString&) const; >+ void setInheritedCustomPropertyValue(const AtomString& name, Ref<CSSCustomPropertyValue>&& value) { return m_rareInheritedData.access().customProperties.access().setCustomPropertyValue(name, WTFMove(value)); } >+ void setNonInheritedCustomPropertyValue(const AtomString& name, Ref<CSSCustomPropertyValue>&& value) { return m_rareNonInheritedData.access().customProperties.access().setCustomPropertyValue(name, WTFMove(value)); } > > void setHasViewportUnits(bool v = true) { m_nonInheritedFlags.hasViewportUnits = v; } > bool hasViewportUnits() const { return m_nonInheritedFlags.hasViewportUnits; } >@@ -598,8 +598,8 @@ public: > short hyphenationLimitBefore() const { return m_rareInheritedData->hyphenationLimitBefore; } > short hyphenationLimitAfter() const { return m_rareInheritedData->hyphenationLimitAfter; } > short hyphenationLimitLines() const { return m_rareInheritedData->hyphenationLimitLines; } >- const AtomicString& hyphenationString() const { return m_rareInheritedData->hyphenationString; } >- const AtomicString& locale() const { return fontDescription().locale(); } >+ const AtomString& hyphenationString() const { return m_rareInheritedData->hyphenationString; } >+ const AtomString& locale() const { return fontDescription().locale(); } > BorderFit borderFit() const { return static_cast<BorderFit>(m_rareNonInheritedData->borderFit); } > Resize resize() const { return static_cast<Resize>(m_rareNonInheritedData->resize); } > ColumnAxis columnAxis() const { return static_cast<ColumnAxis>(m_rareNonInheritedData->multiCol->axis); } >@@ -627,9 +627,9 @@ public: > > TextEmphasisFill textEmphasisFill() const { return static_cast<TextEmphasisFill>(m_rareInheritedData->textEmphasisFill); } > TextEmphasisMark textEmphasisMark() const; >- const AtomicString& textEmphasisCustomMark() const { return m_rareInheritedData->textEmphasisCustomMark; } >+ const AtomString& textEmphasisCustomMark() const { return m_rareInheritedData->textEmphasisCustomMark; } > OptionSet<TextEmphasisPosition> textEmphasisPosition() const { return OptionSet<TextEmphasisPosition>::fromRaw(m_rareInheritedData->textEmphasisPosition); } >- const AtomicString& textEmphasisMarkString() const; >+ const AtomString& textEmphasisMarkString() const; > > RubyPosition rubyPosition() const { return static_cast<RubyPosition>(m_rareInheritedData->rubyPosition); } > >@@ -661,7 +661,7 @@ public: > > // End CSS3 Getters > >- const AtomicString& lineGrid() const { return m_rareInheritedData->lineGrid; } >+ const AtomString& lineGrid() const { return m_rareInheritedData->lineGrid; } > LineSnap lineSnap() const { return static_cast<LineSnap>(m_rareInheritedData->lineSnap); } > LineAlign lineAlign() const { return static_cast<LineAlign>(m_rareInheritedData->lineAlign); } > >@@ -1129,7 +1129,7 @@ public: > void setHyphenationLimitBefore(short limit) { SET_VAR(m_rareInheritedData, hyphenationLimitBefore, limit); } > void setHyphenationLimitAfter(short limit) { SET_VAR(m_rareInheritedData, hyphenationLimitAfter, limit); } > void setHyphenationLimitLines(short limit) { SET_VAR(m_rareInheritedData, hyphenationLimitLines, limit); } >- void setHyphenationString(const AtomicString& h) { SET_VAR(m_rareInheritedData, hyphenationString, h); } >+ void setHyphenationString(const AtomString& h) { SET_VAR(m_rareInheritedData, hyphenationString, h); } > void setBorderFit(BorderFit b) { SET_VAR(m_rareNonInheritedData, borderFit, static_cast<unsigned>(b)); } > void setResize(Resize r) { SET_VAR(m_rareNonInheritedData, resize, static_cast<unsigned>(r)); } > void setColumnAxis(ColumnAxis axis) { SET_NESTED_VAR(m_rareNonInheritedData, multiCol, axis, static_cast<unsigned>(axis)); } >@@ -1160,7 +1160,7 @@ public: > void setTextEmphasisColor(const Color& c) { SET_VAR(m_rareInheritedData, textEmphasisColor, c); } > void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(m_rareInheritedData, textEmphasisFill, static_cast<unsigned>(fill)); } > void setTextEmphasisMark(TextEmphasisMark mark) { SET_VAR(m_rareInheritedData, textEmphasisMark, static_cast<unsigned>(mark)); } >- void setTextEmphasisCustomMark(const AtomicString& mark) { SET_VAR(m_rareInheritedData, textEmphasisCustomMark, mark); } >+ void setTextEmphasisCustomMark(const AtomString& mark) { SET_VAR(m_rareInheritedData, textEmphasisCustomMark, mark); } > void setTextEmphasisPosition(OptionSet<TextEmphasisPosition> position) { SET_VAR(m_rareInheritedData, textEmphasisPosition, static_cast<unsigned>(position.toRaw())); } > bool setTextOrientation(TextOrientation); > >@@ -1190,7 +1190,7 @@ public: > > // End CSS3 Setters > >- void setLineGrid(const AtomicString& lineGrid) { SET_VAR(m_rareInheritedData, lineGrid, lineGrid); } >+ void setLineGrid(const AtomString& lineGrid) { SET_VAR(m_rareInheritedData, lineGrid, lineGrid); } > void setLineSnap(LineSnap lineSnap) { SET_VAR(m_rareInheritedData, lineSnap, static_cast<unsigned>(lineSnap)); } > void setLineAlign(LineAlign lineAlign) { SET_VAR(m_rareInheritedData, lineAlign, static_cast<unsigned>(lineAlign)); } > >@@ -1394,7 +1394,7 @@ public: > > bool willChangeCreatesStackingContext() const; > >- const AtomicString& hyphenString() const; >+ const AtomString& hyphenString() const; > > bool inheritedNotEqual(const RenderStyle*) const; > bool inheritedDataShared(const RenderStyle*) const; >@@ -1548,7 +1548,7 @@ public: > static short initialHyphenationLimitBefore() { return -1; } > static short initialHyphenationLimitAfter() { return -1; } > static short initialHyphenationLimitLines() { return -1; } >- static const AtomicString& initialHyphenationString() { return nullAtom(); } >+ static const AtomString& initialHyphenationString() { return nullAtom(); } > static BorderFit initialBorderFit() { return BorderFit::Border; } > static Resize initialResize() { return Resize::None; } > static ControlPart initialAppearance() { return NoControlPart; } >@@ -1577,7 +1577,7 @@ public: > static Color initialTextEmphasisColor() { return Color(); } > static TextEmphasisFill initialTextEmphasisFill() { return TextEmphasisFill::Filled; } > static TextEmphasisMark initialTextEmphasisMark() { return TextEmphasisMark::None; } >- static const AtomicString& initialTextEmphasisCustomMark() { return nullAtom(); } >+ static const AtomString& initialTextEmphasisCustomMark() { return nullAtom(); } > static OptionSet<TextEmphasisPosition> initialTextEmphasisPosition() { return { TextEmphasisPosition::Over, TextEmphasisPosition::Right }; } > static RubyPosition initialRubyPosition() { return RubyPosition::Before; } > static LineBoxContain initialLineBoxContain() { return LineBoxContainBlock | LineBoxContainInline | LineBoxContainReplaced; } >@@ -1590,7 +1590,7 @@ public: > static StyleImage* initialMaskBoxImageSource() { return nullptr; } > static PrintColorAdjust initialPrintColorAdjust() { return PrintColorAdjust::Economy; } > static QuotesData* initialQuotes() { return nullptr; } >- static const AtomicString& initialContentAltText() { return emptyAtom(); } >+ static const AtomString& initialContentAltText() { return emptyAtom(); } > > #if ENABLE(DARK_MODE_CSS) > static StyleColorScheme initialColorScheme() { return { }; } >@@ -1664,7 +1664,7 @@ public: > > static TabSize initialTabSize() { return 8; } > >- static const AtomicString& initialLineGrid() { return nullAtom(); } >+ static const AtomString& initialLineGrid() { return nullAtom(); } > static LineSnap initialLineSnap() { return LineSnap::None; } > static LineAlign initialLineAlign() { return LineAlign::None; } > >@@ -2029,7 +2029,7 @@ inline BorderStyle collapsedBorderStyle(BorderStyle style) > return style; > } > >-inline const CSSCustomPropertyValue* RenderStyle::getCustomProperty(const AtomicString& name) const >+inline const CSSCustomPropertyValue* RenderStyle::getCustomProperty(const AtomString& name) const > { > for (auto* map : { &nonInheritedCustomProperties(), &inheritedCustomProperties() }) { > if (auto* val = map->get(name)) >diff --git a/Source/WebCore/rendering/style/StyleCustomPropertyData.h b/Source/WebCore/rendering/style/StyleCustomPropertyData.h >index 132e6f52560e65cac54e4c5b53fd7d41035f75fa..ecc778293981e7c2d6566a5a17e0f20bf5e12179 100644 >--- a/Source/WebCore/rendering/style/StyleCustomPropertyData.h >+++ b/Source/WebCore/rendering/style/StyleCustomPropertyData.h >@@ -27,7 +27,7 @@ > #include <wtf/HashMap.h> > #include <wtf/RefCounted.h> > #include <wtf/RefPtr.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -52,7 +52,7 @@ public: > > bool operator!=(const StyleCustomPropertyData& other) const { return !(*this == other); } > >- void setCustomPropertyValue(const AtomicString& name, Ref<CSSCustomPropertyValue>&& value) >+ void setCustomPropertyValue(const AtomString& name, Ref<CSSCustomPropertyValue>&& value) > { > values.set(name, WTFMove(value)); > } >diff --git a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp >index 14e31b5c506affd53a6ba934a0c5c12e709fb058..ad2cbd957eef82560cfb352e9f50b39e633a26ff 100644 >--- a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp >+++ b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp >@@ -42,7 +42,7 @@ struct GreaterThanOrSameSizeAsStyleRareInheritedData : public RefCounted<Greater > float firstFloat; > Color colors[9]; > void* ownPtrs[1]; >- AtomicString atomicStrings[5]; >+ AtomString atomStrings[5]; > void* refPtrs[3]; > Length lengths[2]; > float secondFloat; >diff --git a/Source/WebCore/rendering/style/StyleRareInheritedData.h b/Source/WebCore/rendering/style/StyleRareInheritedData.h >index e5c594384bd66d54820b4c641bbfaa6c35e13d4b..5ae993f3705550d28fe1e00f550e538fa1680bac 100644 >--- a/Source/WebCore/rendering/style/StyleRareInheritedData.h >+++ b/Source/WebCore/rendering/style/StyleRareInheritedData.h >@@ -32,7 +32,7 @@ > #include "TextDecorationThickness.h" > #include "TextUnderlineOffset.h" > #include <wtf/RefCounted.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > #if ENABLE(TEXT_AUTOSIZING) > #include "TextSizeAdjustment.h" >@@ -163,16 +163,16 @@ public: > Color visitedLinkStrokeColor; > float miterLimit; > >- AtomicString hyphenationString; >+ AtomString hyphenationString; > short hyphenationLimitBefore; > short hyphenationLimitAfter; > short hyphenationLimitLines; > >- AtomicString textEmphasisCustomMark; >+ AtomString textEmphasisCustomMark; > RefPtr<QuotesData> quotes; > DataRef<StyleFilterData> appleColorFilter; > >- AtomicString lineGrid; >+ AtomString lineGrid; > TabSize tabSize; > > #if ENABLE(TEXT_AUTOSIZING) >diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h b/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h >index f637b714da5b9c9adb70e861c830753a17bcc41c..894b57dd5123bb55c5d9ef67431281ac61f1ee78 100644 >--- a/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h >+++ b/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h >@@ -70,14 +70,14 @@ private: > void willBeDestroyed() final; > void registerResource(); > >- AtomicString m_id; >+ AtomString m_id; > HashSet<RenderElement*> m_clients; > HashSet<RenderLayer*> m_clientLayers; > bool m_registered { false }; > bool m_isInvalidating { false }; > }; > >-inline RenderSVGResourceContainer* getRenderSVGResourceContainerById(Document& document, const AtomicString& id) >+inline RenderSVGResourceContainer* getRenderSVGResourceContainerById(Document& document, const AtomString& id) > { > if (id.isEmpty()) > return nullptr; >@@ -89,7 +89,7 @@ inline RenderSVGResourceContainer* getRenderSVGResourceContainerById(Document& d > } > > template<typename Renderer> >-Renderer* getRenderSVGResourceById(Document& document, const AtomicString& id) >+Renderer* getRenderSVGResourceById(Document& document, const AtomString& id) > { > // Using the RenderSVGResource type here avoids ambiguous casts for types that > // descend from both RenderObject and RenderSVGResourceContainer. >diff --git a/Source/WebCore/rendering/svg/SVGPathData.cpp b/Source/WebCore/rendering/svg/SVGPathData.cpp >index fe97674386143a583ae110d6f7e598fb82948163..0f8499e53b0305ad008cea43818f3d71defece56 100644 >--- a/Source/WebCore/rendering/svg/SVGPathData.cpp >+++ b/Source/WebCore/rendering/svg/SVGPathData.cpp >@@ -174,9 +174,9 @@ Path pathFromGraphicsElement(const SVGElement* element) > ASSERT(element); > > typedef Path (*PathFromFunction)(const SVGElement&); >- static HashMap<AtomicStringImpl*, PathFromFunction>* map = 0; >+ static HashMap<AtomStringImpl*, PathFromFunction>* map = 0; > if (!map) { >- map = new HashMap<AtomicStringImpl*, PathFromFunction>; >+ map = new HashMap<AtomStringImpl*, PathFromFunction>; > map->set(SVGNames::circleTag->localName().impl(), pathFromCircleElement); > map->set(SVGNames::ellipseTag->localName().impl(), pathFromEllipseElement); > map->set(SVGNames::lineTag->localName().impl(), pathFromLineElement); >diff --git a/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp b/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp >index b462b2cfe9ea27a32d00d6787fe27a41b3fe707d..cc4f068ae4beddbcba5999e2acd8fdfb1328638a 100644 >--- a/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp >+++ b/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp >@@ -408,7 +408,7 @@ void writeSVGResourceContainer(TextStream& ts, const RenderSVGResourceContainer& > { > writeStandardPrefix(ts, resource, behavior); > >- const AtomicString& id = resource.element().getIdAttribute(); >+ const AtomString& id = resource.element().getIdAttribute(); > writeNameAndQuotedValue(ts, "id", id); > > if (resource.resourceType() == MaskerResourceType) { >@@ -578,7 +578,7 @@ void writeResources(TextStream& ts, const RenderObject& renderer, OptionSet<Rend > const FilterOperation& filterOperation = *filterOperations.at(0); > if (filterOperation.type() == FilterOperation::REFERENCE) { > const auto& referenceFilterOperation = downcast<ReferenceFilterOperation>(filterOperation); >- AtomicString id = SVGURIReference::fragmentIdentifierFromIRIString(referenceFilterOperation.url(), renderer.document()); >+ AtomString id = SVGURIReference::fragmentIdentifierFromIRIString(referenceFilterOperation.url(), renderer.document()); > if (RenderSVGResourceFilter* filter = getRenderSVGResourceById<RenderSVGResourceFilter>(renderer.document(), id)) { > ts << indent << " "; > writeNameAndQuotedValue(ts, "filter", id); >diff --git a/Source/WebCore/rendering/svg/SVGResources.cpp b/Source/WebCore/rendering/svg/SVGResources.cpp >index 2b06517ad75828a78a3b0ea2e67caab92c559ad0..bf786443ddd60d621bcd579b8770edcd91d29fa9 100644 >--- a/Source/WebCore/rendering/svg/SVGResources.cpp >+++ b/Source/WebCore/rendering/svg/SVGResources.cpp >@@ -43,9 +43,9 @@ SVGResources::SVGResources() > { > } > >-static HashSet<AtomicString>& clipperFilterMaskerTags() >+static HashSet<AtomString>& clipperFilterMaskerTags() > { >- static NeverDestroyed<HashSet<AtomicString>> s_tagList; >+ static NeverDestroyed<HashSet<AtomString>> s_tagList; > if (s_tagList.get().isEmpty()) { > // "container elements": http://www.w3.org/TR/SVG11/intro.html#TermContainerElement > // "graphics elements" : http://www.w3.org/TR/SVG11/intro.html#TermGraphicsElement >@@ -92,9 +92,9 @@ static HashSet<AtomicString>& clipperFilterMaskerTags() > return s_tagList; > } > >-static HashSet<AtomicString>& markerTags() >+static HashSet<AtomString>& markerTags() > { >- static NeverDestroyed<HashSet<AtomicString>> s_tagList; >+ static NeverDestroyed<HashSet<AtomString>> s_tagList; > if (s_tagList.get().isEmpty()) { > s_tagList.get().add(SVGNames::lineTag->localName()); > s_tagList.get().add(SVGNames::pathTag->localName()); >@@ -105,9 +105,9 @@ static HashSet<AtomicString>& markerTags() > return s_tagList; > } > >-static HashSet<AtomicString>& fillAndStrokeTags() >+static HashSet<AtomString>& fillAndStrokeTags() > { >- static NeverDestroyed<HashSet<AtomicString>> s_tagList; >+ static NeverDestroyed<HashSet<AtomString>> s_tagList; > if (s_tagList.get().isEmpty()) { > s_tagList.get().add(SVGNames::altGlyphTag->localName()); > s_tagList.get().add(SVGNames::circleTag->localName()); >@@ -126,9 +126,9 @@ static HashSet<AtomicString>& fillAndStrokeTags() > return s_tagList; > } > >-static HashSet<AtomicString>& chainableResourceTags() >+static HashSet<AtomString>& chainableResourceTags() > { >- static NeverDestroyed<HashSet<AtomicString>> s_tagList; >+ static NeverDestroyed<HashSet<AtomString>> s_tagList; > if (s_tagList.get().isEmpty()) { > s_tagList.get().add(SVGNames::linearGradientTag->localName()); > s_tagList.get().add(SVGNames::filterTag->localName()); >@@ -169,7 +169,7 @@ static inline bool isChainableResource(const SVGElement& element, const SVGEleme > return false; > } > >-static inline RenderSVGResourceContainer* paintingResourceFromSVGPaint(Document& document, const SVGPaintType& paintType, const String& paintUri, AtomicString& id, bool& hasPendingResource) >+static inline RenderSVGResourceContainer* paintingResourceFromSVGPaint(Document& document, const SVGPaintType& paintType, const String& paintUri, AtomString& id, bool& hasPendingResource) > { > if (paintType != SVGPaintType::URI && paintType != SVGPaintType::URIRGBColor && paintType != SVGPaintType::URICurrentColor) > return nullptr; >@@ -188,7 +188,7 @@ static inline RenderSVGResourceContainer* paintingResourceFromSVGPaint(Document& > return container; > } > >-static inline void registerPendingResource(SVGDocumentExtensions& extensions, const AtomicString& id, SVGElement& element) >+static inline void registerPendingResource(SVGDocumentExtensions& extensions, const AtomString& id, SVGElement& element) > { > extensions.addPendingResource(id, element); > } >@@ -207,7 +207,7 @@ bool SVGResources::buildCachedResources(const RenderElement& renderer, const Ren > > SVGDocumentExtensions& extensions = document.accessSVGExtensions(); > >- const AtomicString& tagName = element.localName(); >+ const AtomString& tagName = element.localName(); > if (tagName.isNull()) > return false; > >@@ -216,7 +216,7 @@ bool SVGResources::buildCachedResources(const RenderElement& renderer, const Ren > bool foundResources = false; > if (clipperFilterMaskerTags().contains(tagName)) { > if (svgStyle.hasClipper()) { >- AtomicString id(svgStyle.clipperResource()); >+ AtomString id(svgStyle.clipperResource()); > if (setClipper(getRenderSVGResourceById<RenderSVGResourceClipper>(document, id))) > foundResources = true; > else >@@ -225,7 +225,7 @@ bool SVGResources::buildCachedResources(const RenderElement& renderer, const Ren > // FIXME: -webkit-clip-path should support external resources > // https://bugs.webkit.org/show_bug.cgi?id=127032 > auto& clipPath = downcast<ReferenceClipPathOperation>(*style.clipPath()); >- AtomicString id(clipPath.fragment()); >+ AtomString id(clipPath.fragment()); > if (setClipper(getRenderSVGResourceById<RenderSVGResourceClipper>(document, id))) > foundResources = true; > else >@@ -238,7 +238,7 @@ bool SVGResources::buildCachedResources(const RenderElement& renderer, const Ren > const FilterOperation& filterOperation = *filterOperations.at(0); > if (filterOperation.type() == FilterOperation::REFERENCE) { > const auto& referenceFilterOperation = downcast<ReferenceFilterOperation>(filterOperation); >- AtomicString id = SVGURIReference::fragmentIdentifierFromIRIString(referenceFilterOperation.url(), element.document()); >+ AtomString id = SVGURIReference::fragmentIdentifierFromIRIString(referenceFilterOperation.url(), element.document()); > if (setFilter(getRenderSVGResourceById<RenderSVGResourceFilter>(document, id))) > foundResources = true; > else >@@ -248,7 +248,7 @@ bool SVGResources::buildCachedResources(const RenderElement& renderer, const Ren > } > > if (svgStyle.hasMasker()) { >- AtomicString id(svgStyle.maskerResource()); >+ AtomString id(svgStyle.maskerResource()); > if (setMasker(getRenderSVGResourceById<RenderSVGResourceMasker>(document, id))) > foundResources = true; > else >@@ -257,19 +257,19 @@ bool SVGResources::buildCachedResources(const RenderElement& renderer, const Ren > } > > if (markerTags().contains(tagName) && svgStyle.hasMarkers()) { >- AtomicString markerStartId(svgStyle.markerStartResource()); >+ AtomString markerStartId(svgStyle.markerStartResource()); > if (setMarkerStart(getRenderSVGResourceById<RenderSVGResourceMarker>(document, markerStartId))) > foundResources = true; > else > registerPendingResource(extensions, markerStartId, element); > >- AtomicString markerMidId(svgStyle.markerMidResource()); >+ AtomString markerMidId(svgStyle.markerMidResource()); > if (setMarkerMid(getRenderSVGResourceById<RenderSVGResourceMarker>(document, markerMidId))) > foundResources = true; > else > registerPendingResource(extensions, markerMidId, element); > >- AtomicString markerEndId(svgStyle.markerEndResource()); >+ AtomString markerEndId(svgStyle.markerEndResource()); > if (setMarkerEnd(getRenderSVGResourceById<RenderSVGResourceMarker>(document, markerEndId))) > foundResources = true; > else >@@ -279,7 +279,7 @@ bool SVGResources::buildCachedResources(const RenderElement& renderer, const Ren > if (fillAndStrokeTags().contains(tagName)) { > if (svgStyle.hasFill()) { > bool hasPendingResource = false; >- AtomicString id; >+ AtomString id; > if (setFill(paintingResourceFromSVGPaint(document, svgStyle.fillPaintType(), svgStyle.fillPaintUri(), id, hasPendingResource))) > foundResources = true; > else if (hasPendingResource) >@@ -288,7 +288,7 @@ bool SVGResources::buildCachedResources(const RenderElement& renderer, const Ren > > if (svgStyle.hasStroke()) { > bool hasPendingResource = false; >- AtomicString id; >+ AtomString id; > if (setStroke(paintingResourceFromSVGPaint(document, svgStyle.strokePaintType(), svgStyle.strokePaintUri(), id, hasPendingResource))) > foundResources = true; > else if (hasPendingResource) >@@ -297,7 +297,7 @@ bool SVGResources::buildCachedResources(const RenderElement& renderer, const Ren > } > > if (chainableResourceTags().contains(tagName)) { >- AtomicString id(targetReferenceFromResource(element)); >+ AtomString id(targetReferenceFromResource(element)); > auto* linkedResource = getRenderSVGResourceContainerById(document, id); > if (!linkedResource) > registerPendingResource(extensions, id, element); >diff --git a/Source/WebCore/storage/Storage.cpp b/Source/WebCore/storage/Storage.cpp >index 0863f087ee07e7d5b3d73eab43d521ac94a3b974..47dbb17d9ae6d269c14703a1a62a492ee66df416 100644 >--- a/Source/WebCore/storage/Storage.cpp >+++ b/Source/WebCore/storage/Storage.cpp >@@ -117,11 +117,11 @@ bool Storage::isSupportedPropertyName(const String& propertyName) const > return m_storageArea->contains(propertyName); > } > >-Vector<AtomicString> Storage::supportedPropertyNames() const >+Vector<AtomString> Storage::supportedPropertyNames() const > { > unsigned length = m_storageArea->length(); > >- Vector<AtomicString> result; >+ Vector<AtomString> result; > result.reserveInitialCapacity(length); > > for (unsigned i = 0; i < length; ++i) >diff --git a/Source/WebCore/storage/Storage.h b/Source/WebCore/storage/Storage.h >index f3b2caed11dfe0091a9fc14748d5ee983e60af45..28aa9ab14e1b22acc5bc5b4f6e1c84c1a974f660 100644 >--- a/Source/WebCore/storage/Storage.h >+++ b/Source/WebCore/storage/Storage.h >@@ -49,7 +49,7 @@ public: > > // Bindings support functions. > bool isSupportedPropertyName(const String&) const; >- Vector<AtomicString> supportedPropertyNames() const; >+ Vector<AtomString> supportedPropertyNames() const; > > StorageArea& area() const { return m_storageArea.get(); } > >diff --git a/Source/WebCore/storage/StorageEvent.cpp b/Source/WebCore/storage/StorageEvent.cpp >index c7068afd9863acda7ca4111dcae001591a99ecf1..f667156ede25db7cdabc90b76d364336812e09e6 100644 >--- a/Source/WebCore/storage/StorageEvent.cpp >+++ b/Source/WebCore/storage/StorageEvent.cpp >@@ -39,17 +39,17 @@ StorageEvent::StorageEvent() = default; > > StorageEvent::~StorageEvent() = default; > >-Ref<StorageEvent> StorageEvent::create(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& url, Storage* storageArea) >+Ref<StorageEvent> StorageEvent::create(const AtomString& type, const String& key, const String& oldValue, const String& newValue, const String& url, Storage* storageArea) > { > return adoptRef(*new StorageEvent(type, key, oldValue, newValue, url, storageArea)); > } > >-Ref<StorageEvent> StorageEvent::create(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+Ref<StorageEvent> StorageEvent::create(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > { > return adoptRef(*new StorageEvent(type, initializer, isTrusted)); > } > >-StorageEvent::StorageEvent(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& url, Storage* storageArea) >+StorageEvent::StorageEvent(const AtomString& type, const String& key, const String& oldValue, const String& newValue, const String& url, Storage* storageArea) > : Event(type, CanBubble::No, IsCancelable::No) > , m_key(key) > , m_oldValue(oldValue) >@@ -59,7 +59,7 @@ StorageEvent::StorageEvent(const AtomicString& type, const String& key, const St > { > } > >-StorageEvent::StorageEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) >+StorageEvent::StorageEvent(const AtomString& type, const Init& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > , m_key(initializer.key) > , m_oldValue(initializer.oldValue) >@@ -69,7 +69,7 @@ StorageEvent::StorageEvent(const AtomicString& type, const Init& initializer, Is > { > } > >-void StorageEvent::initStorageEvent(const AtomicString& type, bool canBubble, bool cancelable, const String& key, const String& oldValue, const String& newValue, const String& url, Storage* storageArea) >+void StorageEvent::initStorageEvent(const AtomString& type, bool canBubble, bool cancelable, const String& key, const String& oldValue, const String& newValue, const String& url, Storage* storageArea) > { > if (isBeingDispatched()) > return; >diff --git a/Source/WebCore/storage/StorageEvent.h b/Source/WebCore/storage/StorageEvent.h >index ac18aac9f8f38e5ffc8922cfec7fa4363665f3b2..c2b32c63dc1dad13edc3d6d2b14582ba55fd5bdd 100644 >--- a/Source/WebCore/storage/StorageEvent.h >+++ b/Source/WebCore/storage/StorageEvent.h >@@ -34,7 +34,7 @@ class Storage; > > class StorageEvent : public Event { > public: >- static Ref<StorageEvent> create(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& url, Storage* storageArea); >+ static Ref<StorageEvent> create(const AtomString& type, const String& key, const String& oldValue, const String& newValue, const String& url, Storage* storageArea); > static Ref<StorageEvent> createForBindings(); > > struct Init : EventInit { >@@ -45,7 +45,7 @@ public: > RefPtr<Storage> storageArea; > }; > >- static Ref<StorageEvent> create(const AtomicString&, const Init&, IsTrusted = IsTrusted::No); >+ static Ref<StorageEvent> create(const AtomString&, const Init&, IsTrusted = IsTrusted::No); > virtual ~StorageEvent(); > > const String& key() const { return m_key; } >@@ -54,7 +54,7 @@ public: > const String& url() const { return m_url; } > Storage* storageArea() const { return m_storageArea.get(); } > >- void initStorageEvent(const AtomicString& type, bool canBubble, bool cancelable, const String& key, const String& oldValue, const String& newValue, const String& url, Storage* storageArea); >+ void initStorageEvent(const AtomString& type, bool canBubble, bool cancelable, const String& key, const String& oldValue, const String& newValue, const String& url, Storage* storageArea); > > // Needed once we support init<blank>EventNS > // void initStorageEventNS(in DOMString namespaceURI, in DOMString typeArg, in boolean canBubbleArg, in boolean cancelableArg, in DOMString keyArg, in DOMString oldValueArg, in DOMString newValueArg, in DOMString urlArg, Storage storageAreaArg); >@@ -63,8 +63,8 @@ public: > > private: > StorageEvent(); >- StorageEvent(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& url, Storage* storageArea); >- StorageEvent(const AtomicString&, const Init&, IsTrusted); >+ StorageEvent(const AtomString& type, const String& key, const String& oldValue, const String& newValue, const String& url, Storage* storageArea); >+ StorageEvent(const AtomString&, const Init&, IsTrusted); > > String m_key; > String m_oldValue; >diff --git a/Source/WebCore/style/AttributeChangeInvalidation.cpp b/Source/WebCore/style/AttributeChangeInvalidation.cpp >index be8e5bf265d77fdd3a8d8c2891c7c6ca292224ae..491ba2dab4636089ad5b8915ed0ce411cf022eec 100644 >--- a/Source/WebCore/style/AttributeChangeInvalidation.cpp >+++ b/Source/WebCore/style/AttributeChangeInvalidation.cpp >@@ -39,7 +39,7 @@ static bool mayBeAffectedByAttributeChange(const RuleFeatureSet& features, bool > return nameSet.contains(attributeName.localName()); > } > >-void AttributeChangeInvalidation::invalidateStyle(const QualifiedName& attributeName, const AtomicString& oldValue, const AtomicString& newValue) >+void AttributeChangeInvalidation::invalidateStyle(const QualifiedName& attributeName, const AtomString& oldValue, const AtomString& newValue) > { > if (newValue == oldValue) > return; >diff --git a/Source/WebCore/style/AttributeChangeInvalidation.h b/Source/WebCore/style/AttributeChangeInvalidation.h >index 017e387c78d4d08581e270ee1c4b2699c0b0582e..cac7159ddccb51bb55a8af298f94a775b13dd5b9 100644 >--- a/Source/WebCore/style/AttributeChangeInvalidation.h >+++ b/Source/WebCore/style/AttributeChangeInvalidation.h >@@ -35,11 +35,11 @@ namespace Style { > > class AttributeChangeInvalidation { > public: >- AttributeChangeInvalidation(Element&, const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue); >+ AttributeChangeInvalidation(Element&, const QualifiedName&, const AtomString& oldValue, const AtomString& newValue); > ~AttributeChangeInvalidation(); > > private: >- void invalidateStyle(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue); >+ void invalidateStyle(const QualifiedName&, const AtomString& oldValue, const AtomString& newValue); > void invalidateStyleWithRuleSets(); > > const bool m_isEnabled; >@@ -48,7 +48,7 @@ private: > Vector<const InvalidationRuleSet*, 4> m_invalidationRuleSets; > }; > >-inline AttributeChangeInvalidation::AttributeChangeInvalidation(Element& element, const QualifiedName& attributeName, const AtomicString& oldValue, const AtomicString& newValue) >+inline AttributeChangeInvalidation::AttributeChangeInvalidation(Element& element, const QualifiedName& attributeName, const AtomString& oldValue, const AtomString& newValue) > : m_isEnabled(element.needsStyleInvalidation()) > , m_element(element) > { >diff --git a/Source/WebCore/style/ClassChangeInvalidation.cpp b/Source/WebCore/style/ClassChangeInvalidation.cpp >index cd30dc736fe6efe32728c3797c2cdc6f388805a9..c90ac33a6d99da6e73f8afdc727752fcadb53856 100644 >--- a/Source/WebCore/style/ClassChangeInvalidation.cpp >+++ b/Source/WebCore/style/ClassChangeInvalidation.cpp >@@ -35,7 +35,7 @@ > namespace WebCore { > namespace Style { > >-using ClassChangeVector = Vector<AtomicStringImpl*, 4>; >+using ClassChangeVector = Vector<AtomStringImpl*, 4>; > > static ClassChangeVector collectClasses(const SpaceSplitString& classes) > { >diff --git a/Source/WebCore/style/IdChangeInvalidation.cpp b/Source/WebCore/style/IdChangeInvalidation.cpp >index 9691a8d3e12e650a8b0138c69b09b49cf9168223..8bee5eb7c39e1aab2f54c815bc917e2885937563 100644 >--- a/Source/WebCore/style/IdChangeInvalidation.cpp >+++ b/Source/WebCore/style/IdChangeInvalidation.cpp >@@ -32,7 +32,7 @@ > namespace WebCore { > namespace Style { > >-void IdChangeInvalidation::invalidateStyle(const AtomicString& changedId) >+void IdChangeInvalidation::invalidateStyle(const AtomString& changedId) > { > if (changedId.isEmpty()) > return; >diff --git a/Source/WebCore/style/IdChangeInvalidation.h b/Source/WebCore/style/IdChangeInvalidation.h >index 0e3bdef9b3d7cdb7e70d57bcaeafd9a66374c81d..436194d4e886f25346fd64ee26c1e44e8231f3a0 100644 >--- a/Source/WebCore/style/IdChangeInvalidation.h >+++ b/Source/WebCore/style/IdChangeInvalidation.h >@@ -33,19 +33,19 @@ namespace Style { > > class IdChangeInvalidation { > public: >- IdChangeInvalidation(Element&, const AtomicString& oldId, const AtomicString& newId); >+ IdChangeInvalidation(Element&, const AtomString& oldId, const AtomString& newId); > ~IdChangeInvalidation(); > > private: >- void invalidateStyle(const AtomicString&); >+ void invalidateStyle(const AtomString&); > > const bool m_isEnabled; > Element& m_element; > >- AtomicString m_newId; >+ AtomString m_newId; > }; > >-inline IdChangeInvalidation::IdChangeInvalidation(Element& element, const AtomicString& oldId, const AtomicString& newId) >+inline IdChangeInvalidation::IdChangeInvalidation(Element& element, const AtomString& oldId, const AtomString& newId) > : m_isEnabled(element.needsStyleInvalidation()) > , m_element(element) > { >diff --git a/Source/WebCore/style/StyleScope.cpp b/Source/WebCore/style/StyleScope.cpp >index a4fe9a2586278cd5731c67bfde7dbe241ee1d306..9f0d1ad7490bfeab2407ce7bc88b095116d0b222 100644 >--- a/Source/WebCore/style/StyleScope.cpp >+++ b/Source/WebCore/style/StyleScope.cpp >@@ -328,7 +328,7 @@ void Scope::collectActiveStyleSheets(Vector<RefPtr<StyleSheet>>& sheets) > sheet = downcast<ProcessingInstruction>(*node).sheet(); > } else if (is<HTMLLinkElement>(*node) || is<HTMLStyleElement>(*node) || is<SVGStyleElement>(*node)) { > Element& element = downcast<Element>(*node); >- AtomicString title = element.isInShadowTree() ? nullAtom() : element.attributeWithoutSynchronization(titleAttr); >+ AtomString title = element.isInShadowTree() ? nullAtom() : element.attributeWithoutSynchronization(titleAttr); > bool enabledViaScript = false; > if (is<HTMLLinkElement>(element)) { > // <LINK> element >diff --git a/Source/WebCore/svg/SVGAElement.cpp b/Source/WebCore/svg/SVGAElement.cpp >index d4619504e2b6c2d041d08014b32e9aff626eef3a..3dd3f3b63be232f0ea9e10bfe69d996378228d4b 100644 >--- a/Source/WebCore/svg/SVGAElement.cpp >+++ b/Source/WebCore/svg/SVGAElement.cpp >@@ -67,7 +67,7 @@ Ref<SVGAElement> SVGAElement::create(const QualifiedName& tagName, Document& doc > String SVGAElement::title() const > { > // If the xlink:title is set (non-empty string), use it. >- const AtomicString& title = attributeWithoutSynchronization(XLinkNames::titleAttr); >+ const AtomString& title = attributeWithoutSynchronization(XLinkNames::titleAttr); > if (!title.isEmpty()) > return title; > >@@ -75,7 +75,7 @@ String SVGAElement::title() const > return SVGElement::title(); > } > >-void SVGAElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGAElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::targetAttr) { > m_target->setBaseValInternal(value); >diff --git a/Source/WebCore/svg/SVGAElement.h b/Source/WebCore/svg/SVGAElement.h >index 7e1d2946704e6755be34e40e798474fb14c701c6..b046e3be523691d7647338656600e982847dc1b4 100644 >--- a/Source/WebCore/svg/SVGAElement.h >+++ b/Source/WebCore/svg/SVGAElement.h >@@ -45,7 +45,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGAElement, SVGGraphicsElement, SVGExternalResourcesRequired, SVGURIReference>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; >diff --git a/Source/WebCore/svg/SVGAltGlyphElement.cpp b/Source/WebCore/svg/SVGAltGlyphElement.cpp >index 95efcb279b1686a08be6f29fe7e6e9930c381647..9a9c7c71a4a16039c0718fe7069e3a83bd3d9a54 100644 >--- a/Source/WebCore/svg/SVGAltGlyphElement.cpp >+++ b/Source/WebCore/svg/SVGAltGlyphElement.cpp >@@ -49,22 +49,22 @@ Ref<SVGAltGlyphElement> SVGAltGlyphElement::create(const QualifiedName& tagName, > return adoptRef(*new SVGAltGlyphElement(tagName, document)); > } > >-ExceptionOr<void> SVGAltGlyphElement::setGlyphRef(const AtomicString&) >+ExceptionOr<void> SVGAltGlyphElement::setGlyphRef(const AtomString&) > { > return Exception { NoModificationAllowedError }; > } > >-const AtomicString& SVGAltGlyphElement::glyphRef() const >+const AtomString& SVGAltGlyphElement::glyphRef() const > { > return attributeWithoutSynchronization(SVGNames::glyphRefAttr); > } > >-ExceptionOr<void> SVGAltGlyphElement::setFormat(const AtomicString&) >+ExceptionOr<void> SVGAltGlyphElement::setFormat(const AtomString&) > { > return Exception { NoModificationAllowedError }; > } > >-const AtomicString& SVGAltGlyphElement::format() const >+const AtomString& SVGAltGlyphElement::format() const > { > return attributeWithoutSynchronization(SVGNames::formatAttr); > } >diff --git a/Source/WebCore/svg/SVGAltGlyphElement.h b/Source/WebCore/svg/SVGAltGlyphElement.h >index 5d902f6756c39c7a2cfe7830fc448251907e07e0..4ed82595954648add41b3a02c46fe81c9824a892 100644 >--- a/Source/WebCore/svg/SVGAltGlyphElement.h >+++ b/Source/WebCore/svg/SVGAltGlyphElement.h >@@ -35,10 +35,10 @@ class SVGAltGlyphElement final : public SVGTextPositioningElement, public SVGURI > public: > static Ref<SVGAltGlyphElement> create(const QualifiedName&, Document&); > >- const AtomicString& glyphRef() const; >- ExceptionOr<void> setGlyphRef(const AtomicString&); >- const AtomicString& format() const; >- ExceptionOr<void> setFormat(const AtomicString&); >+ const AtomString& glyphRef() const; >+ ExceptionOr<void> setGlyphRef(const AtomString&); >+ const AtomString& format() const; >+ ExceptionOr<void> setFormat(const AtomString&); > > bool hasValidGlyphElements(Vector<String>& glyphNames) const; > >diff --git a/Source/WebCore/svg/SVGAnimateMotionElement.cpp b/Source/WebCore/svg/SVGAnimateMotionElement.cpp >index 8ec41b7804b653cba9903b1dd324ae92b50631ef..1dac660050fa26ffe9c8b3d6c8c679e25062c49d 100644 >--- a/Source/WebCore/svg/SVGAnimateMotionElement.cpp >+++ b/Source/WebCore/svg/SVGAnimateMotionElement.cpp >@@ -96,7 +96,7 @@ bool SVGAnimateMotionElement::hasValidAttributeName() const > return true; > } > >-void SVGAnimateMotionElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGAnimateMotionElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::pathAttr) { > m_path = buildPathFromString(value); >@@ -109,9 +109,9 @@ void SVGAnimateMotionElement::parseAttribute(const QualifiedName& name, const At > > SVGAnimateMotionElement::RotateMode SVGAnimateMotionElement::rotateMode() const > { >- static NeverDestroyed<const AtomicString> autoVal("auto", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> autoReverse("auto-reverse", AtomicString::ConstructFromLiteral); >- const AtomicString& rotate = getAttribute(SVGNames::rotateAttr); >+ static NeverDestroyed<const AtomString> autoVal("auto", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> autoReverse("auto-reverse", AtomString::ConstructFromLiteral); >+ const AtomString& rotate = getAttribute(SVGNames::rotateAttr); > if (rotate == autoVal) > return RotateAuto; > if (rotate == autoReverse) >diff --git a/Source/WebCore/svg/SVGAnimateMotionElement.h b/Source/WebCore/svg/SVGAnimateMotionElement.h >index 2a90d3b81a4719f0bc93186248bc93988fc405be..fabaac5d7c3372ae6a8d53da95cd6b7f350af2a4 100644 >--- a/Source/WebCore/svg/SVGAnimateMotionElement.h >+++ b/Source/WebCore/svg/SVGAnimateMotionElement.h >@@ -39,7 +39,7 @@ private: > bool hasValidAttributeType() const override; > bool hasValidAttributeName() const override; > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > > void resetAnimatedType() override; > void clearAnimatedType(SVGElement* targetElement) override; >diff --git a/Source/WebCore/svg/SVGAnimateTransformElement.cpp b/Source/WebCore/svg/SVGAnimateTransformElement.cpp >index ad750aef787966dcd6539e2768924a9b27fa952c..a5cd113c3aa9e262f58f7a377d9a2bd4dff63d7c 100644 >--- a/Source/WebCore/svg/SVGAnimateTransformElement.cpp >+++ b/Source/WebCore/svg/SVGAnimateTransformElement.cpp >@@ -54,7 +54,7 @@ bool SVGAnimateTransformElement::hasValidAttributeType() const > return SVGAnimateElementBase::hasValidAttributeType(); > } > >-void SVGAnimateTransformElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGAnimateTransformElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::typeAttr) { > m_type = SVGTransformable::parseTransformType(value); >diff --git a/Source/WebCore/svg/SVGAnimateTransformElement.h b/Source/WebCore/svg/SVGAnimateTransformElement.h >index 301ea88ab465d547b12db81b3a1b65537e529b7a..98da70e26d6f8412333f2bd13feb0194011a0961 100644 >--- a/Source/WebCore/svg/SVGAnimateTransformElement.h >+++ b/Source/WebCore/svg/SVGAnimateTransformElement.h >@@ -40,7 +40,7 @@ private: > SVGAnimateTransformElement(const QualifiedName&, Document&); > > bool hasValidAttributeType() const final; >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > String animateRangeString(const String&) const final; > > SVGTransformValue::SVGTransformType m_type; >diff --git a/Source/WebCore/svg/SVGAnimationElement.cpp b/Source/WebCore/svg/SVGAnimationElement.cpp >index 542428bd98115fdbe810c78ada86cf28e153365e..b8b51f16f422999ed01ae693917e9db267b167b5 100644 >--- a/Source/WebCore/svg/SVGAnimationElement.cpp >+++ b/Source/WebCore/svg/SVGAnimationElement.cpp >@@ -153,7 +153,7 @@ bool SVGAnimationElement::isSupportedAttribute(const QualifiedName& attrName) > return supportedAttributes.get().contains<SVGAttributeHashTranslator>(attrName); > } > >-void SVGAnimationElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGAnimationElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::valuesAttr) { > // Per the SMIL specification, leading and trailing white space, >@@ -277,12 +277,12 @@ void SVGAnimationElement::updateAnimationMode() > setAnimationMode(AnimationMode::None); > } > >-void SVGAnimationElement::setCalcMode(const AtomicString& calcMode) >+void SVGAnimationElement::setCalcMode(const AtomString& calcMode) > { >- static NeverDestroyed<const AtomicString> discrete("discrete", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> linear("linear", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> paced("paced", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> spline("spline", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> discrete("discrete", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> linear("linear", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> paced("paced", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> spline("spline", AtomString::ConstructFromLiteral); > if (calcMode == discrete) > setCalcMode(CalcMode::Discrete); > else if (calcMode == linear) >@@ -295,10 +295,10 @@ void SVGAnimationElement::setCalcMode(const AtomicString& calcMode) > setCalcMode(hasTagName(SVGNames::animateMotionTag) ? CalcMode::Paced : CalcMode::Linear); > } > >-void SVGAnimationElement::setAttributeType(const AtomicString& attributeType) >+void SVGAnimationElement::setAttributeType(const AtomString& attributeType) > { >- static NeverDestroyed<const AtomicString> css("CSS", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> xml("XML", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> css("CSS", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> xml("XML", AtomString::ConstructFromLiteral); > if (attributeType == css) > m_attributeType = AttributeType::CSS; > else if (attributeType == xml) >@@ -324,15 +324,15 @@ String SVGAnimationElement::fromValue() const > > bool SVGAnimationElement::isAdditive() const > { >- static NeverDestroyed<const AtomicString> sum("sum", AtomicString::ConstructFromLiteral); >- const AtomicString& value = attributeWithoutSynchronization(SVGNames::additiveAttr); >+ static NeverDestroyed<const AtomString> sum("sum", AtomString::ConstructFromLiteral); >+ const AtomString& value = attributeWithoutSynchronization(SVGNames::additiveAttr); > return value == sum || animationMode() == AnimationMode::By; > } > > bool SVGAnimationElement::isAccumulated() const > { >- static NeverDestroyed<const AtomicString> sum("sum", AtomicString::ConstructFromLiteral); >- const AtomicString& value = attributeWithoutSynchronization(SVGNames::accumulateAttr); >+ static NeverDestroyed<const AtomString> sum("sum", AtomString::ConstructFromLiteral); >+ const AtomString& value = attributeWithoutSynchronization(SVGNames::accumulateAttr); > return value == sum && animationMode() != AnimationMode::To; > } > >@@ -609,7 +609,7 @@ void SVGAnimationElement::computeCSSPropertyValue(SVGElement* element, CSSProper > > static bool inheritsFromProperty(SVGElement* targetElement, const QualifiedName& attributeName, const String& value) > { >- static NeverDestroyed<const AtomicString> inherit("inherit", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> inherit("inherit", AtomString::ConstructFromLiteral); > > if (value.isEmpty() || value != inherit) > return false; >diff --git a/Source/WebCore/svg/SVGAnimationElement.h b/Source/WebCore/svg/SVGAnimationElement.h >index 54e9128129c792cf811e3d605756390f080afe35..aa53a0c54bf4d0b698564c579ab4f942542da531 100644 >--- a/Source/WebCore/svg/SVGAnimationElement.h >+++ b/Source/WebCore/svg/SVGAnimationElement.h >@@ -92,7 +92,7 @@ protected: > virtual void resetAnimation(); > > static bool isSupportedAttribute(const QualifiedName&); >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > String toValue() const; >@@ -116,7 +116,7 @@ protected: > > private: > void animationAttributeChanged() override; >- void setAttributeType(const AtomicString&); >+ void setAttributeType(const AtomString&); > > virtual bool calculateToAtEndOfDurationValue(const String& toAtEndOfDurationString) = 0; > virtual bool calculateFromAndToValues(const String& fromString, const String& toString) = 0; >@@ -132,7 +132,7 @@ private: > float calculatePercentForFromTo(float percent) const; > unsigned calculateKeyTimesIndex(float percent) const; > >- void setCalcMode(const AtomicString&); >+ void setCalcMode(const AtomString&); > > bool m_animationValid { false }; > >diff --git a/Source/WebCore/svg/SVGCircleElement.cpp b/Source/WebCore/svg/SVGCircleElement.cpp >index 0be6827a161e44a81df15f125bef729cb7c71d19..d93040a1f56aaeff5c2921d46ab73db108ad78f4 100644 >--- a/Source/WebCore/svg/SVGCircleElement.cpp >+++ b/Source/WebCore/svg/SVGCircleElement.cpp >@@ -49,7 +49,7 @@ Ref<SVGCircleElement> SVGCircleElement::create(const QualifiedName& tagName, Doc > return adoptRef(*new SVGCircleElement(tagName, document)); > } > >-void SVGCircleElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGCircleElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGParsingError parseError = NoError; > >diff --git a/Source/WebCore/svg/SVGCircleElement.h b/Source/WebCore/svg/SVGCircleElement.h >index 5f90c70fa9d6bb02edb75470619c4f93248bf00c..720f310e640f82dbee6670643f79313b4f5efa85 100644 >--- a/Source/WebCore/svg/SVGCircleElement.h >+++ b/Source/WebCore/svg/SVGCircleElement.h >@@ -46,7 +46,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGCircleElement, SVGGeometryElement, SVGExternalResourcesRequired>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > > bool isValid() const final { return SVGTests::isValid(); } >diff --git a/Source/WebCore/svg/SVGClipPathElement.cpp b/Source/WebCore/svg/SVGClipPathElement.cpp >index e104c59321d4232515ef0ba75931049aa84d6fbf..74f973cd921650ffdbd592419f22286ea6f12e24 100644 >--- a/Source/WebCore/svg/SVGClipPathElement.cpp >+++ b/Source/WebCore/svg/SVGClipPathElement.cpp >@@ -50,7 +50,7 @@ Ref<SVGClipPathElement> SVGClipPathElement::create(const QualifiedName& tagName, > return adoptRef(*new SVGClipPathElement(tagName, document)); > } > >-void SVGClipPathElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGClipPathElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::clipPathUnitsAttr) { > auto propertyValue = SVGPropertyTraits<SVGUnitTypes::SVGUnitType>::fromString(value); >diff --git a/Source/WebCore/svg/SVGClipPathElement.h b/Source/WebCore/svg/SVGClipPathElement.h >index 3ef0368cc94f44adf4d04f7a3ac28dd3cbbbe396..fb3ef17ea4807d44c08c4ed281c322881b9729dd 100644 >--- a/Source/WebCore/svg/SVGClipPathElement.h >+++ b/Source/WebCore/svg/SVGClipPathElement.h >@@ -43,7 +43,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGClipPathElement, SVGGraphicsElement, SVGExternalResourcesRequired>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > void childrenChanged(const ChildChange&) final; > >diff --git a/Source/WebCore/svg/SVGComponentTransferFunctionElement.cpp b/Source/WebCore/svg/SVGComponentTransferFunctionElement.cpp >index 01c03297e2a00a61d411527bc03e9b4fd4cff6db..68f9227aff5bf0ded9dcebbb7ecfb634e13d8b56 100644 >--- a/Source/WebCore/svg/SVGComponentTransferFunctionElement.cpp >+++ b/Source/WebCore/svg/SVGComponentTransferFunctionElement.cpp >@@ -46,7 +46,7 @@ SVGComponentTransferFunctionElement::SVGComponentTransferFunctionElement(const Q > }); > } > >-void SVGComponentTransferFunctionElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGComponentTransferFunctionElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::typeAttr) { > ComponentTransferType propertyValue = SVGPropertyTraits<ComponentTransferType>::fromString(value); >diff --git a/Source/WebCore/svg/SVGComponentTransferFunctionElement.h b/Source/WebCore/svg/SVGComponentTransferFunctionElement.h >index a3388f82e28219446f2f231e6b0e753abfdf5131..e590f2c6308de4ae02eb1acd033406f65f0ec2bd 100644 >--- a/Source/WebCore/svg/SVGComponentTransferFunctionElement.h >+++ b/Source/WebCore/svg/SVGComponentTransferFunctionElement.h >@@ -94,7 +94,7 @@ protected: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGComponentTransferFunctionElement, SVGElement>; > const SVGPropertyRegistry& propertyRegistry() const override { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > bool rendererIsNeeded(const RenderStyle&) override { return false; } >diff --git a/Source/WebCore/svg/SVGCursorElement.cpp b/Source/WebCore/svg/SVGCursorElement.cpp >index d20a3a46b5f5037a6e8129d25c716b5999bc3726..5cd7d19de9395ee1ff45d0b7e46e853e0bbf7447 100644 >--- a/Source/WebCore/svg/SVGCursorElement.cpp >+++ b/Source/WebCore/svg/SVGCursorElement.cpp >@@ -59,7 +59,7 @@ SVGCursorElement::~SVGCursorElement() > client->cursorElementRemoved(*this); > } > >-void SVGCursorElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGCursorElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGParsingError parseError = NoError; > >diff --git a/Source/WebCore/svg/SVGCursorElement.h b/Source/WebCore/svg/SVGCursorElement.h >index 9b812ebc8b4f11be972025aaa64458642fba6aed..ed64d5fa19e835f9080532555f17c8cf4744c022 100644 >--- a/Source/WebCore/svg/SVGCursorElement.h >+++ b/Source/WebCore/svg/SVGCursorElement.h >@@ -52,7 +52,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGCursorElement, SVGElement, SVGExternalResourcesRequired, SVGTests, SVGURIReference>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > > bool isValid() const final { return SVGTests::isValid(); } >diff --git a/Source/WebCore/svg/SVGDocumentExtensions.cpp b/Source/WebCore/svg/SVGDocumentExtensions.cpp >index 5c45335b5a5333088b5dfe42d4629ead6f5a8df8..bc51434b0b2b8e0bf77e57a4a76e4d4bceee9965 100644 >--- a/Source/WebCore/svg/SVGDocumentExtensions.cpp >+++ b/Source/WebCore/svg/SVGDocumentExtensions.cpp >@@ -35,7 +35,7 @@ > #include "SVGSVGElement.h" > #include "ScriptableDocumentParser.h" > #include "ShadowRoot.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -60,7 +60,7 @@ void SVGDocumentExtensions::removeTimeContainer(SVGSVGElement& element) > m_timeContainers.remove(&element); > } > >-void SVGDocumentExtensions::addResource(const AtomicString& id, RenderSVGResourceContainer& resource) >+void SVGDocumentExtensions::addResource(const AtomString& id, RenderSVGResourceContainer& resource) > { > if (id.isEmpty()) > return; >@@ -69,7 +69,7 @@ void SVGDocumentExtensions::addResource(const AtomicString& id, RenderSVGResourc > m_resources.set(id, &resource); > } > >-void SVGDocumentExtensions::removeResource(const AtomicString& id) >+void SVGDocumentExtensions::removeResource(const AtomString& id) > { > if (id.isEmpty()) > return; >@@ -77,7 +77,7 @@ void SVGDocumentExtensions::removeResource(const AtomicString& id) > m_resources.remove(id); > } > >-RenderSVGResourceContainer* SVGDocumentExtensions::resourceById(const AtomicString& id) const >+RenderSVGResourceContainer* SVGDocumentExtensions::resourceById(const AtomString& id) const > { > if (id.isEmpty()) > return 0; >@@ -139,7 +139,7 @@ void SVGDocumentExtensions::reportError(const String& message) > reportMessage(m_document, MessageLevel::Error, "Error: " + message); > } > >-void SVGDocumentExtensions::addPendingResource(const AtomicString& id, Element& element) >+void SVGDocumentExtensions::addPendingResource(const AtomString& id, Element& element) > { > if (id.isEmpty()) > return; >@@ -152,7 +152,7 @@ void SVGDocumentExtensions::addPendingResource(const AtomicString& id, Element& > element.setHasPendingResources(); > } > >-bool SVGDocumentExtensions::isIdOfPendingResource(const AtomicString& id) const >+bool SVGDocumentExtensions::isIdOfPendingResource(const AtomString& id) const > { > if (id.isEmpty()) > return false; >@@ -172,7 +172,7 @@ bool SVGDocumentExtensions::isElementWithPendingResources(Element& element) cons > return false; > } > >-bool SVGDocumentExtensions::isPendingResource(Element& element, const AtomicString& id) const >+bool SVGDocumentExtensions::isPendingResource(Element& element, const AtomString& id) const > { > if (!isIdOfPendingResource(id)) > return false; >@@ -190,7 +190,7 @@ void SVGDocumentExtensions::removeElementFromPendingResources(Element& element) > { > // Remove the element from pending resources. > if (!m_pendingResources.isEmpty() && element.hasPendingResources()) { >- Vector<AtomicString> toBeRemoved; >+ Vector<AtomString> toBeRemoved; > for (auto& resource : m_pendingResources) { > PendingElements* elements = resource.value.get(); > ASSERT(elements); >@@ -210,7 +210,7 @@ void SVGDocumentExtensions::removeElementFromPendingResources(Element& element) > > // Remove the element from pending resources that were scheduled for removal. > if (!m_pendingResourcesForRemoval.isEmpty()) { >- Vector<AtomicString> toBeRemoved; >+ Vector<AtomString> toBeRemoved; > for (auto& resource : m_pendingResourcesForRemoval) { > PendingElements* elements = resource.value.get(); > ASSERT(elements); >@@ -227,19 +227,19 @@ void SVGDocumentExtensions::removeElementFromPendingResources(Element& element) > } > } > >-std::unique_ptr<SVGDocumentExtensions::PendingElements> SVGDocumentExtensions::removePendingResource(const AtomicString& id) >+std::unique_ptr<SVGDocumentExtensions::PendingElements> SVGDocumentExtensions::removePendingResource(const AtomString& id) > { > ASSERT(m_pendingResources.contains(id)); > return m_pendingResources.take(id); > } > >-std::unique_ptr<SVGDocumentExtensions::PendingElements> SVGDocumentExtensions::removePendingResourceForRemoval(const AtomicString& id) >+std::unique_ptr<SVGDocumentExtensions::PendingElements> SVGDocumentExtensions::removePendingResourceForRemoval(const AtomString& id) > { > ASSERT(m_pendingResourcesForRemoval.contains(id)); > return m_pendingResourcesForRemoval.take(id); > } > >-void SVGDocumentExtensions::markPendingResourcesForRemoval(const AtomicString& id) >+void SVGDocumentExtensions::markPendingResourcesForRemoval(const AtomString& id) > { > if (id.isEmpty()) > return; >@@ -251,7 +251,7 @@ void SVGDocumentExtensions::markPendingResourcesForRemoval(const AtomicString& i > m_pendingResourcesForRemoval.add(id, WTFMove(existing)); > } > >-RefPtr<Element> SVGDocumentExtensions::removeElementFromPendingResourcesForRemovalMap(const AtomicString& id) >+RefPtr<Element> SVGDocumentExtensions::removeElementFromPendingResourcesForRemovalMap(const AtomString& id) > { > if (id.isEmpty()) > return 0; >diff --git a/Source/WebCore/svg/SVGDocumentExtensions.h b/Source/WebCore/svg/SVGDocumentExtensions.h >index c49f2dc73d21aeb36a118c71a78e50254bf9a334..8fbdf3a3a63b55e37e283a69e83dc24926eef5d2 100644 >--- a/Source/WebCore/svg/SVGDocumentExtensions.h >+++ b/Source/WebCore/svg/SVGDocumentExtensions.h >@@ -23,7 +23,7 @@ > #include <wtf/Forward.h> > #include <wtf/HashMap.h> > #include <wtf/HashSet.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > namespace WebCore { > >@@ -46,9 +46,9 @@ public: > void addTimeContainer(SVGSVGElement&); > void removeTimeContainer(SVGSVGElement&); > >- void addResource(const AtomicString& id, RenderSVGResourceContainer&); >- void removeResource(const AtomicString& id); >- RenderSVGResourceContainer* resourceById(const AtomicString& id) const; >+ void addResource(const AtomString& id, RenderSVGResourceContainer&); >+ void removeResource(const AtomString& id); >+ RenderSVGResourceContainer* resourceById(const AtomString& id) const; > > void startAnimations(); > void pauseAnimations(); >@@ -82,9 +82,9 @@ private: > #if ENABLE(SVG_FONTS) > HashSet<SVGFontFaceElement*> m_svgFontFaceElements; > #endif >- HashMap<AtomicString, RenderSVGResourceContainer*> m_resources; >- HashMap<AtomicString, std::unique_ptr<PendingElements>> m_pendingResources; // Resources that are pending. >- HashMap<AtomicString, std::unique_ptr<PendingElements>> m_pendingResourcesForRemoval; // Resources that are pending and scheduled for removal. >+ HashMap<AtomString, RenderSVGResourceContainer*> m_resources; >+ HashMap<AtomString, std::unique_ptr<PendingElements>> m_pendingResources; // Resources that are pending. >+ HashMap<AtomString, std::unique_ptr<PendingElements>> m_pendingResourcesForRemoval; // Resources that are pending and scheduled for removal. > HashMap<SVGElement*, std::unique_ptr<HashSet<SVGElement*>>> m_elementDependencies; > std::unique_ptr<SVGResourcesCache> m_resourcesCache; > >@@ -95,20 +95,20 @@ public: > // This HashMap contains a list of pending resources. Pending resources, are such > // which are referenced by any object in the SVG document, but do NOT exist yet. > // For instance, dynamically build gradients / patterns / clippers... >- void addPendingResource(const AtomicString& id, Element&); >- bool isIdOfPendingResource(const AtomicString& id) const; >- bool isPendingResource(Element&, const AtomicString& id) const; >+ void addPendingResource(const AtomString& id, Element&); >+ bool isIdOfPendingResource(const AtomString& id) const; >+ bool isPendingResource(Element&, const AtomString& id) const; > void clearHasPendingResourcesIfPossible(Element&); > void removeElementFromPendingResources(Element&); >- std::unique_ptr<PendingElements> removePendingResource(const AtomicString& id); >+ std::unique_ptr<PendingElements> removePendingResource(const AtomString& id); > > // The following two functions are used for scheduling a pending resource to be removed. >- void markPendingResourcesForRemoval(const AtomicString&); >- RefPtr<Element> removeElementFromPendingResourcesForRemovalMap(const AtomicString&); >+ void markPendingResourcesForRemoval(const AtomString&); >+ RefPtr<Element> removeElementFromPendingResourcesForRemovalMap(const AtomString&); > > private: > bool isElementWithPendingResources(Element&) const; >- std::unique_ptr<PendingElements> removePendingResourceForRemoval(const AtomicString&); >+ std::unique_ptr<PendingElements> removePendingResourceForRemoval(const AtomString&); > }; > > } // namespace WebCore >diff --git a/Source/WebCore/svg/SVGElement.cpp b/Source/WebCore/svg/SVGElement.cpp >index cc5b6fd25e85b7f9ca9eca2e1aead4ef458f6189..a8096ddada81ead6a7a1ea324cd85067f5c0b28b 100644 >--- a/Source/WebCore/svg/SVGElement.cpp >+++ b/Source/WebCore/svg/SVGElement.cpp >@@ -64,7 +64,7 @@ namespace WebCore { > > WTF_MAKE_ISO_ALLOCATED_IMPL(SVGElement); > >-static NEVER_INLINE HashMap<AtomicStringImpl*, CSSPropertyID> createAttributeNameToCSSPropertyIDMap() >+static NEVER_INLINE HashMap<AtomStringImpl*, CSSPropertyID> createAttributeNameToCSSPropertyIDMap() > { > using namespace HTMLNames; > using namespace SVGNames; >@@ -144,10 +144,10 @@ static NEVER_INLINE HashMap<AtomicStringImpl*, CSSPropertyID> createAttributeNam > &yAttr.get(), > }; > >- HashMap<AtomicStringImpl*, CSSPropertyID> map; >+ HashMap<AtomStringImpl*, CSSPropertyID> map; > > for (auto& name : attributeNames) { >- const AtomicString& localName = name->localName(); >+ const AtomString& localName = name->localName(); > map.add(localName.impl(), cssPropertyID(localName)); > } > >@@ -230,7 +230,7 @@ bool SVGElement::isOutermostSVGSVGElement() const > return !parentNode()->isSVGElement(); > } > >-void SVGElement::reportAttributeParsingError(SVGParsingError error, const QualifiedName& name, const AtomicString& value) >+void SVGElement::reportAttributeParsingError(SVGParsingError error, const QualifiedName& name, const AtomString& value) > { > if (error == NoError) > return; >@@ -341,7 +341,7 @@ void SVGElement::setCorrespondingElement(SVGElement* correspondingElement) > correspondingElement->ensureSVGRareData().instances().add(this); > } > >-void SVGElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == HTMLNames::classAttr) { > m_className->setBaseValInternal(value); >@@ -374,7 +374,7 @@ bool SVGElement::haveLoadedRequiredResources() > return true; > } > >-bool SVGElement::addEventListener(const AtomicString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) >+bool SVGElement::addEventListener(const AtomString& eventType, Ref<EventListener>&& listener, const AddEventListenerOptions& options) > { > // Add event listener to regular DOM element > if (!Node::addEventListener(eventType, listener.copyRef(), options)) >@@ -394,7 +394,7 @@ bool SVGElement::addEventListener(const AtomicString& eventType, Ref<EventListen > return true; > } > >-bool SVGElement::removeEventListener(const AtomicString& eventType, EventListener& listener, const ListenerOptions& options) >+bool SVGElement::removeEventListener(const AtomString& eventType, EventListener& listener, const ListenerOptions& options) > { > if (containingShadowRoot()) > return Node::removeEventListener(eventType, listener, options); >@@ -533,7 +533,7 @@ bool SVGElement::childShouldCreateRenderer(const Node& child) const > return svgChild.isValid(); > } > >-void SVGElement::attributeChanged(const QualifiedName& name, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason) >+void SVGElement::attributeChanged(const QualifiedName& name, const AtomString& oldValue, const AtomString& newValue, AttributeModificationReason) > { > StyledElement::attributeChanged(name, oldValue, newValue); > >@@ -675,7 +675,7 @@ const RenderStyle* SVGElement::computedStyle(PseudoId pseudoElementSpecifier) > return m_svgRareData->overrideComputedStyle(*this, parentStyle); > } > >-QualifiedName SVGElement::animatableAttributeForName(const AtomicString& localName) >+QualifiedName SVGElement::animatableAttributeForName(const AtomString& localName) > { > static const auto animatableAttributes = makeNeverDestroyed([] { > static const QualifiedName* const names[] = { >@@ -773,7 +773,7 @@ QualifiedName SVGElement::animatableAttributeForName(const AtomicString& localNa > &SVGNames::zAttr.get(), > &SVGNames::hrefAttr.get(), > }; >- HashMap<AtomicString, QualifiedName> map; >+ HashMap<AtomString, QualifiedName> map; > for (auto& name : names) { > auto addResult = map.add(name->localName(), *name); > ASSERT_UNUSED(addResult, addResult.isNewEntry); >@@ -839,7 +839,7 @@ bool SVGElement::isPresentationAttribute(const QualifiedName& name) const > return StyledElement::isPresentationAttribute(name); > } > >-void SVGElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void SVGElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > CSSPropertyID propertyID = cssPropertyIdForSVGAttributeName(name); > if (propertyID > 0) >diff --git a/Source/WebCore/svg/SVGElement.h b/Source/WebCore/svg/SVGElement.h >index b4a701d1ed82a944906fec755897b625f8bf7170..dd455d6e3e8b6d6d372087d6854681ac32700c96 100644 >--- a/Source/WebCore/svg/SVGElement.h >+++ b/Source/WebCore/svg/SVGElement.h >@@ -45,7 +45,7 @@ class SVGPropertyAnimatorFactory; > class SVGSVGElement; > class SVGUseElement; > >-void mapAttributeToCSSProperty(HashMap<AtomicStringImpl*, CSSPropertyID>* propertyNameToIdMap, const QualifiedName& attrName); >+void mapAttributeToCSSProperty(HashMap<AtomStringImpl*, CSSPropertyID>* propertyNameToIdMap, const QualifiedName& attrName); > > class SVGElement : public StyledElement, public SVGLangSpace, public SVGPropertyOwner { > WTF_MAKE_ISO_ALLOCATED(SVGElement); >@@ -103,7 +103,7 @@ public: > > Optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override; > >- static QualifiedName animatableAttributeForName(const AtomicString&); >+ static QualifiedName animatableAttributeForName(const AtomString&); > #ifndef NDEBUG > bool isAnimatableAttribute(const QualifiedName&) const; > #endif >@@ -114,8 +114,8 @@ public: > > virtual bool haveLoadedRequiredResources(); > >- bool addEventListener(const AtomicString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) override; >- bool removeEventListener(const AtomicString& eventType, EventListener&, const ListenerOptions&) override; >+ bool addEventListener(const AtomString& eventType, Ref<EventListener>&&, const AddEventListenerOptions&) override; >+ bool removeEventListener(const AtomString& eventType, EventListener&, const ListenerOptions&) override; > bool hasFocusEventListeners() const; > > bool hasTagName(const SVGQualifiedName& name) const { return hasLocalName(name.localName()); } >@@ -158,19 +158,19 @@ protected: > bool supportsFocus() const override { return false; } > > bool rendererIsNeeded(const RenderStyle&) override; >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > > void finishParsingChildren() override; >- void attributeChanged(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue, AttributeModificationReason = ModifiedDirectly) override; >+ void attributeChanged(const QualifiedName&, const AtomString& oldValue, const AtomString& newValue, AttributeModificationReason = ModifiedDirectly) override; > bool childShouldCreateRenderer(const Node&) const override; > > SVGElementRareData& ensureSVGRareData(); > >- void reportAttributeParsingError(SVGParsingError, const QualifiedName&, const AtomicString&); >+ void reportAttributeParsingError(SVGParsingError, const QualifiedName&, const AtomString&); > static CSSPropertyID cssPropertyIdForSVGAttributeName(const QualifiedName&); > > bool isPresentationAttribute(const QualifiedName&) const override; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) override; > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) override; > void removedFromAncestor(RemovalType, ContainerNode&) override; > void childrenChanged(const ChildChange&) override; >diff --git a/Source/WebCore/svg/SVGEllipseElement.cpp b/Source/WebCore/svg/SVGEllipseElement.cpp >index 23e4adaa408380111e9ac19b9dbf76df94ccdcb9..8332eb5dbfc28f8627824bf889f8f346066d341c 100644 >--- a/Source/WebCore/svg/SVGEllipseElement.cpp >+++ b/Source/WebCore/svg/SVGEllipseElement.cpp >@@ -50,7 +50,7 @@ Ref<SVGEllipseElement> SVGEllipseElement::create(const QualifiedName& tagName, D > return adoptRef(*new SVGEllipseElement(tagName, document)); > } > >-void SVGEllipseElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGEllipseElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGParsingError parseError = NoError; > >diff --git a/Source/WebCore/svg/SVGEllipseElement.h b/Source/WebCore/svg/SVGEllipseElement.h >index 0fdca3767c4bb23fc62246777dc83a89117e9886..303558e02e53ffa2881f135f0ae8159e715c3c0b 100644 >--- a/Source/WebCore/svg/SVGEllipseElement.h >+++ b/Source/WebCore/svg/SVGEllipseElement.h >@@ -48,7 +48,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGEllipseElement, SVGGeometryElement, SVGExternalResourcesRequired>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > > bool isValid() const final { return SVGTests::isValid(); } >diff --git a/Source/WebCore/svg/SVGExternalResourcesRequired.cpp b/Source/WebCore/svg/SVGExternalResourcesRequired.cpp >index 8095f2b97cd87cb399bbddfa949694e31b38d980..1f23d90ee1eec386abbe5163d1e9d0da3599b37e 100644 >--- a/Source/WebCore/svg/SVGExternalResourcesRequired.cpp >+++ b/Source/WebCore/svg/SVGExternalResourcesRequired.cpp >@@ -39,7 +39,7 @@ SVGExternalResourcesRequired::SVGExternalResourcesRequired(SVGElement* contextEl > }); > } > >-void SVGExternalResourcesRequired::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGExternalResourcesRequired::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::externalResourcesRequiredAttr) > m_externalResourcesRequired->setBaseValInternal(value == "true"); >diff --git a/Source/WebCore/svg/SVGExternalResourcesRequired.h b/Source/WebCore/svg/SVGExternalResourcesRequired.h >index 9919af6d1fa07c5dc559bc708810faf444eaea30..f8fadc0492bd4dcc7944daf4ea0abf0d88dce4ae 100644 >--- a/Source/WebCore/svg/SVGExternalResourcesRequired.h >+++ b/Source/WebCore/svg/SVGExternalResourcesRequired.h >@@ -39,7 +39,7 @@ class SVGExternalResourcesRequired { > public: > virtual ~SVGExternalResourcesRequired() = default; > >- void parseAttribute(const QualifiedName&, const AtomicString&); >+ void parseAttribute(const QualifiedName&, const AtomString&); > void svgAttributeChanged(const QualifiedName&); > > static void addSupportedAttributes(HashSet<QualifiedName>&); >diff --git a/Source/WebCore/svg/SVGFEBlendElement.cpp b/Source/WebCore/svg/SVGFEBlendElement.cpp >index 3308dc7511ed45ea5a74cf7e6c2dd15e5e3f1efc..7bcf041800f799f1174cfe04b822d6d06431f686 100644 >--- a/Source/WebCore/svg/SVGFEBlendElement.cpp >+++ b/Source/WebCore/svg/SVGFEBlendElement.cpp >@@ -51,7 +51,7 @@ Ref<SVGFEBlendElement> SVGFEBlendElement::create(const QualifiedName& tagName, D > return adoptRef(*new SVGFEBlendElement(tagName, document)); > } > >-void SVGFEBlendElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFEBlendElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::modeAttr) { > BlendMode mode = BlendMode::Normal; >diff --git a/Source/WebCore/svg/SVGFEBlendElement.h b/Source/WebCore/svg/SVGFEBlendElement.h >index a9c98e427664b2e13c167078f1f0dc7cd50230ba..9037cb121f9367b788d9216e0b941fc8b06dec66 100644 >--- a/Source/WebCore/svg/SVGFEBlendElement.h >+++ b/Source/WebCore/svg/SVGFEBlendElement.h >@@ -66,7 +66,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFEBlendElement, SVGFilterPrimitiveStandardAttributes>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > RefPtr<FilterEffect> build(SVGFilterBuilder*, Filter&) const override; >diff --git a/Source/WebCore/svg/SVGFEColorMatrixElement.cpp b/Source/WebCore/svg/SVGFEColorMatrixElement.cpp >index 6597672b30741797e8873adfc7ab80a63ae6c3ff..e0c597df92a5b30f7a7f9a4935643fc5340aecdb 100644 >--- a/Source/WebCore/svg/SVGFEColorMatrixElement.cpp >+++ b/Source/WebCore/svg/SVGFEColorMatrixElement.cpp >@@ -49,7 +49,7 @@ Ref<SVGFEColorMatrixElement> SVGFEColorMatrixElement::create(const QualifiedName > return adoptRef(*new SVGFEColorMatrixElement(tagName, document)); > } > >-void SVGFEColorMatrixElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFEColorMatrixElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::typeAttr) { > auto propertyValue = SVGPropertyTraits<ColorMatrixType>::fromString(value); >diff --git a/Source/WebCore/svg/SVGFEColorMatrixElement.h b/Source/WebCore/svg/SVGFEColorMatrixElement.h >index 3ef24c94224868da77d0e80bcdf0c7465393f23e..7ab4aa4181e7ab198b12e77be206b9c5c41023fd 100644 >--- a/Source/WebCore/svg/SVGFEColorMatrixElement.h >+++ b/Source/WebCore/svg/SVGFEColorMatrixElement.h >@@ -82,7 +82,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFEColorMatrixElement, SVGFilterPrimitiveStandardAttributes>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > bool setFilterEffectAttribute(FilterEffect*, const QualifiedName&) override; >diff --git a/Source/WebCore/svg/SVGFEComponentTransferElement.cpp b/Source/WebCore/svg/SVGFEComponentTransferElement.cpp >index ec515e114a2acf2a76054ee0a57a3d13b3bd4fa3..491a1b45e7a76f8aa946332573a69d2ad0ad21a9 100644 >--- a/Source/WebCore/svg/SVGFEComponentTransferElement.cpp >+++ b/Source/WebCore/svg/SVGFEComponentTransferElement.cpp >@@ -52,7 +52,7 @@ Ref<SVGFEComponentTransferElement> SVGFEComponentTransferElement::create(const Q > return adoptRef(*new SVGFEComponentTransferElement(tagName, document)); > } > >-void SVGFEComponentTransferElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFEComponentTransferElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::inAttr) { > m_in1->setBaseValInternal(value); >diff --git a/Source/WebCore/svg/SVGFEComponentTransferElement.h b/Source/WebCore/svg/SVGFEComponentTransferElement.h >index 526216e56016fab5224aabe9132064cdb03ad0bb..bb589347d8826dfb3609edac6e8b993a4dd54863 100644 >--- a/Source/WebCore/svg/SVGFEComponentTransferElement.h >+++ b/Source/WebCore/svg/SVGFEComponentTransferElement.h >@@ -41,7 +41,7 @@ private: > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > > // FIXME: svgAttributeChanged missing. >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > > RefPtr<FilterEffect> build(SVGFilterBuilder*, Filter&) const override; > >diff --git a/Source/WebCore/svg/SVGFECompositeElement.cpp b/Source/WebCore/svg/SVGFECompositeElement.cpp >index 90880ab1ddc552a7785a466fd917b25f635b8ade..3ca99b875708bbd8a6baf653dc06fe205ac98235 100644 >--- a/Source/WebCore/svg/SVGFECompositeElement.cpp >+++ b/Source/WebCore/svg/SVGFECompositeElement.cpp >@@ -53,7 +53,7 @@ Ref<SVGFECompositeElement> SVGFECompositeElement::create(const QualifiedName& ta > return adoptRef(*new SVGFECompositeElement(tagName, document)); > } > >-void SVGFECompositeElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFECompositeElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::operatorAttr) { > CompositeOperationType propertyValue = SVGPropertyTraits<CompositeOperationType>::fromString(value); >diff --git a/Source/WebCore/svg/SVGFECompositeElement.h b/Source/WebCore/svg/SVGFECompositeElement.h >index a33c982b3495e3abfd4f18756aa110299fc9c2c5..81a78c8657a0fa3044df5b7c5a080d6e779722f6 100644 >--- a/Source/WebCore/svg/SVGFECompositeElement.h >+++ b/Source/WebCore/svg/SVGFECompositeElement.h >@@ -105,7 +105,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFECompositeElement, SVGFilterPrimitiveStandardAttributes>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > bool setFilterEffectAttribute(FilterEffect*, const QualifiedName&) override; >diff --git a/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp b/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp >index eb914fa3450cde59cd947d18f7b1d2f22a1c9de0..43d8d6d87c2fc4fe779e14c13ca8d586e45b1c6b 100644 >--- a/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp >+++ b/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp >@@ -59,7 +59,7 @@ Ref<SVGFEConvolveMatrixElement> SVGFEConvolveMatrixElement::create(const Qualifi > return adoptRef(*new SVGFEConvolveMatrixElement(tagName, document)); > } > >-void SVGFEConvolveMatrixElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFEConvolveMatrixElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::inAttr) { > m_in1->setBaseValInternal(value); >diff --git a/Source/WebCore/svg/SVGFEConvolveMatrixElement.h b/Source/WebCore/svg/SVGFEConvolveMatrixElement.h >index cea1123faa918d5f1f15d2d433ec011f70211002..85c002698c6277e04370d35982a95b8d9049b339 100644 >--- a/Source/WebCore/svg/SVGFEConvolveMatrixElement.h >+++ b/Source/WebCore/svg/SVGFEConvolveMatrixElement.h >@@ -99,7 +99,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFEConvolveMatrixElement, SVGFilterPrimitiveStandardAttributes>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > bool setFilterEffectAttribute(FilterEffect*, const QualifiedName&) override; >diff --git a/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp b/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp >index e3df5b8d65ac68143b9cfde681d0c5a944663e9d..dd0aee6828574ac0a2c7cbb8cc7e07654be1e67e 100644 >--- a/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp >+++ b/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp >@@ -53,7 +53,7 @@ Ref<SVGFEDiffuseLightingElement> SVGFEDiffuseLightingElement::create(const Quali > return adoptRef(*new SVGFEDiffuseLightingElement(tagName, document)); > } > >-void SVGFEDiffuseLightingElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFEDiffuseLightingElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::inAttr) { > m_in1->setBaseValInternal(value); >diff --git a/Source/WebCore/svg/SVGFEDiffuseLightingElement.h b/Source/WebCore/svg/SVGFEDiffuseLightingElement.h >index 8d795990cf23e0c414920e2f17b1cce784c7f135..68999609f4b6b56a76c88ea5695f1e0e9e205580 100644 >--- a/Source/WebCore/svg/SVGFEDiffuseLightingElement.h >+++ b/Source/WebCore/svg/SVGFEDiffuseLightingElement.h >@@ -54,7 +54,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFEDiffuseLightingElement, SVGFilterPrimitiveStandardAttributes>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > bool setFilterEffectAttribute(FilterEffect*, const QualifiedName&) override; >diff --git a/Source/WebCore/svg/SVGFEDisplacementMapElement.cpp b/Source/WebCore/svg/SVGFEDisplacementMapElement.cpp >index 84bea0b6274a8984e3524845ed372fa114bb4475..0c5e825bc82560f36a269ea6d722dfd05173d8c2 100644 >--- a/Source/WebCore/svg/SVGFEDisplacementMapElement.cpp >+++ b/Source/WebCore/svg/SVGFEDisplacementMapElement.cpp >@@ -50,7 +50,7 @@ Ref<SVGFEDisplacementMapElement> SVGFEDisplacementMapElement::create(const Quali > return adoptRef(*new SVGFEDisplacementMapElement(tagName, document)); > } > >-void SVGFEDisplacementMapElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFEDisplacementMapElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::xChannelSelectorAttr) { > auto propertyValue = SVGPropertyTraits<ChannelSelectorType>::fromString(value); >diff --git a/Source/WebCore/svg/SVGFEDisplacementMapElement.h b/Source/WebCore/svg/SVGFEDisplacementMapElement.h >index 422f0cf7ea9505427b07bf0aefffb3b8444197fa..aa91df38b36298f121a1411c4d0ae5ecd58665d3 100644 >--- a/Source/WebCore/svg/SVGFEDisplacementMapElement.h >+++ b/Source/WebCore/svg/SVGFEDisplacementMapElement.h >@@ -87,7 +87,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFEDisplacementMapElement, SVGFilterPrimitiveStandardAttributes>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > bool setFilterEffectAttribute(FilterEffect*, const QualifiedName& attrName) override; >diff --git a/Source/WebCore/svg/SVGFEDropShadowElement.cpp b/Source/WebCore/svg/SVGFEDropShadowElement.cpp >index f61dc8a939508bc2c2ffd779a7463204a67b13cf..662703e59ccf2d4885dfb5dd88cded3fe412fd84 100644 >--- a/Source/WebCore/svg/SVGFEDropShadowElement.cpp >+++ b/Source/WebCore/svg/SVGFEDropShadowElement.cpp >@@ -58,7 +58,7 @@ void SVGFEDropShadowElement::setStdDeviation(float x, float y) > invalidate(); > } > >-void SVGFEDropShadowElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFEDropShadowElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::stdDeviationAttr) { > float x, y; >diff --git a/Source/WebCore/svg/SVGFEDropShadowElement.h b/Source/WebCore/svg/SVGFEDropShadowElement.h >index 061cca2bed96c1aab0534d7a0913c314ce1be5f4..9b62d24b454bb7d2758e712b621b8cbe42f7451d 100644 >--- a/Source/WebCore/svg/SVGFEDropShadowElement.h >+++ b/Source/WebCore/svg/SVGFEDropShadowElement.h >@@ -50,7 +50,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFEDropShadowElement, SVGFilterPrimitiveStandardAttributes>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > RefPtr<FilterEffect> build(SVGFilterBuilder*, Filter&) const override; >diff --git a/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp b/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp >index 95b6683ca11baee7cc2719dbcd31df7aba5e4519..5ef6c376f5f507b9fc9d7e622754b61dce5999a2 100644 >--- a/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp >+++ b/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp >@@ -57,7 +57,7 @@ void SVGFEGaussianBlurElement::setStdDeviation(float x, float y) > invalidate(); > } > >-void SVGFEGaussianBlurElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFEGaussianBlurElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::stdDeviationAttr) { > float x, y; >diff --git a/Source/WebCore/svg/SVGFEGaussianBlurElement.h b/Source/WebCore/svg/SVGFEGaussianBlurElement.h >index b2d5e83cecd6da463b4a8c059f4f30ec2a4b5365..d89e1a748fb2c509e214fe94ae41001ce48ee0b2 100644 >--- a/Source/WebCore/svg/SVGFEGaussianBlurElement.h >+++ b/Source/WebCore/svg/SVGFEGaussianBlurElement.h >@@ -50,7 +50,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFEGaussianBlurElement, SVGFilterPrimitiveStandardAttributes>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > RefPtr<FilterEffect> build(SVGFilterBuilder*, Filter&) const override; >diff --git a/Source/WebCore/svg/SVGFEImageElement.cpp b/Source/WebCore/svg/SVGFEImageElement.cpp >index bf3f38f444ece010d87a48ad07cefc8ae3d224d9..f43217017230b1d14c7aa1bb2e66437a3dfa0b1d 100644 >--- a/Source/WebCore/svg/SVGFEImageElement.cpp >+++ b/Source/WebCore/svg/SVGFEImageElement.cpp >@@ -115,7 +115,7 @@ void SVGFEImageElement::buildPendingResource() > invalidate(); > } > >-void SVGFEImageElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFEImageElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::preserveAspectRatioAttr) { > SVGPreserveAspectRatioValue preserveAspectRatio; >diff --git a/Source/WebCore/svg/SVGFEImageElement.h b/Source/WebCore/svg/SVGFEImageElement.h >index 7624990b358ab527b4d19e57f9dcdcebf9f5310e..0b868b3cc5a856eea9ddb4c9618576fe77fe2410 100644 >--- a/Source/WebCore/svg/SVGFEImageElement.h >+++ b/Source/WebCore/svg/SVGFEImageElement.h >@@ -48,7 +48,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFEImageElement, SVGFilterPrimitiveStandardAttributes, SVGExternalResourcesRequired, SVGURIReference>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > void notifyFinished(CachedResource&) final; >diff --git a/Source/WebCore/svg/SVGFELightElement.cpp b/Source/WebCore/svg/SVGFELightElement.cpp >index 2e6b0ec26a80911cc415fa38fd6fd6e48cee2538..100289407e9371dd201cfd13a9b6f39ca1d50644 100644 >--- a/Source/WebCore/svg/SVGFELightElement.cpp >+++ b/Source/WebCore/svg/SVGFELightElement.cpp >@@ -67,7 +67,7 @@ SVGFELightElement* SVGFELightElement::findLightElement(const SVGElement* svgElem > return nullptr; > } > >-void SVGFELightElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFELightElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::azimuthAttr) { > m_azimuth->setBaseValInternal(value.toFloat()); >diff --git a/Source/WebCore/svg/SVGFELightElement.h b/Source/WebCore/svg/SVGFELightElement.h >index 2534d1d7ac9d54e8d06445e7a7e2f85abd0b4c5e..cd0bfb9edcfd7b4e1af39b55edbbbd784aaea89d 100644 >--- a/Source/WebCore/svg/SVGFELightElement.h >+++ b/Source/WebCore/svg/SVGFELightElement.h >@@ -66,7 +66,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFELightElement, SVGElement>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > void childrenChanged(const ChildChange&) override; > >diff --git a/Source/WebCore/svg/SVGFEMergeNodeElement.cpp b/Source/WebCore/svg/SVGFEMergeNodeElement.cpp >index e82bbfc55f675d709b4683f2654e841cbca4affe..4be907826dba06193684e0a4daf5ba2b5fa94afa 100644 >--- a/Source/WebCore/svg/SVGFEMergeNodeElement.cpp >+++ b/Source/WebCore/svg/SVGFEMergeNodeElement.cpp >@@ -48,7 +48,7 @@ Ref<SVGFEMergeNodeElement> SVGFEMergeNodeElement::create(const QualifiedName& ta > return adoptRef(*new SVGFEMergeNodeElement(tagName, document)); > } > >-void SVGFEMergeNodeElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFEMergeNodeElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::inAttr) { > m_in1->setBaseValInternal(value); >diff --git a/Source/WebCore/svg/SVGFEMergeNodeElement.h b/Source/WebCore/svg/SVGFEMergeNodeElement.h >index 8da92361408a23b88f1a6af04b7a532b2a9cb070..a9d2c074c50f9997b886579a6caef82694db1842 100644 >--- a/Source/WebCore/svg/SVGFEMergeNodeElement.h >+++ b/Source/WebCore/svg/SVGFEMergeNodeElement.h >@@ -39,7 +39,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFEMergeNodeElement, SVGElement>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > > bool rendererIsNeeded(const RenderStyle&) final { return false; } >diff --git a/Source/WebCore/svg/SVGFEMorphologyElement.cpp b/Source/WebCore/svg/SVGFEMorphologyElement.cpp >index 176305cadf3e3a4dfdb3925fb9f64a0bfee94a11..05d8a52bd493fc8a6b880d3a31c0ce748902546e 100644 >--- a/Source/WebCore/svg/SVGFEMorphologyElement.cpp >+++ b/Source/WebCore/svg/SVGFEMorphologyElement.cpp >@@ -56,7 +56,7 @@ void SVGFEMorphologyElement::setRadius(float x, float y) > invalidate(); > } > >-void SVGFEMorphologyElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFEMorphologyElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::operatorAttr) { > MorphologyOperatorType propertyValue = SVGPropertyTraits<MorphologyOperatorType>::fromString(value); >diff --git a/Source/WebCore/svg/SVGFEMorphologyElement.h b/Source/WebCore/svg/SVGFEMorphologyElement.h >index 99933555361a20541577b11245b48239b6d33b2d..1a9088b75cf8d85ae38f293e11198a66f66aa669 100644 >--- a/Source/WebCore/svg/SVGFEMorphologyElement.h >+++ b/Source/WebCore/svg/SVGFEMorphologyElement.h >@@ -77,7 +77,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFEMorphologyElement, SVGFilterPrimitiveStandardAttributes>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > bool setFilterEffectAttribute(FilterEffect*, const QualifiedName&) override; >diff --git a/Source/WebCore/svg/SVGFEOffsetElement.cpp b/Source/WebCore/svg/SVGFEOffsetElement.cpp >index db10de86314f381e748161054bb03384cb2142f4..485c0609d95705206ce3bf0a8de36e83a9b6c0f7 100644 >--- a/Source/WebCore/svg/SVGFEOffsetElement.cpp >+++ b/Source/WebCore/svg/SVGFEOffsetElement.cpp >@@ -50,7 +50,7 @@ Ref<SVGFEOffsetElement> SVGFEOffsetElement::create(const QualifiedName& tagName, > return adoptRef(*new SVGFEOffsetElement(tagName, document)); > } > >-void SVGFEOffsetElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFEOffsetElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::dxAttr) { > m_dx->setBaseValInternal(value.toFloat()); >diff --git a/Source/WebCore/svg/SVGFEOffsetElement.h b/Source/WebCore/svg/SVGFEOffsetElement.h >index 3d8d77dbef7839109e3b0bc70af01a9f0e62ba54..57473dcc72db67b125ea2ed465e35b5737049bee 100644 >--- a/Source/WebCore/svg/SVGFEOffsetElement.h >+++ b/Source/WebCore/svg/SVGFEOffsetElement.h >@@ -44,7 +44,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFEOffsetElement, SVGFilterPrimitiveStandardAttributes>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > RefPtr<FilterEffect> build(SVGFilterBuilder*, Filter&) const override; >diff --git a/Source/WebCore/svg/SVGFESpecularLightingElement.cpp b/Source/WebCore/svg/SVGFESpecularLightingElement.cpp >index 767381e381a7688e68abab2d057d3893afa08c39..1e93823d9eb8eb2f63ead573636366cf1a36ef65 100644 >--- a/Source/WebCore/svg/SVGFESpecularLightingElement.cpp >+++ b/Source/WebCore/svg/SVGFESpecularLightingElement.cpp >@@ -55,7 +55,7 @@ Ref<SVGFESpecularLightingElement> SVGFESpecularLightingElement::create(const Qua > return adoptRef(*new SVGFESpecularLightingElement(tagName, document)); > } > >-void SVGFESpecularLightingElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFESpecularLightingElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::inAttr) { > m_in1->setBaseValInternal(value); >diff --git a/Source/WebCore/svg/SVGFESpecularLightingElement.h b/Source/WebCore/svg/SVGFESpecularLightingElement.h >index ce23cb5ae22c3f751e115c7082aba158b5a3cc09..897b8de156d1c79a1d3fd8b3118e2ab63b47b146 100644 >--- a/Source/WebCore/svg/SVGFESpecularLightingElement.h >+++ b/Source/WebCore/svg/SVGFESpecularLightingElement.h >@@ -54,7 +54,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFESpecularLightingElement, SVGFilterPrimitiveStandardAttributes>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > bool setFilterEffectAttribute(FilterEffect*, const QualifiedName&) override; >diff --git a/Source/WebCore/svg/SVGFETileElement.cpp b/Source/WebCore/svg/SVGFETileElement.cpp >index 9887e4a38081ad617d40fd7b6d0f7739e73d59c6..5c59d78ed06d602cdaad43440f505b72682c9474 100644 >--- a/Source/WebCore/svg/SVGFETileElement.cpp >+++ b/Source/WebCore/svg/SVGFETileElement.cpp >@@ -49,7 +49,7 @@ Ref<SVGFETileElement> SVGFETileElement::create(const QualifiedName& tagName, Doc > return adoptRef(*new SVGFETileElement(tagName, document)); > } > >-void SVGFETileElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFETileElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::inAttr) { > m_in1->setBaseValInternal(value); >diff --git a/Source/WebCore/svg/SVGFETileElement.h b/Source/WebCore/svg/SVGFETileElement.h >index adcc7a8d304cb332d9bae7ba582849c261f4b4d8..45b3271851d7fc0dc2d3bcc879a22dc42a33a91f 100644 >--- a/Source/WebCore/svg/SVGFETileElement.h >+++ b/Source/WebCore/svg/SVGFETileElement.h >@@ -39,7 +39,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFETileElement, SVGFilterPrimitiveStandardAttributes>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > RefPtr<FilterEffect> build(SVGFilterBuilder*, Filter&) const override; >diff --git a/Source/WebCore/svg/SVGFETurbulenceElement.cpp b/Source/WebCore/svg/SVGFETurbulenceElement.cpp >index 3e35d220e48a1ac5757f937bd33d06ad4d0d1eb6..f2628bbd0d37bebf4b458beb170f7fee9794608c 100644 >--- a/Source/WebCore/svg/SVGFETurbulenceElement.cpp >+++ b/Source/WebCore/svg/SVGFETurbulenceElement.cpp >@@ -50,7 +50,7 @@ Ref<SVGFETurbulenceElement> SVGFETurbulenceElement::create(const QualifiedName& > return adoptRef(*new SVGFETurbulenceElement(tagName, document)); > } > >-void SVGFETurbulenceElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFETurbulenceElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::typeAttr) { > TurbulenceType propertyValue = SVGPropertyTraits<TurbulenceType>::fromString(value); >diff --git a/Source/WebCore/svg/SVGFETurbulenceElement.h b/Source/WebCore/svg/SVGFETurbulenceElement.h >index cca7f85783f4886ec981f6fa1db962b9cb416c2e..bf9da22ad42e410a10435e0a40e34267769e198a 100644 >--- a/Source/WebCore/svg/SVGFETurbulenceElement.h >+++ b/Source/WebCore/svg/SVGFETurbulenceElement.h >@@ -115,7 +115,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFETurbulenceElement, SVGFilterPrimitiveStandardAttributes>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > bool setFilterEffectAttribute(FilterEffect*, const QualifiedName& attrName) override; >diff --git a/Source/WebCore/svg/SVGFilterElement.cpp b/Source/WebCore/svg/SVGFilterElement.cpp >index 7655c07697570396d9e7b1e1a76dcd0ca7f8affc..24c6c52f4838f72ac3b8e6c794a8b5b7970271bc 100644 >--- a/Source/WebCore/svg/SVGFilterElement.cpp >+++ b/Source/WebCore/svg/SVGFilterElement.cpp >@@ -63,7 +63,7 @@ Ref<SVGFilterElement> SVGFilterElement::create(const QualifiedName& tagName, Doc > return adoptRef(*new SVGFilterElement(tagName, document)); > } > >-void SVGFilterElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFilterElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGParsingError parseError = NoError; > >diff --git a/Source/WebCore/svg/SVGFilterElement.h b/Source/WebCore/svg/SVGFilterElement.h >index e1f2f5bcec563df15c27f9fd4fe44bc88a34657c..1589a6c42bda877145d5e0737ec8fa1f4abceedf 100644 >--- a/Source/WebCore/svg/SVGFilterElement.h >+++ b/Source/WebCore/svg/SVGFilterElement.h >@@ -55,7 +55,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGFilterElement, SVGElement, SVGExternalResourcesRequired, SVGURIReference>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > void childrenChanged(const ChildChange&) final; > >diff --git a/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp b/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp >index 35cec9cb667703858849a2b91e5e982c232d6e86..364cb280f3279f20f526a61c8a323103cc47bec8 100644 >--- a/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp >+++ b/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp >@@ -46,7 +46,7 @@ SVGFilterPrimitiveStandardAttributes::SVGFilterPrimitiveStandardAttributes(const > }); > } > >-void SVGFilterPrimitiveStandardAttributes::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFilterPrimitiveStandardAttributes::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGParsingError parseError = NoError; > >diff --git a/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h b/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h >index eb25b53a94d8e5fdd89285b583b732313e232010..c2816da3635d06563b91c83508bd8138cb39ab94 100644 >--- a/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h >+++ b/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h >@@ -59,7 +59,7 @@ public: > protected: > SVGFilterPrimitiveStandardAttributes(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > void childrenChanged(const ChildChange&) override; > >diff --git a/Source/WebCore/svg/SVGFitToViewBox.cpp b/Source/WebCore/svg/SVGFitToViewBox.cpp >index d15e3546c1213e00dfa57c81b4a00b2efe30a973..1f47d368e9031f44a0be0fd24350c72d141f6549 100644 >--- a/Source/WebCore/svg/SVGFitToViewBox.cpp >+++ b/Source/WebCore/svg/SVGFitToViewBox.cpp >@@ -63,7 +63,7 @@ void SVGFitToViewBox::reset() > resetPreserveAspectRatio(); > } > >-bool SVGFitToViewBox::parseAttribute(const QualifiedName& name, const AtomicString& value) >+bool SVGFitToViewBox::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::viewBoxAttr) { > FloatRect viewBox; >@@ -84,7 +84,7 @@ bool SVGFitToViewBox::parseAttribute(const QualifiedName& name, const AtomicStri > return false; > } > >-bool SVGFitToViewBox::parseViewBox(const AtomicString& value, FloatRect& viewBox) >+bool SVGFitToViewBox::parseViewBox(const AtomString& value, FloatRect& viewBox) > { > auto upconvertedCharacters = StringView(value).upconvertedCharacters(); > const UChar* characters = upconvertedCharacters; >diff --git a/Source/WebCore/svg/SVGFitToViewBox.h b/Source/WebCore/svg/SVGFitToViewBox.h >index 7cc4231416019319d7e2b4d2d7d7636c379b8a4f..907d655cd1b1b9b372a20f8189236042e20f0fd0 100644 >--- a/Source/WebCore/svg/SVGFitToViewBox.h >+++ b/Source/WebCore/svg/SVGFitToViewBox.h >@@ -64,8 +64,8 @@ protected: > static bool isKnownAttribute(const QualifiedName& attributeName) { return PropertyRegistry::isKnownAttribute(attributeName); } > > void reset(); >- bool parseAttribute(const QualifiedName&, const AtomicString&); >- bool parseViewBox(const AtomicString& value, FloatRect& viewBox); >+ bool parseAttribute(const QualifiedName&, const AtomString&); >+ bool parseViewBox(const AtomString& value, FloatRect& viewBox); > bool parseViewBox(const UChar*& start, const UChar* end, FloatRect& viewBox, bool validate = true); > > private: >diff --git a/Source/WebCore/svg/SVGFontFaceElement.cpp b/Source/WebCore/svg/SVGFontFaceElement.cpp >index 33b6b78a851124c3d3b7cfe79b50958a35b0ec5c..ed51c07f5911dd9fe717a616fc489b9a9962a2cf 100644 >--- a/Source/WebCore/svg/SVGFontFaceElement.cpp >+++ b/Source/WebCore/svg/SVGFontFaceElement.cpp >@@ -71,7 +71,7 @@ Ref<SVGFontFaceElement> SVGFontFaceElement::create(const QualifiedName& tagName, > return adoptRef(*new SVGFontFaceElement(tagName, document)); > } > >-void SVGFontFaceElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFontFaceElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > CSSPropertyID propertyId = cssPropertyIdForSVGAttributeName(name); > if (propertyId > 0) { >@@ -98,7 +98,7 @@ void SVGFontFaceElement::parseAttribute(const QualifiedName& name, const AtomicS > > unsigned SVGFontFaceElement::unitsPerEm() const > { >- const AtomicString& valueString = attributeWithoutSynchronization(units_per_emAttr); >+ const AtomString& valueString = attributeWithoutSynchronization(units_per_emAttr); > if (valueString.isEmpty()) > return FontMetrics::defaultUnitsPerEm; > >@@ -160,7 +160,7 @@ float SVGFontFaceElement::verticalOriginX() const > // Spec: The default X-coordinate in the font coordinate system of the origin of a glyph to be used when > // drawing vertically oriented text. If the attribute is not specified, the effect is as if the attribute > // were set to half of the effective value of attribute horiz-adv-x. >- const AtomicString& value = m_fontElement->attributeWithoutSynchronization(vert_origin_xAttr); >+ const AtomString& value = m_fontElement->attributeWithoutSynchronization(vert_origin_xAttr); > if (value.isEmpty()) > return horizontalAdvanceX() / 2.0f; > >@@ -175,7 +175,7 @@ float SVGFontFaceElement::verticalOriginY() const > // Spec: The default Y-coordinate in the font coordinate system of the origin of a glyph to be used when > // drawing vertically oriented text. If the attribute is not specified, the effect is as if the attribute > // were set to the position specified by the font's ascent attribute. >- const AtomicString& value = m_fontElement->attributeWithoutSynchronization(vert_origin_yAttr); >+ const AtomString& value = m_fontElement->attributeWithoutSynchronization(vert_origin_yAttr); > if (value.isEmpty()) > return ascent(); > >@@ -189,7 +189,7 @@ float SVGFontFaceElement::verticalAdvanceY() const > > // Spec: The default vertical advance after rendering a glyph in vertical orientation. If the attribute is > // not specified, the effect is as if a value equivalent of one em were specified (see units-per-em). >- const AtomicString& value = m_fontElement->attributeWithoutSynchronization(vert_adv_yAttr); >+ const AtomString& value = m_fontElement->attributeWithoutSynchronization(vert_adv_yAttr); > if (value.isEmpty()) > return 1.0f; > >@@ -202,12 +202,12 @@ int SVGFontFaceElement::ascent() const > // unaccented height of the font within the font coordinate system. If the attribute is not specified, > // the effect is as if the attribute were set to the difference between the units-per-em value and the > // vert-origin-y value for the corresponding font. >- const AtomicString& ascentValue = attributeWithoutSynchronization(ascentAttr); >+ const AtomString& ascentValue = attributeWithoutSynchronization(ascentAttr); > if (!ascentValue.isEmpty()) > return static_cast<int>(ceilf(ascentValue.toFloat())); > > if (m_fontElement) { >- const AtomicString& vertOriginY = m_fontElement->attributeWithoutSynchronization(vert_origin_yAttr); >+ const AtomString& vertOriginY = m_fontElement->attributeWithoutSynchronization(vert_origin_yAttr); > if (!vertOriginY.isEmpty()) > return static_cast<int>(unitsPerEm()) - static_cast<int>(ceilf(vertOriginY.toFloat())); > } >@@ -221,7 +221,7 @@ int SVGFontFaceElement::descent() const > // Spec: Same syntax and semantics as the 'descent' descriptor within an @font-face rule. The maximum > // unaccented depth of the font within the font coordinate system. If the attribute is not specified, > // the effect is as if the attribute were set to the vert-origin-y value for the corresponding font. >- const AtomicString& descentValue = attributeWithoutSynchronization(descentAttr); >+ const AtomString& descentValue = attributeWithoutSynchronization(descentAttr); > if (!descentValue.isEmpty()) { > // 14 different W3C SVG 1.1 testcases use a negative descent value, > // where a positive was meant to be used Including: >@@ -231,7 +231,7 @@ int SVGFontFaceElement::descent() const > } > > if (m_fontElement) { >- const AtomicString& vertOriginY = m_fontElement->attributeWithoutSynchronization(vert_origin_yAttr); >+ const AtomString& vertOriginY = m_fontElement->attributeWithoutSynchronization(vert_origin_yAttr); > if (!vertOriginY.isEmpty()) > return static_cast<int>(ceilf(vertOriginY.toFloat())); > } >diff --git a/Source/WebCore/svg/SVGFontFaceElement.h b/Source/WebCore/svg/SVGFontFaceElement.h >index 8f8ba5892be280798ee41dc00bd1b3cb7d3098a9..9da05f0997e4610ebb3e19d1bf0baa79ace2fc18 100644 >--- a/Source/WebCore/svg/SVGFontFaceElement.h >+++ b/Source/WebCore/svg/SVGFontFaceElement.h >@@ -57,7 +57,7 @@ private: > SVGFontFaceElement(const QualifiedName&, Document&); > ~SVGFontFaceElement(); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > void childrenChanged(const ChildChange&) final; > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; >diff --git a/Source/WebCore/svg/SVGFontFaceUriElement.cpp b/Source/WebCore/svg/SVGFontFaceUriElement.cpp >index 4c2225d5963b0a5cb36597e73e162f3b8a6df4b8..75cbde8c33c2be9d019a7062cddf35909800d720 100644 >--- a/Source/WebCore/svg/SVGFontFaceUriElement.cpp >+++ b/Source/WebCore/svg/SVGFontFaceUriElement.cpp >@@ -59,12 +59,12 @@ SVGFontFaceUriElement::~SVGFontFaceUriElement() > Ref<CSSFontFaceSrcValue> SVGFontFaceUriElement::srcValue() const > { > auto src = CSSFontFaceSrcValue::create(getAttribute(SVGNames::hrefAttr, XLinkNames::hrefAttr), LoadedFromOpaqueSource::No); >- AtomicString value(attributeWithoutSynchronization(formatAttr)); >+ AtomString value(attributeWithoutSynchronization(formatAttr)); > src.get().setFormat(value.isEmpty() ? "svg" : value); // Default format > return src; > } > >-void SVGFontFaceUriElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGFontFaceUriElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::hrefAttr || name == XLinkNames::hrefAttr) > loadFont(); >@@ -101,7 +101,7 @@ void SVGFontFaceUriElement::loadFont() > if (m_cachedFont) > m_cachedFont->removeClient(*this); > >- const AtomicString& href = getAttribute(SVGNames::hrefAttr, XLinkNames::hrefAttr); >+ const AtomString& href = getAttribute(SVGNames::hrefAttr, XLinkNames::hrefAttr); > if (!href.isNull()) { > ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions(); > options.contentSecurityPolicyImposition = isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck; >diff --git a/Source/WebCore/svg/SVGFontFaceUriElement.h b/Source/WebCore/svg/SVGFontFaceUriElement.h >index c78a2bca97f4fa359df1a67f0ede0048199810b3..48fcf2f88778bd03d2b7e30bb52fe07043881675 100644 >--- a/Source/WebCore/svg/SVGFontFaceUriElement.h >+++ b/Source/WebCore/svg/SVGFontFaceUriElement.h >@@ -41,7 +41,7 @@ public: > private: > SVGFontFaceUriElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void childrenChanged(const ChildChange&) final; > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; > bool rendererIsNeeded(const RenderStyle&) final { return false; } >diff --git a/Source/WebCore/svg/SVGForeignObjectElement.cpp b/Source/WebCore/svg/SVGForeignObjectElement.cpp >index ba690ed6e2520aa8b726d8ba33da9fa04cbc241f..5acd5fcb31980de7b8e66b08d3c5d35b607b2829 100644 >--- a/Source/WebCore/svg/SVGForeignObjectElement.cpp >+++ b/Source/WebCore/svg/SVGForeignObjectElement.cpp >@@ -54,7 +54,7 @@ Ref<SVGForeignObjectElement> SVGForeignObjectElement::create(const QualifiedName > return adoptRef(*new SVGForeignObjectElement(tagName, document)); > } > >-void SVGForeignObjectElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGForeignObjectElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGParsingError parseError = NoError; > >diff --git a/Source/WebCore/svg/SVGForeignObjectElement.h b/Source/WebCore/svg/SVGForeignObjectElement.h >index fb57468a06fba108a512f9be5e26011b2879f6f7..02a194c417a7ab77304148277d3f9e649fb068a4 100644 >--- a/Source/WebCore/svg/SVGForeignObjectElement.h >+++ b/Source/WebCore/svg/SVGForeignObjectElement.h >@@ -47,7 +47,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGForeignObjectElement, SVGGraphicsElement, SVGExternalResourcesRequired>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > > bool rendererIsNeeded(const RenderStyle&) final; >diff --git a/Source/WebCore/svg/SVGGElement.cpp b/Source/WebCore/svg/SVGGElement.cpp >index 7df6ea6dcf21d123a0130775c90612af6e842665..7c050e0fc34b4f212c80b917ae83324e2d762363 100644 >--- a/Source/WebCore/svg/SVGGElement.cpp >+++ b/Source/WebCore/svg/SVGGElement.cpp >@@ -50,7 +50,7 @@ Ref<SVGGElement> SVGGElement::create(Document& document) > return create(SVGNames::gTag, document); > } > >-void SVGGElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGGElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGGraphicsElement::parseAttribute(name, value); > SVGExternalResourcesRequired::parseAttribute(name, value); >diff --git a/Source/WebCore/svg/SVGGElement.h b/Source/WebCore/svg/SVGGElement.h >index cb206ae34ad2cbbbf34801c12ae40197902b6f5f..668cee9975236f0916af90e4f72a422fffb92c6e 100644 >--- a/Source/WebCore/svg/SVGGElement.h >+++ b/Source/WebCore/svg/SVGGElement.h >@@ -40,7 +40,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGGElement, SVGGraphicsElement, SVGExternalResourcesRequired>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > > bool isValid() const final { return SVGTests::isValid(); } >diff --git a/Source/WebCore/svg/SVGGeometryElement.cpp b/Source/WebCore/svg/SVGGeometryElement.cpp >index bdd7a02754ace5418ad9e980d13381e69edfac56..b3d301c0f0f7909a5c9b81288b1705087a5906f8 100644 >--- a/Source/WebCore/svg/SVGGeometryElement.cpp >+++ b/Source/WebCore/svg/SVGGeometryElement.cpp >@@ -92,7 +92,7 @@ bool SVGGeometryElement::isPointInStroke(DOMPointInit&& pointInit) > return renderer->isPointInStroke(point); > } > >-void SVGGeometryElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGGeometryElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::pathLengthAttr) { > m_pathLength->setBaseValInternal(value.toFloat()); >diff --git a/Source/WebCore/svg/SVGGeometryElement.h b/Source/WebCore/svg/SVGGeometryElement.h >index d24e622d1e02a259d03bc8d6ff52d1f06cb86f56..555cb19943c185047cb35e40e397f61b0cd06b60 100644 >--- a/Source/WebCore/svg/SVGGeometryElement.h >+++ b/Source/WebCore/svg/SVGGeometryElement.h >@@ -48,7 +48,7 @@ public: > protected: > SVGGeometryElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > private: >diff --git a/Source/WebCore/svg/SVGGlyphRefElement.cpp b/Source/WebCore/svg/SVGGlyphRefElement.cpp >index 51097e4c337c26f488832bb1bb554517554c9c6c..1c4568ae74839549ec650b15fde3782e8c28f23a 100644 >--- a/Source/WebCore/svg/SVGGlyphRefElement.cpp >+++ b/Source/WebCore/svg/SVGGlyphRefElement.cpp >@@ -28,7 +28,7 @@ > #include "SVGParserUtilities.h" > #include "XLinkNames.h" > #include <wtf/IsoMallocInlines.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -56,7 +56,7 @@ bool SVGGlyphRefElement::hasValidGlyphElement(String& glyphName) const > return is<SVGGlyphElement>(target.element); > } > >-static float parseFloat(const AtomicString& value) >+static float parseFloat(const AtomString& value) > { > float result; > if (!parseNumberFromString(value, result)) >@@ -64,7 +64,7 @@ static float parseFloat(const AtomicString& value) > return result; > } > >-void SVGGlyphRefElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGGlyphRefElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > // FIXME: Is the error handling in parseFloat correct for these attributes? > if (name == SVGNames::xAttr) >@@ -83,22 +83,22 @@ void SVGGlyphRefElement::parseAttribute(const QualifiedName& name, const AtomicS > > void SVGGlyphRefElement::setX(float x) > { >- setAttribute(SVGNames::xAttr, AtomicString::number(x)); >+ setAttribute(SVGNames::xAttr, AtomString::number(x)); > } > > void SVGGlyphRefElement::setY(float y) > { >- setAttribute(SVGNames::yAttr, AtomicString::number(y)); >+ setAttribute(SVGNames::yAttr, AtomString::number(y)); > } > > void SVGGlyphRefElement::setDx(float dx) > { >- setAttribute(SVGNames::dxAttr, AtomicString::number(dx)); >+ setAttribute(SVGNames::dxAttr, AtomString::number(dx)); > } > > void SVGGlyphRefElement::setDy(float dy) > { >- setAttribute(SVGNames::dyAttr, AtomicString::number(dy)); >+ setAttribute(SVGNames::dyAttr, AtomString::number(dy)); > } > > } >diff --git a/Source/WebCore/svg/SVGGlyphRefElement.h b/Source/WebCore/svg/SVGGlyphRefElement.h >index be046ee73625aed90bcd7df56abe9e1d715d9869..b90eeb88f6c33dec5e86abd816811eaff8ea6160 100644 >--- a/Source/WebCore/svg/SVGGlyphRefElement.h >+++ b/Source/WebCore/svg/SVGGlyphRefElement.h >@@ -49,7 +49,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGGlyphRefElement, SVGElement, SVGURIReference>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > bool rendererIsNeeded(const RenderStyle&) final { return false; } > > float m_x { 0 }; >diff --git a/Source/WebCore/svg/SVGGradientElement.cpp b/Source/WebCore/svg/SVGGradientElement.cpp >index 80374dda16bf4e5e6b9627c2d2cd5c563635874f..bf3d886d188140df3d1f29ea188ca922fe27bc01 100644 >--- a/Source/WebCore/svg/SVGGradientElement.cpp >+++ b/Source/WebCore/svg/SVGGradientElement.cpp >@@ -51,7 +51,7 @@ SVGGradientElement::SVGGradientElement(const QualifiedName& tagName, Document& d > }); > } > >-void SVGGradientElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGGradientElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::gradientUnitsAttr) { > auto propertyValue = SVGPropertyTraits<SVGUnitTypes::SVGUnitType>::fromString(value); >diff --git a/Source/WebCore/svg/SVGGradientElement.h b/Source/WebCore/svg/SVGGradientElement.h >index 21b210c5951dcb1cec5c642ea89ec3622481f7af..6fcf45268fab6710e6512ceeb3d24920a5ea7323 100644 >--- a/Source/WebCore/svg/SVGGradientElement.h >+++ b/Source/WebCore/svg/SVGGradientElement.h >@@ -95,7 +95,7 @@ public: > protected: > SVGGradientElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > private: >diff --git a/Source/WebCore/svg/SVGGraphicsElement.cpp b/Source/WebCore/svg/SVGGraphicsElement.cpp >index f72e14b1402e52d794244b7b46bdc52e49a57e2c..a75890f3180468d1524bee854359d0356eb5222d 100644 >--- a/Source/WebCore/svg/SVGGraphicsElement.cpp >+++ b/Source/WebCore/svg/SVGGraphicsElement.cpp >@@ -123,7 +123,7 @@ AffineTransform* SVGGraphicsElement::supplementalTransform() > return m_supplementalTransform.get(); > } > >-void SVGGraphicsElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGGraphicsElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::transformAttr) { > m_transform->baseVal()->parse(value); >diff --git a/Source/WebCore/svg/SVGGraphicsElement.h b/Source/WebCore/svg/SVGGraphicsElement.h >index d516e59b385906b287982cb90fd8f760ffa7754a..a4755ad30fa37bb99c48baa019c3c054046b664e 100644 >--- a/Source/WebCore/svg/SVGGraphicsElement.h >+++ b/Source/WebCore/svg/SVGGraphicsElement.h >@@ -72,7 +72,7 @@ protected: > > bool supportsFocus() const override { return Element::supportsFocus() || hasFocusEventListeners(); } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > private: >diff --git a/Source/WebCore/svg/SVGImageElement.cpp b/Source/WebCore/svg/SVGImageElement.cpp >index caa65628c0ac079175596d13eb667ff6fbe3c730..9670e2644067cfdab347303519b14f0fc18f16b7 100644 >--- a/Source/WebCore/svg/SVGImageElement.cpp >+++ b/Source/WebCore/svg/SVGImageElement.cpp >@@ -67,7 +67,7 @@ bool SVGImageElement::hasSingleSecurityOrigin() const > return !image || image->hasSingleSecurityOrigin(); > } > >-void SVGImageElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGImageElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::preserveAspectRatioAttr) { > SVGPreserveAspectRatioValue preserveAspectRatio; >@@ -160,7 +160,7 @@ Node::InsertedIntoAncestorResult SVGImageElement::insertedIntoAncestor(Insertion > return InsertedIntoAncestorResult::Done; > } > >-const AtomicString& SVGImageElement::imageSourceURL() const >+const AtomString& SVGImageElement::imageSourceURL() const > { > return getAttribute(SVGNames::hrefAttr, XLinkNames::hrefAttr); > } >diff --git a/Source/WebCore/svg/SVGImageElement.h b/Source/WebCore/svg/SVGImageElement.h >index dcd7a0826ad49a2efd6d108bb11a289e963954d4..9fb5786875fb114c5232865e4e083aeb3fca8403 100644 >--- a/Source/WebCore/svg/SVGImageElement.h >+++ b/Source/WebCore/svg/SVGImageElement.h >@@ -34,7 +34,7 @@ public: > static Ref<SVGImageElement> create(const QualifiedName&, Document&); > > bool hasSingleSecurityOrigin() const; >- const AtomicString& imageSourceURL() const final; >+ const AtomString& imageSourceURL() const final; > > const SVGLengthValue& x() const { return m_x->currentValue(); } > const SVGLengthValue& y() const { return m_y->currentValue(); } >@@ -54,7 +54,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGImageElement, SVGGraphicsElement, SVGExternalResourcesRequired, SVGURIReference>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > > void didAttachRenderers() final; >diff --git a/Source/WebCore/svg/SVGImageLoader.cpp b/Source/WebCore/svg/SVGImageLoader.cpp >index 7221dfcb7ddde59039276addc9f39bda2d789045..42a35d45892a80f80bcbad157d6dfeefe0deba62 100644 >--- a/Source/WebCore/svg/SVGImageLoader.cpp >+++ b/Source/WebCore/svg/SVGImageLoader.cpp >@@ -46,7 +46,7 @@ void SVGImageLoader::dispatchLoadEvent() > } > } > >-String SVGImageLoader::sourceURI(const AtomicString& attribute) const >+String SVGImageLoader::sourceURI(const AtomString& attribute) const > { > URL base = element().baseURI(); > if (base != WTF::blankURL()) >diff --git a/Source/WebCore/svg/SVGImageLoader.h b/Source/WebCore/svg/SVGImageLoader.h >index 94fabf20e8366e9bed08806769454334f1fc6e5c..048ea2214555ef04dd10be5183b9ec813c2d2409 100644 >--- a/Source/WebCore/svg/SVGImageLoader.h >+++ b/Source/WebCore/svg/SVGImageLoader.h >@@ -32,7 +32,7 @@ public: > > private: > void dispatchLoadEvent() override; >- String sourceURI(const AtomicString&) const override; >+ String sourceURI(const AtomString&) const override; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/svg/SVGLangSpace.cpp b/Source/WebCore/svg/SVGLangSpace.cpp >index 926175a2345f541f401ac14c15980d599eb0bd04..c468cb547700c45c36e1cb3295bbc985347e5dda 100644 >--- a/Source/WebCore/svg/SVGLangSpace.cpp >+++ b/Source/WebCore/svg/SVGLangSpace.cpp >@@ -35,10 +35,10 @@ SVGLangSpace::SVGLangSpace(SVGElement* contextElement) > { > } > >-const AtomicString& SVGLangSpace::xmlspace() const >+const AtomString& SVGLangSpace::xmlspace() const > { > if (!m_space) { >- static NeverDestroyed<const AtomicString> defaultString("default", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> defaultString("default", AtomString::ConstructFromLiteral); > return defaultString; > } > return m_space; >@@ -49,7 +49,7 @@ bool SVGLangSpace::isKnownAttribute(const QualifiedName& attributeName) > return attributeName.matches(XMLNames::langAttr) || attributeName.matches(XMLNames::spaceAttr); > } > >-void SVGLangSpace::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGLangSpace::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name.matches(XMLNames::langAttr)) > setXmllang(value); >diff --git a/Source/WebCore/svg/SVGLangSpace.h b/Source/WebCore/svg/SVGLangSpace.h >index 4eff7fb344d5175815a3e1d3b2e20891da4f6c03..fcdee7e387d8f89cb1262806e4154eb22674688f 100644 >--- a/Source/WebCore/svg/SVGLangSpace.h >+++ b/Source/WebCore/svg/SVGLangSpace.h >@@ -30,13 +30,13 @@ class SVGElement; > > class SVGLangSpace { > public: >- const AtomicString& xmllang() const { return m_lang; } >- void setXmllang(const AtomicString& xmlLang) { m_lang = xmlLang; } >+ const AtomString& xmllang() const { return m_lang; } >+ void setXmllang(const AtomString& xmlLang) { m_lang = xmlLang; } > >- const AtomicString& xmlspace() const; >- void setXmlspace(const AtomicString& xmlSpace) { m_space = xmlSpace; } >+ const AtomString& xmlspace() const; >+ void setXmlspace(const AtomString& xmlSpace) { m_space = xmlSpace; } > >- void parseAttribute(const QualifiedName&, const AtomicString&); >+ void parseAttribute(const QualifiedName&, const AtomString&); > > void svgAttributeChanged(const QualifiedName&); > >@@ -47,8 +47,8 @@ protected: > > private: > SVGElement& m_contextElement; >- AtomicString m_lang; >- AtomicString m_space; >+ AtomString m_lang; >+ AtomString m_space; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/svg/SVGLineElement.cpp b/Source/WebCore/svg/SVGLineElement.cpp >index 897344cc9c953cbb823485e0a0cfc59bfa6c7891..65fe54fa80461a979df661dad1f911da6119e9fa 100644 >--- a/Source/WebCore/svg/SVGLineElement.cpp >+++ b/Source/WebCore/svg/SVGLineElement.cpp >@@ -50,7 +50,7 @@ Ref<SVGLineElement> SVGLineElement::create(const QualifiedName& tagName, Documen > return adoptRef(*new SVGLineElement(tagName, document)); > } > >-void SVGLineElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGLineElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGParsingError parseError = NoError; > >diff --git a/Source/WebCore/svg/SVGLineElement.h b/Source/WebCore/svg/SVGLineElement.h >index dd029a3d5bed8250248799c94ccc6c781d27a2cf..582777a7adf7c39b21b6b708e0edefa4d8bbc039 100644 >--- a/Source/WebCore/svg/SVGLineElement.h >+++ b/Source/WebCore/svg/SVGLineElement.h >@@ -48,7 +48,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGLineElement, SVGGeometryElement, SVGExternalResourcesRequired>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > > bool isValid() const final { return SVGTests::isValid(); } >diff --git a/Source/WebCore/svg/SVGLinearGradientElement.cpp b/Source/WebCore/svg/SVGLinearGradientElement.cpp >index 0c98082c46782ce35e79e42771534e87c822b7ee..7d7d7c2364f2e4cf5e824dbf00dc8d44a2837610 100644 >--- a/Source/WebCore/svg/SVGLinearGradientElement.cpp >+++ b/Source/WebCore/svg/SVGLinearGradientElement.cpp >@@ -59,7 +59,7 @@ Ref<SVGLinearGradientElement> SVGLinearGradientElement::create(const QualifiedNa > return adoptRef(*new SVGLinearGradientElement(tagName, document)); > } > >-void SVGLinearGradientElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGLinearGradientElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGParsingError parseError = NoError; > >diff --git a/Source/WebCore/svg/SVGLinearGradientElement.h b/Source/WebCore/svg/SVGLinearGradientElement.h >index 04a31dd47c0b219163838af5c5e09a9285c3a26f..b0e6eb50d4ea6880f6c91b0abc51d3651a49b222 100644 >--- a/Source/WebCore/svg/SVGLinearGradientElement.h >+++ b/Source/WebCore/svg/SVGLinearGradientElement.h >@@ -51,7 +51,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGLinearGradientElement, SVGGradientElement>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override; >diff --git a/Source/WebCore/svg/SVGMPathElement.cpp b/Source/WebCore/svg/SVGMPathElement.cpp >index 53765d993dc305e2ab5a765c4cd1dcca6216a5fb..d8039242c6520373d432f0d30da8b4b8cbededdf 100644 >--- a/Source/WebCore/svg/SVGMPathElement.cpp >+++ b/Source/WebCore/svg/SVGMPathElement.cpp >@@ -101,7 +101,7 @@ void SVGMPathElement::removedFromAncestor(RemovalType removalType, ContainerNode > clearResourceReferences(); > } > >-void SVGMPathElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGMPathElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGElement::parseAttribute(name, value); > SVGURIReference::parseAttribute(name, value); >diff --git a/Source/WebCore/svg/SVGMPathElement.h b/Source/WebCore/svg/SVGMPathElement.h >index d65903ceb83a9bcf6154b78ccaa4a6ba354b3fe6..67d1db3548325b169ff25622841131881745b3df 100644 >--- a/Source/WebCore/svg/SVGMPathElement.h >+++ b/Source/WebCore/svg/SVGMPathElement.h >@@ -46,7 +46,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGMPathElement, SVGElement, SVGExternalResourcesRequired, SVGURIReference>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > > void buildPendingResource() final; >diff --git a/Source/WebCore/svg/SVGMarkerElement.cpp b/Source/WebCore/svg/SVGMarkerElement.cpp >index b3c467206ef7d16e6d4c41ef57c2ea778e221e9a..f5346240f0161557b2b9e3f6494aa6f2e15dcd89 100644 >--- a/Source/WebCore/svg/SVGMarkerElement.cpp >+++ b/Source/WebCore/svg/SVGMarkerElement.cpp >@@ -60,7 +60,7 @@ AffineTransform SVGMarkerElement::viewBoxToViewTransform(float viewWidth, float > return SVGFitToViewBox::viewBoxToViewTransform(viewBox(), preserveAspectRatio(), viewWidth, viewHeight); > } > >-void SVGMarkerElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGMarkerElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::markerUnitsAttr) { > auto propertyValue = SVGPropertyTraits<SVGMarkerUnitsType>::fromString(value); >diff --git a/Source/WebCore/svg/SVGMarkerElement.h b/Source/WebCore/svg/SVGMarkerElement.h >index f034584403baba263f18bec1c1438c76e8681b50..1c86e75978efe6000a175a04a188f0a12afbf624 100644 >--- a/Source/WebCore/svg/SVGMarkerElement.h >+++ b/Source/WebCore/svg/SVGMarkerElement.h >@@ -74,7 +74,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGMarkerElement, SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > void childrenChanged(const ChildChange&) override; > >diff --git a/Source/WebCore/svg/SVGMaskElement.cpp b/Source/WebCore/svg/SVGMaskElement.cpp >index 56e0cd1b096ebb0ad9f195bd518b02b4f7f21fdf..8f2a802aee0fbf4874e44684e2a846abf0fc867c 100644 >--- a/Source/WebCore/svg/SVGMaskElement.cpp >+++ b/Source/WebCore/svg/SVGMaskElement.cpp >@@ -64,7 +64,7 @@ Ref<SVGMaskElement> SVGMaskElement::create(const QualifiedName& tagName, Documen > return adoptRef(*new SVGMaskElement(tagName, document)); > } > >-void SVGMaskElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGMaskElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::maskUnitsAttr) { > auto propertyValue = SVGPropertyTraits<SVGUnitTypes::SVGUnitType>::fromString(value); >diff --git a/Source/WebCore/svg/SVGMaskElement.h b/Source/WebCore/svg/SVGMaskElement.h >index c5e358dffba9de4d703f6c48207cdf1a36a4c0be..9564649bc83c3412c4064d0303d82d584b23796f 100644 >--- a/Source/WebCore/svg/SVGMaskElement.h >+++ b/Source/WebCore/svg/SVGMaskElement.h >@@ -53,7 +53,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGMaskElement, SVGElement, SVGExternalResourcesRequired, SVGTests>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > void childrenChanged(const ChildChange&) final; > >diff --git a/Source/WebCore/svg/SVGPathElement.cpp b/Source/WebCore/svg/SVGPathElement.cpp >index 07fc2a9a33f41875354ec9816776446913a253a8..6ba1440d75218dfe49daec4b5eda7841105e1aa8 100644 >--- a/Source/WebCore/svg/SVGPathElement.cpp >+++ b/Source/WebCore/svg/SVGPathElement.cpp >@@ -52,7 +52,7 @@ Ref<SVGPathElement> SVGPathElement::create(const QualifiedName& tagName, Documen > return adoptRef(*new SVGPathElement(tagName, document)); > } > >-void SVGPathElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGPathElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::dAttr) { > if (!m_pathSegList->baseVal()->parse(value)) >diff --git a/Source/WebCore/svg/SVGPathElement.h b/Source/WebCore/svg/SVGPathElement.h >index 6774d0698aa42fb53737de1d895070831358e7a7..3a59773a03d30e777eb33b50c39d109ff5b85ac8 100644 >--- a/Source/WebCore/svg/SVGPathElement.h >+++ b/Source/WebCore/svg/SVGPathElement.h >@@ -111,7 +111,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGPathElement, SVGGeometryElement, SVGExternalResourcesRequired>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > > bool isValid() const final { return SVGTests::isValid(); } >diff --git a/Source/WebCore/svg/SVGPatternElement.cpp b/Source/WebCore/svg/SVGPatternElement.cpp >index f9e820797e98230c4dd0eb91e6d7d5d162f4a8c4..cddc3a3e8b1383f060f491fde636bc91ef649e87 100644 >--- a/Source/WebCore/svg/SVGPatternElement.cpp >+++ b/Source/WebCore/svg/SVGPatternElement.cpp >@@ -71,7 +71,7 @@ Ref<SVGPatternElement> SVGPatternElement::create(const QualifiedName& tagName, D > return adoptRef(*new SVGPatternElement(tagName, document)); > } > >-void SVGPatternElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGPatternElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::patternUnitsAttr) { > auto propertyValue = SVGPropertyTraits<SVGUnitTypes::SVGUnitType>::fromString(value); >diff --git a/Source/WebCore/svg/SVGPatternElement.h b/Source/WebCore/svg/SVGPatternElement.h >index 36cdefb0b7634db27ddded816608c9c176c1be0f..d1ad59c8de4beb98a003e9b1afdf4631a8a1adfc 100644 >--- a/Source/WebCore/svg/SVGPatternElement.h >+++ b/Source/WebCore/svg/SVGPatternElement.h >@@ -64,7 +64,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGPatternElement, SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox, SVGTests, SVGURIReference>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > void childrenChanged(const ChildChange&) final; > >diff --git a/Source/WebCore/svg/SVGPolyElement.cpp b/Source/WebCore/svg/SVGPolyElement.cpp >index c2fe2eaa897d78b69b095c6dcf350c29f0fcbbb6..62bf31406270fc10a0abe9e944f6fcad2f73b882 100644 >--- a/Source/WebCore/svg/SVGPolyElement.cpp >+++ b/Source/WebCore/svg/SVGPolyElement.cpp >@@ -43,7 +43,7 @@ SVGPolyElement::SVGPolyElement(const QualifiedName& tagName, Document& document) > }); > } > >-void SVGPolyElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGPolyElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::pointsAttr) { > if (!m_points->baseVal()->parse(value)) >diff --git a/Source/WebCore/svg/SVGPolyElement.h b/Source/WebCore/svg/SVGPolyElement.h >index 67224903ef6310e2bd2b17912189634459d25f2b..5ee311f354c27afe17338146e12f91db70526b68 100644 >--- a/Source/WebCore/svg/SVGPolyElement.h >+++ b/Source/WebCore/svg/SVGPolyElement.h >@@ -44,7 +44,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGPolyElement, SVGGeometryElement, SVGExternalResourcesRequired>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > bool isValid() const override { return SVGTests::isValid(); } >diff --git a/Source/WebCore/svg/SVGRadialGradientElement.cpp b/Source/WebCore/svg/SVGRadialGradientElement.cpp >index 9aa23ae0bd6b90d986d31dcec6344f557d1c8965..b11d875482654aa7568948949356f1496aec04c5 100644 >--- a/Source/WebCore/svg/SVGRadialGradientElement.cpp >+++ b/Source/WebCore/svg/SVGRadialGradientElement.cpp >@@ -61,7 +61,7 @@ Ref<SVGRadialGradientElement> SVGRadialGradientElement::create(const QualifiedNa > return adoptRef(*new SVGRadialGradientElement(tagName, document)); > } > >-void SVGRadialGradientElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGRadialGradientElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGParsingError parseError = NoError; > >diff --git a/Source/WebCore/svg/SVGRadialGradientElement.h b/Source/WebCore/svg/SVGRadialGradientElement.h >index b88a35a4328af8c6640f22eda614f91ebfe6a597..f315d94808c5dd8cbf4192aba1fd074e465fa039 100644 >--- a/Source/WebCore/svg/SVGRadialGradientElement.h >+++ b/Source/WebCore/svg/SVGRadialGradientElement.h >@@ -55,7 +55,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGRadialGradientElement, SVGGradientElement>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override; >diff --git a/Source/WebCore/svg/SVGRectElement.cpp b/Source/WebCore/svg/SVGRectElement.cpp >index 4e14cc6d7988f5b862ba5fa81223eacbc8a0da06..eb539980b5e9116b1f28b260f308f015ea890617 100644 >--- a/Source/WebCore/svg/SVGRectElement.cpp >+++ b/Source/WebCore/svg/SVGRectElement.cpp >@@ -53,7 +53,7 @@ Ref<SVGRectElement> SVGRectElement::create(const QualifiedName& tagName, Documen > return adoptRef(*new SVGRectElement(tagName, document)); > } > >-void SVGRectElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGRectElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGParsingError parseError = NoError; > >diff --git a/Source/WebCore/svg/SVGRectElement.h b/Source/WebCore/svg/SVGRectElement.h >index c392e1e2e5c6e497dd7c89f2b3709cbf75776056..fc2479286ee7ba45bc7668bede83b75f4679ca4e 100644 >--- a/Source/WebCore/svg/SVGRectElement.h >+++ b/Source/WebCore/svg/SVGRectElement.h >@@ -52,7 +52,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGRectElement, SVGGeometryElement, SVGExternalResourcesRequired>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > > bool isValid() const final { return SVGTests::isValid(); } >diff --git a/Source/WebCore/svg/SVGSVGElement.cpp b/Source/WebCore/svg/SVGSVGElement.cpp >index 9bf0342332aeb44dcdb49ba9432b11cbce026baa..c57cffc591aa87d04a86d590e3e6570420deb92c 100644 >--- a/Source/WebCore/svg/SVGSVGElement.cpp >+++ b/Source/WebCore/svg/SVGSVGElement.cpp >@@ -94,26 +94,26 @@ void SVGSVGElement::didMoveToNewDocument(Document& oldDocument, Document& newDoc > SVGGraphicsElement::didMoveToNewDocument(oldDocument, newDocument); > } > >-const AtomicString& SVGSVGElement::contentScriptType() const >+const AtomString& SVGSVGElement::contentScriptType() const > { >- static NeverDestroyed<AtomicString> defaultScriptType { "text/ecmascript" }; >- const AtomicString& type = attributeWithoutSynchronization(SVGNames::contentScriptTypeAttr); >+ static NeverDestroyed<AtomString> defaultScriptType { "text/ecmascript" }; >+ const AtomString& type = attributeWithoutSynchronization(SVGNames::contentScriptTypeAttr); > return type.isNull() ? defaultScriptType.get() : type; > } > >-void SVGSVGElement::setContentScriptType(const AtomicString& type) >+void SVGSVGElement::setContentScriptType(const AtomString& type) > { > setAttributeWithoutSynchronization(SVGNames::contentScriptTypeAttr, type); > } > >-const AtomicString& SVGSVGElement::contentStyleType() const >+const AtomString& SVGSVGElement::contentStyleType() const > { >- static NeverDestroyed<AtomicString> defaultStyleType { "text/css" }; >- const AtomicString& type = attributeWithoutSynchronization(SVGNames::contentStyleTypeAttr); >+ static NeverDestroyed<AtomString> defaultStyleType { "text/css" }; >+ const AtomString& type = attributeWithoutSynchronization(SVGNames::contentStyleTypeAttr); > return type.isNull() ? defaultStyleType.get() : type; > } > >-void SVGSVGElement::setContentStyleType(const AtomicString& type) >+void SVGSVGElement::setContentStyleType(const AtomString& type) > { > setAttributeWithoutSynchronization(SVGNames::contentStyleTypeAttr, type); > } >@@ -193,7 +193,7 @@ void SVGSVGElement::updateCurrentTranslate() > document().renderView()->repaint(); > } > >-void SVGSVGElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGSVGElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (!nearestViewportElement()) { > // For these events, the outermost <svg> element works like a <body> element does, >@@ -735,7 +735,7 @@ void SVGSVGElement::resumeFromDocumentSuspension() > > // getElementById on SVGSVGElement is restricted to only the child subtree defined by the <svg> element. > // See http://www.w3.org/TR/SVG11/struct.html#InterfaceSVGSVGElement >-Element* SVGSVGElement::getElementById(const AtomicString& id) >+Element* SVGSVGElement::getElementById(const AtomString& id) > { > if (id.isNull()) > return nullptr; >diff --git a/Source/WebCore/svg/SVGSVGElement.h b/Source/WebCore/svg/SVGSVGElement.h >index 960f85ada0afee58accb00c41e0b44fe7b6798e1..9eacd8091dc11961a9690199763fc2025d2578c0 100644 >--- a/Source/WebCore/svg/SVGSVGElement.h >+++ b/Source/WebCore/svg/SVGSVGElement.h >@@ -41,11 +41,11 @@ class SVGViewSpec; > class SVGSVGElement final : public SVGGraphicsElement, public SVGExternalResourcesRequired, public SVGFitToViewBox, public SVGZoomAndPan { > WTF_MAKE_ISO_ALLOCATED(SVGSVGElement); > public: // DOM >- const AtomicString& contentScriptType() const; >- void setContentScriptType(const AtomicString&); >+ const AtomString& contentScriptType() const; >+ void setContentScriptType(const AtomString&); > >- const AtomicString& contentStyleType() const; >- void setContentStyleType(const AtomicString&); >+ const AtomString& contentStyleType() const; >+ void setContentStyleType(const AtomString&); > > Ref<SVGRect> viewport() const; > >@@ -91,7 +91,7 @@ public: // DOM > static Ref<SVGTransform> createSVGTransform(); > static Ref<SVGTransform> createSVGTransformFromMatrix(SVGMatrix&); > >- Element* getElementById(const AtomicString&); >+ Element* getElementById(const AtomString&); > > public: > static Ref<SVGSVGElement> create(const QualifiedName&, Document&); >@@ -134,7 +134,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGSVGElement, SVGGraphicsElement, SVGExternalResourcesRequired, SVGFitToViewBox>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > bool selfHasRelativeLengths() const override; > bool isValid() const override; >diff --git a/Source/WebCore/svg/SVGSVGElement.idl b/Source/WebCore/svg/SVGSVGElement.idl >index 3deb05ea18469a362247cba618cc85812fda8f62..44aa5196c6ec6279b01f545c7f557b3746348f10 100644 >--- a/Source/WebCore/svg/SVGSVGElement.idl >+++ b/Source/WebCore/svg/SVGSVGElement.idl >@@ -74,7 +74,7 @@ > [NewObject] SVGTransform createSVGTransform(); > [NewObject] SVGTransform createSVGTransformFromMatrix(SVGMatrix matrix); > >- Element getElementById([RequiresExistingAtomicString] DOMString elementId); >+ Element getElementById([RequiresExistingAtomString] DOMString elementId); > }; > > SVGSVGElement implements SVGExternalResourcesRequired; >diff --git a/Source/WebCore/svg/SVGScriptElement.cpp b/Source/WebCore/svg/SVGScriptElement.cpp >index 1e09454247ea1aa5e88fc75f790523b906fb3945..6f3a29b96e1906dd7336b64307d5dc4237b8740a 100644 >--- a/Source/WebCore/svg/SVGScriptElement.cpp >+++ b/Source/WebCore/svg/SVGScriptElement.cpp >@@ -45,7 +45,7 @@ Ref<SVGScriptElement> SVGScriptElement::create(const QualifiedName& tagName, Doc > return adoptRef(*new SVGScriptElement(tagName, document, insertedByParser, false)); > } > >-void SVGScriptElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGScriptElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGElement::parseAttribute(name, value); > SVGURIReference::parseAttribute(name, value); >diff --git a/Source/WebCore/svg/SVGScriptElement.h b/Source/WebCore/svg/SVGScriptElement.h >index f15f3b7cf6f93af148d5032a10dd2b0167afabaf..2bd57a42260f6664d30e79c7344bec6163edebdb 100644 >--- a/Source/WebCore/svg/SVGScriptElement.h >+++ b/Source/WebCore/svg/SVGScriptElement.h >@@ -43,7 +43,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGScriptElement, SVGElement, SVGExternalResourcesRequired, SVGURIReference>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; >diff --git a/Source/WebCore/svg/SVGStopElement.cpp b/Source/WebCore/svg/SVGStopElement.cpp >index ba1dab0ff1d83679adb797df53608588ac1dd10b..e31923d9ba3981d33fc29c8874f36d7c9e160782 100644 >--- a/Source/WebCore/svg/SVGStopElement.cpp >+++ b/Source/WebCore/svg/SVGStopElement.cpp >@@ -49,7 +49,7 @@ Ref<SVGStopElement> SVGStopElement::create(const QualifiedName& tagName, Documen > return adoptRef(*new SVGStopElement(tagName, document)); > } > >-void SVGStopElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGStopElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::offsetAttr) { > if (value.endsWith('%')) >diff --git a/Source/WebCore/svg/SVGStopElement.h b/Source/WebCore/svg/SVGStopElement.h >index 8104fbbd7f6cfcdb73c60d3703d4ee668741a30a..e651c4a262f97834bc230687e62124352f08b150 100644 >--- a/Source/WebCore/svg/SVGStopElement.h >+++ b/Source/WebCore/svg/SVGStopElement.h >@@ -41,7 +41,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGStopElement, SVGElement>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > void svgAttributeChanged(const QualifiedName&) final; > > bool isGradientStop() const final { return true; } >diff --git a/Source/WebCore/svg/SVGStyleElement.cpp b/Source/WebCore/svg/SVGStyleElement.cpp >index d0ca399651da6ba05b7d822cd46ee5aa4b14ea69..45de8790118a70c709558e265a3568da5ab9ecc2 100644 >--- a/Source/WebCore/svg/SVGStyleElement.cpp >+++ b/Source/WebCore/svg/SVGStyleElement.cpp >@@ -62,26 +62,26 @@ void SVGStyleElement::setDisabled(bool setDisabled) > styleSheet->setDisabled(setDisabled); > } > >-const AtomicString& SVGStyleElement::type() const >+const AtomString& SVGStyleElement::type() const > { >- static NeverDestroyed<const AtomicString> defaultValue("text/css", AtomicString::ConstructFromLiteral); >- const AtomicString& n = getAttribute(SVGNames::typeAttr); >+ static NeverDestroyed<const AtomString> defaultValue("text/css", AtomString::ConstructFromLiteral); >+ const AtomString& n = getAttribute(SVGNames::typeAttr); > return n.isNull() ? defaultValue.get() : n; > } > >-void SVGStyleElement::setType(const AtomicString& type) >+void SVGStyleElement::setType(const AtomString& type) > { > setAttribute(SVGNames::typeAttr, type); > } > >-const AtomicString& SVGStyleElement::media() const >+const AtomString& SVGStyleElement::media() const > { >- static NeverDestroyed<const AtomicString> defaultValue("all", AtomicString::ConstructFromLiteral); >- const AtomicString& n = attributeWithoutSynchronization(SVGNames::mediaAttr); >+ static NeverDestroyed<const AtomString> defaultValue("all", AtomString::ConstructFromLiteral); >+ const AtomString& n = attributeWithoutSynchronization(SVGNames::mediaAttr); > return n.isNull() ? defaultValue.get() : n; > } > >-void SVGStyleElement::setMedia(const AtomicString& media) >+void SVGStyleElement::setMedia(const AtomString& media) > { > setAttributeWithoutSynchronization(SVGNames::mediaAttr, media); > } >@@ -91,7 +91,7 @@ String SVGStyleElement::title() const > return attributeWithoutSynchronization(SVGNames::titleAttr); > } > >-void SVGStyleElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGStyleElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::titleAttr) { > if (sheet() && !isInShadowTree()) >diff --git a/Source/WebCore/svg/SVGStyleElement.h b/Source/WebCore/svg/SVGStyleElement.h >index 41a937ed19e849e5403a4174f639034735fe3462..17039438705d8778881ad3f4702e45e6427498b7 100644 >--- a/Source/WebCore/svg/SVGStyleElement.h >+++ b/Source/WebCore/svg/SVGStyleElement.h >@@ -37,16 +37,16 @@ public: > bool disabled() const; > void setDisabled(bool); > >- const AtomicString& type() const; >- void setType(const AtomicString&); >+ const AtomString& type() const; >+ void setType(const AtomString&); > >- const AtomicString& media() const; >- void setMedia(const AtomicString&); >+ const AtomString& media() const; >+ void setMedia(const AtomString&); > > private: > SVGStyleElement(const QualifiedName&, Document&, bool createdByParser); > >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final; > void removedFromAncestor(RemovalType, ContainerNode&) final; > void childrenChanged(const ChildChange&) final; >diff --git a/Source/WebCore/svg/SVGSymbolElement.cpp b/Source/WebCore/svg/SVGSymbolElement.cpp >index 2e339a36b14fd7852390d71033f727b1b3b46d9c..c7cc412b80e8d18d89f34c16f416b09722d37c1a 100644 >--- a/Source/WebCore/svg/SVGSymbolElement.cpp >+++ b/Source/WebCore/svg/SVGSymbolElement.cpp >@@ -44,7 +44,7 @@ Ref<SVGSymbolElement> SVGSymbolElement::create(const QualifiedName& tagName, Doc > return adoptRef(*new SVGSymbolElement(tagName, document)); > } > >-void SVGSymbolElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGSymbolElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGElement::parseAttribute(name, value); > SVGExternalResourcesRequired::parseAttribute(name, value); >diff --git a/Source/WebCore/svg/SVGSymbolElement.h b/Source/WebCore/svg/SVGSymbolElement.h >index 8c4afdedc9c2bb0ffa2ef0ecf3806d3c3f483b76..1f0e3e4d57a4d32711fcd6afef1eab6717e85b43 100644 >--- a/Source/WebCore/svg/SVGSymbolElement.h >+++ b/Source/WebCore/svg/SVGSymbolElement.h >@@ -38,7 +38,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGSymbolElement, SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override; > >diff --git a/Source/WebCore/svg/SVGTRefElement.cpp b/Source/WebCore/svg/SVGTRefElement.cpp >index 823f1f023532a06387ea61365d0797dd5b02c581..a86396b80a33ec0e66e0c0109d34d35239946df9 100644 >--- a/Source/WebCore/svg/SVGTRefElement.cpp >+++ b/Source/WebCore/svg/SVGTRefElement.cpp >@@ -172,7 +172,7 @@ void SVGTRefElement::detachTarget() > document().accessSVGExtensions().addPendingResource(target.identifier, *this); > } > >-void SVGTRefElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGTRefElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGTextPositioningElement::parseAttribute(name, value); > SVGURIReference::parseAttribute(name, value); >diff --git a/Source/WebCore/svg/SVGTRefElement.h b/Source/WebCore/svg/SVGTRefElement.h >index 8e816f5469bcec8b9f53080408ae6347a6c0613c..1bd13f8a8428128186534f9a84c8d412c995ff95 100644 >--- a/Source/WebCore/svg/SVGTRefElement.h >+++ b/Source/WebCore/svg/SVGTRefElement.h >@@ -42,7 +42,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGTRefElement, SVGTextPositioningElement, SVGURIReference>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override; >diff --git a/Source/WebCore/svg/SVGTests.cpp b/Source/WebCore/svg/SVGTests.cpp >index 45523044f84066fe022c03d1595e8f32a9f7c0d5..1af5dab5f4499a8c67b596fbd75991cc1738fc6c 100644 >--- a/Source/WebCore/svg/SVGTests.cpp >+++ b/Source/WebCore/svg/SVGTests.cpp >@@ -147,7 +147,7 @@ bool SVGTests::isValid() const > return true; > } > >-void SVGTests::parseAttribute(const QualifiedName& attributeName, const AtomicString& value) >+void SVGTests::parseAttribute(const QualifiedName& attributeName, const AtomString& value) > { > if (attributeName == requiredFeaturesAttr) > m_requiredFeatures->reset(value); >diff --git a/Source/WebCore/svg/SVGTests.h b/Source/WebCore/svg/SVGTests.h >index 449270d9f9d0f897ddff9e7c15cceb080647e174..a9c2ace0a30c450e9d9d28191152976c522a8c5b 100644 >--- a/Source/WebCore/svg/SVGTests.h >+++ b/Source/WebCore/svg/SVGTests.h >@@ -40,7 +40,7 @@ public: > > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGTests>; > >- void parseAttribute(const QualifiedName&, const AtomicString&); >+ void parseAttribute(const QualifiedName&, const AtomString&); > void svgAttributeChanged(const QualifiedName&); > > static void addSupportedAttributes(HashSet<QualifiedName>&); >diff --git a/Source/WebCore/svg/SVGTextContentElement.cpp b/Source/WebCore/svg/SVGTextContentElement.cpp >index 4e1316bdce3bc0ce42fa22204f3011b324e204e0..1820b3ccd2e526c921431f4e47f611c5923ff2a4 100644 >--- a/Source/WebCore/svg/SVGTextContentElement.cpp >+++ b/Source/WebCore/svg/SVGTextContentElement.cpp >@@ -148,7 +148,7 @@ bool SVGTextContentElement::isPresentationAttribute(const QualifiedName& name) c > return SVGGraphicsElement::isPresentationAttribute(name); > } > >-void SVGTextContentElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void SVGTextContentElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name.matches(XMLNames::spaceAttr)) { > if (value == "preserve") >@@ -161,7 +161,7 @@ void SVGTextContentElement::collectStyleForPresentationAttribute(const Qualified > SVGGraphicsElement::collectStyleForPresentationAttribute(name, value, style); > } > >-void SVGTextContentElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGTextContentElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGParsingError parseError = NoError; > >diff --git a/Source/WebCore/svg/SVGTextContentElement.h b/Source/WebCore/svg/SVGTextContentElement.h >index 0e6da5c67785cf41657434aa2b95c6fc17e0f0dc..58a7d3771487bed3e670930b95c6ffa8b561b5c8 100644 >--- a/Source/WebCore/svg/SVGTextContentElement.h >+++ b/Source/WebCore/svg/SVGTextContentElement.h >@@ -97,9 +97,9 @@ protected: > > bool isValid() const override { return SVGTests::isValid(); } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > bool isPresentationAttribute(const QualifiedName&) const override; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) override; > void svgAttributeChanged(const QualifiedName&) override; > > bool selfHasRelativeLengths() const override; >diff --git a/Source/WebCore/svg/SVGTextPathElement.cpp b/Source/WebCore/svg/SVGTextPathElement.cpp >index f20c67bdeae4177c4b3854692ed48548f2127ee1..76fbba7926fcd20190efe2f7c15ebf7bd178f287 100644 >--- a/Source/WebCore/svg/SVGTextPathElement.cpp >+++ b/Source/WebCore/svg/SVGTextPathElement.cpp >@@ -62,7 +62,7 @@ void SVGTextPathElement::clearResourceReferences() > document().accessSVGExtensions().removeAllTargetReferencesForElement(*this); > } > >-void SVGTextPathElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGTextPathElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGParsingError parseError = NoError; > >diff --git a/Source/WebCore/svg/SVGTextPathElement.h b/Source/WebCore/svg/SVGTextPathElement.h >index 435387bfaf57be437f9da25eba5697c77fba7c9d..5677f5beb237fc382b4c0d2ebba8dba2e4a9d285 100644 >--- a/Source/WebCore/svg/SVGTextPathElement.h >+++ b/Source/WebCore/svg/SVGTextPathElement.h >@@ -129,7 +129,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGTextPathElement, SVGTextContentElement, SVGURIReference>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override; >diff --git a/Source/WebCore/svg/SVGTextPositioningElement.cpp b/Source/WebCore/svg/SVGTextPositioningElement.cpp >index a6642a014ce7107a0d9fc44e1d2d276b695fa1af..2488cc36499f4a9494cf4661db1a31e454ee64a0 100644 >--- a/Source/WebCore/svg/SVGTextPositioningElement.cpp >+++ b/Source/WebCore/svg/SVGTextPositioningElement.cpp >@@ -50,7 +50,7 @@ SVGTextPositioningElement::SVGTextPositioningElement(const QualifiedName& tagNam > }); > } > >-void SVGTextPositioningElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGTextPositioningElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::xAttr) { > m_x->baseVal()->parse(value); >@@ -80,7 +80,7 @@ void SVGTextPositioningElement::parseAttribute(const QualifiedName& name, const > SVGTextContentElement::parseAttribute(name, value); > } > >-void SVGTextPositioningElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style) >+void SVGTextPositioningElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomString& value, MutableStyleProperties& style) > { > if (name == SVGNames::xAttr || name == SVGNames::yAttr) > return; >diff --git a/Source/WebCore/svg/SVGTextPositioningElement.h b/Source/WebCore/svg/SVGTextPositioningElement.h >index a4862ec4762965997430fa84d68d9719b34765ba..0e7134c138357c6cdb3db57c1d6242f31317f977 100644 >--- a/Source/WebCore/svg/SVGTextPositioningElement.h >+++ b/Source/WebCore/svg/SVGTextPositioningElement.h >@@ -47,12 +47,12 @@ public: > protected: > SVGTextPositioningElement(const QualifiedName&, Document&); > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > private: > bool isPresentationAttribute(const QualifiedName&) const final; >- void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; >+ void collectStyleForPresentationAttribute(const QualifiedName&, const AtomString&, MutableStyleProperties&) final; > > const SVGPropertyRegistry& propertyRegistry() const override { return m_propertyRegistry; } > >diff --git a/Source/WebCore/svg/SVGURIReference.cpp b/Source/WebCore/svg/SVGURIReference.cpp >index 4c0e266e042eb25bf68adcf81612c7a93c03a704..53da59c7abc446ac3fd6bbcfcba2551b1d178c0d 100644 >--- a/Source/WebCore/svg/SVGURIReference.cpp >+++ b/Source/WebCore/svg/SVGURIReference.cpp >@@ -45,7 +45,7 @@ bool SVGURIReference::isKnownAttribute(const QualifiedName& attributeName) > return PropertyRegistry::isKnownAttribute(attributeName); > } > >-void SVGURIReference::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGURIReference::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (isKnownAttribute(name)) > m_href->setBaseValInternal(value); >diff --git a/Source/WebCore/svg/SVGURIReference.h b/Source/WebCore/svg/SVGURIReference.h >index 201b6c71bed7139a9c6e2ed00d62b2df41f6d750..0fd104fe4e43ac97e98634797d0414137184f42b 100644 >--- a/Source/WebCore/svg/SVGURIReference.h >+++ b/Source/WebCore/svg/SVGURIReference.h >@@ -34,7 +34,7 @@ class SVGURIReference { > public: > virtual ~SVGURIReference() = default; > >- void parseAttribute(const QualifiedName&, const AtomicString&); >+ void parseAttribute(const QualifiedName&, const AtomString&); > > static String fragmentIdentifierFromIRIString(const String&, const Document&); > >diff --git a/Source/WebCore/svg/SVGUseElement.cpp b/Source/WebCore/svg/SVGUseElement.cpp >index e08ae5a4a9a8f92eb0103b4d9652c40bba159321..9a729842ed2d9b66699100eb75dd318b582ad9e7 100644 >--- a/Source/WebCore/svg/SVGUseElement.cpp >+++ b/Source/WebCore/svg/SVGUseElement.cpp >@@ -75,7 +75,7 @@ SVGUseElement::~SVGUseElement() > m_externalDocument->removeClient(*this); > } > >-void SVGUseElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGUseElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > SVGParsingError parseError = NoError; > >@@ -144,14 +144,14 @@ void SVGUseElement::transferSizeAttributesToTargetClone(SVGElement& shadowElemen > // If attributes width and/or height are provided on the 'use' element, then these attributes > // will be transferred to the generated 'svg'. If attributes width and/or height are not specified, > // the generated 'svg' element will use values of 100% for these attributes. >- shadowElement.setAttribute(SVGNames::widthAttr, width().valueInSpecifiedUnits() ? AtomicString(width().valueAsString()) : "100%"); >- shadowElement.setAttribute(SVGNames::heightAttr, height().valueInSpecifiedUnits() ? AtomicString(height().valueAsString()) : "100%"); >+ shadowElement.setAttribute(SVGNames::widthAttr, width().valueInSpecifiedUnits() ? AtomString(width().valueAsString()) : "100%"); >+ shadowElement.setAttribute(SVGNames::heightAttr, height().valueInSpecifiedUnits() ? AtomString(height().valueAsString()) : "100%"); > } else if (is<SVGSVGElement>(shadowElement)) { > // Spec (<use> on <svg>): If attributes width and/or height are provided on the 'use' element, then these > // values will override the corresponding attributes on the 'svg' in the generated tree. > auto correspondingElement = makeRefPtr(shadowElement.correspondingElement()); >- shadowElement.setAttribute(SVGNames::widthAttr, width().valueInSpecifiedUnits() ? AtomicString(width().valueAsString()) : (correspondingElement ? correspondingElement->getAttribute(SVGNames::widthAttr) : nullAtom())); >- shadowElement.setAttribute(SVGNames::heightAttr, height().valueInSpecifiedUnits() ? AtomicString(height().valueAsString()) : (correspondingElement ? correspondingElement->getAttribute(SVGNames::heightAttr) : nullAtom())); >+ shadowElement.setAttribute(SVGNames::widthAttr, width().valueInSpecifiedUnits() ? AtomString(width().valueAsString()) : (correspondingElement ? correspondingElement->getAttribute(SVGNames::widthAttr) : nullAtom())); >+ shadowElement.setAttribute(SVGNames::heightAttr, height().valueInSpecifiedUnits() ? AtomString(height().valueAsString()) : (correspondingElement ? correspondingElement->getAttribute(SVGNames::heightAttr) : nullAtom())); > } > } > >@@ -184,14 +184,14 @@ void SVGUseElement::svgAttributeChanged(const QualifiedName& attrName) > SVGExternalResourcesRequired::svgAttributeChanged(attrName); > } > >-static HashSet<AtomicString> createAllowedElementSet() >+static HashSet<AtomString> createAllowedElementSet() > { > // Spec: "Any 'svg', 'symbol', 'g', graphics element or other 'use' is potentially a template object that can be re-used > // (i.e., "instanced") in the SVG document via a 'use' element." > // "Graphics Element" is defined as 'circle', 'ellipse', 'image', 'line', 'path', 'polygon', 'polyline', 'rect', 'text' > // Excluded are anything that is used by reference or that only make sense to appear once in a document. > using namespace SVGNames; >- HashSet<AtomicString> set; >+ HashSet<AtomString> set; > for (auto& tag : { aTag.get(), circleTag.get(), descTag.get(), ellipseTag.get(), gTag.get(), imageTag.get(), lineTag.get(), metadataTag.get(), pathTag.get(), polygonTag.get(), polylineTag.get(), rectTag.get(), svgTag.get(), switchTag.get(), symbolTag.get(), textTag.get(), textPathTag.get(), titleTag.get(), trefTag.get(), tspanTag.get(), useTag.get() }) > set.add(tag.localName()); > return set; >@@ -199,7 +199,7 @@ static HashSet<AtomicString> createAllowedElementSet() > > static inline bool isDisallowedElement(const SVGElement& element) > { >- static NeverDestroyed<HashSet<AtomicString>> set = createAllowedElementSet(); >+ static NeverDestroyed<HashSet<AtomString>> set = createAllowedElementSet(); > return !set.get().contains(element.localName()); > } > >diff --git a/Source/WebCore/svg/SVGUseElement.h b/Source/WebCore/svg/SVGUseElement.h >index 039081d166eada7b5200b604b70e39c4feaa1bdb..1f52bc1dcf0d2192305a65af805be6d31d070cfb 100644 >--- a/Source/WebCore/svg/SVGUseElement.h >+++ b/Source/WebCore/svg/SVGUseElement.h >@@ -66,7 +66,7 @@ private: > using PropertyRegistry = SVGPropertyOwnerRegistry<SVGUseElement, SVGGraphicsElement, SVGExternalResourcesRequired, SVGURIReference>; > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > > RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override; >diff --git a/Source/WebCore/svg/SVGViewElement.cpp b/Source/WebCore/svg/SVGViewElement.cpp >index 3396c6e98236b64e8695ff0419e80269577b473a..273382ce40f686b80e36e935abe654b2f29ac872 100644 >--- a/Source/WebCore/svg/SVGViewElement.cpp >+++ b/Source/WebCore/svg/SVGViewElement.cpp >@@ -48,7 +48,7 @@ Ref<SVGViewElement> SVGViewElement::create(const QualifiedName& tagName, Documen > return adoptRef(*new SVGViewElement(tagName, document)); > } > >-void SVGViewElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGViewElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::viewTargetAttr) { > m_viewTarget->reset(value); >diff --git a/Source/WebCore/svg/SVGViewElement.h b/Source/WebCore/svg/SVGViewElement.h >index b0eef19d7c495051878a8815ae462da95084e07c..538f8644243591a04577c15494416f60be07c762 100644 >--- a/Source/WebCore/svg/SVGViewElement.h >+++ b/Source/WebCore/svg/SVGViewElement.h >@@ -46,7 +46,7 @@ private: > const SVGPropertyRegistry& propertyRegistry() const final { return m_propertyRegistry; } > > // FIXME(webkit.org/b/196554): svgAttributeChanged missing. >- void parseAttribute(const QualifiedName&, const AtomicString&) final; >+ void parseAttribute(const QualifiedName&, const AtomString&) final; > > bool rendererIsNeeded(const RenderStyle&) final { return false; } > >diff --git a/Source/WebCore/svg/SVGZoomAndPan.cpp b/Source/WebCore/svg/SVGZoomAndPan.cpp >index 14d8fcb77ea5801d65109f453da250362311276d..75a831c3c86bb521b59cc1bdaa3c674396187f88 100644 >--- a/Source/WebCore/svg/SVGZoomAndPan.cpp >+++ b/Source/WebCore/svg/SVGZoomAndPan.cpp >@@ -41,7 +41,7 @@ bool SVGZoomAndPan::parseZoomAndPan(const UChar*& start, const UChar* end) > return false; > } > >-void SVGZoomAndPan::parseAttribute(const QualifiedName& attributeName, const AtomicString& value) >+void SVGZoomAndPan::parseAttribute(const QualifiedName& attributeName, const AtomString& value) > { > if (attributeName != SVGNames::zoomAndPanAttr) > return; >diff --git a/Source/WebCore/svg/SVGZoomAndPan.h b/Source/WebCore/svg/SVGZoomAndPan.h >index 9fbcfb09ac3ad016b8fe2d292dab23562a5254a7..1904194999eb1cdbd079f4e1833c31fbb2c7c5a0 100644 >--- a/Source/WebCore/svg/SVGZoomAndPan.h >+++ b/Source/WebCore/svg/SVGZoomAndPan.h >@@ -43,7 +43,7 @@ public: > ExceptionOr<void> setZoomAndPan(unsigned) { return Exception { NoModificationAllowedError }; } > void reset() { m_zoomAndPan = SVGPropertyTraits<SVGZoomAndPanType>::initialValue(); } > >- void parseAttribute(const QualifiedName&, const AtomicString&); >+ void parseAttribute(const QualifiedName&, const AtomString&); > > protected: > SVGZoomAndPan() = default; >diff --git a/Source/WebCore/svg/animation/SVGSMILElement.cpp b/Source/WebCore/svg/animation/SVGSMILElement.cpp >index 74d2b209a0ffaf8bab2e6db945964dc978176653..81d17f409a7721483e030083f1ef99320ee2dc67 100644 >--- a/Source/WebCore/svg/animation/SVGSMILElement.cpp >+++ b/Source/WebCore/svg/animation/SVGSMILElement.cpp >@@ -219,7 +219,7 @@ inline QualifiedName SVGSMILElement::constructAttributeName() const > if (parseResult.hasException()) > return anyQName(); > >- AtomicString prefix, localName; >+ AtomString prefix, localName; > std::tie(prefix, localName) = parseResult.releaseReturnValue(); > > if (prefix.isNull()) >@@ -341,7 +341,7 @@ SMILTime SVGSMILElement::parseClockValue(const String& data) > > String parse = data.stripWhiteSpace(); > >- static NeverDestroyed<const AtomicString> indefiniteValue("indefinite", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> indefiniteValue("indefinite", AtomString::ConstructFromLiteral); > if (parse == indefiniteValue) > return SMILTime::indefinite(); > >@@ -477,7 +477,7 @@ bool SVGSMILElement::isSupportedAttribute(const QualifiedName& attrName) > return supportedAttributes.get().contains<SVGAttributeHashTranslator>(attrName); > } > >-void SVGSMILElement::parseAttribute(const QualifiedName& name, const AtomicString& value) >+void SVGSMILElement::parseAttribute(const QualifiedName& name, const AtomString& value) > { > if (name == SVGNames::beginAttr) { > if (!m_conditions.isEmpty()) { >@@ -653,9 +653,9 @@ bool SVGSMILElement::isFrozen() const > > SVGSMILElement::Restart SVGSMILElement::restart() const > { >- static NeverDestroyed<const AtomicString> never("never", AtomicString::ConstructFromLiteral); >- static NeverDestroyed<const AtomicString> whenNotActive("whenNotActive", AtomicString::ConstructFromLiteral); >- const AtomicString& value = attributeWithoutSynchronization(SVGNames::restartAttr); >+ static NeverDestroyed<const AtomString> never("never", AtomString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> whenNotActive("whenNotActive", AtomString::ConstructFromLiteral); >+ const AtomString& value = attributeWithoutSynchronization(SVGNames::restartAttr); > if (value == never) > return RestartNever; > if (value == whenNotActive) >@@ -665,8 +665,8 @@ SVGSMILElement::Restart SVGSMILElement::restart() const > > SVGSMILElement::FillMode SVGSMILElement::fill() const > { >- static NeverDestroyed<const AtomicString> freeze("freeze", AtomicString::ConstructFromLiteral); >- const AtomicString& value = attributeWithoutSynchronization(SVGNames::fillAttr); >+ static NeverDestroyed<const AtomString> freeze("freeze", AtomString::ConstructFromLiteral); >+ const AtomString& value = attributeWithoutSynchronization(SVGNames::fillAttr); > return value == freeze ? FillFreeze : FillRemove; > } > >@@ -674,7 +674,7 @@ SMILTime SVGSMILElement::dur() const > { > if (m_cachedDur != invalidCachedTime) > return m_cachedDur; >- const AtomicString& value = attributeWithoutSynchronization(SVGNames::durAttr); >+ const AtomString& value = attributeWithoutSynchronization(SVGNames::durAttr); > SMILTime clockValue = parseClockValue(value); > return m_cachedDur = clockValue <= 0 ? SMILTime::unresolved() : clockValue; > } >@@ -683,7 +683,7 @@ SMILTime SVGSMILElement::repeatDur() const > { > if (m_cachedRepeatDur != invalidCachedTime) > return m_cachedRepeatDur; >- const AtomicString& value = attributeWithoutSynchronization(SVGNames::repeatDurAttr); >+ const AtomString& value = attributeWithoutSynchronization(SVGNames::repeatDurAttr); > SMILTime clockValue = parseClockValue(value); > m_cachedRepeatDur = clockValue <= 0 ? SMILTime::unresolved() : clockValue; > return m_cachedRepeatDur; >@@ -694,11 +694,11 @@ SMILTime SVGSMILElement::repeatCount() const > { > if (m_cachedRepeatCount != invalidCachedTime) > return m_cachedRepeatCount; >- const AtomicString& value = attributeWithoutSynchronization(SVGNames::repeatCountAttr); >+ const AtomString& value = attributeWithoutSynchronization(SVGNames::repeatCountAttr); > if (value.isNull()) > return SMILTime::unresolved(); > >- static NeverDestroyed<const AtomicString> indefiniteValue("indefinite", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> indefiniteValue("indefinite", AtomString::ConstructFromLiteral); > if (value == indefiniteValue) > return SMILTime::indefinite(); > bool ok; >@@ -710,7 +710,7 @@ SMILTime SVGSMILElement::maxValue() const > { > if (m_cachedMax != invalidCachedTime) > return m_cachedMax; >- const AtomicString& value = attributeWithoutSynchronization(SVGNames::maxAttr); >+ const AtomString& value = attributeWithoutSynchronization(SVGNames::maxAttr); > SMILTime result = parseClockValue(value); > return m_cachedMax = (result.isUnresolved() || result <= 0) ? SMILTime::indefinite() : result; > } >@@ -719,7 +719,7 @@ SMILTime SVGSMILElement::minValue() const > { > if (m_cachedMin != invalidCachedTime) > return m_cachedMin; >- const AtomicString& value = attributeWithoutSynchronization(SVGNames::minAttr); >+ const AtomString& value = attributeWithoutSynchronization(SVGNames::minAttr); > SMILTime result = parseClockValue(value); > return m_cachedMin = (result.isUnresolved() || result < 0) ? 0 : result; > } >@@ -1225,7 +1225,7 @@ void SVGSMILElement::endedActiveInterval() > void SVGSMILElement::dispatchPendingEvent(SMILEventSender* eventSender) > { > ASSERT(eventSender == &smilBeginEventSender() || eventSender == &smilEndEventSender()); >- const AtomicString& eventType = eventSender->eventType(); >+ const AtomString& eventType = eventSender->eventType(); > dispatchEvent(Event::create(eventType, Event::CanBubble::No, Event::IsCancelable::No)); > } > >diff --git a/Source/WebCore/svg/animation/SVGSMILElement.h b/Source/WebCore/svg/animation/SVGSMILElement.h >index ef9924af96a53175df2c0265dde2eea96b092ef4..069bc831cb111390006967ca267a713f858e7416 100644 >--- a/Source/WebCore/svg/animation/SVGSMILElement.h >+++ b/Source/WebCore/svg/animation/SVGSMILElement.h >@@ -46,7 +46,7 @@ public: > SVGSMILElement(const QualifiedName&, Document&); > virtual ~SVGSMILElement(); > >- void parseAttribute(const QualifiedName&, const AtomicString&) override; >+ void parseAttribute(const QualifiedName&, const AtomString&) override; > void svgAttributeChanged(const QualifiedName&) override; > InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) override; > void removedFromAncestor(RemovalType, ContainerNode&) override; >diff --git a/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.cpp b/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.cpp >index 97ea55e8c087978bdef5b82de857e70f9f7f522e..d2e32859cbfe87c637e568cdf1476d91c09c7b30 100644 >--- a/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.cpp >+++ b/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.cpp >@@ -33,7 +33,7 @@ SVGFilterBuilder::SVGFilterBuilder(RefPtr<FilterEffect> sourceGraphic) > addBuiltinEffects(); > } > >-void SVGFilterBuilder::add(const AtomicString& id, RefPtr<FilterEffect> effect) >+void SVGFilterBuilder::add(const AtomString& id, RefPtr<FilterEffect> effect) > { > if (id.isEmpty()) { > m_lastEffect = effect; >@@ -47,7 +47,7 @@ void SVGFilterBuilder::add(const AtomicString& id, RefPtr<FilterEffect> effect) > m_namedEffects.set(id, m_lastEffect); > } > >-RefPtr<FilterEffect> SVGFilterBuilder::getEffectById(const AtomicString& id) const >+RefPtr<FilterEffect> SVGFilterBuilder::getEffectById(const AtomString& id) const > { > if (id.isEmpty()) { > if (m_lastEffect) >diff --git a/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.h b/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.h >index f68abdb3d00734d263abde9f66970c54ebadafe9..d970302adf86585509c6508d504952a25532362b 100644 >--- a/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.h >+++ b/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.h >@@ -24,7 +24,7 @@ > #include "SVGUnitTypes.h" > #include <wtf/HashMap.h> > #include <wtf/HashSet.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/WTFString.h> > > namespace WebCore { >@@ -44,9 +44,9 @@ public: > SVGUnitTypes::SVGUnitType primitiveUnits() const { return m_primitiveUnits; } > void setPrimitiveUnits(SVGUnitTypes::SVGUnitType units) { m_primitiveUnits = units; } > >- void add(const AtomicString& id, RefPtr<FilterEffect>); >+ void add(const AtomString& id, RefPtr<FilterEffect>); > >- RefPtr<FilterEffect> getEffectById(const AtomicString&) const; >+ RefPtr<FilterEffect> getEffectById(const AtomString&) const; > FilterEffect* lastEffect() const { return m_lastEffect.get(); } > > void appendEffectToEffectReferences(RefPtr<FilterEffect>&&, RenderObject*); >@@ -71,8 +71,8 @@ private: > m_effectReferences.add(effect, FilterEffectSet()); > } > >- HashMap<AtomicString, RefPtr<FilterEffect>> m_builtinEffects; >- HashMap<AtomicString, RefPtr<FilterEffect>> m_namedEffects; >+ HashMap<AtomString, RefPtr<FilterEffect>> m_builtinEffects; >+ HashMap<AtomString, RefPtr<FilterEffect>> m_namedEffects; > // The value is a list, which contains those filter effects, > // which depends on the key filter effect. > HashMap<RefPtr<FilterEffect>, FilterEffectSet> m_effectReferences; >diff --git a/Source/WebCore/svg/properties/SVGAnimatedPropertyDescription.h b/Source/WebCore/svg/properties/SVGAnimatedPropertyDescription.h >index f1d9a04b0ff3f61f62c2a9a328363ccae2730b5c..7fa82c618d6bbe4576740ca68503e1842eb9cfce 100644 >--- a/Source/WebCore/svg/properties/SVGAnimatedPropertyDescription.h >+++ b/Source/WebCore/svg/properties/SVGAnimatedPropertyDescription.h >@@ -22,7 +22,7 @@ > #pragma once > > #include <wtf/HashMap.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -47,7 +47,7 @@ struct SVGAnimatedPropertyDescription { > return m_element == reinterpret_cast<SVGElement*>(-1); > } > >- SVGAnimatedPropertyDescription(SVGElement* element, const AtomicString& attributeName) >+ SVGAnimatedPropertyDescription(SVGElement* element, const AtomString& attributeName) > : m_element(element) > , m_attributeName(attributeName.impl()) > { >@@ -61,7 +61,7 @@ struct SVGAnimatedPropertyDescription { > } > > SVGElement* m_element; >- AtomicStringImpl* m_attributeName; >+ AtomStringImpl* m_attributeName; > }; > > struct SVGAnimatedPropertyDescriptionHash { >diff --git a/Source/WebCore/svg/properties/SVGAnimationAdditiveValueFunctionImpl.cpp b/Source/WebCore/svg/properties/SVGAnimationAdditiveValueFunctionImpl.cpp >index 1b1cbeb3a5460ec1c8d8480ef70dd7b20609fa78..72b25b5b8cc2fc1e701c7919e3392767c231405d 100644 >--- a/Source/WebCore/svg/properties/SVGAnimationAdditiveValueFunctionImpl.cpp >+++ b/Source/WebCore/svg/properties/SVGAnimationAdditiveValueFunctionImpl.cpp >@@ -33,7 +33,7 @@ namespace WebCore { > > Color SVGAnimationColorFunction::colorFromString(SVGElement* targetElement, const String& string) > { >- static NeverDestroyed<const AtomicString> currentColor("currentColor", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> currentColor("currentColor", AtomString::ConstructFromLiteral); > > if (string != currentColor.get()) > return SVGPropertyTraits<Color>::fromString(string); >diff --git a/Source/WebCore/svg/properties/SVGPropertyAnimator.h b/Source/WebCore/svg/properties/SVGPropertyAnimator.h >index f5e8b1bd3041265c49e5a05aa2f729e3f55a58f7..21e883fe244838ff3746869bf11a3df46ff4be2a 100644 >--- a/Source/WebCore/svg/properties/SVGPropertyAnimator.h >+++ b/Source/WebCore/svg/properties/SVGPropertyAnimator.h >@@ -72,7 +72,7 @@ protected: > > String adjustForInheritance(SVGElement* targetElement, const String& value) const > { >- static NeverDestroyed<const AtomicString> inherit("inherit", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> inherit("inherit", AtomString::ConstructFromLiteral); > return value == inherit ? computeInheritedCSSPropertyValue(targetElement) : value; > } > >diff --git a/Source/WebCore/testing/InternalSettings.h b/Source/WebCore/testing/InternalSettings.h >index fa73394d06e8751b3c73d0724aa8c280c50beff5..a04c4021f28c5c3cb194d6352c0c41c56f8d2cf9 100644 >--- a/Source/WebCore/testing/InternalSettings.h >+++ b/Source/WebCore/testing/InternalSettings.h >@@ -27,7 +27,7 @@ > #pragma once > > // FIXME (121927): This include should not be needed. >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > #include "EditingBehaviorTypes.h" > #include "ExceptionOr.h" >diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp >index 22f1065212a0fa5c5c62ea0a5bc09b8d3bd43789..7efc7c4469712f06c734fee2fadc534532047c4a 100644 >--- a/Source/WebCore/testing/Internals.cpp >+++ b/Source/WebCore/testing/Internals.cpp >@@ -1053,7 +1053,7 @@ ExceptionOr<bool> Internals::pauseAnimationAtTimeOnElement(const String& animati > { > if (pauseTime < 0) > return Exception { InvalidAccessError }; >- return frame()->animation().pauseAnimationAtTime(element, AtomicString(animationName), pauseTime); >+ return frame()->animation().pauseAnimationAtTime(element, AtomString(animationName), pauseTime); > } > > ExceptionOr<bool> Internals::pauseAnimationAtTimeOnPseudoElement(const String& animationName, double pauseTime, Element& element, const String& pseudoId) >@@ -1068,7 +1068,7 @@ ExceptionOr<bool> Internals::pauseAnimationAtTimeOnPseudoElement(const String& a > if (!pseudoElement) > return Exception { InvalidAccessError }; > >- return frame()->animation().pauseAnimationAtTime(*pseudoElement, AtomicString(animationName), pauseTime); >+ return frame()->animation().pauseAnimationAtTime(*pseudoElement, AtomString(animationName), pauseTime); > } > > ExceptionOr<bool> Internals::pauseTransitionAtTimeOnElement(const String& propertyName, double pauseTime, Element& element) >@@ -3715,12 +3715,12 @@ void Internals::initializeMockMediaSource() > MediaPlayerFactorySupport::callRegisterMediaEngine(MockMediaPlayerMediaSource::registerMediaEngine); > } > >-Vector<String> Internals::bufferedSamplesForTrackID(SourceBuffer& buffer, const AtomicString& trackID) >+Vector<String> Internals::bufferedSamplesForTrackID(SourceBuffer& buffer, const AtomString& trackID) > { > return buffer.bufferedSamplesForTrackID(trackID); > } > >-Vector<String> Internals::enqueuedSamplesForTrackID(SourceBuffer& buffer, const AtomicString& trackID) >+Vector<String> Internals::enqueuedSamplesForTrackID(SourceBuffer& buffer, const AtomString& trackID) > { > return buffer.enqueuedSamplesForTrackID(trackID); > } >diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h >index 38e5f7bf1e92c30470dd3fa0ce6ee946b9142917..0c03d68646ae6b4cc42cbe139f0a7c0c645308fc 100644 >--- a/Source/WebCore/testing/Internals.h >+++ b/Source/WebCore/testing/Internals.h >@@ -571,8 +571,8 @@ public: > > #if ENABLE(MEDIA_SOURCE) > WEBCORE_TESTSUPPORT_EXPORT void initializeMockMediaSource(); >- Vector<String> bufferedSamplesForTrackID(SourceBuffer&, const AtomicString&); >- Vector<String> enqueuedSamplesForTrackID(SourceBuffer&, const AtomicString&); >+ Vector<String> bufferedSamplesForTrackID(SourceBuffer&, const AtomString&); >+ Vector<String> enqueuedSamplesForTrackID(SourceBuffer&, const AtomString&); > void setShouldGenerateTimestamps(SourceBuffer&, bool); > #endif > >diff --git a/Source/WebCore/testing/MockCDMFactory.cpp b/Source/WebCore/testing/MockCDMFactory.cpp >index 7d869b4d4a62dbf4f13dd02560742927078ff22a..04fbf274302bcf5e9b8bc174d043e4255daf748a 100644 >--- a/Source/WebCore/testing/MockCDMFactory.cpp >+++ b/Source/WebCore/testing/MockCDMFactory.cpp >@@ -108,7 +108,7 @@ MockCDM::MockCDM(WeakPtr<MockCDMFactory> factory) > { > } > >-bool MockCDM::supportsInitDataType(const AtomicString& initDataType) const >+bool MockCDM::supportsInitDataType(const AtomString& initDataType) const > { > if (m_factory) > return m_factory->supportedDataTypes().contains(initDataType); >@@ -197,7 +197,7 @@ bool MockCDM::supportsSessions() const > return m_factory && m_factory->supportsSessions(); > } > >-bool MockCDM::supportsInitData(const AtomicString& initDataType, const SharedBuffer& initData) const >+bool MockCDM::supportsInitData(const AtomString& initDataType, const SharedBuffer& initData) const > { > if (!supportsInitDataType(initDataType)) > return false; >@@ -299,7 +299,7 @@ MockCDMInstanceSession::MockCDMInstanceSession(WeakPtr<MockCDMInstance>&& instan > { > } > >-void MockCDMInstanceSession::requestLicense(LicenseType licenseType, const AtomicString& initDataType, Ref<SharedBuffer>&& initData, LicenseCallback&& callback) >+void MockCDMInstanceSession::requestLicense(LicenseType licenseType, const AtomString& initDataType, Ref<SharedBuffer>&& initData, LicenseCallback&& callback) > { > MockCDMFactory* factory = m_instance ? m_instance->factory() : nullptr; > if (!factory) { >diff --git a/Source/WebCore/testing/MockCDMFactory.h b/Source/WebCore/testing/MockCDMFactory.h >index 5cadf28d654a1dd02bdd18a8e88269a77b0400d7..3396cd02ad02dd14e92f1579e27516e6bc3f4298 100644 >--- a/Source/WebCore/testing/MockCDMFactory.h >+++ b/Source/WebCore/testing/MockCDMFactory.h >@@ -46,7 +46,7 @@ public: > static Ref<MockCDMFactory> create() { return adoptRef(*new MockCDMFactory); } > ~MockCDMFactory(); > >- const Vector<AtomicString>& supportedDataTypes() const { return m_supportedDataTypes; } >+ const Vector<AtomString>& supportedDataTypes() const { return m_supportedDataTypes; } > void setSupportedDataTypes(Vector<String>&&); > > const Vector<MediaKeySessionType>& supportedSessionTypes() const { return m_supportedSessionTypes; } >@@ -88,7 +88,7 @@ private: > > MediaKeysRequirement m_distinctiveIdentifiersRequirement { MediaKeysRequirement::Optional }; > MediaKeysRequirement m_persistentStateRequirement { MediaKeysRequirement::Optional }; >- Vector<AtomicString> m_supportedDataTypes; >+ Vector<AtomString> m_supportedDataTypes; > Vector<MediaKeySessionType> m_supportedSessionTypes; > Vector<String> m_supportedRobustness; > Vector<MediaKeyEncryptionScheme> m_supportedEncryptionSchemes; >@@ -108,7 +108,7 @@ public: > private: > friend class MockCDMInstance; > >- bool supportsInitDataType(const AtomicString&) const final; >+ bool supportsInitDataType(const AtomString&) const final; > bool supportsConfiguration(const MediaKeySystemConfiguration&) const final; > bool supportsConfigurationWithRestrictions(const MediaKeySystemConfiguration&, const MediaKeysRestrictions&) const final; > bool supportsSessionTypeWithConfiguration(MediaKeySessionType&, const MediaKeySystemConfiguration&) const final; >@@ -120,7 +120,7 @@ private: > void loadAndInitialize() final; > bool supportsServerCertificates() const final; > bool supportsSessions() const final; >- bool supportsInitData(const AtomicString&, const SharedBuffer&) const final; >+ bool supportsInitData(const AtomString&, const SharedBuffer&) const final; > RefPtr<SharedBuffer> sanitizeResponse(const SharedBuffer&) const final; > Optional<String> sanitizeSessionId(const String&) const final; > >@@ -155,7 +155,7 @@ public: > MockCDMInstanceSession(WeakPtr<MockCDMInstance>&&); > > private: >- void requestLicense(LicenseType, const AtomicString& initDataType, Ref<SharedBuffer>&& initData, LicenseCallback&&) final; >+ void requestLicense(LicenseType, const AtomString& initDataType, Ref<SharedBuffer>&& initData, LicenseCallback&&) final; > void updateLicense(const String&, LicenseType, const SharedBuffer&, LicenseUpdateCallback&&) final; > void loadSession(LicenseType, const String&, const String&, LoadSessionCallback&&) final; > void closeSession(const String&, CloseSessionCallback&&) final; >diff --git a/Source/WebCore/workers/Worker.h b/Source/WebCore/workers/Worker.h >index df192526ce8ff327a746413270789ebfb4f9840b..23c31a0084081ad9a0ee2cb082ef1185fae84954 100644 >--- a/Source/WebCore/workers/Worker.h >+++ b/Source/WebCore/workers/Worker.h >@@ -34,7 +34,7 @@ > #include <JavaScriptCore/RuntimeFlags.h> > #include <wtf/MonotonicTime.h> > #include <wtf/Optional.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > > namespace JSC { > class ExecState; >diff --git a/Source/WebCore/workers/service/ExtendableEvent.cpp b/Source/WebCore/workers/service/ExtendableEvent.cpp >index 79679f9a0c3602c30b9b35399ac79ff65bdfd973..4c1bc6f839229a7f733fdf593af52d47a9e018ed 100644 >--- a/Source/WebCore/workers/service/ExtendableEvent.cpp >+++ b/Source/WebCore/workers/service/ExtendableEvent.cpp >@@ -34,12 +34,12 @@ > > namespace WebCore { > >-ExtendableEvent::ExtendableEvent(const AtomicString& type, const ExtendableEventInit& initializer, IsTrusted isTrusted) >+ExtendableEvent::ExtendableEvent(const AtomString& type, const ExtendableEventInit& initializer, IsTrusted isTrusted) > : Event(type, initializer, isTrusted) > { > } > >-ExtendableEvent::ExtendableEvent(const AtomicString& type, CanBubble canBubble, IsCancelable cancelable) >+ExtendableEvent::ExtendableEvent(const AtomString& type, CanBubble canBubble, IsCancelable cancelable) > : Event(type, canBubble, cancelable) > { > } >diff --git a/Source/WebCore/workers/service/ExtendableEvent.h b/Source/WebCore/workers/service/ExtendableEvent.h >index baaf13ee60dea90d60c8b1c6e60a48757c45c785..2563c8d7c33bf11ba7a53d292bc3a5d28be57df6 100644 >--- a/Source/WebCore/workers/service/ExtendableEvent.h >+++ b/Source/WebCore/workers/service/ExtendableEvent.h >@@ -37,7 +37,7 @@ class DOMPromise; > > class ExtendableEvent : public Event, public CanMakeWeakPtr<ExtendableEvent> { > public: >- static Ref<ExtendableEvent> create(const AtomicString& type, const ExtendableEventInit& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<ExtendableEvent> create(const AtomString& type, const ExtendableEventInit& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new ExtendableEvent(type, initializer, isTrusted)); > } >@@ -52,8 +52,8 @@ public: > WEBCORE_EXPORT void whenAllExtendLifetimePromisesAreSettled(WTF::Function<void(HashSet<Ref<DOMPromise>>&&)>&&); > > protected: >- WEBCORE_EXPORT ExtendableEvent(const AtomicString&, const ExtendableEventInit&, IsTrusted); >- ExtendableEvent(const AtomicString&, CanBubble, IsCancelable); >+ WEBCORE_EXPORT ExtendableEvent(const AtomString&, const ExtendableEventInit&, IsTrusted); >+ ExtendableEvent(const AtomString&, CanBubble, IsCancelable); > > void addExtendLifetimePromise(Ref<DOMPromise>&&); > >diff --git a/Source/WebCore/workers/service/ExtendableMessageEvent.cpp b/Source/WebCore/workers/service/ExtendableMessageEvent.cpp >index 7b05fffc03114f7712323aa300927c7a77e4711f..3dcabcb80c7364dd27852a47e3496dc58bfee2f5 100644 >--- a/Source/WebCore/workers/service/ExtendableMessageEvent.cpp >+++ b/Source/WebCore/workers/service/ExtendableMessageEvent.cpp >@@ -37,7 +37,7 @@ Ref<ExtendableMessageEvent> ExtendableMessageEvent::create(Vector<RefPtr<Message > return adoptRef(*new ExtendableMessageEvent(WTFMove(data), origin, lastEventId, WTFMove(source), WTFMove(ports))); > } > >-ExtendableMessageEvent::ExtendableMessageEvent(JSC::ExecState& state, const AtomicString& type, const Init& init, IsTrusted isTrusted) >+ExtendableMessageEvent::ExtendableMessageEvent(JSC::ExecState& state, const AtomString& type, const Init& init, IsTrusted isTrusted) > : ExtendableEvent(type, init, isTrusted) > , m_data(SerializedScriptValue::create(state, init.data, SerializationErrorMode::NonThrowing)) > , m_origin(init.origin) >diff --git a/Source/WebCore/workers/service/ExtendableMessageEvent.h b/Source/WebCore/workers/service/ExtendableMessageEvent.h >index 4a01a79d27fc77c761f29a8b1df0351f544112f5..34323c8b535ab1e66c869dac44abe85a3f8e67a1 100644 >--- a/Source/WebCore/workers/service/ExtendableMessageEvent.h >+++ b/Source/WebCore/workers/service/ExtendableMessageEvent.h >@@ -57,7 +57,7 @@ public: > Vector<RefPtr<MessagePort>> ports; > }; > >- static Ref<ExtendableMessageEvent> create(JSC::ExecState& state, const AtomicString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<ExtendableMessageEvent> create(JSC::ExecState& state, const AtomString& type, const Init& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new ExtendableMessageEvent(state, type, initializer, isTrusted)); > } >@@ -75,7 +75,7 @@ public: > EventInterface eventInterface() const final { return ExtendableMessageEventInterfaceType; } > > private: >- ExtendableMessageEvent(JSC::ExecState&, const AtomicString&, const Init&, IsTrusted); >+ ExtendableMessageEvent(JSC::ExecState&, const AtomString&, const Init&, IsTrusted); > ExtendableMessageEvent(RefPtr<SerializedScriptValue>&& data, const String& origin, const String& lastEventId, Optional<ExtendableMessageEventSource>&&, Vector<RefPtr<MessagePort>>&&); > > RefPtr<SerializedScriptValue> m_data; >diff --git a/Source/WebCore/workers/service/FetchEvent.cpp b/Source/WebCore/workers/service/FetchEvent.cpp >index 7767ac7aabc4fbf6c705ae3e7c0c68eeae797107..1bfe66cb95fb543c2c644061cb19816bc7ba2d11 100644 >--- a/Source/WebCore/workers/service/FetchEvent.cpp >+++ b/Source/WebCore/workers/service/FetchEvent.cpp >@@ -40,7 +40,7 @@ Ref<FetchEvent> FetchEvent::createForTesting(ScriptExecutionContext& context) > return FetchEvent::create("fetch", WTFMove(init), Event::IsTrusted::Yes); > } > >-FetchEvent::FetchEvent(const AtomicString& type, Init&& initializer, IsTrusted isTrusted) >+FetchEvent::FetchEvent(const AtomString& type, Init&& initializer, IsTrusted isTrusted) > : ExtendableEvent(type, initializer, isTrusted) > , m_request(initializer.request.releaseNonNull()) > , m_clientId(WTFMove(initializer.clientId)) >diff --git a/Source/WebCore/workers/service/FetchEvent.h b/Source/WebCore/workers/service/FetchEvent.h >index f570b8a0dd4bc386b7b663906740a4a64b42c2f6..e588648efa3e669854614da2249ba5589e51a13c 100644 >--- a/Source/WebCore/workers/service/FetchEvent.h >+++ b/Source/WebCore/workers/service/FetchEvent.h >@@ -48,7 +48,7 @@ public: > > WEBCORE_EXPORT static Ref<FetchEvent> createForTesting(ScriptExecutionContext&); > >- static Ref<FetchEvent> create(const AtomicString& type, Init&& initializer, IsTrusted isTrusted = IsTrusted::No) >+ static Ref<FetchEvent> create(const AtomString& type, Init&& initializer, IsTrusted isTrusted = IsTrusted::No) > { > return adoptRef(*new FetchEvent(type, WTFMove(initializer), isTrusted)); > } >@@ -71,7 +71,7 @@ public: > static ResourceError createResponseError(const URL&, const String&); > > private: >- WEBCORE_EXPORT FetchEvent(const AtomicString&, Init&&, IsTrusted); >+ WEBCORE_EXPORT FetchEvent(const AtomString&, Init&&, IsTrusted); > > void promiseIsSettled(); > void processResponse(Expected<Ref<FetchResponse>, ResourceError>&&); >diff --git a/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp b/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp >index f277ea3132a170f7a66b2b4d473e5700460a0b24..08660670a38fcbcbb2728027720a71cd69a84226 100644 >--- a/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp >+++ b/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp >@@ -77,7 +77,7 @@ ServiceWorkerThread::ServiceWorkerThread(const ServiceWorkerContextData& data, P > , m_data(data.isolatedCopy()) > , m_workerObjectProxy(DummyServiceWorkerThreadProxy::shared()) > { >- AtomicString::init(); >+ AtomString::init(); > } > > ServiceWorkerThread::~ServiceWorkerThread() = default; >diff --git a/Source/WebCore/worklets/PaintWorkletGlobalScope.cpp b/Source/WebCore/worklets/PaintWorkletGlobalScope.cpp >index 9aeab97ac54dd1b56c0cef05577d0bdc3a54f856..2b7a2fe3fbb58d4c4ee38fc04b536a3e4e0c77e7 100644 >--- a/Source/WebCore/worklets/PaintWorkletGlobalScope.cpp >+++ b/Source/WebCore/worklets/PaintWorkletGlobalScope.cpp >@@ -59,7 +59,7 @@ double PaintWorkletGlobalScope::devicePixelRatio() const > return responsibleDocument()->domWindow()->devicePixelRatio(); > } > >-PaintWorkletGlobalScope::PaintDefinition::PaintDefinition(const AtomicString& name, JSC::JSObject* paintConstructor, Ref<CSSPaintCallback>&& paintCallback, Vector<String>&& inputProperties, Vector<String>&& inputArguments) >+PaintWorkletGlobalScope::PaintDefinition::PaintDefinition(const AtomString& name, JSC::JSObject* paintConstructor, Ref<CSSPaintCallback>&& paintCallback, Vector<String>&& inputProperties, Vector<String>&& inputArguments) > : name(name) > , paintConstructor(paintConstructor) > , paintCallback(WTFMove(paintCallback)) >diff --git a/Source/WebCore/worklets/PaintWorkletGlobalScope.h b/Source/WebCore/worklets/PaintWorkletGlobalScope.h >index fe0eb4c5f652db3c02759fbd97a21bfaabbe0074..96cf1850b0cae3aae9607db134167358b671c1d9 100644 >--- a/Source/WebCore/worklets/PaintWorkletGlobalScope.h >+++ b/Source/WebCore/worklets/PaintWorkletGlobalScope.h >@@ -49,9 +49,9 @@ public: > > // All paint definitions must be destroyed before the vm is destroyed, because otherwise they will point to freed memory. > struct PaintDefinition : public CanMakeWeakPtr<PaintDefinition> { >- PaintDefinition(const AtomicString& name, JSC::JSObject* paintConstructor, Ref<CSSPaintCallback>&&, Vector<String>&& inputProperties, Vector<String>&& inputArguments); >+ PaintDefinition(const AtomString& name, JSC::JSObject* paintConstructor, Ref<CSSPaintCallback>&&, Vector<String>&& inputProperties, Vector<String>&& inputArguments); > >- const AtomicString name; >+ const AtomString name; > const JSC::JSObject* const paintConstructor; > const Ref<CSSPaintCallback> paintCallback; > const Vector<String> inputProperties; >diff --git a/Source/WebCore/xml/XMLHttpRequest.cpp b/Source/WebCore/xml/XMLHttpRequest.cpp >index 2cbfbfb0e66f0d085c313d689551f3decf9e77eb..5c6474ff47f6d02adcbda29ecad564f4b46b3028 100644 >--- a/Source/WebCore/xml/XMLHttpRequest.cpp >+++ b/Source/WebCore/xml/XMLHttpRequest.cpp >@@ -1079,7 +1079,7 @@ void XMLHttpRequest::dispatchEvent(Event& event) > EventTarget::dispatchEvent(event); > } > >-void XMLHttpRequest::dispatchErrorEvents(const AtomicString& type) >+void XMLHttpRequest::dispatchErrorEvents(const AtomString& type) > { > if (!m_uploadComplete) { > m_uploadComplete = true; >diff --git a/Source/WebCore/xml/XMLHttpRequest.h b/Source/WebCore/xml/XMLHttpRequest.h >index 13c86c88212d1699fef3d45e8505ff8f72b99630..d70d3e9c5d489b213e6af97351e4d62b8ff06934 100644 >--- a/Source/WebCore/xml/XMLHttpRequest.h >+++ b/Source/WebCore/xml/XMLHttpRequest.h >@@ -184,7 +184,7 @@ private: > void networkError(); > void abortError(); > >- void dispatchErrorEvents(const AtomicString&); >+ void dispatchErrorEvents(const AtomString&); > > using EventTarget::dispatchEvent; > void dispatchEvent(Event&) override; >diff --git a/Source/WebCore/xml/XMLHttpRequestProgressEvent.h b/Source/WebCore/xml/XMLHttpRequestProgressEvent.h >index c0aeddd2dde129435094b52a0153a752209bef8a..85f807c9e0574d2528a1241f388714a8e9117d1f 100644 >--- a/Source/WebCore/xml/XMLHttpRequestProgressEvent.h >+++ b/Source/WebCore/xml/XMLHttpRequestProgressEvent.h >@@ -32,7 +32,7 @@ namespace WebCore { > > class XMLHttpRequestProgressEvent : public ProgressEvent { > public: >- static Ref<XMLHttpRequestProgressEvent> create(const AtomicString& type, bool lengthComputable = false, unsigned long long loaded = 0, unsigned long long total = 0) >+ static Ref<XMLHttpRequestProgressEvent> create(const AtomString& type, bool lengthComputable = false, unsigned long long loaded = 0, unsigned long long total = 0) > { > return adoptRef(*new XMLHttpRequestProgressEvent(type, lengthComputable, loaded, total)); > } >@@ -43,7 +43,7 @@ public: > EventInterface eventInterface() const override { return XMLHttpRequestProgressEventInterfaceType; } > > private: >- XMLHttpRequestProgressEvent(const AtomicString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total) >+ XMLHttpRequestProgressEvent(const AtomString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total) > : ProgressEvent(type, lengthComputable, loaded, total) > { > } >diff --git a/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp b/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp >index 4a19c479c763c77c36d902fa4eb92fe8006fc169..f8f9f5ee70b2717e88ac5ab0b6e0bba85c85d986 100644 >--- a/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp >+++ b/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp >@@ -95,7 +95,7 @@ void XMLHttpRequestProgressEventThrottle::dispatchEvent(Event& event) > m_target->dispatchEvent(event); > } > >-void XMLHttpRequestProgressEventThrottle::dispatchProgressEvent(const AtomicString& type) >+void XMLHttpRequestProgressEventThrottle::dispatchProgressEvent(const AtomString& type) > { > ASSERT(type == eventNames().loadstartEvent || type == eventNames().progressEvent || type == eventNames().loadEvent || type == eventNames().loadendEvent || type == eventNames().abortEvent || type == eventNames().errorEvent || type == eventNames().timeoutEvent); > >diff --git a/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h b/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h >index 553f10398a4c0799d868f651bfc06a49a6d22097..195316c4287f6c0d6ce9d3fb9567a6742532f7ff 100644 >--- a/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h >+++ b/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h >@@ -49,7 +49,7 @@ public: > > void dispatchThrottledProgressEvent(bool lengthComputable, unsigned long long loaded, unsigned long long total); > void dispatchReadyStateChangeEvent(Event&, ProgressEventAction = DoNotFlushProgressEvent); >- void dispatchProgressEvent(const AtomicString&); >+ void dispatchProgressEvent(const AtomString&); > > void suspend(); > void resume(); >diff --git a/Source/WebCore/xml/XMLHttpRequestUpload.cpp b/Source/WebCore/xml/XMLHttpRequestUpload.cpp >index e92a49f2f51407b4e549f4beaa268f742cbcd6e3..929a34cb76e00cb5130a1f18ae2492151331be71 100644 >--- a/Source/WebCore/xml/XMLHttpRequestUpload.cpp >+++ b/Source/WebCore/xml/XMLHttpRequestUpload.cpp >@@ -30,7 +30,7 @@ > #include "XMLHttpRequestProgressEvent.h" > #include <wtf/Assertions.h> > #include <wtf/IsoMallocInlines.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -41,7 +41,7 @@ XMLHttpRequestUpload::XMLHttpRequestUpload(XMLHttpRequest& request) > { > } > >-void XMLHttpRequestUpload::dispatchProgressEvent(const AtomicString& type, unsigned long long loaded, unsigned long long total) >+void XMLHttpRequestUpload::dispatchProgressEvent(const AtomString& type, unsigned long long loaded, unsigned long long total) > { > ASSERT(type == eventNames().loadstartEvent || type == eventNames().progressEvent || type == eventNames().loadEvent || type == eventNames().loadendEvent || type == eventNames().abortEvent || type == eventNames().errorEvent || type == eventNames().timeoutEvent); > >diff --git a/Source/WebCore/xml/XMLHttpRequestUpload.h b/Source/WebCore/xml/XMLHttpRequestUpload.h >index d399fdb7f3bbe8b1deb327959b85511d623a6dd8..d099d2ba2b44a11ca6e48bf29287e9199879edc7 100644 >--- a/Source/WebCore/xml/XMLHttpRequestUpload.h >+++ b/Source/WebCore/xml/XMLHttpRequestUpload.h >@@ -38,7 +38,7 @@ public: > void ref() { m_request.ref(); } > void deref() { m_request.deref(); } > >- void dispatchProgressEvent(const AtomicString& type, unsigned long long loaded, unsigned long long total); >+ void dispatchProgressEvent(const AtomString& type, unsigned long long loaded, unsigned long long total); > > private: > void refEventTarget() final { ref(); } >diff --git a/Source/WebCore/xml/XMLTreeViewer.cpp b/Source/WebCore/xml/XMLTreeViewer.cpp >index 93deb8e6d3c4448e1dabe0c7ee2a403002a5e1c3..fe01cc1ff491c367fcad97bfd4d6c4e730f6bda8 100644 >--- a/Source/WebCore/xml/XMLTreeViewer.cpp >+++ b/Source/WebCore/xml/XMLTreeViewer.cpp >@@ -57,7 +57,7 @@ void XMLTreeViewer::transformDocumentToTreeView() > > String scriptString = StringImpl::createWithoutCopying(XMLViewer_js, sizeof(XMLViewer_js)); > m_document.frame()->script().evaluate(ScriptSourceCode(scriptString)); >- m_document.frame()->script().evaluate(ScriptSourceCode(AtomicString("prepareWebKitXMLViewer('This XML file does not appear to have any style information associated with it. The document tree is shown below.');"))); >+ m_document.frame()->script().evaluate(ScriptSourceCode(AtomString("prepareWebKitXMLViewer('This XML file does not appear to have any style information associated with it. The document tree is shown below.');"))); > > String cssString = StringImpl::createWithoutCopying(XMLViewer_css, sizeof(XMLViewer_css)); > auto text = m_document.createTextNode(cssString); >diff --git a/Source/WebCore/xml/XPathFunctions.cpp b/Source/WebCore/xml/XPathFunctions.cpp >index 73534a474f5b1b47639a2cab7cd35d8bac17cc7c..ad7e13c8a194ad56d6234200017cba77fe80b742 100644 >--- a/Source/WebCore/xml/XPathFunctions.cpp >+++ b/Source/WebCore/xml/XPathFunctions.cpp >@@ -304,13 +304,13 @@ Value FunPosition::evaluate() const > return Expression::evaluationContext().position; > } > >-static AtomicString atomicSubstring(StringBuilder& builder, unsigned start, unsigned length) >+static AtomString atomicSubstring(StringBuilder& builder, unsigned start, unsigned length) > { > ASSERT(start <= builder.length()); > ASSERT(length <= builder.length() - start); > if (builder.is8Bit()) >- return AtomicString(builder.characters8() + start, length); >- return AtomicString(builder.characters16() + start, length); >+ return AtomString(builder.characters8() + start, length); >+ return AtomString(builder.characters16() + start, length); > } > > Value FunId::evaluate() const >@@ -367,7 +367,7 @@ static inline String expandedNameLocalPart(Node* node) > > static inline String expandedName(Node* node) > { >- const AtomicString& prefix = node->prefix(); >+ const AtomString& prefix = node->prefix(); > return prefix.isEmpty() ? expandedNameLocalPart(node) : prefix + ":" + expandedNameLocalPart(node); > } > >diff --git a/Source/WebCore/xml/XPathStep.cpp b/Source/WebCore/xml/XPathStep.cpp >index 4b55917a371b6aa6c24f2d350fce997d0ed9e9f5..4003cf27a889e2f5745522583c83a4e134885f06 100644 >--- a/Source/WebCore/xml/XPathStep.cpp >+++ b/Source/WebCore/xml/XPathStep.cpp >@@ -165,14 +165,14 @@ inline bool nodeMatchesBasicTest(Node& node, Step::Axis axis, const Step::NodeTe > case Step::NodeTest::CommentNodeTest: > return node.nodeType() == Node::COMMENT_NODE; > case Step::NodeTest::ProcessingInstructionNodeTest: { >- const AtomicString& name = nodeTest.m_data; >+ const AtomString& name = nodeTest.m_data; > return node.nodeType() == Node::PROCESSING_INSTRUCTION_NODE && (name.isEmpty() || node.nodeName() == name); > } > case Step::NodeTest::AnyNodeTest: > return true; > case Step::NodeTest::NameTest: { >- const AtomicString& name = nodeTest.m_data; >- const AtomicString& namespaceURI = nodeTest.m_namespaceURI; >+ const AtomString& name = nodeTest.m_data; >+ const AtomString& namespaceURI = nodeTest.m_namespaceURI; > > if (axis == Step::AttributeAxis) { > ASSERT(node.isAttributeNode()); >diff --git a/Source/WebCore/xml/XPathStep.h b/Source/WebCore/xml/XPathStep.h >index 0e5fd629cda2d70cf499322f9e290714baa256b6..fbfd92e118ff84bf851224603c5fb4660b8ceb10 100644 >--- a/Source/WebCore/xml/XPathStep.h >+++ b/Source/WebCore/xml/XPathStep.h >@@ -27,7 +27,7 @@ > #pragma once > > #include <wtf/Vector.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebCore { > >@@ -55,8 +55,8 @@ public: > enum Kind { TextNodeTest, CommentNodeTest, ProcessingInstructionNodeTest, AnyNodeTest, NameTest }; > > explicit NodeTest(Kind kind) : m_kind(kind) { } >- NodeTest(Kind kind, const AtomicString& data) : m_kind(kind), m_data(data) { } >- NodeTest(Kind kind, const AtomicString& data, const AtomicString& namespaceURI) : m_kind(kind), m_data(data), m_namespaceURI(namespaceURI) { } >+ NodeTest(Kind kind, const AtomString& data) : m_kind(kind), m_data(data) { } >+ NodeTest(Kind kind, const AtomString& data, const AtomString& namespaceURI) : m_kind(kind), m_data(data), m_namespaceURI(namespaceURI) { } > > private: > friend class Step; >@@ -65,8 +65,8 @@ public: > friend bool nodeMatches(Node&, Axis, const NodeTest&); > > Kind m_kind; >- AtomicString m_data; >- AtomicString m_namespaceURI; >+ AtomString m_data; >+ AtomString m_namespaceURI; > Vector<std::unique_ptr<Expression>> m_mergedPredicates; > }; > >diff --git a/Source/WebCore/xml/parser/XMLDocumentParser.h b/Source/WebCore/xml/parser/XMLDocumentParser.h >index e822c23a0dc8e4c36e30cf3c5b0c76590940f49f..b3d9d93a7ea240e5c546e51cbab03297d3d92fe2 100644 >--- a/Source/WebCore/xml/parser/XMLDocumentParser.h >+++ b/Source/WebCore/xml/parser/XMLDocumentParser.h >@@ -32,7 +32,7 @@ > #include <libxml/tree.h> > #include <libxml/xmlstring.h> > #include <wtf/HashMap.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomStringHash.h> > #include <wtf/text/CString.h> > > namespace WebCore { >@@ -180,9 +180,9 @@ private: > TextPosition m_scriptStartPosition; > > bool m_parsingFragment { false }; >- AtomicString m_defaultNamespaceURI; >+ AtomString m_defaultNamespaceURI; > >- HashMap<AtomicString, AtomicString> m_prefixToNamespaceMap; >+ HashMap<AtomString, AtomString> m_prefixToNamespaceMap; > SegmentedString m_pendingSrc; > }; > >diff --git a/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp b/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp >index 9dc2cb0963836f0c4aaf8d19c3a13e3d68d81a1a..b93101b8aac4839a39bb54b2b89de898c79b75ab 100644 >--- a/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp >+++ b/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp >@@ -673,14 +673,14 @@ static inline String toString(const xmlChar* string) > return String::fromUTF8(reinterpret_cast<const char*>(string)); > } > >-static inline AtomicString toAtomicString(const xmlChar* string, size_t size) >+static inline AtomString toAtomString(const xmlChar* string, size_t size) > { >- return AtomicString::fromUTF8(reinterpret_cast<const char*>(string), size); >+ return AtomString::fromUTF8(reinterpret_cast<const char*>(string), size); > } > >-static inline AtomicString toAtomicString(const xmlChar* string) >+static inline AtomString toAtomString(const xmlChar* string) > { >- return AtomicString::fromUTF8(reinterpret_cast<const char*>(string)); >+ return AtomString::fromUTF8(reinterpret_cast<const char*>(string)); > } > > struct _xmlSAX2Namespace { >@@ -693,8 +693,8 @@ static inline bool handleNamespaceAttributes(Vector<Attribute>& prefixedAttribut > { > xmlSAX2Namespace* namespaces = reinterpret_cast<xmlSAX2Namespace*>(libxmlNamespaces); > for (int i = 0; i < numNamespaces; i++) { >- AtomicString namespaceQName = xmlnsAtom(); >- AtomicString namespaceURI = toAtomicString(namespaces[i].uri); >+ AtomString namespaceQName = xmlnsAtom(); >+ AtomString namespaceURI = toAtomString(namespaces[i].uri); > if (namespaces[i].prefix) > namespaceQName = "xmlns:" + toString(namespaces[i].prefix); > >@@ -721,10 +721,10 @@ static inline bool handleElementAttributes(Vector<Attribute>& prefixedAttributes > xmlSAX2Attributes* attributes = reinterpret_cast<xmlSAX2Attributes*>(libxmlAttributes); > for (int i = 0; i < numAttributes; i++) { > int valueLength = static_cast<int>(attributes[i].end - attributes[i].value); >- AtomicString attrValue = toAtomicString(attributes[i].value, valueLength); >+ AtomString attrValue = toAtomString(attributes[i].value, valueLength); > String attrPrefix = toString(attributes[i].prefix); >- AtomicString attrURI = attrPrefix.isEmpty() ? nullAtom() : toAtomicString(attributes[i].uri); >- AtomicString attrQName = attrPrefix.isEmpty() ? toAtomicString(attributes[i].localname) : attrPrefix + ":" + toString(attributes[i].localname); >+ AtomString attrURI = attrPrefix.isEmpty() ? nullAtom() : toAtomString(attributes[i].uri); >+ AtomString attrQName = attrPrefix.isEmpty() ? toAtomString(attributes[i].localname) : attrPrefix + ":" + toString(attributes[i].localname); > > auto result = Element::parseAttributeName(attrURI, attrQName); > if (result.hasException()) >@@ -761,9 +761,9 @@ void XMLDocumentParser::startElementNs(const xmlChar* xmlLocalName, const xmlCha > if (!updateLeafTextNode()) > return; > >- AtomicString localName = toAtomicString(xmlLocalName); >- AtomicString uri = toAtomicString(xmlURI); >- AtomicString prefix = toAtomicString(xmlPrefix); >+ AtomString localName = toAtomString(xmlLocalName); >+ AtomString uri = toAtomString(xmlURI); >+ AtomString prefix = toAtomString(xmlPrefix); > > if (m_parsingFragment && uri.isNull()) { > if (!prefix.isNull()) >diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp >index dd9a1e3a8c5d76d2dd435303b7b8365ccae092e2..f25e7e602d0964652e681f53ab1ef9b4797bf2ef 100644 >--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp >@@ -85,7 +85,7 @@ > #include <wtf/OptionSet.h> > #include <wtf/ProcessPrivilege.h> > #include <wtf/RunLoop.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > #if ENABLE(SEC_ITEM_SHIM) > #include "SecItemShim.h" >@@ -288,7 +288,7 @@ void NetworkProcess::initializeNetworkProcess(NetworkProcessCreationParameters&& > platformInitializeNetworkProcess(parameters); > > WTF::Thread::setCurrentThreadIsUserInitiated(); >- AtomicString::init(); >+ AtomString::init(); > > m_suppressMemoryPressureHandler = parameters.shouldSuppressMemoryPressureHandler; > if (!m_suppressMemoryPressureHandler) { >diff --git a/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp b/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp >index e5e68138ff55efd12743b5fbd66a046ff34ba20b..1310931b4b0af70d8f65ad774d2f4d9abd4701f3 100644 >--- a/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp >+++ b/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp >@@ -52,10 +52,10 @@ namespace NetworkCache { > > using namespace FileSystem; > >-static const AtomicString& resourceType() >+static const AtomString& resourceType() > { > ASSERT(WTF::RunLoop::isMain()); >- static NeverDestroyed<const AtomicString> resource("Resource", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> resource("Resource", AtomString::ConstructFromLiteral); > return resource; > } > >diff --git a/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp b/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp >index 40ccc5e0c6fa949e36dcab66598f2684b9c6dee8..62f7de5a07ec1f529a6aa3949cbc30be9f6bd610 100644 >--- a/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp >+++ b/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp >@@ -73,10 +73,10 @@ static void logSpeculativeLoadingDiagnosticMessage(NetworkProcess& networkProces > networkProcess.logDiagnosticMessage(frameID.first, WebCore::DiagnosticLoggingKeys::networkCacheKey(), message, WebCore::ShouldSample::Yes); > } > >-static const AtomicString& subresourcesType() >+static const AtomString& subresourcesType() > { > ASSERT(RunLoop::isMain()); >- static NeverDestroyed<const AtomicString> resource("SubResources", AtomicString::ConstructFromLiteral); >+ static NeverDestroyed<const AtomString> resource("SubResources", AtomString::ConstructFromLiteral); > return resource; > } > >diff --git a/Source/WebKit/Platform/IPC/ArgumentCoders.cpp b/Source/WebKit/Platform/IPC/ArgumentCoders.cpp >index 02bf4dcd70edb411e8c535a3ab138085b68a1792..56e6639b8e836c03cd8500dbb48188b33c6028e4 100644 >--- a/Source/WebKit/Platform/IPC/ArgumentCoders.cpp >+++ b/Source/WebKit/Platform/IPC/ArgumentCoders.cpp >@@ -56,18 +56,18 @@ Optional<WallTime> ArgumentCoder<WallTime>::decode(Decoder& decoder) > return WallTime::fromRawSeconds(*time); > } > >-void ArgumentCoder<AtomicString>::encode(Encoder& encoder, const AtomicString& atomicString) >+void ArgumentCoder<AtomString>::encode(Encoder& encoder, const AtomString& atomString) > { >- encoder << atomicString.string(); >+ encoder << atomString.string(); > } > >-bool ArgumentCoder<AtomicString>::decode(Decoder& decoder, AtomicString& atomicString) >+bool ArgumentCoder<AtomString>::decode(Decoder& decoder, AtomString& atomString) > { > String string; > if (!decoder.decode(string)) > return false; > >- atomicString = string; >+ atomString = string; > return true; > } > >diff --git a/Source/WebKit/Platform/IPC/ArgumentCoders.h b/Source/WebKit/Platform/IPC/ArgumentCoders.h >index efa2db54b10c5abe6b8f77877aacad82b48356b4..aa3fce67cb92748896b314fb4abb302dea57ffc2 100644 >--- a/Source/WebKit/Platform/IPC/ArgumentCoders.h >+++ b/Source/WebKit/Platform/IPC/ArgumentCoders.h >@@ -615,9 +615,9 @@ template<> struct ArgumentCoder<WallTime> { > static Optional<WallTime> decode(Decoder&); > }; > >-template<> struct ArgumentCoder<AtomicString> { >- static void encode(Encoder&, const AtomicString&); >- static bool decode(Decoder&, AtomicString&); >+template<> struct ArgumentCoder<AtomString> { >+ static void encode(Encoder&, const AtomString&); >+ static bool decode(Decoder&, AtomString&); > }; > > template<> struct ArgumentCoder<CString> { >diff --git a/Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp b/Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp >index 030657c0fae09c612f3274ad8c661f27175bd895..d409da98b7a6b106b850e00a617efe2db99e2879 100644 >--- a/Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp >+++ b/Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp >@@ -467,7 +467,7 @@ void ContentRuleListStore::getAvailableContentRuleListIdentifiers(CompletionHand > > void ContentRuleListStore::compileContentRuleList(const WTF::String& identifier, WTF::String&& json, CompletionHandler<void(RefPtr<API::ContentRuleList>, std::error_code)> completionHandler) > { >- AtomicString::init(); >+ AtomString::init(); > WebCore::QualifiedName::init(); > > auto parsedRules = WebCore::ContentExtensions::parseRuleList(json); >diff --git a/Source/WebKit/UIProcess/Downloads/DownloadProxy.messages.in b/Source/WebKit/UIProcess/Downloads/DownloadProxy.messages.in >index ea56dab1d625dceff3b27097ab8512badcd6a79e..3757f8f128a3181aa4b49221f1e39fdb9f28305c 100644 >--- a/Source/WebKit/UIProcess/Downloads/DownloadProxy.messages.in >+++ b/Source/WebKit/UIProcess/Downloads/DownloadProxy.messages.in >@@ -21,7 +21,7 @@ > # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > messages -> DownloadProxy { >- DidStart(WebCore::ResourceRequest request, AtomicString suggestedFilename) >+ DidStart(WebCore::ResourceRequest request, AtomString suggestedFilename) > DidReceiveAuthenticationChallenge(WebCore::AuthenticationChallenge challenge, uint64_t challengeID) > WillSendRequest(WebCore::ResourceRequest redirectRequest, WebCore::ResourceResponse redirectResponse)) > DecideDestinationWithSuggestedFilenameAsync(WebKit::DownloadID downloadID, String suggestedFilename) >diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp >index 3491383a375797a3ffc2b6d96d5e39cbd264d90f..d59d9c1bdf79cdb7339805cda7788832927e548f 100644 >--- a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp >+++ b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp >@@ -182,7 +182,7 @@ void RemoteScrollingCoordinatorProxy::handleMouseEvent(const WebCore::PlatformMo > m_scrollingTree->handleMouseEvent(event); > } > >-TrackingType RemoteScrollingCoordinatorProxy::eventTrackingTypeForPoint(const AtomicString& eventName, IntPoint p) const >+TrackingType RemoteScrollingCoordinatorProxy::eventTrackingTypeForPoint(const AtomString& eventName, IntPoint p) const > { > return m_scrollingTree->eventTrackingTypeForPoint(eventName, p); > } >diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h >index 35c2ff107fc70b09647f4984d0d5a8d371f1b91d..72a8eac2f7f661d2317c0c5105f39d423a04e3df 100644 >--- a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h >+++ b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h >@@ -56,7 +56,7 @@ public: > void scrollingTreeNodeDidScroll(WebCore::ScrollingNodeID, const WebCore::FloatPoint& newScrollPosition, const Optional<WebCore::FloatPoint>& layoutViewportOrigin, WebCore::ScrollingLayerPositionAction); > void scrollingTreeNodeRequestsScroll(WebCore::ScrollingNodeID, const WebCore::FloatPoint& scrollPosition, bool representsProgrammaticScroll); > >- WebCore::TrackingType eventTrackingTypeForPoint(const AtomicString& eventName, WebCore::IntPoint) const; >+ WebCore::TrackingType eventTrackingTypeForPoint(const AtomString& eventName, WebCore::IntPoint) const; > > // Called externally when native views move around. > void viewportChangedViaDelegatedScrolling(const WebCore::FloatPoint& scrollPosition, const WebCore::FloatRect& layoutViewport, double scale); >diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp >index 303e74fb73af8abfafda0a4b3b0722ab3c771199..38470e544125baf1684e7e0dd533f607ae429eb7 100644 >--- a/Source/WebKit/UIProcess/WebPageProxy.cpp >+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp >@@ -2527,7 +2527,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent > const EventNames& names = eventNames(); > for (auto& touchPoint : touchStartEvent.touchPoints()) { > IntPoint location = touchPoint.location(); >- auto updateTrackingType = [this, location](TrackingType& trackingType, const AtomicString& eventName) { >+ auto updateTrackingType = [this, location](TrackingType& trackingType, const AtomString& eventName) { > if (trackingType == TrackingType::Synchronous) > return; > >diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h >index f54f67fe486ef1899b1328755cda0788f1cdb3da..93374abbb62d07084cadfebdc20f36e17e5ec255 100644 >--- a/Source/WebKit/UIProcess/WebPageProxy.h >+++ b/Source/WebKit/UIProcess/WebPageProxy.h >@@ -1786,7 +1786,7 @@ private: > #endif > > #if PLATFORM(GTK) >- void getEditorCommandsForKeyEvent(const AtomicString&, Vector<String>&); >+ void getEditorCommandsForKeyEvent(const AtomString&, Vector<String>&); > #endif > > #if USE(ATK) >diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleNavigationAction.h b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleNavigationAction.h >index 9481bd8d30dccd7eecfbb0a3a897dd8864ea19d9..8e2d6b1a0e66f4315794aefa7fdd647a40cd07fc 100644 >--- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleNavigationAction.h >+++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleNavigationAction.h >@@ -62,7 +62,7 @@ public: > > bool shouldOpenExternalURLs() const { return m_shouldOpenExternalURLs; } > bool shouldTryAppLinks() const { return m_shouldTryAppLinks; } >- AtomicString downloadAttribute() const { return m_downloadAttribute; } >+ AtomString downloadAttribute() const { return m_downloadAttribute; } > > private: > InjectedBundleNavigationAction(WebFrame*, const WebCore::NavigationAction&, RefPtr<WebCore::FormState>&&); >@@ -74,7 +74,7 @@ private: > WebCore::FloatPoint m_clickLocationInRootViewCoordinates; > RefPtr<InjectedBundleHitTestResult> m_hitTestResult; > RefPtr<InjectedBundleNodeHandle> m_formElement; >- AtomicString m_downloadAttribute; >+ AtomString m_downloadAttribute; > bool m_shouldOpenExternalURLs; > bool m_shouldTryAppLinks; > }; >diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm b/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm >index 1588bd0e1c50798804ce1414ff033275f45c9bca..0c22a6b780171935d1d236f321bd4c437b3ad734 100644 >--- a/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm >+++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm >@@ -632,7 +632,7 @@ inline PDFPlugin::PDFPlugin(WebFrame& frame) > if (supportsForms()) { > Document* document = webFrame()->coreFrame()->document(); > m_annotationContainer = document->createElement(divTag, false); >- m_annotationContainer->setAttributeWithoutSynchronization(idAttr, AtomicString("annotationContainer", AtomicString::ConstructFromLiteral)); >+ m_annotationContainer->setAttributeWithoutSynchronization(idAttr, AtomString("annotationContainer", AtomString::ConstructFromLiteral)); > > auto annotationStyleElement = document->createElement(styleTag, false); > annotationStyleElement->setTextContent(annotationStyle); >diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm b/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm >index 86ddbd9559913d1f3fc404948daafe656e3d682f..81342d350f24a735d8964c81fc1508b60722a15b 100644 >--- a/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm >+++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm >@@ -67,8 +67,8 @@ void PDFPluginAnnotation::attach(Element* parent) > m_parent = parent; > m_element = createAnnotationElement(); > >- m_element->setAttributeWithoutSynchronization(classAttr, AtomicString("annotation", AtomicString::ConstructFromLiteral)); >- m_element->setAttributeWithoutSynchronization(x_apple_pdf_annotationAttr, AtomicString("true", AtomicString::ConstructFromLiteral)); >+ m_element->setAttributeWithoutSynchronization(classAttr, AtomString("annotation", AtomString::ConstructFromLiteral)); >+ m_element->setAttributeWithoutSynchronization(x_apple_pdf_annotationAttr, AtomString("true", AtomString::ConstructFromLiteral)); > m_element->addEventListener(eventNames().changeEvent, *m_eventListener, false); > m_element->addEventListener(eventNames().blurEvent, *m_eventListener, false); > >diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm b/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm >index d344bcc3fc6603dd798e7648ae31b46f7598294d..073bb95a677e3f10dbd5ca4914525b45a9d7a757 100644 >--- a/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm >+++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm >@@ -88,7 +88,7 @@ Ref<Element> PDFPluginChoiceAnnotation::createAnnotationElement() > choiceOption->setTextContent(choice); > > if (choice == selectedChoice) >- choiceOption->setAttributeWithoutSynchronization(selectedAttr, AtomicString("selected", AtomicString::ConstructFromLiteral)); >+ choiceOption->setAttributeWithoutSynchronization(selectedAttr, AtomString("selected", AtomString::ConstructFromLiteral)); > > styledElement.appendChild(choiceOption); > } >diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp >index 33d4756eda27861ebcdb33d1c9b591ccc5297df5..d3bd438c71cbf641a4a3e5d41131c3edd577ca80 100644 >--- a/Source/WebKit/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp >+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp >@@ -27,7 +27,7 @@ > #include "WebPage.h" > #include "WebPageProxyMessages.h" > #include "WebProcess.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace WebKit { > using namespace WebCore; >@@ -47,7 +47,7 @@ PopupMenu* WebSearchPopupMenu::popupMenu() > return m_popup.get(); > } > >-void WebSearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<RecentSearch>& searchItems) >+void WebSearchPopupMenu::saveRecentSearches(const AtomString& name, const Vector<RecentSearch>& searchItems) > { > if (name.isEmpty()) > return; >@@ -59,7 +59,7 @@ void WebSearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vect > WebProcess::singleton().parentProcessConnection()->send(Messages::WebPageProxy::SaveRecentSearches(name, searchItems), page->pageID()); > } > >-void WebSearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<RecentSearch>& resultItems) >+void WebSearchPopupMenu::loadRecentSearches(const AtomString& name, Vector<RecentSearch>& resultItems) > { > if (name.isEmpty()) > return; >diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebSearchPopupMenu.h b/Source/WebKit/WebProcess/WebCoreSupport/WebSearchPopupMenu.h >index 4e5b3b66c61352fea9788de6d292908ffdf123a2..580664515b07ec52a5d23644ea54efc2498bbdc4 100644 >--- a/Source/WebKit/WebProcess/WebCoreSupport/WebSearchPopupMenu.h >+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebSearchPopupMenu.h >@@ -31,8 +31,8 @@ public: > static Ref<WebSearchPopupMenu> create(WebPage*, WebCore::PopupMenuClient*); > > WebCore::PopupMenu* popupMenu() override; >- void saveRecentSearches(const WTF::AtomicString& name, const Vector<WebCore::RecentSearch>&) override; >- void loadRecentSearches(const WTF::AtomicString& name, Vector<WebCore::RecentSearch>&) override; >+ void saveRecentSearches(const WTF::AtomString& name, const Vector<WebCore::RecentSearch>&) override; >+ void loadRecentSearches(const WTF::AtomString& name, Vector<WebCore::RecentSearch>&) override; > bool enabled() override; > > private: >diff --git a/Source/WebKit/WebProcess/WebPage/VisitedLinkTableController.cpp b/Source/WebKit/WebProcess/WebPage/VisitedLinkTableController.cpp >index ae17cb26225879a88f70bb5789dd505051c865cf..bb1306e299f3f778d9e6525e397002a1819a2acc 100644 >--- a/Source/WebKit/WebProcess/WebPage/VisitedLinkTableController.cpp >+++ b/Source/WebKit/WebProcess/WebPage/VisitedLinkTableController.cpp >@@ -70,7 +70,7 @@ VisitedLinkTableController::~VisitedLinkTableController() > visitedLinkTableControllers().remove(m_identifier); > } > >-bool VisitedLinkTableController::isLinkVisited(Page&, SharedStringHash linkHash, const URL&, const AtomicString&) >+bool VisitedLinkTableController::isLinkVisited(Page&, SharedStringHash linkHash, const URL&, const AtomString&) > { > return m_visitedLinkTable.contains(linkHash); > } >diff --git a/Source/WebKit/WebProcess/WebPage/VisitedLinkTableController.h b/Source/WebKit/WebProcess/WebPage/VisitedLinkTableController.h >index 17fa8ecca78ba8ac27681653a7d2e7fdd70fe273..6726bcaf2cb5b320ee2e74f67f27636af6495186 100644 >--- a/Source/WebKit/WebProcess/WebPage/VisitedLinkTableController.h >+++ b/Source/WebKit/WebProcess/WebPage/VisitedLinkTableController.h >@@ -41,7 +41,7 @@ private: > explicit VisitedLinkTableController(uint64_t identifier); > > // WebCore::VisitedLinkStore. >- bool isLinkVisited(WebCore::Page&, WebCore::SharedStringHash, const URL& baseURL, const AtomicString& attributeURL) override; >+ bool isLinkVisited(WebCore::Page&, WebCore::SharedStringHash, const URL& baseURL, const AtomString& attributeURL) override; > void addVisitedLink(WebCore::Page&, WebCore::SharedStringHash) override; > > // IPC::MessageReceiver. >diff --git a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm >index 75d12f541d85760806398dfb52eade97e8c0f3dc..c6dbee9822d5a87fc4fb47766daed56cc548f385 100644 >--- a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm >+++ b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm >@@ -2906,7 +2906,7 @@ void WebPage::getFocusedElementInformation(FocusedElementInformation& informatio > else if (element.isURLField()) > information.elementType = InputType::URL; > else if (element.isText()) { >- const AtomicString& pattern = element.attributeWithoutSynchronization(HTMLNames::patternAttr); >+ const AtomString& pattern = element.attributeWithoutSynchronization(HTMLNames::patternAttr); > if (pattern == "\\d*" || pattern == "[0-9]*") > information.elementType = InputType::NumberPad; > else { >diff --git a/Source/WebKit/WebProcess/WebProcess.h b/Source/WebKit/WebProcess/WebProcess.h >index 89901cecf0f96fb2288345d57da8aaaf46f4cfb1..d4c01bab1f93da9085b0f2194cd327d4718650b2 100644 >--- a/Source/WebKit/WebProcess/WebProcess.h >+++ b/Source/WebKit/WebProcess/WebProcess.h >@@ -52,8 +52,8 @@ > #include <wtf/HashMap.h> > #include <wtf/HashSet.h> > #include <wtf/RefCounter.h> >-#include <wtf/text/AtomicString.h> >-#include <wtf/text/AtomicStringHash.h> >+#include <wtf/text/AtomString.h> >+#include <wtf/text/AtomStringHash.h> > > #if PLATFORM(COCOA) > #include <dispatch/dispatch.h> >diff --git a/Source/WebKitLegacy/ios/WebCoreSupport/SearchPopupMenuIOS.cpp b/Source/WebKitLegacy/ios/WebCoreSupport/SearchPopupMenuIOS.cpp >index 8049b1ccc272c3472599e4942e5006cb8681517a..c01ecbc531c446835ce83482bd8bfbe2ac8834df 100644 >--- a/Source/WebKitLegacy/ios/WebCoreSupport/SearchPopupMenuIOS.cpp >+++ b/Source/WebKitLegacy/ios/WebCoreSupport/SearchPopupMenuIOS.cpp >@@ -19,7 +19,7 @@ > > #include "SearchPopupMenuIOS.h" > >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > #if PLATFORM(IOS_FAMILY) > >@@ -35,11 +35,11 @@ PopupMenu* SearchPopupMenuIOS::popupMenu() > return m_popup.ptr(); > } > >-void SearchPopupMenuIOS::saveRecentSearches(const AtomicString&, const Vector<RecentSearch>& /*searchItems*/) >+void SearchPopupMenuIOS::saveRecentSearches(const AtomString&, const Vector<RecentSearch>& /*searchItems*/) > { > } > >-void SearchPopupMenuIOS::loadRecentSearches(const AtomicString&, Vector<RecentSearch>& /*searchItems*/) >+void SearchPopupMenuIOS::loadRecentSearches(const AtomString&, Vector<RecentSearch>& /*searchItems*/) > { > } > >diff --git a/Source/WebKitLegacy/ios/WebCoreSupport/SearchPopupMenuIOS.h b/Source/WebKitLegacy/ios/WebCoreSupport/SearchPopupMenuIOS.h >index 0ef44b42a660ae352c8bee69550ab2df0f9534e9..369f8691816ffd0a7717ab94bfd1d6f380fbfcad 100644 >--- a/Source/WebKitLegacy/ios/WebCoreSupport/SearchPopupMenuIOS.h >+++ b/Source/WebKitLegacy/ios/WebCoreSupport/SearchPopupMenuIOS.h >@@ -33,8 +33,8 @@ public: > SearchPopupMenuIOS(WebCore::PopupMenuClient*); > > WebCore::PopupMenu* popupMenu() override; >- void saveRecentSearches(const AtomicString& name, const Vector<WebCore::RecentSearch>&) override; >- void loadRecentSearches(const AtomicString& name, Vector<WebCore::RecentSearch>&) override; >+ void saveRecentSearches(const AtomString& name, const Vector<WebCore::RecentSearch>&) override; >+ void loadRecentSearches(const AtomString& name, Vector<WebCore::RecentSearch>&) override; > bool enabled() override; > > private: >diff --git a/Source/WebKitLegacy/mac/DOM/DOMDocument.mm b/Source/WebKitLegacy/mac/DOM/DOMDocument.mm >index 7d33c7edbb206f3b6e24d7dcbfda4e123ed285a5..319933f8d67e69893f5b0934985bc5c50860eb6e 100644 >--- a/Source/WebKitLegacy/mac/DOM/DOMDocument.mm >+++ b/Source/WebKitLegacy/mac/DOM/DOMDocument.mm >@@ -731,7 +731,7 @@ - (void)webkitExitFullscreen > - (DOMElement *)getElementById:(NSString *)elementId > { > WebCore::JSMainThreadNullState state; >- return kit(WTF::getPtr(IMPL->getElementById(AtomicString(elementId)))); >+ return kit(WTF::getPtr(IMPL->getElementById(AtomString(elementId)))); > } > > - (DOMElement *)querySelector:(NSString *)selectors >diff --git a/Source/WebKitLegacy/mac/DOM/DOMDocumentFragment.mm b/Source/WebKitLegacy/mac/DOM/DOMDocumentFragment.mm >index 2ee2cf84c63948c0002f8a65d8cd669a7679d24c..eb2ec015b950b3a08697f909d8db5fec0d361d4c 100644 >--- a/Source/WebKitLegacy/mac/DOM/DOMDocumentFragment.mm >+++ b/Source/WebKitLegacy/mac/DOM/DOMDocumentFragment.mm >@@ -72,7 +72,7 @@ - (unsigned)childElementCount > - (DOMElement *)getElementById:(NSString *)elementId > { > WebCore::JSMainThreadNullState state; >- return kit(WTF::getPtr(IMPL->getElementById(AtomicString(elementId)))); >+ return kit(WTF::getPtr(IMPL->getElementById(AtomString(elementId)))); > } > > - (DOMElement *)querySelector:(NSString *)selectors >diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/SearchPopupMenuMac.h b/Source/WebKitLegacy/mac/WebCoreSupport/SearchPopupMenuMac.h >index 553dc7e491ee36134723755d3090e58c370bda77..1ac17c9cc3e71de21e456b41f416f6880284db77 100644 >--- a/Source/WebKitLegacy/mac/WebCoreSupport/SearchPopupMenuMac.h >+++ b/Source/WebKitLegacy/mac/WebCoreSupport/SearchPopupMenuMac.h >@@ -35,8 +35,8 @@ public: > ~SearchPopupMenuMac(); > > WebCore::PopupMenu* popupMenu() override; >- void saveRecentSearches(const AtomicString& name, const Vector<WebCore::RecentSearch>&) override; >- void loadRecentSearches(const AtomicString& name, Vector<WebCore::RecentSearch>&) override; >+ void saveRecentSearches(const AtomString& name, const Vector<WebCore::RecentSearch>&) override; >+ void loadRecentSearches(const AtomString& name, Vector<WebCore::RecentSearch>&) override; > bool enabled() override; > > private: >diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/SearchPopupMenuMac.mm b/Source/WebKitLegacy/mac/WebCoreSupport/SearchPopupMenuMac.mm >index aed51da904d561b9fef1931a32ffae540e669b76..eefd1d1d86c6d273577e9f41c0d088780b6bfb9d 100644 >--- a/Source/WebKitLegacy/mac/WebCoreSupport/SearchPopupMenuMac.mm >+++ b/Source/WebKitLegacy/mac/WebCoreSupport/SearchPopupMenuMac.mm >@@ -21,7 +21,7 @@ > #import "SearchPopupMenuMac.h" > > #include "PopupMenuMac.h" >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > SearchPopupMenuMac::SearchPopupMenuMac(WebCore::PopupMenuClient* client) > : m_popup(adoptRef(new PopupMenuMac(client))) >@@ -42,12 +42,12 @@ bool SearchPopupMenuMac::enabled() > return true; > } > >-void SearchPopupMenuMac::saveRecentSearches(const AtomicString& name, const Vector<WebCore::RecentSearch>& searchItems) >+void SearchPopupMenuMac::saveRecentSearches(const AtomString& name, const Vector<WebCore::RecentSearch>& searchItems) > { > WebCore::saveRecentSearches(name, searchItems); > } > >-void SearchPopupMenuMac::loadRecentSearches(const AtomicString& name, Vector<WebCore::RecentSearch>& searchItems) >+void SearchPopupMenuMac::loadRecentSearches(const AtomString& name, Vector<WebCore::RecentSearch>& searchItems) > { > searchItems = WebCore::loadRecentSearches(name); > } >diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.h b/Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.h >index 20ee51879455972ab4b03c462ae31f3949ec913d..9050ca8265d561f107263d0b2e110d50e818ee30 100644 >--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.h >+++ b/Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.h >@@ -44,7 +44,7 @@ public: > private: > WebVisitedLinkStore(); > >- bool isLinkVisited(WebCore::Page&, WebCore::SharedStringHash, const URL& baseURL, const AtomicString& attributeURL) override; >+ bool isLinkVisited(WebCore::Page&, WebCore::SharedStringHash, const URL& baseURL, const AtomString& attributeURL) override; > void addVisitedLink(WebCore::Page&, WebCore::SharedStringHash) override; > > void populateVisitedLinksIfNeeded(WebCore::Page&); >diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.mm b/Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.mm >index ad3ca278bbd5e4405315280e546d43ba4cc50504..0844b39d3670553a0932271cedb739070a185c8b 100644 >--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.mm >+++ b/Source/WebKitLegacy/mac/WebCoreSupport/WebVisitedLinkStore.mm >@@ -105,7 +105,7 @@ void WebVisitedLinkStore::removeVisitedLink(NSString *urlString) > invalidateStylesForLink(linkHash); > } > >-bool WebVisitedLinkStore::isLinkVisited(Page& page, SharedStringHash linkHash, const URL& baseURL, const AtomicString& attributeURL) >+bool WebVisitedLinkStore::isLinkVisited(Page& page, SharedStringHash linkHash, const URL& baseURL, const AtomString& attributeURL) > { > populateVisitedLinksIfNeeded(page); > >diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLRepresentation.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLRepresentation.mm >index cc4aa6c9044d1989ba3be084dfcc3fa20f8532f3..76a575acd973c32652c2840a9113fbf0a893f845 100644 >--- a/Source/WebKitLegacy/mac/WebView/WebHTMLRepresentation.mm >+++ b/Source/WebKitLegacy/mac/WebView/WebHTMLRepresentation.mm >@@ -285,7 +285,7 @@ - (DOMElement *)elementWithName:(NSString *)name inForm:(DOMElement *)form > > ScriptDisallowedScope::InMainThread scriptDisallowedScope; > auto& elements = formElement->unsafeAssociatedElements(); >- AtomicString targetName = name; >+ AtomString targetName = name; > for (unsigned i = 0; i < elements.size(); i++) { > FormAssociatedElement& element = *elements[i]; > if (element.name() == targetName) >diff --git a/Source/WebKitLegacy/win/AccessibleBase.cpp b/Source/WebKitLegacy/win/AccessibleBase.cpp >index 542477a9e9e0a942d65be0ee2c90b4d2969a6c38..d8391b53f64e811ef9113d82e3df2242dac9543a 100644 >--- a/Source/WebKitLegacy/win/AccessibleBase.cpp >+++ b/Source/WebKitLegacy/win/AccessibleBase.cpp >@@ -143,7 +143,7 @@ HRESULT AccessibleBase::get_attribute(_In_ BSTR key, _Out_ VARIANT* value) > if (!value) > return E_POINTER; > >- AtomicString keyAtomic(key, ::SysStringLen(key)); >+ AtomString keyAtomic(key, ::SysStringLen(key)); > > accessibilityAttributeValue(keyAtomic, value); > >diff --git a/Source/WebKitLegacy/win/AccessibleImage.cpp b/Source/WebKitLegacy/win/AccessibleImage.cpp >index 5ff52244d9a06c23019dbfa50ed7427ecc88f884..5b666456520ad05d91ddda1bae7ef7fe0c8f585c 100644 >--- a/Source/WebKitLegacy/win/AccessibleImage.cpp >+++ b/Source/WebKitLegacy/win/AccessibleImage.cpp >@@ -49,7 +49,7 @@ String AccessibleImage::name() const > if (!ariaLabel.isEmpty()) > return ariaLabel; > >- const AtomicString& altText = obj.getAttribute(HTMLNames::altAttr); >+ const AtomString& altText = obj.getAttribute(HTMLNames::altAttr); > if (!altText.isEmpty()) > return altText; > >diff --git a/Source/WebKitLegacy/win/DOMCoreClasses.cpp b/Source/WebKitLegacy/win/DOMCoreClasses.cpp >index eada3e6bc55c0017fec9f0ec1958d9c41c77efa1..b6264373d65c89659e07549230a2c11298ee2b19 100644 >--- a/Source/WebKitLegacy/win/DOMCoreClasses.cpp >+++ b/Source/WebKitLegacy/win/DOMCoreClasses.cpp >@@ -66,7 +66,7 @@ DEFINE_GUID(IID_DOMElement, 0x3b0c0eff, 0x478b, 0x4b0b, 0x82, 0x90, 0xd2, 0x32, > // "DOMObject" exists both in the WebCore namespace and unnamespaced in this > // file, which leads to ambiguities if we say "using namespace WebCore". > using namespace WebCore::HTMLNames; >-using WTF::AtomicString; >+using WTF::AtomString; > using WebCore::BString; > using WebCore::Element; > using WebCore::ExceptionCode; >@@ -1286,7 +1286,7 @@ HRESULT DOMElement::font(_Out_ WebFontDescription* webFontDescription) > return E_FAIL; > > auto fontDescription = renderer->style().fontCascade().fontDescription(); >- AtomicString family = fontDescription.firstFamily(); >+ AtomString family = fontDescription.firstFamily(); > > // FIXME: This leaks. Delete this whole function to get rid of the leak. > UChar* familyCharactersBuffer = new UChar[family.length()]; >diff --git a/Source/WebKitLegacy/win/Interfaces/DOMEvents.idl b/Source/WebKitLegacy/win/Interfaces/DOMEvents.idl >index 6b0130308489f60542a231a8e340e9dadaa21155..5c443268a40723eca62aa713deeb76f1ba265db0 100644 >--- a/Source/WebKitLegacy/win/Interfaces/DOMEvents.idl >+++ b/Source/WebKitLegacy/win/Interfaces/DOMEvents.idl >@@ -196,7 +196,7 @@ interface IDOMKeyboardEvent : IDOMUIEvent > HRESULT getModifierState([in] BSTR keyIdentifierArg, [out, retval] BOOL* result); > > // FIXME: this does not match the version in the DOM spec. >- //void initKeyboardEvent(AtomicString type, >+ //void initKeyboardEvent(AtomString type, > // boolean canBubble, > // boolean cancelable, > // DOMWindow view, >@@ -216,7 +216,7 @@ interface IDOMKeyboardEvent : IDOMUIEvent > //readonly attribute long charCode; > //HRESULT charCode([out, retval] long* result); > >- //void initKeyboardEvent(AtomicString type, >+ //void initKeyboardEvent(AtomString type, > // boolean canBubble, > // boolean cancelable, > // DOMWindow view, >@@ -266,7 +266,7 @@ interface IDOMMouseEvent : IDOMUIEvent > //readonly attribute EventTarget relatedTarget; > HRESULT relatedTarget([out, retval] IDOMEventTarget** result); > >- //[OldStyleObjC] void initMouseEvent(AtomicString type, >+ //[OldStyleObjC] void initMouseEvent(AtomString type, > // boolean canBubble, > // boolean cancelable, > // DOMWindow view, >@@ -331,7 +331,7 @@ interface IDOMMutationEvent : IDOMEvent > //readonly attribute unsigned short attrChange; > HRESULT attrChange([out, retval] unsigned short* result); > >- //[OldStyleObjC] void initMutationEvent(AtomicString type, >+ //[OldStyleObjC] void initMutationEvent(AtomString type, > // boolean canBubble, > // boolean cancelable, > // Node relatedNode, >@@ -378,7 +378,7 @@ interface IDOMUIEvent : IDOMEvent > //readonly attribute long detail; > HRESULT detail([out, retval] long* result); > >- //[OldStyleObjC] void initUIEvent(AtomicString type, >+ //[OldStyleObjC] void initUIEvent(AtomString type, > // boolean canBubble, > // boolean cancelable, > // DOMWindow view, >diff --git a/Source/WebKitLegacy/win/WebCoreSupport/WebVisitedLinkStore.cpp b/Source/WebKitLegacy/win/WebCoreSupport/WebVisitedLinkStore.cpp >index 2a7a7d7e578d45cb73a638b298deda846c790734..2a5e105367a0fff695f80531bc4b5c7b99999d73 100644 >--- a/Source/WebKitLegacy/win/WebCoreSupport/WebVisitedLinkStore.cpp >+++ b/Source/WebKitLegacy/win/WebCoreSupport/WebVisitedLinkStore.cpp >@@ -78,7 +78,7 @@ void WebVisitedLinkStore::addVisitedLink(const String& urlString) > addVisitedLinkHash(computeSharedStringHash(urlString)); > } > >-bool WebVisitedLinkStore::isLinkVisited(Page& page, SharedStringHash linkHash, const URL& baseURL, const AtomicString& attributeURL) >+bool WebVisitedLinkStore::isLinkVisited(Page& page, SharedStringHash linkHash, const URL& baseURL, const AtomString& attributeURL) > { > populateVisitedLinksIfNeeded(page); > >diff --git a/Source/WebKitLegacy/win/WebCoreSupport/WebVisitedLinkStore.h b/Source/WebKitLegacy/win/WebCoreSupport/WebVisitedLinkStore.h >index 8bede9e2581918320270eab65274a7a906db58a0..cf8c3a8f9b21c3c24f23e94c288cc960695436ef 100644 >--- a/Source/WebKitLegacy/win/WebCoreSupport/WebVisitedLinkStore.h >+++ b/Source/WebKitLegacy/win/WebCoreSupport/WebVisitedLinkStore.h >@@ -42,7 +42,7 @@ public: > private: > WebVisitedLinkStore(); > >- bool isLinkVisited(WebCore::Page&, WebCore::SharedStringHash, const URL& baseURL, const AtomicString& attributeURL) override; >+ bool isLinkVisited(WebCore::Page&, WebCore::SharedStringHash, const URL& baseURL, const AtomString& attributeURL) override; > void addVisitedLink(WebCore::Page&, WebCore::SharedStringHash) override; > > void populateVisitedLinksIfNeeded(WebCore::Page&); >diff --git a/Source/WebKitLegacy/win/WebFrame.cpp b/Source/WebKitLegacy/win/WebFrame.cpp >index 100d390614b545d11ae2aed6a5115d0cfcf332ab..2224209a3f20629779c07cfee802ff0d0bbc9b91 100644 >--- a/Source/WebKitLegacy/win/WebFrame.cpp >+++ b/Source/WebKitLegacy/win/WebFrame.cpp >@@ -731,7 +731,7 @@ HRESULT WebFrame::findFrameNamed(_In_ BSTR name, _COM_Outptr_opt_ IWebFrame** fr > if (!coreFrame) > return E_UNEXPECTED; > >- Frame* foundFrame = coreFrame->tree().find(AtomicString(name, SysStringLen(name)), *coreFrame); >+ Frame* foundFrame = coreFrame->tree().find(AtomString(name, SysStringLen(name)), *coreFrame); > if (!foundFrame) > return S_OK; > >@@ -1130,7 +1130,7 @@ HRESULT WebFrame::elementWithName(BSTR name, IDOMElement* form, IDOMElement** el > > HTMLFormElement* formElement = formElementFromDOMElement(form); > if (formElement) { >- AtomicString targetName((UChar*)name, SysStringLen(name)); >+ AtomString targetName((UChar*)name, SysStringLen(name)); > for (auto& associatedElement : formElement->copyAssociatedElementsVector()) { > if (!is<HTMLFormControlElement>(associatedElement.get())) > continue; >diff --git a/Source/WebKitLegacy/win/WebKitGraphics.cpp b/Source/WebKitLegacy/win/WebKitGraphics.cpp >index ad1ab178e42f442bd1c5523ffed6cb8ffe516bf0..875548bc4fa5c62cdb203aca9e1c5cb7be5245ba 100644 >--- a/Source/WebKitLegacy/win/WebKitGraphics.cpp >+++ b/Source/WebKitLegacy/win/WebKitGraphics.cpp >@@ -46,7 +46,7 @@ using namespace WebCore; > > static FontCascade makeFont(const WebFontDescription& description) > { >- AtomicString::init(); >+ AtomString::init(); > > String fontFamilyString(description.family, description.familyLength); > >diff --git a/Source/WebKitLegacy/win/WebMutableURLRequest.cpp b/Source/WebKitLegacy/win/WebMutableURLRequest.cpp >index 1fe1145aec20088a6fb1fbf98db032c06d09b285..3362379884b3a4855d66c1768453c227e7c74147 100644 >--- a/Source/WebKitLegacy/win/WebMutableURLRequest.cpp >+++ b/Source/WebKitLegacy/win/WebMutableURLRequest.cpp >@@ -272,7 +272,7 @@ HRESULT WebMutableURLRequest::isEqual(_In_opt_ IWebURLRequest* other, _Out_ BOOL > > HRESULT WebMutableURLRequest::addValue(_In_ BSTR value, _In_ BSTR field) > { >- m_request.addHTTPHeaderField(WTF::AtomicString(value, SysStringLen(value)), String(field, SysStringLen(field))); >+ m_request.addHTTPHeaderField(WTF::AtomString(value, SysStringLen(value)), String(field, SysStringLen(field))); > return S_OK; > } > >diff --git a/Source/WebKitLegacy/win/WebView.cpp b/Source/WebKitLegacy/win/WebView.cpp >index a89acc000d5ee7b42e717c4e9f36d28cd5ca4a81..d51aa3457145d7fa7ce6161f86093a372dd3da94 100644 >--- a/Source/WebKitLegacy/win/WebView.cpp >+++ b/Source/WebKitLegacy/win/WebView.cpp >@@ -255,9 +255,9 @@ WebView* kit(Page* page) > return static_cast<WebChromeClient&>(page->chrome().client()).webView(); > } > >-static inline AtomicString toAtomicString(BSTR bstr) >+static inline AtomString toAtomString(BSTR bstr) > { >- return AtomicString(bstr, SysStringLen(bstr)); >+ return AtomString(bstr, SysStringLen(bstr)); > } > > static inline String toString(BSTR bstr) >@@ -5115,7 +5115,7 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification) > hr = preferences->cursiveFontFamily(&str); > if (FAILED(hr)) > return hr; >- settings.setCursiveFontFamily(toAtomicString(str)); >+ settings.setCursiveFontFamily(toAtomString(str)); > str.clear(); > > hr = preferences->defaultFixedFontSize(&size); >@@ -5137,13 +5137,13 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification) > hr = preferences->fantasyFontFamily(&str); > if (FAILED(hr)) > return hr; >- settings.setFantasyFontFamily(toAtomicString(str)); >+ settings.setFantasyFontFamily(toAtomString(str)); > str.clear(); > > hr = preferences->fixedFontFamily(&str); > if (FAILED(hr)) > return hr; >- settings.setFixedFontFamily(toAtomicString(str)); >+ settings.setFixedFontFamily(toAtomString(str)); > str.clear(); > > #if ENABLE(VIDEO_TRACK) >@@ -5175,7 +5175,7 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification) > hr = preferences->pictographFontFamily(&str); > if (FAILED(hr)) > return hr; >- settings.setPictographFontFamily(toAtomicString(str)); >+ settings.setPictographFontFamily(toAtomString(str)); > str.clear(); > > hr = preferences->isJavaEnabled(&enabled); >@@ -5311,19 +5311,19 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification) > hr = preferences->sansSerifFontFamily(&str); > if (FAILED(hr)) > return hr; >- settings.setSansSerifFontFamily(toAtomicString(str)); >+ settings.setSansSerifFontFamily(toAtomString(str)); > str.clear(); > > hr = preferences->serifFontFamily(&str); > if (FAILED(hr)) > return hr; >- settings.setSerifFontFamily(toAtomicString(str)); >+ settings.setSerifFontFamily(toAtomString(str)); > str.clear(); > > hr = preferences->standardFontFamily(&str); > if (FAILED(hr)) > return hr; >- settings.setStandardFontFamily(toAtomicString(str)); >+ settings.setStandardFontFamily(toAtomString(str)); > str.clear(); > > hr = preferences->loadsImagesAutomatically(&enabled); >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index d34482ad33657e9ea22e04eb5d13334b8370c9ad..848e48a66e9b1df7b4003b5dc34e3c2dc953ab8b 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,15 @@ >+2019-06-15 Darin Adler <darin@apple.com> >+ >+ Rename AtomicString to AtomString >+ https://bugs.webkit.org/show_bug.cgi?id=195276 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * many files: Let do-webcore-rename do the renaming. >+ >+ * Scripts/do-webcore-rename: Updated with a list of all the identifiers >+ that mention "atomic string" and changed them to instead say "atom string". >+ > 2019-06-14 Youenn Fablet <youenn@apple.com> > > WebResourceLoadStatisticsStore should not use its network session if invalidated >diff --git a/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp b/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp >index b414619879955b87870d62c7e4a9e462444e9c99..43aa360d11825ebd325d6a65b01d00d38265291c 100644 >--- a/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp >+++ b/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp >@@ -40,7 +40,7 @@ > #include <oleacc.h> > #include <string> > #include <wtf/Assertions.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > AccessibilityController::AccessibilityController() = default; > >diff --git a/Tools/Scripts/do-webcore-rename b/Tools/Scripts/do-webcore-rename >index 7b7ed396be2206c8fb4f1cff6c69e8dc03725c38..8998f7675e8d4c75e3bfc036185a64302c942bb7 100755 >--- a/Tools/Scripts/do-webcore-rename >+++ b/Tools/Scripts/do-webcore-rename >@@ -76,6 +76,8 @@ find(\&wanted, "Source/WTF"); > find(\&wanted, "Source/WebCore"); > find(\&wanted, "Source/WebKitLegacy"); > find(\&wanted, "Source/WebKit"); >+find(\&wanted, "Tools/gdb"); >+find(\&wanted, "Tools/lldb"); > find(\&wanted, "Tools/DumpRenderTree"); > find(\&wanted, "Tools/TestWebKitAPI"); > >@@ -100,13 +102,59 @@ sub wanted > my $isDOMTypeRename = 0; > my %renames = ( > # Renames go here in the form of: >- "ConstructorRaisesException" => "ConstructorMayThrowLegacyException", >- "GetterRaisesException" => "GetterMayThrowLegacyException", >- "GetterRaisesExceptionWithMessage" => "GetterMayThrowLegacyExceptionWithMessage", >- "RaisesException" => "MayThrowLegacyException", >- "RaisesExceptionWithMessage" => "MayThrowLegacyExceptionWithMessage", >- "SetterRaisesException" => "SetterMayThrowLegacyException", >- "SetterRaisesExceptionWithMessage" => "SetterMayThrowLegacyExceptionWithMessage", >+ "AtomicString" => "AtomString", >+ "AtomicStringCreationFromLiteral" => "AtomStringCreationFromLiteral", >+ "AtomicStringCreationFromLiteralUniqueness" => "AtomStringCreationFromLiteralUniqueness", >+ "AtomicStringExistingHash" => "AtomStringExistingHash", >+ "AtomicStringFromLiteralCannotOverflow" => "AtomStringFromLiteralCannotOverflow", >+ "AtomicStringFromLiteralNotEmpty" => "AtomStringFromLiteralNotEmpty", >+ "AtomicStringHash" => "AtomStringHash", >+ "AtomicStringImpl" => "AtomStringImpl", >+ "AtomicStringImplCF" => "AtomStringImplCF", >+ "AtomicStringNumberDouble" => "AtomStringNumberDouble", >+ "AtomicStringTable" => "AtomStringTable", >+ "AtomicStringTable" => "AtomStringTable", >+ "AtomicStringTableLocker" => "AtomStringTableLocker", >+ "AtomicString_h" => "AtomString_h", >+ "IDLAtomicStringAdaptor" => "IDLAtomStringAdaptor", >+ "IDLRequiresExistingAtomicStringAdaptor" => "IDLRequiresExistingAtomStringAdaptor", >+ "RequiresExistingAtomicString" => "RequiresExistingAtomString", >+ "StringImplNullSymbolToAtomicString" => "StringImplNullSymbolToAtomString", >+ "StringImplStaticToAtomicString" => "StringImplStaticToAtomString", >+ "StringImplSymbolToAtomicString" => "StringImplSymbolToAtomString", >+ "ToAtomicString" => "ToAtomString", >+ "ToAtomicStringOnEmpty" => "ToAtomStringOnEmpty", >+ "TokenAtomicStringInitializer" => "TokenAtomStringInitializer", >+ "WTFAtomicStringPrinter" => "WTFAtomStringPrinter", >+ "WTFAtomicString_SummaryProvider" => "WTFAtomString_SummaryProvider", >+ "atomicString" => "atomString", >+ "atomicString1" => "atomString1", >+ "atomicString2" => "atomString2", >+ "atomicStringTable" => "atomStringTable", >+ "atomicStringWithTemplate" => "atomStringWithTemplate", >+ "atomicStrings" => "atomStrings", >+ "checkCurrentAtomicStringTable" => "checkCurrentAtomStringTable", >+ "existingAtomicString" => "existingAtomString", >+ "existingEntryAtomicStringTable" => "existingEntryAtomStringTable", >+ "getPropertyNameAtomicString" => "getPropertyNameAtomString", >+ "getValueNameAtomicString" => "getValueNameAtomString", >+ "isAtomic" => "isAtom", >+ "isAtomicString" => "isAtomString", >+ "isInAtomicStringTable" => "isInAtomStringTable", >+ "m_atomicStringTable" => "m_atomStringTable", >+ "m_currentAtomicStringTable" => "m_currentAtomStringTable", >+ "m_defaultAtomicStringTable" => "m_defaultAtomStringTable", >+ "m_entryAtomicStringTable" => "m_entryAtomStringTable", >+ "oldAtomicStringTable" => "oldAtomStringTable", >+ "propertyNameToAtomicString" => "propertyNameToAtomString", >+ "resolveRopeToAtomicString" => "resolveRopeToAtomString", >+ "resolveRopeToExistingAtomicString" => "resolveRopeToExistingAtomString", >+ "setCurrentAtomicStringTable" => "setCurrentAtomStringTable", >+ "shouldUseAtomicString" => "shouldUseAtomString", >+ "testAtomicStringNumber" => "testAtomStringNumber", >+ "toAtomicString" => "toAtomString", >+ "toExistingAtomicString" => "toExistingAtomString", >+ "useAtomicString" => "useAtomString", > ); > > my %renamesContemplatedForTheFuture = ( >@@ -219,17 +267,10 @@ for my $file (sort @paths) { > } > } else { > for my $from (@sortedRenameKeys) { >- $newContents =~ s/\b$from(?!["\w])/$renames{$from}/g; # this " unconfuses Xcode syntax highlighting >+ $newContents =~ s/\b$from\b/$renames{$from}/g; # this " unconfuses Xcode syntax highlighting > } > } > >- # Remove the "virtual" keyword from virtual/override lines. >- # Should be a no-op but also OK to remove this any time, now that we have done it once. >- $newContents =~ s/^(\s*(\w+EXPORT\w*\s+)?)virtual ([^{;]+ override\b)/$1$3/mg; >- $newContents =~ s/^(\s*(\w+EXPORT\w*\s+)?)virtual ([^{;]+ final\b)/$1$3/mg; >- $newContents =~ s/\boverride\s+final\b/final/g; >- $newContents =~ s/\bfinal\s+override\b/final/g; >- > if ($newContents ne $contents) { > open FILE, ">", $file or die "Failed to open $file"; > print FILE $newContents; >diff --git a/Tools/TestWebKitAPI/CMakeLists.txt b/Tools/TestWebKitAPI/CMakeLists.txt >index c49d97aedc3b1a1ce240468ba837251788a27180..7adb608eeaa611b66b1ed5074a5917d0a0df8548 100644 >--- a/Tools/TestWebKitAPI/CMakeLists.txt >+++ b/Tools/TestWebKitAPI/CMakeLists.txt >@@ -24,7 +24,7 @@ set(TestWTF_SOURCES > Counters.cpp > TestsController.cpp > >- Tests/WTF/AtomicString.cpp >+ Tests/WTF/AtomString.cpp > Tests/WTF/BloomFilter.cpp > Tests/WTF/CString.cpp > Tests/WTF/CheckedArithmeticOperations.cpp >diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj >index f6069bd88953cc3510b087e1a0e2a2c7dfa40e56..fdbcd968ad33f26db15a4cf4841ed064cd18396c 100644 >--- a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj >+++ b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj >@@ -406,7 +406,7 @@ > 7C3DB8E41D12129B00AE8CC3 /* CommandBackForward.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C3DB8E21D12129B00AE8CC3 /* CommandBackForward.mm */; }; > 7C417F331D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C417F311D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm */; }; > 7C486BA11AA12567003F6F9B /* bundle-file.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 7C486BA01AA1254B003F6F9B /* bundle-file.html */; }; >- 7C83DE991D0A590C00FEBCF3 /* AtomicString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F1B44215CA434F00D1E4BF /* AtomicString.cpp */; }; >+ 7C83DE991D0A590C00FEBCF3 /* AtomString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F1B44215CA434F00D1E4BF /* AtomString.cpp */; }; > 7C83DE9C1D0A590C00FEBCF3 /* BloomFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E40019301ACE9B5C001B0A2A /* BloomFilter.cpp */; }; > 7C83DEA01D0A590C00FEBCF3 /* CheckedArithmeticOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7A966DA140ECCC8005EF9B4 /* CheckedArithmeticOperations.cpp */; }; > 7C83DEA61D0A590C00FEBCF3 /* Counters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C6BBD8B19CEA63000C1F5E0 /* Counters.cpp */; }; >@@ -1461,7 +1461,7 @@ > 26B2DFF815BDE599004F691D /* HashSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HashSet.cpp; sourceTree = "<group>"; }; > 26DF5A5D15A29BAA003689C2 /* CancelLoadFromResourceLoadDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CancelLoadFromResourceLoadDelegate.mm; sourceTree = "<group>"; }; > 26DF5A6115A2A22B003689C2 /* CancelLoadFromResourceLoadDelegate.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = CancelLoadFromResourceLoadDelegate.html; sourceTree = "<group>"; }; >- 26F1B44215CA434F00D1E4BF /* AtomicString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomicString.cpp; sourceTree = "<group>"; }; >+ 26F1B44215CA434F00D1E4BF /* AtomString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomString.cpp; sourceTree = "<group>"; }; > 26F1B44315CA434F00D1E4BF /* StringImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringImpl.cpp; sourceTree = "<group>"; }; > 26F52EAA182872600023D412 /* Geolocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Geolocation.cpp; sourceTree = "<group>"; }; > 26F52EAC1828820E0023D412 /* geolocationGetCurrentPosition.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = geolocationGetCurrentPosition.html; sourceTree = "<group>"; }; >@@ -3392,7 +3392,7 @@ > E3C21A7821B25C82003B31A3 /* cocoa */, > 7CBBA07519BB8A0900BBF025 /* darwin */, > BC029B1A1486B23800817DA9 /* ns */, >- 26F1B44215CA434F00D1E4BF /* AtomicString.cpp */, >+ 26F1B44215CA434F00D1E4BF /* AtomString.cpp */, > E40019301ACE9B5C001B0A2A /* BloomFilter.cpp */, > A7A966DA140ECCC8005EF9B4 /* CheckedArithmeticOperations.cpp */, > 0F30CB5B1FCE1792004B5323 /* ConcurrentPtrHashSet.cpp */, >@@ -4010,7 +4010,7 @@ > isa = PBXSourcesBuildPhase; > buildActionMask = 2147483647; > files = ( >- 7C83DE991D0A590C00FEBCF3 /* AtomicString.cpp in Sources */, >+ 7C83DE991D0A590C00FEBCF3 /* AtomString.cpp in Sources */, > 1ADAD1501D77A9F600212586 /* BlockPtr.mm in Sources */, > 7C83DE9C1D0A590C00FEBCF3 /* BloomFilter.cpp in Sources */, > 7C83DEA01D0A590C00FEBCF3 /* CheckedArithmeticOperations.cpp in Sources */, >diff --git a/Tools/TestWebKitAPI/Tests/WTF/AtomString.cpp b/Tools/TestWebKitAPI/Tests/WTF/AtomString.cpp >new file mode 100644 >index 0000000000000000000000000000000000000000..be74154e388ba7c56461ec96ba7003e1d92b68ea >--- /dev/null >+++ b/Tools/TestWebKitAPI/Tests/WTF/AtomString.cpp >@@ -0,0 +1,113 @@ >+/* >+ * Copyright (C) 2012-2017 Apple Inc. All rights reserved. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 PROFITS; OR BUSINESS >+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >+ * THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#include "config.h" >+ >+#include <wtf/text/AtomString.h> >+ >+namespace TestWebKitAPI { >+ >+TEST(WTF, AtomStringCreationFromLiteral) >+{ >+ AtomString stringWithTemplate("Template Literal", AtomString::ConstructFromLiteral); >+ ASSERT_EQ(strlen("Template Literal"), stringWithTemplate.length()); >+ ASSERT_TRUE(stringWithTemplate == "Template Literal"); >+ ASSERT_TRUE(stringWithTemplate.string().is8Bit()); >+ >+ const char* programmaticStringData = "Explicit Size Literal"; >+ AtomString programmaticString(programmaticStringData, strlen(programmaticStringData), AtomString::ConstructFromLiteral); >+ ASSERT_EQ(strlen(programmaticStringData), programmaticString.length()); >+ ASSERT_TRUE(programmaticString.string().is8Bit()); >+ ASSERT_EQ(programmaticStringData, reinterpret_cast<const char*>(programmaticString.string().characters8())); >+} >+ >+TEST(WTF, AtomStringCreationFromLiteralUniqueness) >+{ >+ AtomString string1("Template Literal", AtomString::ConstructFromLiteral); >+ AtomString string2("Template Literal", AtomString::ConstructFromLiteral); >+ ASSERT_EQ(string1.impl(), string2.impl()); >+ >+ AtomString string3("Template Literal"); >+ ASSERT_EQ(string1.impl(), string3.impl()); >+} >+ >+TEST(WTF, AtomStringExistingHash) >+{ >+ AtomString string1("Template Literal", AtomString::ConstructFromLiteral); >+ ASSERT_EQ(string1.existingHash(), string1.impl()->existingHash()); >+ AtomString string2; >+ ASSERT_EQ(string2.existingHash(), 0u); >+} >+ >+static inline const char* testAtomStringNumber(double number) >+{ >+ static char testBuffer[100] = { }; >+ std::strncpy(testBuffer, AtomString::number(number).string().utf8().data(), 99); >+ return testBuffer; >+} >+ >+TEST(WTF, AtomStringNumberDouble) >+{ >+ using Limits = std::numeric_limits<double>; >+ >+ EXPECT_STREQ("Infinity", testAtomStringNumber(Limits::infinity())); >+ EXPECT_STREQ("-Infinity", testAtomStringNumber(-Limits::infinity())); >+ >+ EXPECT_STREQ("NaN", testAtomStringNumber(-Limits::quiet_NaN())); >+ >+ EXPECT_STREQ("0", testAtomStringNumber(0)); >+ EXPECT_STREQ("0", testAtomStringNumber(-0)); >+ >+ EXPECT_STREQ("2.2250738585072014e-308", testAtomStringNumber(Limits::min())); >+ EXPECT_STREQ("-1.7976931348623157e+308", testAtomStringNumber(Limits::lowest())); >+ EXPECT_STREQ("1.7976931348623157e+308", testAtomStringNumber(Limits::max())); >+ >+ EXPECT_STREQ("3.141592653589793", testAtomStringNumber(piDouble)); >+ EXPECT_STREQ("3.1415927410125732", testAtomStringNumber(piFloat)); >+ EXPECT_STREQ("1.5707963267948966", testAtomStringNumber(piOverTwoDouble)); >+ EXPECT_STREQ("1.5707963705062866", testAtomStringNumber(piOverTwoFloat)); >+ EXPECT_STREQ("0.7853981633974483", testAtomStringNumber(piOverFourDouble)); >+ EXPECT_STREQ("0.7853981852531433", testAtomStringNumber(piOverFourFloat)); >+ >+ EXPECT_STREQ("2.718281828459045", testAtomStringNumber(2.71828182845904523536028747135266249775724709369995)); >+ >+ EXPECT_STREQ("299792458", testAtomStringNumber(299792458)); >+ >+ EXPECT_STREQ("1.618033988749895", testAtomStringNumber(1.6180339887498948482)); >+ >+ EXPECT_STREQ("1000", testAtomStringNumber(1e3)); >+ EXPECT_STREQ("10000000000", testAtomStringNumber(1e10)); >+ EXPECT_STREQ("100000000000000000000", testAtomStringNumber(1e20)); >+ EXPECT_STREQ("1e+21", testAtomStringNumber(1e21)); >+ EXPECT_STREQ("1e+30", testAtomStringNumber(1e30)); >+ >+ EXPECT_STREQ("1100", testAtomStringNumber(1.1e3)); >+ EXPECT_STREQ("11000000000", testAtomStringNumber(1.1e10)); >+ EXPECT_STREQ("110000000000000000000", testAtomStringNumber(1.1e20)); >+ EXPECT_STREQ("1.1e+21", testAtomStringNumber(1.1e21)); >+ EXPECT_STREQ("1.1e+30", testAtomStringNumber(1.1e30)); >+} >+ >+} // namespace TestWebKitAPI >diff --git a/Tools/TestWebKitAPI/Tests/WTF/AtomicString.cpp b/Tools/TestWebKitAPI/Tests/WTF/AtomicString.cpp >deleted file mode 100644 >index 08b1f805215361b1c3f2add92b47cae069d97822..0000000000000000000000000000000000000000 >--- a/Tools/TestWebKitAPI/Tests/WTF/AtomicString.cpp >+++ /dev/null >@@ -1,113 +0,0 @@ >-/* >- * Copyright (C) 2012-2017 Apple Inc. All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 PROFITS; OR BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >- * THE POSSIBILITY OF SUCH DAMAGE. >- */ >- >-#include "config.h" >- >-#include <wtf/text/AtomicString.h> >- >-namespace TestWebKitAPI { >- >-TEST(WTF, AtomicStringCreationFromLiteral) >-{ >- AtomicString stringWithTemplate("Template Literal", AtomicString::ConstructFromLiteral); >- ASSERT_EQ(strlen("Template Literal"), stringWithTemplate.length()); >- ASSERT_TRUE(stringWithTemplate == "Template Literal"); >- ASSERT_TRUE(stringWithTemplate.string().is8Bit()); >- >- const char* programmaticStringData = "Explicit Size Literal"; >- AtomicString programmaticString(programmaticStringData, strlen(programmaticStringData), AtomicString::ConstructFromLiteral); >- ASSERT_EQ(strlen(programmaticStringData), programmaticString.length()); >- ASSERT_TRUE(programmaticString.string().is8Bit()); >- ASSERT_EQ(programmaticStringData, reinterpret_cast<const char*>(programmaticString.string().characters8())); >-} >- >-TEST(WTF, AtomicStringCreationFromLiteralUniqueness) >-{ >- AtomicString string1("Template Literal", AtomicString::ConstructFromLiteral); >- AtomicString string2("Template Literal", AtomicString::ConstructFromLiteral); >- ASSERT_EQ(string1.impl(), string2.impl()); >- >- AtomicString string3("Template Literal"); >- ASSERT_EQ(string1.impl(), string3.impl()); >-} >- >-TEST(WTF, AtomicStringExistingHash) >-{ >- AtomicString string1("Template Literal", AtomicString::ConstructFromLiteral); >- ASSERT_EQ(string1.existingHash(), string1.impl()->existingHash()); >- AtomicString string2; >- ASSERT_EQ(string2.existingHash(), 0u); >-} >- >-static inline const char* testAtomicStringNumber(double number) >-{ >- static char testBuffer[100] = { }; >- std::strncpy(testBuffer, AtomicString::number(number).string().utf8().data(), 99); >- return testBuffer; >-} >- >-TEST(WTF, AtomicStringNumberDouble) >-{ >- using Limits = std::numeric_limits<double>; >- >- EXPECT_STREQ("Infinity", testAtomicStringNumber(Limits::infinity())); >- EXPECT_STREQ("-Infinity", testAtomicStringNumber(-Limits::infinity())); >- >- EXPECT_STREQ("NaN", testAtomicStringNumber(-Limits::quiet_NaN())); >- >- EXPECT_STREQ("0", testAtomicStringNumber(0)); >- EXPECT_STREQ("0", testAtomicStringNumber(-0)); >- >- EXPECT_STREQ("2.2250738585072014e-308", testAtomicStringNumber(Limits::min())); >- EXPECT_STREQ("-1.7976931348623157e+308", testAtomicStringNumber(Limits::lowest())); >- EXPECT_STREQ("1.7976931348623157e+308", testAtomicStringNumber(Limits::max())); >- >- EXPECT_STREQ("3.141592653589793", testAtomicStringNumber(piDouble)); >- EXPECT_STREQ("3.1415927410125732", testAtomicStringNumber(piFloat)); >- EXPECT_STREQ("1.5707963267948966", testAtomicStringNumber(piOverTwoDouble)); >- EXPECT_STREQ("1.5707963705062866", testAtomicStringNumber(piOverTwoFloat)); >- EXPECT_STREQ("0.7853981633974483", testAtomicStringNumber(piOverFourDouble)); >- EXPECT_STREQ("0.7853981852531433", testAtomicStringNumber(piOverFourFloat)); >- >- EXPECT_STREQ("2.718281828459045", testAtomicStringNumber(2.71828182845904523536028747135266249775724709369995)); >- >- EXPECT_STREQ("299792458", testAtomicStringNumber(299792458)); >- >- EXPECT_STREQ("1.618033988749895", testAtomicStringNumber(1.6180339887498948482)); >- >- EXPECT_STREQ("1000", testAtomicStringNumber(1e3)); >- EXPECT_STREQ("10000000000", testAtomicStringNumber(1e10)); >- EXPECT_STREQ("100000000000000000000", testAtomicStringNumber(1e20)); >- EXPECT_STREQ("1e+21", testAtomicStringNumber(1e21)); >- EXPECT_STREQ("1e+30", testAtomicStringNumber(1e30)); >- >- EXPECT_STREQ("1100", testAtomicStringNumber(1.1e3)); >- EXPECT_STREQ("11000000000", testAtomicStringNumber(1.1e10)); >- EXPECT_STREQ("110000000000000000000", testAtomicStringNumber(1.1e20)); >- EXPECT_STREQ("1.1e+21", testAtomicStringNumber(1.1e21)); >- EXPECT_STREQ("1.1e+30", testAtomicStringNumber(1.1e30)); >-} >- >-} // namespace TestWebKitAPI >diff --git a/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp b/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp >index 7c9df6cc5da4871d5d4685fadfbb2f2266fe2dd5..ab67ce175da1eb6da8403677d045aea87bf74960 100644 >--- a/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp >+++ b/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp >@@ -276,77 +276,77 @@ TEST(StringBuilderTest, CanShrink) > ASSERT_FALSE(builder.canShrink()); > } > >-TEST(StringBuilderTest, ToAtomicString) >+TEST(StringBuilderTest, ToAtomString) > { > StringBuilder builder; > builder.append("123"); >- AtomicString atomicString = builder.toAtomicString(); >- ASSERT_EQ(String("123"), atomicString); >+ AtomString atomString = builder.toAtomString(); >+ ASSERT_EQ(String("123"), atomString); > > builder.reserveCapacity(256); > ASSERT_TRUE(builder.canShrink()); > for (int i = builder.length(); i < 128; i++) > builder.append('x'); >- AtomicString atomicString1 = builder.toAtomicString(); >- ASSERT_EQ(128u, atomicString1.length()); >- ASSERT_EQ('x', atomicString1[127]); >+ AtomString atomString1 = builder.toAtomString(); >+ ASSERT_EQ(128u, atomString1.length()); >+ ASSERT_EQ('x', atomString1[127]); > > // Later change of builder should not affect the atomic string. > for (int i = builder.length(); i < 256; i++) > builder.append('x'); >- ASSERT_EQ(128u, atomicString1.length()); >+ ASSERT_EQ(128u, atomString1.length()); > > ASSERT_FALSE(builder.canShrink()); > String string = builder.toString(); >- AtomicString atomicString2 = builder.toAtomicString(); >+ AtomString atomString2 = builder.toAtomString(); > // They should share the same StringImpl. >- ASSERT_EQ(atomicString2.impl(), string.impl()); >+ ASSERT_EQ(atomString2.impl(), string.impl()); > } > >-TEST(StringBuilderTest, ToAtomicStringOnEmpty) >+TEST(StringBuilderTest, ToAtomStringOnEmpty) > { > { // Default constructed. > StringBuilder builder; >- AtomicString atomicString = builder.toAtomicString(); >- ASSERT_EQ(emptyAtom(), atomicString); >+ AtomString atomString = builder.toAtomString(); >+ ASSERT_EQ(emptyAtom(), atomString); > } > { // With capacity. > StringBuilder builder; > builder.reserveCapacity(64); >- AtomicString atomicString = builder.toAtomicString(); >- ASSERT_EQ(emptyAtom(), atomicString); >+ AtomString atomString = builder.toAtomString(); >+ ASSERT_EQ(emptyAtom(), atomString); > } >- { // AtomicString constructed from a null string. >+ { // AtomString constructed from a null string. > StringBuilder builder; > builder.append(String()); >- AtomicString atomicString = builder.toAtomicString(); >- ASSERT_EQ(emptyAtom(), atomicString); >+ AtomString atomString = builder.toAtomString(); >+ ASSERT_EQ(emptyAtom(), atomString); > } >- { // AtomicString constructed from an empty string. >+ { // AtomString constructed from an empty string. > StringBuilder builder; > builder.append(emptyString()); >- AtomicString atomicString = builder.toAtomicString(); >- ASSERT_EQ(emptyAtom(), atomicString); >+ AtomString atomString = builder.toAtomString(); >+ ASSERT_EQ(emptyAtom(), atomString); > } >- { // AtomicString constructed from an empty StringBuilder. >+ { // AtomString constructed from an empty StringBuilder. > StringBuilder builder; > StringBuilder emptyBuilder; > builder.append(emptyBuilder); >- AtomicString atomicString = builder.toAtomicString(); >- ASSERT_EQ(emptyAtom(), atomicString); >+ AtomString atomString = builder.toAtomString(); >+ ASSERT_EQ(emptyAtom(), atomString); > } >- { // AtomicString constructed from an empty char* string. >+ { // AtomString constructed from an empty char* string. > StringBuilder builder; > builder.append("", 0); >- AtomicString atomicString = builder.toAtomicString(); >- ASSERT_EQ(emptyAtom(), atomicString); >+ AtomString atomString = builder.toAtomString(); >+ ASSERT_EQ(emptyAtom(), atomString); > } > { // Cleared StringBuilder. > StringBuilder builder; > builder.appendLiteral("WebKit"); > builder.clear(); >- AtomicString atomicString = builder.toAtomicString(); >- ASSERT_EQ(emptyAtom(), atomicString); >+ AtomString atomString = builder.toAtomString(); >+ ASSERT_EQ(emptyAtom(), atomString); > } > } > >diff --git a/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp b/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp >index 04f9382cd70ed1ba8c05fb8052703ac3b3082bae..c0196e47818767337fc20a6c57c6f11c0b1b8481 100644 >--- a/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp >+++ b/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp >@@ -57,14 +57,14 @@ TEST(WTF, StringImplCreationFromLiteral) > ASSERT_EQ(stringWithoutLengthLiteral, reinterpret_cast<const char*>(programmaticStringNoLength->characters8())); > ASSERT_TRUE(programmaticStringNoLength->is8Bit()); > >- // AtomicStringImpl from createFromLiteral should use the same underlying string. >- auto atomicStringWithTemplate = AtomicStringImpl::add(stringWithTemplate.ptr()); >- ASSERT_TRUE(atomicStringWithTemplate->is8Bit()); >- ASSERT_EQ(atomicStringWithTemplate->characters8(), stringWithTemplate->characters8()); >- auto atomicProgrammaticString = AtomicStringImpl::add(programmaticString.ptr()); >+ // AtomStringImpl from createFromLiteral should use the same underlying string. >+ auto atomStringWithTemplate = AtomStringImpl::add(stringWithTemplate.ptr()); >+ ASSERT_TRUE(atomStringWithTemplate->is8Bit()); >+ ASSERT_EQ(atomStringWithTemplate->characters8(), stringWithTemplate->characters8()); >+ auto atomicProgrammaticString = AtomStringImpl::add(programmaticString.ptr()); > ASSERT_TRUE(atomicProgrammaticString->is8Bit()); > ASSERT_EQ(atomicProgrammaticString->characters8(), programmaticString->characters8()); >- auto atomicProgrammaticStringNoLength = AtomicStringImpl::add(programmaticStringNoLength.ptr()); >+ auto atomicProgrammaticStringNoLength = AtomStringImpl::add(programmaticStringNoLength.ptr()); > ASSERT_TRUE(atomicProgrammaticStringNoLength->is8Bit()); > ASSERT_EQ(atomicProgrammaticStringNoLength->characters8(), programmaticStringNoLength->characters8()); > } >@@ -533,7 +533,7 @@ TEST(WTF, StringImplCreateNullSymbol) > ASSERT_TRUE(reference->isSymbol()); > ASSERT_FALSE(reference->isPrivate()); > ASSERT_TRUE(reference->isNullSymbol()); >- ASSERT_FALSE(reference->isAtomic()); >+ ASSERT_FALSE(reference->isAtom()); > ASSERT_EQ(0u, reference->length()); > ASSERT_TRUE(equal(reference.ptr(), "")); > } >@@ -545,9 +545,9 @@ TEST(WTF, StringImplCreateSymbol) > ASSERT_TRUE(reference->isSymbol()); > ASSERT_FALSE(reference->isPrivate()); > ASSERT_FALSE(reference->isNullSymbol()); >- ASSERT_FALSE(reference->isAtomic()); >+ ASSERT_FALSE(reference->isAtom()); > ASSERT_FALSE(original->isSymbol()); >- ASSERT_FALSE(original->isAtomic()); >+ ASSERT_FALSE(original->isAtom()); > ASSERT_EQ(original->length(), reference->length()); > ASSERT_TRUE(equal(reference.ptr(), "original")); > >@@ -556,9 +556,9 @@ TEST(WTF, StringImplCreateSymbol) > ASSERT_TRUE(emptyReference->isSymbol()); > ASSERT_FALSE(emptyReference->isPrivate()); > ASSERT_FALSE(emptyReference->isNullSymbol()); >- ASSERT_FALSE(emptyReference->isAtomic()); >+ ASSERT_FALSE(emptyReference->isAtom()); > ASSERT_FALSE(empty->isSymbol()); >- ASSERT_TRUE(empty->isAtomic()); >+ ASSERT_TRUE(empty->isAtom()); > ASSERT_EQ(empty->length(), emptyReference->length()); > ASSERT_TRUE(equal(emptyReference.ptr(), "")); > } >@@ -570,9 +570,9 @@ TEST(WTF, StringImplCreatePrivateSymbol) > ASSERT_TRUE(reference->isSymbol()); > ASSERT_TRUE(reference->isPrivate()); > ASSERT_FALSE(reference->isNullSymbol()); >- ASSERT_FALSE(reference->isAtomic()); >+ ASSERT_FALSE(reference->isAtom()); > ASSERT_FALSE(original->isSymbol()); >- ASSERT_FALSE(original->isAtomic()); >+ ASSERT_FALSE(original->isAtom()); > ASSERT_EQ(original->length(), reference->length()); > ASSERT_TRUE(equal(reference.ptr(), "original")); > >@@ -581,80 +581,80 @@ TEST(WTF, StringImplCreatePrivateSymbol) > ASSERT_TRUE(emptyReference->isSymbol()); > ASSERT_TRUE(emptyReference->isPrivate()); > ASSERT_FALSE(emptyReference->isNullSymbol()); >- ASSERT_FALSE(emptyReference->isAtomic()); >+ ASSERT_FALSE(emptyReference->isAtom()); > ASSERT_FALSE(empty->isSymbol()); >- ASSERT_TRUE(empty->isAtomic()); >+ ASSERT_TRUE(empty->isAtom()); > ASSERT_EQ(empty->length(), emptyReference->length()); > ASSERT_TRUE(equal(emptyReference.ptr(), "")); > } > >-TEST(WTF, StringImplSymbolToAtomicString) >+TEST(WTF, StringImplSymbolToAtomString) > { > auto original = stringFromUTF8("original"); > auto reference = SymbolImpl::create(original); > ASSERT_TRUE(reference->isSymbol()); > ASSERT_FALSE(reference->isPrivate()); >- ASSERT_FALSE(reference->isAtomic()); >+ ASSERT_FALSE(reference->isAtom()); > >- auto result = AtomicStringImpl::lookUp(reference.ptr()); >+ auto result = AtomStringImpl::lookUp(reference.ptr()); > ASSERT_FALSE(result); > >- auto atomic = AtomicStringImpl::add(reference.ptr()); >- ASSERT_TRUE(atomic->isAtomic()); >+ auto atomic = AtomStringImpl::add(reference.ptr()); >+ ASSERT_TRUE(atomic->isAtom()); > ASSERT_FALSE(atomic->isSymbol()); > ASSERT_TRUE(reference->isSymbol()); >- ASSERT_FALSE(reference->isAtomic()); >+ ASSERT_FALSE(reference->isAtom()); > >- auto result2 = AtomicStringImpl::lookUp(reference.ptr()); >+ auto result2 = AtomStringImpl::lookUp(reference.ptr()); > ASSERT_TRUE(result2); > } > >-TEST(WTF, StringImplNullSymbolToAtomicString) >+TEST(WTF, StringImplNullSymbolToAtomString) > { > auto reference = SymbolImpl::createNullSymbol(); > ASSERT_TRUE(reference->isSymbol()); > ASSERT_FALSE(reference->isPrivate()); >- ASSERT_FALSE(reference->isAtomic()); >+ ASSERT_FALSE(reference->isAtom()); > > // Because the substring of the reference is the empty string which is already interned. >- auto result = AtomicStringImpl::lookUp(reference.ptr()); >+ auto result = AtomStringImpl::lookUp(reference.ptr()); > ASSERT_TRUE(result); > >- auto atomic = AtomicStringImpl::add(reference.ptr()); >- ASSERT_TRUE(atomic->isAtomic()); >+ auto atomic = AtomStringImpl::add(reference.ptr()); >+ ASSERT_TRUE(atomic->isAtom()); > ASSERT_FALSE(atomic->isSymbol()); > ASSERT_TRUE(reference->isSymbol()); >- ASSERT_FALSE(reference->isAtomic()); >+ ASSERT_FALSE(reference->isAtom()); > ASSERT_EQ(atomic.get(), StringImpl::empty()); > >- auto result2 = AtomicStringImpl::lookUp(reference.ptr()); >+ auto result2 = AtomStringImpl::lookUp(reference.ptr()); > ASSERT_TRUE(result2); > } > > static StringImpl::StaticStringImpl staticString {"Cocoa"}; > >-TEST(WTF, StringImplStaticToAtomicString) >+TEST(WTF, StringImplStaticToAtomString) > { > StringImpl& original = staticString; > ASSERT_FALSE(original.isSymbol()); >- ASSERT_FALSE(original.isAtomic()); >+ ASSERT_FALSE(original.isAtom()); > ASSERT_TRUE(original.isStatic()); > >- auto result = AtomicStringImpl::lookUp(&original); >+ auto result = AtomStringImpl::lookUp(&original); > ASSERT_FALSE(result); > >- auto atomic = AtomicStringImpl::add(&original); >- ASSERT_TRUE(atomic->isAtomic()); >+ auto atomic = AtomStringImpl::add(&original); >+ ASSERT_TRUE(atomic->isAtom()); > ASSERT_FALSE(atomic->isSymbol()); > ASSERT_FALSE(atomic->isStatic()); > ASSERT_FALSE(original.isSymbol()); >- ASSERT_FALSE(original.isAtomic()); >+ ASSERT_FALSE(original.isAtom()); > ASSERT_TRUE(original.isStatic()); > > ASSERT_TRUE(atomic->is8Bit()); > ASSERT_EQ(atomic->characters8(), original.characters8()); > >- auto result2 = AtomicStringImpl::lookUp(&original); >+ auto result2 = AtomStringImpl::lookUp(&original); > ASSERT_TRUE(result2); > ASSERT_EQ(atomic, result2); > } >@@ -752,7 +752,7 @@ TEST(WTF, ExternalStringImplCreate8bit) > ASSERT_TRUE(external->isExternal()); > ASSERT_TRUE(external->is8Bit()); > ASSERT_FALSE(external->isSymbol()); >- ASSERT_FALSE(external->isAtomic()); >+ ASSERT_FALSE(external->isAtom()); > ASSERT_EQ(external->length(), bufferStringLength); > ASSERT_EQ(external->characters8(), buffer); > } >@@ -774,7 +774,7 @@ TEST(WTF, ExternalStringImplCreate16bit) > ASSERT_TRUE(external->isExternal()); > ASSERT_FALSE(external->is8Bit()); > ASSERT_FALSE(external->isSymbol()); >- ASSERT_FALSE(external->isAtomic()); >+ ASSERT_FALSE(external->isAtom()); > ASSERT_EQ(external->length(), bufferStringLength); > ASSERT_EQ(external->characters16(), buffer); > } >@@ -801,24 +801,24 @@ TEST(WTF, ExternalStringAtomic) > }); > > ASSERT_TRUE(external->isExternal()); >- ASSERT_FALSE(external->isAtomic()); >+ ASSERT_FALSE(external->isAtom()); > ASSERT_FALSE(external->isSymbol()); > ASSERT_TRUE(external->is8Bit()); > ASSERT_EQ(external->length(), bufferStringLength); > ASSERT_EQ(external->characters8(), buffer); > >- auto result = AtomicStringImpl::lookUp(external.ptr()); >+ auto result = AtomStringImpl::lookUp(external.ptr()); > ASSERT_FALSE(result); > >- auto atomic = AtomicStringImpl::add(external.ptr()); >+ auto atomic = AtomStringImpl::add(external.ptr()); > ASSERT_TRUE(atomic->isExternal()); >- ASSERT_TRUE(atomic->isAtomic()); >+ ASSERT_TRUE(atomic->isAtom()); > ASSERT_FALSE(atomic->isSymbol()); > ASSERT_TRUE(atomic->is8Bit()); > ASSERT_EQ(atomic->length(), external->length()); > ASSERT_EQ(atomic->characters8(), external->characters8()); > >- auto result2 = AtomicStringImpl::lookUp(external.ptr()); >+ auto result2 = AtomStringImpl::lookUp(external.ptr()); > ASSERT_TRUE(result2); > ASSERT_EQ(atomic, result2); > } >@@ -839,12 +839,12 @@ TEST(WTF, ExternalStringToSymbol) > > ASSERT_TRUE(external->isExternal()); > ASSERT_FALSE(external->isSymbol()); >- ASSERT_FALSE(external->isAtomic()); >+ ASSERT_FALSE(external->isAtom()); > > auto symbol = SymbolImpl::create(external); > ASSERT_FALSE(symbol->isExternal()); > ASSERT_TRUE(symbol->isSymbol()); >- ASSERT_FALSE(symbol->isAtomic()); >+ ASSERT_FALSE(symbol->isAtom()); > ASSERT_FALSE(symbol->isPrivate()); > ASSERT_FALSE(symbol->isNullSymbol()); > ASSERT_EQ(external->length(), symbol->length()); >diff --git a/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp b/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp >index 0e3bf98f88214fc47c9b5335f74b06d3e53a296d..4b927a8c9b633c0bbd8836e267088ffdc7cf2ccc 100644 >--- a/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp >+++ b/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp >@@ -45,7 +45,7 @@ namespace TestWebKitAPI { > TEST(WTF, StringOperators) > { > String string("String"); >- AtomicString atomicString("AtomicString"); >+ AtomString atomString("AtomString"); > ASCIILiteral literal { "ASCIILiteral"_s }; > > String stringViewBacking { "StringView" }; >@@ -54,25 +54,25 @@ TEST(WTF, StringOperators) > EXPECT_EQ(0, wtfStringCopyCount); > > EXPECT_N_WTF_STRING_COPIES(2, string + string); >- EXPECT_N_WTF_STRING_COPIES(2, string + atomicString); >- EXPECT_N_WTF_STRING_COPIES(2, atomicString + string); >- EXPECT_N_WTF_STRING_COPIES(2, atomicString + atomicString); >+ EXPECT_N_WTF_STRING_COPIES(2, string + atomString); >+ EXPECT_N_WTF_STRING_COPIES(2, atomString + string); >+ EXPECT_N_WTF_STRING_COPIES(2, atomString + atomString); > EXPECT_N_WTF_STRING_COPIES(1, stringView + string); > EXPECT_N_WTF_STRING_COPIES(1, string + stringView); >- EXPECT_N_WTF_STRING_COPIES(1, stringView + atomicString); >- EXPECT_N_WTF_STRING_COPIES(1, atomicString + stringView); >+ EXPECT_N_WTF_STRING_COPIES(1, stringView + atomString); >+ EXPECT_N_WTF_STRING_COPIES(1, atomString + stringView); > > EXPECT_N_WTF_STRING_COPIES(1, "C string" + string); > EXPECT_N_WTF_STRING_COPIES(1, string + "C string"); >- EXPECT_N_WTF_STRING_COPIES(1, "C string" + atomicString); >- EXPECT_N_WTF_STRING_COPIES(1, atomicString + "C string"); >+ EXPECT_N_WTF_STRING_COPIES(1, "C string" + atomString); >+ EXPECT_N_WTF_STRING_COPIES(1, atomString + "C string"); > EXPECT_N_WTF_STRING_COPIES(0, "C string" + stringView); > EXPECT_N_WTF_STRING_COPIES(0, stringView + "C string"); > > EXPECT_N_WTF_STRING_COPIES(1, literal + string); > EXPECT_N_WTF_STRING_COPIES(1, string + literal); >- EXPECT_N_WTF_STRING_COPIES(1, literal + atomicString); >- EXPECT_N_WTF_STRING_COPIES(1, atomicString + literal); >+ EXPECT_N_WTF_STRING_COPIES(1, literal + atomString); >+ EXPECT_N_WTF_STRING_COPIES(1, atomString + literal); > EXPECT_N_WTF_STRING_COPIES(0, literal + stringView); > EXPECT_N_WTF_STRING_COPIES(0, stringView + literal); > >@@ -97,12 +97,12 @@ TEST(WTF, StringOperators) > EXPECT_N_WTF_STRING_COPIES(2, "C string" + (string + literal + string)); > EXPECT_N_WTF_STRING_COPIES(2, ("C string" + string) + (literal + string)); > >- EXPECT_N_WTF_STRING_COPIES(2, literal + atomicString + "C string" + atomicString); >- EXPECT_N_WTF_STRING_COPIES(2, literal + (atomicString + "C string" + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, (literal + atomicString) + ("C string" + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + atomicString + literal + atomicString); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + (atomicString + literal + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, ("C string" + atomicString) + (literal + atomicString)); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + atomString + "C string" + atomString); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + (atomString + "C string" + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, (literal + atomString) + ("C string" + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + atomString + literal + atomString); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + (atomString + literal + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, ("C string" + atomString) + (literal + atomString)); > > EXPECT_N_WTF_STRING_COPIES(0, literal + stringView + "C string" + stringView); > EXPECT_N_WTF_STRING_COPIES(0, literal + (stringView + "C string" + stringView)); >@@ -111,145 +111,145 @@ TEST(WTF, StringOperators) > EXPECT_N_WTF_STRING_COPIES(0, "C string" + (stringView + literal + stringView)); > EXPECT_N_WTF_STRING_COPIES(0, ("C string" + stringView) + (literal + stringView)); > >- EXPECT_N_WTF_STRING_COPIES(2, literal + atomicString + "C string" + string + literal + stringView); >- EXPECT_N_WTF_STRING_COPIES(2, literal + (atomicString + "C string" + string + literal + stringView)); >- EXPECT_N_WTF_STRING_COPIES(2, (literal + atomicString) + ("C string" + string) + (literal + stringView)); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + atomicString + literal + string + literal + stringView); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + (atomicString + literal + string + literal + stringView)); >- EXPECT_N_WTF_STRING_COPIES(2, ("C string" + atomicString) + (literal + string) + (literal + stringView)); >- >- EXPECT_N_WTF_STRING_COPIES(2, literal + atomicString + "C string" + stringView + literal + string); >- EXPECT_N_WTF_STRING_COPIES(2, literal + (atomicString + "C string" + stringView + literal + string)); >- EXPECT_N_WTF_STRING_COPIES(2, (literal + atomicString) + ("C string" + stringView) + (literal + string)); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + atomicString + literal + stringView + literal + string); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + (atomicString + literal + stringView + literal + string)); >- EXPECT_N_WTF_STRING_COPIES(2, ("C string" + atomicString) + (literal + stringView) + (literal + string)); >- >- EXPECT_N_WTF_STRING_COPIES(2, literal + string + "C string" + atomicString + literal + stringView); >- EXPECT_N_WTF_STRING_COPIES(2, literal + (string + "C string" + atomicString + literal + stringView)); >- EXPECT_N_WTF_STRING_COPIES(2, (literal + string) + ("C string" + atomicString) + (literal + stringView)); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + string + literal + atomicString + literal + stringView); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + (string + literal + atomicString + literal + stringView)); >- EXPECT_N_WTF_STRING_COPIES(2, ("C string" + string) + (literal + atomicString) + (literal + stringView)); >- >- EXPECT_N_WTF_STRING_COPIES(2, literal + string + "C string" + stringView + literal + atomicString); >- EXPECT_N_WTF_STRING_COPIES(2, literal + (string + "C string" + stringView + literal + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, (literal + string) + ("C string" + stringView) + (literal + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + string + literal + stringView + literal + atomicString); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + (string + literal + stringView + literal + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, ("C string" + string) + (literal + stringView) + (literal + atomicString)); >- >- EXPECT_N_WTF_STRING_COPIES(2, literal + stringView + "C string" + atomicString + literal + string); >- EXPECT_N_WTF_STRING_COPIES(2, literal + (stringView + "C string" + atomicString + literal + string)); >- EXPECT_N_WTF_STRING_COPIES(2, (literal + stringView) + ("C string" + atomicString) + (literal + string)); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + stringView + literal + atomicString + literal + string); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + (stringView + literal + atomicString + literal + string)); >- EXPECT_N_WTF_STRING_COPIES(2, ("C string" + stringView) + (literal + atomicString) + (literal + string)); >- >- EXPECT_N_WTF_STRING_COPIES(2, literal + stringView + "C string" + string + literal + atomicString); >- EXPECT_N_WTF_STRING_COPIES(2, literal + (stringView + "C string" + string + literal + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, (literal + stringView) + ("C string" + string) + (literal + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + stringView + literal + string + literal + atomicString); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + (stringView + literal + string + literal + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, ("C string" + stringView) + (literal + string) + (literal + atomicString)); >- >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + atomicString + "C string" + atomicString); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + (atomicString + "C string" + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, ("C string" + atomicString) + ("C string" + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, atomicString + "C string" + atomicString + "C string"); >- EXPECT_N_WTF_STRING_COPIES(2, atomicString + ("C string" + atomicString + "C string")); >- EXPECT_N_WTF_STRING_COPIES(2, (atomicString + "C string") + (atomicString + "C string")); >- >- EXPECT_N_WTF_STRING_COPIES(2, literal + atomicString + literal + atomicString); >- EXPECT_N_WTF_STRING_COPIES(2, literal + (atomicString + literal + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, (literal + atomicString) + (literal + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, atomicString + literal + atomicString + literal); >- EXPECT_N_WTF_STRING_COPIES(2, atomicString + (literal + atomicString + literal)); >- EXPECT_N_WTF_STRING_COPIES(2, (atomicString + literal) + (atomicString + literal)); >- >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + string + "C string" + atomicString + "C string" + stringView); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + (string + "C string" + atomicString + "C string" + stringView)); >- EXPECT_N_WTF_STRING_COPIES(2, ("C string" + string) + ("C string" + atomicString) + ("C string" + stringView)); >- EXPECT_N_WTF_STRING_COPIES(2, string + "C string" + atomicString + "C string" + stringView + "C string"); >- EXPECT_N_WTF_STRING_COPIES(2, string + ("C string" + atomicString + "C string" + stringView + "C string")); >- EXPECT_N_WTF_STRING_COPIES(2, (string + "C string") + (atomicString + "C string") + (stringView + "C string")); >- >- EXPECT_N_WTF_STRING_COPIES(2, literal + string + literal + atomicString + literal + stringView); >- EXPECT_N_WTF_STRING_COPIES(2, literal + (string + literal + atomicString + literal + stringView)); >- EXPECT_N_WTF_STRING_COPIES(2, (literal + string) + (literal + atomicString) + (literal + stringView)); >- EXPECT_N_WTF_STRING_COPIES(2, string + literal + atomicString + literal + stringView + literal); >- EXPECT_N_WTF_STRING_COPIES(2, string + (literal + atomicString + literal + stringView + literal)); >- EXPECT_N_WTF_STRING_COPIES(2, (string + literal) + (atomicString + literal) + (stringView + literal)); >- >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + string + "C string" + stringView + "C string" + atomicString); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + (string + "C string" + stringView + "C string" + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, ("C string" + string) + ("C string" + stringView) + ("C string" + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, string + "C string" + stringView + "C string" + atomicString + "C string"); >- EXPECT_N_WTF_STRING_COPIES(2, string + ("C string" + stringView + "C string" + atomicString + "C string")); >- EXPECT_N_WTF_STRING_COPIES(2, (string + "C string") + (stringView + "C string") + (atomicString + "C string")); >- >- EXPECT_N_WTF_STRING_COPIES(2, literal + string + literal + stringView + literal + atomicString); >- EXPECT_N_WTF_STRING_COPIES(2, literal + (string + literal + stringView + literal + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, (literal + string) + (literal + stringView) + (literal + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, string + literal + stringView + literal + atomicString + literal); >- EXPECT_N_WTF_STRING_COPIES(2, string + (literal + stringView + literal + atomicString + literal)); >- EXPECT_N_WTF_STRING_COPIES(2, (string + literal) + (stringView + literal) + (atomicString + literal)); >- >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + atomicString + "C string" + string + "C string" + stringView); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + (atomicString + "C string" + string + "C string" + stringView)); >- EXPECT_N_WTF_STRING_COPIES(2, ("C string" + atomicString) + ("C string" + string) + ("C string" + stringView)); >- EXPECT_N_WTF_STRING_COPIES(2, atomicString + "C string" + string + "C string" + stringView + "C string"); >- EXPECT_N_WTF_STRING_COPIES(2, atomicString + ("C string" + string + "C string" + stringView + "C string")); >- EXPECT_N_WTF_STRING_COPIES(2, (atomicString + "C string") + (string + "C string") + (stringView + "C string")); >- >- EXPECT_N_WTF_STRING_COPIES(2, literal + atomicString + literal + string + literal + stringView); >- EXPECT_N_WTF_STRING_COPIES(2, literal + (atomicString + literal + string + literal + stringView)); >- EXPECT_N_WTF_STRING_COPIES(2, (literal + atomicString) + (literal + string) + (literal + stringView)); >- EXPECT_N_WTF_STRING_COPIES(2, atomicString + literal + string + literal + stringView + literal); >- EXPECT_N_WTF_STRING_COPIES(2, atomicString + (literal + string + literal + stringView + literal)); >- EXPECT_N_WTF_STRING_COPIES(2, (atomicString + literal) + (string + literal) + (stringView + literal)); >- >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + atomicString + "C string" + stringView + "C string" + string); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + (atomicString + "C string" + stringView + "C string" + string)); >- EXPECT_N_WTF_STRING_COPIES(2, ("C string" + atomicString) + ("C string" + stringView) + ("C string" + string)); >- EXPECT_N_WTF_STRING_COPIES(2, atomicString + "C string" + stringView + "C string" + string + "C string"); >- EXPECT_N_WTF_STRING_COPIES(2, atomicString + ("C string" + stringView + "C string" + string + "C string")); >- EXPECT_N_WTF_STRING_COPIES(2, (atomicString + "C string") + (stringView + "C string") + (string + "C string")); >- >- EXPECT_N_WTF_STRING_COPIES(2, literal + atomicString + literal + stringView + literal + string); >- EXPECT_N_WTF_STRING_COPIES(2, literal + (atomicString + literal + stringView + literal + string)); >- EXPECT_N_WTF_STRING_COPIES(2, (literal + atomicString) + (literal + stringView) + (literal + string)); >- EXPECT_N_WTF_STRING_COPIES(2, atomicString + literal + stringView + literal + string + literal); >- EXPECT_N_WTF_STRING_COPIES(2, atomicString + (literal + stringView + literal + string + literal)); >- EXPECT_N_WTF_STRING_COPIES(2, (atomicString + literal) + (stringView + literal) + (string + literal)); >- >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + stringView + "C string" + atomicString + "C string" + string); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + (stringView + "C string" + atomicString + "C string" + string)); >- EXPECT_N_WTF_STRING_COPIES(2, ("C string" + stringView) + ("C string" + atomicString) + ("C string" + string)); >- EXPECT_N_WTF_STRING_COPIES(2, stringView + "C string" + atomicString + "C string" + string + "C string"); >- EXPECT_N_WTF_STRING_COPIES(2, stringView + ("C string" + atomicString + "C string" + string + "C string")); >- EXPECT_N_WTF_STRING_COPIES(2, (stringView + "C string") + (atomicString + "C string") + (string + "C string")); >- >- EXPECT_N_WTF_STRING_COPIES(2, literal + stringView + literal + atomicString + literal + string); >- EXPECT_N_WTF_STRING_COPIES(2, literal + (stringView + literal + atomicString + literal + string)); >- EXPECT_N_WTF_STRING_COPIES(2, (literal + stringView) + (literal + atomicString) + (literal + string)); >- EXPECT_N_WTF_STRING_COPIES(2, stringView + literal + atomicString + literal + string + literal); >- EXPECT_N_WTF_STRING_COPIES(2, stringView + (literal + atomicString + literal + string + literal)); >- EXPECT_N_WTF_STRING_COPIES(2, (stringView + literal) + (atomicString + literal) + (string + literal)); >- >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + stringView + "C string" + string + "C string" + atomicString); >- EXPECT_N_WTF_STRING_COPIES(2, "C string" + (stringView + "C string" + string + "C string" + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, ("C string" + stringView) + ("C string" + string) + ("C string" + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, stringView + "C string" + string + "C string" + atomicString + "C string"); >- EXPECT_N_WTF_STRING_COPIES(2, stringView + ("C string" + string + "C string" + atomicString + "C string")); >- EXPECT_N_WTF_STRING_COPIES(2, (stringView + "C string") + (string + "C string") + (atomicString + "C string")); >- >- EXPECT_N_WTF_STRING_COPIES(2, literal + stringView + literal + string + literal + atomicString); >- EXPECT_N_WTF_STRING_COPIES(2, literal + (stringView + literal + string + literal + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, (literal + stringView) + (literal + string) + (literal + atomicString)); >- EXPECT_N_WTF_STRING_COPIES(2, stringView + literal + string + literal + atomicString + literal); >- EXPECT_N_WTF_STRING_COPIES(2, stringView + (literal + string + literal + atomicString + literal)); >- EXPECT_N_WTF_STRING_COPIES(2, (stringView + literal) + (string + literal) + (atomicString + literal)); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + atomString + "C string" + string + literal + stringView); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + (atomString + "C string" + string + literal + stringView)); >+ EXPECT_N_WTF_STRING_COPIES(2, (literal + atomString) + ("C string" + string) + (literal + stringView)); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + atomString + literal + string + literal + stringView); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + (atomString + literal + string + literal + stringView)); >+ EXPECT_N_WTF_STRING_COPIES(2, ("C string" + atomString) + (literal + string) + (literal + stringView)); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, literal + atomString + "C string" + stringView + literal + string); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + (atomString + "C string" + stringView + literal + string)); >+ EXPECT_N_WTF_STRING_COPIES(2, (literal + atomString) + ("C string" + stringView) + (literal + string)); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + atomString + literal + stringView + literal + string); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + (atomString + literal + stringView + literal + string)); >+ EXPECT_N_WTF_STRING_COPIES(2, ("C string" + atomString) + (literal + stringView) + (literal + string)); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, literal + string + "C string" + atomString + literal + stringView); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + (string + "C string" + atomString + literal + stringView)); >+ EXPECT_N_WTF_STRING_COPIES(2, (literal + string) + ("C string" + atomString) + (literal + stringView)); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + string + literal + atomString + literal + stringView); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + (string + literal + atomString + literal + stringView)); >+ EXPECT_N_WTF_STRING_COPIES(2, ("C string" + string) + (literal + atomString) + (literal + stringView)); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, literal + string + "C string" + stringView + literal + atomString); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + (string + "C string" + stringView + literal + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, (literal + string) + ("C string" + stringView) + (literal + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + string + literal + stringView + literal + atomString); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + (string + literal + stringView + literal + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, ("C string" + string) + (literal + stringView) + (literal + atomString)); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, literal + stringView + "C string" + atomString + literal + string); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + (stringView + "C string" + atomString + literal + string)); >+ EXPECT_N_WTF_STRING_COPIES(2, (literal + stringView) + ("C string" + atomString) + (literal + string)); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + stringView + literal + atomString + literal + string); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + (stringView + literal + atomString + literal + string)); >+ EXPECT_N_WTF_STRING_COPIES(2, ("C string" + stringView) + (literal + atomString) + (literal + string)); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, literal + stringView + "C string" + string + literal + atomString); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + (stringView + "C string" + string + literal + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, (literal + stringView) + ("C string" + string) + (literal + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + stringView + literal + string + literal + atomString); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + (stringView + literal + string + literal + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, ("C string" + stringView) + (literal + string) + (literal + atomString)); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + atomString + "C string" + atomString); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + (atomString + "C string" + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, ("C string" + atomString) + ("C string" + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, atomString + "C string" + atomString + "C string"); >+ EXPECT_N_WTF_STRING_COPIES(2, atomString + ("C string" + atomString + "C string")); >+ EXPECT_N_WTF_STRING_COPIES(2, (atomString + "C string") + (atomString + "C string")); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, literal + atomString + literal + atomString); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + (atomString + literal + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, (literal + atomString) + (literal + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, atomString + literal + atomString + literal); >+ EXPECT_N_WTF_STRING_COPIES(2, atomString + (literal + atomString + literal)); >+ EXPECT_N_WTF_STRING_COPIES(2, (atomString + literal) + (atomString + literal)); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + string + "C string" + atomString + "C string" + stringView); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + (string + "C string" + atomString + "C string" + stringView)); >+ EXPECT_N_WTF_STRING_COPIES(2, ("C string" + string) + ("C string" + atomString) + ("C string" + stringView)); >+ EXPECT_N_WTF_STRING_COPIES(2, string + "C string" + atomString + "C string" + stringView + "C string"); >+ EXPECT_N_WTF_STRING_COPIES(2, string + ("C string" + atomString + "C string" + stringView + "C string")); >+ EXPECT_N_WTF_STRING_COPIES(2, (string + "C string") + (atomString + "C string") + (stringView + "C string")); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, literal + string + literal + atomString + literal + stringView); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + (string + literal + atomString + literal + stringView)); >+ EXPECT_N_WTF_STRING_COPIES(2, (literal + string) + (literal + atomString) + (literal + stringView)); >+ EXPECT_N_WTF_STRING_COPIES(2, string + literal + atomString + literal + stringView + literal); >+ EXPECT_N_WTF_STRING_COPIES(2, string + (literal + atomString + literal + stringView + literal)); >+ EXPECT_N_WTF_STRING_COPIES(2, (string + literal) + (atomString + literal) + (stringView + literal)); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + string + "C string" + stringView + "C string" + atomString); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + (string + "C string" + stringView + "C string" + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, ("C string" + string) + ("C string" + stringView) + ("C string" + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, string + "C string" + stringView + "C string" + atomString + "C string"); >+ EXPECT_N_WTF_STRING_COPIES(2, string + ("C string" + stringView + "C string" + atomString + "C string")); >+ EXPECT_N_WTF_STRING_COPIES(2, (string + "C string") + (stringView + "C string") + (atomString + "C string")); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, literal + string + literal + stringView + literal + atomString); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + (string + literal + stringView + literal + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, (literal + string) + (literal + stringView) + (literal + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, string + literal + stringView + literal + atomString + literal); >+ EXPECT_N_WTF_STRING_COPIES(2, string + (literal + stringView + literal + atomString + literal)); >+ EXPECT_N_WTF_STRING_COPIES(2, (string + literal) + (stringView + literal) + (atomString + literal)); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + atomString + "C string" + string + "C string" + stringView); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + (atomString + "C string" + string + "C string" + stringView)); >+ EXPECT_N_WTF_STRING_COPIES(2, ("C string" + atomString) + ("C string" + string) + ("C string" + stringView)); >+ EXPECT_N_WTF_STRING_COPIES(2, atomString + "C string" + string + "C string" + stringView + "C string"); >+ EXPECT_N_WTF_STRING_COPIES(2, atomString + ("C string" + string + "C string" + stringView + "C string")); >+ EXPECT_N_WTF_STRING_COPIES(2, (atomString + "C string") + (string + "C string") + (stringView + "C string")); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, literal + atomString + literal + string + literal + stringView); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + (atomString + literal + string + literal + stringView)); >+ EXPECT_N_WTF_STRING_COPIES(2, (literal + atomString) + (literal + string) + (literal + stringView)); >+ EXPECT_N_WTF_STRING_COPIES(2, atomString + literal + string + literal + stringView + literal); >+ EXPECT_N_WTF_STRING_COPIES(2, atomString + (literal + string + literal + stringView + literal)); >+ EXPECT_N_WTF_STRING_COPIES(2, (atomString + literal) + (string + literal) + (stringView + literal)); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + atomString + "C string" + stringView + "C string" + string); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + (atomString + "C string" + stringView + "C string" + string)); >+ EXPECT_N_WTF_STRING_COPIES(2, ("C string" + atomString) + ("C string" + stringView) + ("C string" + string)); >+ EXPECT_N_WTF_STRING_COPIES(2, atomString + "C string" + stringView + "C string" + string + "C string"); >+ EXPECT_N_WTF_STRING_COPIES(2, atomString + ("C string" + stringView + "C string" + string + "C string")); >+ EXPECT_N_WTF_STRING_COPIES(2, (atomString + "C string") + (stringView + "C string") + (string + "C string")); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, literal + atomString + literal + stringView + literal + string); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + (atomString + literal + stringView + literal + string)); >+ EXPECT_N_WTF_STRING_COPIES(2, (literal + atomString) + (literal + stringView) + (literal + string)); >+ EXPECT_N_WTF_STRING_COPIES(2, atomString + literal + stringView + literal + string + literal); >+ EXPECT_N_WTF_STRING_COPIES(2, atomString + (literal + stringView + literal + string + literal)); >+ EXPECT_N_WTF_STRING_COPIES(2, (atomString + literal) + (stringView + literal) + (string + literal)); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + stringView + "C string" + atomString + "C string" + string); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + (stringView + "C string" + atomString + "C string" + string)); >+ EXPECT_N_WTF_STRING_COPIES(2, ("C string" + stringView) + ("C string" + atomString) + ("C string" + string)); >+ EXPECT_N_WTF_STRING_COPIES(2, stringView + "C string" + atomString + "C string" + string + "C string"); >+ EXPECT_N_WTF_STRING_COPIES(2, stringView + ("C string" + atomString + "C string" + string + "C string")); >+ EXPECT_N_WTF_STRING_COPIES(2, (stringView + "C string") + (atomString + "C string") + (string + "C string")); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, literal + stringView + literal + atomString + literal + string); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + (stringView + literal + atomString + literal + string)); >+ EXPECT_N_WTF_STRING_COPIES(2, (literal + stringView) + (literal + atomString) + (literal + string)); >+ EXPECT_N_WTF_STRING_COPIES(2, stringView + literal + atomString + literal + string + literal); >+ EXPECT_N_WTF_STRING_COPIES(2, stringView + (literal + atomString + literal + string + literal)); >+ EXPECT_N_WTF_STRING_COPIES(2, (stringView + literal) + (atomString + literal) + (string + literal)); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + stringView + "C string" + string + "C string" + atomString); >+ EXPECT_N_WTF_STRING_COPIES(2, "C string" + (stringView + "C string" + string + "C string" + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, ("C string" + stringView) + ("C string" + string) + ("C string" + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, stringView + "C string" + string + "C string" + atomString + "C string"); >+ EXPECT_N_WTF_STRING_COPIES(2, stringView + ("C string" + string + "C string" + atomString + "C string")); >+ EXPECT_N_WTF_STRING_COPIES(2, (stringView + "C string") + (string + "C string") + (atomString + "C string")); >+ >+ EXPECT_N_WTF_STRING_COPIES(2, literal + stringView + literal + string + literal + atomString); >+ EXPECT_N_WTF_STRING_COPIES(2, literal + (stringView + literal + string + literal + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, (literal + stringView) + (literal + string) + (literal + atomString)); >+ EXPECT_N_WTF_STRING_COPIES(2, stringView + literal + string + literal + atomString + literal); >+ EXPECT_N_WTF_STRING_COPIES(2, stringView + (literal + string + literal + atomString + literal)); >+ EXPECT_N_WTF_STRING_COPIES(2, (stringView + literal) + (string + literal) + (atomString + literal)); > } > > TEST(WTF, ConcatenateCharacterArrayAndEmptyString) >diff --git a/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp b/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp >index 6f915713c141c43b1c11b269b98ca67798d02a97..8e137a80477ff00be9b3592718a23f241693317e 100644 >--- a/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp >+++ b/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp >@@ -217,7 +217,7 @@ static ResourceLoadInfo subResourceRequest(const char* url, const char* mainDocu > > ContentExtensions::ContentExtensionsBackend makeBackend(const char* json) > { >- AtomicString::init(); >+ AtomString::init(); > auto extension = InMemoryCompiledContentExtension::create(json); > ContentExtensions::ContentExtensionsBackend backend; > backend.addContentExtension("testFilter", WTFMove(extension)); >diff --git a/Tools/TestWebKitAPI/Tests/WebCore/FontCache.cpp b/Tools/TestWebKitAPI/Tests/WebCore/FontCache.cpp >index 176b4a938d154b19b735281b5264bcf20719db36..7bab1c4e4633c787e5bdbabe46f32b349ea26ea1 100644 >--- a/Tools/TestWebKitAPI/Tests/WebCore/FontCache.cpp >+++ b/Tools/TestWebKitAPI/Tests/WebCore/FontCache.cpp >@@ -52,7 +52,7 @@ public: > > static std::unique_ptr<FontPlatformData> createPlatformFont(const char* familyName, float weight, float italic, float stretch, float size) > { >- AtomicString familyNameString(familyName); >+ AtomString familyNameString(familyName); > FontCascadeDescription description; > description.setOneFamily(familyNameString); > description.setWeight(FontSelectionValue(weight)); >diff --git a/Tools/TestWebKitAPI/Tests/WebCore/Logging.cpp b/Tools/TestWebKitAPI/Tests/WebCore/Logging.cpp >index 2c0af8bdca0778ec432cf47600cbb2a380cc5bd0..655f6cb1edb1e565309b3d568f2b3c1ab936a976 100644 >--- a/Tools/TestWebKitAPI/Tests/WebCore/Logging.cpp >+++ b/Tools/TestWebKitAPI/Tests/WebCore/Logging.cpp >@@ -319,10 +319,10 @@ TEST_F(LoggingTest, Logger) > EXPECT_EQ(0u, output().length()); > > logger->setEnabled(this, true); >- AtomicString string1("AtomicString", AtomicString::ConstructFromLiteral); >- const AtomicString string2("const AtomicString", AtomicString::ConstructFromLiteral); >+ AtomString string1("AtomString", AtomString::ConstructFromLiteral); >+ const AtomString string2("const AtomString", AtomString::ConstructFromLiteral); > logger->logAlways(TestChannel1, string1, " and ", string2); >- EXPECT_TRUE(output().contains("AtomicString and const AtomicString", false)); >+ EXPECT_TRUE(output().contains("AtomString and const AtomString", false)); > > String string3("String"); > const String string4("const String"); >diff --git a/Tools/TestWebKitAPI/Tests/WebCore/SampleMap.cpp b/Tools/TestWebKitAPI/Tests/WebCore/SampleMap.cpp >index c797f50f18101091ef2415bbdb4077917eff8123..dbeb3231e13bd50267c34a8ab56f4b9c560251f7 100644 >--- a/Tools/TestWebKitAPI/Tests/WebCore/SampleMap.cpp >+++ b/Tools/TestWebKitAPI/Tests/WebCore/SampleMap.cpp >@@ -56,7 +56,7 @@ public: > MediaTime presentationTime() const final { return m_presentationTime; } > MediaTime decodeTime() const final { return m_decodeTime; } > MediaTime duration() const final { return m_duration; } >- AtomicString trackID() const final { return m_trackID; } >+ AtomString trackID() const final { return m_trackID; } > void setTrackID(const String& trackID) final { m_trackID = trackID; } > size_t sizeInBytes() const final { return m_sizeInBytes; } > FloatSize presentationSize() const final { return m_presentationSize; } >@@ -87,7 +87,7 @@ private: > MediaTime m_decodeTime; > MediaTime m_duration; > FloatSize m_presentationSize; >- AtomicString m_trackID; >+ AtomString m_trackID; > size_t m_sizeInBytes { 0 }; > SampleFlags m_flags { None }; > }; >diff --git a/Tools/TestWebKitAPI/TestsController.cpp b/Tools/TestWebKitAPI/TestsController.cpp >index f227be4b6d081891d4c2521c38ccff45e97c81c9..a58e50e412b7734224bcf579a2e2dae55b4dc454 100644 >--- a/Tools/TestWebKitAPI/TestsController.cpp >+++ b/Tools/TestWebKitAPI/TestsController.cpp >@@ -29,7 +29,7 @@ > #include <wtf/MainThread.h> > #include <wtf/ProcessPrivilege.h> > #include <wtf/Threading.h> >-#include <wtf/text/AtomicString.h> >+#include <wtf/text/AtomString.h> > > namespace TestWebKitAPI { > >@@ -72,7 +72,7 @@ TestsController::TestsController() > WTF::initializeThreading(); > WTF::initializeMainThread(); > WTF::setProcessPrivileges(allPrivileges()); >- AtomicString::init(); >+ AtomString::init(); > } > > bool TestsController::run(int argc, char** argv) >diff --git a/Tools/gdb/webkit.py b/Tools/gdb/webkit.py >index 06de4281e3f33f9bc69e5be3e0a05a091a3a5c83..3ad5d4c861f24088279ccb2b608c6b97a3b1d4ec 100644 >--- a/Tools/gdb/webkit.py >+++ b/Tools/gdb/webkit.py >@@ -106,8 +106,8 @@ class LCharStringPrinter(StringPrinter): > return lstring_to_string(self.val) > > >-class WTFAtomicStringPrinter(StringPrinter): >- "Print a WTF::AtomicString" >+class WTFAtomStringPrinter(StringPrinter): >+ "Print a WTF::AtomString" > def to_string(self): > return self.val['m_string'] > >@@ -294,7 +294,7 @@ class WTFVectorPrinter: > def add_pretty_printers(): > pretty_printers = ( > (re.compile("^WTF::Vector<.*>$"), WTFVectorPrinter), >- (re.compile("^WTF::AtomicString$"), WTFAtomicStringPrinter), >+ (re.compile("^WTF::AtomString$"), WTFAtomStringPrinter), > (re.compile("^WTF::CString$"), WTFCStringPrinter), > (re.compile("^WTF::String$"), WTFStringPrinter), > (re.compile("^WTF::StringImpl$"), WTFStringImplPrinter), >diff --git a/Tools/lldb/lldb_webkit.py b/Tools/lldb/lldb_webkit.py >index 8a6c9e47e2130d57b42dcb5784fbcc2aa989e4bb..dbe4f029e251545a2dca9d4cb71ec90c8be1f674 100644 >--- a/Tools/lldb/lldb_webkit.py >+++ b/Tools/lldb/lldb_webkit.py >@@ -59,7 +59,7 @@ def __lldb_init_module(debugger, dict): > debugger.HandleCommand('type summary add --expand -F lldb_webkit.WTFString_SummaryProvider WTF::String') > debugger.HandleCommand('type summary add --expand -F lldb_webkit.WTFStringImpl_SummaryProvider WTF::StringImpl') > debugger.HandleCommand('type summary add --expand -F lldb_webkit.WTFStringView_SummaryProvider WTF::StringView') >- debugger.HandleCommand('type summary add --expand -F lldb_webkit.WTFAtomicString_SummaryProvider WTF::AtomicString') >+ debugger.HandleCommand('type summary add --expand -F lldb_webkit.WTFAtomString_SummaryProvider WTF::AtomString') > debugger.HandleCommand('type summary add --expand -F lldb_webkit.WTFVector_SummaryProvider -x "^WTF::Vector<.+>$"') > debugger.HandleCommand('type summary add --expand -F lldb_webkit.WTFHashTable_SummaryProvider -x "^WTF::HashTable<.+>$"') > debugger.HandleCommand('type summary add --expand -F lldb_webkit.WTFHashMap_SummaryProvider -x "^WTF::HashMap<.+>$"') >@@ -124,7 +124,7 @@ def WTFStringView_SummaryProvider(valobj, dict): > return "{ length = %d, contents = '%s' }" % (provider.get_length(), provider.to_string()) > > >-def WTFAtomicString_SummaryProvider(valobj, dict): >+def WTFAtomString_SummaryProvider(valobj, dict): > return WTFString_SummaryProvider(valobj.GetChildMemberWithName('m_string'), dict) > >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 195276
: 372205