src/java.desktop/share/native/libfontmanager/harfbuzz/hb-fallback-shape.cc

@@ -26,10 +26,14 @@
 
 #define HB_SHAPER fallback
 #include "hb-shaper-impl-private.hh"
 
 
+HB_SHAPER_DATA_ENSURE_DEFINE(fallback, face)
+HB_SHAPER_DATA_ENSURE_DEFINE(fallback, font)
+
+
 /*
  * shaper face data
  */
 
 struct hb_fallback_shaper_face_data_t {};

@@ -123,11 +127,11 @@
       info[i].codepoint = space;
       pos[i].x_advance = 0;
       pos[i].y_advance = 0;
       continue;
     }
-    font->get_nominal_glyph (info[i].codepoint, &info[i].codepoint);
+    (void) font->get_nominal_glyph (info[i].codepoint, &info[i].codepoint);
     font->get_glyph_advance_for_direction (info[i].codepoint,
                                            direction,
                                            &pos[i].x_advance,
                                            &pos[i].y_advance);
     font->subtract_glyph_origin_for_direction (info[i].codepoint,

@@ -137,7 +141,9 @@
   }
 
   if (HB_DIRECTION_IS_BACKWARD (direction))
     hb_buffer_reverse (buffer);
 
+  buffer->safe_to_break_all ();
+
   return true;
 }