summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/Source/wtf/text/AtomicString.h
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538>2013-07-23 23:04:18 +0000
committercevans@chromium.org <cevans@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538>2013-07-23 23:04:18 +0000
commitfae66e6f52d4936e04f75777672c15a793f63688 (patch)
tree5207f5f3c249fdbafb16e6cf2161559218abe645 /third_party/WebKit/Source/wtf/text/AtomicString.h
parentb95790e7ca04c06f08b190bd5f0efbdd0de6706e (diff)
downloadchromium_src-fae66e6f52d4936e04f75777672c15a793f63688.zip
chromium_src-fae66e6f52d4936e04f75777672c15a793f63688.tar.gz
chromium_src-fae66e6f52d4936e04f75777672c15a793f63688.tar.bz2
Remove AtomicStringImpl.
This is attempt #2. Attempt #1 was reverted due to some object lifetime issues which were tackled in separate bugs. I also noted the paradigm of RefPtr<AtomicStringImpl> as a map key, which I replaced with functionally-equivalent AtomicString. This may have the advantage of less template specializations. BUG=250050 TEST=layout tests under ASAN ok Review URL: https://chromiumcodereview.appspot.com/19804005 git-svn-id: svn://svn.chromium.org/blink/trunk@154790 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/Source/wtf/text/AtomicString.h')
-rw-r--r--third_party/WebKit/Source/wtf/text/AtomicString.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/third_party/WebKit/Source/wtf/text/AtomicString.h b/third_party/WebKit/Source/wtf/text/AtomicString.h
index ec47039..5ddc9ae 100644
--- a/third_party/WebKit/Source/wtf/text/AtomicString.h
+++ b/third_party/WebKit/Source/wtf/text/AtomicString.h
@@ -23,7 +23,6 @@
#include "wtf/HashTableDeletedValueType.h"
#include "wtf/WTFExport.h"
-#include "wtf/text/AtomicStringImpl.h"
#include "wtf/text/WTFString.h"
// Define 'NO_IMPLICIT_ATOMICSTRING' before including this header,
@@ -57,7 +56,6 @@ public:
}
ATOMICSTRING_CONVERSION AtomicString(StringImpl* imp) : m_string(add(imp)) { }
- AtomicString(AtomicStringImpl* imp) : m_string(imp) { }
ATOMICSTRING_CONVERSION AtomicString(const String& s) : m_string(add(s.impl())) { }
AtomicString(StringImpl* baseString, unsigned start, unsigned length) : m_string(add(baseString, start, length)) { }
@@ -90,12 +88,12 @@ public:
AtomicString(WTF::HashTableDeletedValueType) : m_string(WTF::HashTableDeletedValue) { }
bool isHashTableDeletedValue() const { return m_string.isHashTableDeletedValue(); }
- static AtomicStringImpl* find(const StringImpl*);
+ static StringImpl* find(const StringImpl*);
operator const String&() const { return m_string; }
const String& string() const { return m_string; };
- AtomicStringImpl* impl() const { return static_cast<AtomicStringImpl *>(m_string.impl()); }
+ StringImpl* impl() const { return m_string.impl(); }
bool is8Bit() const { return m_string.is8Bit(); }
const LChar* characters8() const { return m_string.characters8(); }