summaryrefslogtreecommitdiffstats
path: root/netwerk/base
diff options
context:
space:
mode:
authorNew Tobin Paradigm <email@mattatobin.com>2018-05-14 18:29:41 -0400
committerGitHub <noreply@github.com>2018-05-14 18:29:41 -0400
commit626419cbe2a789760d45dc87fcff1a7ad221d04d (patch)
treed3ff630ec350e3b589e749f7fc83b18151c8affa /netwerk/base
parent4b4b4a59cac398083e4ee224a1b90c98c26c1dfa (diff)
parent1c9d6206cb04027614d6857786d1d82767664b45 (diff)
downloadUXP-626419cbe2a789760d45dc87fcff1a7ad221d04d.tar
UXP-626419cbe2a789760d45dc87fcff1a7ad221d04d.tar.gz
UXP-626419cbe2a789760d45dc87fcff1a7ad221d04d.tar.lz
UXP-626419cbe2a789760d45dc87fcff1a7ad221d04d.tar.xz
UXP-626419cbe2a789760d45dc87fcff1a7ad221d04d.zip
Merge pull request #356 from JustOff/PR_ssuao_revert_1148544
Revert incorrect UAO optimization that broke SSUAO
Diffstat (limited to 'netwerk/base')
-rw-r--r--netwerk/base/nsILoadGroup.idl6
-rw-r--r--netwerk/base/nsLoadGroup.cpp14
-rw-r--r--netwerk/base/nsLoadGroup.h2
3 files changed, 0 insertions, 22 deletions
diff --git a/netwerk/base/nsILoadGroup.idl b/netwerk/base/nsILoadGroup.idl
index 4f89bd0e3..d0cad5ece 100644
--- a/netwerk/base/nsILoadGroup.idl
+++ b/netwerk/base/nsILoadGroup.idl
@@ -95,10 +95,4 @@ interface nsILoadGroup : nsIRequest
* the docShell has created the default request.)
*/
attribute nsLoadFlags defaultLoadFlags;
-
- /**
- * The cached user agent override created by UserAgentOverrides.jsm. Used
- * for all sub-resource requests in the loadgroup.
- */
- attribute ACString userAgentOverrideCache;
};
diff --git a/netwerk/base/nsLoadGroup.cpp b/netwerk/base/nsLoadGroup.cpp
index 7b75f7942..51d5a9ca7 100644
--- a/netwerk/base/nsLoadGroup.cpp
+++ b/netwerk/base/nsLoadGroup.cpp
@@ -809,20 +809,6 @@ nsLoadGroup::SetDefaultLoadFlags(uint32_t aFlags)
return NS_OK;
}
-NS_IMETHODIMP
-nsLoadGroup::GetUserAgentOverrideCache(nsACString & aUserAgentOverrideCache)
-{
- aUserAgentOverrideCache = mUserAgentOverrideCache;
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoadGroup::SetUserAgentOverrideCache(const nsACString & aUserAgentOverrideCache)
-{
- mUserAgentOverrideCache = aUserAgentOverrideCache;
- return NS_OK;
-}
-
////////////////////////////////////////////////////////////////////////////////
diff --git a/netwerk/base/nsLoadGroup.h b/netwerk/base/nsLoadGroup.h
index da89ca1b3..20dd94cf9 100644
--- a/netwerk/base/nsLoadGroup.h
+++ b/netwerk/base/nsLoadGroup.h
@@ -95,8 +95,6 @@ protected:
/* For nsPILoadGroupInternal */
uint32_t mTimedNonCachedRequestsUntilOnEndPageLoad;
-
- nsCString mUserAgentOverrideCache;
};
} // namespace net