зеркало из https://github.com/mozilla/gecko-dev.git
Bug 821475. Moz2D: Remove flip when drawing gradient. r=mstange
We muck with the matrix before we draw the text. We need to set it back after. --HG-- rename : mobile/android/base/FilePicker.java => mobile/android/base/ActivityHandlerHelper.java extra : rebase_source : 4f937b0b2779ee6c771e030a7ae0894f14a7b211
This commit is contained in:
Родитель
e5b03eb751
Коммит
3d43c4a5c0
|
@ -204,3 +204,4 @@ disabled = bug 407107
|
|||
[test_toDataURL_lowercase_ascii.html]
|
||||
[test_toDataURL_parameters.html]
|
||||
[test_windingRuleUndefined.html]
|
||||
[test_2d.fillText.gradient.html]
|
||||
|
|
|
@ -0,0 +1,56 @@
|
|||
<!DOCTYPE HTML>
|
||||
<title>Canvas test: 2d.composite.canvas.xor</title>
|
||||
<script src="/MochiKit/MochiKit.js"></script>
|
||||
<script src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
|
||||
<body>
|
||||
<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
|
||||
<script>
|
||||
function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
|
||||
var pixel = ctx.getImageData(x, y, 1, 1);
|
||||
var pr = pixel.data[0],
|
||||
pg = pixel.data[1],
|
||||
pb = pixel.data[2],
|
||||
pa = pixel.data[3];
|
||||
ok(r-d <= pr && pr <= r+d &&
|
||||
g-d <= pg && pg <= g+d &&
|
||||
b-d <= pb && pb <= b+d &&
|
||||
a-d <= pa && pa <= a+d,
|
||||
"pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
|
||||
}
|
||||
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
addLoadEvent(function () {
|
||||
|
||||
var canvas = document.getElementById('c');
|
||||
var ctx = canvas.getContext('2d');
|
||||
var text = "I";
|
||||
var colorTop = 'rgba(255,0,0,1)';
|
||||
var colorBottom = 'rgba(0,255,0,1)';
|
||||
var inset = 10;
|
||||
var grad = ctx.createLinearGradient(inset, inset, inset, inset + 30);
|
||||
|
||||
// add color stops
|
||||
grad.addColorStop(0, colorTop);
|
||||
grad.addColorStop(1, colorBottom);
|
||||
|
||||
ctx.fillStyle = grad;
|
||||
ctx.textBaseline = 'top';
|
||||
ctx.font = '110px sans-serif'
|
||||
ctx.fillText(text, -10, -20);
|
||||
ctx.fillText(text, -8, -20);
|
||||
ctx.fillText(text, -6, -20);
|
||||
ctx.fillText(text, -4, -20);
|
||||
ctx.fillText(text, -2, -20);
|
||||
ctx.fillText(text, 0, -20);
|
||||
ctx.fillText(text, 2, -20);
|
||||
ctx.fillText(text, 4, -20);
|
||||
ctx.fillText(text, 6, -20);
|
||||
|
||||
isPixel(ctx, 15,0, 255,0,0,255, "15,0", "255,0,0,255", 5);
|
||||
isPixel(ctx, 15,49, 0,255,0,255, "15,49", "0,255,0,255", 5);
|
||||
SimpleTest.finish();
|
||||
|
||||
});
|
||||
</script>
|
||||
|
|
@ -1127,8 +1127,7 @@ DrawTargetCG::FillGlyphs(ScaledFont *aFont, const GlyphBuffer &aBuffer, const Pa
|
|||
positions.resize(aBuffer.mNumGlyphs);
|
||||
|
||||
// Handle the flip
|
||||
CGAffineTransform matrix = CGAffineTransformMakeScale(1, -1);
|
||||
CGContextConcatCTM(cg, matrix);
|
||||
CGContextScaleCTM(cg, 1, -1);
|
||||
// CGContextSetTextMatrix works differently with kCGTextClip && kCGTextFill
|
||||
// It seems that it transforms the positions with TextFill and not with TextClip
|
||||
// Therefore we'll avoid it. See also:
|
||||
|
@ -1164,6 +1163,7 @@ DrawTargetCG::FillGlyphs(ScaledFont *aFont, const GlyphBuffer &aBuffer, const Pa
|
|||
aBuffer.mNumGlyphs);
|
||||
delete bboxes;
|
||||
}
|
||||
CGContextScaleCTM(cg, 1, -1);
|
||||
DrawGradient(cg, aPattern, extents);
|
||||
} else {
|
||||
//XXX: with CoreGraphics we can stroke text directly instead of going
|
||||
|
|
Загрузка…
Ссылка в новой задаче