Commit 3e6a96e7 authored by tzik's avatar tzik Committed by Commit Bot

Replace RefPtr<>::Get() with get()

This CL removes RefPtr<>::Get() in order to rename it to get().

Bug: 763844
Change-Id: I90f05a57d9f9bdf493983656a731585a7fb15ed8
Reviewed-on: https://chromium-review.googlesource.com/686515Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarYuta Kitamura <yutak@chromium.org>
Commit-Queue: Taiju Tsuiki <tzik@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505302}
parent f5cd6735
...@@ -6,7 +6,7 @@ static {{field.type_name}}* {{field.initial_method_name}}() { ...@@ -6,7 +6,7 @@ static {{field.type_name}}* {{field.initial_method_name}}() {
return {{field.default_value}}; return {{field.default_value}};
} }
{{field.type_name}}* {{field.getter_method_name}}() const { {{field.type_name}}* {{field.getter_method_name}}() const {
return {{decode(field, getter_expression(field))}}.Get(); return {{decode(field, getter_expression(field))}}.get();
} }
void {{field.setter_method_name}}({{field.wrapper_pointer_name}}<{{field.type_name}}> v) { void {{field.setter_method_name}}({{field.wrapper_pointer_name}}<{{field.type_name}}> v) {
......
...@@ -98,7 +98,7 @@ DEFINE_TRACE(ElementAnimations) { ...@@ -98,7 +98,7 @@ DEFINE_TRACE(ElementAnimations) {
const ComputedStyle* ElementAnimations::BaseComputedStyle() const { const ComputedStyle* ElementAnimations::BaseComputedStyle() const {
#if !DCHECK_IS_ON() #if !DCHECK_IS_ON()
if (IsAnimationStyleChange()) if (IsAnimationStyleChange())
return base_computed_style_.Get(); return base_computed_style_.get();
#endif #endif
return nullptr; return nullptr;
} }
......
...@@ -18,7 +18,7 @@ class HighContrastImageClassifierTest : public ::testing::Test { ...@@ -18,7 +18,7 @@ class HighContrastImageClassifierTest : public ::testing::Test {
String file_path = testing::BlinkRootDir(); String file_path = testing::BlinkRootDir();
file_path.append(file_name); file_path.append(file_name);
RefPtr<SharedBuffer> image_data = testing::ReadFromFile(file_path); RefPtr<SharedBuffer> image_data = testing::ReadFromFile(file_path);
EXPECT_TRUE(image_data.Get()); EXPECT_TRUE(image_data.get());
RefPtr<BitmapImage> image = BitmapImage::Create(); RefPtr<BitmapImage> image = BitmapImage::Create();
image->SetData(image_data, true); image->SetData(image_data, true);
...@@ -34,10 +34,10 @@ class HighContrastImageClassifierTest : public ::testing::Test { ...@@ -34,10 +34,10 @@ class HighContrastImageClassifierTest : public ::testing::Test {
TEST_F(HighContrastImageClassifierTest, ShouldApplyHighContrastFilterToImage) { TEST_F(HighContrastImageClassifierTest, ShouldApplyHighContrastFilterToImage) {
RefPtr<BitmapImage> image = LoadImage( RefPtr<BitmapImage> image = LoadImage(
"/LayoutTests/images/resources/blue-wheel-srgb-color-profile.png"); "/LayoutTests/images/resources/blue-wheel-srgb-color-profile.png");
EXPECT_FALSE(classifier_.ShouldApplyHighContrastFilterToImage(*image.Get())); EXPECT_FALSE(classifier_.ShouldApplyHighContrastFilterToImage(*image.get()));
image = LoadImage("/LayoutTests/images/resources/grid.png"); image = LoadImage("/LayoutTests/images/resources/grid.png");
EXPECT_TRUE(classifier_.ShouldApplyHighContrastFilterToImage(*image.Get())); EXPECT_TRUE(classifier_.ShouldApplyHighContrastFilterToImage(*image.get()));
} }
} // namespace blink } // namespace blink
...@@ -278,7 +278,7 @@ namespace base { ...@@ -278,7 +278,7 @@ namespace base {
template <typename T> template <typename T>
struct BindUnwrapTraits<WTF::RefPtr<T>> { struct BindUnwrapTraits<WTF::RefPtr<T>> {
static T* Unwrap(const WTF::RefPtr<T>& wrapped) { return wrapped.Get(); } static T* Unwrap(const WTF::RefPtr<T>& wrapped) { return wrapped.get(); }
}; };
template <typename T> template <typename T>
......
...@@ -369,7 +369,7 @@ TEST(FunctionalTest, UnretainedWithRefCounted) { ...@@ -369,7 +369,7 @@ TEST(FunctionalTest, UnretainedWithRefCounted) {
RefPtr<Number> five = Number::Create(5); RefPtr<Number> five = Number::Create(5);
EXPECT_EQ(1, five->RefCount()); EXPECT_EQ(1, five->RefCount());
Function<int()> multiply_five_by_two_function = Function<int()> multiply_five_by_two_function =
WTF::Bind(MultiplyNumberByTwo, WTF::Unretained(five.Get())); WTF::Bind(MultiplyNumberByTwo, WTF::Unretained(five.get()));
EXPECT_EQ(1, five->RefCount()); EXPECT_EQ(1, five->RefCount());
EXPECT_EQ(10, multiply_five_by_two_function()); EXPECT_EQ(10, multiply_five_by_two_function());
EXPECT_EQ(1, five->RefCount()); EXPECT_EQ(1, five->RefCount());
......
...@@ -149,7 +149,7 @@ struct PtrHash { ...@@ -149,7 +149,7 @@ struct PtrHash {
template <typename T> template <typename T>
struct RefPtrHash : PtrHash<T> { struct RefPtrHash : PtrHash<T> {
using PtrHash<T>::GetHash; using PtrHash<T>::GetHash;
static unsigned GetHash(const RefPtr<T>& key) { return GetHash(key.Get()); } static unsigned GetHash(const RefPtr<T>& key) { return GetHash(key.get()); }
using PtrHash<T>::Equal; using PtrHash<T>::Equal;
static bool Equal(const RefPtr<T>& a, const RefPtr<T>& b) { return a == b; } static bool Equal(const RefPtr<T>& a, const RefPtr<T>& b) { return a == b; }
static bool Equal(T* a, const RefPtr<T>& b) { return a == b; } static bool Equal(T* a, const RefPtr<T>& b) { return a == b; }
......
...@@ -175,7 +175,7 @@ TEST(HashMapTest, RefPtrAsKey) { ...@@ -175,7 +175,7 @@ TEST(HashMapTest, RefPtrAsKey) {
EXPECT_EQ(1, DummyRefCounted::ref_invokes_count_); EXPECT_EQ(1, DummyRefCounted::ref_invokes_count_);
EXPECT_EQ(1, map.at(ptr)); EXPECT_EQ(1, map.at(ptr));
DummyRefCounted* raw_ptr = ptr.Get(); DummyRefCounted* raw_ptr = ptr.get();
EXPECT_TRUE(map.Contains(raw_ptr)); EXPECT_TRUE(map.Contains(raw_ptr));
EXPECT_NE(map.end(), map.find(raw_ptr)); EXPECT_NE(map.end(), map.find(raw_ptr));
......
...@@ -187,7 +187,7 @@ TEST(HashSetTest, HashSetRefPtr) { ...@@ -187,7 +187,7 @@ TEST(HashSetTest, HashSetRefPtr) {
// Referenced only once (to store a copy in the container). // Referenced only once (to store a copy in the container).
EXPECT_EQ(1, DummyRefCounted::ref_invokes_count_); EXPECT_EQ(1, DummyRefCounted::ref_invokes_count_);
DummyRefCounted* raw_ptr = ptr.Get(); DummyRefCounted* raw_ptr = ptr.get();
EXPECT_TRUE(set.Contains(raw_ptr)); EXPECT_TRUE(set.Contains(raw_ptr));
EXPECT_NE(set.end(), set.find(raw_ptr)); EXPECT_NE(set.end(), set.find(raw_ptr));
......
...@@ -252,7 +252,7 @@ struct HashTraits<RefPtr<P>> : SimpleClassHashTraits<RefPtr<P>> { ...@@ -252,7 +252,7 @@ struct HashTraits<RefPtr<P>> : SimpleClassHashTraits<RefPtr<P>> {
} }
typedef P* PeekOutType; typedef P* PeekOutType;
static PeekOutType Peek(const RefPtr<P>& value) { return value.Get(); } static PeekOutType Peek(const RefPtr<P>& value) { return value.get(); }
}; };
template <typename T> template <typename T>
......
...@@ -412,7 +412,7 @@ TYPED_TEST(ListOrLinkedHashSetRefPtrTest, WithRefPtr) { ...@@ -412,7 +412,7 @@ TYPED_TEST(ListOrLinkedHashSetRefPtrTest, WithRefPtr) {
EXPECT_EQ(ptr, set.front()); EXPECT_EQ(ptr, set.front());
EXPECT_EQ(1, DummyRefCounted::ref_invokes_count_); EXPECT_EQ(1, DummyRefCounted::ref_invokes_count_);
DummyRefCounted* raw_ptr = ptr.Get(); DummyRefCounted* raw_ptr = ptr.get();
EXPECT_TRUE(set.Contains(ptr)); EXPECT_TRUE(set.Contains(ptr));
EXPECT_TRUE(set.Contains(raw_ptr)); EXPECT_TRUE(set.Contains(raw_ptr));
......
...@@ -73,7 +73,7 @@ class RefPtr { ...@@ -73,7 +73,7 @@ class RefPtr {
ALWAYS_INLINE RefPtr(const RefPtr& o) : ptr_(o.ptr_) { RefIfNotNull(ptr_); } ALWAYS_INLINE RefPtr(const RefPtr& o) : ptr_(o.ptr_) { RefIfNotNull(ptr_); }
template <typename U> template <typename U>
RefPtr(const RefPtr<U>& o, EnsurePtrConvertibleArgDecl(U, T)) RefPtr(const RefPtr<U>& o, EnsurePtrConvertibleArgDecl(U, T))
: ptr_(o.Get()) { : ptr_(o.get()) {
RefIfNotNull(ptr_); RefIfNotNull(ptr_);
} }
RefPtr(RefPtr&& o) : ptr_(o.ptr_) { o.ptr_ = nullptr; } RefPtr(RefPtr&& o) : ptr_(o.ptr_) { o.ptr_ = nullptr; }
...@@ -83,10 +83,6 @@ class RefPtr { ...@@ -83,10 +83,6 @@ class RefPtr {
ALWAYS_INLINE ~RefPtr() { DerefIfNotNull(ptr_); } ALWAYS_INLINE ~RefPtr() { DerefIfNotNull(ptr_); }
// TODO(tzik): Get() is being renamed to get(). Once the rename finished,
// remove Get().
ALWAYS_INLINE T* Get() const { return get(); }
ALWAYS_INLINE T* get() const { return ptr_; } ALWAYS_INLINE T* get() const { return ptr_; }
T* LeakRef() WARN_UNUSED_RESULT; T* LeakRef() WARN_UNUSED_RESULT;
...@@ -148,57 +144,57 @@ inline void swap(RefPtr<T>& a, RefPtr<T>& b) { ...@@ -148,57 +144,57 @@ inline void swap(RefPtr<T>& a, RefPtr<T>& b) {
template <typename T, typename U> template <typename T, typename U>
inline bool operator==(const RefPtr<T>& a, const RefPtr<U>& b) { inline bool operator==(const RefPtr<T>& a, const RefPtr<U>& b) {
return a.Get() == b.Get(); return a.get() == b.get();
} }
template <typename T, typename U> template <typename T, typename U>
inline bool operator==(const RefPtr<T>& a, U* b) { inline bool operator==(const RefPtr<T>& a, U* b) {
return a.Get() == b; return a.get() == b;
} }
template <typename T, typename U> template <typename T, typename U>
inline bool operator==(T* a, const RefPtr<U>& b) { inline bool operator==(T* a, const RefPtr<U>& b) {
return a == b.Get(); return a == b.get();
} }
template <typename T> template <typename T>
inline bool operator==(const RefPtr<T>& a, std::nullptr_t) { inline bool operator==(const RefPtr<T>& a, std::nullptr_t) {
return !a.Get(); return !a.get();
} }
template <typename T> template <typename T>
inline bool operator==(std::nullptr_t, const RefPtr<T>& b) { inline bool operator==(std::nullptr_t, const RefPtr<T>& b) {
return !b.Get(); return !b.get();
} }
template <typename T, typename U> template <typename T, typename U>
inline bool operator!=(const RefPtr<T>& a, const RefPtr<U>& b) { inline bool operator!=(const RefPtr<T>& a, const RefPtr<U>& b) {
return a.Get() != b.Get(); return a.get() != b.get();
} }
template <typename T, typename U> template <typename T, typename U>
inline bool operator!=(const RefPtr<T>& a, U* b) { inline bool operator!=(const RefPtr<T>& a, U* b) {
return a.Get() != b; return a.get() != b;
} }
template <typename T, typename U> template <typename T, typename U>
inline bool operator!=(T* a, const RefPtr<U>& b) { inline bool operator!=(T* a, const RefPtr<U>& b) {
return a != b.Get(); return a != b.get();
} }
template <typename T> template <typename T>
inline bool operator!=(const RefPtr<T>& a, std::nullptr_t) { inline bool operator!=(const RefPtr<T>& a, std::nullptr_t) {
return a.Get(); return a.get();
} }
template <typename T> template <typename T>
inline bool operator!=(std::nullptr_t, const RefPtr<T>& b) { inline bool operator!=(std::nullptr_t, const RefPtr<T>& b) {
return b.Get(); return b.get();
} }
template <typename T> template <typename T>
inline T* GetPtr(const RefPtr<T>& p) { inline T* GetPtr(const RefPtr<T>& p) {
return p.Get(); return p.get();
} }
template <typename T> template <typename T>
...@@ -209,7 +205,7 @@ class RefPtrValuePeeker { ...@@ -209,7 +205,7 @@ class RefPtrValuePeeker {
ALWAYS_INLINE RefPtrValuePeeker(T* p) : ptr_(p) {} ALWAYS_INLINE RefPtrValuePeeker(T* p) : ptr_(p) {}
ALWAYS_INLINE RefPtrValuePeeker(std::nullptr_t) : ptr_(nullptr) {} ALWAYS_INLINE RefPtrValuePeeker(std::nullptr_t) : ptr_(nullptr) {}
template <typename U> template <typename U>
RefPtrValuePeeker(const RefPtr<U>& p) : ptr_(p.Get()) {} RefPtrValuePeeker(const RefPtr<U>& p) : ptr_(p.get()) {}
ALWAYS_INLINE operator T*() const { return ptr_; } ALWAYS_INLINE operator T*() const { return ptr_; }
......
...@@ -25,7 +25,7 @@ TEST(RefPtrTest, LeakRef) { ...@@ -25,7 +25,7 @@ TEST(RefPtrTest, LeakRef) {
RefPtr<StringImpl> string = StringImpl::Create("test"); RefPtr<StringImpl> string = StringImpl::Create("test");
EXPECT_TRUE(string); EXPECT_TRUE(string);
EXPECT_TRUE(string->HasOneRef()); EXPECT_TRUE(string->HasOneRef());
StringImpl* raw = string.Get(); StringImpl* raw = string.get();
StringImpl* leaked = string.LeakRef(); StringImpl* leaked = string.LeakRef();
EXPECT_TRUE(!string); EXPECT_TRUE(!string);
EXPECT_TRUE(leaked); EXPECT_TRUE(leaked);
......
...@@ -41,17 +41,17 @@ TEST(TreeNodeTest, AppendChild) { ...@@ -41,17 +41,17 @@ TEST(TreeNodeTest, AppendChild) {
RefPtr<TestTree> first_child = TestTree::Create(); RefPtr<TestTree> first_child = TestTree::Create();
RefPtr<TestTree> last_child = TestTree::Create(); RefPtr<TestTree> last_child = TestTree::Create();
root->AppendChild(first_child.Get()); root->AppendChild(first_child.get());
EXPECT_EQ(root->FirstChild(), first_child.Get()); EXPECT_EQ(root->FirstChild(), first_child.get());
EXPECT_EQ(root->LastChild(), first_child.Get()); EXPECT_EQ(root->LastChild(), first_child.get());
EXPECT_EQ(first_child->Parent(), root.Get()); EXPECT_EQ(first_child->Parent(), root.get());
root->AppendChild(last_child.Get()); root->AppendChild(last_child.get());
EXPECT_EQ(root->FirstChild(), first_child.Get()); EXPECT_EQ(root->FirstChild(), first_child.get());
EXPECT_EQ(root->LastChild(), last_child.Get()); EXPECT_EQ(root->LastChild(), last_child.get());
EXPECT_EQ(last_child->Previous(), first_child.Get()); EXPECT_EQ(last_child->Previous(), first_child.get());
EXPECT_EQ(first_child->Next(), last_child.Get()); EXPECT_EQ(first_child->Next(), last_child.get());
EXPECT_EQ(last_child->Parent(), root.Get()); EXPECT_EQ(last_child->Parent(), root.get());
} }
TEST(TreeNodeTest, InsertBefore) { TEST(TreeNodeTest, InsertBefore) {
...@@ -61,28 +61,28 @@ TEST(TreeNodeTest, InsertBefore) { ...@@ -61,28 +61,28 @@ TEST(TreeNodeTest, InsertBefore) {
RefPtr<TestTree> last_child = TestTree::Create(); RefPtr<TestTree> last_child = TestTree::Create();
// Inserting single node // Inserting single node
root->InsertBefore(last_child.Get(), 0); root->InsertBefore(last_child.get(), 0);
EXPECT_EQ(last_child->Parent(), root.Get()); EXPECT_EQ(last_child->Parent(), root.get());
EXPECT_EQ(root->FirstChild(), last_child.Get()); EXPECT_EQ(root->FirstChild(), last_child.get());
EXPECT_EQ(root->LastChild(), last_child.Get()); EXPECT_EQ(root->LastChild(), last_child.get());
// Then prepend // Then prepend
root->InsertBefore(first_child.Get(), last_child.Get()); root->InsertBefore(first_child.get(), last_child.get());
EXPECT_EQ(first_child->Parent(), root.Get()); EXPECT_EQ(first_child->Parent(), root.get());
EXPECT_EQ(root->FirstChild(), first_child.Get()); EXPECT_EQ(root->FirstChild(), first_child.get());
EXPECT_EQ(root->LastChild(), last_child.Get()); EXPECT_EQ(root->LastChild(), last_child.get());
EXPECT_EQ(first_child->Next(), last_child.Get()); EXPECT_EQ(first_child->Next(), last_child.get());
EXPECT_EQ(first_child.Get(), last_child->Previous()); EXPECT_EQ(first_child.get(), last_child->Previous());
// Inserting in the middle // Inserting in the middle
root->InsertBefore(middle_child.Get(), last_child.Get()); root->InsertBefore(middle_child.get(), last_child.get());
EXPECT_EQ(middle_child->Parent(), root.Get()); EXPECT_EQ(middle_child->Parent(), root.get());
EXPECT_EQ(root->FirstChild(), first_child.Get()); EXPECT_EQ(root->FirstChild(), first_child.get());
EXPECT_EQ(root->LastChild(), last_child.Get()); EXPECT_EQ(root->LastChild(), last_child.get());
EXPECT_EQ(middle_child->Previous(), first_child.Get()); EXPECT_EQ(middle_child->Previous(), first_child.get());
EXPECT_EQ(middle_child->Next(), last_child.Get()); EXPECT_EQ(middle_child->Next(), last_child.get());
EXPECT_EQ(first_child->Next(), middle_child.Get()); EXPECT_EQ(first_child->Next(), middle_child.get());
EXPECT_EQ(last_child->Previous(), middle_child.Get()); EXPECT_EQ(last_child->Previous(), middle_child.get());
} }
TEST(TreeNodeTest, RemoveSingle) { TEST(TreeNodeTest, RemoveSingle) {
...@@ -90,13 +90,13 @@ TEST(TreeNodeTest, RemoveSingle) { ...@@ -90,13 +90,13 @@ TEST(TreeNodeTest, RemoveSingle) {
RefPtr<TestTree> child = TestTree::Create(); RefPtr<TestTree> child = TestTree::Create();
RefPtr<TestTree> null_node; RefPtr<TestTree> null_node;
root->AppendChild(child.Get()); root->AppendChild(child.get());
root->RemoveChild(child.Get()); root->RemoveChild(child.get());
EXPECT_EQ(child->Next(), null_node.Get()); EXPECT_EQ(child->Next(), null_node.get());
EXPECT_EQ(child->Previous(), null_node.Get()); EXPECT_EQ(child->Previous(), null_node.get());
EXPECT_EQ(child->Parent(), null_node.Get()); EXPECT_EQ(child->Parent(), null_node.get());
EXPECT_EQ(root->FirstChild(), null_node.Get()); EXPECT_EQ(root->FirstChild(), null_node.get());
EXPECT_EQ(root->LastChild(), null_node.Get()); EXPECT_EQ(root->LastChild(), null_node.get());
} }
class Trio { class Trio {
...@@ -108,9 +108,9 @@ class Trio { ...@@ -108,9 +108,9 @@ class Trio {
last_child(TestTree::Create()) {} last_child(TestTree::Create()) {}
void AppendChildren() { void AppendChildren() {
root->AppendChild(first_child.Get()); root->AppendChild(first_child.get());
root->AppendChild(middle_child.Get()); root->AppendChild(middle_child.get());
root->AppendChild(last_child.Get()); root->AppendChild(last_child.get());
} }
RefPtr<TestTree> root; RefPtr<TestTree> root;
...@@ -123,12 +123,12 @@ TEST(TreeNodeTest, RemoveMiddle) { ...@@ -123,12 +123,12 @@ TEST(TreeNodeTest, RemoveMiddle) {
Trio trio; Trio trio;
trio.AppendChildren(); trio.AppendChildren();
trio.root->RemoveChild(trio.middle_child.Get()); trio.root->RemoveChild(trio.middle_child.get());
EXPECT_TRUE(trio.middle_child->Orphan()); EXPECT_TRUE(trio.middle_child->Orphan());
EXPECT_EQ(trio.first_child->Next(), trio.last_child.Get()); EXPECT_EQ(trio.first_child->Next(), trio.last_child.get());
EXPECT_EQ(trio.last_child->Previous(), trio.first_child.Get()); EXPECT_EQ(trio.last_child->Previous(), trio.first_child.get());
EXPECT_EQ(trio.root->FirstChild(), trio.first_child.Get()); EXPECT_EQ(trio.root->FirstChild(), trio.first_child.get());
EXPECT_EQ(trio.root->LastChild(), trio.last_child.Get()); EXPECT_EQ(trio.root->LastChild(), trio.last_child.get());
} }
TEST(TreeNodeTest, RemoveLast) { TEST(TreeNodeTest, RemoveLast) {
...@@ -136,11 +136,11 @@ TEST(TreeNodeTest, RemoveLast) { ...@@ -136,11 +136,11 @@ TEST(TreeNodeTest, RemoveLast) {
Trio trio; Trio trio;
trio.AppendChildren(); trio.AppendChildren();
trio.root->RemoveChild(trio.last_child.Get()); trio.root->RemoveChild(trio.last_child.get());
EXPECT_TRUE(trio.last_child->Orphan()); EXPECT_TRUE(trio.last_child->Orphan());
EXPECT_EQ(trio.middle_child->Next(), null_node.Get()); EXPECT_EQ(trio.middle_child->Next(), null_node.get());
EXPECT_EQ(trio.root->FirstChild(), trio.first_child.Get()); EXPECT_EQ(trio.root->FirstChild(), trio.first_child.get());
EXPECT_EQ(trio.root->LastChild(), trio.middle_child.Get()); EXPECT_EQ(trio.root->LastChild(), trio.middle_child.get());
} }
TEST(TreeNodeTest, RemoveFirst) { TEST(TreeNodeTest, RemoveFirst) {
...@@ -148,11 +148,11 @@ TEST(TreeNodeTest, RemoveFirst) { ...@@ -148,11 +148,11 @@ TEST(TreeNodeTest, RemoveFirst) {
Trio trio; Trio trio;
trio.AppendChildren(); trio.AppendChildren();
trio.root->RemoveChild(trio.first_child.Get()); trio.root->RemoveChild(trio.first_child.get());
EXPECT_TRUE(trio.first_child->Orphan()); EXPECT_TRUE(trio.first_child->Orphan());
EXPECT_EQ(trio.middle_child->Previous(), null_node.Get()); EXPECT_EQ(trio.middle_child->Previous(), null_node.get());
EXPECT_EQ(trio.root->FirstChild(), trio.middle_child.Get()); EXPECT_EQ(trio.root->FirstChild(), trio.middle_child.get());
EXPECT_EQ(trio.root->LastChild(), trio.last_child.Get()); EXPECT_EQ(trio.root->LastChild(), trio.last_child.get());
} }
TEST(TreeNodeTest, TakeChildrenFrom) { TEST(TreeNodeTest, TakeChildrenFrom) {
...@@ -160,13 +160,13 @@ TEST(TreeNodeTest, TakeChildrenFrom) { ...@@ -160,13 +160,13 @@ TEST(TreeNodeTest, TakeChildrenFrom) {
Trio trio; Trio trio;
trio.AppendChildren(); trio.AppendChildren();
new_parent->TakeChildrenFrom(trio.root.Get()); new_parent->TakeChildrenFrom(trio.root.get());
EXPECT_FALSE(trio.root->HasChildren()); EXPECT_FALSE(trio.root->HasChildren());
EXPECT_TRUE(new_parent->HasChildren()); EXPECT_TRUE(new_parent->HasChildren());
EXPECT_EQ(trio.first_child.Get(), new_parent->FirstChild()); EXPECT_EQ(trio.first_child.get(), new_parent->FirstChild());
EXPECT_EQ(trio.middle_child.Get(), new_parent->FirstChild()->Next()); EXPECT_EQ(trio.middle_child.get(), new_parent->FirstChild()->Next());
EXPECT_EQ(trio.last_child.Get(), new_parent->LastChild()); EXPECT_EQ(trio.last_child.get(), new_parent->LastChild());
} }
class TrioWithGrandChild : public Trio { class TrioWithGrandChild : public Trio {
...@@ -175,7 +175,7 @@ class TrioWithGrandChild : public Trio { ...@@ -175,7 +175,7 @@ class TrioWithGrandChild : public Trio {
void AppendChildren() { void AppendChildren() {
Trio::AppendChildren(); Trio::AppendChildren();
middle_child->AppendChild(grand_child.Get()); middle_child->AppendChild(grand_child.get());
} }
RefPtr<TestTree> grand_child; RefPtr<TestTree> grand_child;
...@@ -185,12 +185,12 @@ TEST(TreeNodeTest, TraverseNext) { ...@@ -185,12 +185,12 @@ TEST(TreeNodeTest, TraverseNext) {
TrioWithGrandChild trio; TrioWithGrandChild trio;
trio.AppendChildren(); trio.AppendChildren();
TestTree* order[] = {trio.root.Get(), trio.first_child.Get(), TestTree* order[] = {trio.root.get(), trio.first_child.get(),
trio.middle_child.Get(), trio.grand_child.Get(), trio.middle_child.get(), trio.grand_child.get(),
trio.last_child.Get()}; trio.last_child.get()};
unsigned order_index = 0; unsigned order_index = 0;
for (TestTree *node = trio.root.Get(); node; for (TestTree *node = trio.root.get(); node;
node = TraverseNext(node), order_index++) node = TraverseNext(node), order_index++)
EXPECT_EQ(node, order[order_index]); EXPECT_EQ(node, order[order_index]);
EXPECT_EQ(order_index, sizeof(order) / sizeof(TestTree*)); EXPECT_EQ(order_index, sizeof(order) / sizeof(TestTree*));
...@@ -200,12 +200,12 @@ TEST(TreeNodeTest, TraverseNextPostORder) { ...@@ -200,12 +200,12 @@ TEST(TreeNodeTest, TraverseNextPostORder) {
TrioWithGrandChild trio; TrioWithGrandChild trio;
trio.AppendChildren(); trio.AppendChildren();
TestTree* order[] = {trio.first_child.Get(), trio.grand_child.Get(), TestTree* order[] = {trio.first_child.get(), trio.grand_child.get(),
trio.middle_child.Get(), trio.last_child.Get(), trio.middle_child.get(), trio.last_child.get(),
trio.root.Get()}; trio.root.get()};
unsigned order_index = 0; unsigned order_index = 0;
for (TestTree *node = TraverseFirstPostOrder(trio.root.Get()); node; for (TestTree *node = TraverseFirstPostOrder(trio.root.get()); node;
node = TraverseNextPostOrder(node), order_index++) node = TraverseNextPostOrder(node), order_index++)
EXPECT_EQ(node, order[order_index]); EXPECT_EQ(node, order[order_index]);
EXPECT_EQ(order_index, sizeof(order) / sizeof(TestTree*)); EXPECT_EQ(order_index, sizeof(order) / sizeof(TestTree*));
......
...@@ -91,7 +91,7 @@ class WTF_EXPORT CString { ...@@ -91,7 +91,7 @@ class WTF_EXPORT CString {
bool IsSafeToSendToAnotherThread() const; bool IsSafeToSendToAnotherThread() const;
CStringImpl* Impl() const { return buffer_.Get(); } CStringImpl* Impl() const { return buffer_.get(); }
private: private:
RefPtr<CStringImpl> buffer_; RefPtr<CStringImpl> buffer_;
......
...@@ -62,7 +62,7 @@ struct StringHash { ...@@ -62,7 +62,7 @@ struct StringHash {
return key->GetHash(); return key->GetHash();
} }
static bool Equal(const RefPtr<StringImpl>& a, const RefPtr<StringImpl>& b) { static bool Equal(const RefPtr<StringImpl>& a, const RefPtr<StringImpl>& b) {
return Equal(a.Get(), b.Get()); return Equal(a.get(), b.get());
} }
static unsigned GetHash(const String& key) { return key.Impl()->GetHash(); } static unsigned GetHash(const String& key) { return key.Impl()->GetHash(); }
...@@ -113,11 +113,11 @@ class CaseFoldingHash { ...@@ -113,11 +113,11 @@ class CaseFoldingHash {
} }
static unsigned GetHash(const RefPtr<StringImpl>& key) { static unsigned GetHash(const RefPtr<StringImpl>& key) {
return GetHash(key.Get()); return GetHash(key.get());
} }
static bool Equal(const RefPtr<StringImpl>& a, const RefPtr<StringImpl>& b) { static bool Equal(const RefPtr<StringImpl>& a, const RefPtr<StringImpl>& b) {
return Equal(a.Get(), b.Get()); return Equal(a.get(), b.get());
} }
static unsigned GetHash(const String& key) { return GetHash(key.Impl()); } static unsigned GetHash(const String& key) { return GetHash(key.Impl()); }
......
...@@ -48,27 +48,27 @@ TEST(StringImplTest, LowerASCII) { ...@@ -48,27 +48,27 @@ TEST(StringImplTest, LowerASCII) {
EXPECT_TRUE(test_string_impl->Is8Bit()); EXPECT_TRUE(test_string_impl->Is8Bit());
EXPECT_TRUE(StringImpl::Create("a\xE1")->Is8Bit()); EXPECT_TRUE(StringImpl::Create("a\xE1")->Is8Bit());
EXPECT_TRUE(Equal(test_string_impl.Get(), EXPECT_TRUE(Equal(test_string_impl.get(),
StringImpl::Create("link")->LowerASCII().Get())); StringImpl::Create("link")->LowerASCII().get()));
EXPECT_TRUE(Equal(test_string_impl.Get(), EXPECT_TRUE(Equal(test_string_impl.get(),
StringImpl::Create("LINK")->LowerASCII().Get())); StringImpl::Create("LINK")->LowerASCII().get()));
EXPECT_TRUE(Equal(test_string_impl.Get(), EXPECT_TRUE(Equal(test_string_impl.get(),
StringImpl::Create("lInk")->LowerASCII().Get())); StringImpl::Create("lInk")->LowerASCII().get()));
EXPECT_TRUE(Equal(StringImpl::Create("LINK")->LowerUnicode().Get(), EXPECT_TRUE(Equal(StringImpl::Create("LINK")->LowerUnicode().get(),
StringImpl::Create("LINK")->LowerASCII().Get())); StringImpl::Create("LINK")->LowerASCII().get()));
EXPECT_TRUE(Equal(StringImpl::Create("lInk")->LowerUnicode().Get(), EXPECT_TRUE(Equal(StringImpl::Create("lInk")->LowerUnicode().get(),
StringImpl::Create("lInk")->LowerASCII().Get())); StringImpl::Create("lInk")->LowerASCII().get()));
EXPECT_TRUE(Equal(StringImpl::Create("a\xE1").Get(), EXPECT_TRUE(Equal(StringImpl::Create("a\xE1").get(),
StringImpl::Create("A\xE1")->LowerASCII().Get())); StringImpl::Create("A\xE1")->LowerASCII().get()));
EXPECT_TRUE(Equal(StringImpl::Create("a\xC1").Get(), EXPECT_TRUE(Equal(StringImpl::Create("a\xC1").get(),
StringImpl::Create("A\xC1")->LowerASCII().Get())); StringImpl::Create("A\xC1")->LowerASCII().get()));
EXPECT_FALSE(Equal(StringImpl::Create("a\xE1").Get(), EXPECT_FALSE(Equal(StringImpl::Create("a\xE1").get(),
StringImpl::Create("a\xC1")->LowerASCII().Get())); StringImpl::Create("a\xC1")->LowerASCII().get()));
EXPECT_FALSE(Equal(StringImpl::Create("A\xE1").Get(), EXPECT_FALSE(Equal(StringImpl::Create("A\xE1").get(),
StringImpl::Create("A\xC1")->LowerASCII().Get())); StringImpl::Create("A\xC1")->LowerASCII().get()));
static const UChar kTest[5] = {0x006c, 0x0069, 0x006e, 0x006b, 0}; // link static const UChar kTest[5] = {0x006c, 0x0069, 0x006e, 0x006b, 0}; // link
static const UChar kTestCapitalized[5] = {0x004c, 0x0049, 0x004e, 0x004b, static const UChar kTestCapitalized[5] = {0x004c, 0x0049, 0x004e, 0x004b,
...@@ -77,11 +77,11 @@ TEST(StringImplTest, LowerASCII) { ...@@ -77,11 +77,11 @@ TEST(StringImplTest, LowerASCII) {
RefPtr<StringImpl> test_string_impl16 = StringImpl::Create(kTest, 4); RefPtr<StringImpl> test_string_impl16 = StringImpl::Create(kTest, 4);
EXPECT_FALSE(test_string_impl16->Is8Bit()); EXPECT_FALSE(test_string_impl16->Is8Bit());
EXPECT_TRUE(Equal(test_string_impl16.Get(), EXPECT_TRUE(Equal(test_string_impl16.get(),
StringImpl::Create(kTest, 4)->LowerASCII().Get())); StringImpl::Create(kTest, 4)->LowerASCII().get()));
EXPECT_TRUE( EXPECT_TRUE(
Equal(test_string_impl16.Get(), Equal(test_string_impl16.get(),
StringImpl::Create(kTestCapitalized, 4)->LowerASCII().Get())); StringImpl::Create(kTestCapitalized, 4)->LowerASCII().get()));
static const UChar kTestWithNonASCII[3] = {0x0061, 0x00e1, 0}; // a\xE1 static const UChar kTestWithNonASCII[3] = {0x0061, 0x00e1, 0}; // a\xE1
static const UChar kTestWithNonASCIIComparison[3] = {0x0061, 0x00c1, static const UChar kTestWithNonASCIIComparison[3] = {0x0061, 0x00c1,
...@@ -93,11 +93,11 @@ TEST(StringImplTest, LowerASCII) { ...@@ -93,11 +93,11 @@ TEST(StringImplTest, LowerASCII) {
RefPtr<const StringImpl> const_ref = test_string_impl->IsolatedCopy(); RefPtr<const StringImpl> const_ref = test_string_impl->IsolatedCopy();
DCHECK(const_ref->HasOneRef()); DCHECK(const_ref->HasOneRef());
EXPECT_TRUE(Equal( EXPECT_TRUE(Equal(
StringImpl::Create(kTestWithNonASCII, 2).Get(), StringImpl::Create(kTestWithNonASCII, 2).get(),
StringImpl::Create(kTestWithNonASCIICapitalized, 2)->LowerASCII().Get())); StringImpl::Create(kTestWithNonASCIICapitalized, 2)->LowerASCII().get()));
EXPECT_FALSE(Equal( EXPECT_FALSE(Equal(
StringImpl::Create(kTestWithNonASCII, 2).Get(), StringImpl::Create(kTestWithNonASCII, 2).get(),
StringImpl::Create(kTestWithNonASCIIComparison, 2)->LowerASCII().Get())); StringImpl::Create(kTestWithNonASCIIComparison, 2)->LowerASCII().get()));
} }
TEST(StringImplTest, UpperASCII) { TEST(StringImplTest, UpperASCII) {
...@@ -105,27 +105,27 @@ TEST(StringImplTest, UpperASCII) { ...@@ -105,27 +105,27 @@ TEST(StringImplTest, UpperASCII) {
EXPECT_TRUE(test_string_impl->Is8Bit()); EXPECT_TRUE(test_string_impl->Is8Bit());
EXPECT_TRUE(StringImpl::Create("a\xE1")->Is8Bit()); EXPECT_TRUE(StringImpl::Create("a\xE1")->Is8Bit());
EXPECT_TRUE(Equal(test_string_impl.Get(), EXPECT_TRUE(Equal(test_string_impl.get(),
StringImpl::Create("link")->UpperASCII().Get())); StringImpl::Create("link")->UpperASCII().get()));
EXPECT_TRUE(Equal(test_string_impl.Get(), EXPECT_TRUE(Equal(test_string_impl.get(),
StringImpl::Create("LINK")->UpperASCII().Get())); StringImpl::Create("LINK")->UpperASCII().get()));
EXPECT_TRUE(Equal(test_string_impl.Get(), EXPECT_TRUE(Equal(test_string_impl.get(),
StringImpl::Create("lInk")->UpperASCII().Get())); StringImpl::Create("lInk")->UpperASCII().get()));
EXPECT_TRUE(Equal(StringImpl::Create("LINK")->UpperUnicode().Get(), EXPECT_TRUE(Equal(StringImpl::Create("LINK")->UpperUnicode().get(),
StringImpl::Create("LINK")->UpperASCII().Get())); StringImpl::Create("LINK")->UpperASCII().get()));
EXPECT_TRUE(Equal(StringImpl::Create("lInk")->UpperUnicode().Get(), EXPECT_TRUE(Equal(StringImpl::Create("lInk")->UpperUnicode().get(),
StringImpl::Create("lInk")->UpperASCII().Get())); StringImpl::Create("lInk")->UpperASCII().get()));
EXPECT_TRUE(Equal(StringImpl::Create("A\xE1").Get(), EXPECT_TRUE(Equal(StringImpl::Create("A\xE1").get(),
StringImpl::Create("a\xE1")->UpperASCII().Get())); StringImpl::Create("a\xE1")->UpperASCII().get()));
EXPECT_TRUE(Equal(StringImpl::Create("A\xC1").Get(), EXPECT_TRUE(Equal(StringImpl::Create("A\xC1").get(),
StringImpl::Create("a\xC1")->UpperASCII().Get())); StringImpl::Create("a\xC1")->UpperASCII().get()));
EXPECT_FALSE(Equal(StringImpl::Create("A\xE1").Get(), EXPECT_FALSE(Equal(StringImpl::Create("A\xE1").get(),
StringImpl::Create("a\xC1")->UpperASCII().Get())); StringImpl::Create("a\xC1")->UpperASCII().get()));
EXPECT_FALSE(Equal(StringImpl::Create("A\xE1").Get(), EXPECT_FALSE(Equal(StringImpl::Create("A\xE1").get(),
StringImpl::Create("A\xC1")->UpperASCII().Get())); StringImpl::Create("A\xC1")->UpperASCII().get()));
static const UChar kTest[5] = {0x006c, 0x0069, 0x006e, 0x006b, 0}; // link static const UChar kTest[5] = {0x006c, 0x0069, 0x006e, 0x006b, 0}; // link
static const UChar kTestCapitalized[5] = {0x004c, 0x0049, 0x004e, 0x004b, static const UChar kTestCapitalized[5] = {0x004c, 0x0049, 0x004e, 0x004b,
...@@ -135,11 +135,11 @@ TEST(StringImplTest, UpperASCII) { ...@@ -135,11 +135,11 @@ TEST(StringImplTest, UpperASCII) {
StringImpl::Create(kTestCapitalized, 4); StringImpl::Create(kTestCapitalized, 4);
EXPECT_FALSE(test_string_impl16->Is8Bit()); EXPECT_FALSE(test_string_impl16->Is8Bit());
EXPECT_TRUE(Equal(test_string_impl16.Get(), EXPECT_TRUE(Equal(test_string_impl16.get(),
StringImpl::Create(kTest, 4)->UpperASCII().Get())); StringImpl::Create(kTest, 4)->UpperASCII().get()));
EXPECT_TRUE( EXPECT_TRUE(
Equal(test_string_impl16.Get(), Equal(test_string_impl16.get(),
StringImpl::Create(kTestCapitalized, 4)->UpperASCII().Get())); StringImpl::Create(kTestCapitalized, 4)->UpperASCII().get()));
static const UChar kTestWithNonASCII[3] = {0x0061, 0x00e1, 0}; // a\xE1 static const UChar kTestWithNonASCII[3] = {0x0061, 0x00e1, 0}; // a\xE1
static const UChar kTestWithNonASCIIComparison[3] = {0x0061, 0x00c1, static const UChar kTestWithNonASCIIComparison[3] = {0x0061, 0x00c1,
...@@ -151,11 +151,11 @@ TEST(StringImplTest, UpperASCII) { ...@@ -151,11 +151,11 @@ TEST(StringImplTest, UpperASCII) {
RefPtr<const StringImpl> const_ref = test_string_impl->IsolatedCopy(); RefPtr<const StringImpl> const_ref = test_string_impl->IsolatedCopy();
DCHECK(const_ref->HasOneRef()); DCHECK(const_ref->HasOneRef());
EXPECT_TRUE( EXPECT_TRUE(
Equal(StringImpl::Create(kTestWithNonASCIICapitalized, 2).Get(), Equal(StringImpl::Create(kTestWithNonASCIICapitalized, 2).get(),
StringImpl::Create(kTestWithNonASCII, 2)->UpperASCII().Get())); StringImpl::Create(kTestWithNonASCII, 2)->UpperASCII().get()));
EXPECT_FALSE(Equal( EXPECT_FALSE(Equal(
StringImpl::Create(kTestWithNonASCIICapitalized, 2).Get(), StringImpl::Create(kTestWithNonASCIICapitalized, 2).get(),
StringImpl::Create(kTestWithNonASCIIComparison, 2)->UpperASCII().Get())); StringImpl::Create(kTestWithNonASCIIComparison, 2)->UpperASCII().get()));
} }
} // namespace WTF } // namespace WTF
...@@ -19,61 +19,61 @@ TEST(StringViewTest, ConstructionStringImpl8) { ...@@ -19,61 +19,61 @@ TEST(StringViewTest, ConstructionStringImpl8) {
RefPtr<StringImpl> impl8_bit = StringImpl::Create(kChars8, 5); RefPtr<StringImpl> impl8_bit = StringImpl::Create(kChars8, 5);
// StringView(StringImpl*); // StringView(StringImpl*);
ASSERT_TRUE(StringView(impl8_bit.Get()).Is8Bit()); ASSERT_TRUE(StringView(impl8_bit.get()).Is8Bit());
EXPECT_FALSE(StringView(impl8_bit.Get()).IsNull()); EXPECT_FALSE(StringView(impl8_bit.get()).IsNull());
EXPECT_EQ(impl8_bit->Characters8(), EXPECT_EQ(impl8_bit->Characters8(),
StringView(impl8_bit.Get()).Characters8()); StringView(impl8_bit.get()).Characters8());
EXPECT_EQ(impl8_bit->length(), StringView(impl8_bit.Get()).length()); EXPECT_EQ(impl8_bit->length(), StringView(impl8_bit.get()).length());
EXPECT_STREQ(kChars, StringView(impl8_bit.Get()).ToString().Utf8().data()); EXPECT_STREQ(kChars, StringView(impl8_bit.get()).ToString().Utf8().data());
// StringView(StringImpl*, unsigned offset); // StringView(StringImpl*, unsigned offset);
ASSERT_TRUE(StringView(impl8_bit.Get(), 2).Is8Bit()); ASSERT_TRUE(StringView(impl8_bit.get(), 2).Is8Bit());
EXPECT_FALSE(StringView(impl8_bit.Get(), 2).IsNull()); EXPECT_FALSE(StringView(impl8_bit.get(), 2).IsNull());
EXPECT_EQ(impl8_bit->Characters8() + 2, EXPECT_EQ(impl8_bit->Characters8() + 2,
StringView(impl8_bit.Get(), 2).Characters8()); StringView(impl8_bit.get(), 2).Characters8());
EXPECT_EQ(3u, StringView(impl8_bit.Get(), 2).length()); EXPECT_EQ(3u, StringView(impl8_bit.get(), 2).length());
EXPECT_EQ(StringView("345"), StringView(impl8_bit.Get(), 2)); EXPECT_EQ(StringView("345"), StringView(impl8_bit.get(), 2));
EXPECT_STREQ("345", StringView(impl8_bit.Get(), 2).ToString().Utf8().data()); EXPECT_STREQ("345", StringView(impl8_bit.get(), 2).ToString().Utf8().data());
// StringView(StringImpl*, unsigned offset, unsigned length); // StringView(StringImpl*, unsigned offset, unsigned length);
ASSERT_TRUE(StringView(impl8_bit.Get(), 2, 1).Is8Bit()); ASSERT_TRUE(StringView(impl8_bit.get(), 2, 1).Is8Bit());
EXPECT_FALSE(StringView(impl8_bit.Get(), 2, 1).IsNull()); EXPECT_FALSE(StringView(impl8_bit.get(), 2, 1).IsNull());
EXPECT_EQ(impl8_bit->Characters8() + 2, EXPECT_EQ(impl8_bit->Characters8() + 2,
StringView(impl8_bit.Get(), 2, 1).Characters8()); StringView(impl8_bit.get(), 2, 1).Characters8());
EXPECT_EQ(1u, StringView(impl8_bit.Get(), 2, 1).length()); EXPECT_EQ(1u, StringView(impl8_bit.get(), 2, 1).length());
EXPECT_EQ(StringView("3"), StringView(impl8_bit.Get(), 2, 1)); EXPECT_EQ(StringView("3"), StringView(impl8_bit.get(), 2, 1));
EXPECT_STREQ("3", StringView(impl8_bit.Get(), 2, 1).ToString().Utf8().data()); EXPECT_STREQ("3", StringView(impl8_bit.get(), 2, 1).ToString().Utf8().data());
} }
TEST(StringViewTest, ConstructionStringImpl16) { TEST(StringViewTest, ConstructionStringImpl16) {
RefPtr<StringImpl> impl16_bit = StringImpl::Create(kChars16, 5); RefPtr<StringImpl> impl16_bit = StringImpl::Create(kChars16, 5);
// StringView(StringImpl*); // StringView(StringImpl*);
ASSERT_FALSE(StringView(impl16_bit.Get()).Is8Bit()); ASSERT_FALSE(StringView(impl16_bit.get()).Is8Bit());
EXPECT_FALSE(StringView(impl16_bit.Get()).IsNull()); EXPECT_FALSE(StringView(impl16_bit.get()).IsNull());
EXPECT_EQ(impl16_bit->Characters16(), EXPECT_EQ(impl16_bit->Characters16(),
StringView(impl16_bit.Get()).Characters16()); StringView(impl16_bit.get()).Characters16());
EXPECT_EQ(impl16_bit->length(), StringView(impl16_bit.Get()).length()); EXPECT_EQ(impl16_bit->length(), StringView(impl16_bit.get()).length());
EXPECT_STREQ(kChars, StringView(impl16_bit.Get()).ToString().Utf8().data()); EXPECT_STREQ(kChars, StringView(impl16_bit.get()).ToString().Utf8().data());
// StringView(StringImpl*, unsigned offset); // StringView(StringImpl*, unsigned offset);
ASSERT_FALSE(StringView(impl16_bit.Get(), 2).Is8Bit()); ASSERT_FALSE(StringView(impl16_bit.get(), 2).Is8Bit());
EXPECT_FALSE(StringView(impl16_bit.Get(), 2).IsNull()); EXPECT_FALSE(StringView(impl16_bit.get(), 2).IsNull());
EXPECT_EQ(impl16_bit->Characters16() + 2, EXPECT_EQ(impl16_bit->Characters16() + 2,
StringView(impl16_bit.Get(), 2).Characters16()); StringView(impl16_bit.get(), 2).Characters16());
EXPECT_EQ(3u, StringView(impl16_bit.Get(), 2).length()); EXPECT_EQ(3u, StringView(impl16_bit.get(), 2).length());
EXPECT_EQ(StringView("345"), StringView(impl16_bit.Get(), 2)); EXPECT_EQ(StringView("345"), StringView(impl16_bit.get(), 2));
EXPECT_STREQ("345", StringView(impl16_bit.Get(), 2).ToString().Utf8().data()); EXPECT_STREQ("345", StringView(impl16_bit.get(), 2).ToString().Utf8().data());
// StringView(StringImpl*, unsigned offset, unsigned length); // StringView(StringImpl*, unsigned offset, unsigned length);
ASSERT_FALSE(StringView(impl16_bit.Get(), 2, 1).Is8Bit()); ASSERT_FALSE(StringView(impl16_bit.get(), 2, 1).Is8Bit());
EXPECT_FALSE(StringView(impl16_bit.Get(), 2, 1).IsNull()); EXPECT_FALSE(StringView(impl16_bit.get(), 2, 1).IsNull());
EXPECT_EQ(impl16_bit->Characters16() + 2, EXPECT_EQ(impl16_bit->Characters16() + 2,
StringView(impl16_bit.Get(), 2, 1).Characters16()); StringView(impl16_bit.get(), 2, 1).Characters16());
EXPECT_EQ(1u, StringView(impl16_bit.Get(), 2, 1).length()); EXPECT_EQ(1u, StringView(impl16_bit.get(), 2, 1).length());
EXPECT_EQ(StringView("3"), StringView(impl16_bit.Get(), 2, 1)); EXPECT_EQ(StringView("3"), StringView(impl16_bit.get(), 2, 1));
EXPECT_STREQ("3", EXPECT_STREQ("3",
StringView(impl16_bit.Get(), 2, 1).ToString().Utf8().data()); StringView(impl16_bit.get(), 2, 1).ToString().Utf8().data());
} }
TEST(StringViewTest, ConstructionStringImplRef8) { TEST(StringViewTest, ConstructionStringImplRef8) {
......
...@@ -112,7 +112,7 @@ class WTF_EXPORT String { ...@@ -112,7 +112,7 @@ class WTF_EXPORT String {
bool IsNull() const { return !impl_; } bool IsNull() const { return !impl_; }
bool IsEmpty() const { return !impl_ || !impl_->length(); } bool IsEmpty() const { return !impl_ || !impl_->length(); }
StringImpl* Impl() const { return impl_.Get(); } StringImpl* Impl() const { return impl_.get(); }
RefPtr<StringImpl> ReleaseImpl() { return std::move(impl_); } RefPtr<StringImpl> ReleaseImpl() { return std::move(impl_); }
unsigned length() const { unsigned length() const {
......
...@@ -92,7 +92,7 @@ void ArrayBuffer::AddView(ArrayBufferView* view) { ...@@ -92,7 +92,7 @@ void ArrayBuffer::AddView(ArrayBufferView* view) {
} }
void ArrayBuffer::RemoveView(ArrayBufferView* view) { void ArrayBuffer::RemoveView(ArrayBufferView* view) {
DCHECK_EQ(this, view->buffer_.Get()); DCHECK_EQ(this, view->buffer_.get());
if (view->next_view_) if (view->next_view_)
view->next_view_->prev_view_ = view->prev_view_; view->next_view_->prev_view_ = view->prev_view_;
if (view->prev_view_) if (view->prev_view_)
......
...@@ -56,7 +56,7 @@ class WTF_EXPORT ArrayBufferBuilder final { ...@@ -56,7 +56,7 @@ class WTF_EXPORT ArrayBufferBuilder final {
buffer_ = ArrayBuffer::Create(capacity, 1); buffer_ = ArrayBuffer::Create(capacity, 1);
} }
bool IsValid() const { return buffer_.Get(); } bool IsValid() const { return buffer_.get(); }
// Appending empty data is not allowed. // Appending empty data is not allowed.
unsigned Append(const char* data, unsigned length); unsigned Append(const char* data, unsigned length);
......
...@@ -145,7 +145,7 @@ TEST(ArrayBufferBuilderTest, ToArrayBufferSameAddressIfExactCapacity) { ...@@ -145,7 +145,7 @@ TEST(ArrayBufferBuilderTest, ToArrayBufferSameAddressIfExactCapacity) {
RefPtr<ArrayBuffer> result1 = builder.ToArrayBuffer(); RefPtr<ArrayBuffer> result1 = builder.ToArrayBuffer();
RefPtr<ArrayBuffer> result2 = builder.ToArrayBuffer(); RefPtr<ArrayBuffer> result2 = builder.ToArrayBuffer();
EXPECT_EQ(result1.Get(), result2.Get()); EXPECT_EQ(result1.get(), result2.get());
} }
TEST(ArrayBufferBuilderTest, ToString) { TEST(ArrayBufferBuilderTest, ToString) {
......
...@@ -51,7 +51,7 @@ class WTF_EXPORT ArrayBufferView : public RefCounted<ArrayBufferView> { ...@@ -51,7 +51,7 @@ class WTF_EXPORT ArrayBufferView : public RefCounted<ArrayBufferView> {
virtual ViewType GetType() const = 0; virtual ViewType GetType() const = 0;
const char* TypeName(); const char* TypeName();
ArrayBuffer* Buffer() const { return buffer_.Get(); } ArrayBuffer* Buffer() const { return buffer_.get(); }
void* BaseAddress() const { void* BaseAddress() const {
DCHECK(!IsShared()); DCHECK(!IsShared());
......
...@@ -87,7 +87,7 @@ class TypedArrayBase : public ArrayBufferView { ...@@ -87,7 +87,7 @@ class TypedArrayBase : public ArrayBufferView {
static RefPtr<Subclass> Create(RefPtr<ArrayBuffer> buffer, static RefPtr<Subclass> Create(RefPtr<ArrayBuffer> buffer,
unsigned byte_offset, unsigned byte_offset,
unsigned length) { unsigned length) {
CHECK(VerifySubRange<T>(buffer.Get(), byte_offset, length)); CHECK(VerifySubRange<T>(buffer.get(), byte_offset, length));
return WTF::AdoptRef(new Subclass(std::move(buffer), byte_offset, length)); return WTF::AdoptRef(new Subclass(std::move(buffer), byte_offset, length));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment