зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 5a07f228795b
This commit is contained in:
Robert O'Callahan
Родитель
14f325ad0f
Коммит
4401f7c29f
|
|
@ -1,6 +0,0 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<body>
|
||||
<div style="width:1px; height:1px; background:lime; position:absolute; left:0; top:0;"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<body>
|
||||
<div style="width:1px; height:1px; background:red; position:absolute; left:0; top:0;"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<body>
|
||||
<div style="width:1px; height:1px; background:lime; position:absolute; left:799px; top:0;"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<body>
|
||||
<div style="width:1px; height:1px; background:red; position:absolute; left:799px; top:0;"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<body>
|
||||
<div style="width:1px; height:1px; background:lime; position:absolute; left:799px; top:999px;"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<body>
|
||||
<div style="width:1px; height:1px; background:red; position:absolute; left:799px; top:999px;"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<body>
|
||||
<div style="width:1px; height:1px; background:lime; position:absolute; left:0; top:999px;"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<body>
|
||||
<div style="width:1px; height:1px; background:red; position:absolute; left:0; top:999px;"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -64,9 +64,3 @@ include scripttests.list
|
|||
|
||||
# test url-prefix
|
||||
include urlprefixtests.list
|
||||
|
||||
# test that all corners are visible
|
||||
!= corners-1.html corners-1-ref.html
|
||||
!= corners-2.html corners-2-ref.html
|
||||
!= corners-3.html corners-3-ref.html
|
||||
!= corners-4.html corners-4-ref.html
|
||||
|
|
|
|||
|
|
@ -109,8 +109,6 @@ var gSlowestTestTime = 0;
|
|||
var gSlowestTestURL;
|
||||
var gClearingForAssertionCheck = false;
|
||||
|
||||
var gDrawWindowFlags;
|
||||
|
||||
const TYPE_REFTEST_EQUAL = '==';
|
||||
const TYPE_REFTEST_NOTEQUAL = '!=';
|
||||
const TYPE_LOAD = 'load'; // test without a reference (just test that it does
|
||||
|
|
@ -933,42 +931,8 @@ function UpdateCanvasCache(url, canvas)
|
|||
}
|
||||
}
|
||||
|
||||
// Compute drawWindow flags lazily so the window is set up and can be
|
||||
// measured accurately
|
||||
function DoDrawWindow(ctx, win, x, y, w, h)
|
||||
{
|
||||
if (typeof gDrawWindowFlags == "undefined") {
|
||||
gDrawWindowFlags = ctx.DRAWWINDOW_DRAW_CARET |
|
||||
ctx.DRAWWINDOW_DRAW_VIEW;
|
||||
var flags = "DRAWWINDOW_DRAW_CARET | DRAWWINDOW_DRAW_VIEW";
|
||||
var win = gBrowser.contentWindow;
|
||||
if (win.innerWidth == gCurrentCanvas.width &&
|
||||
win.innerHeight == gCurrentCanvas.height) {
|
||||
// We can use the window's retained layers
|
||||
// because the window is big enough to display the entire reftest
|
||||
gDrawWindowFlags |= ctx.DRAWWINDOW_USE_WIDGET_LAYERS;
|
||||
flags += " | DRAWWINDOW_USE_WIDGET_LAYERS";
|
||||
}
|
||||
dump("REFTEST INFO | drawWindow flags = " + flags + "\n");
|
||||
}
|
||||
|
||||
var scrollX = 0;
|
||||
var scrollY = 0;
|
||||
if (!(gDrawWindowFlags & ctx.DRAWWINDOW_DRAW_VIEW)) {
|
||||
scrollX = win.scrollX;
|
||||
scrollY = win.scrollY;
|
||||
}
|
||||
ctx.drawWindow(win, scrollX + x, scrollY + y, w, h, "rgb(255,255,255)",
|
||||
gDrawWindowFlags);
|
||||
}
|
||||
|
||||
function InitCurrentCanvasWithSnapshot()
|
||||
{
|
||||
if (gURLs[0].type == TYPE_LOAD || gURLs[0].type == TYPE_SCRIPT) {
|
||||
// We don't want to snapshot this kind of test
|
||||
return;
|
||||
}
|
||||
|
||||
gCurrentCanvas = AllocateCanvas();
|
||||
|
||||
/* XXX This needs to be rgb(255,255,255) because otherwise we get
|
||||
|
|
@ -982,9 +946,12 @@ function InitCurrentCanvasWithSnapshot()
|
|||
// window, so scale the drawing to show the zoom (making each canvas pixel be one
|
||||
// device pixel instead)
|
||||
ctx.scale(scale, scale);
|
||||
DoDrawWindow(ctx, win, 0, 0,
|
||||
Math.ceil(gCurrentCanvas.width / scale),
|
||||
Math.ceil(gCurrentCanvas.height / scale));
|
||||
ctx.drawWindow(win, win.scrollX, win.scrollY,
|
||||
Math.ceil(gCurrentCanvas.width / scale),
|
||||
Math.ceil(gCurrentCanvas.height / scale),
|
||||
"rgb(255,255,255)",
|
||||
ctx.DRAWWINDOW_DRAW_CARET |
|
||||
ctx.DRAWWINDOW_USE_WIDGET_LAYERS);
|
||||
ctx.restore();
|
||||
}
|
||||
|
||||
|
|
@ -995,9 +962,6 @@ function roundTo(x, fraction)
|
|||
|
||||
function UpdateCurrentCanvasForEvent(event)
|
||||
{
|
||||
if (!gCurrentCanvas)
|
||||
return;
|
||||
|
||||
var win = gBrowser.contentWindow;
|
||||
var ctx = gCurrentCanvas.getContext("2d");
|
||||
var scale = gBrowser.markupDocumentViewer.fullZoom;
|
||||
|
|
@ -1014,7 +978,10 @@ function UpdateCurrentCanvasForEvent(event)
|
|||
ctx.save();
|
||||
ctx.scale(scale, scale);
|
||||
ctx.translate(left, top);
|
||||
DoDrawWindow(ctx, win, left, top, right - left, bottom - top);
|
||||
ctx.drawWindow(win, left + win.scrollX, top + win.scrollY,
|
||||
right - left, bottom - top,
|
||||
"rgb(255,255,255)",
|
||||
ctx.DRAWWINDOW_DRAW_CARET);
|
||||
ctx.restore();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче