Making Unicode character names consistent

Source/platform/fonts/FontFallbackList.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * 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 19 matching lines @@
 #include "platform/fonts/FontFallbackList.h"
 
 #include "platform/FontFamilyNames.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/FontFamily.h"
 #include "platform/fonts/SegmentedFontData.h"
 #include "wtf/unicode/CharacterNames.h"
 
 namespace blink {
+using namespace WTF;

[jsbell, 2015/05/11 16:28:02]

Are these using declarations necessary?

[h.joshi, 2015/05/12 04:20:14]

Sorry for this, removed now. Was checking something else and they got added to
this CL.

+using namespace Unicode;
 
 FontFallbackList::FontFallbackList()
     : m_pageZero(0)
     , m_cachedPrimarySimpleFontData(0)
     , m_fontSelector(nullptr)
     , m_fontSelectorVersion(0)
     , m_familyIndex(0)
     , m_generation(FontCache::fontCache()->generation())
     , m_hasLoadingFallback(false)
 {
@@ skipping 54 matching lines @@
 const SimpleFontData* FontFallbackList::determinePrimarySimpleFontData(const FontDescription& fontDescription) const
 {
     bool shouldLoadCustomFont = true;
 
     for (unsigned fontIndex = 0; ; ++fontIndex) {
         const FontData* fontData = fontDataAt(fontDescription, fontIndex);
         if (!fontData) {
             // All fonts are custom fonts and are loading. Return the first FontData.
             fontData = fontDataAt(fontDescription, 0);
             if (fontData)
-                return fontData->fontDataForCharacter(space);
+                return fontData->fontDataForCharacter(spaceCharacter);
 
             SimpleFontData* lastResortFallback = FontCache::fontCache()->getLastResortFallbackFont(fontDescription).get();
             ASSERT(lastResortFallback);
             return lastResortFallback;
         }
 
-        if (fontData->isSegmented() && !toSegmentedFontData(fontData)->containsCharacter(space))
+        if (fontData->isSegmented() && !toSegmentedFontData(fontData)->containsCharacter(spaceCharacter))
             continue;
 
-        const SimpleFontData* fontDataForSpace = fontData->fontDataForCharacter(space);
+        const SimpleFontData* fontDataForSpace = fontData->fontDataForCharacter(spaceCharacter);
         ASSERT(fontDataForSpace);
 
         // When a custom font is loading, we should use the correct fallback font to layout the text.
         // Here skip the temporary font for the loading custom font which may not act as the correct fallback font.
         if (!fontDataForSpace->isLoadingFallback())
             return fontDataForSpace;
 
         if (fontData->isSegmented()) {
             const SegmentedFontData* segmented = toSegmentedFontData(fontData);
             for (unsigned i = 0; i < segmented->numRanges(); i++) {
@@ skipping 81 matching lines @@
 
 bool FontFallbackList::isValid() const
 {
     if (!m_fontSelector)
         return m_fontSelectorVersion == 0;
 
     return m_fontSelector->version() == m_fontSelectorVersion;
 }
 
 } // namespace blink