Shape unicode-range: font faces in only one iteration

third_party/WebKit/Source/platform/fonts/GlyphPageTreeNodeTest.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 "platform/fonts/GlyphPageTreeNode.h"
 
 #include "platform/fonts/SegmentedFontData.h"
 #include "platform/fonts/SimpleFontData.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 89 matching lines @@
 }
 
 TEST(GlyphPageTreeNodeTest, segmentedData)
 {
     const unsigned kPageNumber = 0;
     size_t pageCountBeforeTest = GlyphPageTreeNode::treeGlyphPageCount();
     {
         RefPtr<TestSimpleFontData> dataBtoC = TestSimpleFontData::create('B', 'C');
         RefPtr<TestSimpleFontData> dataCtoE = TestSimpleFontData::create('C', 'E');
         RefPtr<SegmentedFontData> segmentedData = SegmentedFontData::create();
-        segmentedData->appendRange(FontDataRange('A', 'C', dataBtoC));
-        segmentedData->appendRange(FontDataRange('C', 'D', dataCtoE));
+        segmentedData->appendFace(FontDataForRangeSet(dataBtoC, 'A', 'C'));
+        segmentedData->appendFace(FontDataForRangeSet(dataCtoE, 'C', 'D'));
         GlyphPageTreeNode* node = GlyphPageTreeNode::getNormalRootChild(segmentedData.get(), kPageNumber);
 
         EXPECT_EQ(0, node->page()->glyphDataForCharacter('A').fontData);
         EXPECT_EQ(dataBtoC, node->page()->glyphDataForCharacter('B').fontData);
         EXPECT_EQ(dataBtoC, node->page()->glyphDataForCharacter('C').fontData);
         EXPECT_EQ(dataCtoE, node->page()->glyphDataForCharacter('D').fontData);
         EXPECT_EQ(0, node->page()->glyphDataForCharacter('E').fontData);
     }
     EXPECT_EQ(pageCountBeforeTest, GlyphPageTreeNode::treeGlyphPageCount());
 }
