SimpleFontData::fillGlyphPage should not set zero for missing glyphs

Source/platform/fonts/mac/SimpleFontDataCoreText.cpp

 /*
  * Copyright (C) 2005, 2006, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 87 matching lines @@
 }
 
 bool SimpleFontData::fillGlyphPage(GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength) const
 {
     bool haveGlyphs = false;
 
     Vector<CGGlyph, 512> glyphs(bufferLength);
     if (!shouldUseCoreText(buffer, bufferLength, this)) {
         CGFontGetGlyphsForUnichars(platformData().cgFont(), buffer, glyphs.data(), bufferLength);
         for (unsigned i = 0; i < length; ++i) {
-            if (!glyphs[i]) {
-                pageToFill->setGlyphDataForIndex(offset + i, 0, 0);
-            } else {
+            if (glyphs[i]) {
                 pageToFill->setGlyphDataForIndex(offset + i, glyphs[i], this);
                 haveGlyphs = true;
             }
         }
     } else if (!platformData().isCompositeFontReference() && platformData().widthVariant() != RegularWidth
         && CTFontGetGlyphsForCharacters(platformData().ctFont(), buffer, glyphs.data(), bufferLength)) {
         // When buffer consists of surrogate pairs, CTFontGetGlyphsForCharacters
         // places the glyphs at indices corresponding to the first character of each pair.
         unsigned glyphStep = bufferLength / length;
         for (unsigned i = 0; i < length; ++i) {
-            if (!glyphs[i * glyphStep]) {
-                pageToFill->setGlyphDataForIndex(offset + i, 0, 0);
-            } else {
+            if (glyphs[i * glyphStep]) {
                 pageToFill->setGlyphDataForIndex(offset + i, glyphs[i * glyphStep], this);
                 haveGlyphs = true;
             }
         }
     } else {
         // We ask CoreText for possible vertical variant glyphs
         RetainPtr<CFStringRef> string(AdoptCF, CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, buffer, bufferLength, kCFAllocatorNull));
         RetainPtr<CFAttributedStringRef> attributedString(AdoptCF, CFAttributedStringCreate(kCFAllocatorDefault, string.get(), getCFStringAttributes(0, hasVerticalGlyphs() ? Vertical : Horizontal)));
         RetainPtr<CTLineRef> line(AdoptCF, CTLineCreateWithAttributedString(attributedString.get()));
 
         CFArrayRef runArray = CTLineGetGlyphRuns(line.get());
         CFIndex runCount = CFArrayGetCount(runArray);
 
-        // Initialize glyph entries
-        for (unsigned index = 0; index < length; ++index)
-            pageToFill->setGlyphDataForIndex(offset + index, 0, 0);
-
         Vector<CGGlyph, 512> glyphVector;
         Vector<CFIndex, 512> indexVector;
         bool done = false;
 
         // For the CGFont comparison in the loop, use the CGFont that Core Text assigns to the CTFont. This may
         // be non-CFEqual to platformData().cgFont().
         RetainPtr<CGFontRef> cgFont(AdoptCF, CTFontCopyGraphicsFont(platformData().ctFont(), 0));
 
         for (CFIndex r = 0; r < runCount && !done ; ++r) {
             // CTLine could map characters over multiple fonts using its own font fallback list.
@@ skipping 49 matching lines @@
                     }
                 }
             }
         }
     }
 
     return haveGlyphs;
 }
 
 } // namespace WebCore