From 3950f0f267ceaa95dfd67f8df7e06b11cfa37a22 Mon Sep 17 00:00:00 2001
From: freiling <freiling@google.com>
Date: Mon, 17 Apr 2017 11:55:13 -0700
Subject: [PATCH] [fuchsia] change VulkanRasterizer member ordering to avoid
 crashes during teardown on device shell logout (#3597)

---
 content_handler/vulkan_rasterizer.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/content_handler/vulkan_rasterizer.h b/content_handler/vulkan_rasterizer.h
index 3981b3c5ed7..abe27c01dee 100644
--- a/content_handler/vulkan_rasterizer.h
+++ b/content_handler/vulkan_rasterizer.h
@@ -97,6 +97,10 @@ class VulkanRasterizer : public Rasterizer {
     }
 
     ftl::RefPtr<vulkan::VulkanProcTable> vk_;
+    std::unique_ptr<vulkan::VulkanApplication> application_;
+    std::unique_ptr<vulkan::VulkanDevice> logical_device_;
+    sk_sp<GrVkBackendContext> backend_context_;
+    sk_sp<GrContext> context_;
 
     // These three containers hold surfaces in various stages of recycling
 
@@ -121,11 +125,6 @@ class VulkanRasterizer : public Rasterizer {
     // Surfaces exist in pendind surfaces until they are released by the buffer
     // consumer
     std::unordered_map<mx_handle_t, PendingSurfaceInfo> pending_surfaces_;
-
-    sk_sp<GrContext> context_;
-    sk_sp<GrVkBackendContext> backend_context_;
-    std::unique_ptr<vulkan::VulkanApplication> application_;
-    std::unique_ptr<vulkan::VulkanDevice> logical_device_;
     bool valid_;
 
     bool Initialize();