Changeset 219199 in webkit


Ignore:
Timestamp:
Jul 6, 2017 9:22:41 AM (7 years ago)
Author:
Matt Lewis
Message:

Unreviewed, rolling out r219178.

This caused a consistent failure with the API test
StringBuilderTest.ToAtomicStringOnEmpty on all Debug testers.

Reverted changeset:

"[WTF] Clean up StringStatics.cpp by using
LazyNeverDestroyed<> for Atoms"
​https://bugs.webkit.org/show_bug.cgi?id=174150
​http://trac.webkit.org/changeset/219178

Location:
trunk
Files:
1 added
147 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r219191 r219199  
     12017-07-06  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r219178.
     4
     5        This caused a consistent failure with the API test
     6        StringBuilderTest.ToAtomicStringOnEmpty on all Debug testers.
     7
     8        Reverted changeset:
     9
     10        "[WTF] Clean up StringStatics.cpp by using
     11        LazyNeverDestroyed<> for Atoms"
     12        https://bugs.webkit.org/show_bug.cgi?id=174150
     13        http://trac.webkit.org/changeset/219178
     14
    1152017-07-05  Don Olmstead  <don.olmstead@sony.com>
    216

  • trunk/Source/WTF/WTF.xcodeproj/project.pbxproj

    r219191 r219199  
    116116                A8A4743C151A825B004123FF /* StringBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A47324151A825B004123FF /* StringBuilder.cpp */; };
    117117                A8A47440151A825B004123FF /* StringImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A47328151A825B004123FF /* StringImpl.cpp */; };
     118                A8A47443151A825B004123FF /* StringStatics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A4732B151A825B004123FF /* StringStatics.cpp */; };
    118119                A8A47445151A825B004123FF /* WTFString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A4732D151A825B004123FF /* WTFString.cpp */; };
    119120                A8A47448151A825B004123FF /* ThreadHolderPthreads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A47330151A825B004123FF /* ThreadHolderPthreads.cpp */; };
    … …  
    489490                A8A47329151A825B004123FF /* StringImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringImpl.h; sourceTree = "<group>"; };
    490491                A8A4732A151A825B004123FF /* StringOperators.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringOperators.h; sourceTree = "<group>"; };
     492                A8A4732B151A825B004123FF /* StringStatics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringStatics.cpp; sourceTree = "<group>"; };
    491493                A8A4732C151A825B004123FF /* TextPosition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextPosition.h; sourceTree = "<group>"; };
    492494                A8A4732D151A825B004123FF /* WTFString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WTFString.cpp; sourceTree = "<group>"; };
    … …  
    10691071                                A8A47329151A825B004123FF /* StringImpl.h */,
    10701072                                A8A4732A151A825B004123FF /* StringOperators.h */,
     1073                                A8A4732B151A825B004123FF /* StringStatics.cpp */,
    10711074                                93F1993D19D7958D00C2390B /* StringView.cpp */,
    10721075                                1A6EB1DF187D0BD30030126F /* StringView.h */,
    … …  
    13771380                                A5BA15F3182433A900A82E69 /* StringMac.mm in Sources */,
    13781381                                0FDDBFA71666DFA300C55FEF /* StringPrintStream.cpp in Sources */,
     1382                                A8A47443151A825B004123FF /* StringStatics.cpp in Sources */,
    13791383                                93F1993E19D7958D00C2390B /* StringView.cpp in Sources */,
    13801384                                93934BD518A1F16900D0D6A1 /* StringViewCF.cpp in Sources */,

  • trunk/Source/WTF/wtf/CMakeLists.txt

    r219178 r219199  
    277277    text/StringBuilder.cpp
    278278    text/StringImpl.cpp
     279    text/StringStatics.cpp
    279280    text/StringView.cpp
    280281    text/SymbolImpl.cpp

  • trunk/Source/WTF/wtf/text/AtomicString.cpp

    r219178 r219199  
    2525
    2626#include "IntegerToStringConversion.h"
    27 #include "MainThread.h"
    28 #include "NeverDestroyed.h"
    2927#include "dtoa.h"
     28
     29#if USE(WEB_THREAD)
     30#include "Lock.h"
     31#endif
    3032
    3133namespace WTF {
    … …  
    3638    StringImpl* impl = this->impl();
    3739    if (UNLIKELY(!impl))
    38         return nullAtom();
     40        return nullAtom;
    3941
    4042    // Convert short strings without allocating a new StringImpl, since
    … …  
    111113    auto impl = AtomicStringImpl::addUTF8(charactersStart, charactersEnd);
    112114    if (!impl)
    113         return nullAtom();
     115        return nullAtom;
    114116    return impl.get();
    115117}
    … …  
    122124#endif
    123125
    124 WTF_EXPORTDATA LazyNeverDestroyed<AtomicString> nullAtomData;
    125 WTF_EXPORTDATA LazyNeverDestroyed<AtomicString> emptyAtomData;
    126 WTF_EXPORTDATA LazyNeverDestroyed<AtomicString> starAtomData;
    127 WTF_EXPORTDATA LazyNeverDestroyed<AtomicString> xmlAtomData;
    128 WTF_EXPORTDATA LazyNeverDestroyed<AtomicString> xmlnsAtomData;
    129 
    130 void AtomicString::init()
    131 {
    132     static std::once_flag initializeKey;
    133     std::call_once(initializeKey, [] {
    134         // Initialization is not thread safe, so this function must be called from the main thread first.
    135         ASSERT(isUIThread());
    136 
    137         nullAtomData.construct();
    138         emptyAtomData.construct("");
    139         starAtomData.construct("*", AtomicString::ConstructFromLiteral);
    140         xmlAtomData.construct("xml", AtomicString::ConstructFromLiteral);
    141         xmlnsAtomData.construct("xmlns", AtomicString::ConstructFromLiteral);
    142     });
    143 }
    144 
    145126} // namespace WTF

  • trunk/Source/WTF/wtf/text/AtomicString.h

    r219178 r219199  
    2323
    2424#include <utility>
    25 #include <wtf/NeverDestroyed.h>
    2625#include <wtf/text/AtomicStringImpl.h>
    2726#include <wtf/text/IntegerToStringConversion.h>
    … …  
    306305// Define external global variables for the commonly used atomic strings.
    307306// These are only usable from the main thread.
    308 extern WTF_EXPORTDATA LazyNeverDestroyed<AtomicString> nullAtomData;
    309 extern WTF_EXPORTDATA LazyNeverDestroyed<AtomicString> emptyAtomData;
    310 extern WTF_EXPORTDATA LazyNeverDestroyed<AtomicString> starAtomData;
    311 extern WTF_EXPORTDATA LazyNeverDestroyed<AtomicString> xmlAtomData;
    312 extern WTF_EXPORTDATA LazyNeverDestroyed<AtomicString> xmlnsAtomData;
    313 
    314 inline const AtomicString& nullAtom() { return nullAtomData.get(); }
    315 inline const AtomicString& emptyAtom() { return emptyAtomData.get(); }
    316 inline const AtomicString& starAtom() { return starAtomData.get(); }
    317 inline const AtomicString& xmlAtom() { return xmlAtomData.get(); }
    318 inline const AtomicString& xmlnsAtom() { return xmlnsAtomData.get(); }
     307#ifndef ATOMICSTRING_HIDE_GLOBALS
     308extern const WTF_EXPORTDATA AtomicString nullAtom;
     309extern const WTF_EXPORTDATA AtomicString emptyAtom;
     310extern const WTF_EXPORTDATA AtomicString starAtom;
     311extern const WTF_EXPORTDATA AtomicString xmlAtom;
     312extern const WTF_EXPORTDATA AtomicString xmlnsAtom;
    319313
    320314inline AtomicString AtomicString::fromUTF8(const char* characters, size_t length)
    321315{
    322316    if (!characters)
    323         return nullAtom();
     317        return nullAtom;
    324318    if (!length)
    325         return emptyAtom();
     319        return emptyAtom;
    326320    return fromUTF8Internal(characters, characters + length);
    327321}
    … …  
    330324{
    331325    if (!characters)
    332         return nullAtom();
     326        return nullAtom;
    333327    if (!*characters)
    334         return emptyAtom();
     328        return emptyAtom;
    335329    return fromUTF8Internal(characters, nullptr);
    336330}
     331#endif
    337332
    338333// AtomicStringHash is the default hash for AtomicString

  • trunk/Source/WTF/wtf/text/StringBuilder.h

    r219178 r219199  
    206206    {
    207207        if (!m_length)
    208             return emptyAtom();
     208            return emptyAtom;
    209209
    210210        // If the buffer is sufficiently over-allocated, make a new AtomicString from a copy so its buffer is not so large.

  • trunk/Source/WTF/wtf/text/StringImpl.cpp

    r219178 r219199  
    21412141}
    21422142
    2143 NEVER_INLINE unsigned StringImpl::hashSlowCase() const
    2144 {
    2145     if (is8Bit())
    2146         setHash(StringHasher::computeHashAndMaskTop8Bits(m_data8, m_length));
    2147     else
    2148         setHash(StringHasher::computeHashAndMaskTop8Bits(m_data16, m_length));
    2149     return existingHash();
    2150 }
    2151 
    2152 unsigned StringImpl::concurrentHash() const
    2153 {
    2154     unsigned hash;
    2155     if (is8Bit())
    2156         hash = StringHasher::computeHashAndMaskTop8Bits(m_data8, m_length);
    2157     else
    2158         hash = StringHasher::computeHashAndMaskTop8Bits(m_data16, m_length);
    2159     ASSERT(((hash << s_flagCount) >> s_flagCount) == hash);
    2160     return hash;
    2161 }
    2162 
    21632143bool equalIgnoringNullity(const UChar* a, size_t aLength, StringImpl* b)
    21642144{

  • trunk/Source/WebCore/ChangeLog

    r219194 r219199  
     12017-07-06  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r219178.
     4
     5        This caused a consistent failure with the API test
     6        StringBuilderTest.ToAtomicStringOnEmpty on all Debug testers.
     7
     8        Reverted changeset:
     9
     10        "[WTF] Clean up StringStatics.cpp by using
     11        LazyNeverDestroyed<> for Atoms"
     12        https://bugs.webkit.org/show_bug.cgi?id=174150
     13        http://trac.webkit.org/changeset/219178
     14
    1152017-07-06  Charlie Turner  <cturner@igalia.com>
    216

  • trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp

    r219178 r219199  
    131131    Page* page = m_mediaElement->document().page();
    132132    if (!page)
    133         return emptyAtom();
     133        return emptyAtom;
    134134
    135135    switch (page->group().captionPreferences().captionDisplayMode()) {
    … …  
    144144    default:
    145145        ASSERT_NOT_REACHED();
    146         return emptyAtom();
     146        return emptyAtom;
    147147    }
    148148}

  • trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp

    r219178 r219199  
    9191
    9292    ASSERT_NOT_REACHED();
    93     return emptyAtom();
     93    return emptyAtom;
    9494}
    9595

  • trunk/Source/WebCore/accessibility/AXObjectCache.cpp

    r219178 r219199  
    401401
    402402// FIXME: This probably belongs on Node.
    403 // FIXME: This should take a const char*, but one caller passes nullAtom().
     403// FIXME: This should take a const char*, but one caller passes nullAtom.
    404404bool nodeHasRole(Node* node, const String& role)
    405405{
    … …  
    424424    // ul/ol/dl type (it shouldn't be a list if aria says otherwise).
    425425    if (node && ((nodeHasRole(node, "list") || nodeHasRole(node, "directory"))
    426                       || (nodeHasRole(node, nullAtom()) && (node->hasTagName(ulTag) || node->hasTagName(olTag) || node->hasTagName(dlTag)))))
     426                      || (nodeHasRole(node, nullAtom) && (node->hasTagName(ulTag) || node->hasTagName(olTag) || node->hasTagName(dlTag)))))
    427427        return AccessibilityList::create(renderer);
    428428
    … …  
    441441        return AccessibilityTreeItem::create(renderer);
    442442
    443     if (node && is<HTMLLabelElement>(node) && nodeHasRole(node, nullAtom()))
     443    if (node && is<HTMLLabelElement>(node) && nodeHasRole(node, nullAtom))
    444444        return AccessibilityLabel::create(renderer);
    445445

  • trunk/Source/WebCore/accessibility/AccessibilityMediaControls.cpp

    r219178 r219199  
    136136    }
    137137
    138     return nullAtom();
     138    return nullAtom;
    139139}
    140140

  • trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

    r219178 r219199  
    10541054        if (doc)
    10551055            return doc->contentLanguage();
    1056         return nullAtom();
     1056        return nullAtom;
    10571057    }
    10581058   
    … …  
    19341934        return ASCIILiteral("off");
    19351935    default:
    1936         return nullAtom();
     1936        return nullAtom;
    19371937    }
    19381938}
    … …  
    19751975        return listItemAction;
    19761976    default:
    1977         return nullAtom();
     1977        return nullAtom;
    19781978    }
    19791979#else
    1980     return nullAtom();
     1980    return nullAtom;
    19811981#endif
    19821982}
    … …  
    21392139    if (Element* element = this->element())
    21402140        return element->attributeWithoutSynchronization(attribute);
    2141     return nullAtom();
     2141    return nullAtom;
    21422142}
    21432143   
    … …  
    24782478        return ariaPlaceholder;
    24792479   
    2480     return nullAtom();
     2480    return nullAtom;
    24812481}
    24822482   

  • trunk/Source/WebCore/accessibility/AccessibilityObject.h

    r219178 r219199  
    817817    virtual VisibleSelection selection() const { return VisibleSelection(); }
    818818    virtual String selectedText() const { return String(); }
    819     virtual const AtomicString& accessKey() const { return nullAtom(); }
     819    virtual const AtomicString& accessKey() const { return nullAtom; }
    820820    const String& actionVerb() const;
    821821    virtual Widget* widget() const { return nullptr; }
    … …  
    974974    bool isInsideARIALiveRegion() const;
    975975    virtual const String ariaLiveRegionStatus() const { return String(); }
    976     virtual const AtomicString& ariaLiveRegionRelevant() const { return nullAtom(); }
     976    virtual const AtomicString& ariaLiveRegionRelevant() const { return nullAtom; }
    977977    virtual bool ariaLiveRegionAtomic() const { return false; }
    978978    virtual bool isBusy() const { return false; }

  • trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

    r219178 r219199  
    15061506    Node* node = m_renderer->node();
    15071507    if (!is<Element>(node))
    1508         return nullAtom();
     1508        return nullAtom;
    15091509    return downcast<Element>(*node).getAttribute(accesskeyAttr);
    15101510}
    … …  
    34653465        return linkAction;
    34663466    default:
    3467         return nullAtom();
     3467        return nullAtom;
    34683468    }
    34693469#else
    3470     return nullAtom();
     3470    return nullAtom;
    34713471#endif
    34723472}

  • trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp

    r219178 r219199  
    6666        return element.releaseNonNull();
    6767
    68     auto element = HTMLUnknownElement::create(QualifiedName(nullAtom(), localName, HTMLNames::xhtmlNamespaceURI), document);
     68    auto element = HTMLUnknownElement::create(QualifiedName(nullAtom, localName, HTMLNames::xhtmlNamespaceURI), document);
    6969    element->setIsCustomElementUpgradeCandidate();
    7070    element->setIsFailedCustomElement(*this);
    … …  
    7676{
    7777    if (auto element = tryToConstructCustomElement(document, name.localName())) {
    78         if (name.prefix() != nullAtom())
     78        if (name.prefix() != nullAtom)
    7979            element->setPrefix(name.prefix());
    8080        return element.releaseNonNull();

  • trunk/Source/WebCore/bindings/js/JSCustomElementRegistryCustom.cpp

    r219178 r219199  
    127127    JSObject& prototypeObject = *asObject(prototypeValue);
    128128
    129     QualifiedName name(nullAtom(), localName, HTMLNames::xhtmlNamespaceURI);
     129    QualifiedName name(nullAtom, localName, HTMLNames::xhtmlNamespaceURI);
    130130    auto elementInterface = JSCustomElementInterface::create(name, constructor, globalObject());
    131131

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r219178 r219199  
    21262126        my $useAtomicString = $type->extendedAttributes->{AtomicString};
    21272127        if ($defaultValue eq "null") {
    2128             return $useAtomicString ? "nullAtom()" : "String()";
     2128            return $useAtomicString ? "nullAtom" : "String()";
    21292129        } elsif ($defaultValue eq "\"\"") {
    2130             return $useAtomicString ? "emptyAtom()" : "emptyString()";
     2130            return $useAtomicString ? "emptyAtom" : "emptyString()";
    21312131        } else {
    21322132            return $useAtomicString ? "AtomicString(${defaultValue}, AtomicString::ConstructFromLiteral)" : "ASCIILiteral(${defaultValue})";

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

    r219178 r219199  
    60126012    UNUSED_PARAM(throwScope);
    60136013    auto& impl = castedThis->wrapped();
    6014     auto str = state->argument(0).isUndefined() ? nullAtom() : convert<IDLAtomicStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0));
     6014    auto str = state->argument(0).isUndefined() ? nullAtom : convert<IDLAtomicStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0));
    60156015    RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
    60166016    impl.methodWithOptionalAtomicString(WTFMove(str));
    … …  
    60926092    UNUSED_PARAM(throwScope);
    60936093    auto& impl = castedThis->wrapped();
    6094     auto str = state->argument(0).isUndefined() ? nullAtom() : convert<IDLAtomicStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0));
     6094    auto str = state->argument(0).isUndefined() ? nullAtom : convert<IDLAtomicStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0));
    60956095    RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
    60966096    impl.methodWithOptionalAtomicStringIsNull(WTFMove(str));
    … …  
    61406140    UNUSED_PARAM(throwScope);
    61416141    auto& impl = castedThis->wrapped();
    6142     auto str = state->argument(0).isUndefined() ? emptyAtom() : convert<IDLAtomicStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0));
     6142    auto str = state->argument(0).isUndefined() ? emptyAtom : convert<IDLAtomicStringAdaptor<IDLDOMString>>(*state, state->uncheckedArgument(0));
    61436143    RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
    61446144    impl.methodWithOptionalAtomicStringIsEmptyString(WTFMove(str));

  • trunk/Source/WebCore/css/CSSPageRule.cpp

    r219178 r219199  
    6060    if (selector) {
    6161        String pageSpecification = selector->selectorText();
    62         if (!pageSpecification.isEmpty() && pageSpecification != starAtom()) {
     62        if (!pageSpecification.isEmpty() && pageSpecification != starAtom) {
    6363            text.append(' ');
    6464            text.append(pageSpecification);

  • trunk/Source/WebCore/css/CSSPrimitiveValue.cpp

    r219178 r219199  
    283283
    284284    if (valueID < 0)
    285         return nullAtom();
     285        return nullAtom;
    286286
    287287    static AtomicString* keywordStrings = new AtomicString[numCSSValueKeywords]; // Leaked intentionally.

  • trunk/Source/WebCore/css/CSSSelector.cpp

    r219178 r219199  
    141141        return static_cast<unsigned>(SelectorSpecificityIncrement::ClassB);
    142142    case CSSSelector::Tag:
    143         return (simpleSelector.tagQName().localName() != starAtom()) ? static_cast<unsigned>(SelectorSpecificityIncrement::ClassC) : 0;
     143        return (simpleSelector.tagQName().localName() != starAtom) ? static_cast<unsigned>(SelectorSpecificityIncrement::ClassC) : 0;
    144144    case CSSSelector::PseudoElement:
    145145        return static_cast<unsigned>(SelectorSpecificityIncrement::ClassC);
    … …  
    247247        switch (component->match()) {
    248248        case Tag:
    249             s += tagQName().localName() == starAtom() ? 0 : 4;
     249            s += tagQName().localName() == starAtom ? 0 : 4;
    250250            break;
    251251        case PagePseudoClass:
    … …  
    827827    , m_b(0)
    828828    , m_attribute(anyQName())
    829     , m_argument(nullAtom())
     829    , m_argument(nullAtom)
    830830{
    831831}

  • trunk/Source/WebCore/css/CSSSelector.h

    r219178 r219199  
    236236        const QualifiedName& attribute() const;
    237237        const AtomicString& attributeCanonicalLocalName() const;
    238         const AtomicString& argument() const { return m_hasRareData ? m_data.m_rareData->m_argument : nullAtom(); }
     238        const AtomicString& argument() const { return m_hasRareData ? m_data.m_rareData->m_argument : nullAtom; }
    239239        bool attributeValueMatchingIsCaseInsensitive() const;
    240240        const Vector<AtomicString>* langArgumentList() const { return m_hasRareData ? m_data.m_rareData->m_langArgumentList.get() : nullptr; }

  • trunk/Source/WebCore/css/CSSSelectorList.cpp

    r219178 r219199  
    172172    bool operator()(const CSSSelector* selector)
    173173    {
    174         if (selector->match() == CSSSelector::Tag && !selector->tagQName().prefix().isEmpty() && selector->tagQName().prefix() != starAtom())
    175             return true;
    176         if (selector->isAttributeSelector() && !selector->attribute().prefix().isEmpty() && selector->attribute().prefix() != starAtom())
     174        if (selector->match() == CSSSelector::Tag && !selector->tagQName().prefix().isEmpty() && selector->tagQName().prefix() != starAtom)
     175            return true;
     176        if (selector->isAttributeSelector() && !selector->attribute().prefix().isEmpty() && selector->attribute().prefix() != starAtom)
    177177            return true;
    178178        return false;

  • trunk/Source/WebCore/css/PageRuleCollector.cpp

    r219178 r219199  
    9696        if (component->match() == CSSSelector::Tag) {
    9797            const AtomicString& localName = component->tagQName().localName();
    98             if (localName != starAtom() && localName != pageName)
     98            if (localName != starAtom && localName != pageName)
    9999                return false;
    100100        } else if (component->match() == CSSSelector::PagePseudoClass) {

  • trunk/Source/WebCore/css/RuleSet.cpp

    r219178 r219199  
    6363        const QualifiedName& tagQualifiedName = selector.tagQName();
    6464        const AtomicString& selectorNamespace = tagQualifiedName.namespaceURI();
    65         if (selectorNamespace == starAtom() || selectorNamespace == xhtmlNamespaceURI) {
     65        if (selectorNamespace == starAtom || selectorNamespace == xhtmlNamespaceURI) {
    6666            if (tagQualifiedName == anyQName())
    6767                return MatchBasedOnRuleHash::Universal;
    … …  
    247247        }
    248248        case CSSSelector::Tag:
    249             if (selector->tagQName().localName() != starAtom())
     249            if (selector->tagQName().localName() != starAtom)
    250250                tagSelector = selector;
    251251            break;

  • trunk/Source/WebCore/css/SelectorChecker.cpp

    r219178 r219199  
    644644    const AtomicString& localName = (element.isHTMLElement() && element.document().isHTMLDocument()) ? simpleSelector.tagLowercaseLocalName() : tagQName.localName();
    645645
    646     if (localName != starAtom() && localName != element.localName())
     646    if (localName != starAtom && localName != element.localName())
    647647        return false;
    648648    const AtomicString& namespaceURI = tagQName.namespaceURI();
    649     return namespaceURI == starAtom() || namespaceURI == element.namespaceURI();
     649    return namespaceURI == starAtom || namespaceURI == element.namespaceURI();
    650650}
    651651

  • trunk/Source/WebCore/css/SelectorFilter.cpp

    r219178 r219199  
    110110    case CSSSelector::Tag: {
    111111        const AtomicString& tagLowercaseLocalName = selector->tagLowercaseLocalName();
    112         if (tagLowercaseLocalName != starAtom())
     112        if (tagLowercaseLocalName != starAtom)
    113113            (*hash++) = tagLowercaseLocalName.impl()->existingHash() * TagNameSalt;
    114114        break;

  • trunk/Source/WebCore/css/StyleBuilderConverter.h

    r219178 r219199  
    458458{
    459459    if (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueAuto)
    460         return nullAtom();
     460        return nullAtom;
    461461    return convertString(styleResolver, value);
    462462}
    … …  
    465465{
    466466    if (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueNone)
    467         return nullAtom();
     467        return nullAtom;
    468468    return convertString(styleResolver, value);
    469469}

  • trunk/Source/WebCore/css/StyleBuilderCustom.h

    r219178 r219199  
    723723    FontCascadeDescription fontDescription = styleResolver.style()->fontDescription();
    724724    if (primitiveValue.valueID() == CSSValueAuto)
    725         fontDescription.setLocale(nullAtom());
     725        fontDescription.setLocale(nullAtom);
    726726    else
    727727        fontDescription.setLocale(primitiveValue.stringValue());
    … …  
    10561056                styleResolver.style()->setTextEmphasisMark(value);
    10571057        }
    1058         styleResolver.style()->setTextEmphasisCustomMark(nullAtom());
     1058        styleResolver.style()->setTextEmphasisCustomMark(nullAtom);
    10591059        return;
    10601060    }
    … …  
    10681068    }
    10691069
    1070     styleResolver.style()->setTextEmphasisCustomMark(nullAtom());
     1070    styleResolver.style()->setTextEmphasisCustomMark(nullAtom);
    10711071
    10721072    if (primitiveValue.valueID() == CSSValueFilled || primitiveValue.valueID() == CSSValueOpen) {
    … …  
    13861386            else
    13871387                const_cast<RenderStyle*>(styleResolver.parentStyle())->setHasAttrContent();
    1388             QualifiedName attr(nullAtom(), contentValue.stringValue().impl(), nullAtom());
     1388            QualifiedName attr(nullAtom, contentValue.stringValue().impl(), nullAtom);
    13891389            const AtomicString& value = styleResolver.element()->getAttribute(attr);
    1390             styleResolver.style()->setContent(value.isNull() ? emptyAtom() : value.impl(), didSet);
     1390            styleResolver.style()->setContent(value.isNull() ? emptyAtom : value.impl(), didSet);
    13911391            didSet = true;
    13921392            // Register the fact that the attribute value affects the style.
    … …  
    17841784            const_cast<RenderStyle*>(styleResolver.parentStyle())->setUnique();
    17851785
    1786         QualifiedName attr(nullAtom(), primitiveValue.stringValue(), nullAtom());
     1786        QualifiedName attr(nullAtom, primitiveValue.stringValue(), nullAtom);
    17871787        const AtomicString& value = styleResolver.element()->getAttribute(attr);
    1788         styleResolver.style()->setContentAltText(value.isNull() ? emptyAtom() : value);
     1788        styleResolver.style()->setContentAltText(value.isNull() ? emptyAtom : value);
    17891789
    17901790        // Register the fact that the attribute value affects the style.
    … …  
    17921792        styleResolver.ruleSets().mutableFeatures().attributeLocalNamesInRules.add(attr.localName().impl());
    17931793    } else
    1794         styleResolver.style()->setContentAltText(emptyAtom());
     1794        styleResolver.style()->setContentAltText(emptyAtom);
    17951795}
    17961796

  • trunk/Source/WebCore/css/StyleSheetContents.cpp

    r219178 r219199  
    6969    : m_ownerRule(ownerRule)
    7070    , m_originalURL(originalURL)
    71     , m_defaultNamespace(starAtom())
     71    , m_defaultNamespace(starAtom)
    7272    , m_isUserStyleSheet(ownerRule && ownerRule->parentStyleSheet() && ownerRule->parentStyleSheet()->isUserStyleSheet())
    7373    , m_parserContext(context)
    … …  
    312312    PrefixNamespaceURIMap::const_iterator it = m_namespaces.find(prefix);
    313313    if (it == m_namespaces.end())
    314         return nullAtom();
     314        return nullAtom;
    315315    return it->value;
    316316}

  • trunk/Source/WebCore/css/makeprop.pl

    r219178 r219199  
    337337{
    338338    if (id < firstCSSProperty)
    339         return nullAtom();
     339        return nullAtom;
    340340    int index = id - firstCSSProperty;
    341341    if (index >= numCSSProperties)
    342         return nullAtom();
     342        return nullAtom;
    343343
    344344    static AtomicString* propertyStrings = new AtomicString[numCSSProperties]; // Intentionally never destroyed.

  • trunk/Source/WebCore/css/parser/CSSParserImpl.cpp

    r219178 r219199  
    281281    std::unique_ptr<CSSParserSelector> selector;
    282282    if (!typeSelector.isNull() && pseudo.isNull())
    283         selector = std::unique_ptr<CSSParserSelector>(new CSSParserSelector(QualifiedName(nullAtom(), typeSelector, styleSheet->defaultNamespace())));
     283        selector = std::unique_ptr<CSSParserSelector>(new CSSParserSelector(QualifiedName(nullAtom, typeSelector, styleSheet->defaultNamespace())));
    284284    else {
    285285        selector = std::unique_ptr<CSSParserSelector>(new CSSParserSelector);
    … …  
    290290        }
    291291        if (!typeSelector.isNull())
    292             selector->prependTagSelector(QualifiedName(nullAtom(), typeSelector, styleSheet->defaultNamespace()));
     292            selector->prependTagSelector(QualifiedName(nullAtom, typeSelector, styleSheet->defaultNamespace()));
    293293    }
    294294

  • trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp

    r219178 r219199  
    303303        }
    304304        if (namespaceURI == defaultNamespace())
    305             namespacePrefix = nullAtom();
     305            namespacePrefix = nullAtom;
    306306       
    307307        CSSParserSelector* rawSelector = new CSSParserSelector(QualifiedName(namespacePrefix, elementName, namespaceURI));
    … …  
    334334bool CSSSelectorParser::consumeName(CSSParserTokenRange& range, AtomicString& name, AtomicString& namespacePrefix)
    335335{
    336     name = nullAtom();
    337     namespacePrefix = nullAtom();
     336    name = nullAtom;
     337    namespacePrefix = nullAtom;
    338338
    339339    const CSSParserToken& firstToken = range.peek();
    … …  
    342342        range.consume();
    343343    } else if (firstToken.type() == DelimiterToken && firstToken.delimiter() == '*') {
    344         name = starAtom();
     344        name = starAtom;
    345345        range.consume();
    346346    } else if (firstToken.type() == DelimiterToken && firstToken.delimiter() == '|') {
    347347        // This is an empty namespace, which'll get assigned this value below
    348         name = emptyAtom();
     348        name = emptyAtom;
    349349    } else
    350350        return false;
    … …  
    359359        name = nameToken.value().toAtomicString();
    360360    } else if (nameToken.type() == DelimiterToken && nameToken.delimiter() == '*')
    361         name = starAtom();
     361        name = starAtom;
    362362    else {
    363         name = nullAtom();
    364         namespacePrefix = nullAtom();
     363        name = nullAtom;
     364        namespacePrefix = nullAtom;
    365365        return false;
    366366    }
    … …  
    422422
    423423    QualifiedName qualifiedName = namespacePrefix.isNull()
    424         ? QualifiedName(nullAtom(), attributeName, nullAtom())
     424        ? QualifiedName(nullAtom, attributeName, nullAtom)
    425425        : QualifiedName(namespacePrefix, attributeName, namespaceURI);
    426426
    … …  
    804804{
    805805    if (!m_styleSheet)
    806         return starAtom();
     806        return starAtom;
    807807    return m_styleSheet->defaultNamespace();
    808808}
    … …  
    813813        return defaultNamespace();
    814814    if (prefix.isEmpty())
    815         return emptyAtom(); // No namespace. If an element/attribute has a namespace, we won't match it.
    816     if (prefix == starAtom())
    817         return starAtom(); // We'll match any namespace.
     815        return emptyAtom; // No namespace. If an element/attribute has a namespace, we won't match it.
     816    if (prefix == starAtom)
     817        return starAtom; // We'll match any namespace.
    818818    if (!m_styleSheet)
    819         return nullAtom(); // Cannot resolve prefix to namespace without a stylesheet, syntax error.
     819        return nullAtom; // Cannot resolve prefix to namespace without a stylesheet, syntax error.
    820820    return m_styleSheet->namespaceURIFromPrefix(prefix);
    821821}
    … …  
    825825    bool isShadowDOM = compoundSelector->needsImplicitShadowCombinatorForMatching();
    826826   
    827     if (elementName.isNull() && defaultNamespace() == starAtom() && !isShadowDOM)
     827    if (elementName.isNull() && defaultNamespace() == starAtom && !isShadowDOM)
    828828        return;
    829829
    830     AtomicString determinedElementName = elementName.isNull() ? starAtom() : elementName;
     830    AtomicString determinedElementName = elementName.isNull() ? starAtom : elementName;
    831831    AtomicString namespaceURI = determineNamespace(namespacePrefix);
    832832    if (namespaceURI.isNull()) {
    … …  
    836836    AtomicString determinedPrefix = namespacePrefix;
    837837    if (namespaceURI == defaultNamespace())
    838         determinedPrefix = nullAtom();
     838        determinedPrefix = nullAtom;
    839839    QualifiedName tag = QualifiedName(determinedPrefix, determinedElementName, namespaceURI);
    840840
    … …  
    849849    bool explicitForHost = compoundSelector->isHostPseudoSelector() && !elementName.isNull();
    850850    if (tag != anyQName() || explicitForHost || isShadowDOM)
    851         compoundSelector->prependTagSelector(tag, determinedPrefix == nullAtom() && determinedElementName == starAtom() && !explicitForHost);
     851        compoundSelector->prependTagSelector(tag, determinedPrefix == nullAtom && determinedElementName == starAtom && !explicitForHost);
    852852}
    853853

  • trunk/Source/WebCore/cssjit/SelectorCompiler.cpp

    r219178 r219199  
    10471047static inline bool attributeNameTestingRequiresNamespaceRegister(const CSSSelector& attributeSelector)
    10481048{
    1049     return attributeSelector.attribute().prefix() != starAtom() && !attributeSelector.attribute().namespaceURI().isNull();
     1049    return attributeSelector.attribute().prefix() != starAtom && !attributeSelector.attribute().namespaceURI().isNull();
    10501050}
    10511051
    … …  
    13871387    const AtomicString& lhsLocalName = lhsQualifiedName.localName();
    13881388    const AtomicString& rhsLocalName = rhsQualifiedName.localName();
    1389     if (lhsLocalName != starAtom() && rhsLocalName != starAtom()) {
     1389    if (lhsLocalName != starAtom && rhsLocalName != starAtom) {
    13901390        const AtomicString& lhsLowercaseLocalName = lhs->tagLowercaseLocalName();
    13911391        const AtomicString& rhsLowercaseLocalName = rhs->tagLowercaseLocalName();
    … …  
    14011401    const AtomicString& lhsNamespaceURI = lhsQualifiedName.namespaceURI();
    14021402    const AtomicString& rhsNamespaceURI = rhsQualifiedName.namespaceURI();
    1403     if (lhsNamespaceURI != starAtom() && rhsNamespaceURI != starAtom()) {
     1403    if (lhsNamespaceURI != starAtom && rhsNamespaceURI != starAtom) {
    14041404        if (lhsNamespaceURI != rhsNamespaceURI)
    14051405            return TagNameEquality::StrictlyNotEqual;
    … …  
    28012801        m_assembler.loadPtr(Assembler::Address(currentAttributeAddress, Attribute::nameMemoryOffset()), qualifiedNameImpl);
    28022802
    2803         bool shouldCheckNamespace = attributeSelector.attribute().prefix() != starAtom();
     2803        bool shouldCheckNamespace = attributeSelector.attribute().prefix() != starAtom;
    28042804        if (shouldCheckNamespace) {
    28052805            Assembler::Jump nameDoesNotMatch = m_assembler.branchPtr(Assembler::NotEqual, Assembler::Address(qualifiedNameImpl, QualifiedName::QualifiedNameImpl::localNameMemoryOffset()), localNameToMatch);
    … …  
    33923392
    33933393    const AtomicString& selectorLocalName = nameToMatch.localName();
    3394     if (selectorLocalName != starAtom()) {
     3394    if (selectorLocalName != starAtom) {
    33953395        const AtomicString& lowercaseLocalName = tagMatchingSelector.tagLowercaseLocalName();
    33963396
    … …  
    34223422
    34233423    const AtomicString& selectorNamespaceURI = nameToMatch.namespaceURI();
    3424     if (selectorNamespaceURI != starAtom()) {
     3424    if (selectorNamespaceURI != starAtom) {
    34253425        // Generate namespaceURI == element->namespaceURI().
    34263426        LocalRegister constantRegister(m_registerAllocator);

  • trunk/Source/WebCore/dom/Attr.cpp

    r219178 r219199  
    7575        return result.releaseException();
    7676
    77     if ((prefix == xmlnsAtom() && namespaceURI() != XMLNSNames::xmlnsNamespaceURI) || qualifiedName() == xmlnsAtom())
     77    if ((prefix == xmlnsAtom && namespaceURI() != XMLNSNames::xmlnsNamespaceURI) || qualifiedName() == xmlnsAtom)
    7878        return Exception { NAMESPACE_ERR };
    7979
    80     const AtomicString& newPrefix = prefix.isEmpty() ? nullAtom() : prefix;
     80    const AtomicString& newPrefix = prefix.isEmpty() ? nullAtom : prefix;
    8181    if (m_element)
    8282        elementAttribute().setPrefix(newPrefix);
    … …  
    142142    ASSERT(!m_element);
    143143    m_element = &element;
    144     m_standaloneValue = nullAtom();
     144    m_standaloneValue = nullAtom;
    145145    setTreeScopeRecursively(element.treeScope());
    146146}

  • trunk/Source/WebCore/dom/Attribute.h

    r219178 r219199  
    7979    if (filterLocalName != name.localName())
    8080        return false;
    81     return filterPrefix == starAtom() || filterNamespaceURI == name.namespaceURI();
     81    return filterPrefix == starAtom || filterNamespaceURI == name.namespaceURI();
    8282}
    8383

  • trunk/Source/WebCore/dom/ConstantPropertyMap.cpp

    r219178 r219199  
    6767    }
    6868
    69     return nullAtom();
     69    return nullAtom;
    7070}
    7171

  • trunk/Source/WebCore/dom/ContainerNode.cpp

    r219178 r219199  
    898898    ASSERT(!qualifiedName.isNull());
    899899
    900     if (qualifiedName == starAtom())
     900    if (qualifiedName == starAtom)
    901901        return ensureRareData().ensureNodeLists().addCachedCollection<AllDescendantsCollection>(*this, AllDescendants);
    902902
    … …  
    909909{
    910910    ASSERT(!localName.isNull());
    911     return ensureRareData().ensureNodeLists().addCachedTagCollectionNS(*this, namespaceURI.isEmpty() ? nullAtom() : namespaceURI, localName);
     911    return ensureRareData().ensureNodeLists().addCachedTagCollectionNS(*this, namespaceURI.isEmpty() ? nullAtom : namespaceURI, localName);
    912912}
    913913

  • trunk/Source/WebCore/dom/CustomElementReactionQueue.cpp

    r219178 r219199  
    188188        for (auto& attribute : element.attributesIterator()) {
    189189            if (queue->m_interface->observesAttribute(attribute.localName()))
    190                 queue->m_items.append({attribute.name(), nullAtom(), attribute.value()});
     190                queue->m_items.append({attribute.name(), nullAtom, attribute.value()});
    191191        }
    192192    }

  • trunk/Source/WebCore/dom/DatasetDOMStringMap.cpp

    r219178 r219199  
    134134{
    135135    if (name.isNull())
    136         return nullAtom();
     136        return nullAtom;
    137137
    138138    StringImpl* nameImpl = name.impl();

  • trunk/Source/WebCore/dom/Document.cpp

    r219178 r219199  
    855855static ALWAYS_INLINE Ref<HTMLElement> createUpgradeCandidateElement(Document& document, const AtomicString& localName)
    856856{
    857     return createUpgradeCandidateElement(document, QualifiedName { nullAtom(), localName, xhtmlNamespaceURI });
     857    return createUpgradeCandidateElement(document, QualifiedName { nullAtom, localName, xhtmlNamespaceURI });
    858858}
    859859
    … …  
    900900        return Exception { INVALID_CHARACTER_ERR };
    901901
    902     return createElement(QualifiedName(nullAtom(), name, nullAtom()), false);
     902    return createElement(QualifiedName(nullAtom, name, nullAtom), false);
    903903}
    904904
    … …  
    963963    case ATTRIBUTE_NODE:
    964964        // FIXME: This will "Attr::normalize" child nodes of Attr.
    965         return Ref<Node> { Attr::create(*this, QualifiedName(nullAtom(), downcast<Attr>(nodeToImport).name(), nullAtom()), downcast<Attr>(nodeToImport).value()) };
     965        return Ref<Node> { Attr::create(*this, QualifiedName(nullAtom, downcast<Attr>(nodeToImport).name(), nullAtom), downcast<Attr>(nodeToImport).value()) };
    966966
    967967    case DOCUMENT_NODE: // Can't import a document into another document.
    … …  
    10181018    if (!qName.prefix().isEmpty() && qName.namespaceURI().isNull()) // createElementNS(null, "html:div")
    10191019        return false;
    1020     if (qName.prefix() == xmlAtom() && qName.namespaceURI() != XMLNames::xmlNamespaceURI) // createElementNS("http://www.example.com", "xml:lang")
     1020    if (qName.prefix() == xmlAtom && qName.namespaceURI() != XMLNames::xmlNamespaceURI) // createElementNS("http://www.example.com", "xml:lang")
    10211021        return false;
    10221022
    … …  
    10241024    // http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#ID-DocCrElNS
    10251025    // createElementNS("http://www.w3.org/2000/xmlns/", "foo:bar"), createElementNS(null, "xmlns:bar"), createElementNS(null, "xmlns")
    1026     if (qName.prefix() == xmlnsAtom() || (qName.prefix().isEmpty() && qName.localName() == xmlnsAtom()))
     1026    if (qName.prefix() == xmlnsAtom || (qName.prefix().isEmpty() && qName.localName() == xmlnsAtom))
    10271027        return qName.namespaceURI() == XMLNSNames::xmlnsNamespaceURI;
    10281028    return qName.namespaceURI() != XMLNSNames::xmlnsNamespaceURI;
    … …  
    30533053    }
    30543054
    3055     m_baseTarget = target ? *target : nullAtom();
     3055    m_baseTarget = target ? *target : nullAtom;
    30563056}
    30573057
    … …  
    70867086    auto* documentElement = this->documentElement();
    70877087    if (!is<HTMLHtmlElement>(documentElement))
    7088         return nullAtom();
     7088        return nullAtom;
    70897089    return downcast<HTMLHtmlElement>(*documentElement).dir();
    70907090}
    … …  
    71657165    auto* bodyElement = body();
    71667166    if (!bodyElement)
    7167         return emptyAtom();
     7167        return emptyAtom;
    71687168    return bodyElement->attributeWithoutSynchronization(bgcolorAttr);
    71697169}
    … …  
    71797179    auto* bodyElement = body();
    71807180    if (!bodyElement)
    7181         return emptyAtom();
     7181        return emptyAtom;
    71827182    return bodyElement->attributeWithoutSynchronization(textAttr);
    71837183}
    … …  
    71937193    auto* bodyElement = body();
    71947194    if (!bodyElement)
    7195         return emptyAtom();
     7195        return emptyAtom;
    71967196    return bodyElement->attributeWithoutSynchronization(alinkAttr);
    71977197}
    … …  
    72077207    auto* bodyElement = body();
    72087208    if (!bodyElement)
    7209         return emptyAtom();
     7209        return emptyAtom;
    72107210    return bodyElement->attributeWithoutSynchronization(linkAttr);
    72117211}
    … …  
    72217221    auto* bodyElement = body();
    72227222    if (!bodyElement)
    7223         return emptyAtom();
     7223        return emptyAtom;
    72247224    return bodyElement->attributeWithoutSynchronization(vlinkAttr);
    72257225}

  • trunk/Source/WebCore/dom/Document.h

    r219178 r219199  
    12471247
    12481248    // Return a Locale for the default locale if the argument is null or empty.
    1249     Locale& getCachedLocale(const AtomicString& locale = nullAtom());
     1249    Locale& getCachedLocale(const AtomicString& locale = nullAtom);
    12501250
    12511251    const Document* templateDocument() const;

  • trunk/Source/WebCore/dom/Element.cpp

    r219178 r219199  
    403403{
    404404    if (value)
    405         setAttribute(name, emptyAtom());
     405        setAttribute(name, emptyAtom);
    406406    else
    407407        removeAttribute(name);
    … …  
    480480        // We're not passing a namespace argument on purpose. SVGNames::*Attr are defined w/o namespaces as well.
    481481        ASSERT_WITH_SECURITY_IMPLICATION(isSVGElement());
    482         downcast<SVGElement>(*this).synchronizeAnimatedSVGAttribute(QualifiedName(nullAtom(), localName, nullAtom()));
     482        downcast<SVGElement>(*this).synchronizeAnimatedSVGAttribute(QualifiedName(nullAtom, localName, nullAtom));
    483483    }
    484484}
    … …  
    487487{
    488488    if (!elementData())
    489         return nullAtom();
     489        return nullAtom;
    490490    synchronizeAttribute(name);
    491491    if (const Attribute* attribute = findAttributeByName(name))
    492492        return attribute->value();
    493     return nullAtom();
     493    return nullAtom;
    494494}
    495495
    … …  
    12141214{
    12151215    if (!elementData())
    1216         return nullAtom();
     1216        return nullAtom;
    12171217    synchronizeAttribute(localName);
    12181218    if (const Attribute* attribute = elementData()->findAttributeByName(localName, shouldIgnoreAttributeCase(*this)))
    12191219        return attribute->value();
    1220     return nullAtom();
     1220    return nullAtom;
    12211221}
    12221222
    12231223const AtomicString& Element::getAttributeNS(const AtomicString& namespaceURI, const AtomicString& localName) const
    12241224{
    1225     return getAttribute(QualifiedName(nullAtom(), localName, namespaceURI));
     1225    return getAttribute(QualifiedName(nullAtom, localName, namespaceURI));
    12261226}
    12271227
    … …  
    12341234    auto caseAdjustedLocalName = shouldIgnoreAttributeCase(*this) ? localName.convertToASCIILowercase() : localName;
    12351235    unsigned index = elementData() ? elementData()->findAttributeIndexByName(caseAdjustedLocalName, false) : ElementData::attributeNotFound;
    1236     auto name = index != ElementData::attributeNotFound ? attributeAt(index).name() : QualifiedName { nullAtom(), caseAdjustedLocalName, nullAtom() };
     1236    auto name = index != ElementData::attributeNotFound ? attributeAt(index).name() : QualifiedName { nullAtom, caseAdjustedLocalName, nullAtom };
    12371237    setAttributeInternal(index, name, value, NotInSynchronizationOfLazyAttribute);
    12381238
    … …  
    15291529    // Use attributeVector instead of m_elementData because attributeChanged might modify m_elementData.
    15301530    for (const auto& attribute : attributeVector)
    1531         attributeChanged(attribute.name(), nullAtom(), attribute.value(), ModifiedDirectly);
     1531        attributeChanged(attribute.name(), nullAtom, attribute.value(), ModifiedDirectly);
    15321532}
    15331533
    … …  
    15441544        // ElementData::m_classNames or ElementData::m_idForStyleResolution need to be updated with the right case.
    15451545        if (hasID())
    1546             attributeChanged(idAttr, nullAtom(), getIdAttribute());
     1546            attributeChanged(idAttr, nullAtom, getIdAttribute());
    15471547        if (hasClass())
    1548             attributeChanged(classAttr, nullAtom(), getAttribute(classAttr));
     1548            attributeChanged(classAttr, nullAtom, getAttribute(classAttr));
    15491549    }
    15501550
    … …  
    15881588        return result.releaseException();
    15891589
    1590     m_tagName.setPrefix(prefix.isEmpty() ? nullAtom() : prefix);
     1590    m_tagName.setPrefix(prefix.isEmpty() ? nullAtom : prefix);
    15911591    return { };
    15921592}
    … …  
    16401640    if (!idValue.isNull()) {
    16411641        if (newScope)
    1642             updateIdForTreeScope(*newScope, nullAtom(), idValue);
     1642            updateIdForTreeScope(*newScope, nullAtom, idValue);
    16431643        if (newDocument)
    1644             updateIdForDocument(*newDocument, nullAtom(), idValue, AlwaysUpdateHTMLDocumentNamedItemMaps);
     1644            updateIdForDocument(*newDocument, nullAtom, idValue, AlwaysUpdateHTMLDocumentNamedItemMaps);
    16451645    }
    16461646
    … …  
    16481648    if (!nameValue.isNull()) {
    16491649        if (newScope)
    1650             updateNameForTreeScope(*newScope, nullAtom(), nameValue);
     1650            updateNameForTreeScope(*newScope, nullAtom, nameValue);
    16511651        if (newDocument)
    1652             updateNameForDocument(*newDocument, nullAtom(), nameValue);
     1652            updateNameForDocument(*newDocument, nullAtom, nameValue);
    16531653    }
    16541654
    16551655    if (newScope && hasTagName(labelTag)) {
    16561656        if (newScope->shouldCacheLabelsByForAttribute())
    1657             updateLabel(*newScope, nullAtom(), attributeWithoutSynchronization(forAttr));
     1657            updateLabel(*newScope, nullAtom, attributeWithoutSynchronization(forAttr));
    16581658    }
    16591659
    … …  
    16941694        if (!idValue.isNull()) {
    16951695            if (oldScope)
    1696                 updateIdForTreeScope(*oldScope, idValue, nullAtom());
     1696                updateIdForTreeScope(*oldScope, idValue, nullAtom);
    16971697            if (oldDocument)
    1698                 updateIdForDocument(*oldDocument, idValue, nullAtom(), AlwaysUpdateHTMLDocumentNamedItemMaps);
     1698                updateIdForDocument(*oldDocument, idValue, nullAtom, AlwaysUpdateHTMLDocumentNamedItemMaps);
    16991699        }
    17001700
    … …  
    17021702        if (!nameValue.isNull()) {
    17031703            if (oldScope)
    1704                 updateNameForTreeScope(*oldScope, nameValue, nullAtom());
     1704                updateNameForTreeScope(*oldScope, nameValue, nullAtom);
    17051705            if (oldDocument)
    1706                 updateNameForDocument(*oldDocument, nameValue, nullAtom());
     1706                updateNameForDocument(*oldDocument, nameValue, nullAtom);
    17071707        }
    17081708
    17091709        if (oldScope && hasTagName(labelTag)) {
    17101710            if (oldScope->shouldCacheLabelsByForAttribute())
    1711                 updateLabel(*oldScope, attributeWithoutSynchronization(forAttr), nullAtom());
     1711                updateLabel(*oldScope, attributeWithoutSynchronization(forAttr), nullAtom);
    17121712        }
    17131713
    … …  
    22842284
    22852285    if (!valueBeingRemoved.isNull())
    2286         willModifyAttribute(name, valueBeingRemoved, nullAtom());
     2286        willModifyAttribute(name, valueBeingRemoved, nullAtom);
    22872287
    22882288    {
    2289         Style::AttributeChangeInvalidation styleInvalidation(*this, name, valueBeingRemoved, nullAtom());
     2289        Style::AttributeChangeInvalidation styleInvalidation(*this, name, valueBeingRemoved, nullAtom);
    22902290        elementData.removeAttribute(index);
    22912291    }
    … …  
    23012301    }
    23022302
    2303     willModifyAttribute(name, nullAtom(), value);
     2303    willModifyAttribute(name, nullAtom, value);
    23042304    {
    2305         Style::AttributeChangeInvalidation styleInvalidation(*this, name, nullAtom(), value);
     2305        Style::AttributeChangeInvalidation styleInvalidation(*this, name, nullAtom, value);
    23062306        ensureUniqueElementData().addAttribute(name, value);
    23072307    }
    … …  
    23282328bool Element::removeAttributeNS(const AtomicString& namespaceURI, const AtomicString& localName)
    23292329{
    2330     return removeAttribute(QualifiedName(nullAtom(), localName, namespaceURI));
     2330    return removeAttribute(QualifiedName(nullAtom, localName, namespaceURI));
    23312331}
    23322332
    … …  
    23462346    if (!elementData())
    23472347        return 0;
    2348     QualifiedName qName(nullAtom(), localName, namespaceURI);
     2348    QualifiedName qName(nullAtom, localName, namespaceURI);
    23492349    synchronizeAttribute(qName);
    23502350    const Attribute* attribute = elementData()->findAttributeByName(qName);
    … …  
    23662366    if (!elementData())
    23672367        return false;
    2368     QualifiedName qName(nullAtom(), localName, namespaceURI);
     2368    QualifiedName qName(nullAtom, localName, namespaceURI);
    23692369    synchronizeAttribute(qName);
    23702370    return elementData()->findAttributeByName(qName);
    … …  
    28692869    }
    28702870
    2871     return nullAtom();
     2871    return nullAtom;
    28722872}
    28732873
    … …  
    32633263
    32643264    if (WindowNameCollection::elementMatchesIfNameAttributeMatch(*this)) {
    3265         const AtomicString& id = WindowNameCollection::elementMatchesIfIdAttributeMatch(*this) ? getIdAttribute() : nullAtom();
     3265        const AtomicString& id = WindowNameCollection::elementMatchesIfIdAttributeMatch(*this) ? getIdAttribute() : nullAtom;
    32663266        if (!oldName.isEmpty() && oldName != id)
    32673267            document.removeWindowNamedItem(*oldName.impl(), *this);
    … …  
    32713271
    32723272    if (DocumentNameCollection::elementMatchesIfNameAttributeMatch(*this)) {
    3273         const AtomicString& id = DocumentNameCollection::elementMatchesIfIdAttributeMatch(*this) ? getIdAttribute() : nullAtom();
     3273        const AtomicString& id = DocumentNameCollection::elementMatchesIfIdAttributeMatch(*this) ? getIdAttribute() : nullAtom;
    32743274        if (!oldName.isEmpty() && oldName != id)
    32753275            document.removeDocumentNamedItem(*oldName.impl(), *this);
    … …  
    33163316
    33173317    if (WindowNameCollection::elementMatchesIfIdAttributeMatch(*this)) {
    3318         const AtomicString& name = condition == UpdateHTMLDocumentNamedItemMapsOnlyIfDiffersFromNameAttribute && WindowNameCollection::elementMatchesIfNameAttributeMatch(*this) ? getNameAttribute() : nullAtom();
     3318        const AtomicString& name = condition == UpdateHTMLDocumentNamedItemMapsOnlyIfDiffersFromNameAttribute && WindowNameCollection::elementMatchesIfNameAttributeMatch(*this) ? getNameAttribute() : nullAtom;
    33193319        if (!oldId.isEmpty() && oldId != name)
    33203320            document.removeWindowNamedItem(*oldId.impl(), *this);
    … …  
    33243324
    33253325    if (DocumentNameCollection::elementMatchesIfIdAttributeMatch(*this)) {
    3326         const AtomicString& name = condition == UpdateHTMLDocumentNamedItemMapsOnlyIfDiffersFromNameAttribute && DocumentNameCollection::elementMatchesIfNameAttributeMatch(*this) ? getNameAttribute() : nullAtom();
     3326        const AtomicString& name = condition == UpdateHTMLDocumentNamedItemMapsOnlyIfDiffersFromNameAttribute && DocumentNameCollection::elementMatchesIfNameAttributeMatch(*this) ? getNameAttribute() : nullAtom;
    33273327        if (!oldId.isEmpty() && oldId != name)
    33283328            document.removeDocumentNamedItem(*oldId.impl(), *this);
    … …  
    33673367void Element::didAddAttribute(const QualifiedName& name, const AtomicString& value)
    33683368{
    3369     attributeChanged(name, nullAtom(), value);
     3369    attributeChanged(name, nullAtom, value);
    33703370    InspectorInstrumentation::didModifyDOMAttr(document(), *this, name.localName(), value);
    33713371    dispatchSubtreeModifiedEvent();
    … …  
    33813381void Element::didRemoveAttribute(const QualifiedName& name, const AtomicString& oldValue)
    33823382{
    3383     attributeChanged(name, oldValue, nullAtom());
     3383    attributeChanged(name, oldValue, nullAtom);
    33843384    InspectorInstrumentation::didRemoveDOMAttr(document(), *this, name.localName());
    33853385    dispatchSubtreeModifiedEvent();
    … …  
    35753575
    35763576    for (const Attribute& attribute : attributesIterator())
    3577         attributeChanged(attribute.name(), nullAtom(), attribute.value(), ModifiedByCloning);
     3577        attributeChanged(attribute.name(), nullAtom, attribute.value(), ModifiedByCloning);
    35783578}
    35793579

  • trunk/Source/WebCore/dom/Element.h

    r219178 r219199  
    723723            return attribute->value();
    724724    }
    725     return nullAtom();
     725    return nullAtom;
    726726}
    727727
    … …  
    733733inline const AtomicString& Element::idForStyleResolution() const
    734734{
    735     return hasID() ? elementData()->idForStyleResolution() : nullAtom();
     735    return hasID() ? elementData()->idForStyleResolution() : nullAtom;
    736736}
    737737
    … …  
    740740    if (hasID())
    741741        return elementData()->findAttributeByName(HTMLNames::idAttr)->value();
    742     return nullAtom();
     742    return nullAtom;
    743743}
    744744
    … …  
    747747    if (hasName())
    748748        return elementData()->findAttributeByName(HTMLNames::nameAttr)->value();
    749     return nullAtom();
     749    return nullAtom;
    750750}
    751751

  • trunk/Source/WebCore/dom/EventTarget.cpp

    r219178 r219199  
    192192        return eventNames().mousewheelEvent;
    193193
    194     return nullAtom();
     194    return nullAtom;
    195195}
    196196

  • trunk/Source/WebCore/dom/MutationRecord.h

    r219178 r219199  
    6262    virtual Node* nextSibling() { return 0; }
    6363
    64     virtual const AtomicString& attributeName() { return nullAtom(); }
    65     virtual const AtomicString& attributeNamespace() { return nullAtom(); }
     64    virtual const AtomicString& attributeName() { return nullAtom; }
     65    virtual const AtomicString& attributeNamespace() { return nullAtom; }
    6666
    6767    virtual String oldValue() { return String(); }

  • trunk/Source/WebCore/dom/NamedNodeMap.cpp

    r219178 r219199  
    8484    if (!m_element.hasAttributes())
    8585        return Exception { NOT_FOUND_ERR };
    86     auto index = m_element.findAttributeIndexByName(QualifiedName { nullAtom(), localName, namespaceURI });
     86    auto index = m_element.findAttributeIndexByName(QualifiedName { nullAtom, localName, namespaceURI });
    8787    if (index == ElementData::attributeNotFound)
    8888        return Exception { NOT_FOUND_ERR };

  • trunk/Source/WebCore/dom/Node.cpp

    r219178 r219199  
    630630{
    631631    // For nodes other than elements and attributes, the prefix is always null
    632     return nullAtom();
     632    return nullAtom;
    633633}
    634634
    … …  
    643643const AtomicString& Node::localName() const
    644644{
    645     return nullAtom();
     645    return nullAtom;
    646646}
    647647
    648648const AtomicString& Node::namespaceURI() const
    649649{
    650     return nullAtom();
     650    return nullAtom;
    651651}
    652652
    … …  
    932932    if (namespaceURI.isEmpty() && !prefix.isEmpty())
    933933        return Exception { NAMESPACE_ERR };
    934     if (prefix == xmlAtom() && namespaceURI != XMLNames::xmlNamespaceURI)
     934    if (prefix == xmlAtom && namespaceURI != XMLNames::xmlNamespaceURI)
    935935        return Exception { NAMESPACE_ERR };
    936936
    … …  
    13931393                    continue;
    13941394
    1395                 if ((prefix.isNull() && attribute.prefix().isNull() && attribute.localName() == xmlnsAtom()) || (attribute.prefix() == xmlnsAtom() && attribute.localName() == prefix)) {
     1395                if ((prefix.isNull() && attribute.prefix().isNull() && attribute.localName() == xmlnsAtom) || (attribute.prefix() == xmlnsAtom && attribute.localName() == prefix)) {
    13961396                    auto& result = attribute.value();
    1397                     return result.isEmpty() ? nullAtom() : result;
     1397                    return result.isEmpty() ? nullAtom : result;
    13981398                }
    13991399            }
    14001400        }
    14011401        auto* parent = node.parentElement();
    1402         return parent ? locateDefaultNamespace(*parent, prefix) : nullAtom();
     1402        return parent ? locateDefaultNamespace(*parent, prefix) : nullAtom;
    14031403    }
    14041404    case Node::DOCUMENT_NODE:
    14051405        if (auto* documentElement = downcast<Document>(node).documentElement())
    14061406            return locateDefaultNamespace(*documentElement, prefix);
    1407         return nullAtom();
     1407        return nullAtom;
    14081408    case Node::DOCUMENT_TYPE_NODE:
    14091409    case Node::DOCUMENT_FRAGMENT_NODE:
    1410         return nullAtom();
     1410        return nullAtom;
    14111411    case Node::ATTRIBUTE_NODE:
    14121412        if (auto* ownerElement = downcast<Attr>(node).ownerElement())
    14131413            return locateDefaultNamespace(*ownerElement, prefix);
    1414         return nullAtom();
     1414        return nullAtom;
    14151415    default:
    14161416        if (auto* parent = node.parentElement())
    14171417            return locateDefaultNamespace(*parent, prefix);
    1418         return nullAtom();
     1418        return nullAtom;
    14191419    }
    14201420}
    … …  
    14231423bool Node::isDefaultNamespace(const AtomicString& potentiallyEmptyNamespace) const
    14241424{
    1425     const AtomicString& namespaceURI = potentiallyEmptyNamespace.isEmpty() ? nullAtom() : potentiallyEmptyNamespace;
    1426     return locateDefaultNamespace(*this, nullAtom()) == namespaceURI;
     1425    const AtomicString& namespaceURI = potentiallyEmptyNamespace.isEmpty() ? nullAtom : potentiallyEmptyNamespace;
     1426    return locateDefaultNamespace(*this, nullAtom) == namespaceURI;
    14271427}
    14281428
    … …  
    14301430const AtomicString& Node::lookupNamespaceURI(const AtomicString& potentiallyEmptyPrefix) const
    14311431{
    1432     const AtomicString& prefix = potentiallyEmptyPrefix.isEmpty() ? nullAtom() : potentiallyEmptyPrefix;
     1432    const AtomicString& prefix = potentiallyEmptyPrefix.isEmpty() ? nullAtom : potentiallyEmptyPrefix;
    14331433    return locateDefaultNamespace(*this, prefix);
    14341434}
    … …  
    14421442    if (element.hasAttributes()) {
    14431443        for (auto& attribute : element.attributesIterator()) {
    1444             if (attribute.prefix() == xmlnsAtom() && attribute.value() == namespaceURI)
     1444            if (attribute.prefix() == xmlnsAtom && attribute.value() == namespaceURI)
    14451445                return attribute.localName();
    14461446        }
    14471447    }
    14481448    auto* parent = element.parentElement();
    1449     return parent ? locateNamespacePrefix(*parent, namespaceURI) : nullAtom();
     1449    return parent ? locateNamespacePrefix(*parent, namespaceURI) : nullAtom;
    14501450}
    14511451
    … …  
    14541454{
    14551455    if (namespaceURI.isEmpty())
    1456         return nullAtom();
     1456        return nullAtom;
    14571457   
    14581458    switch (nodeType()) {
    … …  
    14621462        if (auto* documentElement = downcast<Document>(*this).documentElement())
    14631463            return locateNamespacePrefix(*documentElement, namespaceURI);
    1464         return nullAtom();
     1464        return nullAtom;
    14651465    case DOCUMENT_FRAGMENT_NODE:
    14661466    case DOCUMENT_TYPE_NODE:
    1467         return nullAtom();
     1467        return nullAtom;
    14681468    case ATTRIBUTE_NODE:
    14691469        if (auto* ownerElement = downcast<Attr>(*this).ownerElement())
    14701470            return locateNamespacePrefix(*ownerElement, namespaceURI);
    1471         return nullAtom();
     1471        return nullAtom;
    14721472    default:
    14731473        if (auto* parent = parentElement())
    14741474            return locateNamespacePrefix(*parent, namespaceURI);
    1475         return nullAtom();
     1475        return nullAtom;
    14761476    }
    14771477}

  • trunk/Source/WebCore/dom/NodeRareData.h

    r219178 r219199  
    123123    ALWAYS_INLINE Ref<TagCollectionNS> addCachedTagCollectionNS(ContainerNode& node, const AtomicString& namespaceURI, const AtomicString& localName)
    124124    {
    125         QualifiedName name(nullAtom(), localName, namespaceURI);
     125        QualifiedName name(nullAtom, localName, namespaceURI);
    126126        TagCollectionNSCache::AddResult result = m_tagCollectionNSCache.fastAdd(name, nullptr);
    127127        if (!result.isNewEntry)
    … …  
    148148    ALWAYS_INLINE Ref<T> addCachedCollection(ContainerType& container, CollectionType collectionType)
    149149    {
    150         CollectionCacheMap::AddResult result = m_cachedCollections.fastAdd(namedCollectionKey(collectionType, starAtom()), nullptr);
     150        CollectionCacheMap::AddResult result = m_cachedCollections.fastAdd(namedCollectionKey(collectionType, starAtom), nullptr);
    151151        if (!result.isNewEntry)
    152152            return static_cast<T&>(*result.iterator->value);
    … …  
    160160    T* cachedCollection(CollectionType collectionType)
    161161    {
    162         return static_cast<T*>(m_cachedCollections.get(namedCollectionKey(collectionType, starAtom())));
     162        return static_cast<T*>(m_cachedCollections.get(namedCollectionKey(collectionType, starAtom)));
    163163    }
    164164
    165165    template <class NodeListType>
    166     void removeCacheWithAtomicName(NodeListType* list, const AtomicString& name = starAtom())
     166    void removeCacheWithAtomicName(NodeListType* list, const AtomicString& name = starAtom)
    167167    {
    168168        ASSERT(list == m_atomicNameCaches.get(namedNodeListKey<NodeListType>(name)));
    … …  
    174174    void removeCachedTagCollectionNS(HTMLCollection& collection, const AtomicString& namespaceURI, const AtomicString& localName)
    175175    {
    176         QualifiedName name(nullAtom(), localName, namespaceURI);
     176        QualifiedName name(nullAtom, localName, namespaceURI);
    177177        ASSERT(&collection == m_tagCollectionNSCache.get(name));
    178178        if (deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList(collection.ownerNode()))
    … …  
    181181    }
    182182
    183     void removeCachedCollection(HTMLCollection* collection, const AtomicString& name = starAtom())
     183    void removeCachedCollection(HTMLCollection* collection, const AtomicString& name = starAtom)
    184184    {
    185185        ASSERT(collection == m_cachedCollections.get(namedCollectionKey(collection->type(), name)));

  • trunk/Source/WebCore/dom/PseudoElement.cpp

    r219178 r219199  
    4040const QualifiedName& pseudoElementTagName()
    4141{
    42     static NeverDestroyed<QualifiedName> name(nullAtom(), "<pseudo>", nullAtom());
     42    static NeverDestroyed<QualifiedName> name(nullAtom, "<pseudo>", nullAtom);
    4343    return name;
    4444}

  • trunk/Source/WebCore/dom/QualifiedName.cpp

    r219178 r219199  
    4646
    4747// Global init routines
    48 DEFINE_GLOBAL(QualifiedName, anyName, nullAtom(), starAtom(), starAtom())
     48DEFINE_GLOBAL(QualifiedName, anyName, nullAtom, starAtom, starAtom)
    4949
    5050void QualifiedName::init()
    … …  
    5656    // Use placement new to initialize the globals.
    5757    AtomicString::init();
    58     new (NotNull, (void*)&anyName) QualifiedName(nullAtom(), starAtom(), starAtom());
     58    new (NotNull, (void*)&anyName) QualifiedName(nullAtom, starAtom, starAtom);
    5959    initialized = true;
    6060}
    … …  
    6262const QualifiedName& nullQName()
    6363{
    64     static NeverDestroyed<QualifiedName> nullName(nullAtom(), nullAtom(), nullAtom());
     64    static NeverDestroyed<QualifiedName> nullName(nullAtom, nullAtom, nullAtom);
    6565    return nullName;
    6666}
    … …  
    8181void createQualifiedName(void* targetAddress, StringImpl* name, const AtomicString& nameNamespace)
    8282{
    83     new (NotNull, reinterpret_cast<void*>(targetAddress)) QualifiedName(nullAtom(), AtomicString(name), nameNamespace);
     83    new (NotNull, reinterpret_cast<void*>(targetAddress)) QualifiedName(nullAtom, AtomicString(name), nameNamespace);
    8484}
    8585
    8686void createQualifiedName(void* targetAddress, StringImpl* name)
    8787{
    88     new (NotNull, reinterpret_cast<void*>(targetAddress)) QualifiedName(nullAtom(), AtomicString(name), nullAtom());
     88    new (NotNull, reinterpret_cast<void*>(targetAddress)) QualifiedName(nullAtom, AtomicString(name), nullAtom);
    8989}
    9090

  • trunk/Source/WebCore/dom/QualifiedName.h

    r219178 r219199  
    8282    bool matches(const QualifiedName& other) const { return m_impl == other.m_impl || (localName() == other.localName() && namespaceURI() == other.namespaceURI()); }
    8383
    84     bool hasPrefix() const { return m_impl->m_prefix != nullAtom(); }
     84    bool hasPrefix() const { return m_impl->m_prefix != nullAtom; }
    8585    void setPrefix(const AtomicString& prefix) { *this = QualifiedName(prefix, localName(), namespaceURI()); }
    8686

  • trunk/Source/WebCore/dom/SelectorQuery.cpp

    r219178 r219199  
    337337    const AtomicString& selectorNamespaceURI = tagQualifiedName.namespaceURI();
    338338
    339     if (selectorNamespaceURI == starAtom()) {
    340         if (selectorLocalName != starAtom()) {
     339    if (selectorNamespaceURI == starAtom) {
     340        if (selectorLocalName != starAtom) {
    341341            // Common case: name defined, selectorNamespaceURI is a wildcard.
    342342            elementsForLocalName<SelectorQueryTrait>(rootNode, selectorLocalName, selectorLowercaseLocalName, output);
    … …  
    346346        }
    347347    } else {
    348         // Fallback: NamespaceURI is set, selectorLocalName may be starAtom().
     348        // Fallback: NamespaceURI is set, selectorLocalName may be starAtom.
    349349        for (auto& element : elementDescendants(const_cast<ContainerNode&>(rootNode))) {
    350350            if (element.namespaceURI() == selectorNamespaceURI && localNameMatches(element, selectorLocalName, selectorLowercaseLocalName)) {

  • trunk/Source/WebCore/dom/SlotAssignment.cpp

    r219178 r219199  
    3838static const AtomicString& slotNameFromAttributeValue(const AtomicString& value)
    3939{
    40     return value == nullAtom() ? SlotAssignment::defaultSlotName() : value;
     40    return value == nullAtom ? SlotAssignment::defaultSlotName() : value;
    4141}
    4242

  • trunk/Source/WebCore/dom/SlotAssignment.h

    r219178 r219199  
    4646    virtual ~SlotAssignment();
    4747
    48     static const AtomicString& defaultSlotName() { return emptyAtom(); }
     48    static const AtomicString& defaultSlotName() { return emptyAtom; }
    4949
    5050    HTMLSlotElement* findAssignedSlot(const Node&, ShadowRoot&);
    … …  
    100100{
    101101    if (m_slotAssignment) // FIXME: This is incorrect when there were no elements or text nodes removed.
    102         m_slotAssignment->didChangeSlot(nullAtom(), *this);
     102        m_slotAssignment->didChangeSlot(nullAtom, *this);
    103103}
    104104
    … …  
    106106{
    107107    if (m_slotAssignment)
    108         m_slotAssignment->didChangeSlot(nullAtom(), *this);
     108        m_slotAssignment->didChangeSlot(nullAtom, *this);
    109109}
    110110

  • trunk/Source/WebCore/dom/TagCollection.cpp

    r219178 r219199  
    4646    , m_qualifiedName(qualifiedName)
    4747{
    48     ASSERT(qualifiedName != starAtom());
     48    ASSERT(qualifiedName != starAtom);
    4949}
    5050
    … …  
    5959    , m_loweredQualifiedName(qualifiedName.convertToASCIILowercase())
    6060{
    61     ASSERT(qualifiedName != starAtom());
     61    ASSERT(qualifiedName != starAtom);
    6262}
    6363

  • trunk/Source/WebCore/dom/TagCollection.h

    r219178 r219199  
    8989inline bool TagCollectionNS::elementMatches(Element& element) const
    9090{
    91     if (m_localName != starAtom() && m_localName != element.localName())
     91    if (m_localName != starAtom && m_localName != element.localName())
    9292        return false;
    93     return m_namespaceURI == starAtom() || m_namespaceURI == element.namespaceURI();
     93    return m_namespaceURI == starAtom || m_namespaceURI == element.namespaceURI();
    9494}
    9595

  • trunk/Source/WebCore/dom/make_names.pl

    r219178 r219199  
    807807
    808808    if (keys %allTags) {
    809         my $tagsNamespace = $parameters{tagsNullNamespace} ? "nullAtom()" : "${lowercaseNamespacePrefix}NS";
     809        my $tagsNamespace = $parameters{tagsNullNamespace} ? "nullAtom" : "${lowercaseNamespacePrefix}NS";
    810810        printDefinitions($F, \%allTags, "tags", $tagsNamespace);
    811811    }
    812812    if (keys %allAttrs) {
    813         my $attrsNamespace = $parameters{attrsNullNamespace} ? "nullAtom()" : "${lowercaseNamespacePrefix}NS";
     813        my $attrsNamespace = $parameters{attrsNullNamespace} ? "nullAtom" : "${lowercaseNamespacePrefix}NS";
    814814        printDefinitions($F, \%allAttrs, "attributes", $attrsNamespace);
    815815    }
    … …  
    922922END
    923923;
    924     if ($namespaceURI eq "nullAtom()") {
     924    if ($namespaceURI eq "nullAtom") {
    925925        print F "        createQualifiedName(entry.targetAddress, &entry.name);\n";
    926926    } else {
    … …  
    10641064        return entry.function($argumentList);
    10651065    }
    1066     return $parameters{fallbackInterfaceName}::create(QualifiedName(nullAtom(), localName, ${lowercaseNamespacePrefix}NamespaceURI), document);
     1066    return $parameters{fallbackInterfaceName}::create(QualifiedName(nullAtom, localName, ${lowercaseNamespacePrefix}NamespaceURI), document);
    10671067}
    10681068

  • trunk/Source/WebCore/editing/CompositeEditCommand.cpp

    r219178 r219199  
    838838void CompositeEditCommand::removeNodeAttribute(Element& element, const QualifiedName& attribute)
    839839{
    840     setNodeAttribute(element, attribute, nullAtom());
     840    setNodeAttribute(element, attribute, nullAtom);
    841841}
    842842

  • trunk/Source/WebCore/editing/Editing.cpp

    r219178 r219199  
    891891Ref<HTMLElement> createHTMLElement(Document& document, const AtomicString& tagName)
    892892{
    893     return createHTMLElement(document, QualifiedName(nullAtom(), tagName, xhtmlNamespaceURI));
     893    return createHTMLElement(document, QualifiedName(nullAtom, tagName, xhtmlNamespaceURI));
    894894}
    895895

  • trunk/Source/WebCore/editing/MarkupAccumulator.cpp

    r219178 r219199  
    150150    else if (inXMLFragmentSerialization()) {
    151151        // Make sure xml prefix and namespace are always known to uphold the constraints listed at http://www.w3.org/TR/xml-names11/#xmlReserved.
    152         namespaceHash.set(xmlAtom().impl(), XMLNames::xmlNamespaceURI.impl());
    153         namespaceHash.set(XMLNames::xmlNamespaceURI.impl(), xmlAtom().impl());
     152        namespaceHash.set(xmlAtom.impl(), XMLNames::xmlNamespaceURI.impl());
     153        namespaceHash.set(XMLNames::xmlNamespaceURI.impl(), xmlAtom.impl());
    154154    }
    155155
    … …  
    256256    const AtomicString& prefix = element.prefix();
    257257    if (prefix.isEmpty())
    258         return !element.hasAttribute(xmlnsAtom());
     258        return !element.hasAttribute(xmlnsAtom);
    259259
    260260    static NeverDestroyed<String> xmlnsWithColon(MAKE_STATIC_STRING_IMPL("xmlns:"));
    … …  
    268268    // Don't add namespace attributes twice
    269269    // HTML Parser will create xmlns attributes without namespace for HTML elements, allow those as well.
    270     if (attribute.name().localName() == xmlnsAtom() && (attribute.namespaceURI().isEmpty() || attribute.namespaceURI() == XMLNSNames::xmlnsNamespaceURI)) {
    271         namespaces.set(emptyAtom().impl(), attribute.value().impl());
     270    if (attribute.name().localName() == xmlnsAtom && (attribute.namespaceURI().isEmpty() || attribute.namespaceURI() == XMLNSNames::xmlnsNamespaceURI)) {
     271        namespaces.set(emptyAtom.impl(), attribute.value().impl());
    272272        return false;
    273273    }
    274274
    275     QualifiedName xmlnsPrefixAttr(xmlnsAtom(), attribute.localName(), XMLNSNames::xmlnsNamespaceURI);
     275    QualifiedName xmlnsPrefixAttr(xmlnsAtom, attribute.localName(), XMLNSNames::xmlnsNamespaceURI);
    276276    if (attribute.name() == xmlnsPrefixAttr) {
    277277        namespaces.set(attribute.localName().impl(), attribute.value().impl());
    … …  
    288288    if (namespaceURI.isEmpty()) {
    289289        // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-xhtml-syntax.html#xml-fragment-serialization-algorithm
    290         if (allowEmptyDefaultNS && namespaces.get(emptyAtom().impl())) {
     290        if (allowEmptyDefaultNS && namespaces.get(emptyAtom.impl())) {
    291291            result.append(' ');
    292             result.append(xmlnsAtom().string());
     292            result.append(xmlnsAtom.string());
    293293            result.appendLiteral("=\"\"");
    294294        }
    … …  
    296296    }
    297297
    298     // Use emptyAtom()s's impl() for both null and empty strings since the HashMap can't handle 0 as a key
    299     AtomicStringImpl* pre = prefix.isEmpty() ? emptyAtom().impl() : prefix.impl();
     298    // Use emptyAtoms's impl() for both null and empty strings since the HashMap can't handle 0 as a key
     299    AtomicStringImpl* pre = prefix.isEmpty() ? emptyAtom.impl() : prefix.impl();
    300300    AtomicStringImpl* foundNS = namespaces.get(pre);
    301301    if (foundNS != namespaceURI.impl()) {
    … …  
    308308            return;
    309309        result.append(' ');
    310         result.append(xmlnsAtom().string());
     310        result.append(xmlnsAtom.string());
    311311        if (!prefix.isEmpty()) {
    312312            result.append(':');
    … …  
    444444        // "The prefix xml MUST NOT be declared as the default namespace.", so use the xml prefix explicitly.
    445445        if (element.namespaceURI() == XMLNames::xmlNamespaceURI) {
    446             result.append(xmlAtom());
     446            result.append(xmlAtom);
    447447            result.append(':');
    448448        }
    … …  
    501501            if (attribute.namespaceURI() == XMLNames::xmlNamespaceURI) {
    502502                // Always use xml as prefix if the namespace is the XML namespace.
    503                 prefixedName.setPrefix(xmlAtom());
     503                prefixedName.setPrefix(xmlAtom);
    504504            } else {
    505505                AtomicStringImpl* foundNS = namespaces && attribute.prefix().impl() ? namespaces->get(attribute.prefix().impl()) : 0;
    … …  
    510510                    else {
    511511                        bool shouldBeDeclaredUsingAppendNamespace = !attribute.prefix().isEmpty() && !foundNS;
    512                         if (!shouldBeDeclaredUsingAppendNamespace && attribute.localName() != xmlnsAtom() && namespaces)
     512                        if (!shouldBeDeclaredUsingAppendNamespace && attribute.localName() != xmlnsAtom && namespaces)
    513513                            generateUniquePrefix(prefixedName, *namespaces);
    514514                    }

  • trunk/Source/WebCore/editing/gtk/EditorGtk.cpp

    r219178 r219199  
    104104    if (is<HTMLEmbedElement>(element) || is<HTMLObjectElement>(element))
    105105        return element.imageSourceURL();
    106     return nullAtom();
     106    return nullAtom;
    107107}
    108108

  • trunk/Source/WebCore/editing/markup.cpp

    r219178 r219199  
    7676public:
    7777    AttributeChange()
    78         : m_name(nullAtom(), nullAtom(), nullAtom())
     78        : m_name(nullAtom, nullAtom, nullAtom)
    7979    {
    8080    }

  • trunk/Source/WebCore/html/Autocapitalize.cpp

    r219178 r219199  
    5454    switch (type) {
    5555    case AutocapitalizeTypeDefault:
    56         return nullAtom();
     56        return nullAtom;
    5757    case AutocapitalizeTypeNone: {
    5858        static NeverDestroyed<const AtomicString> valueNone("none", AtomicString::ConstructFromLiteral);
    … …  
    7474
    7575    ASSERT_NOT_REACHED();
    76     return nullAtom();
     76    return nullAtom;
    7777}
    7878

  • trunk/Source/WebCore/html/Autofill.cpp

    r219178 r219199  
    176176
    177177    // 1. If the element has no autocomplete attribute, then jump to the step labeled default.
    178     if (attributeValue == nullAtom())
     178    if (attributeValue == nullAtom)
    179179        return defaultLabel();
    180180

  • trunk/Source/WebCore/html/DOMTokenList.h

    r219178 r219199  
    8585{
    8686    auto& tokens = this->tokens();
    87     return index < tokens.size() ? tokens[index] : nullAtom();
     87    return index < tokens.size() ? tokens[index] : nullAtom;
    8888}
    8989

  • trunk/Source/WebCore/html/FormAssociatedElement.cpp

    r219178 r219199  
    283283{
    284284    const AtomicString& name = asHTMLElement().getNameAttribute();
    285     return name.isNull() ? emptyAtom() : name;
     285    return name.isNull() ? emptyAtom : name;
    286286}
    287287

  • trunk/Source/WebCore/html/HTMLButtonElement.cpp

    r219178 r219199  
    8080
    8181    ASSERT_NOT_REACHED();
    82     return emptyAtom();
     82    return emptyAtom;
    8383}
    8484

  • trunk/Source/WebCore/html/HTMLDetailsElement.cpp

    r219178 r219199  
    166166void HTMLDetailsElement::toggleOpen()
    167167{
    168     setAttributeWithoutSynchronization(openAttr, m_isOpen ? nullAtom() : emptyAtom());
     168    setAttributeWithoutSynchronization(openAttr, m_isOpen ? nullAtom : emptyAtom);
    169169
    170170    // We need to post to the document because toggling this element will delete it.

  • trunk/Source/WebCore/html/HTMLDocument.cpp

    r219178 r219199  
    237237{
    238238    static HashSet<AtomicStringImpl*>* htmlCaseInsensitiveAttributesSet = createHtmlCaseInsensitiveAttributesSet();
    239     bool isPossibleHTMLAttr = !attributeName.hasPrefix() && (attributeName.namespaceURI() == nullAtom());
     239    bool isPossibleHTMLAttr = !attributeName.hasPrefix() && (attributeName.namespaceURI() == nullAtom);
    240240    return !isPossibleHTMLAttr || !htmlCaseInsensitiveAttributesSet->contains(attributeName.localName().impl());
    241241}

  • trunk/Source/WebCore/html/HTMLElement.cpp

    r219178 r219199  
    370370    // Event handler attributes have no namespace.
    371371    if (!attributeName.namespaceURI().isNull())
    372         return nullAtom();
     372        return nullAtom;
    373373
    374374    // Fast early return for names that don't start with "on".
    375375    AtomicStringImpl& localName = *attributeName.localName().impl();
    376376    if (localName.length() < 3 || localName[0] != 'o' || localName[1] != 'n')
    377         return nullAtom();
     377        return nullAtom;
    378378
    379379    auto it = map.find(&localName);
    380     return it == map.end() ? nullAtom() : it->value;
     380    return it == map.end() ? nullAtom : it->value;
    381381}
    382382
    … …  
    490490    if (equalLettersIgnoringASCIICase(value, "auto"))
    491491        return autoValue;
    492     return nullAtom();
     492    return nullAtom;
    493493}
    494494

  • trunk/Source/WebCore/html/HTMLImageElement.cpp

    r219178 r219199  
    177177
    178178        auto sourceSize = SizesAttributeParser(source.attributeWithoutSynchronization(sizesAttr).string(), document()).length();
    179         auto candidate = bestFitSourceForImageAttributes(document().deviceScaleFactor(), nullAtom(), srcset, sourceSize);
     179        auto candidate = bestFitSourceForImageAttributes(document().deviceScaleFactor(), nullAtom, srcset, sourceSize);
    180180        if (!candidate.isEmpty())
    181181            return candidate;

  • trunk/Source/WebCore/html/HTMLInputElement.cpp

    r219178 r219199  
    167167const AtomicString& HTMLInputElement::name() const
    168168{
    169     return m_name.isNull() ? emptyAtom() : m_name;
     169    return m_name.isNull() ? emptyAtom : m_name;
    170170}
    171171
    … …  
    527527        // FIXME: We don't have the old attribute values so we pretend that we didn't have the old values.
    528528        if (const Attribute* height = findAttributeByName(heightAttr))
    529             attributeChanged(heightAttr, nullAtom(), height->value());
     529            attributeChanged(heightAttr, nullAtom, height->value());
    530530        if (const Attribute* width = findAttributeByName(widthAttr))
    531             attributeChanged(widthAttr, nullAtom(), width->value());
     531            attributeChanged(widthAttr, nullAtom, width->value());
    532532        if (const Attribute* align = findAttributeByName(alignAttr))
    533             attributeChanged(alignAttr, nullAtom(), align->value());
     533            attributeChanged(alignAttr, nullAtom, align->value());
    534534    }
    535535

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r219178 r219199  
    73137313bool HTMLMediaElement::doesHaveAttribute(const AtomicString& attribute, AtomicString* value) const
    73147314{
    7315     QualifiedName attributeName(nullAtom(), attribute, nullAtom());
     7315    QualifiedName attributeName(nullAtom, attribute, nullAtom);
    73167316
    73177317    auto& elementValue = attributeWithoutSynchronization(attributeName);

  • trunk/Source/WebCore/html/HTMLOptionElement.cpp

    r219178 r219199  
    7979        element->setValue(value);
    8080    if (defaultSelected)
    81         element->setAttributeWithoutSynchronization(selectedAttr, emptyAtom());
     81        element->setAttributeWithoutSynchronization(selectedAttr, emptyAtom);
    8282    element->setSelected(selected);
    8383

  • trunk/Source/WebCore/html/HTMLParamElement.cpp

    r219178 r219199  
    4646    if (hasName())
    4747        return getNameAttribute();
    48     return document().isHTMLDocument() ? emptyAtom() : getIdAttribute();
     48    return document().isHTMLDocument() ? emptyAtom : getIdAttribute();
    4949}
    5050

  • trunk/Source/WebCore/html/HTMLSelectElement.cpp

    r219178 r219199  
    393393    bool oldMultiple = this->multiple();
    394394    int oldSelectedIndex = selectedIndex();
    395     setAttributeWithoutSynchronization(multipleAttr, multiple ? emptyAtom() : nullAtom());
     395    setAttributeWithoutSynchronization(multipleAttr, multiple ? emptyAtom : nullAtom);
    396396
    397397    // Restore selectedIndex after changing the multiple flag to preserve

  • trunk/Source/WebCore/html/HTMLTableCellElement.cpp

    r219178 r219199  
    182182    if (equalIgnoringASCIICase(value, colgroup))
    183183        return colgroup;
    184     return emptyAtom();
     184    return emptyAtom;
    185185}
    186186

  • trunk/Source/WebCore/html/HTMLTrackElement.cpp

    r219178 r219199  
    280280    if (HTMLMediaElement* parent = mediaElement())
    281281        return parent->attributeWithoutSynchronization(HTMLNames::crossoriginAttr);
    282     return nullAtom();
     282    return nullAtom;
    283283}
    284284

  • trunk/Source/WebCore/html/LabelableElement.cpp

    r219178 r219199  
    4646        return nullptr;
    4747
    48     return ensureRareData().ensureNodeLists().addCacheWithAtomicName<LabelsNodeList>(*this, starAtom());
     48    return ensureRareData().ensureNodeLists().addCacheWithAtomicName<LabelsNodeList>(*this, starAtom);
    4949}
    5050

  • trunk/Source/WebCore/html/LabelsNodeList.cpp

    r219178 r219199  
    4141LabelsNodeList::~LabelsNodeList()
    4242{
    43     ownerNode().nodeLists()->removeCacheWithAtomicName(this, starAtom());
     43    ownerNode().nodeLists()->removeCacheWithAtomicName(this, starAtom);
    4444}
    4545   

  • trunk/Source/WebCore/html/MediaController.cpp

    r219178 r219199  
    318318    default:
    319319        ASSERT_NOT_REACHED();
    320         return nullAtom();
     320        return nullAtom;
    321321    }
    322322}
    … …  
    343343    default:
    344344        ASSERT_NOT_REACHED();
    345         return nullAtom();
     345        return nullAtom;
    346346    }
    347347}

  • trunk/Source/WebCore/html/MediaDocument.cpp

    r219178 r219199  
    107107    auto videoElement = HTMLVideoElement::create(document);
    108108    m_mediaElement = videoElement.ptr();
    109     videoElement->setAttributeWithoutSynchronization(controlsAttr, emptyAtom());
    110     videoElement->setAttributeWithoutSynchronization(autoplayAttr, emptyAtom());
    111     videoElement->setAttributeWithoutSynchronization(playsinlineAttr, emptyAtom());
     109    videoElement->setAttributeWithoutSynchronization(controlsAttr, emptyAtom);
     110    videoElement->setAttributeWithoutSynchronization(autoplayAttr, emptyAtom);
     111    videoElement->setAttributeWithoutSynchronization(playsinlineAttr, emptyAtom);
    112112    videoElement->setAttributeWithoutSynchronization(srcAttr, document.url().string());
    113113    if (auto* loader = document.loader())

  • trunk/Source/WebCore/html/parser/AtomicHTMLToken.h

    r219178 r219199  
    207207        // FIXME: This is N^2 for the number of attributes.
    208208        if (!hasAttribute(m_attributes, localName))
    209             m_attributes.uncheckedAppend(Attribute(QualifiedName(nullAtom(), localName, nullAtom()), AtomicString(attribute.value)));
     209            m_attributes.uncheckedAppend(Attribute(QualifiedName(nullAtom, localName, nullAtom), AtomicString(attribute.value)));
    210210    }
    211211}

  • trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp

    r219178 r219199  
    642642Ref<Element> HTMLConstructionSite::createElement(AtomicHTMLToken& token, const AtomicString& namespaceURI)
    643643{
    644     QualifiedName tagName(nullAtom(), token.name(), namespaceURI);
     644    QualifiedName tagName(nullAtom, token.name(), namespaceURI);
    645645    auto element = ownerDocumentForCurrentNode().createElement(tagName, true);
    646646    setAttributes(element, token, m_parserContentPolicy);
    … …  
    677677        }
    678678
    679         QualifiedName qualifiedName(nullAtom(), localName, xhtmlNamespaceURI);
     679        QualifiedName qualifiedName(nullAtom, localName, xhtmlNamespaceURI);
    680680        if (Document::validateCustomElementName(localName) == CustomElementNameValidationStatus::Valid) {
    681681            element = HTMLElement::create(qualifiedName, ownerDocument);

  • trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp

    r219178 r219199  
    4848
    4949    if (numLeadingSpaces == length)
    50         return string.isNull() ? string : emptyAtom().string();
     50        return string.isNull() ? string : emptyAtom.string();
    5151
    5252    for (; numTrailingSpaces < length; ++numTrailingSpaces) {
    … …  
    6868
    6969    if (!length)
    70         return string.isNull() ? string : emptyAtom().string();
     70        return string.isNull() ? string : emptyAtom.string();
    7171
    7272    if (string.is8Bit())
    … …  
    463463    size_t numberSignIndex = usemap.find('#');
    464464    if (numberSignIndex == notFound)
    465         return nullAtom();
     465        return nullAtom;
    466466    return usemap.substring(numberSignIndex + 1).toAtomicString();
    467467}

  • trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp

    r219178 r219199  
    542542    AtomicString xlinkName("xlink", AtomicString::ConstructFromLiteral);
    543543    addNamesWithPrefix(map, xlinkName, XLinkNames::getXLinkAttrs(), XLinkNames::XLinkAttrsCount);
    544     addNamesWithPrefix(map, xmlAtom(), XMLNames::getXMLAttrs(), XMLNames::XMLAttrsCount);
    545 
    546     map.add(WTF::xmlnsAtom(), XMLNSNames::xmlnsAttr);
    547     map.add("xmlns:xlink", QualifiedName(xmlnsAtom(), xlinkName, XMLNSNames::xmlnsNamespaceURI));
     544    addNamesWithPrefix(map, xmlAtom, XMLNames::getXMLAttrs(), XMLNames::XMLAttrsCount);
     545
     546    map.add(WTF::xmlnsAtom, XMLNSNames::xmlnsAttr);
     547    map.add("xmlns:xlink", QualifiedName(xmlnsAtom, xlinkName, XMLNSNames::xmlnsNamespaceURI));
    548548
    549549    return map;

  • trunk/Source/WebCore/html/track/InbandTextTrack.cpp

    r219178 r219199  
    5252
    5353InbandTextTrack::InbandTextTrack(ScriptExecutionContext& context, TextTrackClient& client, InbandTextTrackPrivate& trackPrivate)
    54     : TextTrack(&context, &client, emptyAtom(), trackPrivate.id(), trackPrivate.label(), trackPrivate.language(), InBand)
     54    : TextTrack(&context, &client, emptyAtom, trackPrivate.id(), trackPrivate.label(), trackPrivate.language(), InBand)
    5555    , m_private(trackPrivate)
    5656{

  • trunk/Source/WebCore/html/track/LoadableTextTrack.cpp

    r219178 r219199  
    128128{
    129129    if (!m_trackElement)
    130         return emptyAtom();
     130        return emptyAtom;
    131131    return m_trackElement->attributeWithoutSynchronization(idAttr);
    132132}

  • trunk/Source/WebCore/html/track/TextTrack.cpp

    r219178 r219199  
    8585TextTrack* TextTrack::captionMenuOffItem()
    8686{
    87     static TextTrack& off = TextTrack::create(nullptr, nullptr, "off menu item", emptyAtom(), emptyAtom(), emptyAtom()).leakRef();
     87    static TextTrack& off = TextTrack::create(nullptr, nullptr, "off menu item", emptyAtom, emptyAtom, emptyAtom).leakRef();
    8888    return &off;
    8989}
    … …  
    9191TextTrack* TextTrack::captionMenuAutomaticItem()
    9292{
    93     static TextTrack& automatic = TextTrack::create(nullptr, nullptr, "automatic menu item", emptyAtom(), emptyAtom(), emptyAtom()).leakRef();
     93    static TextTrack& automatic = TextTrack::create(nullptr, nullptr, "automatic menu item", emptyAtom, emptyAtom, emptyAtom).leakRef();
    9494    return &automatic;
    9595}

  • trunk/Source/WebCore/html/track/TrackBase.cpp

    r219178 r219199  
    150150        m_kind = kind;
    151151    else
    152         m_kind = emptyAtom();
     152        m_kind = emptyAtom;
    153153}
    154154

  • trunk/Source/WebCore/html/track/VTTRegion.cpp

    r219178 r219199  
    136136const AtomicString& VTTRegion::scroll() const
    137137{
    138     return m_scroll ? upKeyword() : emptyAtom();
     138    return m_scroll ? upKeyword() : emptyAtom;
    139139}
    140140

  • trunk/Source/WebCore/html/track/WebVTTElement.cpp

    r219178 r219199  
    3838static const QualifiedName& nodeTypeToTagName(WebVTTNodeType nodeType)
    3939{
    40     static NeverDestroyed<QualifiedName> cTag(nullAtom(), "c", nullAtom());
    41     static NeverDestroyed<QualifiedName> vTag(nullAtom(), "v", nullAtom());
    42     static NeverDestroyed<QualifiedName> langTag(nullAtom(), "lang", nullAtom());
    43     static NeverDestroyed<QualifiedName> bTag(nullAtom(), "b", nullAtom());
    44     static NeverDestroyed<QualifiedName> uTag(nullAtom(), "u", nullAtom());
    45     static NeverDestroyed<QualifiedName> iTag(nullAtom(), "i", nullAtom());
    46     static NeverDestroyed<QualifiedName> rubyTag(nullAtom(), "ruby", nullAtom());
    47     static NeverDestroyed<QualifiedName> rtTag(nullAtom(), "rt", nullAtom());
     40    static NeverDestroyed<QualifiedName> cTag(nullAtom, "c", nullAtom);
     41    static NeverDestroyed<QualifiedName> vTag(nullAtom, "v", nullAtom);
     42    static NeverDestroyed<QualifiedName> langTag(nullAtom, "lang", nullAtom);
     43    static NeverDestroyed<QualifiedName> bTag(nullAtom, "b", nullAtom);
     44    static NeverDestroyed<QualifiedName> uTag(nullAtom, "u", nullAtom);
     45    static NeverDestroyed<QualifiedName> iTag(nullAtom, "i", nullAtom);
     46    static NeverDestroyed<QualifiedName> rubyTag(nullAtom, "ruby", nullAtom);
     47    static NeverDestroyed<QualifiedName> rtTag(nullAtom, "rt", nullAtom);
    4848    switch (nodeType) {
    4949    case WebVTTNodeTypeClass:

  • trunk/Source/WebCore/html/track/WebVTTElement.h

    r219178 r219199  
    6363    static const QualifiedName& voiceAttributeName()
    6464    {
    65         static NeverDestroyed<QualifiedName> voiceAttr(nullAtom(), "voice", nullAtom());
     65        static NeverDestroyed<QualifiedName> voiceAttr(nullAtom, "voice", nullAtom);
    6666        return voiceAttr;
    6767    }
    … …  
    6969    static const QualifiedName& langAttributeName()
    7070    {
    71         static NeverDestroyed<QualifiedName> voiceAttr(nullAtom(), "lang", nullAtom());
     71        static NeverDestroyed<QualifiedName> voiceAttr(nullAtom, "lang", nullAtom);
    7272        return voiceAttr;
    7373    }

  • trunk/Source/WebCore/html/track/WebVTTToken.h

    r219178 r219199  
    5959    }
    6060
    61     static WebVTTToken StartTag(const String& tagName, const AtomicString& classes = emptyAtom(), const AtomicString& annotation = emptyAtom())
     61    static WebVTTToken StartTag(const String& tagName, const AtomicString& classes = emptyAtom, const AtomicString& annotation = emptyAtom)
    6262    {
    6363        WebVTTToken token(Type::StartTag, tagName);

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r219178 r219199  
    628628
    629629        if (shouldClearWindowName(m_frame, *newDocument))
    630             m_frame.tree().setName(nullAtom());
     630            m_frame.tree().setName(nullAtom);
    631631    }
    632632

  • trunk/Source/WebCore/loader/FrameLoader.h

    r219178 r219199  
    119119
    120120    void changeLocation(FrameLoadRequest&&);
    121     WEBCORE_EXPORT void urlSelected(const URL&, const String& target, Event*, LockHistory, LockBackForwardList, ShouldSendReferrer, ShouldOpenExternalURLsPolicy, std::optional<NewFrameOpenerPolicy> = std::nullopt, const AtomicString& downloadAttribute = nullAtom());
     121    WEBCORE_EXPORT void urlSelected(const URL&, const String& target, Event*, LockHistory, LockBackForwardList, ShouldSendReferrer, ShouldOpenExternalURLsPolicy, std::optional<NewFrameOpenerPolicy> = std::nullopt, const AtomicString& downloadAttribute = nullAtom);
    122122    void submitForm(Ref<FormSubmission>&&);
    123123

  • trunk/Source/WebCore/loader/ImageLoader.cpp

    r219178 r219199  
    472472inline void ImageLoader::clearFailedLoadURL()
    473473{
    474     m_failedLoadURL = nullAtom();
    475 }
    476 
    477 }
     474    m_failedLoadURL = nullAtom;
     475}
     476
     477}

  • trunk/Source/WebCore/loader/NavigationAction.h

    r219178 r219199  
    4242public:
    4343    NavigationAction();
    44     WEBCORE_EXPORT NavigationAction(Document&, const ResourceRequest&, NavigationType = NavigationType::Other, ShouldOpenExternalURLsPolicy = ShouldOpenExternalURLsPolicy::ShouldNotAllow, Event* = nullptr, const AtomicString& downloadAttribute = nullAtom());
    45     NavigationAction(Document&, const ResourceRequest&, FrameLoadType, bool isFormSubmission, Event* = nullptr, ShouldOpenExternalURLsPolicy = ShouldOpenExternalURLsPolicy::ShouldNotAllow, const AtomicString& downloadAttribute = nullAtom());
     44    WEBCORE_EXPORT NavigationAction(Document&, const ResourceRequest&, NavigationType = NavigationType::Other, ShouldOpenExternalURLsPolicy = ShouldOpenExternalURLsPolicy::ShouldNotAllow, Event* = nullptr, const AtomicString& downloadAttribute = nullAtom);
     45    NavigationAction(Document&, const ResourceRequest&, FrameLoadType, bool isFormSubmission, Event* = nullptr, ShouldOpenExternalURLsPolicy = ShouldOpenExternalURLsPolicy::ShouldNotAllow, const AtomicString& downloadAttribute = nullAtom);
    4646
    4747    WEBCORE_EXPORT ~NavigationAction();

  • trunk/Source/WebCore/loader/PolicyChecker.cpp

    r219178 r219199  
    147147
    148148    m_delegateIsDecidingNavigationPolicy = true;
    149     m_suggestedFilename = action.downloadAttribute().isEmpty() ? nullAtom() : action.downloadAttribute();
     149    m_suggestedFilename = action.downloadAttribute().isEmpty() ? nullAtom : action.downloadAttribute();
    150150    m_frame.loader().client().dispatchDecidePolicyForNavigationAction(action, request, formState, [this](PolicyAction action) {
    151151        continueAfterNavigationPolicy(action);

  • trunk/Source/WebCore/page/DOMWindow.cpp

    r219178 r219199  
    23272327        return;
    23282328
    2329     RefPtr<Frame> dialogFrame = createWindow(urlString, emptyAtom(), parseDialogFeatures(dialogFeaturesString, screenAvailableRect(m_frame->view())), activeWindow, *firstFrame, *m_frame, prepareDialogFunction);
     2329    RefPtr<Frame> dialogFrame = createWindow(urlString, emptyAtom, parseDialogFeatures(dialogFeaturesString, screenAvailableRect(m_frame->view())), activeWindow, *firstFrame, *m_frame, prepareDialogFunction);
    23302330    if (!dialogFrame)
    23312331        return;

  • trunk/Source/WebCore/page/EventHandler.cpp

    r219178 r219199  
    39453945    default:
    39463946        ASSERT_NOT_REACHED();
    3947         return emptyAtom();
     3947        return emptyAtom;
    39483948    }
    39493949}

  • trunk/Source/WebCore/page/FrameTree.cpp

    r219178 r219199  
    4949        return;
    5050    }
    51     m_uniqueName = nullAtom(); // Remove our old frame name so it's not considered in uniqueChildName.
     51    m_uniqueName = nullAtom; // Remove our old frame name so it's not considered in uniqueChildName.
    5252    m_uniqueName = parent()->tree().uniqueChildName(name);
    5353}
    … …  
    5555void FrameTree::clearName()
    5656{
    57     m_name = nullAtom();
    58     m_uniqueName = nullAtom();
     57    m_name = nullAtom;
     58    m_uniqueName = nullAtom;
    5959}
    6060

  • trunk/Source/WebCore/page/Page.cpp

    r219178 r219199  
    557557const String& Page::groupName() const
    558558{
    559     return m_group ? m_group->name() : nullAtom().string();
     559    return m_group ? m_group->name() : nullAtom.string();
    560560}
    561561

  • trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp

    r219178 r219199  
    218218                unsigned hitIndex = hitGlyphStart + (hitGlyphEnd - hitGlyphStart) * (m_run.ltr() ? x / adjustedAdvance : 1 - x / adjustedAdvance);
    219219                unsigned stringLength = complexTextRun.stringLength();
    220                 CachedTextBreakIterator cursorPositionIterator(StringView(complexTextRun.characters(), stringLength), TextBreakIterator::Mode::Caret, nullAtom());
     220                CachedTextBreakIterator cursorPositionIterator(StringView(complexTextRun.characters(), stringLength), TextBreakIterator::Mode::Caret, nullAtom);
    221221                unsigned clusterStart;
    222222                if (cursorPositionIterator.isBoundary(hitIndex))

  • trunk/Source/WebCore/platform/graphics/FontCache.cpp

    r219178 r219199  
    226226    }
    227227
    228     return nullAtom();
     228    return nullAtom;
    229229}
    230230

  • trunk/Source/WebCore/platform/graphics/FontDescription.h

    r219178 r219199  
    304304    static FontVariantAlternates initialVariantAlternates() { return FontVariantAlternates::Normal; }
    305305    static FontOpticalSizing initialOpticalSizing() { return FontOpticalSizing::Enabled; }
    306     static const AtomicString& initialLocale() { return nullAtom(); }
     306    static const AtomicString& initialLocale() { return nullAtom; }
    307307
    308308private:

  • trunk/Source/WebCore/platform/graphics/FontGenericFamilies.cpp

    r219178 r219199  
    8585    if (script != USCRIPT_COMMON)
    8686        return genericFontFamilyForScript(fontMap, USCRIPT_COMMON);
    87     return emptyAtom();
     87    return emptyAtom;
    8888}
    8989

  • trunk/Source/WebCore/platform/graphics/InbandTextTrackPrivate.h

    r219178 r219199  
    7070    virtual bool isEasyToRead() const { return false; }
    7171    virtual bool isDefault() const { return false; }
    72     AtomicString label() const override { return emptyAtom(); }
    73     AtomicString language() const override { return emptyAtom(); }
    74     AtomicString id() const override { return emptyAtom(); }
    75     virtual AtomicString inBandMetadataTrackDispatchType() const { return emptyAtom(); }
     72    AtomicString label() const override { return emptyAtom; }
     73    AtomicString language() const override { return emptyAtom; }
     74    AtomicString id() const override { return emptyAtom; }
     75    virtual AtomicString inBandMetadataTrackDispatchType() const { return emptyAtom; }
    7676
    7777    virtual int textTrackIndex() const { return 0; }

  • trunk/Source/WebCore/platform/graphics/TrackPrivateBase.h

    r219178 r219199  
    5353    virtual TrackPrivateBaseClient* client() const = 0;
    5454
    55     virtual AtomicString id() const { return emptyAtom(); }
    56     virtual AtomicString label() const { return emptyAtom(); }
    57     virtual AtomicString language() const { return emptyAtom(); }
     55    virtual AtomicString id() const { return emptyAtom; }
     56    virtual AtomicString label() const { return emptyAtom; }
     57    virtual AtomicString language() const { return emptyAtom; }
    5858
    5959    virtual int trackIndex() const { return 0; }

  • trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm

    r219191 r219199  
    185185        return [[m_mediaSelectionOption->avMediaSelectionOption() optionID] stringValue];
    186186    ASSERT_NOT_REACHED();
    187     return emptyAtom();
     187    return emptyAtom;
    188188}
    189189
    … …  
    200200    NSArray *titles = [AVMetadataItem metadataItemsFromArray:commonMetadata withKey:AVMetadataCommonKeyTitle keySpace:AVMetadataKeySpaceCommon];
    201201    if (![titles count])
    202         return emptyAtom();
     202        return emptyAtom;
    203203
    204204    // If possible, return a title in one of the user's preferred languages.
    … …  
    217217
    218218    ASSERT_NOT_REACHED();
    219     return emptyAtom();
     219    return emptyAtom;
    220220}
    221221

  • trunk/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.h

    r219178 r219199  
    4242class InbandMetadataTextTrackPrivateAVF : public InbandTextTrackPrivate {
    4343public:
    44     static Ref<InbandMetadataTextTrackPrivateAVF> create(Kind, CueFormat, const AtomicString& id = emptyAtom());
     44    static Ref<InbandMetadataTextTrackPrivateAVF> create(Kind, CueFormat, const AtomicString& id = emptyAtom);
    4545
    4646    ~InbandMetadataTextTrackPrivateAVF();

  • trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp

    r219191 r219199  
    141141{
    142142    if (!m_mediaSelectionOption)
    143         return emptyAtom();
     143        return emptyAtom;
    144144
    145145    RetainPtr<CFStringRef> title;
    … …  
    148148    RetainPtr<CFArrayRef> titles = adoptCF(AVCFMetadataItemCopyItemsWithKeyAndKeySpace(commonMetaData.get(), AVCFMetadataCommonKeyTitle, AVCFMetadataKeySpaceCommon));
    149149    if (!titles)
    150         return emptyAtom();
     150        return emptyAtom;
    151151
    152152    CFIndex titlesCount = CFArrayGetCount(titles.get());
    153153    if (!titlesCount)
    154         return emptyAtom();
     154        return emptyAtom;
    155155
    156156    // If possible, return a title in one of the user's preferred languages.
    … …  
    168168    }
    169169
    170     return title ? AtomicString(title.get()) : emptyAtom();
     170    return title ? AtomicString(title.get()) : emptyAtom;
    171171}
    172172
    … …  
    174174{
    175175    if (!m_mediaSelectionOption)
    176         return emptyAtom();
     176        return emptyAtom;
    177177
    178178    RetainPtr<CFLocaleRef> locale = adoptCF(AVCFMediaSelectionOptionCopyLocale(mediaSelectionOption()));
    179179    if (!locale)
    180         return emptyAtom();
     180        return emptyAtom;
    181181
    182182    return CFLocaleGetIdentifier(locale.get());

  • trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.cpp

    r219191 r219199  
    8787{
    8888    if (!m_playerItemTrack)
    89         return emptyAtom();
     89        return emptyAtom;
    9090
    9191    RetainPtr<CFStringRef> title;
    … …  
    110110    }
    111111
    112     return title ? AtomicString(title.get()) : emptyAtom();
     112    return title ? AtomicString(title.get()) : emptyAtom;
    113113}
    114114
    … …  
    116116{
    117117    if (!m_playerItemTrack)
    118         return emptyAtom();
     118        return emptyAtom;
    119119
    120120    RetainPtr<AVCFAssetTrackRef> assetTrack = adoptCF(AVCFPlayerItemTrackCopyAssetTrack(m_playerItemTrack.get()));

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm

    r219191 r219199  
    167167{
    168168    if (!m_mediaSelectionOption)
    169         return emptyAtom();
     169        return emptyAtom;
    170170
    171171    NSString *title = 0;
    … …  
    182182    }
    183183
    184     return title ? AtomicString(title) : emptyAtom();
     184    return title ? AtomicString(title) : emptyAtom;
    185185}
    186186
    … …  
    188188{
    189189    if (!m_mediaSelectionOption)
    190         return emptyAtom();
     190        return emptyAtom;
    191191
    192192    return [[m_mediaSelectionOption.get() locale] localeIdentifier];

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm

    r219191 r219199  
    9898{
    9999    if (!m_playerItemTrack)
    100         return emptyAtom();
     100        return emptyAtom;
    101101
    102102    NSString *title = 0;
    … …  
    113113    }
    114114
    115     return title ? AtomicString(title) : emptyAtom();
     115    return title ? AtomicString(title) : emptyAtom;
    116116}
    117117
    … …  
    119119{
    120120    if (!m_playerItemTrack)
    121         return emptyAtom();
     121        return emptyAtom;
    122122
    123123    NSString *languageCode = [[m_playerItemTrack assetTrack] languageCode];

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r219178 r219199  
    31143114        return id3Metadata;
    31153115
    3116     return emptyAtom();
     3116    return emptyAtom;
    31173117}
    31183118
    … …  
    31523152            end = start + toMediaTime(item.duration);
    31533153
    3154         AtomicString type = nullAtom();
     3154        AtomicString type = nullAtom;
    31553155        if (item.keySpace)
    31563156            type = metadataType(item.keySpace);

  • trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp

    r219178 r219199  
    14011401    }
    14021402
    1403     return nullAtom();
    1404 }
    1405 
    1406 }
     1403    return nullAtom;
     1404}
     1405
     1406}

  • trunk/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp

    r219178 r219199  
    345345    }
    346346    ASSERT_NOT_REACHED();
    347     return nullAtom();
    348 }
    349 
    350 }
    351 
    352 #endif
    353 
     347    return nullAtom;
     348}
     349
     350}
     351
     352#endif
     353

  • trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp

    r219178 r219199  
    388388const AtomicString& FontCache::platformAlternateFamilyName(const AtomicString&)
    389389{
    390     return nullAtom();
    391 }
    392 
    393 }
     390    return nullAtom;
     391}
     392
     393}

  • trunk/Source/WebCore/platform/graphics/gstreamer/InbandMetadataTextTrackPrivateGStreamer.h

    r219178 r219199  
    3434class InbandMetadataTextTrackPrivateGStreamer : public InbandTextTrackPrivate {
    3535public:
    36     static Ref<InbandMetadataTextTrackPrivateGStreamer> create(Kind kind, CueFormat cueFormat, const AtomicString& id = emptyAtom())
     36    static Ref<InbandMetadataTextTrackPrivateGStreamer> create(Kind kind, CueFormat cueFormat, const AtomicString& id = emptyAtom)
    3737    {
    3838        return adoptRef(*new InbandMetadataTextTrackPrivateGStreamer(kind, cueFormat, id));

  • trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp

    r219178 r219199  
    678678        break;
    679679    }
    680     return nullAtom();
    681 }
    682 
    683 }
     680    return nullAtom;
     681}
     682
     683}

  • trunk/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.h

    r219178 r219199  
    4444    AtomicString id() const override { return m_id; }
    4545    AtomicString label() const override { return m_label; }
    46     AtomicString language() const override { return emptyAtom(); }
     46    AtomicString language() const override { return emptyAtom; }
    4747    int trackIndex() const override { return m_index; }
    4848

  • trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.cpp

    r219178 r219199  
    7373        return rightFacing();
    7474    case RealtimeMediaSourceSettings::Unknown:
    75         return emptyAtom();
     75        return emptyAtom;
    7676    }
    7777   
    7878    ASSERT_NOT_REACHED();
    79     return emptyAtom();
     79    return emptyAtom;
    8080}
    8181

  • trunk/Source/WebCore/platform/mediastream/VideoTrackPrivateMediaStream.h

    r219178 r219199  
    6060    AtomicString id() const final { return m_id; }
    6161    AtomicString label() const final { return m_label; }
    62     AtomicString language() const final { return emptyAtom(); }
     62    AtomicString language() const final { return emptyAtom; }
    6363    int trackIndex() const final { return m_index; }
    6464

  • trunk/Source/WebCore/rendering/HitTestResult.cpp

    r219178 r219199  
    789789    auto* urlElement = URLElement();
    790790    if (!is<HTMLAnchorElement>(urlElement))
    791         return nullAtom();
     791        return nullAtom;
    792792    return ResourceResponse::sanitizeSuggestedFilename(urlElement->attributeWithoutSynchronization(HTMLNames::downloadAttr));
    793793}

  • trunk/Source/WebCore/rendering/InlineTextBox.cpp

    r219178 r219199  
    528528    bool emphasisMarkAbove;
    529529    bool hasTextEmphasis = emphasisMarkExistsAndIsAbove(lineStyle, emphasisMarkAbove);
    530     const AtomicString& emphasisMark = hasTextEmphasis ? lineStyle.textEmphasisMarkString() : nullAtom();
     530    const AtomicString& emphasisMark = hasTextEmphasis ? lineStyle.textEmphasisMarkString() : nullAtom;
    531531    if (!emphasisMark.isEmpty())
    532532        emphasisMarkOffset = emphasisMarkAbove ? -font.fontMetrics().ascent() - font.emphasisMarkDescent(emphasisMark) : font.fontMetrics().descent() + font.emphasisMarkAscent(emphasisMark);

  • trunk/Source/WebCore/rendering/RenderListItem.cpp

    r219178 r219199  
    459459    if (m_marker)
    460460        return m_marker->text();
    461     return nullAtom().string();
     461    return nullAtom.string();
    462462}
    463463

  • trunk/Source/WebCore/rendering/RenderText.cpp

    r219178 r219199  
    15351535
    15361536    StringImpl* textImpl = m_text.impl();
    1537     CachedTextBreakIterator iterator(StringView(textImpl->characters16(), textImpl->length()), TextBreakIterator::Mode::Caret, nullAtom());
     1537    CachedTextBreakIterator iterator(StringView(textImpl->characters16(), textImpl->length()), TextBreakIterator::Mode::Caret, nullAtom);
    15381538    auto result = iterator.preceding(current).value_or(current - 1);
    15391539    return result;
    … …  
    17081708
    17091709    StringImpl* textImpl = m_text.impl();
    1710     CachedTextBreakIterator iterator(StringView(textImpl->characters16(), textImpl->length()), TextBreakIterator::Mode::Caret, nullAtom());
     1710    CachedTextBreakIterator iterator(StringView(textImpl->characters16(), textImpl->length()), TextBreakIterator::Mode::Caret, nullAtom);
    17111711    auto result = iterator.following(current).value_or(current + 1);
    17121712    return result;

  • trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

    r219178 r219199  
    191191        // FIXME: Temporary hack to make tests pass by simulating the old generated content output.
    192192        if (o.isPseudoElement() || (o.parent() && o.parent()->isPseudoElement()))
    193             tagName = emptyAtom();
     193            tagName = emptyAtom;
    194194        if (!tagName.isEmpty()) {
    195195            ts << " {" << tagName << "}";

  • trunk/Source/WebCore/rendering/TextPainter.cpp

    r219178 r219199  
    126126    if (paintStyle.paintOrder == PaintOrder::Normal) {
    127127        // FIXME: Truncate right-to-left text correctly.
    128         paintTextWithShadows(shadow, *m_font, textRun, boxRect, textOrigin, startOffset, endOffset, nullAtom(), 0, paintStyle.strokeWidth > 0);
     128        paintTextWithShadows(shadow, *m_font, textRun, boxRect, textOrigin, startOffset, endOffset, nullAtom, 0, paintStyle.strokeWidth > 0);
    129129    } else {
    130130        bool paintShadow = true;
    … …  
    135135            case PaintType::Fill:
    136136                m_context.setTextDrawingMode(textDrawingMode & ~TextModeStroke);
    137                 paintTextWithShadows(paintShadow ? shadow : nullptr, *m_font, textRun, boxRect, textOrigin, startOffset, endOffset, nullAtom(), 0, false);
     137                paintTextWithShadows(paintShadow ? shadow : nullptr, *m_font, textRun, boxRect, textOrigin, startOffset, endOffset, nullAtom, 0, false);
    138138                paintShadow = false;
    139139                m_context.setTextDrawingMode(textDrawingMode);
    … …  
    141141            case PaintType::Stroke:
    142142                m_context.setTextDrawingMode(textDrawingMode & ~TextModeFill);
    143                 paintTextWithShadows(paintShadow ? shadow : nullptr, *m_font, textRun, boxRect, textOrigin, startOffset, endOffset, nullAtom(), 0, paintStyle.strokeWidth > 0);
     143                paintTextWithShadows(paintShadow ? shadow : nullptr, *m_font, textRun, boxRect, textOrigin, startOffset, endOffset, nullAtom, 0, paintStyle.strokeWidth > 0);
    144144                paintShadow = false;
    145145                m_context.setTextDrawingMode(textDrawingMode);

  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r219178 r219199  
    13311331    switch (textEmphasisMark()) {
    13321332    case TextEmphasisMarkNone:
    1333         return nullAtom();
     1333        return nullAtom;
    13341334    case TextEmphasisMarkCustom:
    13351335        return textEmphasisCustomMark();
    … …  
    13611361    case TextEmphasisMarkAuto:
    13621362        ASSERT_NOT_REACHED();
    1363         return nullAtom();
     1363        return nullAtom;
    13641364    }
    13651365
    13661366    ASSERT_NOT_REACHED();
    1367     return nullAtom();
     1367    return nullAtom;
    13681368}
    13691369

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r219178 r219199  
    15231523    static short initialHyphenationLimitAfter() { return -1; }
    15241524    static short initialHyphenationLimitLines() { return -1; }
    1525     static const AtomicString& initialHyphenationString() { return nullAtom(); }
     1525    static const AtomicString& initialHyphenationString() { return nullAtom; }
    15261526    static EBorderFit initialBorderFit() { return BorderFitBorder; }
    15271527    static EResize initialResize() { return RESIZE_NONE; }
    … …  
    15501550    static TextEmphasisFill initialTextEmphasisFill() { return TextEmphasisFillFilled; }
    15511551    static TextEmphasisMark initialTextEmphasisMark() { return TextEmphasisMarkNone; }
    1552     static const AtomicString& initialTextEmphasisCustomMark() { return nullAtom(); }
     1552    static const AtomicString& initialTextEmphasisCustomMark() { return nullAtom; }
    15531553    static TextEmphasisPosition initialTextEmphasisPosition() { return TextEmphasisPositionOver | TextEmphasisPositionRight; }
    15541554    static RubyPosition initialRubyPosition() { return RubyPositionBefore; }
    … …  
    15631563    static PrintColorAdjust initialPrintColorAdjust() { return PrintColorAdjustEconomy; }
    15641564    static QuotesData* initialQuotes() { return nullptr; }
    1565     static const AtomicString& initialContentAltText() { return emptyAtom(); }
     1565    static const AtomicString& initialContentAltText() { return emptyAtom; }
    15661566
    15671567#if ENABLE(CSS3_TEXT)
    … …  
    16381638    static unsigned initialTabSize() { return 8; }
    16391639
    1640     static const AtomicString& initialLineGrid() { return nullAtom(); }
     1640    static const AtomicString& initialLineGrid() { return nullAtom; }
    16411641    static LineSnap initialLineSnap() { return LineSnapNone; }
    16421642    static LineAlign initialLineAlign() { return LineAlignNone; }
    16431643
    1644     static const AtomicString& initialFlowThread() { return nullAtom(); }
    1645     static const AtomicString& initialRegionThread() { return nullAtom(); }
     1644    static const AtomicString& initialFlowThread() { return nullAtom; }
     1645    static const AtomicString& initialRegionThread() { return nullAtom; }
    16461646    static RegionFragment initialRegionFragment() { return AutoRegionFragment; }
    16471647

  • trunk/Source/WebCore/style/StyleScope.cpp

    r219178 r219199  
    333333                }
    334334                if (!linkElement.sheet())
    335                     title = nullAtom();
     335                    title = nullAtom;
    336336            }
    337337            // Get the current preferred styleset. This is the

  • trunk/Source/WebCore/svg/SVGElement.cpp

    r219178 r219199  
    10331033        return 0;
    10341034
    1035     QualifiedName attributeName(nullAtom(), name, nullAtom());
     1035    QualifiedName attributeName(nullAtom, name, nullAtom);
    10361036    const Attribute* attribute = findAttributeByName(attributeName);
    10371037    if (!attribute)

  • trunk/Source/WebCore/svg/SVGElement.h

    r219178 r219199  
    219219    {
    220220        if (key.hasPrefix()) {
    221             QualifiedNameComponents components = { nullAtom().impl(), key.localName().impl(), key.namespaceURI().impl() };
     221            QualifiedNameComponents components = { nullAtom.impl(), key.localName().impl(), key.namespaceURI().impl() };
    222222            return hashComponents(components);
    223223        }

  • trunk/Source/WebCore/svg/SVGUseElement.cpp

    r219178 r219199  
    143143        // values will override the corresponding attributes on the 'svg' in the generated tree.
    144144        SVGElement* correspondingElement = shadowElement.correspondingElement();
    145         shadowElement.setAttribute(SVGNames::widthAttr, (widthIsValid() && width().valueInSpecifiedUnits()) ? AtomicString(width().valueAsString()) : (correspondingElement ? correspondingElement->getAttribute(SVGNames::widthAttr) : nullAtom()));
    146         shadowElement.setAttribute(SVGNames::heightAttr, (heightIsValid() && height().valueInSpecifiedUnits()) ? AtomicString(height().valueAsString()) : (correspondingElement ? correspondingElement->getAttribute(SVGNames::heightAttr) : nullAtom()));
     145        shadowElement.setAttribute(SVGNames::widthAttr, (widthIsValid() && width().valueInSpecifiedUnits()) ? AtomicString(width().valueAsString()) : (correspondingElement ? correspondingElement->getAttribute(SVGNames::widthAttr) : nullAtom));
     146        shadowElement.setAttribute(SVGNames::heightAttr, (heightIsValid() && height().valueInSpecifiedUnits()) ? AtomicString(height().valueAsString()) : (correspondingElement ? correspondingElement->getAttribute(SVGNames::heightAttr) : nullAtom));
    147147    }
    148148}

  • trunk/Source/WebCore/svg/animation/SVGSMILElement.cpp

    r219178 r219199  
    217217
    218218    if (prefix.isNull())
    219         return { nullAtom(), localName, nullAtom() };
     219        return { nullAtom, localName, nullAtom };
    220220
    221221    auto namespaceURI = lookupNamespaceURI(prefix);
    … …  
    223223        return anyQName();
    224224
    225     return { nullAtom(), localName, namespaceURI };
     225    return { nullAtom, localName, namespaceURI };
    226226}
    227227

  • trunk/Source/WebCore/testing/MockCDMFactory.cpp

    r219178 r219199  
    270270    MockCDMFactory* factory = m_cdm ? m_cdm->factory() : nullptr;
    271271    if (!factory) {
    272         callback(SharedBuffer::create(), emptyAtom(), false, SuccessValue::Failed);
     272        callback(SharedBuffer::create(), emptyAtom, false, SuccessValue::Failed);
    273273        return;
    274274    }

  • trunk/Source/WebCore/xml/XMLErrors.cpp

    r219178 r219199  
    9090static inline Ref<Element> createXHTMLParserErrorHeader(Document& document, const String& errorMessages)
    9191{
    92     Ref<Element> reportElement = document.createElement(QualifiedName(nullAtom(), "parsererror", xhtmlNamespaceURI), true);
     92    Ref<Element> reportElement = document.createElement(QualifiedName(nullAtom, "parsererror", xhtmlNamespaceURI), true);
    9393
    9494    Vector<Attribute> reportAttributes;

  • trunk/Source/WebCore/xml/XPathStep.cpp

    r219178 r219199  
    185185                    return false;
    186186
    187                 if (name == starAtom())
     187                if (name == starAtom)
    188188                    return namespaceURI.isEmpty() || node.namespaceURI() == namespaceURI;
    189189
    … …  
    199199                return false;
    200200
    201             if (name == starAtom())
     201            if (name == starAtom)
    202202                return namespaceURI.isEmpty() || namespaceURI == node.namespaceURI();
    203203
    … …  
    343343
    344344            // Avoid lazily creating attribute nodes for attributes that we do not need anyway.
    345             if (m_nodeTest.m_kind == NodeTest::NameTest && m_nodeTest.m_data != starAtom()) {
     345            if (m_nodeTest.m_kind == NodeTest::NameTest && m_nodeTest.m_data != starAtom) {
    346346                auto attr = contextElement.getAttributeNodeNS(m_nodeTest.m_namespaceURI, m_nodeTest.m_data);
    347347                if (attr && attr->namespaceURI() != XMLNSNames::xmlnsNamespaceURI) { // In XPath land, namespace nodes are not accessible on the attribute axis.

  • trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp

    r219178 r219199  
    601601        if (element->hasAttributes()) {
    602602            for (const Attribute& attribute : element->attributesIterator()) {
    603                 if (attribute.localName() == xmlnsAtom())
     603                if (attribute.localName() == xmlnsAtom)
    604604                    m_defaultNamespaceURI = attribute.value();
    605                 else if (attribute.prefix() == xmlnsAtom())
     605                else if (attribute.prefix() == xmlnsAtom)
    606606                    m_prefixToNamespaceMap.set(attribute.localName(), attribute.value());
    607607            }
    … …  
    696696    xmlSAX2Namespace* namespaces = reinterpret_cast<xmlSAX2Namespace*>(libxmlNamespaces);
    697697    for (int i = 0; i < numNamespaces; i++) {
    698         AtomicString namespaceQName = xmlnsAtom();
     698        AtomicString namespaceQName = xmlnsAtom;
    699699        AtomicString namespaceURI = toAtomicString(namespaces[i].uri);
    700700        if (namespaces[i].prefix)
    … …  
    726726        AtomicString attrValue = toAtomicString(attributes[i].value, valueLength);
    727727        String attrPrefix = toString(attributes[i].prefix);
    728         AtomicString attrURI = attrPrefix.isEmpty() ? nullAtom() : toAtomicString(attributes[i].uri);
     728        AtomicString attrURI = attrPrefix.isEmpty() ? nullAtom : toAtomicString(attributes[i].uri);
    729729        AtomicString attrQName = attrPrefix.isEmpty() ? toAtomicString(attributes[i].localname) : attrPrefix + ":" + toString(attributes[i].localname);
    730730

  • trunk/Source/WebKit/mac/ChangeLog

    r219191 r219199  
     12017-07-06  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r219178.
     4
     5        This caused a consistent failure with the API test
     6        StringBuilderTest.ToAtomicStringOnEmpty on all Debug testers.
     7
     8        Reverted changeset:
     9
     10        "[WTF] Clean up StringStatics.cpp by using
     11        LazyNeverDestroyed<> for Atoms"
     12        https://bugs.webkit.org/show_bug.cgi?id=174150
     13        http://trac.webkit.org/changeset/219178
     14
    1152017-07-05  Don Olmstead  <don.olmstead@sony.com>
    216

  • trunk/Source/WebKit/mac/DOM/DOM.mm

    r219178 r219199  
    165165    // Do a special lookup to ignore element prefixes
    166166    if (tag.hasPrefix())
    167         return elementClassMap->get(QualifiedName(nullAtom(), tag.localName(), tag.namespaceURI()).impl());
     167        return elementClassMap->get(QualifiedName(nullAtom, tag.localName(), tag.namespaceURI()).impl());
    168168   
    169169    return elementClassMap->get(tag.impl());

  • trunk/Tools/ChangeLog

    r219197 r219199  
     12017-07-06  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r219178.
     4
     5        This caused a consistent failure with the API test
     6        StringBuilderTest.ToAtomicStringOnEmpty on all Debug testers.
     7
     8        Reverted changeset:
     9
     10        "[WTF] Clean up StringStatics.cpp by using
     11        LazyNeverDestroyed<> for Atoms"
     12        https://bugs.webkit.org/show_bug.cgi?id=174150
     13        http://trac.webkit.org/changeset/219178
     14
    1152017-07-06  Alicia Boya García  <aboya@igalia.com>
    216

  • trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp

    r219178 r219199  
    294294        StringBuilder builder;
    295295        AtomicString atomicString = builder.toAtomicString();
    296         ASSERT_EQ(emptyAtom(), atomicString);
     296        ASSERT_EQ(emptyAtom, atomicString);
    297297    }
    298298    { // With capacity.
    … …  
    300300        builder.reserveCapacity(64);
    301301        AtomicString atomicString = builder.toAtomicString();
    302         ASSERT_EQ(emptyAtom(), atomicString);
     302        ASSERT_EQ(emptyAtom, atomicString);
    303303    }
    304304    { // AtomicString constructed from a null string.
    … …  
    306306        builder.append(String());
    307307        AtomicString atomicString = builder.toAtomicString();
    308         ASSERT_EQ(emptyAtom(), atomicString);
     308        ASSERT_EQ(emptyAtom, atomicString);
    309309    }
    310310    { // AtomicString constructed from an empty string.
    … …  
    312312        builder.append(emptyString());
    313313        AtomicString atomicString = builder.toAtomicString();
    314         ASSERT_EQ(emptyAtom(), atomicString);
     314        ASSERT_EQ(emptyAtom, atomicString);
    315315    }
    316316    { // AtomicString constructed from an empty StringBuilder.
    … …  
    319319        builder.append(emptyBuilder);
    320320        AtomicString atomicString = builder.toAtomicString();
    321         ASSERT_EQ(emptyAtom(), atomicString);
     321        ASSERT_EQ(emptyAtom, atomicString);
    322322    }
    323323    { // AtomicString constructed from an empty char* string.
    … …  
    325325        builder.append("", 0);
    326326        AtomicString atomicString = builder.toAtomicString();
    327         ASSERT_EQ(emptyAtom(), atomicString);
     327        ASSERT_EQ(emptyAtom, atomicString);
    328328    }
    329329    { // Cleared StringBuilder.
    … …  
    332332        builder.clear();
    333333        AtomicString atomicString = builder.toAtomicString();
    334         ASSERT_EQ(emptyAtom(), atomicString);
     334        ASSERT_EQ(emptyAtom, atomicString);
    335335    }
    336336}
Note: See TracChangeset for help on using the changeset viewer.