diff options
| author | Moonchild <moonchild@palemoon.org> | 2019-11-08 10:54:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 10:54:27 +0100 |
| commit | 0f3635dc8fac240b5e6d2a74d8894d83176bc357 (patch) | |
| tree | 91f42e5b7b611e259ae8fb63f84e201032e56382 /gfx/cairo/dwrite-font-match-robustness.patch | |
| parent | 8bb208397d2574ffcad436d23d3e8b87b3413141 (diff) | |
| parent | 5f80c286cf845cbc1dde8b7d6ea177ddd4f8f39b (diff) | |
| download | UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar.gz UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar.lz UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.tar.xz UXP-0f3635dc8fac240b5e6d2a74d8894d83176bc357.zip | |
Merge pull request #1276 from MoonchildProductions/cairo-work
Update the in-tree cairo code.
Diffstat (limited to 'gfx/cairo/dwrite-font-match-robustness.patch')
| -rw-r--r-- | gfx/cairo/dwrite-font-match-robustness.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/gfx/cairo/dwrite-font-match-robustness.patch b/gfx/cairo/dwrite-font-match-robustness.patch deleted file mode 100644 index eadcce3bd..000000000 --- a/gfx/cairo/dwrite-font-match-robustness.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Robert O'Callahan <robert@ocallahan.org> -Bug 717178. Part 1: Don't crash when passing a nil scaled-font to _name_tables_match. r=jfkthame - -diff --git a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp ---- a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp -+++ b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp -@@ -1489,17 +1489,18 @@ static cairo_bool_t - unsigned long size1; - unsigned long size2; - cairo_int_status_t status1; - cairo_int_status_t status2; - unsigned char *buffer1; - unsigned char *buffer2; - cairo_bool_t result = false; - -- if (!font1->backend->load_truetype_table || -+ if (!font1->backend || !font2->backend || -+ !font1->backend->load_truetype_table || - !font2->backend->load_truetype_table) - return false; - - status1 = font1->backend->load_truetype_table (font1, - TT_TAG_name, 0, NULL, &size1); - status2 = font2->backend->load_truetype_table (font2, - TT_TAG_name, 0, NULL, &size2); - if (status1 || status2) |