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

Backed out changeset 2d49d73f38aa (bug 1727514) for causing frequent crashes. a=backout

Browse Source
This commit is contained in:
Sandor Molnar
2021-09-16 15:52:56 +03:00
parent 7bac0d0890
commit d4735562cb
9 changed files with 16 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docshell/base/BrowsingContext.cpp
View File

@@ -2842,14 +2842,8 @@ void BrowsingContext::DidSet(FieldIndex<IDX_IsInBFCache>) {
}); });
if (isInBFCache) { if (isInBFCache) {
PreOrderWalk([&](BrowsingContext* aContext) { PreOrderWalk(
aContext->mIsInBFCache = true; [&](BrowsingContext* aContext) { aContext->mIsInBFCache = true; });
Document* doc = aContext->GetDocument();
if (doc) {
// Container needs to be cleared after mIsInBFCache is set to true.
doc->SetContainer(nullptr);
}
});
} }
} }

1
docshell/base/nsDocShell.cpp
View File

@@ -1161,7 +1161,6 @@ void nsDocShell::FirePageHideShowNonRecursive(bool aShow) {
mFiredUnloadEvent = false; mFiredUnloadEvent = false;
RefPtr<Document> doc = contentViewer->GetDocument(); RefPtr<Document> doc = contentViewer->GetDocument();
if (doc) { if (doc) {
doc->SetContainer(this);
RefPtr<nsGlobalWindowInner> inner = RefPtr<nsGlobalWindowInner> inner =
mScriptGlobal ? mScriptGlobal->GetCurrentInnerWindowInternal() mScriptGlobal ? mScriptGlobal->GetCurrentInnerWindowInternal()
: nullptr; : nullptr;

7
dom/base/Document.cpp
View File

@@ -6935,11 +6935,8 @@ bool Document::RemoveFromBFCacheSync() {
} }
if (mozilla::SessionHistoryInParent() && XRE_IsContentProcess()) { if (mozilla::SessionHistoryInParent() && XRE_IsContentProcess()) {
// Note, Document::GetBrowsingContext() returns null when the document is in if (BrowsingContext* bc = GetBrowsingContext()) {
// the bfcache. if (bc->IsInBFCache()) {
if (nsPIDOMWindowInner* innerWindow = GetInnerWindow()) {
BrowsingContext* bc = innerWindow->GetBrowsingContext();
if (bc && bc->IsInBFCache()) {
ContentChild* cc = ContentChild::GetSingleton(); ContentChild* cc = ContentChild::GetSingleton();
// IPC is asynchronous but the caller is supposed to check the return // IPC is asynchronous but the caller is supposed to check the return
// value. The reason for 'Sync' in the method name is that the old // value. The reason for 'Sync' in the method name is that the old

2
dom/base/Document.h
View File

@@ -3650,8 +3650,6 @@ class Document : public nsINode,
// Return true. // Return true.
bool ConsumeTransientUserGestureActivation(); bool ConsumeTransientUserGestureActivation();
// Note, GetBrowsingContext() returns null when the document is in
// the bfcache.
BrowsingContext* GetBrowsingContext() const; BrowsingContext* GetBrowsingContext() const;
// This document is a WebExtension page, it might be a background page, a // This document is a WebExtension page, it might be a background page, a

16
dom/html/HTMLMediaElement.cpp
View File

@@ -2566,6 +2566,10 @@ void HTMLMediaElement::SelectResource() {
!mIsLoadingFromSourceChildren, !mIsLoadingFromSourceChildren,
"Should think we're not loading from source children by default"); "Should think we're not loading from source children by default");
if (!mMediaSource) {
OwnerDoc()->AddMediaElementWithMSE();
}
RemoveMediaElementFromURITable(); RemoveMediaElementFromURITable();
if (!mSrcMediaSource) { if (!mSrcMediaSource) {
mLoadingSrc = uri; mLoadingSrc = uri;
@@ -2575,11 +2579,7 @@ void HTMLMediaElement::SelectResource() {
mLoadingSrcTriggeringPrincipal = mSrcAttrTriggeringPrincipal; mLoadingSrcTriggeringPrincipal = mSrcAttrTriggeringPrincipal;
DDLOG(DDLogCategory::Property, "loading_src", DDLOG(DDLogCategory::Property, "loading_src",
nsCString(NS_ConvertUTF16toUTF8(src))); nsCString(NS_ConvertUTF16toUTF8(src)));
bool hadMediaSource = !!mMediaSource;
mMediaSource = mSrcMediaSource; mMediaSource = mSrcMediaSource;
if (mMediaSource && !hadMediaSource) {
OwnerDoc()->AddMediaElementWithMSE();
}
DDLINKCHILD("mediasource", mMediaSource.get()); DDLINKCHILD("mediasource", mMediaSource.get());
UpdatePreloadAction(); UpdatePreloadAction();
if (mPreloadAction == HTMLMediaElement::PRELOAD_NONE && !mMediaSource) { if (mPreloadAction == HTMLMediaElement::PRELOAD_NONE && !mMediaSource) {
@@ -2833,16 +2833,16 @@ void HTMLMediaElement::LoadFromSourceChildren() {
return; return;
} }
if (!mMediaSource) {
OwnerDoc()->AddMediaElementWithMSE();
}
RemoveMediaElementFromURITable(); RemoveMediaElementFromURITable();
mLoadingSrc = uri; mLoadingSrc = uri;
mLoadingSrcTriggeringPrincipal = childSrc->GetSrcTriggeringPrincipal(); mLoadingSrcTriggeringPrincipal = childSrc->GetSrcTriggeringPrincipal();
DDLOG(DDLogCategory::Property, "loading_src", DDLOG(DDLogCategory::Property, "loading_src",
nsCString(NS_ConvertUTF16toUTF8(src))); nsCString(NS_ConvertUTF16toUTF8(src)));
bool hadMediaSource = !!mMediaSource;
mMediaSource = childSrc->GetSrcMediaSource(); mMediaSource = childSrc->GetSrcMediaSource();
if (mMediaSource && !hadMediaSource) {
OwnerDoc()->AddMediaElementWithMSE();
}
DDLINKCHILD("mediasource", mMediaSource.get()); DDLINKCHILD("mediasource", mMediaSource.get());
NS_ASSERTION(mNetworkState == NETWORK_LOADING, NS_ASSERTION(mNetworkState == NETWORK_LOADING,
"Network state should be loading"); "Network state should be loading");

57
dom/media/test/file_playback_and_bfcache.html
View File

@@ -1,57 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<script>
function init() {
if (location.search == "") {
let bc1 = new BroadcastChannel("bc1");
bc1.onmessage = function(e) {
if (e.data == "loadNext") {
location.href = location.href + "?page2";
} else if (e.data == "forward") {
bc1.close();
history.forward();
}
};
window.onpageshow = function() {
bc1.postMessage("pageshow");
};
} else {
document.body.innerHTML = "<video controls src='owl.mp3' autoplay>";
let bc2 = new BroadcastChannel("bc2");
bc2.onmessage = function(e) {
if (e.data == "back") {
history.back();
} else if (e.data == "statistics") {
bc2.postMessage({ currentTime: document.body.firstChild.currentTime,
duration: document.body.firstChild.duration });
bc2.close();
window.close();
}
}
window.onpageshow = function(e) {
bc2.postMessage({ event: "pageshow", persisted: e.persisted});
if (!e.persisted) {
// The initial statistics is sent once we know the duration and
// have loaded all the data.
let mediaElement = document.body.firstChild;
mediaElement.onpause = function() {
mediaElement.onpause = null;
mediaElement.currentTime = 0;
mediaElement.onplay = function() {
setTimeout(function() {
bc2.postMessage({ currentTime: mediaElement.currentTime,
duration: mediaElement.duration });
}, 500);
}
mediaElement.play();
}
}
};
}
}
</script>
</head>
<body onload="init()">
</body>
</html>

2
dom/media/test/mochitest.ini
View File

@@ -1103,8 +1103,6 @@ skip-if = appname == "seamonkey" # Seamonkey: Bug 598252, bug 1307337, bug 1143
# a platform removes a lot of coverage. # a platform removes a lot of coverage.
[test_playback.html] [test_playback.html]
skip-if = toolkit == 'android' # bug 1316177 skip-if = toolkit == 'android' # bug 1316177
[test_playback_and_bfcache.html]
support-files = file_playback_and_bfcache.html
[test_playback_errors.html] [test_playback_errors.html]
[test_playback_rate.html] [test_playback_rate.html]
[test_playback_rate_playpause.html] [test_playback_rate_playpause.html]

72
dom/media/test/test_playback_and_bfcache.html
View File

@@ -1,72 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test media playback and bfcache</title>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" href="/tests/SimpleTest/test.css"/>
<script>
SimpleTest.requestFlakyTimeout("Need some timer to wait for the audio to play");
SimpleTest.waitForExplicitFinish();
var duration = 0;
// The test opens a page and another page with a media element is loaded.
// The media element plays an audio file and starts again and sends
// statistics about it and then history.back() is called. The test waits
// for 1s + duration of the audio file and goes forward. The audio playback
// shouldn't have progressed while the page was in the bfcache.
function test() {
let bc1 = new BroadcastChannel("bc1");
let pageshow1Count = 0;
bc1.onmessage = function(e) {
if (e.data == "pageshow") {
++pageshow1Count;
info("Page 1 pageshow " + pageshow1Count);
if (pageshow1Count == 1) {
bc1.postMessage("loadNext");
} else if (pageshow1Count == 2) {
setTimeout(function() {
bc1.postMessage("forward");
bc1.close();
}, (Math.round(duration) + 1) * 1000);
}
}
};
let bc2 = new BroadcastChannel("bc2");
let pageshow2Count = 0;
let statisticsCount = 0;
bc2.onmessage = function(e) {
if (e.data.event == "pageshow") {
++pageshow2Count;
info("Page 2 pageshow " + pageshow2Count);
if (pageshow2Count == 2) {
ok(e.data.persisted, "Should have persisted the page.");
bc2.postMessage("statistics");
}
} else {
++statisticsCount;
if (statisticsCount == 1) {
duration = e.data.duration;
bc2.postMessage("back");
} else {
is(statisticsCount, 2, "Should got two play events.");
ok(e.data.currentTime < e.data.duration,
"Should have stopped the playback while the page was in bfcache." +
"currentTime: " + e.data.currentTime + " duration: " + e.data.duration);
bc2.close();
SimpleTest.finish();
}
}
};
window.open("file_playback_and_bfcache.html", "", "noopener");
}
</script>
</head>
<body onload="test()">
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test"></pre>
</body>
</html>

5
layout/base/nsPresContext.cpp
View File

@@ -2078,7 +2078,10 @@ class DelayedFireDOMPaintEvent : public Runnable {
mPresContext(aPresContext), mPresContext(aPresContext),
mTransactionId(aTransactionId), mTransactionId(aTransactionId),
mTimeStamp(aTimeStamp), mTimeStamp(aTimeStamp),
mList(std::move(aList)) {} mList(std::move(aList)) {
MOZ_ASSERT(mPresContext->GetContainerWeak(),
"DOMPaintEvent requested for a detached pres context");
}
NS_IMETHOD Run() override { NS_IMETHOD Run() override {
// The pres context might have been detached during the delay - // The pres context might have been detached during the delay -
// that's fine, just don't fire the event. // that's fine, just don't fire the event.