Backed out changeset 00312b136937 (bug 968273) for causing regressions

2016-06-28 10:03:25 +02:00
parent 43714e27d4
commit f1e70b513b
18 changed files with 116 additions and 102 deletions
--- a/docshell/base/nsDocShellLoadInfo.cpp
+++ b/docshell/base/nsDocShellLoadInfo.cpp
@@ -12,7 +12,8 @@
 #include "mozilla/net/ReferrerPolicy.h"

 nsDocShellLoadInfo::nsDocShellLoadInfo()
-  : mInheritOwner(false)
+  : mLoadReplace(false)
+  , mInheritOwner(false)
  , mOwnerIsExplicit(false)
  , mSendReferrer(true)
  , mReferrerPolicy(mozilla::net::RP_Default)
@@ -67,6 +68,20 @@ nsDocShellLoadInfo::SetOriginalURI(nsIURI* aOriginalURI)
  return NS_OK;
 }

+NS_IMETHODIMP
+nsDocShellLoadInfo::GetLoadReplace(bool* aLoadReplace)
+{
+  *aLoadReplace = mLoadReplace;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShellLoadInfo::SetLoadReplace(bool aLoadReplace)
+{
+  mLoadReplace = aLoadReplace;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsDocShellLoadInfo::GetOwner(nsISupports** aOwner)
 {