Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(330)

Unified Diff: trunk/Source/wtf/text/AtomicString.cpp

Issue 18196004: Revert 153294 "Remove AtomicStringImpl." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/Source/wtf/text/AtomicString.h ('k') | trunk/Source/wtf/text/AtomicStringImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/Source/wtf/text/AtomicString.cpp
===================================================================
--- trunk/Source/wtf/text/AtomicString.cpp (revision 153372)
+++ trunk/Source/wtf/text/AtomicString.cpp (working copy)
@@ -397,13 +397,13 @@
return stringTable().find<HashAndCharactersTranslator<CharacterType> >(buffer);
}
-StringImpl* AtomicString::find(const StringImpl* stringImpl)
+AtomicStringImpl* AtomicString::find(const StringImpl* stringImpl)
{
ASSERT(stringImpl);
ASSERT(stringImpl->existingHash());
if (!stringImpl->length())
- return StringImpl::empty();
+ return static_cast<AtomicStringImpl*>(StringImpl::empty());
HashSet<StringImpl*>::iterator iterator;
if (stringImpl->is8Bit())
@@ -412,7 +412,7 @@
iterator = findString<UChar>(stringImpl);
if (iterator == stringTable().end())
return 0;
- return *iterator;
+ return static_cast<AtomicStringImpl*>(*iterator);
}
void AtomicString::remove(StringImpl* r)
« no previous file with comments | « trunk/Source/wtf/text/AtomicString.h ('k') | trunk/Source/wtf/text/AtomicStringImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698