| Index: Source/core/css/CSSSelector.h
|
| diff --git a/Source/core/css/CSSSelector.h b/Source/core/css/CSSSelector.h
|
| index 1eafd5fa3f1d0d01437c5ad2a8c60c1f5c02809c..5aa125a73d930dd5a412a34def98b3bb752f3120 100644
|
| --- a/Source/core/css/CSSSelector.h
|
| +++ b/Source/core/css/CSSSelector.h
|
| @@ -255,13 +255,13 @@ namespace WebCore {
|
| CSSSelector& operator=(const CSSSelector&);
|
|
|
| struct RareData : public RefCounted<RareData> {
|
| - static PassRefPtr<RareData> create(PassRefPtr<AtomicStringImpl> value) { return adoptRef(new RareData(value)); }
|
| + static PassRefPtr<RareData> create(PassRefPtr<StringImpl> value) { return adoptRef(new RareData(value)); }
|
| ~RareData();
|
|
|
| bool parseNth();
|
| bool matchNth(int count);
|
|
|
| - AtomicStringImpl* m_value; // Plain pointer to keep things uniform with the union.
|
| + StringImpl* m_value; // Plain pointer to keep things uniform with the union.
|
| int m_a; // Used for :nth-*
|
| int m_b; // Used for :nth-*
|
| QualifiedName m_attribute; // used for attribute selector
|
| @@ -269,13 +269,13 @@ namespace WebCore {
|
| OwnPtr<CSSSelectorList> m_selectorList; // Used for :-webkit-any and :not
|
|
|
| private:
|
| - RareData(PassRefPtr<AtomicStringImpl> value);
|
| + RareData(PassRefPtr<StringImpl> value);
|
| };
|
| void createRareData();
|
|
|
| union DataUnion {
|
| DataUnion() : m_value(0) { }
|
| - AtomicStringImpl* m_value;
|
| + StringImpl* m_value;
|
| QualifiedName::QualifiedNameImpl* m_tagQName;
|
| RareData* m_rareData;
|
| } m_data;
|
| @@ -430,8 +430,8 @@ inline const QualifiedName& CSSSelector::tagQName() const
|
| inline const AtomicString& CSSSelector::value() const
|
| {
|
| ASSERT(m_match != Tag);
|
| - // AtomicString is really just an AtomicStringImpl* so the cast below is safe.
|
| - // FIXME: Perhaps call sites could be changed to accept AtomicStringImpl?
|
| + // AtomicString is really just a StringImpl* so the cast below is safe.
|
| + // FIXME: Perhaps call sites could be changed to accept StringImpl?
|
| return *reinterpret_cast<const AtomicString*>(m_hasRareData ? &m_data.m_rareData->m_value : &m_data.m_value);
|
| }
|
|
|
|
|