Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-22 18:32:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1059424 Part 1: Simplify cairo quartz surface generation now that we are minimum macOS 10.9. r=jrmuizel,mstange

Browse Source 
MozReview-Commit-ID: 7ewjZwbFbwP

--HG--
extra : rebase_source : 638fc40c8ef4280e693b9b2f7397078fc686a4e2
This commit is contained in:
Brad Werth 2017-07-10 15:17:54 -07:00
parent 20fe9c3032
commit fd01267841
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gfx/cairo/cairo/src/cairo-quartz-surface.c
View File

@ -140,8 +140,6 @@ static CGFloat (*CGContextGetAlphaPtr) (CGContextRef) = NULL;
/* CTFontDrawGlyphs is not available until 10.7 */
static void (*CTFontDrawGlyphsPtr) (CTFontRef, const CGGlyph[], const CGPoint[], size_t, CGContextRef) = NULL;
static SInt32 _cairo_quartz_osx_version = 0x0;
static cairo_bool_t _cairo_quartz_symbol_lookup_done = FALSE;
/*
@ -179,16 +177,6 @@ static void quartz_ensure_symbols(void)
CTFontDrawGlyphsPtr = dlsym(RTLD_DEFAULT, "CTFontDrawGlyphs");
#if !TARGET_OS_IPHONE
if (Gestalt(gestaltSystemVersion, &_cairo_quartz_osx_version) != noErr) {
// assume 10.5
_cairo_quartz_osx_version = 0x1050;
}
#else
//TODO: this is not great
_cairo_quartz_osx_version = 0x1050;
#endif
_cairo_quartz_symbol_lookup_done = TRUE;
}
@ -3110,8 +3098,7 @@ _cairo_quartz_surface_mask_cg (void *abstract_surface,
/* If we have CGContextClipToMask, we can do more complex masks */
if (CGContextClipToMaskPtr) {
/* For these, we can skip creating a temporary surface, since we already have one */
/* For some reason this doesn't work reliably on OS X 10.5. See bug 721663. */
if (_cairo_quartz_osx_version >= 0x1060 && mask->type == CAIRO_PATTERN_TYPE_SURFACE &&
if (mask->type == CAIRO_PATTERN_TYPE_SURFACE &&
mask->extend == CAIRO_EXTEND_NONE) {
return _cairo_quartz_surface_mask_with_surface (surface, op, source, (cairo_surface_pattern_t *) mask, clip);
}