Cleanup namespace usage in platform/fonts/.

Review URL: https://codereview.chromium.org/468443002

git-svn-id: svn://svn.chromium.org/blink/trunk@180224 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/platform/fonts/Character.cpp

@@ -372,4 +372,4 @@ String Character::normalizeSpaces(const UChar* characters, unsigned length)
     return normalizeSpacesInternal(characters, length);
 }
 
-}
+} // namespace blink

third_party/WebKit/Source/platform/fonts/Character.h

@@ -74,6 +74,6 @@ private:
     Character();
 };
 
-}
+} // namespace blink
 
 #endif

third_party/WebKit/Source/platform/fonts/CustomFontData.h

@@ -60,6 +60,6 @@ protected:
     template<typename T> inline thisType* to##thisType(const RefPtr<T>& customFontData) { return to##thisType(customFontData.get()); } \
     DEFINE_TYPE_CASTS(thisType, CustomFontData, customFontData, customFontData->predicate, customFontData.predicate)
 
-}
+} // namespace blink
 
 #endif // CustomFontData_h

third_party/WebKit/Source/platform/fonts/FixedPitchFontType.h

@@ -12,6 +12,6 @@ enum FixedPitchFontType {
     NonFixedPitchFont
 };
 
-}
+} // namespace blink
 
 #endif // FixedPitchFontType_h

third_party/WebKit/Source/platform/fonts/Font.cpp

@@ -839,4 +839,4 @@ int Font::offsetForPositionForSimpleText(const TextRun& run, float x, bool inclu
     return offset;
 }
 
-}
+} // namespace blink

third_party/WebKit/Source/platform/fonts/Font.h

@@ -222,6 +222,6 @@ inline float Font::tabWidth(const SimpleFontData& fontData, unsigned tabSize, fl
     return tabWidth - fmodf(position, tabWidth);
 }
 
-}
+} // namespace blink
 
 #endif

third_party/WebKit/Source/platform/fonts/FontCache.cpp

@@ -114,7 +114,7 @@ FontPlatformData* FontCache::getFontPlatformData(const FontDescription& fontDesc
 }
 
 #if ENABLE(OPENTYPE_VERTICAL)
-typedef HashMap<FontCache::FontFileKey, RefPtr<OpenTypeVerticalData>, WTF::IntHash<FontCache::FontFileKey>, WTF::UnsignedWithZeroKeyHashTraits<FontCache::FontFileKey> > FontVerticalDataCache;
+typedef HashMap<FontCache::FontFileKey, RefPtr<OpenTypeVerticalData>, IntHash<FontCache::FontFileKey>, UnsignedWithZeroKeyHashTraits<FontCache::FontFileKey> > FontVerticalDataCache;
 
 FontVerticalDataCache& fontVerticalDataCacheInstance()
 {

third_party/WebKit/Source/platform/fonts/FontCache.h

@@ -180,6 +180,6 @@ public:
     ~FontCachePurgePreventer() { FontCache::fontCache()->enablePurging(); }
 };
 
-}
+} // namespace blink
 
 #endif

third_party/WebKit/Source/platform/fonts/FontCacheKey.h

@@ -111,6 +111,6 @@ struct FontCacheKeyHash {
 
 struct FontCacheKeyTraits : WTF::SimpleClassHashTraits<FontCacheKey> { };
 
-}
+} // namespace blink
 
 #endif // FontCacheKey_h

third_party/WebKit/Source/platform/fonts/FontCacheTest.cpp

@@ -12,7 +12,7 @@
 
 namespace blink {
 
-class EmptyPlatform : public blink::Platform {
+class EmptyPlatform : public Platform {
 public:
     EmptyPlatform() { }
     virtual ~EmptyPlatform() { }
@@ -24,9 +24,9 @@ TEST(FontCache, getLastResortFallbackFont)
     FontCache* fontCache = FontCache::fontCache();
     ASSERT_TRUE(fontCache);
 
-    blink::Platform* oldPlatform = blink::Platform::current();
+    Platform* oldPlatform = Platform::current();
     OwnPtr<EmptyPlatform> platform = adoptPtr(new EmptyPlatform);
-    blink::Platform::initialize(platform.get());
+    Platform::initialize(platform.get());
 
     if (emptyAtom.isNull())
         AtomicString::init();
@@ -40,7 +40,7 @@ TEST(FontCache, getLastResortFallbackFont)
     fontData = fontCache->getLastResortFallbackFont(fontDescription, Retain);
     EXPECT_TRUE(fontData);
 
-    blink::Platform::initialize(oldPlatform);
+    Platform::initialize(oldPlatform);
 }
 
 } // namespace blink

third_party/WebKit/Source/platform/fonts/FontDataCache.cpp

@@ -152,4 +152,4 @@ bool FontDataCache::purgeLeastRecentlyUsed(int count)
     return didWork;
 }
 
