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

Backed out changeset d1b5408d946f (bug 952087) for Android reftest failures.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2014-01-07 15:46:15 -05:00
parent 96414ab45e
commit 04cc65be92
5 changed files with 8 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

21
layout/base/nsDocumentViewer.cpp
View File

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

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

@ -1,14 +0,0 @@
<!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
View File

@ -1,17 +0,0 @@
<!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,4 +1,3 @@
== deferred-anchor.html#d deferred-anchor-ref.html#d
HTTP == fixed-1.html fixed-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