Bug 518777. When drawing the canvas background color for drawWindow, adjust CanvasArea because it is relative to the frame itself. r=roc

--HG--
rename : layout/base/tests/test_bug514127.html => layout/base/tests/test_bug518777.html
extra : rebase_source : 252a78c5444513eac82b6ebc6ae202aef91bc5ce
This commit is contained in:
Timothy Nikkel 2009-09-28 20:40:24 -05:00
Родитель dec90dd61b
Коммит 0e1f3b12b0
3 изменённых файлов: 55 добавлений и 1 удалений

Просмотреть файл

@ -5304,7 +5304,8 @@ PresShell::RenderDocument(const nsRect& aRect, PRUint32 aFlags,
CanvasFrame* canvasFrame =
do_QueryFrame(rootScrollableFrame->GetScrolledFrame());
if (canvasFrame) {
canvasArea = canvasFrame->CanvasArea();
canvasArea =
canvasFrame->CanvasArea() + builder.ToReferenceFrame(canvasFrame);
}
}

Просмотреть файл

@ -81,6 +81,7 @@ _TEST_FILES = \
test_bug435293-skew.html \
test_bug495648.xul \
test_bug514127.html \
test_bug518777.html \
test_scrolling.html \
$(NULL)
# test_bug396024.html is currently disabled because it interacts badly with

Просмотреть файл

@ -0,0 +1,52 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=518777
-->
<head>
<title>Test for Bug 518777</title>
<script type="application/javascript" src="/MochiKit/packed.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p><a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=518777">Mozilla Bug 518777</a></p>
<!--
iframe source is
<html><body onload='window.scrollTo(0,99999999); document.documentElement.offsetWidth; window.parent.dotest();' style='background: rgb(0,0,255); width: 100px; height: 50100px;'></body></html>
-->
<iframe id="source" width="50" height="50"
src="data:text/html,%3Chtml%3E%3Cbody%20onload%3D%27window.scrollTo%280%2C99999999%29%3B%20document.documentElement.offsetWidth%3B%20window.parent.dotest%28%29%3B%27%20style%3D%27background%3A%20rgb%280%2C0%2C255%29%3B%20width%3A%20100px%3B%20height%3A%2050100px%3B%27%3E%3C%2Fbody%3E%3C%2Fhtml%3E"></iframe>
<canvas id="scratch" width="50" height="50"></canvas>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 518777 **/
function dotest() {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var canvas = document.getElementById('scratch');
var source = document.getElementById('source').contentWindow;
var context = canvas.getContext("2d");
context.clearRect(0, 0, canvas.width, canvas.height);
context.drawWindow(source, 25, 25, canvas.width, canvas.height,
"transparent");
var data = context.getImageData(0, 0, canvas.width, canvas.height).data;
var failed = false;
for (var i = 0; i < data.length; i+=4) {
if (data[i] != 0 || data[i+1] != 0 || data[i+2] != 255 || data[i+3] != 255) {
failed = true;
break;
}
}
ok(!failed, "all pixels blue");
}
</script>
</pre>
</body>
</html>