Bug 1425458 - Resource timing entries Workers - part 9 - Fixing a compilation issue, r=me CLOSED TREE

This commit is contained in:
Andrea Marchesini
2018-01-24 18:19:12 +01:00
parent 80b493fef0
commit 1c39f5bdcd
4 changed files with 27 additions and 11 deletions

View File

@@ -285,9 +285,14 @@ void
PerformanceMainThread::EnsureDocEntry()
{
if (!mDocEntry && nsContentUtils::IsPerformanceNavigationTimingEnabled()) {
nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(mChannel);
UniquePtr<PerformanceTimingData> timing(
new PerformanceTimingData(mChannel, nullptr, 0));
nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(mChannel);
if (httpChannel) {
timing->SetPropertiesFromHttpChannel(httpChannel);
}
mDocEntry = new PerformanceNavigationTiming(Move(timing), this);
}
}

View File

@@ -37,7 +37,7 @@ public:
void AddEntryOnWorker(UniquePtr<PerformanceProxyData>&& aData);
private:
PerformanceStorageWorker(workers::WorkerPrivate* aWorkerPrivate);
explicit PerformanceStorageWorker(workers::WorkerPrivate* aWorkerPrivate);
~PerformanceStorageWorker();
Mutex mMutex;

View File

@@ -207,16 +207,24 @@ PerformanceTimingData::PerformanceTimingData(nsITimedChannel* aChannel,
aChannel->GetAllRedirectsPassTimingAllowCheck(&redirectsPassCheck);
mReportCrossOriginRedirect = mTimingAllowed && redirectsPassCheck;
nsAutoCString protocol;
Unused << aHttpChannel->GetProtocolVersion(protocol);
mNextHopProtocol = NS_ConvertUTF8toUTF16(protocol);
SetPropertiesFromHttpChannel(aHttpChannel);
}
}
Unused << aHttpChannel->GetEncodedBodySize(&mEncodedBodySize);
Unused << aHttpChannel->GetTransferSize(&mTransferSize);
Unused << aHttpChannel->GetDecodedBodySize(&mDecodedBodySize);
if (mDecodedBodySize == 0) {
mDecodedBodySize = mEncodedBodySize;
}
void
PerformanceTimingData::SetPropertiesFromHttpChannel(nsIHttpChannel* aHttpChannel)
{
MOZ_ASSERT(aHttpChannel);
nsAutoCString protocol;
Unused << aHttpChannel->GetProtocolVersion(protocol);
mNextHopProtocol = NS_ConvertUTF8toUTF16(protocol);
Unused << aHttpChannel->GetEncodedBodySize(&mEncodedBodySize);
Unused << aHttpChannel->GetTransferSize(&mTransferSize);
Unused << aHttpChannel->GetDecodedBodySize(&mDecodedBodySize);
if (mDecodedBodySize == 0) {
mDecodedBodySize = mEncodedBodySize;
}
}

View File

@@ -39,6 +39,9 @@ public:
nsIHttpChannel* aHttpChannel,
DOMHighResTimeStamp aZeroTime);
void
SetPropertiesFromHttpChannel(nsIHttpChannel* aHttpChannel);
bool IsInitialized() const
{
return mInitialized;