WebKit Bugzilla
Attachment 372426 Details for
Bug 198990
: Tidy up the remaining bits of the AtomicString to AtomString rename
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-198990-20190618212117.patch (text/plain), 48.31 KB, created by
Darin Adler
on 2019-06-18 21:21:18 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Darin Adler
Created:
2019-06-18 21:21:18 PDT
Size:
48.31 KB
patch
obsolete
>Subversion Revision: 246579 >diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog >index b73d4e4b05ad9cbb75c9b5ac75d8b13225df48b3..9cf88043ae2350bc505791f2eeccb2e7a4459334 100644 >--- a/Source/JavaScriptCore/ChangeLog >+++ b/Source/JavaScriptCore/ChangeLog >@@ -1,3 +1,20 @@ >+2019-06-18 Darin Adler <darin@apple.com> >+ >+ Tidy up the remaining bits of the AtomicString to AtomString rename >+ https://bugs.webkit.org/show_bug.cgi?id=198990 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * dfg/DFGSpeculativeJIT.cpp: >+ (JSC::DFG::SpeculativeJIT::speculateStringIdentAndLoadStorage): Use flagIsAtom. >+ * dfg/DFGSpeculativeJIT32_64.cpp: >+ (JSC::DFG::SpeculativeJIT::compile): Ditto. >+ * dfg/DFGSpeculativeJIT64.cpp: >+ (JSC::DFG::SpeculativeJIT::compile): Ditto. >+ * ftl/FTLLowerDFGToB3.cpp: >+ (JSC::FTL::DFG::LowerDFGToB3::compileHasOwnProperty): Ditto. >+ (JSC::FTL::DFG::LowerDFGToB3::speculateStringIdent): Ditto. >+ > 2019-06-18 Yusuke Suzuki <ysuzuki@apple.com> > > [JSC] JSLock should be WebThread aware >diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog >index 04935c45c8ffb831af2db0d0924dd371d374153e..9f70b28da4dda74e78f5bf314c0ddaa0667e0fd4 100644 >--- a/Source/WTF/ChangeLog >+++ b/Source/WTF/ChangeLog >@@ -1,3 +1,34 @@ >+2019-06-18 Darin Adler <darin@apple.com> >+ >+ Tidy up the remaining bits of the AtomicString to AtomString rename >+ https://bugs.webkit.org/show_bug.cgi?id=198990 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * wtf/text/AtomString.h: Tweak formatting a bit. Use nullptr instead of 0. >+ Removed "using AtomicString = AtomString". >+ * wtf/text/AtomStringImpl.cpp: >+ (WTF::CStringTranslator::translate): Use setIsAtom instead of setIsAtomic. >+ (WTF::UCharBufferTranslator::translate): Ditto. >+ (WTF::HashAndUTF8CharactersTranslator::translate): Ditto. >+ (WTF::SubstringTranslator::translate): Ditto. >+ (WTF::LCharBufferTranslator::translate): Ditto. >+ (WTF::BufferFromStaticDataTranslator::translate): Ditto. >+ (WTF::AtomStringImpl::addSlowCase): Ditto. >+ (WTF::AtomStringImpl::lookUpSlowCase): Updated assertion message. >+ >+ * wtf/text/AtomStringImpl.h: Tweaked the implementation of add. >+ Updated comments to say AtomString. >+ >+ * wtf/text/AtomStringTable.cpp: >+ (WTF::AtomStringTable::~AtomStringTable): Use setIsAtom. >+ >+ * wtf/text/StringImpl.h: Updated name of s_hashFlagStringKindIsAtom. >+ renamed to flagIsAtom and setIsAtom. >+ >+ * wtf/text/WTFString.cpp: >+ (WTF::String::isSafeToSendToAnotherThread const): Updated comment. >+ > 2019-06-18 Kenneth Russell <kbr@chromium.org> > > Add preliminary ANGLE backend to WebCore >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index c571b58a80f3ebdd94d7bc2760647ccd15dac75f..e0eaf6fe216f76f3dea9fef0fc229cb7b3026b18 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,18 @@ >+2019-06-18 Darin Adler <darin@apple.com> >+ >+ Tidy up the remaining bits of the AtomicString to AtomString rename >+ https://bugs.webkit.org/show_bug.cgi?id=198990 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * bindings/scripts/test/JS/JSTestObj.cpp: Updated names. >+ * bindings/scripts/test/TestObj.idl: Ditto. >+ >+ * css/makeprop.pl: Updated comment. >+ * css/makevalues.pl: Ditto. >+ * html/FormController.cpp: >+ (WebCore::FormKeyGenerator::formKey): Ditto. >+ > 2019-06-18 Saam Barati <sbarati@apple.com> > > [WHLSL] Support matrices >diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp >index 2135c8e63639100af03f22648590eb53709ec3d7..1f3638d2147b9f60d784f08fbc9455607c180fd8 100644 >--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp >+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp >@@ -10281,7 +10281,7 @@ void SpeculativeJIT::speculateStringIdentAndLoadStorage(Edge edge, GPRReg string > BadType, JSValueSource::unboxedCell(string), edge, m_jit.branchTest32( > MacroAssembler::Zero, > MacroAssembler::Address(storage, StringImpl::flagsOffset()), >- MacroAssembler::TrustedImm32(StringImpl::flagIsAtomic()))); >+ MacroAssembler::TrustedImm32(StringImpl::flagIsAtom()))); > > m_interpreter.filter(edge, SpecStringIdent | ~SpecString); > } >diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp >index 75f102bc4fdc63329f2ddfde819de0460644668e..b3d1d1dd611e167f1e42843f58fa4c638fe9f3cf 100644 >--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp >+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp >@@ -3899,7 +3899,7 @@ void SpeculativeJIT::compile(Node* node) > slowPath.append(m_jit.branchIfRopeStringImpl(implGPR)); > slowPath.append(m_jit.branchTest32( > MacroAssembler::Zero, MacroAssembler::Address(implGPR, StringImpl::flagsOffset()), >- MacroAssembler::TrustedImm32(StringImpl::flagIsAtomic()))); >+ MacroAssembler::TrustedImm32(StringImpl::flagIsAtom()))); > break; > } > case UntypedUse: { >@@ -3909,7 +3909,7 @@ void SpeculativeJIT::compile(Node* node) > slowPath.append(m_jit.branchIfRopeStringImpl(implGPR)); > slowPath.append(m_jit.branchTest32( > MacroAssembler::Zero, MacroAssembler::Address(implGPR, StringImpl::flagsOffset()), >- MacroAssembler::TrustedImm32(StringImpl::flagIsAtomic()))); >+ MacroAssembler::TrustedImm32(StringImpl::flagIsAtom()))); > auto hasUniquedImpl = m_jit.jump(); > > isNotString.link(&m_jit); >diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp >index f3a0b2bc6fcf3c24425ac6d3aa30da265b94b750..9d0ae0af150b809c7141cc60ba6fbe62902ccf2c 100644 >--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp >+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp >@@ -4466,7 +4466,7 @@ void SpeculativeJIT::compile(Node* node) > slowPath.append(m_jit.branchIfRopeStringImpl(implGPR)); > slowPath.append(m_jit.branchTest32( > MacroAssembler::Zero, MacroAssembler::Address(implGPR, StringImpl::flagsOffset()), >- MacroAssembler::TrustedImm32(StringImpl::flagIsAtomic()))); >+ MacroAssembler::TrustedImm32(StringImpl::flagIsAtom()))); > break; > } > case UntypedUse: { >@@ -4476,7 +4476,7 @@ void SpeculativeJIT::compile(Node* node) > slowPath.append(m_jit.branchIfRopeStringImpl(implGPR)); > slowPath.append(m_jit.branchTest32( > MacroAssembler::Zero, MacroAssembler::Address(implGPR, StringImpl::flagsOffset()), >- MacroAssembler::TrustedImm32(StringImpl::flagIsAtomic()))); >+ MacroAssembler::TrustedImm32(StringImpl::flagIsAtom()))); > auto hasUniquedImpl = m_jit.jump(); > > isNotString.link(&m_jit); >diff --git a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp >index a539b0544dc670a2d45259b8bad7f8bd718c1d88..c4a6705ecac07159668104e04ba4a0cf1fafd17d 100644 >--- a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp >+++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp >@@ -10463,7 +10463,7 @@ private: > > 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())); >+ LValue isNotAtomic = m_out.testIsZero32(m_out.load32(uniquedStringImpl, m_heaps.StringImpl_hashAndFlags), m_out.constInt32(StringImpl::flagIsAtom())); > m_out.branch(isNotAtomic, rarely(slowCase), usually(isAtomString)); > > m_out.appendTo(isAtomString, slowCase); >@@ -10495,7 +10495,7 @@ private: > m_out.appendTo(isNonEmptyString, notStringCase); > LValue implFromString = m_out.loadPtr(keyAsValue, m_heaps.JSString_value); > ValueFromBlock stringResult = m_out.anchor(implFromString); >- LValue isNotAtomic = m_out.testIsZero32(m_out.load32(implFromString, m_heaps.StringImpl_hashAndFlags), m_out.constInt32(StringImpl::flagIsAtomic())); >+ LValue isNotAtomic = m_out.testIsZero32(m_out.load32(implFromString, m_heaps.StringImpl_hashAndFlags), m_out.constInt32(StringImpl::flagIsAtom())); > m_out.branch(isNotAtomic, rarely(slowCase), usually(hasUniquedStringImpl)); > > m_out.appendTo(notStringCase, isSymbolCase); >@@ -16421,7 +16421,7 @@ private: > BadType, jsValueValue(string), edge.node(), > m_out.testIsZero32( > m_out.load32(stringImpl, m_heaps.StringImpl_hashAndFlags), >- m_out.constInt32(StringImpl::flagIsAtomic()))); >+ m_out.constInt32(StringImpl::flagIsAtom()))); > m_interpreter.filter(edge, SpecStringIdent | ~SpecString); > } > >diff --git a/Source/WTF/wtf/text/AtomString.h b/Source/WTF/wtf/text/AtomString.h >index 9d43e1fa7284eba14a7c3bcddd3394e63e96eba7..38c3110072b2425560e2dc66bf88f372e51924b7 100644 >--- a/Source/WTF/wtf/text/AtomString.h >+++ b/Source/WTF/wtf/text/AtomString.h >@@ -1,5 +1,5 @@ > /* >- * Copyright (C) 2004-2017 Apple Inc. All rights reserved. >+ * Copyright (C) 2004-2019 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 >@@ -90,7 +90,8 @@ public: > operator const String&() const { return m_string; } > const String& string() const { return m_string; }; > >- AtomStringImpl* impl() const { return static_cast<AtomStringImpl *>(m_string.impl()); } >+ // FIXME: What guarantees this isn't a SymbolImpl rather than an AtomStringImpl? >+ 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(); } >@@ -132,9 +133,9 @@ public: > 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); } >+ int toInt(bool* ok = nullptr) const { return m_string.toInt(ok); } >+ double toDouble(bool* ok = nullptr) const { return m_string.toDouble(ok); } >+ float toFloat(bool* ok = nullptr) const { return m_string.toFloat(ok); } > bool percentage(int& p) const { return m_string.percentage(p); } > > bool isNull() const { return m_string.isNull(); } >@@ -145,8 +146,8 @@ public: > #endif > > #ifdef __OBJC__ >- AtomString(NSString*); >- operator NSString*() const { return m_string; } >+ AtomString(NSString *); >+ operator NSString *() const { return m_string; } > #endif > > #if OS(WINDOWS) && U_ICU_VERSION_MAJOR_NUM >= 59 >@@ -177,9 +178,7 @@ private: > String m_string; > }; > >-using AtomicString = AtomString; >- >-static_assert(sizeof(AtomString) == sizeof(String), "AtomString and String must be same size!"); >+static_assert(sizeof(AtomString) == sizeof(String), "AtomString and String must be the same size!"); > > inline bool operator==(const AtomString& a, const AtomString& b) { return a.impl() == b.impl(); } > bool operator==(const AtomString&, const LChar*); >@@ -281,7 +280,7 @@ inline AtomString::AtomString(CFStringRef string) > > #ifdef __OBJC__ > >-inline AtomString::AtomString(NSString* string) >+inline AtomString::AtomString(NSString *string) > : m_string(AtomStringImpl::add((__bridge CFStringRef)string)) > { > } >@@ -360,7 +359,6 @@ template<> struct IntegerToStringConversionTrait<AtomString> { > } // namespace WTF > > using WTF::AtomString; >-using WTF::AtomicString; > using WTF::nullAtom; > using WTF::emptyAtom; > using WTF::starAtom; >diff --git a/Source/WTF/wtf/text/AtomStringImpl.cpp b/Source/WTF/wtf/text/AtomStringImpl.cpp >index 87a64eeab25aa74dc0b91907b2c8448b95d1fc9c..269cbbcb2e07572f2c0223f3ac3970030833add6 100644 >--- a/Source/WTF/wtf/text/AtomStringImpl.cpp >+++ b/Source/WTF/wtf/text/AtomStringImpl.cpp >@@ -108,7 +108,7 @@ struct CStringTranslator { > { > location = &StringImpl::create(characters).leakRef(); > location->setHash(hash); >- location->setIsAtomic(true); >+ location->setIsAtom(true); > } > }; > >@@ -159,7 +159,7 @@ struct UCharBufferTranslator { > { > location = &StringImpl::create8BitIfPossible(buf.characters, buf.length).leakRef(); > location->setHash(hash); >- location->setIsAtomic(true); >+ location->setIsAtom(true); > } > }; > >@@ -227,7 +227,7 @@ struct HashAndUTF8CharactersTranslator { > > location = &newString.leakRef(); > location->setHash(hash); >- location->setIsAtomic(true); >+ location->setIsAtom(true); > } > }; > >@@ -270,7 +270,7 @@ struct SubstringTranslator { > { > location = &StringImpl::createSubstringSharingImpl(*buffer.baseString, buffer.start, buffer.length).leakRef(); > location->setHash(hash); >- location->setIsAtomic(true); >+ location->setIsAtom(true); > } > }; > >@@ -335,7 +335,7 @@ struct LCharBufferTranslator { > { > location = &StringImpl::create(buf.characters, buf.length).leakRef(); > location->setHash(hash); >- location->setIsAtomic(true); >+ location->setIsAtom(true); > } > }; > >@@ -356,7 +356,7 @@ struct BufferFromStaticDataTranslator { > { > location = &StringImpl::createWithoutCopying(buf.characters, buf.length).leakRef(); > location->setHash(hash); >- location->setIsAtomic(true); >+ location->setIsAtom(true); > } > }; > >@@ -444,7 +444,7 @@ Ref<AtomStringImpl> AtomStringImpl::addSlowCase(StringImpl& string) > > if (addResult.isNewEntry) { > ASSERT(*addResult.iterator == &string); >- string.setIsAtomic(true); >+ string.setIsAtom(true); > } > > return *static_cast<AtomStringImpl*>(*addResult.iterator); >@@ -474,7 +474,7 @@ Ref<AtomStringImpl> AtomStringImpl::addSlowCase(AtomStringTable& stringTable, St > > if (addResult.isNewEntry) { > ASSERT(*addResult.iterator == &string); >- string.setIsAtomic(true); >+ string.setIsAtom(true); > } > > return *static_cast<AtomStringImpl*>(*addResult.iterator); >@@ -493,7 +493,7 @@ void AtomStringImpl::remove(AtomStringImpl* string) > > RefPtr<AtomStringImpl> AtomStringImpl::lookUpSlowCase(StringImpl& string) > { >- ASSERT_WITH_MESSAGE(!string.isAtom(), "AtomicStringImpls should return from the fast case."); >+ ASSERT_WITH_MESSAGE(!string.isAtom(), "AtomStringImpl objects should return from the fast case."); > > if (!string.length()) > return static_cast<AtomStringImpl*>(StringImpl::empty()); >diff --git a/Source/WTF/wtf/text/AtomStringImpl.h b/Source/WTF/wtf/text/AtomStringImpl.h >index 3466a91bfabb25099826ec7e8033391a5b5419cd..55282ddcc6e50074606166d736b23e49a5cd75b5 100644 >--- a/Source/WTF/wtf/text/AtomStringImpl.h >+++ b/Source/WTF/wtf/text/AtomStringImpl.h >@@ -1,5 +1,5 @@ > /* >- * Copyright (C) 2006 Apple Inc. >+ * Copyright (C) 2006-2019 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 >@@ -46,12 +46,7 @@ public: > 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); >- } >+ ALWAYS_INLINE static RefPtr<AtomStringImpl> add(StringImpl* string) { return string ? add(*string) : nullptr; } > WTF_EXPORT_PRIVATE static RefPtr<AtomStringImpl> add(const StaticStringImpl*); > WTF_EXPORT_PRIVATE static Ref<AtomStringImpl> addLiteral(const char* characters, unsigned length); > >@@ -102,20 +97,19 @@ private: > }; > > #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*> { >+ >+// AtomStringImpls 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 don't >+// do any consistency check for AtomStringImpl*. >+ >+template<> struct ValueCheck<AtomStringImpl*> { > static void checkConsistency(const AtomStringImpl*) { } > }; > >-template<> struct >-ValueCheck<const AtomStringImpl*> { >+template<> struct ValueCheck<const AtomStringImpl*> { > static void checkConsistency(const AtomStringImpl*) { } > }; >+ > #endif > > } >diff --git a/Source/WTF/wtf/text/AtomStringTable.cpp b/Source/WTF/wtf/text/AtomStringTable.cpp >index 9812ac229f5d4c4a6933e19f31cedba76d98cb2d..c1382528d1090905f491171d239b52d3cca19f17 100644 >--- a/Source/WTF/wtf/text/AtomStringTable.cpp >+++ b/Source/WTF/wtf/text/AtomStringTable.cpp >@@ -32,7 +32,7 @@ namespace WTF { > AtomStringTable::~AtomStringTable() > { > for (auto* string : m_table) >- string->setIsAtomic(false); >+ string->setIsAtom(false); > } > > } >diff --git a/Source/WTF/wtf/text/StringImpl.h b/Source/WTF/wtf/text/StringImpl.h >index d79c557966ca5d15a430e3baa805bb95d4b7de06..c0add11bffdf4d2027c93ed0f8731bcf68191816 100644 >--- a/Source/WTF/wtf/text/StringImpl.h >+++ b/Source/WTF/wtf/text/StringImpl.h >@@ -197,16 +197,16 @@ private: > static_assert(s_flagCount <= StringHasher::flagCount, "StringHasher reserves enough bits for StringImpl flags"); > static constexpr const unsigned s_flagStringKindCount = 4; > >- static constexpr const unsigned s_hashFlagStringKindIsAtomic = 1u << (s_flagStringKindCount); >+ static constexpr const unsigned s_hashFlagStringKindIsAtom = 1u << (s_flagStringKindCount); > static constexpr const unsigned s_hashFlagStringKindIsSymbol = 1u << (s_flagStringKindCount + 1); >- static constexpr const unsigned s_hashMaskStringKind = s_hashFlagStringKindIsAtomic | s_hashFlagStringKindIsSymbol; >+ static constexpr const unsigned s_hashMaskStringKind = s_hashFlagStringKindIsAtom | s_hashFlagStringKindIsSymbol; > static constexpr const unsigned s_hashFlagDidReportCost = 1u << 3; > static constexpr const unsigned s_hashFlag8BitBuffer = 1u << 2; > static constexpr const unsigned s_hashMaskBufferOwnership = (1u << 0) | (1u << 1); > > enum StringKind { > StringNormal = 0u, // non-symbol, non-atomic >- StringAtomic = s_hashFlagStringKindIsAtomic, // non-symbol, atomic >+ StringAtomic = s_hashFlagStringKindIsAtom, // non-symbol, atomic > StringSymbol = s_hashFlagStringKindIsSymbol, // symbol, non-atomic > }; > >@@ -265,7 +265,7 @@ public: > > static unsigned flagsOffset() { return OBJECT_OFFSETOF(StringImpl, m_hashAndFlags); } > static constexpr unsigned flagIs8Bit() { return s_hashFlag8BitBuffer; } >- static constexpr unsigned flagIsAtomic() { return s_hashFlagStringKindIsAtomic; } >+ static constexpr unsigned flagIsAtom() { return s_hashFlagStringKindIsAtom; } > static constexpr unsigned flagIsSymbol() { return s_hashFlagStringKindIsSymbol; } > static constexpr unsigned maskStringKind() { return s_hashMaskStringKind; } > static unsigned dataOffset() { return OBJECT_OFFSETOF(StringImpl, m_data8); } >@@ -292,8 +292,8 @@ public: > WTF_EXPORT_PRIVATE size_t sizeInBytes() const; > > bool isSymbol() const { return m_hashAndFlags & s_hashFlagStringKindIsSymbol; } >- bool isAtom() const { return m_hashAndFlags & s_hashFlagStringKindIsAtomic; } >- void setIsAtomic(bool); >+ bool isAtom() const { return m_hashAndFlags & s_hashFlagStringKindIsAtom; } >+ void setIsAtom(bool); > > bool isExternal() const { return bufferOwnership() == BufferExternal; } > >@@ -359,8 +359,8 @@ public: > // This means StaticStringImpl costs are not counted. But since there should only > // be a finite set of StaticStringImpls, their cost can be aggregated into a single > // system cost if needed. >- // b. setIsAtomic() is never called on a StaticStringImpl. >- // setIsAtomic() asserts !isStatic(). >+ // b. setIsAtom() is never called on a StaticStringImpl. >+ // setIsAtom() asserts !isStatic(). > // c. setHash() is never called on a StaticStringImpl. > // StaticStringImpl's constructor sets the hash on construction. > // StringImpl::hash() only sets a new hash iff !hasHash(). >@@ -1031,14 +1031,14 @@ inline size_t StringImpl::costDuringGC() > return divideRoundedUp(result, refCount()); > } > >-inline void StringImpl::setIsAtomic(bool isAtom) >+inline void StringImpl::setIsAtom(bool isAtom) > { > ASSERT(!isStatic()); > ASSERT(!isSymbol()); > if (isAtom) >- m_hashAndFlags |= s_hashFlagStringKindIsAtomic; >+ m_hashAndFlags |= s_hashFlagStringKindIsAtom; > else >- m_hashAndFlags &= ~s_hashFlagStringKindIsAtomic; >+ m_hashAndFlags &= ~s_hashFlagStringKindIsAtom; > } > > inline void StringImpl::setHash(unsigned hash) const >diff --git a/Source/WTF/wtf/text/WTFString.cpp b/Source/WTF/wtf/text/WTFString.cpp >index 43de3d076059f8074b74876ef77f683904b6a0b4..cff7bedba0d3d18783fc129342d2487412ad1f9e 100644 >--- a/Source/WTF/wtf/text/WTFString.cpp >+++ b/Source/WTF/wtf/text/WTFString.cpp >@@ -1,6 +1,6 @@ > /* > * (C) 1999 Lars Knoll (knoll@kde.org) >- * Copyright (C) 2004-2017 Apple Inc. All rights reserved. >+ * Copyright (C) 2004-2019 Apple Inc. All rights reserved. > * Copyright (C) 2007-2009 Torch Mobile, Inc. > * > * This library is free software; you can redistribute it and/or >@@ -648,7 +648,7 @@ String String::isolatedCopy() && > > bool String::isSafeToSendToAnotherThread() const > { >- // AtomicStrings are not safe to send between threads as ~StringImpl() >+ // AtomStrings are not safe to send between threads, as ~StringImpl() > // will try to remove them from the wrong AtomStringTable. > return isEmpty() || (m_impl->hasOneRef() && !m_impl->isAtom()); > } >diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp >index c781c86649c7c3a54418e903f221096687187223..bf3c85dd8cbcf4c9aba4aab3305b47b1e0fdd190 100644 >--- a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp >+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp >@@ -1486,15 +1486,15 @@ JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithNonOptiona > JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs(JSC::ExecState*); > JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalString(JSC::ExecState*); > JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalUSVString(JSC::ExecState*); >-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomicString(JSC::ExecState*); >+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomString(JSC::ExecState*); > JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalStringAndDefaultValue(JSC::ExecState*); >-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringAndDefaultValue(JSC::ExecState*); >+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomStringAndDefaultValue(JSC::ExecState*); > JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalStringIsNull(JSC::ExecState*); > JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalStringIsUndefined(JSC::ExecState*); >-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsNull(JSC::ExecState*); >+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomStringIsNull(JSC::ExecState*); > JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalStringIsEmptyString(JSC::ExecState*); > JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalUSVStringIsEmptyString(JSC::ExecState*); >-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsEmptyString(JSC::ExecState*); >+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomStringIsEmptyString(JSC::ExecState*); > JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalDoubleIsNaN(JSC::ExecState*); > JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalFloatIsNaN(JSC::ExecState*); > JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalLongLong(JSC::ExecState*); >@@ -2203,15 +2203,15 @@ static const HashTableValue JSTestObjPrototypeTableValues[] = > { "methodWithNonOptionalArgAndTwoOptionalArgs", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs), (intptr_t) (1) } }, > { "methodWithOptionalString", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalString), (intptr_t) (0) } }, > { "methodWithOptionalUSVString", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalUSVString), (intptr_t) (0) } }, >- { "methodWithOptionalAtomicString", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalAtomicString), (intptr_t) (0) } }, >+ { "methodWithOptionalAtomString", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalAtomString), (intptr_t) (0) } }, > { "methodWithOptionalStringAndDefaultValue", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalStringAndDefaultValue), (intptr_t) (0) } }, >- { "methodWithOptionalAtomicStringAndDefaultValue", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringAndDefaultValue), (intptr_t) (0) } }, >+ { "methodWithOptionalAtomStringAndDefaultValue", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalAtomStringAndDefaultValue), (intptr_t) (0) } }, > { "methodWithOptionalStringIsNull", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalStringIsNull), (intptr_t) (0) } }, > { "methodWithOptionalStringIsUndefined", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalStringIsUndefined), (intptr_t) (0) } }, >- { "methodWithOptionalAtomicStringIsNull", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsNull), (intptr_t) (0) } }, >+ { "methodWithOptionalAtomStringIsNull", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalAtomStringIsNull), (intptr_t) (0) } }, > { "methodWithOptionalStringIsEmptyString", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalStringIsEmptyString), (intptr_t) (0) } }, > { "methodWithOptionalUSVStringIsEmptyString", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalUSVStringIsEmptyString), (intptr_t) (0) } }, >- { "methodWithOptionalAtomicStringIsEmptyString", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsEmptyString), (intptr_t) (0) } }, >+ { "methodWithOptionalAtomStringIsEmptyString", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalAtomStringIsEmptyString), (intptr_t) (0) } }, > { "methodWithOptionalDoubleIsNaN", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalDoubleIsNaN), (intptr_t) (0) } }, > { "methodWithOptionalFloatIsNaN", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalFloatIsNaN), (intptr_t) (0) } }, > { "methodWithOptionalLongLong", static_cast<unsigned>(JSC::PropertyAttribute::Function), NoIntrinsic, { (intptr_t)static_cast<RawNativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalLongLong), (intptr_t) (0) } }, >@@ -6448,20 +6448,20 @@ EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalUSVStri > return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionMethodWithOptionalUSVStringBody>(*state, "methodWithOptionalUSVString"); > } > >-static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope) >+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalAtomStringBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope) > { > UNUSED_PARAM(state); > UNUSED_PARAM(throwScope); > auto& impl = castedThis->wrapped(); > auto str = state->argument(0).isUndefined() ? nullAtom() : convert<IDLAtomStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); > RETURN_IF_EXCEPTION(throwScope, encodedJSValue()); >- impl.methodWithOptionalAtomicString(WTFMove(str)); >+ impl.methodWithOptionalAtomString(WTFMove(str)); > return JSValue::encode(jsUndefined()); > } > >-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomicString(ExecState* state) >+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomString(ExecState* state) > { >- return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringBody>(*state, "methodWithOptionalAtomicString"); >+ return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionMethodWithOptionalAtomStringBody>(*state, "methodWithOptionalAtomString"); > } > > static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalStringAndDefaultValueBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope) >@@ -6480,20 +6480,20 @@ EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalStringA > return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionMethodWithOptionalStringAndDefaultValueBody>(*state, "methodWithOptionalStringAndDefaultValue"); > } > >-static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringAndDefaultValueBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope) >+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalAtomStringAndDefaultValueBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope) > { > UNUSED_PARAM(state); > UNUSED_PARAM(throwScope); > auto& impl = castedThis->wrapped(); > 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)); >+ impl.methodWithOptionalAtomStringAndDefaultValue(WTFMove(str)); > return JSValue::encode(jsUndefined()); > } > >-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringAndDefaultValue(ExecState* state) >+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomStringAndDefaultValue(ExecState* state) > { >- return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringAndDefaultValueBody>(*state, "methodWithOptionalAtomicStringAndDefaultValue"); >+ return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionMethodWithOptionalAtomStringAndDefaultValueBody>(*state, "methodWithOptionalAtomStringAndDefaultValue"); > } > > static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalStringIsNullBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope) >@@ -6528,20 +6528,20 @@ EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalStringI > return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionMethodWithOptionalStringIsUndefinedBody>(*state, "methodWithOptionalStringIsUndefined"); > } > >-static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsNullBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope) >+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalAtomStringIsNullBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope) > { > UNUSED_PARAM(state); > UNUSED_PARAM(throwScope); > auto& impl = castedThis->wrapped(); > auto str = state->argument(0).isUndefined() ? nullAtom() : convert<IDLAtomStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); > RETURN_IF_EXCEPTION(throwScope, encodedJSValue()); >- impl.methodWithOptionalAtomicStringIsNull(WTFMove(str)); >+ impl.methodWithOptionalAtomStringIsNull(WTFMove(str)); > return JSValue::encode(jsUndefined()); > } > >-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsNull(ExecState* state) >+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomStringIsNull(ExecState* state) > { >- return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsNullBody>(*state, "methodWithOptionalAtomicStringIsNull"); >+ return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionMethodWithOptionalAtomStringIsNullBody>(*state, "methodWithOptionalAtomStringIsNull"); > } > > static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalStringIsEmptyStringBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope) >@@ -6576,20 +6576,20 @@ EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalUSVStri > return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionMethodWithOptionalUSVStringIsEmptyStringBody>(*state, "methodWithOptionalUSVStringIsEmptyString"); > } > >-static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsEmptyStringBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope) >+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalAtomStringIsEmptyStringBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope) > { > UNUSED_PARAM(state); > UNUSED_PARAM(throwScope); > auto& impl = castedThis->wrapped(); > auto str = state->argument(0).isUndefined() ? emptyAtom() : convert<IDLAtomStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0)); > RETURN_IF_EXCEPTION(throwScope, encodedJSValue()); >- impl.methodWithOptionalAtomicStringIsEmptyString(WTFMove(str)); >+ impl.methodWithOptionalAtomStringIsEmptyString(WTFMove(str)); > return JSValue::encode(jsUndefined()); > } > >-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsEmptyString(ExecState* state) >+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalAtomStringIsEmptyString(ExecState* state) > { >- return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsEmptyStringBody>(*state, "methodWithOptionalAtomicStringIsEmptyString"); >+ return IDLOperation<JSTestObj>::call<jsTestObjPrototypeFunctionMethodWithOptionalAtomStringIsEmptyStringBody>(*state, "methodWithOptionalAtomStringIsEmptyString"); > } > > static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalDoubleIsNaNBody(JSC::ExecState* state, typename IDLOperation<JSTestObj>::ClassParameter castedThis, JSC::ThrowScope& throwScope) >diff --git a/Source/WebCore/bindings/scripts/test/TestObj.idl b/Source/WebCore/bindings/scripts/test/TestObj.idl >index 0872a9f5132b67dca6144fe6f343d8f22ac73828..1e98bcd0c545843106bfa4946401bb3ae8991563 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 [AtomString] DOMString str); >+ void methodWithOptionalAtomString(optional [AtomString] DOMString str); > void methodWithOptionalStringAndDefaultValue(optional DOMString str = "foo"); >- void methodWithOptionalAtomicStringAndDefaultValue(optional [AtomString] DOMString str = "foo"); >+ void methodWithOptionalAtomStringAndDefaultValue(optional [AtomString] DOMString str = "foo"); > void methodWithOptionalStringIsNull(optional DOMString str = null); > void methodWithOptionalStringIsUndefined(optional DOMString str = "undefined"); >- void methodWithOptionalAtomicStringIsNull(optional [AtomString] DOMString str = null); >+ void methodWithOptionalAtomStringIsNull(optional [AtomString] DOMString str = null); > void methodWithOptionalStringIsEmptyString(optional DOMString str = ""); > void methodWithOptionalUSVStringIsEmptyString(optional USVString str = ""); >- void methodWithOptionalAtomicStringIsEmptyString(optional [AtomString] DOMString str = ""); >+ void methodWithOptionalAtomStringIsEmptyString(optional [AtomString] DOMString str = ""); > void methodWithOptionalDoubleIsNaN(optional unrestricted double number = NaN); > void methodWithOptionalFloatIsNaN(optional unrestricted float number = NaN); > void methodWithOptionalLongLong(optional long long number); >diff --git a/Source/WebCore/css/makeprop.pl b/Source/WebCore/css/makeprop.pl >index 7acc58cbf12e4aaf574ad382e55a46458cbec9f6..997c4c0367dd5d0d645d5edf51eec4bfb0c32105 100755 >--- a/Source/WebCore/css/makeprop.pl >+++ b/Source/WebCore/css/makeprop.pl >@@ -369,7 +369,7 @@ const AtomString& getPropertyNameAtomString(CSSPropertyID id) > > String getPropertyNameString(CSSPropertyID id) > { >- // We share the StringImpl with the AtomicStrings. >+ // We share the StringImpl with the AtomStrings. > return getPropertyNameAtomString(id).string(); > } > >diff --git a/Source/WebCore/css/makevalues.pl b/Source/WebCore/css/makevalues.pl >index 7224df5114246795fde5b64991b2c5c269c74125..abdb1ec6376aed776f94ef1b415eee98310bf9ae 100755 >--- a/Source/WebCore/css/makevalues.pl >+++ b/Source/WebCore/css/makevalues.pl >@@ -145,7 +145,7 @@ const AtomString& getValueNameAtomString(CSSValueID id) > > String getValueNameString(CSSValueID id) > { >- // We share the StringImpl with the AtomicStrings. >+ // We share the StringImpl with the AtomStrings. > return getValueNameAtomString(id).string(); > } > >diff --git a/Source/WebCore/html/FormController.cpp b/Source/WebCore/html/FormController.cpp >index b7d1035b7589469b155014410812d1c112aa934b..6532bdbb30e5a2671e804aea691d5b25e51416c9 100644 >--- a/Source/WebCore/html/FormController.cpp >+++ b/Source/WebCore/html/FormController.cpp >@@ -326,7 +326,7 @@ AtomString FormKeyGenerator::formKey(const HTMLFormControlElementWithState& cont > return m_formToKeyMap.ensure(form.get(), [this, &form] { > auto signature = formSignature(*form); > auto nextIndex = m_formSignatureToNextIndexMap.add(signature, 0).iterator->value++; >- // FIXME: Would be nice to have makeAtomicString to use here. >+ // FIXME: Would be nice to have makeAtomString to use to optimize the case where the string already exists. > return makeString(signature, " #", nextIndex); > }).iterator->value; > } >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 6c8bb2fab96e79db756f545f7d59eefd0ed9986a..9dc8d97742c7bb038bec05177f2748878f5d3970 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,12 @@ >+2019-06-18 Darin Adler <darin@apple.com> >+ >+ Tidy up the remaining bits of the AtomicString to AtomString rename >+ https://bugs.webkit.org/show_bug.cgi?id=198990 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Scripts/do-webcore-rename: Removed already-done renames. >+ > 2019-06-18 Yusuke Suzuki <ysuzuki@apple.com> > > [JSC] JSLock should be WebThread aware >diff --git a/Tools/Scripts/do-webcore-rename b/Tools/Scripts/do-webcore-rename >index 8998f7675e8d4c75e3bfc036185a64302c942bb7..0ccdda2a06e10d97ad23f93bdddfebf37b2d1928 100755 >--- a/Tools/Scripts/do-webcore-rename >+++ b/Tools/Scripts/do-webcore-rename >@@ -102,67 +102,10 @@ sub wanted > my $isDOMTypeRename = 0; > my %renames = ( > # Renames go here in the form of: >- "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", >+ "flagIsAtomic" => "flagIsAtom", > ); > > my %renamesContemplatedForTheFuture = ( >- "setDOMException" => "propagateException", >- "setDOMExceptionSlow" => "propagateExceptionSlowPath", >- >- "PassRefPtr" => "DeprecatedPassRefPtr", >- > "HTMLPlugInImageElement" => "HTMLEmbeddedObjectElement", > "isPlugInImageElement" => "isEmbeddedObjectElement", > "isHTMLPlugInImageElement" => "isHTMLEmbeddedObjectElement", >@@ -173,8 +116,6 @@ my %renamesContemplatedForTheFuture = ( > "DateInstance" => "JSDate", > "ErrorInstance" => "JSError", > >- "TreeShared" => "TreeRefCounted", >- > "StringImpl" => "SharedString", > > "RenderView" => "RenderViewport", >@@ -187,10 +128,6 @@ my %renamesContemplatedForTheFuture = ( > "runtime_object" => "BridgedObject", > "objc_runtime" => "ObjCBridge", > >- "WTF_UNICODE_H" => "Unicode_h", >- "WTF_UNICODE_ICU_H" => "UnicodeICU_h", >- "UnicodeIcu" => "UnicodeICU", >- > "LegacyWebArchive" => "WebArchive", > "LegacyWebArchive_h" => "WebArchive_h", > >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 6f70302e5af793e8076788935698ed616de536d0..27bb4e5d38f1130984e1945eca5832c3e69f3bdd 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,13 @@ >+2019-06-18 Darin Adler <darin@apple.com> >+ >+ Tidy up the remaining bits of the AtomicString to AtomString rename >+ https://bugs.webkit.org/show_bug.cgi?id=198990 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * js/dopey-rope-with-16-bit-propertyname-expected.txt: Rename to AtomString. >+ * js/dopey-rope-with-16-bit-propertyname.html: Ditto. >+ > 2019-06-18 Saam Barati <sbarati@apple.com> > > [WHLSL] Support matrices >diff --git a/LayoutTests/js/dopey-rope-with-16-bit-propertyname-expected.txt b/LayoutTests/js/dopey-rope-with-16-bit-propertyname-expected.txt >index 6f25f197bd5993f43d684aa278dacc868cc610e4..eb708bc9bc84c5b6eff37925c9ae218f08eda528 100644 >--- a/LayoutTests/js/dopey-rope-with-16-bit-propertyname-expected.txt >+++ b/LayoutTests/js/dopey-rope-with-16-bit-propertyname-expected.txt >@@ -1,4 +1,4 @@ >-Test that a 16-bit AtomicString containing only 8-bit characters doesn't confuse the JIT into thinking it's an 8-bit AtomicString. >+Test that a 16-bit AtomString containing only 8-bit characters doesn't confuse the JIT into thinking it's an 8-bit AtomString. > > On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". > >diff --git a/LayoutTests/js/dopey-rope-with-16-bit-propertyname.html b/LayoutTests/js/dopey-rope-with-16-bit-propertyname.html >index d94b4b59998504f3ae01b78a82fcf7f9e5dc3dcf..1b2d4f0feb75dcf877ae7f8b0a96f9251c78e022 100644 >--- a/LayoutTests/js/dopey-rope-with-16-bit-propertyname.html >+++ b/LayoutTests/js/dopey-rope-with-16-bit-propertyname.html >@@ -7,14 +7,14 @@ > <body> > <script> > >-description("Test that a 16-bit AtomicString containing only 8-bit characters doesn't confuse the JIT into thinking it's an 8-bit AtomicString."); >+description("Test that a 16-bit AtomString containing only 8-bit characters doesn't confuse the JIT into thinking it's an 8-bit AtomString."); > > o = {}; > > stringWithEmoji = "zestð"; > var test16bit = stringWithEmoji.substring(0, 4); > >-o[test16bit] = "this makes it an AtomicString"; >+o[test16bit] = "this makes it an AtomString"; > > globalRope = ""; >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=372426">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 198990
:
372426
|
372427