-}
+} // namespace blink

third_party/WebKit/Source/platform/fonts/FontDataCache.h

@@ -94,6 +94,6 @@ private:
     ListHashSet<RefPtr<SimpleFontData> > m_inactiveFontData;
 };
 
-}
+} // namespace blink
 
 #endif

third_party/WebKit/Source/platform/fonts/FontDescription.h

@@ -267,6 +267,6 @@ inline bool FontDescription::operator==(const FontDescription& other) const
         && m_subpixelTextPosition == other.m_subpixelTextPosition;
 }
 
-}
+} // namespace blink
 
 #endif

third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp

@@ -243,4 +243,4 @@ const FontData* FontFallbackList::fontDataAt(const FontDescription& fontDescript
     return result.get();
 }
 
-}
+} // namespace blink

third_party/WebKit/Source/platform/fonts/FontFallbackList.h

@@ -131,6 +131,6 @@ private:
     mutable bool m_hasLoadingFallback : 1;
 };
 
-}
+} // namespace blink
 
 #endif

third_party/WebKit/Source/platform/fonts/FontFamily.cpp

@@ -43,4 +43,4 @@ bool operator==(const FontFamily& a, const FontFamily& b)
     return true;
 }
 
-}
+} // namespace blink

third_party/WebKit/Source/platform/fonts/FontFamily.h

@@ -90,6 +90,6 @@ inline PassRefPtr<SharedFontFamily> FontFamily::releaseNext()
     return m_next.release();
 }
 
-}
+} // namespace blink
 
 #endif

third_party/WebKit/Source/platform/fonts/FontFeatureSettings.cpp

@@ -43,4 +43,4 @@ FontFeatureSettings::FontFeatureSettings()
 {
 }
 
-}
+} // namespace blink

third_party/WebKit/Source/platform/fonts/FontFeatureSettings.h

@@ -64,6 +64,6 @@ private:
     Vector<FontFeature> m_list;
 };
 
-}
+} // namespace blink
 
 #endif // FontFeatureSettings_h

third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp

@@ -119,4 +119,4 @@ const FontPlatformData& FontPlatformData::operator=(const FontPlatformData& othe
     return platformDataAssign(other);
 }
 
-}
+} // namespace blink

third_party/WebKit/Source/platform/fonts/FontPlatformFeatures.h

@@ -44,6 +44,6 @@ private:
     FontPlatformFeatures();
 };
 
-}
+} // namespace blink
 
 #endif

third_party/WebKit/Source/platform/fonts/FontRenderStyle.h

@@ -72,6 +72,6 @@ struct FontRenderStyle {
     char useSubpixelPositioning; // use subpixel positioning (fractional X positions for glyphs)
 };
 
-}
+} // namespace blink
 
 #endif // FontRenderStyle_h

third_party/WebKit/Source/platform/fonts/GenericFontFamilySettings.cpp

@@ -183,4 +183,4 @@ void GenericFontFamilySettings::reset()
     m_pictographFontFamilyMap.clear();
 }
 
-}
+} // namespace blink

third_party/WebKit/Source/platform/fonts/GenericFontFamilySettings.h

@@ -100,6 +100,6 @@ private:
     ScriptFontFamilyMap m_pictographFontFamilyMap;
 };
 
-}
+} // namespace blink
 
 #endif

third_party/WebKit/Source/platform/fonts/GlyphBuffer.h

@@ -111,5 +111,6 @@ private:
     bool m_hasVerticalAdvances;
 };
 
-}
+} // namespace blink
+
 #endif

third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.cpp

@@ -402,7 +402,7 @@ void GlyphPageTreeNode::pruneFontData(const SimpleFontData* fontData, unsigned l
     }
 #endif
 
-}
+} // namespace blink
 
 #ifndef NDEBUG
 void showGlyphPageTrees()

third_party/WebKit/Source/platform/fonts/Latin1TextIterator.h

@@ -62,6 +62,6 @@ private:
     int m_lastCharacter;
 };
 
-}
+} // namespace blink
 
 #endif

third_party/WebKit/Source/platform/fonts/SVGGlyph.cpp

@@ -186,6 +186,6 @@ bool isCompatibleGlyph(const SVGGlyph& identifier, bool isVerticalText, const St
     return isCompatibleArabicForm(identifier, chars, startPosition, endPosition);
 }
 
-}
+} // namespace blink
 
 #endif

third_party/WebKit/Source/platform/fonts/WidthIterator.cpp

@@ -264,4 +264,4 @@ bool WidthIterator::advanceOneCharacter(float& width)
     return true;
 }
 
-}
+} // namespace blink

third_party/WebKit/Source/platform/fonts/WidthIterator.h

