summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--third_party/WebKit/Source/wtf/text/AtomicString.h2
-rw-r--r--third_party/WebKit/Source/wtf/text/AtomicStringTest.cpp22
2 files changed, 13 insertions, 11 deletions
diff --git a/third_party/WebKit/Source/wtf/text/AtomicString.h b/third_party/WebKit/Source/wtf/text/AtomicString.h
index aea437a..792344e 100644
--- a/third_party/WebKit/Source/wtf/text/AtomicString.h
+++ b/third_party/WebKit/Source/wtf/text/AtomicString.h
@@ -188,6 +188,7 @@ inline bool operator==(const AtomicString& a, const char* b) { return WTF::equal
inline bool operator==(const AtomicString& a, const Vector<UChar>& b) { return a.impl() && equal(a.impl(), b.data(), b.size()); }
inline bool operator==(const AtomicString& a, const String& b) { return equal(a.impl(), b.impl()); }
inline bool operator==(const LChar* a, const AtomicString& b) { return b == a; }
+inline bool operator==(const char* a, const AtomicString& b) { return b == a; }
inline bool operator==(const String& a, const AtomicString& b) { return equal(a.impl(), b.impl()); }
inline bool operator==(const Vector<UChar>& a, const AtomicString& b) { return b == a; }
@@ -197,6 +198,7 @@ inline bool operator!=(const AtomicString& a, const char* b) { return !(a == b);
inline bool operator!=(const AtomicString& a, const String& b) { return !equal(a.impl(), b.impl()); }
inline bool operator!=(const AtomicString& a, const Vector<UChar>& b) { return !(a == b); }
inline bool operator!=(const LChar* a, const AtomicString& b) { return !(b == a); }
+inline bool operator!=(const char* a, const AtomicString& b) { return !(b == a); }
inline bool operator!=(const String& a, const AtomicString& b) { return !equal(a.impl(), b.impl()); }
inline bool operator!=(const Vector<UChar>& a, const AtomicString& b) { return !(a == b); }
diff --git a/third_party/WebKit/Source/wtf/text/AtomicStringTest.cpp b/third_party/WebKit/Source/wtf/text/AtomicStringTest.cpp
index af690c2..c853b37 100644
--- a/third_party/WebKit/Source/wtf/text/AtomicStringTest.cpp
+++ b/third_party/WebKit/Source/wtf/text/AtomicStringTest.cpp
@@ -38,27 +38,27 @@ namespace {
TEST(AtomicStringTest, Number)
{
int intValue = 1234;
- ASSERT_EQ(AtomicString::number(intValue), "1234");
+ ASSERT_EQ("1234", AtomicString::number(intValue));
intValue = -1234;
- ASSERT_EQ(AtomicString::number(intValue), "-1234");
+ ASSERT_EQ("-1234", AtomicString::number(intValue));
unsigned unsignedValue = 1234u;
- ASSERT_EQ(AtomicString::number(unsignedValue), "1234");
+ ASSERT_EQ("1234", AtomicString::number(unsignedValue));
long longValue = 6553500;
- ASSERT_EQ(AtomicString::number(longValue), "6553500");
+ ASSERT_EQ("6553500", AtomicString::number(longValue));
longValue = -6553500;
- ASSERT_EQ(AtomicString::number(longValue), "-6553500");
+ ASSERT_EQ("-6553500", AtomicString::number(longValue));
unsigned long unsignedLongValue = 4294967295u;
- ASSERT_EQ(AtomicString::number(unsignedLongValue), "4294967295");
+ ASSERT_EQ("4294967295", AtomicString::number(unsignedLongValue));
long long longlongValue = 9223372036854775807;
- ASSERT_EQ(AtomicString::number(longlongValue), "9223372036854775807");
+ ASSERT_EQ("9223372036854775807", AtomicString::number(longlongValue));
longlongValue = -9223372036854775807;
- ASSERT_EQ(AtomicString::number(longlongValue), "-9223372036854775807");
+ ASSERT_EQ("-9223372036854775807", AtomicString::number(longlongValue));
unsigned long long unsignedLongLongValue = 18446744073709551615u;
- ASSERT_EQ(AtomicString::number(unsignedLongLongValue), "18446744073709551615");
+ ASSERT_EQ("18446744073709551615", AtomicString::number(unsignedLongLongValue));
double doubleValue = 1234.56;
- ASSERT_EQ(AtomicString::number(doubleValue), "1234.56");
+ ASSERT_EQ("1234.56", AtomicString::number(doubleValue));
doubleValue = 1234.56789;
- ASSERT_EQ(AtomicString::number(doubleValue, 9), "1234.56789");
+ ASSERT_EQ("1234.56789", AtomicString::number(doubleValue, 9));
}
TEST(AtomicStringTest, ImplEquality)