Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-25 20:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1549973 - Force tabState flush from C++ listener before tab is closed r=peterv

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D30475

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Alphan Chen 2019-05-22 09:06:14 +00:00
parent aa3dd59877
commit 2dbd18c6c8
12 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
browser/base/content/browser.js
View File

@ -5318,16 +5318,13 @@ var XULBrowserWindow = {
this._sessionData.isPrivate = aIsPrivate;
},
updateSessionStore: function XWB_updateSessionStore(aBrowser, aFlushId) {
let tab = gBrowser.getTabForBrowser(aBrowser);
if (tab) {
SessionStore.updateSessionStoreFromTablistener(tab, {
data: this._sessionData,
flushID: aFlushId,
isFinal: false,
});
this._sessionData = {};
}
updateSessionStore: function XWB_updateSessionStore(aBrowser, aFlushId, aIsFinal) {
SessionStore.updateSessionStoreFromTablistener(aBrowser, {
data: this._sessionData,
flushID: aFlushId,
isFinal: aIsFinal,
});
this._sessionData = {};
},
};

17
browser/components/sessionstore/SessionStore.jsm
View File

@ -369,8 +369,8 @@ var SessionStore = {
return SessionStoreInternal.navigateAndRestore(tab, loadArguments, historyIndex);
},
updateSessionStoreFromTablistener(aTab, aData) {
return SessionStoreInternal.updateSessionStoreFromTablistener(aTab, aData);
updateSessionStoreFromTablistener(aBrowser, aData) {
return SessionStoreInternal.updateSessionStoreFromTablistener(aBrowser, aData);
},
getSessionHistory(tab, updatedCallback) {
@ -822,17 +822,20 @@ var SessionStoreInternal = {
}
},
updateSessionStoreFromTablistener(aTab, aData) {
let browser = aTab.linkedBrowser;
let win = browser.ownerGlobal;
TabState.update(browser, aData);
updateSessionStoreFromTablistener(aBrowser, aData) {
if (aBrowser.permanentKey == undefined) {
return;
}
TabState.update(aBrowser, aData);
let win = aBrowser.ownerGlobal;
this.saveStateDelayed(win);
if (aData.flushID) {
// This is an update kicked off by an async flush request. Notify the
// TabStateFlusher so that it can finish the request and notify its
// consumer that's waiting for the flush to be done.
TabStateFlusher.resolve(browser, aData.flushID);
TabStateFlusher.resolve(aBrowser, aData.flushID);
}
},

9
dom/base/nsFrameLoader.cpp
View File

@ -1788,6 +1788,9 @@ void nsFrameLoader::StartDestroy() {
}
mDestroyCalled = true;
// request a tabStateFlush before tab is closed
RequestTabStateFlush(/*flushId*/ 0, /*isFinal*/ true);
// After this point, we return an error when trying to send a message using
// the message manager on the frame.
if (mMessageManager) {
@ -3172,16 +3175,16 @@ void nsFrameLoader::RequestUpdatePosition(ErrorResult& aRv) {
}
}
bool nsFrameLoader::RequestTabStateFlush(uint32_t aFlushId) {
bool nsFrameLoader::RequestTabStateFlush(uint32_t aFlushId, bool aIsFinal) {
if (mSessionStoreListener) {
mSessionStoreListener->ForceFlushFromParent(aFlushId);
mSessionStoreListener->ForceFlushFromParent(aFlushId, aIsFinal);
// No async ipc call is involved in parent only case
return false;
}
// If remote browsing (e10s), handle this with the BrowserParent.
if (mBrowserParent) {
Unused << mBrowserParent->SendFlushTabState(aFlushId);
Unused << mBrowserParent->SendFlushTabState(aFlushId, aIsFinal);
return true;
}

2
dom/base/nsFrameLoader.h
View File

@ -195,7 +195,7 @@ class nsFrameLoader final : public nsStubMutationObserver,
void RequestUpdatePosition(mozilla::ErrorResult& aRv);
bool RequestTabStateFlush(uint32_t aFlushId);
bool RequestTabStateFlush(uint32_t aFlushId, bool aIsFinal = false);
void Print(uint64_t aOuterWindowID, nsIPrintSettings* aPrintSettings,
nsIWebProgressListener* aProgressListener,

8
dom/ipc/BrowserChild.cpp
View File

@ -1940,8 +1940,8 @@ mozilla::ipc::IPCResult BrowserChild::RecvNativeSynthesisResponse(
}
mozilla::ipc::IPCResult BrowserChild::RecvFlushTabState(
const uint32_t& aFlushId) {
UpdateSessionStore(aFlushId);
const uint32_t& aFlushId, const bool& aIsFinal) {
UpdateSessionStore(aFlushId, aIsFinal);
return IPC_OK();
}
@ -3626,7 +3626,7 @@ nsresult BrowserChild::PrepareProgressListenerData(
return NS_OK;
}
bool BrowserChild::UpdateSessionStore(uint32_t aFlushId) {
bool BrowserChild::UpdateSessionStore(uint32_t aFlushId, bool aIsFinal) {
if (!mSessionStoreListener) {
return false;
}
@ -3649,7 +3649,7 @@ bool BrowserChild::UpdateSessionStore(uint32_t aFlushId) {
}
Unused << SendSessionStoreUpdate(docShellCaps, privatedMode, positions,
positionDescendants, aFlushId);
positionDescendants, aFlushId, aIsFinal);
return true;
}

5
dom/ipc/BrowserChild.h
View File

@ -396,7 +396,8 @@ class BrowserChild final : public BrowserChildBase,
const WidgetTouchEvent& aEvent, const ScrollableLayerGuid& aGuid,
const uint64_t& aInputBlockId, const nsEventStatus& aApzResponse);
mozilla::ipc::IPCResult RecvFlushTabState(const uint32_t& aFlushId);
mozilla::ipc::IPCResult RecvFlushTabState(const uint32_t& aFlushId,
const bool& aIsFinal);
mozilla::ipc::IPCResult RecvNativeSynthesisResponse(
const uint64_t& aObserverId, const nsCString& aResponse);
@ -690,7 +691,7 @@ class BrowserChild final : public BrowserChildBase,
return *sVisibleTabs;
}
bool UpdateSessionStore(uint32_t aFlushId);
bool UpdateSessionStore(uint32_t aFlushId, bool aIsFinal = false);
protected:
virtual ~BrowserChild();

5
dom/ipc/BrowserParent.cpp
View File

@ -2522,7 +2522,8 @@ void BrowserParent::ReconstructWebProgressAndRequest(
mozilla::ipc::IPCResult BrowserParent::RecvSessionStoreUpdate(
const Maybe<nsCString>& aDocShellCaps, const Maybe<bool>& aPrivatedMode,
const nsTArray<nsCString>& aPositions,
const nsTArray<int32_t>& aPositionDescendants, const uint32_t& aFlushId) {
const nsTArray<int32_t>& aPositionDescendants, const uint32_t& aFlushId,
const bool& aIsFinal) {
nsCOMPtr<nsIXULBrowserWindow> xulBrowserWindow = GetXULBrowserWindow();
if (!xulBrowserWindow) {
return IPC_OK();
@ -2540,7 +2541,7 @@ mozilla::ipc::IPCResult BrowserParent::RecvSessionStoreUpdate(
xulBrowserWindow->UpdateScrollPositions(aPositions, aPositionDescendants);
}
xulBrowserWindow->UpdateSessionStore(mFrameElement, aFlushId);
xulBrowserWindow->UpdateSessionStore(mFrameElement, aFlushId, aIsFinal);
return IPC_OK();
}

3
dom/ipc/BrowserParent.h
View File

@ -296,7 +296,8 @@ class BrowserParent final : public PBrowserParent,
mozilla::ipc::IPCResult RecvSessionStoreUpdate(
const Maybe<nsCString>& aDocShellCaps, const Maybe<bool>& aPrivatedMode,
const nsTArray<nsCString>& aPositions,
const nsTArray<int32_t>& aPositionDescendants, const uint32_t& aFlushId);
const nsTArray<int32_t>& aPositionDescendants, const uint32_t& aFlushId,
const bool& aIsFinal);
mozilla::ipc::IPCResult RecvBrowserFrameOpenWindow(
PBrowserParent* aOpener, const nsString& aURL, const nsString& aName,

5
dom/ipc/PBrowser.ipdl
View File

@ -560,11 +560,12 @@ parent:
bool? aPrivatedMode,
nsCString[] aPositions,
int32_t[] aPositionDescendants,
uint32_t aFlushId);
uint32_t aFlushId,
bool aIsFinal);
child:
async NativeSynthesisResponse(uint64_t aObserverId, nsCString aResponse);
async FlushTabState(uint32_t aFlushId);
async FlushTabState(uint32_t aFlushId, bool aIsFinal);
parent:

8
toolkit/components/sessionstore/SessionStoreListener.cpp
View File

@ -413,17 +413,17 @@ void ContentSessionStore::GetScrollPositions(
mScrollChanged = NO_CHANGE;
}
bool TabListener::ForceFlushFromParent(uint32_t aFlushId) {
bool TabListener::ForceFlushFromParent(uint32_t aFlushId, bool aIsFinal) {
if (!XRE_IsParentProcess()) {
return false;
}
if (!mSessionStore) {
return false;
}
return UpdateSessionStore(aFlushId);
return UpdateSessionStore(aFlushId, aIsFinal);
}
bool TabListener::UpdateSessionStore(uint32_t aFlushId) {
bool TabListener::UpdateSessionStore(uint32_t aFlushId, bool aIsFinal) {
if (!aFlushId) {
if (!mSessionStore || !mSessionStore->UpdateNeeded()) {
return false;
@ -475,7 +475,7 @@ bool TabListener::UpdateSessionStore(uint32_t aFlushId) {
mSessionStore->GetScrollPositions(positions, descendants);
xulBrowserWindow->UpdateScrollPositions(positions, descendants);
}
xulBrowserWindow->UpdateSessionStore(mOwnerContent, aFlushId);
xulBrowserWindow->UpdateSessionStore(mOwnerContent, aFlushId, aIsFinal);
StopTimerForUpdate();
return true;
}

4
toolkit/components/sessionstore/SessionStoreListener.h
View File

@ -63,7 +63,7 @@ class TabListener : public nsIDOMEventListener,
nsresult Init();
ContentSessionStore* GetSessionStore() { return mSessionStore; }
// the function is called only when TabListener is in parent process
bool ForceFlushFromParent(uint32_t aFlushId);
bool ForceFlushFromParent(uint32_t aFlushId, bool aIsFinal = false);
void RemoveListeners();
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@ -78,7 +78,7 @@ class TabListener : public nsIDOMEventListener,
static void TimerCallback(nsITimer* aTimer, void* aClosure);
void AddTimerForUpdate();
void StopTimerForUpdate();
bool UpdateSessionStore(uint32_t aFlushId = 0);
bool UpdateSessionStore(uint32_t aFlushId = 0, bool aIsFinal = false);
virtual ~TabListener();
nsCOMPtr<nsIDocShell> mDocShell;

2
xpfe/appshell/nsIXULBrowserWindow.idl
View File

@ -96,6 +96,6 @@ interface nsIXULBrowserWindow : nsISupports
void updateDocShellCaps(in ACString aDisCaps);
void updateIsPrivate(in boolean aIsPrivate);
void updateScrollPositions(in Array<ACString> aPositions, in Array<long> aChildren);
void updateSessionStore(in Element aBrowser, in uint32_t aFlushId);
void updateSessionStore(in Element aBrowser, in uint32_t aFlushId, in boolean aIsFinal);
};