@@ -98,6 +98,6 @@ private:
     bool m_forTextEmphasis : 1;
 };
 
-}
+} // namespace blink
 
 #endif

third_party/WebKit/Source/platform/fonts/harfbuzz/HarfBuzzFace.h

@@ -70,6 +70,6 @@ private:
     hb_script_t m_scriptForVerticalText;
 };
 
-}
+} // namespace blink
 
 #endif // HarfBuzzFace_h

third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp

@@ -36,11 +36,11 @@ namespace blink {
 
 void FontCache::getFontForCharacter(UChar32 c, const char* preferredLocale, FontCache::PlatformFallbackFont* fallbackFont)
 {
-    blink::WebFallbackFont webFallbackFont;
-    if (blink::Platform::current()->sandboxSupport())
-        blink::Platform::current()->sandboxSupport()->getFallbackFontForCharacter(c, preferredLocale, &webFallbackFont);
+    WebFallbackFont webFallbackFont;
+    if (Platform::current()->sandboxSupport())
+        Platform::current()->sandboxSupport()->getFallbackFontForCharacter(c, preferredLocale, &webFallbackFont);
     else
-        blink::WebFontInfo::fallbackFontForChar(c, preferredLocale, &webFallbackFont);
+        WebFontInfo::fallbackFontForChar(c, preferredLocale, &webFallbackFont);
     fallbackFont->name = String::fromUTF8(CString(webFallbackFont.name));
     fallbackFont->filename = webFallbackFont.filename;
     fallbackFont->fontconfigInterfaceId = webFallbackFont.fontconfigInterfaceId;
@@ -49,4 +49,4 @@ void FontCache::getFontForCharacter(UChar32 c, const char* preferredLocale, Font
     fallbackFont->isItalic = webFallbackFont.isItalic;
 }
 
-}
+} // namespace blink

third_party/WebKit/Source/platform/fonts/linux/FontPlatformDataLinux.cpp

@@ -102,16 +102,16 @@ void FontPlatformData::setupPaint(SkPaint* paint, GraphicsContext* context)
 
 void FontPlatformData::querySystemForRenderStyle(bool useSkiaSubpixelPositioning)
 {
-    blink::WebFontRenderStyle style;
+    WebFontRenderStyle style;
 #if OS(ANDROID)
     style.setDefaults();
 #else
     // If the font name is missing (i.e. probably a web font) or the sandbox is disabled, use the system defaults.
-    if (!m_family.length() || !blink::Platform::current()->sandboxSupport()) {
+    if (!m_family.length() || !Platform::current()->sandboxSupport()) {
         style.setDefaults();
     } else {
         const int sizeAndStyle = (((int)m_textSize) << 2) | (m_typeface->style() & 3);
-        blink::Platform::current()->sandboxSupport()->getRenderStyleForStrike(m_family.data(), sizeAndStyle, &style);
+        Platform::current()->sandboxSupport()->getRenderStyleForStrike(m_family.data(), sizeAndStyle, &style);
     }
 #endif
     style.toFontRenderStyle(&m_style);

third_party/WebKit/Source/platform/fonts/mac/FontCustomPlatformDataMac.cpp

@@ -80,4 +80,4 @@ bool FontCustomPlatformData::supportsFormat(const String& format)
     return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "opentype") || OpenTypeSanitizer::supportsFormat(format);
 }
 
-}
+} // namespace blink

third_party/WebKit/Source/platform/fonts/opentype/OpenTypeUtilities.cpp

@@ -221,4 +221,4 @@ HANDLE renameAndActivateFont(SharedBuffer* fontData, const String& fontName)
     return fontHandle;
 }
 
-}
+} // namespace blink

third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp

@@ -171,7 +171,7 @@ PassRefPtr<SkTypeface> FontCache::createTypeface(const FontDescription& fontDesc
         // TODO(dro): crbug.com/381620 Use creationParams.ttcIndex() after
         // https://code.google.com/p/skia/issues/detail?id=1186 gets fixed.
         SkTypeface* typeface = nullptr;
-        if (blink::Platform::current()->sandboxSupport())
+        if (Platform::current()->sandboxSupport())
             typeface = SkTypeface::CreateFromStream(streamForFontconfigInterfaceId(creationParams.fontconfigInterfaceId()));
         else
             typeface = SkTypeface::CreateFromFile(creationParams.filename().data());

third_party/WebKit/Source/platform/fonts/skia/FontCustomPlatformDataSkia.cpp

@@ -114,4 +114,4 @@ bool FontCustomPlatformData::supportsFormat(const String& format)
     return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "opentype") || OpenTypeSanitizer::supportsFormat(format);
 }
 
-}
+} // namespace blink

third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp

@@ -251,4 +251,4 @@ FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontD
     return result;
 }
 
-}
+} // namespace blink