wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 952087 Anchor scroll fails if the anchor is created between DOMContentLoaded and onload r=smaug

Browse Source
This commit is contained in:
Neil Rashbrook 2014-01-07 18:34:21 +00:00
parent 4d46ad1708
commit 796419d6e8
5 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/src/nsDocument.cpp
View File

@ -8821,6 +8821,10 @@ void
nsDocument::ScrollToRef() nsDocument::ScrollToRef()
{ {
if (mScrolledToRefAlready) { if (mScrolledToRefAlready) {
nsCOMPtr<nsIPresShell> shell = GetShell();
if (shell) {
shell->ScrollToAnchor();
}
return; return;
} }

21
layout/base/nsDocumentViewer.cpp
View File

@ -1025,15 +1025,20 @@ nsDocumentViewer::LoadComplete(nsresult aStatus)
} }
} }
// Now that the document has loaded, we can tell the presshell if (!mStopped) {
// to unsuppress painting. if (mDocument) {
if (mPresShell && !mStopped) { mDocument->ScrollToRef();
nsCOMPtr<nsIPresShell> shellDeathGrip(mPresShell); }
mPresShell->UnsuppressPainting();
// mPresShell could have been removed now, see bug 378682/421432 // Now that the document has loaded, we can tell the presshell
// to unsuppress painting.
if (mPresShell) { if (mPresShell) {
mPresShell->ScrollToAnchor(); nsCOMPtr<nsIPresShell> shellDeathGrip(mPresShell);
mPresShell->LoadComplete(); mPresShell->UnsuppressPainting();
// mPresShell could have been removed now, see bug 378682/421432
if (mPresShell) {
mPresShell->LoadComplete();
}
} }
} }

14
layout/reftests/scrolling/deferred-anchor-ref.html Normal file
View File

@ -0,0 +1,14 @@
<!DOCTYPE HTML>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="UTF-8" />
</head>
<body style="margin: 0;">
<div>
<div style="height: 50px; width: 50px; background-color: red;"></div>
<div style="height: 1000px;"></div>
<div id="d" style="height: 50px; width: 50px; background-color: green;"></div>
<div style="height: 1000px;"></div>
</div>
</body>
</html>

17
layout/reftests/scrolling/deferred-anchor.html Normal file
View File

@ -0,0 +1,17 @@
<!DOCTYPE HTML>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="UTF-8" />
<script>
var xhr = new XMLHttpRequest();
xhr.onload = function() {
document.body.appendChild(document.importNode(this.responseXML.getElementsByTagName("div")[0], true));
};
xhr.open("get", "deferred-anchor-ref.html");
xhr.responseType = "document";
xhr.send();
</script>
</head>
<body style="margin: 0;">
</body>
</html>

1
layout/reftests/scrolling/reftest.list
View File

@ -1,3 +1,4 @@
== deferred-anchor.html#d deferred-anchor-ref.html#d
HTTP == fixed-1.html fixed-1.html?ref HTTP == fixed-1.html fixed-1.html?ref
HTTP == fixed-opacity-1.html fixed-opacity-1.html?ref HTTP == fixed-opacity-1.html fixed-opacity-1.html?ref
skip-if(B2G) HTTP == fixed-opacity-2.html fixed-opacity-2.html?ref skip-if(B2G) HTTP == fixed-opacity-2.html fixed-opacity-2.html?ref