Bug 948466: Rename gfxPangoFonts to gfxFontconfigFonts. r=nical
authorNicolas Belleville <belleville.nicolas@yahoo.fr>
Wed, 20 May 2015 17:44:09 +0200
changeset 244941 36d1a8d3936a3885fba2953c7761782d3dd9c4ef
parent 244940 9567247769c572884034a37168149b0f62a81cbc
child 244942 26b9e4567122f3d2a8d164f04571f308a9c83463
push id60064
push usernsilva@mozilla.com
push dateThu, 21 May 2015 13:16:58 +0000
treeherdermozilla-inbound@26b9e4567122 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs948466
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 948466: Rename gfxPangoFonts to gfxFontconfigFonts. r=nical
gfx/thebes/gfxFcPlatformFontList.cpp
gfx/thebes/gfxFont.h
gfx/thebes/gfxFontconfigFonts.cpp
gfx/thebes/gfxFontconfigFonts.h
gfx/thebes/gfxPangoFonts.cpp
gfx/thebes/gfxPangoFonts.h
gfx/thebes/gfxPlatformGtk.cpp
gfx/thebes/gfxQtPlatform.cpp
gfx/thebes/moz.build
intl/lwbrk/nsPangoBreaker.cpp
--- a/gfx/thebes/gfxFcPlatformFontList.cpp
+++ b/gfx/thebes/gfxFcPlatformFontList.cpp
@@ -484,17 +484,17 @@ gfxFontconfigFontEntry::GetAspect()
 }
 
 static void
 PrepareFontOptions(FcPattern* aPattern,
                    cairo_font_options_t* aFontOptions)
 {
     NS_ASSERTION(aFontOptions, "null font options passed to PrepareFontOptions");
 
-    // xxx - taken from the gfxPangoFonts code, needs to be reviewed
+    // xxx - taken from the gfxFontconfigFonts code, needs to be reviewed
 
     FcBool printing;
     if (FcPatternGetBool(aPattern, PRINTING_FC_PROPERTY, 0, &printing) !=
             FcResultMatch) {
         printing = FcFalse;
     }
 
     // Font options are set explicitly here to improve cairo's caching
--- a/gfx/thebes/gfxFont.h
+++ b/gfx/thebes/gfxFont.h
@@ -1839,17 +1839,17 @@ protected:
     void CalculateSubSuperSizeAndOffset(int32_t aAppUnitsPerDevPixel,
                                         gfxFloat& aSubSuperSizeRatio,
                                         float& aBaselineOffset);
 
     // Return a font that is a "clone" of this one, but reduced to 80% size
     // (and with variantCaps set to normal).
     // Default implementation relies on gfxFontEntry::CreateFontInstance;
     // backends that don't implement that will need to override this and use
-    // an alternative technique. (gfxPangoFonts, I'm looking at you...)
+    // an alternative technique. (gfxFontconfigFonts, I'm looking at you...)
     virtual already_AddRefed<gfxFont> GetSmallCapsFont();
 
     // subclasses may provide (possibly hinted) glyph widths (in font units);
     // if they do not override this, harfbuzz will use unhinted widths
     // derived from the font tables
     virtual bool ProvidesGlyphWidths() const {
         return false;
     }
rename from gfx/thebes/gfxPangoFonts.cpp
rename to gfx/thebes/gfxFontconfigFonts.cpp
--- a/gfx/thebes/gfxPangoFonts.cpp
+++ b/gfx/thebes/gfxFontconfigFonts.cpp
@@ -10,17 +10,17 @@
 
 #include "gfxContext.h"
 #ifdef MOZ_WIDGET_GTK
 #include "gfxPlatformGtk.h"
 #endif
 #ifdef MOZ_WIDGET_QT
 #include "gfxQtPlatform.h"
 #endif
-#include "gfxPangoFonts.h"
+#include "gfxFontconfigFonts.h"
 #include "gfxFT2FontBase.h"
 #include "gfxFT2Utils.h"
 #include "harfbuzz/hb.h"
 #include "harfbuzz/hb-ot.h"
 #include "nsUnicodeProperties.h"
 #include "nsUnicodeScriptCodes.h"
 #include "gfxFontconfigUtils.h"
 #include "gfxUserFontSet.h"
rename from gfx/thebes/gfxPangoFonts.h
rename to gfx/thebes/gfxFontconfigFonts.h
--- a/gfx/thebes/gfxPangoFonts.h
+++ b/gfx/thebes/gfxFontconfigFonts.h
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef GFX_PANGOFONTS_H
-#define GFX_PANGOFONTS_H
+#ifndef GFX_FONTCONFIG_FONTS_H
+#define GFX_FONTCONFIG_FONTS_H
 
 #include "cairo.h"
 #include "gfxTypes.h"
 #include "gfxTextRun.h"
 
 #include "nsAutoRef.h"
 #include "nsTArray.h"
 
@@ -97,9 +97,9 @@ private:
     virtual void FindPlatformFont(const nsAString& aName,
                                   bool aUseFontSet,
                                   void *aClosure);
 
     friend class gfxSystemFcFontEntry;
     static FT_Library GetFTLibrary();
 };
 
