Changeset 180528 in webkit

Timestamp:

Feb 23, 2015 3:44:02 PM (9 years ago)

Author:

Brent Fulgham

Message:

Source/WTF:
WTF::WeakPtr should have a 'forget' method
​https://bugs.webkit.org/show_bug.cgi?id=141923

Reviewed by Myles C. Maxfield.

• wtf/WeakPtr.h:

(WTF::WeakPtr::forget): Added.

Tools:
WTF::WeakPtr should have a 'forget' method.
​https://bugs.webkit.org/show_bug.cgi?id=141923

Reviewed by Myles C. Maxfield.

• TestWebKitAPI/Tests/WTF/WeakPtr.cpp:

(TestWebKitAPI::TEST): Added 'Forget' tests case.

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/WeakPtr.h (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/WeakPtr.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2015-02-23  Brent Fulgham  <bfulgham@apple.com>
+
+        WTF::WeakPtr should have a 'forget' method
+        https://bugs.webkit.org/show_bug.cgi?id=141923
+
+        Reviewed by Myles C. Maxfield.
+
+        * wtf/WeakPtr.h:
+        (WTF::WeakPtr::forget): Added.
+
 2015-02-20  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WTF/wtf/WeakPtr.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2013 Google, Inc. All Rights Reserved.
+ * Copyright (C) 2015 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41 +42 @@
 template<typename T> class WeakPtrFactory;
 
+// Note: WeakReference is an implementation detail, and should not be used directly.
 template<typename T>
 class WeakReference : public ThreadSafeRefCounted<WeakReference<T>> {
@@ -102 +104 @@
     T* operator->() const { return m_ref->get(); }
 
+    void forget() { m_ref = WeakReference<T>::create(nullptr); }
+
 private:
     friend class WeakPtrFactory<T>;

trunk/Tools/ChangeLog

@@ +1 @@
+2015-02-23  Brent Fulgham  <bfulgham@apple.com>
+
+        WTF::WeakPtr should have a 'forget' method.
+        https://bugs.webkit.org/show_bug.cgi?id=141923
+
+        Reviewed by Myles C. Maxfield.
+
+        * TestWebKitAPI/Tests/WTF/WeakPtr.cpp:
+        (TestWebKitAPI::TEST): Added 'Forget' tests case.
+
 2015-02-23  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/WeakPtr.cpp

@@ -120 +120 @@
 }
 
+TEST(WTF_WeakPtr, Forget)
+{
+    int dummy = 5;
+    int dummy2 = 7;
+
+    WeakPtrFactory<int> outerFactory(&dummy2);
+    WeakPtr<int> weakPtr1, weakPtr2, weakPtr4;
+    {
+        WeakPtrFactory<int> innerFactory(&dummy);
+        weakPtr1 = innerFactory.createWeakPtr();
+        weakPtr2 = innerFactory.createWeakPtr();
+        EXPECT_EQ(weakPtr1.get(), &dummy);
+        EXPECT_EQ(weakPtr2.get(), &dummy);
+        weakPtr1.forget();
+        EXPECT_NULL(weakPtr1.get());
+        EXPECT_EQ(weakPtr2.get(), &dummy);
+        weakPtr1.forget();
+        EXPECT_NULL(weakPtr1.get());
+        EXPECT_EQ(weakPtr2.get(), &dummy);
+        WeakPtr<int> weakPtr3 = weakPtr2;
+        EXPECT_EQ(weakPtr2.get(), &dummy);
+        EXPECT_EQ(weakPtr3.get(), &dummy);
+        weakPtr3.forget();
+        EXPECT_NULL(weakPtr3.get());
+        EXPECT_EQ(weakPtr2.get(), &dummy);
+        weakPtr4 = weakPtr2;
+        EXPECT_EQ(weakPtr2.get(), &dummy);
+        EXPECT_EQ(weakPtr4.get(), &dummy);
+
+        weakPtr4 = outerFactory.createWeakPtr();
+        EXPECT_EQ(weakPtr2.get(), &dummy);
+        EXPECT_EQ(weakPtr4.get(), &dummy2);
+    }
+
+    EXPECT_NULL(weakPtr1.get());
+    EXPECT_NULL(weakPtr2.get());
+    EXPECT_EQ(weakPtr4.get(), &dummy2);
+
+    WeakPtr<int> weakPtr5 = weakPtr4;
+    EXPECT_EQ(weakPtr4.get(), &dummy2);
+    EXPECT_EQ(weakPtr5.get(), &dummy2);
+    weakPtr5.forget();
+    EXPECT_NULL(weakPtr5.get());
+    WeakPtr<int> weakPtr6 = weakPtr5;
+    EXPECT_NULL(weakPtr6.get());
+    EXPECT_EQ(weakPtr5.get(), weakPtr6.get());
+}
+    
 } // namespace TestWebKitAPI