The Tor Browser / file diff

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/xpcom/base/nsInterfaceRequestorAgg.cpp	Wed Dec 31 06:09:35 2014 +0100
     1.3 @@ -0,0 +1,87 @@
     1.4 +/* This Source Code Form is subject to the terms of the Mozilla Public
     1.5 + * License, v. 2.0. If a copy of the MPL was not distributed with this
     1.6 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
     1.7 +
     1.8 +#include "nsInterfaceRequestorAgg.h"
     1.9 +#include "nsIInterfaceRequestor.h"
    1.10 +#include "nsCOMPtr.h"
    1.11 +#include "mozilla/Attributes.h"
    1.12 +#include "nsThreadUtils.h"
    1.13 +#include "nsProxyRelease.h"
    1.14 +
    1.15 +class nsInterfaceRequestorAgg MOZ_FINAL : public nsIInterfaceRequestor
    1.16 +{
    1.17 +public:
    1.18 +  // XXX This needs to support threadsafe refcounting until we fix bug 243591.
    1.19 +  NS_DECL_THREADSAFE_ISUPPORTS
    1.20 +  NS_DECL_NSIINTERFACEREQUESTOR
    1.21 +
    1.22 +  nsInterfaceRequestorAgg(nsIInterfaceRequestor *aFirst,
    1.23 +                          nsIInterfaceRequestor *aSecond,
    1.24 +                          nsIEventTarget *aConsumerTarget = nullptr)
    1.25 +    : mFirst(aFirst)
    1.26 +    , mSecond(aSecond)
    1.27 +    , mConsumerTarget(aConsumerTarget)
    1.28 +  {
    1.29 +    if (!mConsumerTarget) {
    1.30 +      mConsumerTarget = NS_GetCurrentThread();
    1.31 +    }
    1.32 +  }
    1.33 +  ~nsInterfaceRequestorAgg();
    1.34 +
    1.35 +private:
    1.36 +  nsCOMPtr<nsIInterfaceRequestor> mFirst, mSecond;
    1.37 +  nsCOMPtr<nsIEventTarget> mConsumerTarget;
    1.38 +};
    1.39 +
    1.40 +NS_IMPL_ISUPPORTS(nsInterfaceRequestorAgg, nsIInterfaceRequestor)
    1.41 +
    1.42 +NS_IMETHODIMP
    1.43 +nsInterfaceRequestorAgg::GetInterface(const nsIID &aIID, void **aResult)
    1.44 +{
    1.45 +  nsresult rv = NS_ERROR_NO_INTERFACE;
    1.46 +  if (mFirst)
    1.47 +    rv = mFirst->GetInterface(aIID, aResult);
    1.48 +  if (mSecond && NS_FAILED(rv))
    1.49 +    rv = mSecond->GetInterface(aIID, aResult);
    1.50 +  return rv;
    1.51 +}
    1.52 +
    1.53 +nsInterfaceRequestorAgg::~nsInterfaceRequestorAgg()
    1.54 +{
    1.55 +  nsIInterfaceRequestor* iir = nullptr;
    1.56 +  mFirst.swap(iir);
    1.57 +  if (iir) {
    1.58 +    NS_ProxyRelease(mConsumerTarget, iir);
    1.59 +  }
    1.60 +  iir = nullptr;
    1.61 +  mSecond.swap(iir);
    1.62 +  if (iir) {
    1.63 +    NS_ProxyRelease(mConsumerTarget, iir);
    1.64 +  }
    1.65 +}
    1.66 +
    1.67 +nsresult
    1.68 +NS_NewInterfaceRequestorAggregation(nsIInterfaceRequestor *aFirst,
    1.69 +                                    nsIInterfaceRequestor *aSecond,
    1.70 +                                    nsIInterfaceRequestor **aResult)
    1.71 +{
    1.72 +  *aResult = new nsInterfaceRequestorAgg(aFirst, aSecond);
    1.73 +  if (!*aResult)
    1.74 +    return NS_ERROR_OUT_OF_MEMORY;
    1.75 +  NS_ADDREF(*aResult);
    1.76 +  return NS_OK;
    1.77 +}
    1.78 +
    1.79 +nsresult
    1.80 +NS_NewInterfaceRequestorAggregation(nsIInterfaceRequestor *aFirst,
    1.81 +                                    nsIInterfaceRequestor *aSecond,
    1.82 +                                    nsIEventTarget* aTarget,
    1.83 +                                    nsIInterfaceRequestor **aResult)
    1.84 +{
    1.85 +  *aResult = new nsInterfaceRequestorAgg(aFirst, aSecond, aTarget);
    1.86 +  if (!*aResult)
    1.87 +    return NS_ERROR_OUT_OF_MEMORY;
    1.88 +  NS_ADDREF(*aResult);
    1.89 +  return NS_OK;
    1.90 +}