[buffer] Make swap_buffers() copy rest

src/gen-vowel-constraints.py

@@ -223,11 +223,7 @@ print ('    default:')
 print ('      break;')
 print ('  }')
 print ('  if (processed)')
-print ('  {')
-print ('    if (buffer->idx < count)')
-print ('      buffer->next_glyph ();')
 print ('    buffer->swap_buffers ();')
-print ('  }')
 print ('}')
 
 print ()

src/hb-aat-layout-common.hh

@@ -835,12 +835,8 @@ struct StateTableDriver
     }
 
     if (!c->in_place)
-    {
-      for (; buffer->successful && buffer->idx < buffer->len;)
-	buffer->next_glyph ();
       buffer->swap_buffers ();
   }
-  }
 
   public:
   const StateTableT &machine;

src/hb-buffer.cc

@@ -333,6 +333,9 @@ hb_buffer_t::swap_buffers ()
 {
   if (unlikely (!successful)) return;
 
+  assert (idx <= len);
+  next_glyphs (len - idx);
+
   assert (have_output);
   have_output = false;
 

src/hb-ot-shape-complex-vowel-constraints.cc

@@ -452,11 +452,7 @@ _hb_preprocess_text_vowel_constraints (const hb_ot_shape_plan_t *plan HB_UNUSED,
       break;
   }
   if (processed)
-  {
-    if (buffer->idx < count)
-      buffer->next_glyph ();
     buffer->swap_buffers ();
-  }
 }
 
 

src/hb-ot-shape.cc

@@ -535,8 +535,6 @@ hb_insert_dotted_circle (hb_buffer_t *buffer, hb_font_t *font)
   info.cluster = buffer->cur().cluster;
   info.mask = buffer->cur().mask;
   buffer->output_info (info);
-  while (buffer->idx < buffer->len && buffer->successful)
-    buffer->next_glyph ();
   buffer->swap_buffers ();
 }