Ensure Firefox frame table subcategory fields are always included

Author: joshuay03

lib/vernier/output/firefox.rb

@@ -487,17 +487,21 @@ def stack_table
         def frame_table
           funcs = @stack_table_hash[:frame_table].fetch(:func)
           lines = @stack_table_hash[:frame_table].fetch(:line)
-          size = funcs.length
+          raise unless lines.size == funcs.size
+
+          size = funcs.size
           none = [nil] * size
-          categories = @frame_categories.map(&:idx)
+          default = [0] * size
+          unidentified = [-1] * size
 
-          raise unless lines.size == funcs.size
+          categories = @frame_categories.map(&:idx)
+          subcategories = @frame_subcategories
 
           {
-            address: [-1] * size,
-            inlineDepth: [0] * size,
+            address: unidentified,
+            inlineDepth: default,
             category: categories,
-            subcategory: nil,
+            subcategory: subcategories,
             func: funcs,
             nativeSymbol: none,
             innerWindowID: none,

test/firefox_test_helpers.rb

@@ -62,6 +62,7 @@ def assert_valid_firefox_profile(profile)
       assert_equal frame_length, thread["frameTable"]["innerWindowID"].length
       assert_equal frame_length, thread["frameTable"]["func"].length
       assert_equal frame_length, thread["frameTable"]["category"].length
+      assert_equal frame_length, thread["frameTable"]["subcategory"].length
       assert_equal frame_length, thread["frameTable"]["inlineDepth"].length
       assert_equal frame_length, thread["frameTable"]["address"].length