ResourcePtr refactoring

Source/core/fetch/ResourcePtr.h

Index: Source/core/fetch/ResourcePtr.h
diff --git a/Source/core/fetch/ResourcePtr.h b/Source/core/fetch/ResourcePtr.h
index e3545ee251b320ff04eafe4838148a9d9bd1fb11..a03782ed3b5ea329bd512c24c04049f0f90b6263 100644
--- a/Source/core/fetch/ResourcePtr.h
+++ b/Source/core/fetch/ResourcePtr.h
@@ -32,27 +32,25 @@ namespace blink {
 
 class ResourcePtrBase {
 public:
-    ~ResourcePtrBase();
-
     Resource* get() const { return m_resource; }
     bool operator!() const { return !m_resource; }
-    void clear() { setResource(0); }
+    void clear() { setResource(nullptr); }
 
     // This conversion operator allows implicit conversion to bool but not to other integer types.
     typedef Resource* ResourcePtrBase::*UnspecifiedBoolType;
-    operator UnspecifiedBoolType() const { return m_resource ? &ResourcePtrBase::m_resource : 0; }
+    operator UnspecifiedBoolType() const { return m_resource ? &ResourcePtrBase::m_resource : nullptr; }
 
 protected:
-    ResourcePtrBase() : m_resource(0) { }
-    ResourcePtrBase(Resource*);
-    ResourcePtrBase(const ResourcePtrBase&);
+    ResourcePtrBase() : m_resource(nullptr) { }
+    explicit ResourcePtrBase(Resource*);
+    explicit ResourcePtrBase(const ResourcePtrBase&);
+    ~ResourcePtrBase();
 
     void setResource(Resource*);
 
 private:
-    ResourcePtrBase& operator=(const ResourcePtrBase&) { return *this; }
-
     friend class Resource;
+    ResourcePtrBase& operator=(const ResourcePtrBase&) = delete;

[Nate Chapin, 2014/11/12 17:31:28]

I'm not familiar with this syntax, I assume it's new C++11 goodness? What does
it mean?

[dcheng, 2014/11/12 18:31:15]

It's an error to call a deleted function, so this disallows code from assigning
ResourcePtrBase. http://msdn.microsoft.com/en-us/library/dn457344.aspx documents
why you might want to delete (or default) certain functions that can be
automatically generated by the compiler.

 
     Resource* m_resource;
 };
@@ -77,19 +75,19 @@ inline ResourcePtrBase::ResourcePtrBase(const ResourcePtrBase& o)
         m_resource->registerHandle(this);
 }
 
-template <class R> class ResourcePtr : public ResourcePtrBase {
+template <class R> class ResourcePtr final : public ResourcePtrBase {
 public:
     ResourcePtr() { }
     ResourcePtr(R* res) : ResourcePtrBase(res) { }
     ResourcePtr(const ResourcePtr<R>& o) : ResourcePtrBase(o) { }
-    template<typename U> ResourcePtr(const ResourcePtr<U>& o) : ResourcePtrBase(o.get()) { }
+    template<typename U> ResourcePtr(const ResourcePtr<U>& o) : ResourcePtr(o.get()) { }
 
-    R* get() const { return reinterpret_cast<R*>(ResourcePtrBase::get()); }
+    R* get() const { return static_cast<R*>(ResourcePtrBase::get()); }
     R* operator->() const { return get(); }
 
     ResourcePtr& operator=(R* res) { setResource(res); return *this; }
     ResourcePtr& operator=(const ResourcePtr& o) { setResource(o.get()); return *this; }
-    template<typename U> ResourcePtr& operator=(const ResourcePtr<U>& o) { setResource(o.get()); return *this; }
+    template<typename U> ResourcePtr& operator=(const ResourcePtr<U>& o) { R* r = o.get(); setResource(r); return *this; }
 
     bool operator==(const ResourcePtrBase& o) const { return get() == o.get(); }
     bool operator!=(const ResourcePtrBase& o) const { return get() != o.get(); }