-#endif /* GFX_PANGOFONTS_H */
+#endif /* GFX_FONTCONFIG_FONTS_H */
--- a/gfx/thebes/gfxPlatformGtk.cpp
+++ b/gfx/thebes/gfxPlatformGtk.cpp
@@ -9,17 +9,17 @@
 #include "gfxPlatformGtk.h"
 #include "prenv.h"
 
 #include "nsUnicharUtils.h"
 #include "nsUnicodeProperties.h"
 #include "gfx2DGlue.h"
 #include "gfxFcPlatformFontList.h"
 #include "gfxFontconfigUtils.h"
-#include "gfxPangoFonts.h"
+#include "gfxFontconfigFonts.h"
 #include "gfxContext.h"
 #include "gfxUserFontSet.h"
 #include "gfxUtils.h"
 #include "gfxFT2FontBase.h"
 
 #include "mozilla/gfx/2D.h"
 
 #include "cairo.h"
--- a/gfx/thebes/gfxQtPlatform.cpp
+++ b/gfx/thebes/gfxQtPlatform.cpp
@@ -18,17 +18,17 @@
 #include "mozilla/gfx/2D.h"
 
 #include "cairo.h"
 
 #include "gfxImageSurface.h"
 #include "gfxQPainterSurface.h"
 #include "nsUnicodeProperties.h"
 
-#include "gfxPangoFonts.h"
+#include "gfxFontconfigFonts.h"
 #include "gfxContext.h"
 #include "gfxUserFontSet.h"
 
 #include "nsUnicharUtils.h"
 
 #include "nsMathUtils.h"
 #include "nsTArray.h"
 #ifdef MOZ_X11
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -97,31 +97,31 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
         'gfxMacFont.cpp',
         'gfxPlatformMac.cpp',
         'gfxQuartzImageSurface.cpp',
         'gfxQuartzNativeDrawing.cpp',
         'gfxQuartzSurface.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_GTK']:
     EXPORTS += [
+        'gfxFontconfigFonts.h',
         'gfxFT2FontBase.h',
         'gfxGdkNativeRenderer.h',
-        'gfxPangoFonts.h',
         'gfxPDFSurface.h',
         'gfxPlatformGtk.h',
         'gfxPSSurface.h',
     ]
 
     SOURCES += [
         'gfxFcPlatformFontList.cpp',
+        'gfxFontconfigFonts.cpp',
         'gfxFontconfigUtils.cpp',
         'gfxFT2FontBase.cpp',
         'gfxFT2Utils.cpp',
         'gfxGdkNativeRenderer.cpp',
-        'gfxPangoFonts.cpp',
         'gfxPDFSurface.cpp',
         'gfxPlatformGtk.cpp',
         'gfxPSSurface.cpp',
     ]
 
     if CONFIG['MOZ_X11']:
         EXPORTS += [
             'gfxXlibNativeRenderer.h',
@@ -129,28 +129,28 @@ elif CONFIG['MOZ_WIDGET_GTK']:
         ]
         SOURCES += [
             'gfxXlibNativeRenderer.cpp',
             'gfxXlibSurface.cpp',
         ]
 
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     EXPORTS += [
+        'gfxFontconfigFonts.h',
         'gfxFT2FontBase.h',
-        'gfxPangoFonts.h',
         'gfxPDFSurface.h',
         'gfxQPainterSurface.h',
         'gfxQtNativeRenderer.h',
         'gfxQtPlatform.h',
     ]
     SOURCES += [
+        'gfxFontconfigFonts.cpp',
         'gfxFontconfigUtils.cpp',
         'gfxFT2FontBase.cpp',
         'gfxFT2Utils.cpp',
-        'gfxPangoFonts.cpp',
         'gfxPDFSurface.cpp',
         'gfxQPainterSurface.cpp',
         'gfxQtPlatform.cpp',
     ]
 
     if CONFIG['MOZ_X11']:
         EXPORTS += [
             'gfxXlibSurface.h',
--- a/intl/lwbrk/nsPangoBreaker.cpp
+++ b/intl/lwbrk/nsPangoBreaker.cpp
@@ -45,16 +45,16 @@ NS_GetComplexLineBreaks(const char16_t* 
       bool err;
       uint32_t ch = UTF8CharEnumerator::NextChar(&p, end, &err);
       ++attr;
 
       if (ch == 0 || err) {
         // pango_break (pango 1.16.2) only analyses text before the
         // first NUL (but sets one extra attr). Workaround loop to call
         // pango_break again to analyse after the NUL is done somewhere else
-        // (gfx/thebes/gfxPangoFonts.cpp: SetupClusterBoundaries()).
+        // (gfx/thebes/gfxFontconfigFonts.cpp: SetupClusterBoundaries()).
         // So, we do the same here for pango_get_log_attrs.
         break;
       }
     }
   }
 }