Consolidate most simple vs. complex Font methods

Source/platform/fonts/GlyphBufferTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "platform/fonts/GlyphBuffer.h"
 
 #include "platform/fonts/SimpleFontData.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
@@ skipping 32 matching lines @@
 {
     RefPtr<SimpleFontData> font1 = TestSimpleFontData::create();
     RefPtr<SimpleFontData> font2 = TestSimpleFontData::create();
 
     GlyphBuffer glyphBuffer;
     glyphBuffer.add(42, font1.get(), 10);
     glyphBuffer.add(43, font1.get(), 15);
     glyphBuffer.add(44, font2.get(), 12);
 
     EXPECT_FALSE(glyphBuffer.isEmpty());
+    EXPECT_FALSE(glyphBuffer.hasOffsets());
     EXPECT_EQ(3u, glyphBuffer.size());
 
     EXPECT_EQ(42, glyphBuffer.glyphAt(0));
     EXPECT_EQ(43, glyphBuffer.glyphAt(1));
     EXPECT_EQ(44, glyphBuffer.glyphAt(2));
 
     const Glyph* glyphs = glyphBuffer.glyphs(0);
     EXPECT_EQ(42, glyphs[0]);
     EXPECT_EQ(43, glyphs[1]);
     EXPECT_EQ(44, glyphs[2]);
 }
 
 TEST(GlyphBufferTest, StoresOffsets)
 {
     RefPtr<SimpleFontData> font1 = TestSimpleFontData::create();
     RefPtr<SimpleFontData> font2 = TestSimpleFontData::create();
 
-    GlyphBufferWithOffsets glyphBuffer;
+    GlyphBuffer glyphBuffer;
     glyphBuffer.add(42, font1.get(), FloatSize(10, 0), 0);
     glyphBuffer.add(43, font1.get(), FloatSize(15, 0), 0);
     glyphBuffer.add(44, font2.get(), FloatSize(12, 2), 0);
 
     EXPECT_FALSE(glyphBuffer.isEmpty());
+    EXPECT_TRUE(glyphBuffer.hasOffsets());
     EXPECT_EQ(3u, glyphBuffer.size());
 
-    EXPECT_EQ(FloatSize(10, 0), glyphBuffer.offsetAt(0));
-    EXPECT_EQ(FloatSize(15, 0), glyphBuffer.offsetAt(1));
-    EXPECT_EQ(FloatSize(12, 2), glyphBuffer.offsetAt(2));
-
     const FloatSize* offsets = glyphBuffer.offsets(0);
     EXPECT_EQ(FloatSize(10, 0), offsets[0]);
     EXPECT_EQ(FloatSize(15, 0), offsets[1]);
     EXPECT_EQ(FloatSize(12, 2), offsets[2]);
 }
 
 TEST(GlyphBufferTest, StoresAdvances)
 {
     RefPtr<SimpleFontData> font1 = TestSimpleFontData::create();
     RefPtr<SimpleFontData> font2 = TestSimpleFontData::create();
@@ skipping 106 matching lines @@
     GlyphBuffer glyphBuffer;
     glyphBuffer.add(42, font1.get(), 10);
     glyphBuffer.add(43, font1.get(), 15);
     glyphBuffer.add(44, font2.get(), 12);
 
     glyphBuffer.expandLastAdvance(20);
     EXPECT_EQ(32, glyphBuffer.advanceAt(2));
 }
 
 } // namespace