Rename FontFallbackList.cpp/h to FontGlyphs.cpp/h
authorantti@apple.com <antti@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 May 2013 10:44:22 +0000 (10:44 +0000)
committerantti@apple.com <antti@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 May 2013 10:44:22 +0000 (10:44 +0000)
https://bugs.webkit.org/show_bug.cgi?id=117022

Reviewed by Andreas Kling.

Rename to match the class name.

* CMakeLists.txt:
* GNUmakefile.list.am:
* Target.pri:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* platform/graphics/Font.h:
* platform/graphics/FontCache.cpp:
* platform/graphics/FontFallbackList.cpp: Removed.
* platform/graphics/FontFallbackList.h: Removed.
* platform/graphics/FontFastPath.cpp:
* platform/graphics/FontGlyphs.cpp: Copied from Source/WebCore/platform/graphics/FontFallbackList.cpp.
* platform/graphics/FontGlyphs.h: Copied from Source/WebCore/platform/graphics/FontFallbackList.h.
* platform/graphics/mac/FontComplexTextMac.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@150956 268f45cc-cd09-0410-ab3c-d52691b4dbfc

17 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Target.pri
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/graphics/Font.h
Source/WebCore/platform/graphics/FontCache.cpp
Source/WebCore/platform/graphics/FontFastPath.cpp
Source/WebCore/platform/graphics/FontGlyphs.cpp [moved from Source/WebCore/platform/graphics/FontFallbackList.cpp with 99% similarity]
Source/WebCore/platform/graphics/FontGlyphs.h [moved from Source/WebCore/platform/graphics/FontFallbackList.h with 98% similarity]
Source/WebCore/platform/graphics/mac/FontComplexTextMac.cpp
Source/WebCore/platform/graphics/qt/FontQt.cpp
Source/WebCore/platform/graphics/win/FontWin.cpp
Source/WebCore/platform/graphics/wince/FontWinCE.cpp

