Bug 1129795 - Convert docshell/base/ to Gecko style. r=mccr8,smaug

2015-02-13 21:36:37 +02:00
parent 25b867caa0
commit 9a04e80e2c
31 changed files with 12267 additions and 12168 deletions
--- a/docshell/base/nsDocShellLoadInfo.cpp
+++ b/docshell/base/nsDocShellLoadInfo.cpp
@@ -17,12 +17,12 @@
 //*****************************************************************************

 nsDocShellLoadInfo::nsDocShellLoadInfo()
-  : mInheritOwner(false),
-    mOwnerIsExplicit(false),
-    mSendReferrer(true),
-    mReferrerPolicy(mozilla::net::RP_Default),
-    mLoadType(nsIDocShellLoadInfo::loadNormal),
-    mIsSrcdocLoad(false)
+  : mInheritOwner(false)
+  , mOwnerIsExplicit(false)
+  , mSendReferrer(true)
+  , mReferrerPolicy(mozilla::net::RP_Default)
+  , mLoadType(nsIDocShellLoadInfo::loadNormal)
+  , mIsSrcdocLoad(false)
 {
 }

@@ -32,123 +32,136 @@ nsDocShellLoadInfo::~nsDocShellLoadInfo()

 //*****************************************************************************
 // nsDocShellLoadInfo::nsISupports
-//*****************************************************************************   
+//*****************************************************************************

 NS_IMPL_ADDREF(nsDocShellLoadInfo)
 NS_IMPL_RELEASE(nsDocShellLoadInfo)

 NS_INTERFACE_MAP_BEGIN(nsDocShellLoadInfo)
-   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDocShellLoadInfo)
-   NS_INTERFACE_MAP_ENTRY(nsIDocShellLoadInfo)
-NS_INTERFACE_MAP_END     
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDocShellLoadInfo)
+  NS_INTERFACE_MAP_ENTRY(nsIDocShellLoadInfo)
+NS_INTERFACE_MAP_END

 //*****************************************************************************
 // nsDocShellLoadInfo::nsIDocShellLoadInfo
