Consolidate most simple vs. complex Font methods

Source/platform/fonts/shaping/HarfBuzzShaper.cpp

Index: Source/platform/fonts/shaping/HarfBuzzShaper.cpp
diff --git a/Source/platform/fonts/shaping/HarfBuzzShaper.cpp b/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
index bcf441c52f205f331c6ae205cf4aa08369f9f3f3..e1393ce18e96fbfc7f949e5fd83fb892b388737b 100644
--- a/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
+++ b/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
@@ -950,7 +950,8 @@ void HarfBuzzShaper::setGlyphPositionsForHarfBuzzRun(HarfBuzzRun* currentRun, hb
     m_totalWidth += currentRun->width();
 }
 
-void HarfBuzzShaper::fillGlyphBufferFromHarfBuzzRun(GlyphBufferWithOffsets* glyphBuffer, HarfBuzzRun* currentRun, float& carryAdvance)
+void HarfBuzzShaper::fillGlyphBufferFromHarfBuzzRun(GlyphBuffer* glyphBuffer,
+    HarfBuzzRun* currentRun, float& carryAdvance)
 {
     FloatSize* offsets = currentRun->offsets();
     uint16_t* glyphs = currentRun->glyphs();
@@ -1049,12 +1050,9 @@ bool HarfBuzzShaper::fillGlyphBuffer(GlyphBuffer* glyphBuffer)
                 continue;
             }
             if (m_forTextEmphasis == ForTextEmphasis) {
-                ASSERT(!glyphBuffer->hasOffsets());
                 fillGlyphBufferForTextEmphasis(glyphBuffer, currentRun);
             } else {
-                ASSERT(glyphBuffer->hasOffsets());
-                fillGlyphBufferFromHarfBuzzRun(
-                    static_cast<GlyphBufferWithOffsets*>(glyphBuffer), currentRun, carryAdvance);
+                fillGlyphBufferFromHarfBuzzRun(glyphBuffer, currentRun, carryAdvance);
             }
         }
     } else {
@@ -1065,12 +1063,9 @@ bool HarfBuzzShaper::fillGlyphBuffer(GlyphBuffer* glyphBuffer)
                 continue;
             }
             if (m_forTextEmphasis == ForTextEmphasis) {
-                ASSERT(!glyphBuffer->hasOffsets());
                 fillGlyphBufferForTextEmphasis(glyphBuffer, currentRun);
             } else {
-                ASSERT(glyphBuffer->hasOffsets());
-                fillGlyphBufferFromHarfBuzzRun(
-                    static_cast<GlyphBufferWithOffsets*>(glyphBuffer), currentRun, carryAdvance);
+                fillGlyphBufferFromHarfBuzzRun(glyphBuffer, currentRun, carryAdvance);
             }
         }
     }