diff options
| author | tsepez <tsepez@chromium.org> | 2016-10-03 13:54:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-03 13:54:27 -0700 |
| commit | abab61a1fcd776964a15c528dd2dd034fb31edf0 (patch) | |
| tree | 72b991193f09b7e60218b91e44cf676807f4e76d /core/fxcrt | |
| parent | bcf46238b4533a9da91f4fa5d7248bbc85511dbd (diff) | |
| download | pdfium-abab61a1fcd776964a15c528dd2dd034fb31edf0.tar.xz | |
Rename CFX_WeakPtr::Clear() to DestroyObject()
|Clear| is too easily mistaken for "clear this pointer only."
Review-Url: https://codereview.chromium.org/2385303002
Diffstat (limited to 'core/fxcrt')
| -rw-r--r-- | core/fxcrt/cfx_weak_ptr.h | 2 | ||||
| -rw-r--r-- | core/fxcrt/cfx_weak_ptr_unittest.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/fxcrt/cfx_weak_ptr.h b/core/fxcrt/cfx_weak_ptr.h index 61f15e3dda..9ac1475884 100644 --- a/core/fxcrt/cfx_weak_ptr.h +++ b/core/fxcrt/cfx_weak_ptr.h @@ -35,7 +35,7 @@ class CFX_WeakPtr { bool operator!=(const CFX_WeakPtr& that) const { return !(*this == that); } T* Get() const { return m_pHandle ? m_pHandle->Get() : nullptr; } - void Clear() { + void DeleteObject() { if (m_pHandle) { m_pHandle->Clear(); m_pHandle.Reset(); diff --git a/core/fxcrt/cfx_weak_ptr_unittest.cpp b/core/fxcrt/cfx_weak_ptr_unittest.cpp index 11dd8bb3c0..47f63c35b2 100644 --- a/core/fxcrt/cfx_weak_ptr_unittest.cpp +++ b/core/fxcrt/cfx_weak_ptr_unittest.cpp @@ -121,13 +121,13 @@ TEST(fxcrt, WeakPtrResetNonNull) { EXPECT_EQ(1, thing2.delete_count()); } -TEST(fxcrt, WeakPtrClear) { +TEST(fxcrt, WeakPtrDeleteObject) { PseudoDeletable thing; { UniquePtr unique(&thing); WeakPtr ptr1(std::move(unique)); WeakPtr ptr2 = ptr1; - ptr1.Clear(); + ptr1.DeleteObject(); EXPECT_FALSE(ptr1); EXPECT_EQ(nullptr, ptr1.Get()); EXPECT_FALSE(ptr2); @@ -155,7 +155,7 @@ TEST(fxcrt, WeakPtrCyclic) { EXPECT_EQ(0, thing2.delete_count()); } -TEST(fxcrt, WeakPtrCyclicClear) { +TEST(fxcrt, WeakPtrCyclicDeleteObject) { PseudoDeletable thing1; PseudoDeletable thing2; { @@ -165,7 +165,7 @@ TEST(fxcrt, WeakPtrCyclicClear) { WeakPtr ptr2(std::move(unique2)); ptr1->SetNext(ptr2); ptr2->SetNext(ptr1); - ptr1.Clear(); + ptr1.DeleteObject(); EXPECT_EQ(1, thing1.delete_count()); EXPECT_EQ(0, thing2.delete_count()); } |