-//*****************************************************************************   
-
-NS_IMETHODIMP nsDocShellLoadInfo::GetReferrer(nsIURI** aReferrer)
-{
-   NS_ENSURE_ARG_POINTER(aReferrer);
-
-   *aReferrer = mReferrer;
-   NS_IF_ADDREF(*aReferrer);
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsDocShellLoadInfo::SetReferrer(nsIURI* aReferrer)
-{
-   mReferrer = aReferrer;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsDocShellLoadInfo::GetOwner(nsISupports** aOwner)
-{
-   NS_ENSURE_ARG_POINTER(aOwner);
-
-   *aOwner = mOwner;
-   NS_IF_ADDREF(*aOwner);
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsDocShellLoadInfo::SetOwner(nsISupports* aOwner)
-{
-   mOwner = aOwner;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsDocShellLoadInfo::GetInheritOwner(bool* aInheritOwner)
-{
-   NS_ENSURE_ARG_POINTER(aInheritOwner);
-
-   *aInheritOwner = mInheritOwner;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsDocShellLoadInfo::SetInheritOwner(bool aInheritOwner)
-{
-   mInheritOwner = aInheritOwner;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsDocShellLoadInfo::GetOwnerIsExplicit(bool* aOwnerIsExplicit)
-{
-   *aOwnerIsExplicit = mOwnerIsExplicit;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsDocShellLoadInfo::SetOwnerIsExplicit(bool aOwnerIsExplicit)
-{
-   mOwnerIsExplicit = aOwnerIsExplicit;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsDocShellLoadInfo::GetLoadType(nsDocShellInfoLoadType * aLoadType)
-{
-   NS_ENSURE_ARG_POINTER(aLoadType);
-
-   *aLoadType = mLoadType;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsDocShellLoadInfo::SetLoadType(nsDocShellInfoLoadType aLoadType)
-{
-   mLoadType = aLoadType;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsDocShellLoadInfo::GetSHEntry(nsISHEntry** aSHEntry)
-{
-   NS_ENSURE_ARG_POINTER(aSHEntry);
-
-   *aSHEntry = mSHEntry;
-   NS_IF_ADDREF(*aSHEntry);
-   return NS_OK;
-}
- 
-NS_IMETHODIMP nsDocShellLoadInfo::SetSHEntry(nsISHEntry* aSHEntry)
-{
-   mSHEntry = aSHEntry;
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsDocShellLoadInfo::GetTarget(char16_t** aTarget)
-{
-   NS_ENSURE_ARG_POINTER(aTarget);
-
-   *aTarget = ToNewUnicode(mTarget);
-
-   return NS_OK;
-}
-
-NS_IMETHODIMP nsDocShellLoadInfo::SetTarget(const char16_t* aTarget)
-{
-   mTarget.Assign(aTarget);
-   return NS_OK;
-}
-
+//*****************************************************************************

 NS_IMETHODIMP
-nsDocShellLoadInfo::GetPostDataStream(nsIInputStream **aResult)
+nsDocShellLoadInfo::GetReferrer(nsIURI** aReferrer)
+{
+  NS_ENSURE_ARG_POINTER(aReferrer);
+
+  *aReferrer = mReferrer;
+  NS_IF_ADDREF(*aReferrer);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::SetReferrer(nsIURI* aReferrer)
+{
+  mReferrer = aReferrer;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::GetOwner(nsISupports** aOwner)
+{
+  NS_ENSURE_ARG_POINTER(aOwner);
+
+  *aOwner = mOwner;
+  NS_IF_ADDREF(*aOwner);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::SetOwner(nsISupports* aOwner)
+{
+  mOwner = aOwner;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::GetInheritOwner(bool* aInheritOwner)
+{
+  NS_ENSURE_ARG_POINTER(aInheritOwner);
+
+  *aInheritOwner = mInheritOwner;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::SetInheritOwner(bool aInheritOwner)
+{
+  mInheritOwner = aInheritOwner;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::GetOwnerIsExplicit(bool* aOwnerIsExplicit)
+{
+  *aOwnerIsExplicit = mOwnerIsExplicit;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::SetOwnerIsExplicit(bool aOwnerIsExplicit)
+{
+  mOwnerIsExplicit = aOwnerIsExplicit;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::GetLoadType(nsDocShellInfoLoadType* aLoadType)
+{
+  NS_ENSURE_ARG_POINTER(aLoadType);
+
+  *aLoadType = mLoadType;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::SetLoadType(nsDocShellInfoLoadType aLoadType)
+{
+  mLoadType = aLoadType;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::GetSHEntry(nsISHEntry** aSHEntry)
+{
+  NS_ENSURE_ARG_POINTER(aSHEntry);
+
+  *aSHEntry = mSHEntry;
+  NS_IF_ADDREF(*aSHEntry);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::SetSHEntry(nsISHEntry* aSHEntry)
+{
+  mSHEntry = aSHEntry;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::GetTarget(char16_t** aTarget)
+{
+  NS_ENSURE_ARG_POINTER(aTarget);
+
+  *aTarget = ToNewUnicode(mTarget);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::SetTarget(const char16_t* aTarget)
+{
+  mTarget.Assign(aTarget);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::GetPostDataStream(nsIInputStream** aResult)
 {
  NS_ENSURE_ARG_POINTER(aResult);

@@ -158,106 +171,112 @@ nsDocShellLoadInfo::GetPostDataStream(nsIInputStream **aResult)
  return NS_OK;
 }

-
 NS_IMETHODIMP
-nsDocShellLoadInfo::SetPostDataStream(nsIInputStream *aStream)
+nsDocShellLoadInfo::SetPostDataStream(nsIInputStream* aStream)
 {
  mPostDataStream = aStream;
  return NS_OK;
 }

 /* attribute nsIInputStream headersStream; */
-NS_IMETHODIMP nsDocShellLoadInfo::GetHeadersStream(nsIInputStream * *aHeadersStream)
+NS_IMETHODIMP
+nsDocShellLoadInfo::GetHeadersStream(nsIInputStream** aHeadersStream)
 {
  NS_ENSURE_ARG_POINTER(aHeadersStream);
  *aHeadersStream = mHeadersStream;
  NS_IF_ADDREF(*aHeadersStream);
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::SetHeadersStream(nsIInputStream * aHeadersStream)
+NS_IMETHODIMP
+nsDocShellLoadInfo::SetHeadersStream(nsIInputStream* aHeadersStream)
 {
  mHeadersStream = aHeadersStream;
  return NS_OK;
 }

-NS_IMETHODIMP nsDocShellLoadInfo::GetSendReferrer(bool* aSendReferrer)
+NS_IMETHODIMP
+nsDocShellLoadInfo::GetSendReferrer(bool* aSendReferrer)
 {
-   NS_ENSURE_ARG_POINTER(aSendReferrer);
+  NS_ENSURE_ARG_POINTER(aSendReferrer);

-   *aSendReferrer = mSendReferrer;
-   return NS_OK;
+  *aSendReferrer = mSendReferrer;
+  return NS_OK;
 }

-NS_IMETHODIMP nsDocShellLoadInfo::SetSendReferrer(bool aSendReferrer)
+NS_IMETHODIMP
+nsDocShellLoadInfo::SetSendReferrer(bool aSendReferrer)
 {
-   mSendReferrer = aSendReferrer;
-   return NS_OK;
+  mSendReferrer = aSendReferrer;
+  return NS_OK;
 }

-NS_IMETHODIMP nsDocShellLoadInfo::GetReferrerPolicy(nsDocShellInfoReferrerPolicy* aReferrerPolicy)
+NS_IMETHODIMP
+nsDocShellLoadInfo::GetReferrerPolicy(
+    nsDocShellInfoReferrerPolicy* aReferrerPolicy)
 {
-   *aReferrerPolicy = mReferrerPolicy;
-   return NS_OK;
+  *aReferrerPolicy = mReferrerPolicy;
+  return NS_OK;
 }

-NS_IMETHODIMP nsDocShellLoadInfo::SetReferrerPolicy(nsDocShellInfoReferrerPolicy aReferrerPolicy)
+NS_IMETHODIMP
+nsDocShellLoadInfo::SetReferrerPolicy(
+    nsDocShellInfoReferrerPolicy aReferrerPolicy)
 {
-    mReferrerPolicy = aReferrerPolicy;
-    return NS_OK;
+  mReferrerPolicy = aReferrerPolicy;
+  return NS_OK;
 }

-NS_IMETHODIMP nsDocShellLoadInfo::GetIsSrcdocLoad(bool* aIsSrcdocLoad)
+NS_IMETHODIMP
+nsDocShellLoadInfo::GetIsSrcdocLoad(bool* aIsSrcdocLoad)
 {
-   *aIsSrcdocLoad = mIsSrcdocLoad;
-   return NS_OK;
+  *aIsSrcdocLoad = mIsSrcdocLoad;
+  return NS_OK;
 }

-NS_IMETHODIMP nsDocShellLoadInfo::GetSrcdocData(nsAString &aSrcdocData)
+NS_IMETHODIMP
+nsDocShellLoadInfo::GetSrcdocData(nsAString& aSrcdocData)
 {
-   aSrcdocData = mSrcdocData;
-   return NS_OK;
+  aSrcdocData = mSrcdocData;
+  return NS_OK;
 }

-NS_IMETHODIMP nsDocShellLoadInfo::SetSrcdocData(const nsAString &aSrcdocData)
+NS_IMETHODIMP
+nsDocShellLoadInfo::SetSrcdocData(const nsAString& aSrcdocData)
 {
-   mSrcdocData = aSrcdocData;
-   mIsSrcdocLoad = true;
-   return NS_OK;
+  mSrcdocData = aSrcdocData;
+  mIsSrcdocLoad = true;
+  return NS_OK;
 }

-NS_IMETHODIMP nsDocShellLoadInfo::GetSourceDocShell(nsIDocShell** aSourceDocShell)
+NS_IMETHODIMP
+nsDocShellLoadInfo::GetSourceDocShell(nsIDocShell** aSourceDocShell)
 {
-   MOZ_ASSERT(aSourceDocShell);
-   nsCOMPtr<nsIDocShell> result = mSourceDocShell;
-   result.forget(aSourceDocShell);
-   return NS_OK;
+  MOZ_ASSERT(aSourceDocShell);
+  nsCOMPtr<nsIDocShell> result = mSourceDocShell;
+  result.forget(aSourceDocShell);
+  return NS_OK;
 }

-NS_IMETHODIMP nsDocShellLoadInfo::SetSourceDocShell(nsIDocShell* aSourceDocShell)
+NS_IMETHODIMP
+nsDocShellLoadInfo::SetSourceDocShell(nsIDocShell* aSourceDocShell)
 {
-   mSourceDocShell = aSourceDocShell;
-   return NS_OK;
+  mSourceDocShell = aSourceDocShell;
+  return NS_OK;
 }

-NS_IMETHODIMP nsDocShellLoadInfo::GetBaseURI(nsIURI** aBaseURI)
+NS_IMETHODIMP
+nsDocShellLoadInfo::GetBaseURI(nsIURI** aBaseURI)
 {
-   NS_ENSURE_ARG_POINTER(aBaseURI);
+  NS_ENSURE_ARG_POINTER(aBaseURI);

-   *aBaseURI = mBaseURI;
-   NS_IF_ADDREF(*aBaseURI);
-   return NS_OK;
+  *aBaseURI = mBaseURI;
+  NS_IF_ADDREF(*aBaseURI);
+  return NS_OK;
 }

-NS_IMETHODIMP nsDocShellLoadInfo::SetBaseURI(nsIURI* aBaseURI)
+NS_IMETHODIMP
+nsDocShellLoadInfo::SetBaseURI(nsIURI* aBaseURI)
 {
-   mBaseURI = aBaseURI;
-   return NS_OK;
+  mBaseURI = aBaseURI;
+  return NS_OK;
 }
-
-//*****************************************************************************
-// nsDocShellLoadInfo: Helpers
-//*****************************************************************************   
-
-//*****************************************************************************
-// nsDocShellLoadInfo: Accessors
-//*****************************************************************************