Add WTF::WeakPtr::operator*()

third_party/WebKit/Source/wtf/WeakPtr.h

 /*
  * Copyright (C) 2013 Google, Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 26 matching lines @@
 template<typename T>
 class WeakReference : public ThreadSafeRefCounted<WeakReference<T>> {
     WTF_MAKE_NONCOPYABLE(WeakReference<T>);
     USING_FAST_MALLOC(WeakReference);
 public:
     static PassRefPtr<WeakReference<T>> create(T* ptr) { return adoptRef(new WeakReference(ptr)); }
     static PassRefPtr<WeakReference<T>> createUnbound() { return adoptRef(new WeakReference()); }
 
     T* get() const
     {
-        ASSERT(m_boundThread == currentThread());
+#if DCHECK_IS_ON()
+        DCHECK(m_boundThread == currentThread());
+#endif
         return m_ptr;
     }
 
     void clear()
     {
-        ASSERT(m_boundThread == currentThread());
+#if DCHECK_IS_ON()
+        DCHECK(m_boundThread == currentThread());
+#endif
         m_ptr = 0;
     }
 
     void bindTo(T* ptr)
     {
-        ASSERT(!m_ptr);
-#if ENABLE(ASSERT)
+        DCHECK(!m_ptr);
+#if DCHECK_IS_ON()
         m_boundThread = currentThread();
 #endif
         m_ptr = ptr;
     }
 
 private:
     WeakReference() : m_ptr(0) { }
 
     explicit WeakReference(T* ptr)
         : m_ptr(ptr)
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
         , m_boundThread(currentThread())
 #endif
     {
     }
 
     T* m_ptr;
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
     ThreadIdentifier m_boundThread;
 #endif
 };
 
 template<typename T>
 class WeakPtr {
     USING_FAST_MALLOC(WeakPtr);
 public:
     WeakPtr() { }
     WeakPtr(std::nullptr_t) { }
     WeakPtr(PassRefPtr<WeakReference<T>> ref) : m_ref(ref) { }
 
     T* get() const { return m_ref ? m_ref->get() : 0; }
     void clear() { m_ref.clear(); }
 
+    T& operator*() const
+    {
+        DCHECK(get());
+        return *get();
+    }
+
     T* operator->() const
     {
-        ASSERT(get());
+        DCHECK(get());
         return get();
     }
 
     typedef RefPtr<WeakReference<T>> (WeakPtr::*UnspecifiedBoolType);
     operator UnspecifiedBoolType() const { return get() ? &WeakPtr::m_ref : 0; }
 
 private:
     RefPtr<WeakReference<T>> m_ref;
 };
 
@@ skipping 42 matching lines @@
     RefPtr<WeakReference<T>> m_ref;
 };
 
 } // namespace WTF
 
 using WTF::WeakPtr;
 using WTF::WeakPtrFactory;
 using WTF::WeakReference;
 
 #endif