Bug 1081694 - Include SkiaGLGlue.h on non-skia platforms. r=jgilbert
authorSteve Singer <steve@ssinger.info>
Sun, 12 Oct 2014 09:58:00 +0200
changeset 210329 f3f97d35b18016460c99c94b460c80c28341545c
parent 210328 f9faedda0179e32f5b103920b2ba154fc78118bb
child 210330 7a05af7d4902a2d83fdf2be43928290b5a567970
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersjgilbert
bugs1081694
milestone36.0a1
Bug 1081694 - Include SkiaGLGlue.h on non-skia platforms. r=jgilbert
dom/canvas/CanvasRenderingContext2D.cpp
dom/canvas/moz.build
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -109,18 +109,18 @@
 #include "nsIScreenManager.h"
 #include "nsFilterInstance.h"
 #include "nsSVGLength2.h"
 #include "nsDeviceContext.h"
 #include "nsFontMetrics.h"
 
 #undef free // apparently defined by some windows header, clashing with a free()
             // method in SkTypes.h
+#include "SkiaGLGlue.h"
 #ifdef USE_SKIA
-#include "SkiaGLGlue.h"
 #include "SurfaceTypes.h"
 #endif
 
 using mozilla::gl::GLContext;
 using mozilla::gl::SkiaGLGlue;
 using mozilla::gl::GLContextProvider;
 
 #ifdef XP_WIN
--- a/dom/canvas/moz.build
+++ b/dom/canvas/moz.build
@@ -124,16 +124,17 @@ include('/ipc/chromium/chromium-config.m
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     '/content/svg/content/src',
     '/content/xul/content/src',
     '/dom/base',
+    '/gfx/gl',
     '/image/src',
     '/js/xpconnect/src',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
 ]
 
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']