summaryrefslogtreecommitdiffstats
path: root/netwerk/protocol/http/nsHttpChannel.h
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-07-21 21:30:26 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-07-21 21:31:04 +0200
commit91de3341df7e08094e17a34053b8e21c89ab02a7 (patch)
treefafc6b9475618a2055e627d0f5a68593ee11eb4f /netwerk/protocol/http/nsHttpChannel.h
parent1dbed95e4c43fdbcc2d959ddb06ebe6331afb9d8 (diff)
downloadUXP-91de3341df7e08094e17a34053b8e21c89ab02a7.tar
UXP-91de3341df7e08094e17a34053b8e21c89ab02a7.tar.gz
UXP-91de3341df7e08094e17a34053b8e21c89ab02a7.tar.lz
UXP-91de3341df7e08094e17a34053b8e21c89ab02a7.tar.xz
UXP-91de3341df7e08094e17a34053b8e21c89ab02a7.zip
Revert "Implement a threadsafe & revised version of http2PushedStream."
Backed out because of gcc build failures. This reverts commit 66fae1d81013a2321e7d607a426f834a01b847ce.
Diffstat (limited to 'netwerk/protocol/http/nsHttpChannel.h')
-rw-r--r--netwerk/protocol/http/nsHttpChannel.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
index defd710c3..0038e1f71 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -126,7 +126,7 @@ public:
const nsID& aChannelId,
nsContentPolicyType aContentPolicyType) override;
- nsresult OnPush(const nsACString &uri, Http2PushedStreamWrapper *pushedStream);
+ nsresult OnPush(const nsACString &uri, Http2PushedStream *pushedStream);
static bool IsRedirectStatus(uint32_t status);
@@ -448,7 +448,7 @@ private:
nsresult OpenCacheInputStream(nsICacheEntry* cacheEntry, bool startBuffering,
bool checkingAppCacheEntry);
- void SetPushedStream(Http2PushedStreamWrapper *stream);
+ void SetPushedStream(Http2PushedStream *stream);
void SetDoNotTrack();
@@ -578,10 +578,9 @@ private:
nsTArray<nsContinueRedirectionFunc> mRedirectFuncStack;
// Needed for accurate DNS timing
- RefPtr<nsDNSPrefetch> mDNSPrefetch;
+ RefPtr<nsDNSPrefetch> mDNSPrefetch;
- RefPtr<Http2PushedStreamWrapper> mPushedStream;
-
+ Http2PushedStream *mPushedStream;
// True if the channel's principal was found on a phishing, malware, or
// tracking (if tracking protection is enabled) blocklist
bool mLocalBlocklist;