index ac2b087..a159738 100644 (file)
@@ -1892,7 +1892,7 @@ set(WebCore_SOURCES
     platform/graphics/FontCache.cpp
     platform/graphics/FontData.cpp
     platform/graphics/FontDescription.cpp
-    platform/graphics/FontFallbackList.cpp
+    platform/graphics/FontGlyphs.cpp
     platform/graphics/FontFastPath.cpp
     platform/graphics/FontFeatureSettings.cpp
     platform/graphics/LayoutBoxExtent.cpp
index 5ec545d..f4bc0b4 100644 (file)
@@ -1,3 +1,28 @@
+2013-05-30  Antti Koivisto  <antti@apple.com>
+
+        Rename FontFallbackList.cpp/h to FontGlyphs.cpp/h
+        https://bugs.webkit.org/show_bug.cgi?id=117022
+
+        Reviewed by Andreas Kling.
+
+        Rename to match the class name.
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * Target.pri:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/graphics/Font.h:
+        * platform/graphics/FontCache.cpp:
+        * platform/graphics/FontFallbackList.cpp: Removed.
+        * platform/graphics/FontFallbackList.h: Removed.
+        * platform/graphics/FontFastPath.cpp:
+        * platform/graphics/FontGlyphs.cpp: Copied from Source/WebCore/platform/graphics/FontFallbackList.cpp.
+        * platform/graphics/FontGlyphs.h: Copied from Source/WebCore/platform/graphics/FontFallbackList.h.
+        * platform/graphics/mac/FontComplexTextMac.cpp:
+
 2013-05-30  Ryosuke Niwa  <rniwa@webkit.org>
 
         Get rid of Position::computedStyle
index a0974c5..2e66f48 100644 (file)
@@ -5626,8 +5626,8 @@ webcore_platform_sources += \
        Source/WebCore/platform/graphics/FontData.h \
        Source/WebCore/platform/graphics/FontDescription.cpp \
        Source/WebCore/platform/graphics/FontDescription.h \
-       Source/WebCore/platform/graphics/FontFallbackList.cpp \
-       Source/WebCore/platform/graphics/FontFallbackList.h \
+       Source/WebCore/platform/graphics/FontGlyphs.cpp \
+       Source/WebCore/platform/graphics/FontGlyphs.h \
        Source/WebCore/platform/graphics/FontFastPath.cpp \
        Source/WebCore/platform/graphics/FontFeatureSettings.cpp \
        Source/WebCore/platform/graphics/FontFeatureSettings.h \
index 1aca204..b8285af 100644 (file)
@@ -986,7 +986,7 @@ SOURCES += \
     platform/FileSystem.cpp \
     platform/HistogramSupport.cpp \
     platform/graphics/FontDescription.cpp \
-    platform/graphics/FontFallbackList.cpp \
+    platform/graphics/FontGlyphs.cpp \
     platform/graphics/FontFeatureSettings.cpp \
     platform/graphics/BitmapImage.cpp \
     platform/graphics/Color.cpp \
index f32d2b1..9eece87 100755 (executable)
                                        >
                                </File>
                                <File
-                                       RelativePath="..\platform\graphics\FontFallbackList.cpp"
+                                       RelativePath="..\platform\graphics\FontGlyphs.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\platform\graphics\FontFallbackList.h"
+                                       RelativePath="..\platform\graphics\FontGlyphs.h"
                                        >
                                </File>
                                <File
index afa6eac..fc262ca 100644 (file)
     <ClCompile Include="..\platform\graphics\FontCache.cpp" />
     <ClCompile Include="..\platform\graphics\FontData.cpp" />
     <ClCompile Include="..\platform\graphics\FontDescription.cpp" />
-    <ClCompile Include="..\platform\graphics\FontFallbackList.cpp" />
+    <ClCompile Include="..\platform\graphics\FontGlyphs.cpp" />
     <ClCompile Include="..\platform\graphics\FontFastPath.cpp" />
     <ClCompile Include="..\platform\graphics\FontFeatureSettings.cpp" />
     <ClCompile Include="..\platform\graphics\FontPlatformData.cpp" />
     <ClInclude Include="..\platform\graphics\FontCache.h" />
     <ClInclude Include="..\platform\graphics\FontData.h" />
     <ClInclude Include="..\platform\graphics\FontDescription.h" />
-    <ClInclude Include="..\platform\graphics\FontFallbackList.h" />
+    <ClInclude Include="..\platform\graphics\FontGlyphs.h" />
     <ClInclude Include="..\platform\graphics\FontFeatureSettings.h" />
     <ClInclude Include="..\platform\graphics\FontMetrics.h" />
     <ClInclude Include="..\platform\graphics\FontPlatformData.h" />
index e2b55f8..5113b7d 100644 (file)
     <ClCompile Include="..\platform\graphics\FontDescription.cpp">
       <Filter>platform\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\platform\graphics\FontFallbackList.cpp">
+    <ClCompile Include="..\platform\graphics\FontGlyphs.cpp">
       <Filter>platform\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\platform\graphics\FontFastPath.cpp">
     <ClInclude Include="..\platform\graphics\FontDescription.h">
       <Filter>platform\graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\platform\graphics\FontFallbackList.h">
+    <ClInclude Include="..\platform\graphics\FontGlyphs.h">
       <Filter>platform\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\platform\graphics\FontFeatureSettings.h">
index a859e8e..15cbb2f 100644 (file)
                B2C3DA640D006CD600EF6F26 /* SimpleFontData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA530D006CD600EF6F26 /* SimpleFontData.cpp */; };
                B2C3DA650D006CD600EF6F26 /* SimpleFontData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA540D006CD600EF6F26 /* SimpleFontData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                B2C3DA660D006CD600EF6F26 /* FontDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA550D006CD600EF6F26 /* FontDescription.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               B2C3DA670D006CD600EF6F26 /* FontFallbackList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA560D006CD600EF6F26 /* FontFallbackList.cpp */; };
