wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1222352 - Resource Timing - nextHopProtocol does not work in e10s r=nwgh

Browse Source
This commit is contained in:
Valentin Gosu 2015-11-24 13:42:47 +01:00
parent 8278de119c
commit d7b0eedf84
5 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netwerk/ipc/NeckoMessageUtils.h
View File

@ -152,6 +152,7 @@ struct ParamTraits<mozilla::net::ResourceTimingStruct>
WriteParam(aMsg, aParam.transferSize); WriteParam(aMsg, aParam.transferSize);
WriteParam(aMsg, aParam.encodedBodySize); WriteParam(aMsg, aParam.encodedBodySize);
WriteParam(aMsg, aParam.protocolVersion);
} }
static bool Read(const Message* aMsg, void** aIter, mozilla::net::ResourceTimingStruct* aResult) static bool Read(const Message* aMsg, void** aIter, mozilla::net::ResourceTimingStruct* aResult)
@ -167,7 +168,8 @@ struct ParamTraits<mozilla::net::ResourceTimingStruct>
ReadParam(aMsg, aIter, &aResult->redirectStart) && ReadParam(aMsg, aIter, &aResult->redirectStart) &&
ReadParam(aMsg, aIter, &aResult->redirectEnd) && ReadParam(aMsg, aIter, &aResult->redirectEnd) &&
ReadParam(aMsg, aIter, &aResult->transferSize) && ReadParam(aMsg, aIter, &aResult->transferSize) &&
ReadParam(aMsg, aIter, &aResult->encodedBodySize); ReadParam(aMsg, aIter, &aResult->encodedBodySize) &&
ReadParam(aMsg, aIter, &aResult->protocolVersion);
} }
}; };

8
netwerk/protocol/http/HttpChannelChild.cpp
View File

@ -860,6 +860,7 @@ HttpChannelChild::OnStopRequest(const nsresult& channelStatus,
mRedirectEndTimeStamp = timing.redirectEnd; mRedirectEndTimeStamp = timing.redirectEnd;
mTransferSize = timing.transferSize; mTransferSize = timing.transferSize;
mEncodedBodySize = timing.encodedBodySize; mEncodedBodySize = timing.encodedBodySize;
mProtocolVersion = timing.protocolVersion;
nsPerformance* documentPerformance = GetPerformance(); nsPerformance* documentPerformance = GetPerformance();
if (documentPerformance) { if (documentPerformance) {
@ -1988,6 +1989,13 @@ HttpChannelChild::RedirectTo(nsIURI *newURI)
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
NS_IMETHODIMP
HttpChannelChild::GetProtocolVersion(nsACString& aProtocolVersion)
{
aProtocolVersion = mProtocolVersion;
return NS_OK;
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// HttpChannelChild::nsIHttpChannelInternal // HttpChannelChild::nsIHttpChannelInternal
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

3
netwerk/protocol/http/HttpChannelChild.h
View File

@ -83,6 +83,7 @@ public:
bool aMerge) override; bool aMerge) override;
NS_IMETHOD SetEmptyRequestHeader(const nsACString& aHeader) override; NS_IMETHOD SetEmptyRequestHeader(const nsACString& aHeader) override;
NS_IMETHOD RedirectTo(nsIURI *newURI) override; NS_IMETHOD RedirectTo(nsIURI *newURI) override;
NS_IMETHOD GetProtocolVersion(nsACString& aProtocolVersion) override;
// nsIHttpChannelInternal // nsIHttpChannelInternal
NS_IMETHOD SetupFallbackChannel(const char *aFallbackKey) override; NS_IMETHOD SetupFallbackChannel(const char *aFallbackKey) override;
NS_IMETHOD GetLocalAddress(nsACString& addr) override; NS_IMETHOD GetLocalAddress(nsACString& addr) override;
@ -194,6 +195,8 @@ private:
nsCString mCachedCharset; nsCString mCachedCharset;
nsCOMPtr<nsISupports> mCacheKey; nsCOMPtr<nsISupports> mCacheKey;
nsCString mProtocolVersion;
// If ResumeAt is called before AsyncOpen, we need to send extra data upstream // If ResumeAt is called before AsyncOpen, we need to send extra data upstream
bool mSendResumeAt; bool mSendResumeAt;

1
netwerk/protocol/http/HttpChannelParent.cpp
View File

@ -1178,6 +1178,7 @@ HttpChannelParent::OnStopRequest(nsIRequest *aRequest,
mChannel->GetEncodedBodySize(&timing.encodedBodySize); mChannel->GetEncodedBodySize(&timing.encodedBodySize);
// decodedBodySize can be computed in the child process so it doesn't need // decodedBodySize can be computed in the child process so it doesn't need
// to be passed down. // to be passed down.
mChannel->GetProtocolVersion(timing.protocolVersion);
if (mIPCClosed || !SendOnStopRequest(aStatusCode, timing)) if (mIPCClosed || !SendOnStopRequest(aStatusCode, timing))
return NS_ERROR_UNEXPECTED; return NS_ERROR_UNEXPECTED;

1
netwerk/protocol/http/TimingStruct.h
View File

@ -26,6 +26,7 @@ struct ResourceTimingStruct : TimingStruct {
TimeStamp redirectEnd; TimeStamp redirectEnd;
uint64_t transferSize; uint64_t transferSize;
uint64_t encodedBodySize; uint64_t encodedBodySize;
nsCString protocolVersion;
}; };
} // namespace net } // namespace net