corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1748874 - Part 3: Mark the decl of SessionStoreRestoreData::RestoreInto as CAN_RUN_SCRIPT r=masayuki

Browse Source 
Depends on D135402

Differential Revision: https://phabricator.services.mozilla.com/D135403
This commit is contained in:
Kagami Sascha Rosylight
2022-01-11 11:52:27 +00:00
parent a5b54c623d
commit 547ef40ad3
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docshell/base/CanonicalBrowsingContext.h
View File

@@ -287,7 +287,8 @@ class CanonicalBrowsingContext final : public BrowsingContext {
void SetRestoreData(SessionStoreRestoreData* aData, ErrorResult& aError); void SetRestoreData(SessionStoreRestoreData* aData, ErrorResult& aError);
void ClearRestoreState(); void ClearRestoreState();
void RequestRestoreTabContent(WindowGlobalParent* aWindow); MOZ_CAN_RUN_SCRIPT_BOUNDARY void RequestRestoreTabContent(
WindowGlobalParent* aWindow);
already_AddRefed<Promise> GetRestorePromise(); already_AddRefed<Promise> GetRestorePromise();
nsresult WriteSessionStorageToSessionStore( nsresult WriteSessionStorageToSessionStore(

3
dom/ipc/WindowGlobalChild.h
View File

@@ -187,7 +187,8 @@ class WindowGlobalChild final : public WindowGlobalActor,
const dom::sessionstore::DocShellRestoreState& aState, const dom::sessionstore::DocShellRestoreState& aState,
RestoreDocShellStateResolver&& aResolve); RestoreDocShellStateResolver&& aResolve);
mozilla::ipc::IPCResult RecvRestoreTabContent( // TODO: Use MOZ_CAN_RUN_SCRIPT when it gains IPDL support (bug 1539864)
MOZ_CAN_RUN_SCRIPT_BOUNDARY mozilla::ipc::IPCResult RecvRestoreTabContent(
dom::SessionStoreRestoreData* aData, dom::SessionStoreRestoreData* aData,
RestoreTabContentResolver&& aResolve); RestoreTabContentResolver&& aResolve);

1
toolkit/components/sessionstore/SessionStoreRestoreData.cpp
View File

@@ -52,7 +52,6 @@ bool SessionStoreRestoreData::CanRestoreInto(nsIURI* aDocumentURI) {
equalsExceptRef); equalsExceptRef);
} }
MOZ_CAN_RUN_SCRIPT
bool SessionStoreRestoreData::RestoreInto(RefPtr<BrowsingContext> aContext) { bool SessionStoreRestoreData::RestoreInto(RefPtr<BrowsingContext> aContext) {
if (!aContext->IsInProcess()) { if (!aContext->IsInProcess()) {
return false; return false;

2
toolkit/components/sessionstore/SessionStoreRestoreData.h
View File

@@ -28,7 +28,7 @@ class SessionStoreRestoreData final : public nsISessionStoreRestoreData {
bool IsEmpty(); bool IsEmpty();
SessionStoreRestoreData* FindDataForChild(BrowsingContext* aContext); SessionStoreRestoreData* FindDataForChild(BrowsingContext* aContext);
bool CanRestoreInto(nsIURI* aDocumentURI); bool CanRestoreInto(nsIURI* aDocumentURI);
bool RestoreInto(RefPtr<BrowsingContext> aContext); MOZ_CAN_RUN_SCRIPT bool RestoreInto(RefPtr<BrowsingContext> aContext);
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSISESSIONSTORERESTOREDATA NS_DECL_NSISESSIONSTORERESTOREDATA