-               B2C3DA680D006CD600EF6F26 /* FontFallbackList.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA570D006CD600EF6F26 /* FontFallbackList.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA670D006CD600EF6F26 /* FontGlyphs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA560D006CD600EF6F26 /* FontGlyphs.cpp */; };
+               B2C3DA680D006CD600EF6F26 /* FontGlyphs.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA570D006CD600EF6F26 /* FontGlyphs.h */; settings = {ATTRIBUTES = (Private, ); }; };
                B2C3DA6B0D006CD600EF6F26 /* FontSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA5A0D006CD600EF6F26 /* FontSelector.h */; settings = {ATTRIBUTES = (Private, ); }; };
                B2C3DA6C0D006CD600EF6F26 /* GlyphBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA5B0D006CD600EF6F26 /* GlyphBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; };
                B2C3DA6D0D006CD600EF6F26 /* GlyphPageTreeNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA5C0D006CD600EF6F26 /* GlyphPageTreeNode.cpp */; };
                B2C3DA530D006CD600EF6F26 /* SimpleFontData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleFontData.cpp; sourceTree = "<group>"; };
                B2C3DA540D006CD600EF6F26 /* SimpleFontData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SimpleFontData.h; sourceTree = "<group>"; };
                B2C3DA550D006CD600EF6F26 /* FontDescription.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontDescription.h; sourceTree = "<group>"; };
-               B2C3DA560D006CD600EF6F26 /* FontFallbackList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontFallbackList.cpp; sourceTree = "<group>"; };
-               B2C3DA570D006CD600EF6F26 /* FontFallbackList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontFallbackList.h; sourceTree = "<group>"; };
+               B2C3DA560D006CD600EF6F26 /* FontGlyphs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontGlyphs.cpp; sourceTree = "<group>"; };
+               B2C3DA570D006CD600EF6F26 /* FontGlyphs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontGlyphs.h; sourceTree = "<group>"; };
                B2C3DA5A0D006CD600EF6F26 /* FontSelector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontSelector.h; sourceTree = "<group>"; };
                B2C3DA5B0D006CD600EF6F26 /* GlyphBuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GlyphBuffer.h; sourceTree = "<group>"; };
                B2C3DA5C0D006CD600EF6F26 /* GlyphPageTreeNode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphPageTreeNode.cpp; sourceTree = "<group>"; };
                                371F4F3E0D25B9AF00ECE0D5 /* FontData.h */,
                                37ACCE620DA2AA960089E602 /* FontDescription.cpp */,
                                B2C3DA550D006CD600EF6F26 /* FontDescription.h */,
-                               B2C3DA560D006CD600EF6F26 /* FontFallbackList.cpp */,
-                               B2C3DA570D006CD600EF6F26 /* FontFallbackList.h */,
+                               B2C3DA560D006CD600EF6F26 /* FontGlyphs.cpp */,
+                               B2C3DA570D006CD600EF6F26 /* FontGlyphs.h */,
                                72626E010EF022FE00A07E20 /* FontFastPath.cpp */,
                                4A6E9FC513C17D570046A7F8 /* FontFeatureSettings.cpp */,
                                4A6E9FC613C17D570046A7F8 /* FontFeatureSettings.h */,
                                B2AFFC7E0D00A5C10030074D /* FontCustomPlatformData.h in Headers */,
                                371F4F400D25B9AF00ECE0D5 /* FontData.h in Headers */,
                                B2C3DA660D006CD600EF6F26 /* FontDescription.h in Headers */,
-                               B2C3DA680D006CD600EF6F26 /* FontFallbackList.h in Headers */,
+                               B2C3DA680D006CD600EF6F26 /* FontGlyphs.h in Headers */,
                                4A6E9FC813C17D570046A7F8 /* FontFeatureSettings.h in Headers */,
                                4A6E9FC413C17D1D0046A7F8 /* FontFeatureValue.h in Headers */,
                                409EBDB616B7EEA300CBA3FC /* FontLoader.h in Headers */,
                                B2AFFC7D0D00A5C10030074D /* FontCustomPlatformData.cpp in Sources */,
                                371F4F410D25B9AF00ECE0D5 /* FontData.cpp in Sources */,
                                37ACCF690DA414E70089E602 /* FontDescription.cpp in Sources */,
