Backed out 4 changesets (bug 1489317) for causing multiple windows tests timeouts. CLOSED TREE

Backed out changeset e35a9b02675b (bug 1489317)
Backed out changeset 7528056ab631 (bug 1489317)
Backed out changeset d5d432fd2433 (bug 1489317)
Backed out changeset fddf77dc2f9d (bug 1489317)

Author: CosminSabou

ipc/mscom/AgileReference.cpp

@@ -6,11 +6,10 @@
 
 #include "mozilla/mscom/AgileReference.h"
 
-#include "mozilla/Assertions.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/DynamicallyLinkedFunctionPtr.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/Move.h"
-#include "mozilla/mscom/Utils.h"
 
 #if NTDDI_VERSION < NTDDI_WINBLUE
 
@@ -31,34 +30,10 @@ HRESULT WINAPI RoGetAgileReference(AgileReferenceOptions options,
 namespace mozilla {
 namespace mscom {
 
-AgileReference::AgileReference()
-  : mIid()
-  , mGitCookie(0)
-{
-}
-
 AgileReference::AgileReference(REFIID aIid, IUnknown* aObject)
   : mIid(aIid)
   , mGitCookie(0)
 {
-  AssignInternal(aObject);
-}
-
-void
-AgileReference::Assign(REFIID aIid, IUnknown* aObject)
-{
-  Clear();
-  mIid = aIid;
-  AssignInternal(aObject);
-}
-
-void
-AgileReference::AssignInternal(IUnknown* aObject)
-{
-  // We expect mIid to already be set
-  DebugOnly<IID> zeroIid = {};
-  MOZ_ASSERT(mIid != zeroIid);
-
   /*
    * There are two possible techniques for creating agile references. Starting
    * with Windows 8.1, we may use the RoGetAgileReference API, which is faster.
@@ -71,7 +46,7 @@ AgileReference::AssignInternal(IUnknown* aObject)
   MOZ_ASSERT(aObject);
 
   if (pRoGetAgileReference &&
-      SUCCEEDED(pRoGetAgileReference(AGILEREFERENCE_DEFAULT, mIid, aObject,
+      SUCCEEDED(pRoGetAgileReference(AGILEREFERENCE_DEFAULT, aIid, aObject,
                                      getter_AddRefs(mAgileRef)))) {
     return;
   }
@@ -82,7 +57,7 @@ AgileReference::AssignInternal(IUnknown* aObject)
     return;
   }
 
-  DebugOnly<HRESULT> hr = git->RegisterInterfaceInGlobal(aObject, mIid,
+  DebugOnly<HRESULT> hr = git->RegisterInterfaceInGlobal(aObject, aIid,
                                                          &mGitCookie);
   MOZ_ASSERT(SUCCEEDED(hr));
 }
@@ -97,16 +72,7 @@ AgileReference::AgileReference(AgileReference&& aOther)
 
 AgileReference::~AgileReference()
 {
-  Clear();
-}
-
-void
-AgileReference::Clear()
-{
-  mIid = {};
-
   if (!mGitCookie) {
-    mAgileRef = nullptr;
     return;
   }
 
@@ -118,27 +84,13 @@ AgileReference::Clear()
 
   DebugOnly<HRESULT> hr = git->RevokeInterfaceFromGlobal(mGitCookie);
   MOZ_ASSERT(SUCCEEDED(hr));
-  mGitCookie = 0;
-}
-
-AgileReference&
-AgileReference::operator=(AgileReference&& aOther)
-{
-  Clear();
-  mIid = aOther.mIid;
-  aOther.mIid = {};
-  mAgileRef = std::move(aOther.mAgileRef);
-  mGitCookie = aOther.mGitCookie;
-  aOther.mGitCookie = 0;
-  return *this;
 }
 
 HRESULT
-AgileReference::Resolve(REFIID aIid, void** aOutInterface) const
+AgileReference::Resolve(REFIID aIid, void** aOutInterface)
 {
   MOZ_ASSERT(aOutInterface);
   MOZ_ASSERT(mAgileRef || mGitCookie);
-  MOZ_ASSERT(IsCOMInitializedOnCurrentThread());
 
   if (!aOutInterface) {
     return E_INVALIDARG;
@@ -178,7 +130,7 @@ AgileReference::Resolve(REFIID aIid, void** aOutInterface) const
   return originalInterface->QueryInterface(aIid, aOutInterface);
 }
 
-/* static */ IGlobalInterfaceTable*
+IGlobalInterfaceTable*
 AgileReference::ObtainGit()
 {
   // Internally to COM, the Global Interface Table is a singleton, therefore we

ipc/mscom/AgileReference.h

@@ -33,17 +33,9 @@ namespace mscom {
  * HRESULT hr = myAgileRef->Resolve(IID_IFoo, getter_AddRefs(foo));
  * // Now foo may be called from the main thread
  */
-class AgileReference final
+class AgileReference
 {
 public:
-  AgileReference();
-
-  template <typename InterfaceT>
-  explicit AgileReference(RefPtr<InterfaceT>& aObject)
-    : AgileReference(__uuidof(InterfaceT), aObject)
-  {
-  }
-
   AgileReference(REFIID aIid, IUnknown* aObject);
   AgileReference(AgileReference&& aOther);
 
@@ -54,31 +46,14 @@ class AgileReference final
     return mAgileRef || mGitCookie;
   }
 
-  template <typename T>
-  void Assign(const RefPtr<T>& aOther)
-  {
-    Assign(__uuidof(T), aOther);
-  }
-
-  template <typename T>
-  AgileReference& operator=(const RefPtr<T>& aOther)
-  {
-    Assign(aOther);
-    return *this;
-  }
-
-  HRESULT Resolve(REFIID aIid, void** aOutInterface) const;
+  HRESULT Resolve(REFIID aIid, void** aOutInterface);
 
   AgileReference(const AgileReference& aOther) = delete;
   AgileReference& operator=(const AgileReference& aOther) = delete;
-
-  AgileReference& operator=(AgileReference&& aOther);
+  AgileReference& operator=(AgileReference&& aOther) = delete;
 
 private:
-  void Assign(REFIID aIid, IUnknown* aObject);
-  void AssignInternal(IUnknown* aObject);
-  void Clear();
-  static IGlobalInterfaceTable* ObtainGit();
+  IGlobalInterfaceTable* ObtainGit();
 
 private:
   IID                     mIid;
@@ -89,26 +64,4 @@ class AgileReference final
 } // namespace mscom
 } // namespace mozilla
 
-template <typename T>
-RefPtr<T>::RefPtr(const mozilla::mscom::AgileReference& aAgileRef)
-{
-  void* newRawPtr;
-  if (FAILED(aAgileRef.Resolve(__uuidof(T), &newRawPtr))) {
-    newRawPtr = nullptr;
-  }
-  mRawPtr = static_cast<T*>(newRawPtr);
-}
-
-template <typename T>
-RefPtr<T>&
-RefPtr<T>::operator=(const mozilla::mscom::AgileReference& aAgileRef)
-{
-  void* newRawPtr;
-  if (FAILED(aAgileRef.Resolve(__uuidof(T), &newRawPtr))) {
-    newRawPtr = nullptr;
-  }
-  assign_assuming_AddRef(static_cast<T*>(newRawPtr));
-  return *this;
-}
-
 #endif // mozilla_mscom_AgileReference_h

ipc/mscom/Utils.cpp

@@ -32,15 +32,6 @@ extern "C" IMAGE_DOS_HEADER __ImageBase;
 namespace mozilla {
 namespace mscom {
 
-bool
-IsCOMInitializedOnCurrentThread()
-{
-  APTTYPE aptType;
-  APTTYPEQUALIFIER aptTypeQualifier;
-  HRESULT hr = CoGetApartmentType(&aptType, &aptTypeQualifier);
-  return hr != CO_E_NOTINITIALIZED;
-}
-
 bool
 IsCurrentThreadMTA()
 {

ipc/mscom/Utils.h

@@ -20,7 +20,6 @@ struct IUnknown;
 namespace mozilla {
 namespace mscom {
 
-bool IsCOMInitializedOnCurrentThread();
 bool IsCurrentThreadMTA();
 bool IsProxy(IUnknown* aUnknown);
 bool IsValidGUID(REFGUID aCheckGuid);

mfbt/RefPtr.h

@@ -22,11 +22,6 @@ class nsISupports;
 namespace mozilla {
 template<class T> class OwningNonNull;
 template<class T> class StaticRefPtr;
-#if defined(XP_WIN)
-namespace mscom {
-class AgileReference;
-} // namespace mscom
-#endif // defined(XP_WIN)
 
 // Traditionally, RefPtr supports automatic refcounting of any pointer type
 // with AddRef() and Release() methods that follow the traditional semantics.
@@ -157,9 +152,6 @@ class MOZ_IS_REFPTR RefPtr
 
   MOZ_IMPLICIT RefPtr(const nsQueryReferent& aHelper);
   MOZ_IMPLICIT RefPtr(const nsCOMPtr_helper& aHelper);
-#if defined(XP_WIN)
-  MOZ_IMPLICIT RefPtr(const mozilla::mscom::AgileReference& aAgileRef);
-#endif // defined(XP_WIN)
 
   // Defined in OwningNonNull.h
   template<class U>
@@ -223,9 +215,6 @@ class MOZ_IS_REFPTR RefPtr
 
   RefPtr<T>& operator=(const nsQueryReferent& aQueryReferent);
   RefPtr<T>& operator=(const nsCOMPtr_helper& aHelper);
-#if defined(XP_WIN)
-  RefPtr<T>& operator=(const mozilla::mscom::AgileReference& aAgileRef);
-#endif // defined(XP_WIN)
 
   RefPtr<T>&
   operator=(RefPtr<T> && aRefPtr)