@@ skipping 16 matching lines @@
 
 TEST(GlyphPageTreeNodeTest, customData)
 {
     const unsigned kPageNumber = 0;
     size_t pageCountBeforeTest = GlyphPageTreeNode::treeGlyphPageCount();
     {
         RefPtr<TestSimpleFontData> dataAtoC = TestSimpleFontData::createUnloaded('A', 'C');
         RefPtr<TestSimpleFontData> dataBtoD = TestSimpleFontData::create('B', 'D');
         RefPtr<TestSimpleFontData> dataCtoE = TestSimpleFontData::createUnloaded('C', 'E');
         RefPtr<SegmentedFontData> segmentedData = SegmentedFontData::create();
-        segmentedData->appendRange(FontDataRange('A', 'C', dataAtoC));
-        segmentedData->appendRange(FontDataRange('B', 'D', dataBtoD));
-        segmentedData->appendRange(FontDataRange('C', 'E', dataCtoE));
+        segmentedData->appendFace(FontDataForRangeSet(dataAtoC, 'A', 'C'));
+        segmentedData->appendFace(FontDataForRangeSet(dataBtoD, 'B', 'D'));
+        segmentedData->appendFace(FontDataForRangeSet(dataCtoE, 'C', 'E'));
         GlyphPageTreeNode* node = GlyphPageTreeNode::getNormalRootChild(segmentedData.get(), kPageNumber);
 
         EXPECT_EQ(0, node->page()->glyphDataForCharacter('A').fontData);
         EXPECT_EQ(dataBtoD, node->page()->glyphDataForCharacter('B').fontData);
         EXPECT_EQ(dataBtoD, node->page()->glyphDataForCharacter('C').fontData);
         EXPECT_EQ(dataBtoD, node->page()->glyphDataForCharacter('D').fontData);
         EXPECT_EQ(0, node->page()->glyphDataForCharacter('E').fontData);
 
         EXPECT_EQ(dataAtoC->customFontData(), node->page()->customFontToLoadAt('A'));
         EXPECT_EQ(dataAtoC->customFontData(), node->page()->customFontToLoadAt('B'));
         EXPECT_EQ(dataAtoC->customFontData(), node->page()->customFontToLoadAt('C'));
         EXPECT_EQ(0, node->page()->customFontToLoadAt('D'));
         EXPECT_EQ(dataCtoE->customFontData(), node->page()->customFontToLoadAt('E'));
     }
     EXPECT_EQ(pageCountBeforeTest, GlyphPageTreeNode::treeGlyphPageCount());
 }
 
 TEST(GlyphPageTreeNodeTest, customDataWithMultiplePages)
 {
     const unsigned kPageNumber = 0;
     size_t pageCountBeforeTest = GlyphPageTreeNode::treeGlyphPageCount();
     {
         RefPtr<TestSimpleFontData> dataAtoC = TestSimpleFontData::createUnloaded('A', 'C');
         RefPtr<TestSimpleFontData> dataBtoD = TestSimpleFontData::create('B', 'D');
         RefPtr<TestSimpleFontData> dataCtoE = TestSimpleFontData::createUnloaded('C', 'E');
         RefPtr<SegmentedFontData> segmentedData1 = SegmentedFontData::create();
         RefPtr<SegmentedFontData> segmentedData2 = SegmentedFontData::create();
         RefPtr<SegmentedFontData> segmentedData3 = SegmentedFontData::create();
-        segmentedData1->appendRange(FontDataRange('A', 'C', dataAtoC));
-        segmentedData2->appendRange(FontDataRange('B', 'D', dataBtoD));
-        segmentedData3->appendRange(FontDataRange('C', 'E', dataCtoE));
+        segmentedData1->appendFace(FontDataForRangeSet(dataAtoC, 'A', 'C'));
+        segmentedData2->appendFace(FontDataForRangeSet(dataBtoD, 'B', 'D'));
+        segmentedData3->appendFace(FontDataForRangeSet(dataCtoE, 'C', 'E'));
         GlyphPageTreeNode* node1 = GlyphPageTreeNode::getNormalRootChild(segmentedData1.get(), kPageNumber);
         GlyphPageTreeNode* node2 = node1->getNormalChild(segmentedData2.get(), kPageNumber);
         GlyphPageTreeNode* node3 = node2->getNormalChild(segmentedData3.get(), kPageNumber);
 
         EXPECT_EQ(0, node3->page()->glyphDataForCharacter('A').fontData);
         EXPECT_EQ(dataBtoD, node3->page()->glyphDataForCharacter('B').fontData);
         EXPECT_EQ(dataBtoD, node3->page()->glyphDataForCharacter('C').fontData);
         EXPECT_EQ(dataBtoD, node3->page()->glyphDataForCharacter('D').fontData);
         EXPECT_EQ(0, node3->page()->glyphDataForCharacter('E').fontData);
 
         EXPECT_EQ(dataAtoC->customFontData(), node3->page()->customFontToLoadAt('A'));
         EXPECT_EQ(dataAtoC->customFontData(), node3->page()->customFontToLoadAt('B'));
         EXPECT_EQ(dataAtoC->customFontData(), node3->page()->customFontToLoadAt('C'));
         EXPECT_EQ(0, node3->page()->customFontToLoadAt('D'));
         EXPECT_EQ(dataCtoE->customFontData(), node3->page()->customFontToLoadAt('E'));
     }
     EXPECT_EQ(pageCountBeforeTest, GlyphPageTreeNode::treeGlyphPageCount());
 }
 
 TEST(GlyphPageTreeNodeTest, systemFallback)
 {
     const unsigned kPageNumber = 0;
     size_t pageCountBeforeTest = GlyphPageTreeNode::treeGlyphPageCount();
     {
         RefPtr<TestSimpleFontData> dataAtoC = TestSimpleFontData::createUnloaded('A', 'C');
         RefPtr<TestSimpleFontData> dataBtoD = TestSimpleFontData::create('B', 'D');
         RefPtr<SegmentedFontData> segmentedData = SegmentedFontData::create();
-        segmentedData->appendRange(FontDataRange('A', 'C', dataAtoC));
+        segmentedData->appendFace(FontDataForRangeSet(dataAtoC, 'A', 'C'));
         GlyphPageTreeNode* node1 = GlyphPageTreeNode::getNormalRootChild(segmentedData.get(), kPageNumber);
         GlyphPageTreeNode* node2 = node1->getNormalChild(dataBtoD.get(), kPageNumber);
         SystemFallbackGlyphPageTreeNode* node3 = node2->getSystemFallbackChild(kPageNumber);
 
         EXPECT_TRUE(node3->isSystemFallback());
 
         EXPECT_EQ(0, node3->page()->glyphDataForCharacter('A').fontData);
         EXPECT_EQ(dataBtoD, node3->page()->glyphDataForCharacter('B').fontData);
         EXPECT_EQ(dataBtoD, node3->page()->glyphDataForCharacter('C').fontData);
         EXPECT_EQ(dataBtoD, node3->page()->glyphDataForCharacter('D').fontData);
@@ skipping 23 matching lines @@
     EXPECT_NE(commonPage, latinPage);
     EXPECT_NE(commonPage, simplifiedChinesePage);
     EXPECT_NE(commonPage, traditionalChinesePage);
     EXPECT_NE(simplifiedChinesePage, traditionalChinesePage);
     EXPECT_NE(commonPage, japanesePage);
     EXPECT_NE(japanesePage, simplifiedChinesePage);
     EXPECT_NE(japanesePage, traditionalChinesePage);
 }
 
 } // namespace blink