-                               B2C3DA670D006CD600EF6F26 /* FontFallbackList.cpp in Sources */,
+                               B2C3DA670D006CD600EF6F26 /* FontGlyphs.cpp in Sources */,
                                72626E020EF022FE00A07E20 /* FontFastPath.cpp in Sources */,
                                4A6E9FC713C17D570046A7F8 /* FontFeatureSettings.cpp in Sources */,
                                4A6E9FC313C17D1D0046A7F8 /* FontFeatureValue.cpp in Sources */,
index 8f1357f..126f60b 100644 (file)
@@ -26,7 +26,7 @@
 #define Font_h
 
 #include "FontDescription.h"
-#include "FontFallbackList.h"
+#include "FontGlyphs.h"
 #include "SimpleFontData.h"
 #include "TextDirection.h"
 #include "TypesettingFeatures.h"
index e8e242e..f3f1720 100644 (file)
@@ -31,7 +31,7 @@
 #include "FontCache.h"
 
 #include "Font.h"
-#include "FontFallbackList.h"
+#include "FontGlyphs.h"
 #include "FontPlatformData.h"
 #include "FontSelector.h"
 #include "WebKitFontFamilyNames.h"
index fd9fd23..c204f49 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "FloatRect.h"
 #include "FontCache.h"
-#include "FontFallbackList.h"
+#include "FontGlyphs.h"
 #include "GlyphBuffer.h"
 #include "GlyphPageTreeNode.h"
 #include "SimpleFontData.h"
@@ -27,7 +27,7 @@
  */
 
 #include "config.h"
-#include "FontFallbackList.h"
+#include "FontGlyphs.h"
 
 #include "Font.h"
 #include "FontCache.h"
@@ -103,8 +103,8 @@ const FontData* FontGlyphs::realizeFontDataAt(const FontDescription& description
         return 0;
 
     // Ask the font cache for the font data.
-    // We are obtaining this font for the first time.  We keep track of the families we've looked at before
-    // in |m_familyIndex|, so that we never scan the same spot in the list twice.  getFontData will adjust our
+    // We are obtaining this font for the first time. We keep track of the families we've looked at before
+    // in |m_familyIndex|, so that we never scan the same spot in the list twice. getFontData will adjust our
     // |m_familyIndex| as it scans for the right font to make.
     ASSERT(fontCache()->generation() == m_generation);
     RefPtr<FontData> result = fontCache()->getFontData(description, m_familyIndex, m_fontSelector.get());
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef FontFallbackList_h
-#define FontFallbackList_h
+#ifndef FontGlyphs_h
+#define FontGlyphs_h
 
 #include "FontSelector.h"
 #include "SimpleFontData.h"
index ef517c6..d4d4df0 100644 (file)
@@ -26,7 +26,7 @@
 #include "Font.h"
 
 #include "ComplexTextController.h"
-#include "FontFallbackList.h"
+#include "FontGlyphs.h"
 #include "GlyphBuffer.h"
 #include "GraphicsContext.h"
 #include "IntRect.h"
index a2f22d8..5f0d5ee 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "AffineTransform.h"
 #include "FontDescription.h"
-#include "FontFallbackList.h"
+#include "FontGlyphs.h"
 #include "FontSelector.h"
 #include "GlyphBuffer.h"
 #include "Gradient.h"
index b01862f..92093d0 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "Font.h"
 
-#include "FontFallbackList.h"
+#include "FontGlyphs.h"
 #include "GlyphBuffer.h"
 #include "GraphicsContext.h"
 #include "IntRect.h"
index d989be8..65c5b88 100644 (file)
@@ -33,7 +33,7 @@
 #include "FloatRect.h"
 #include "FontCache.h"
 #include "FontData.h"
-#include "FontFallbackList.h"
+#include "FontGlyphs.h"
 #include "GlyphBuffer.h"
 #include "GraphicsContext.h"
 #include "IntRect.h"