Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

Conflicts:
	include/mbgl/platform/default/headless_view.hpp
	platform/default/glfw_view.cpp
	platform/default/headless_view.cpp

2 files changed, 9 insertions, 9 deletions

diff --git a/include/mbgl/platform/default/headless_display.hpp b/include/mbgl/platform/default/headless_display.hpp
index 08c423c587..bf67e3c3b3 100644
--- a/include/mbgl/platform/default/headless_display.hpp
+++ b/include/mbgl/platform/default/headless_display.hpp
@@ -15,8 +15,8 @@ public:
 #endif
 
 #if MBGL_USE_GLX
-    Display *x_display = nullptr;
-    GLXFBConfig *fb_configs = nullptr;
+    Display *xDisplay = nullptr;
+    GLXFBConfig *fbConfigs = nullptr;
 #endif
 };
 
diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp
index f3b897e760..f136f58ea8 100644
--- a/include/mbgl/platform/default/headless_view.hpp
+++ b/include/mbgl/platform/default/headless_view.hpp
@@ -46,19 +46,19 @@ private:
     float pixelRatio_;
 
 #if MBGL_USE_CGL
-    CGLContextObj gl_context;
+    CGLContextObj glContext;
 #endif
 
 #if MBGL_USE_GLX
-    Display *x_display = nullptr;
-    GLXFBConfig *fb_configs = nullptr;
-    GLXContext gl_context = 0;
-    GLXPbuffer glx_pbuffer = 0;
+    Display *xDisplay = nullptr;
+    GLXFBConfig *fbConfigs = nullptr;
+    GLXContext glContext = 0;
+    GLXPbuffer glxPbuffer = 0;
 #endif
 
     GLuint fbo = 0;
-    GLuint fbo_depth_stencil = 0;
-    GLuint fbo_color = 0;
+    GLuint fboDepthStencil = 0;
+    GLuint fboColor = 0;
     bool usingGl3OrNewer = false;
 };