Bug 1154322 - Allow using skia for content rendering. r=jrmuizel
authorMarkus Stange <mstange@themasta.com>
Tue, 14 Apr 2015 11:41:30 -0400
changeset 270404 8bdbf7a8ddc952a31e1fa4736cf4f7f0cf9796ce
parent 270403 b11ea112de5762a575312617b0a715feb97d055c
child 270405 6334b8ddf5aee5ae5ba0066128d6e9e4444623a7
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1154322
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1154322 - Allow using skia for content rendering. r=jrmuizel
gfx/thebes/gfxPlatformMac.cpp
--- a/gfx/thebes/gfxPlatformMac.cpp
+++ b/gfx/thebes/gfxPlatformMac.cpp
@@ -73,17 +73,18 @@ DisableFontActivation()
 gfxPlatformMac::gfxPlatformMac()
 {
     DisableFontActivation();
     mFontAntiAliasingThreshold = ReadAntiAliasingThreshold();
 
     uint32_t canvasMask = BackendTypeBit(BackendType::CAIRO) |
                           BackendTypeBit(BackendType::SKIA) |
                           BackendTypeBit(BackendType::COREGRAPHICS);
-    uint32_t contentMask = BackendTypeBit(BackendType::COREGRAPHICS);
+    uint32_t contentMask = BackendTypeBit(BackendType::COREGRAPHICS) |
+                           BackendTypeBit(BackendType::SKIA);
     InitBackendPrefs(canvasMask, BackendType::COREGRAPHICS,
                      contentMask, BackendType::COREGRAPHICS);
 
     // XXX: Bug 1036682 - we run out of fds on Mac when using tiled layers because
     // with 256x256 tiles we can easily hit the soft limit of 800 when using double
     // buffered tiles in e10s, so let's bump the soft limit to the hard limit for the OS
     // up to a new cap of OPEN_MAX.
     struct rlimit limits;