Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1672873 - Use BuildClonedMessageDataForChild to send cloneable data in SessionHistoryInfo. r=peterv

Browse Source 
The serialization method for SessionHistoryInfo uses some low-level
functions to pack up some of the clone data, but this method
actually has a PContent actor available, so it can use one of the
nicer BuildClonedMessageDataFor methods to send this, which
should improve support for pushMessage with blobs.

The read method already uses the StealFromClonedMessageDataFor
methods so no changes are required there.

Differential Revision: https://phabricator.services.mozilla.com/D104775
This commit is contained in:
Andrew McCreight 2021-02-15 16:52:26 +00:00
parent 7a2918e8f1
commit e468f5e83a
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docshell/base/crashtests/1672873.html Normal file
View File

@ -0,0 +1,6 @@
<script>
document.addEventListener('DOMContentLoaded', () => {
var x = new Blob([undefined, ''], { })
self.history.pushState(x, 'x', 'missing.file')
})
</script>

1
docshell/base/crashtests/crashtests.list
View File

@ -19,3 +19,4 @@ load 1584467.html
load 1614211-1.html
load 1617315-1.html
skip-if(Android) pref(dom.disable_open_during_load,false) load 1667491.html
load 1672873.html

25
docshell/shistory/SessionHistoryEntry.cpp
View File

@ -15,6 +15,8 @@
#include "nsXULAppAPI.h"
#include "mozilla/PresState.h"
#include "mozilla/Tuple.h"
#include "mozilla/dom/ContentChild.h"
#include "mozilla/dom/ContentParent.h"
#include "mozilla/dom/CSPMessageUtils.h"
#include "mozilla/dom/DOMTypes.h"
#include "mozilla/dom/nsCSPContext.h"
@ -1353,16 +1355,21 @@ void IPDLParamTraits<dom::SessionHistoryInfo>::Write(
NS_ENSURE_SUCCESS_VOID(aParam.mStateData->GetFormatVersion(&version));
Get<0>(*stateData) = version;
JSStructuredCloneData& data = aParam.mStateData->Data();
auto iter = data.Start();
bool success;
Get<1>(*stateData).data().data = data.Borrow(iter, data.Size(), &success);
if (NS_WARN_IF(!success)) {
return;
IToplevelProtocol* topLevel = aActor->ToplevelProtocol();
MOZ_RELEASE_ASSERT(topLevel->GetProtocolId() == PContentMsgStart);
if (topLevel->GetSide() == ChildSide) {
auto* contentChild = static_cast<dom::ContentChild*>(topLevel);
if (NS_WARN_IF(!aParam.mStateData->BuildClonedMessageDataForChild(
contentChild, Get<1>(*stateData)))) {
return;
}
} else {
auto* contentParent = static_cast<dom::ContentParent*>(topLevel);
if (NS_WARN_IF(!aParam.mStateData->BuildClonedMessageDataForParent(
contentParent, Get<1>(*stateData)))) {
return;
}
}
MOZ_ASSERT(aParam.mStateData->PortIdentifiers().IsEmpty() &&
aParam.mStateData->BlobImpls().IsEmpty() &&
aParam.mStateData->InputStreams().IsEmpty());
}
WriteIPDLParam(aMsg, aActor, aParam.mURI);