Separate advance from offset in GlypBuffer

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 29 matching lines @@
 }
 
 TEST(GlyphBufferTest, StoresGlyphs)
 {
     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(), FloatSize(12, 2));
+    glyphBuffer.add(44, font2.get(), 12);
 
     EXPECT_FALSE(glyphBuffer.isEmpty());
     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.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_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();
 
     GlyphBuffer glyphBuffer;
     glyphBuffer.add(42, font1.get(), 10);
     glyphBuffer.add(43, font1.get(), 15);
-    glyphBuffer.add(44, font2.get(), FloatSize(12, 2));
+    glyphBuffer.add(44, font2.get(), 20);
 
     EXPECT_FALSE(glyphBuffer.isEmpty());
     EXPECT_EQ(3u, glyphBuffer.size());
 
-    EXPECT_EQ(FloatSize(10, 0), glyphBuffer.advanceAt(0));
-    EXPECT_EQ(FloatSize(15, 0), glyphBuffer.advanceAt(1));
-    EXPECT_EQ(FloatSize(12, 2), glyphBuffer.advanceAt(2));
+    EXPECT_EQ(10, glyphBuffer.advanceAt(0));
+    EXPECT_EQ(15, glyphBuffer.advanceAt(1));
+    EXPECT_EQ(20, glyphBuffer.advanceAt(2));
 
-    const FloatSize* advances = glyphBuffer.advances(0);
-    EXPECT_EQ(FloatSize(10, 0), advances[0]);
-    EXPECT_EQ(FloatSize(15, 0), advances[1]);
-    EXPECT_EQ(FloatSize(12, 2), advances[2]);
+    const float* advances = glyphBuffer.advances(0);
+    EXPECT_EQ(10, advances[0]);
+    EXPECT_EQ(15, advances[1]);
+    EXPECT_EQ(20, advances[2]);
 }
 
 TEST(GlyphBufferTest, StoresSimpleFontData)
 {
     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(), FloatSize(12, 2));
+    glyphBuffer.add(44, font2.get(), 12);
 
     EXPECT_FALSE(glyphBuffer.isEmpty());
     EXPECT_EQ(3u, glyphBuffer.size());
 
     EXPECT_EQ(font1.get(), glyphBuffer.fontDataAt(0));
     EXPECT_EQ(font1.get(), glyphBuffer.fontDataAt(1));
     EXPECT_EQ(font2.get(), glyphBuffer.fontDataAt(2));
 }
 
 TEST(GlyphBufferTest, GlyphArrayWithOffset)
 {
     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(), FloatSize(12, 2));
+    glyphBuffer.add(44, font2.get(), 12);
 
     EXPECT_FALSE(glyphBuffer.isEmpty());
     EXPECT_EQ(3u, glyphBuffer.size());
 
     const Glyph* glyphs = glyphBuffer.glyphs(1);
     EXPECT_EQ(43, glyphs[0]);
     EXPECT_EQ(44, glyphs[1]);
 }
 
 TEST(GlyphBufferTest, AdvanceArrayWithOffset)
 {
     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(), FloatSize(12, 2));
+    glyphBuffer.add(43, font1.get(), 12);
 
     EXPECT_FALSE(glyphBuffer.isEmpty());
     EXPECT_EQ(3u, glyphBuffer.size());
 
-    const FloatSize* advances = glyphBuffer.advances(1);
-    EXPECT_EQ(FloatSize(15, 0), advances[0]);
-    EXPECT_EQ(FloatSize(12, 2), advances[1]);
+    const float* advances = glyphBuffer.advances(1);
+    EXPECT_EQ(15, advances[0]);
+    EXPECT_EQ(12, advances[1]);
 }
 
 TEST(GlyphBufferTest, Clear)
 {
     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(), FloatSize(12, 2));
+    glyphBuffer.add(44, font2.get(), 12);
 
     EXPECT_FALSE(glyphBuffer.isEmpty());
     EXPECT_EQ(3u, glyphBuffer.size());
 
     glyphBuffer.clear();
 
     EXPECT_TRUE(glyphBuffer.isEmpty());
     EXPECT_EQ(0u, glyphBuffer.size());
 }
 
-TEST(GlyphBufferTest, TracksVerticalAdvances)
-{
-    RefPtr<SimpleFontData> font = TestSimpleFontData::create();
-    GlyphBuffer glyphBuffer;
-    EXPECT_FALSE(glyphBuffer.hasVerticalAdvances());
-    glyphBuffer.add(42, font.get(), 10);
-    EXPECT_FALSE(glyphBuffer.hasVerticalAdvances());
-    glyphBuffer.add(43, font.get(), FloatSize(15, 0));
-    EXPECT_FALSE(glyphBuffer.hasVerticalAdvances());
-    glyphBuffer.add(44, font.get(), FloatSize(10, 5));
-    EXPECT_TRUE(glyphBuffer.hasVerticalAdvances());
-    glyphBuffer.clear();
-    EXPECT_FALSE(glyphBuffer.hasVerticalAdvances());
-}
-
 TEST(GlyphBufferTest, Reverse)
 {
     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(), FloatSize(12, 2));
+    glyphBuffer.add(44, font2.get(), 20);
 
     EXPECT_FALSE(glyphBuffer.isEmpty());
     EXPECT_EQ(3u, glyphBuffer.size());
-    EXPECT_TRUE(glyphBuffer.hasVerticalAdvances());
 
     glyphBuffer.reverse();
 
     EXPECT_FALSE(glyphBuffer.isEmpty());
     EXPECT_EQ(3u, glyphBuffer.size());
-    EXPECT_TRUE(glyphBuffer.hasVerticalAdvances());
     EXPECT_EQ(44, glyphBuffer.glyphAt(0));
     EXPECT_EQ(43, glyphBuffer.glyphAt(1));
     EXPECT_EQ(42, glyphBuffer.glyphAt(2));
-    EXPECT_EQ(FloatSize(12, 2), glyphBuffer.advanceAt(0));
-    EXPECT_EQ(FloatSize(15, 0), glyphBuffer.advanceAt(1));
-    EXPECT_EQ(FloatSize(10, 0), glyphBuffer.advanceAt(2));
+    EXPECT_EQ(20, glyphBuffer.advanceAt(0));
+    EXPECT_EQ(15, glyphBuffer.advanceAt(1));
+    EXPECT_EQ(10, glyphBuffer.advanceAt(2));
     EXPECT_EQ(font2.get(), glyphBuffer.fontDataAt(0));
     EXPECT_EQ(font1.get(), glyphBuffer.fontDataAt(1));
     EXPECT_EQ(font1.get(), glyphBuffer.fontDataAt(2));
 }
 
-TEST(GlyphBufferTest, SetAdvanceWidth)
-{
-    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(), FloatSize(12, 2));
-
-    glyphBuffer.setAdvanceWidth(1, 20);
-    EXPECT_EQ(FloatSize(20, 0), glyphBuffer.advanceAt(1));
-
-    glyphBuffer.setAdvanceWidth(2, 10);
-    EXPECT_EQ(FloatSize(10, 2), glyphBuffer.advanceAt(2));
-}
-
 TEST(GlyphBufferTest, ExpandLastAdvance)
 {
     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(), FloatSize(12, 2));
+    glyphBuffer.add(44, font2.get(), 12);
 
     glyphBuffer.expandLastAdvance(20);
-    EXPECT_EQ(FloatSize(32, 2), glyphBuffer.advanceAt(2));
+    EXPECT_EQ(32, glyphBuffer.advanceAt(2));
 }
 
 } // namespace