зеркало из https://github.com/mozilla/pjs.git
Backed out changeset 360b4a2d0aa8
This commit is contained in:
Robert O'Callahan
Родитель
d9b584c12d
Коммит
8e02c66450
|
|
@ -44,8 +44,6 @@ glyph-safety-margin.patch: Change the glyph dropping safety margin from 2em to 1
|
|||
|
||||
win32-vertically-offset-glyph.patch: bug 454098; vertical positioning errors when drawing glyph runs including delta-y offsets on screen via GDI
|
||||
|
||||
win32-canvas-glyph-position.patch: bug 475092; horizontal positioning errors when drawing glyph runs with delta-y offsets to canvas through win32-font
|
||||
|
||||
==== pixman patches ====
|
||||
|
||||
endian.patch: include cairo-platform.h for endian macros
|
||||
|
|
|
|||
|
|
@ -1187,12 +1187,12 @@ _add_glyph (cairo_glyph_state_t *state,
|
|||
if (status)
|
||||
return status;
|
||||
state->start_x = logical_x;
|
||||
} else {
|
||||
dx = logical_x - state->last_x;
|
||||
status = _cairo_array_append (&state->dx, &dx);
|
||||
if (status)
|
||||
return status;
|
||||
}
|
||||
|
||||
dx = logical_x - state->last_x;
|
||||
status = _cairo_array_append (&state->dx, &dx);
|
||||
if (status)
|
||||
return status;
|
||||
} else {
|
||||
state->start_x = logical_x;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
diff --git a/gfx/cairo/cairo/src/cairo-win32-font.c b/gfx/cairo/cairo/src/cairo-win32-font.c
|
||||
--- a/gfx/cairo/cairo/src/cairo-win32-font.c
|
||||
+++ b/gfx/cairo/cairo/src/cairo-win32-font.c
|
||||
@@ -1182,22 +1182,22 @@ _add_glyph (cairo_glyph_state_t *state,
|
||||
if (state->glyphs.num_elements > 0) {
|
||||
int dx;
|
||||
|
||||
if (logical_y != state->last_y) {
|
||||
status = _flush_glyphs (state);
|
||||
if (status)
|
||||
return status;
|
||||
state->start_x = logical_x;
|
||||
+ } else {
|
||||
+ dx = logical_x - state->last_x;
|
||||
+ status = _cairo_array_append (&state->dx, &dx);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
}
|
||||
-
|
||||
- dx = logical_x - state->last_x;
|
||||
- status = _cairo_array_append (&state->dx, &dx);
|
||||
- if (status)
|
||||
- return status;
|
||||
} else {
|
||||
state->start_x = logical_x;
|
||||
}
|
||||
|
||||
state->last_x = logical_x;
|
||||
state->last_y = logical_y;
|
||||
|
||||
status = _cairo_array_append (&state->glyphs, &glyph_index);
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
version="1.1">
|
||||
<!-- use an empty g to force filters.svg to load before onload -->
|
||||
<use xlink:href="../filters.svg#empty"/>
|
||||
<foreignObject filter="url(../filters.svg#NonWhiteToBlack)"
|
||||
x="0" y="0" height="100%" width="100%">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<!-- reftest for bug 475092 (see also bug 454098):
|
||||
depends on Windows Vista version of Times New Roman
|
||||
(should always be available on Vista machines) -->
|
||||
<head>
|
||||
<style type="text/css">
|
||||
html, body { margin: 0; background: white; color: black; height: 100%; width: 100%; }
|
||||
p {
|
||||
font-size: 50px;
|
||||
line-height: 80px;
|
||||
border: 1px solid black;
|
||||
min-width: 1px;
|
||||
margin: 10px 0;
|
||||
font-family: Times New Roman;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<p>
|
||||
x<span style="color: red;">ó̧</span>x</p>
|
||||
<p style="direction: rtl; unicode-bidi: bidi-override;">
|
||||
x<span style="color: red;">ó̧</span>x</p>
|
||||
</body>
|
||||
</html>
|
||||
</foreignObject>
|
||||
</svg>
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
version="1.1">
|
||||
<!-- use an empty g to force filters.svg to load before onload -->
|
||||
<use xlink:href="../filters.svg#empty"/>
|
||||
<foreignObject filter="url(../filters.svg#NonWhiteToBlack)"
|
||||
x="0" y="0" height="100%" width="100%">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<!-- reftest for bug 475092 (see also bug 454098):
|
||||
depends on Windows Vista version of Times New Roman
|
||||
(should always be available on Vista machines) -->
|
||||
<head>
|
||||
<style type="text/css">
|
||||
html, body { margin: 0; background: white; color: black; height: 100%; width: 100%; }
|
||||
p {
|
||||
font-size: 50px;
|
||||
line-height: 80px;
|
||||
border: 1px solid black;
|
||||
min-width: 1px;
|
||||
margin: 10px 0;
|
||||
font-family: Times New Roman;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<p>
|
||||
x<span style="color: red;">ó̧</span>x</p>
|
||||
<p style="direction: rtl; unicode-bidi: bidi-override;">
|
||||
x<span style="color: red;">ó̧</span>x</p>
|
||||
<!-- bug 475092 causes the accented "o" here to appear horizontally shifted
|
||||
on the canvas; bug 454098 causes it to appear vertically shifted on the
|
||||
Windows screen, but we can't directly reftest that because the reftest
|
||||
image is captured via the canvas codepath instead. -->
|
||||
</body>
|
||||
</html>
|
||||
</foreignObject>
|
||||
</svg>
|
||||
|
|
@ -25,4 +25,3 @@ random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == 386339.html 386339-ref.html
|
|||
== 413928-2.html 413928-2-ref.html
|
||||
== 425338-1a.html 425338-1-ref.html
|
||||
== 425338-1b.html 425338-1-ref.html
|
||||
HTTP(..) == 475092-glyph-vertical-delta.xhtml 475092-glyph-vertical-delta-ref.xhtml
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче