Backed out changeset 2467398cd958 (bug 1289251) for build bustage in WindowSurfaceX11.cpp. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 02 Sep 2016 10:26:14 +0200
changeset 312463 84bab1407100af7215a1f19df176295fc2287410
parent 312462 f35a9b2b20910e76bdd784070c245bef40ece975
child 312464 705cb7ff83607a4669a496999913580e12699aed
push id20447
push userkwierso@gmail.com
push dateFri, 02 Sep 2016 20:36:44 +0000
treeherderfx-team@969397f22187 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1289251
milestone51.0a1
backs out2467398cd9587802f15f46179bbd8c073b441f48
Backed out changeset 2467398cd958 (bug 1289251) for build bustage in WindowSurfaceX11.cpp. r=backout
widget/nsShmImage.cpp
--- a/widget/nsShmImage.cpp
+++ b/widget/nsShmImage.cpp
@@ -3,17 +3,16 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "nsShmImage.h"
 
 #ifdef MOZ_HAVE_SHMIMAGE
 #include "mozilla/X11Util.h"
-#include "mozilla/gfx/gfxVars.h"
 #include "mozilla/ipc/SharedMemory.h"
 #include "gfxPlatform.h"
 #include "nsPrintfCString.h"
 #include "nsTArray.h"
 
 #include <errno.h>
 #include <string.h>
 #include <sys/ipc.h>
@@ -146,17 +145,17 @@ nsShmImage::CreateImage(const IntSize& a
   MOZ_ASSERT(mConnection && mVisual);
 
   if (!InitExtension()) {
     return false;
   }
 
   mSize = aSize;
 
-  BackendType backend = gfxVars::ContentBackend();
+  BackendType backend = gfxPlatform::GetPlatform()->GetDefaultContentBackend();
 
   mFormat = SurfaceFormat::UNKNOWN;
   switch (mDepth) {
   case 32:
     if (mVisual->red_mask == 0xff0000 &&
         mVisual->green_mask == 0xff00 &&
         mVisual->blue_mask == 0xff) {
       mFormat = SurfaceFormat::B8G8R8A8;