Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (150718 => 150719)
--- trunk/Source/WebCore/CMakeLists.txt 2013-05-26 15:15:09 UTC (rev 150718)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-05-26 16:20:12 UTC (rev 150719)
@@ -1898,7 +1898,6 @@
platform/graphics/FontData.cpp
platform/graphics/FontDescription.cpp
platform/graphics/FontFallbackList.cpp
- platform/graphics/FontFamily.cpp
platform/graphics/FontFastPath.cpp
platform/graphics/FontFeatureSettings.cpp
platform/graphics/LayoutBoxExtent.cpp
Modified: trunk/Source/WebCore/ChangeLog (150718 => 150719)
--- trunk/Source/WebCore/ChangeLog 2013-05-26 15:15:09 UTC (rev 150718)
+++ trunk/Source/WebCore/ChangeLog 2013-05-26 16:20:12 UTC (rev 150719)
@@ -1,5 +1,24 @@
2013-05-26 Antti Koivisto <[email protected]>
+ Remove FontFamily.h/.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=116788
+
+ Reviewed by Anders Carlsson.
+
+ Empty files.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/graphics/FontDescription.h:
+ * platform/graphics/FontFamily.cpp: Removed.
+ * platform/graphics/FontFamily.h: Removed.
+
+2013-05-26 Antti Koivisto <[email protected]>
+
Use Vector instead of custom linked list for font families
https://bugs.webkit.org/show_bug.cgi?id=116783
Modified: trunk/Source/WebCore/GNUmakefile.list.am (150718 => 150719)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-05-26 15:15:09 UTC (rev 150718)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-05-26 16:20:12 UTC (rev 150719)
@@ -5646,8 +5646,6 @@
Source/WebCore/platform/graphics/FontDescription.h \
Source/WebCore/platform/graphics/FontFallbackList.cpp \
Source/WebCore/platform/graphics/FontFallbackList.h \
- Source/WebCore/platform/graphics/FontFamily.cpp \
- Source/WebCore/platform/graphics/FontFamily.h \
Source/WebCore/platform/graphics/FontFastPath.cpp \
Source/WebCore/platform/graphics/FontFeatureSettings.cpp \
Source/WebCore/platform/graphics/FontFeatureSettings.h \
Modified: trunk/Source/WebCore/Target.pri (150718 => 150719)
--- trunk/Source/WebCore/Target.pri 2013-05-26 15:15:09 UTC (rev 150718)
+++ trunk/Source/WebCore/Target.pri 2013-05-26 16:20:12 UTC (rev 150719)
@@ -993,7 +993,6 @@
platform/HistogramSupport.cpp \
platform/graphics/FontDescription.cpp \
platform/graphics/FontFallbackList.cpp \
- platform/graphics/FontFamily.cpp \
platform/graphics/FontFeatureSettings.cpp \
platform/graphics/BitmapImage.cpp \
platform/graphics/Color.cpp \
@@ -2211,7 +2210,6 @@
platform/graphics/FloatSize.h \
platform/graphics/FontData.h \
platform/graphics/FontDescription.h \
- platform/graphics/FontFamily.h \
platform/graphics/FontFeatureSettings.h \
platform/graphics/FontMetrics.h \
platform/graphics/Font.h \
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (150718 => 150719)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-05-26 15:15:09 UTC (rev 150718)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-05-26 16:20:12 UTC (rev 150719)
@@ -29882,14 +29882,6 @@
>
</File>
<File
- RelativePath="..\platform\graphics\FontFamily.cpp"
- >
- </File>
- <File
- RelativePath="..\platform\graphics\FontFamily.h"
- >
- </File>
- <File
RelativePath="..\platform\graphics\FontFastPath.cpp"
>
</File>
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (150718 => 150719)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-05-26 15:15:09 UTC (rev 150718)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-05-26 16:20:12 UTC (rev 150719)
@@ -4239,7 +4239,6 @@
<ClCompile Include="..\platform\graphics\FontData.cpp" />
<ClCompile Include="..\platform\graphics\FontDescription.cpp" />
<ClCompile Include="..\platform\graphics\FontFallbackList.cpp" />
- <ClCompile Include="..\platform\graphics\FontFamily.cpp" />
<ClCompile Include="..\platform\graphics\FontFastPath.cpp" />
<ClCompile Include="..\platform\graphics\FontFeatureSettings.cpp" />
<ClCompile Include="..\platform\graphics\FontPlatformData.cpp" />
@@ -11624,7 +11623,6 @@
<ClInclude Include="..\platform\graphics\FontData.h" />
<ClInclude Include="..\platform\graphics\FontDescription.h" />
<ClInclude Include="..\platform\graphics\FontFallbackList.h" />
- <ClInclude Include="..\platform\graphics\FontFamily.h" />
<ClInclude Include="..\platform\graphics\FontFeatureSettings.h" />
<ClInclude Include="..\platform\graphics\FontMetrics.h" />
<ClInclude Include="..\platform\graphics\FontPlatformData.h" />
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (150718 => 150719)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-05-26 15:15:09 UTC (rev 150718)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-05-26 16:20:12 UTC (rev 150719)
@@ -4293,8 +4293,6 @@
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, ); }; };
- B2C3DA690D006CD600EF6F26 /* FontFamily.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA580D006CD600EF6F26 /* FontFamily.cpp */; };
- B2C3DA6A0D006CD600EF6F26 /* FontFamily.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA590D006CD600EF6F26 /* FontFamily.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 */; };
@@ -10979,8 +10977,6 @@
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>"; };
- B2C3DA580D006CD600EF6F26 /* FontFamily.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontFamily.cpp; sourceTree = "<group>"; };
- B2C3DA590D006CD600EF6F26 /* FontFamily.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontFamily.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>"; };
@@ -18365,8 +18361,6 @@
B2C3DA550D006CD600EF6F26 /* FontDescription.h */,
B2C3DA560D006CD600EF6F26 /* FontFallbackList.cpp */,
B2C3DA570D006CD600EF6F26 /* FontFallbackList.h */,
- B2C3DA580D006CD600EF6F26 /* FontFamily.cpp */,
- B2C3DA590D006CD600EF6F26 /* FontFamily.h */,
72626E010EF022FE00A07E20 /* FontFastPath.cpp */,
4A6E9FC513C17D570046A7F8 /* FontFeatureSettings.cpp */,
4A6E9FC613C17D570046A7F8 /* FontFeatureSettings.h */,
@@ -21851,7 +21845,6 @@
371F4F400D25B9AF00ECE0D5 /* FontData.h in Headers */,
B2C3DA660D006CD600EF6F26 /* FontDescription.h in Headers */,
B2C3DA680D006CD600EF6F26 /* FontFallbackList.h in Headers */,
- B2C3DA6A0D006CD600EF6F26 /* FontFamily.h in Headers */,
4A6E9FC813C17D570046A7F8 /* FontFeatureSettings.h in Headers */,
4A6E9FC413C17D1D0046A7F8 /* FontFeatureValue.h in Headers */,
409EBDB616B7EEA300CBA3FC /* FontLoader.h in Headers */,
@@ -25050,7 +25043,6 @@
371F4F410D25B9AF00ECE0D5 /* FontData.cpp in Sources */,
37ACCF690DA414E70089E602 /* FontDescription.cpp in Sources */,
B2C3DA670D006CD600EF6F26 /* FontFallbackList.cpp in Sources */,
- B2C3DA690D006CD600EF6F26 /* FontFamily.cpp in Sources */,
72626E020EF022FE00A07E20 /* FontFastPath.cpp in Sources */,
4A6E9FC713C17D570046A7F8 /* FontFeatureSettings.cpp in Sources */,
4A6E9FC313C17D1D0046A7F8 /* FontFeatureValue.cpp in Sources */,
Modified: trunk/Source/WebCore/platform/graphics/FontDescription.h (150718 => 150719)
--- trunk/Source/WebCore/platform/graphics/FontDescription.h 2013-05-26 15:15:09 UTC (rev 150718)
+++ trunk/Source/WebCore/platform/graphics/FontDescription.h 2013-05-26 16:20:12 UTC (rev 150719)
@@ -25,7 +25,6 @@
#ifndef FontDescription_h
#define FontDescription_h
-#include "FontFamily.h"
#include "FontFeatureSettings.h"
#include "FontOrientation.h"
#include "FontRenderingMode.h"
Deleted: trunk/Source/WebCore/platform/graphics/FontFamily.cpp (150718 => 150719)
--- trunk/Source/WebCore/platform/graphics/FontFamily.cpp 2013-05-26 15:15:09 UTC (rev 150718)
+++ trunk/Source/WebCore/platform/graphics/FontFamily.cpp 2013-05-26 16:20:12 UTC (rev 150719)
@@ -1 +0,0 @@
-// Remove me.
Deleted: trunk/Source/WebCore/platform/graphics/FontFamily.h (150718 => 150719)
--- trunk/Source/WebCore/platform/graphics/FontFamily.h 2013-05-26 15:15:09 UTC (rev 150718)
+++ trunk/Source/WebCore/platform/graphics/FontFamily.h 2013-05-26 16:20:12 UTC (rev 150719)
@@ -1 +0,0 @@
-// Remove me.
