Re-land 714393002 after fixing android build.

sky/engine/wtf/RefPtr.h

 /*
  *  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 26 matching lines @@
         WTF_DISALLOW_ZERO_ASSIGNMENT(RefPtr);
     public:
         ALWAYS_INLINE RefPtr() : m_ptr(0) { }
         ALWAYS_INLINE RefPtr(std::nullptr_t) : m_ptr(0) { }
         ALWAYS_INLINE RefPtr(T* ptr) : m_ptr(ptr) { refIfNotNull(ptr); }
         template<typename U> RefPtr(const RawPtr<U>& ptr, EnsurePtrConvertibleArgDecl(U, T)) : m_ptr(ptr.get()) { refIfNotNull(m_ptr); }
         ALWAYS_INLINE explicit RefPtr(T& ref) : m_ptr(&ref) { m_ptr->ref(); }
         ALWAYS_INLINE RefPtr(const RefPtr& o) : m_ptr(o.m_ptr) { refIfNotNull(m_ptr); }
         template<typename U> RefPtr(const RefPtr<U>& o, EnsurePtrConvertibleArgDecl(U, T)) : m_ptr(o.get()) { refIfNotNull(m_ptr); }
 
-#if COMPILER_SUPPORTS(CXX_RVALUE_REFERENCES)
         RefPtr(RefPtr&& o) : m_ptr(o.m_ptr) { o.m_ptr = 0; }
         RefPtr& operator=(RefPtr&&);
-#endif
 
         // See comments in PassRefPtr.h for an explanation of why this takes a const reference.
         template<typename U> RefPtr(const PassRefPtr<U>&, EnsurePtrConvertibleArgDecl(U, T));
 
         // Hash table deleted values, which are only constructed and never copied or destroyed.
         RefPtr(HashTableDeletedValueType) : m_ptr(hashTableDeletedValue()) { }
         bool isHashTableDeletedValue() const { return m_ptr == hashTableDeletedValue(); }
 
         ALWAYS_INLINE ~RefPtr() { derefIfNotNull(m_ptr); }
 
@@ skipping 40 matching lines @@
         derefIfNotNull(ptr);
     }
 
     template<typename T> inline RefPtr<T>& RefPtr<T>::operator=(const RefPtr& o)
     {
         RefPtr ptr = o;
         swap(ptr);
         return *this;
     }
 
-#if COMPILER_SUPPORTS(CXX_RVALUE_REFERENCES)
     template<typename T> inline RefPtr<T>& RefPtr<T>::operator=(RefPtr&& o)
     {
         // FIXME: Instead of explicitly casting to RefPtr&& here, we should use std::move, but that requires us to
         // have a standard library that supports move semantics.
         RefPtr ptr = static_cast<RefPtr&&>(o);
         swap(ptr);
         return *this;
     }
-#endif
 
     template<typename T> template<typename U> inline RefPtr<T>& RefPtr<T>::operator=(const RefPtr<U>& o)
     {
         RefPtr ptr = o;
         swap(ptr);
         return *this;
     }
 
     template<typename T> inline RefPtr<T>& RefPtr<T>::operator=(T* optr)
     {
@@ skipping 84 matching lines @@
     private:
         T* m_ptr;
     };
 
 } // namespace WTF
 
 using WTF::RefPtr;
 using WTF::static_pointer_cast;
 
 #endif // WTF_RefPtr_h