Bug 1164480 - Make sure MacIOSurfaceLib is initialized before we use it. r=jya, a=lizzard
authorMatt Woodrow <mwoodrow@mozilla.com>
Fri, 22 May 2015 11:00:28 +1200
changeset 267727 4b179ee959987ef8036f002b240c738a0629b5b7
parent 267722 05b522f504918b97d00e3488292ca2e4be84eb2f
child 267728 9060127fc5ae128a3da392413f89f6f954ac37f4
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya, lizzard
bugs1164480
milestone39.0
Bug 1164480 - Make sure MacIOSurfaceLib is initialized before we use it. r=jya, a=lizzard
gfx/thebes/gfxPlatformMac.cpp
--- a/gfx/thebes/gfxPlatformMac.cpp
+++ b/gfx/thebes/gfxPlatformMac.cpp
@@ -3,16 +3,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "gfxPlatformMac.h"
 
 #include "gfxQuartzSurface.h"
 #include "gfxQuartzImageSurface.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/MacIOSurface.h"
 
 #include "gfxMacPlatformFontList.h"
 #include "gfxMacFont.h"
 #include "gfxCoreTextShaper.h"
 #include "gfxTextRun.h"
 #include "gfxUserFontSet.h"
 
 #include "nsTArray.h"
@@ -88,16 +89,18 @@ gfxPlatformMac::gfxPlatformMac()
     // up to a new cap of OPEN_MAX.
     struct rlimit limits;
     if (getrlimit(RLIMIT_NOFILE, &limits) == 0) {
         limits.rlim_cur = std::min(rlim_t(OPEN_MAX), limits.rlim_max);
         if (setrlimit(RLIMIT_NOFILE, &limits) != 0) {
             NS_WARNING("Unable to bump RLIMIT_NOFILE to the maximum number on this OS");
         }
     }
+
+    MacIOSurfaceLib::LoadLibrary();
 }
 
 gfxPlatformMac::~gfxPlatformMac()
 {
     gfxCoreTextShaper::Shutdown();
 }
 
 gfxPlatformFontList*