Rubber-stamped by Sam Weinig.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2008 19:14:52 +0000 (19:14 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2008 19:14:52 +0000 (19:14 +0000)
        - rename FontDataBaseClass.{cpp,h} back to FontData.{cpp,h}

        * GNUmakefile.am:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * WebCoreSources.bkl:
        * editing/Editor.cpp:
        * platform/graphics/FontData.cpp: Copied from WebCore/platform/graphics/FontDataBaseClass.cpp.
        * platform/graphics/FontData.h: Copied from WebCore/platform/graphics/FontDataBaseClass.h.
        * platform/graphics/FontDataBaseClass.cpp: Removed.
        * platform/graphics/FontDataBaseClass.h: Removed.
        * platform/graphics/SegmentedFontData.h:
        * platform/graphics/SimpleFontData.h:

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

WebCore/ChangeLog
WebCore/GNUmakefile.am
WebCore/WebCore.pro
WebCore/WebCore.vcproj/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/WebCoreSources.bkl
WebCore/editing/Editor.cpp
WebCore/platform/graphics/FontData.cpp [moved from WebCore/platform/graphics/FontDataBaseClass.cpp with 97% similarity]
WebCore/platform/graphics/FontData.h [moved from WebCore/platform/graphics/FontDataBaseClass.h with 95% similarity]
WebCore/platform/graphics/SegmentedFontData.h
WebCore/platform/graphics/SimpleFontData.h

index 39cbb9cfbe25b760ab172acfe1fc303a87964aff..76058909e8de5d0a435e56c56c4d2fa33ea5b425 100644 (file)
@@ -1,3 +1,22 @@
+2008-01-08  Dan Bernstein  <mitz@apple.com>
+
+        Rubber-stamped by Sam Weinig.
+
+        - rename FontDataBaseClass.{cpp,h} back to FontData.{cpp,h}
+
+        * GNUmakefile.am:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * WebCoreSources.bkl:
+        * editing/Editor.cpp:
+        * platform/graphics/FontData.cpp: Copied from WebCore/platform/graphics/FontDataBaseClass.cpp.
+        * platform/graphics/FontData.h: Copied from WebCore/platform/graphics/FontDataBaseClass.h.
+        * platform/graphics/FontDataBaseClass.cpp: Removed.
+        * platform/graphics/FontDataBaseClass.h: Removed.
+        * platform/graphics/SegmentedFontData.h:
+        * platform/graphics/SimpleFontData.h:
+
 2008-01-08  Dan Bernstein  <mitz@apple.com>
 
         Fix a Wx build error.
index aa5a3b57d8d8891f979e1f4dda79f7927cc625b8..ad1df25c1ec808653234ac0a17d1b1708111f0d0 100644 (file)
@@ -913,7 +913,7 @@ webkitgtk_sources += \
        WebCore/platform/graphics/GlyphWidthMap.cpp \
        WebCore/platform/graphics/FontCache.cpp \
        WebCore/platform/graphics/Font.cpp \
-       WebCore/platform/graphics/FontDataBaseClass.cpp \
+       WebCore/platform/graphics/FontData.cpp \
        WebCore/platform/graphics/FontFallbackList.cpp \
        WebCore/platform/graphics/SegmentedFontData.cpp \
        WebCore/platform/graphics/SimpleFontData.cpp \
index e834297dbd79d3ab14b37dfd52463503fe286704..feb5acba36fc77001b8543d18662f1466812c9e8 100644 (file)
@@ -737,7 +737,7 @@ SOURCES += \
     platform/graphics/FloatPoint.cpp \
     platform/graphics/FloatRect.cpp \
     platform/graphics/FloatSize.cpp \
-    platform/graphics/FontDataBaseClass.cpp \
+    platform/graphics/FontData.cpp \
     platform/graphics/GraphicsContext.cpp \
     platform/graphics/GraphicsTypes.cpp \
     platform/graphics/Image.cpp \
index 321e9ba7d8fa4fd994e770082ca5ef389f6da738..d76be68922ae8f812d0c53ae443a22533040432c 100644 (file)
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\platform\graphics\FontDataBaseClass.cpp"\r
+                                       RelativePath="..\platform\graphics\FontData.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\platform\graphics\FontDataBaseClass.h"\r
+                                       RelativePath="..\platform\graphics\FontData.h"\r
                                        >\r
                                </File>\r
                                <File\r
index 8c545563cddee7ceea6143e74871535a2df37565..8fe0bbe1a689d702d089ec40cbd84fdbcb5c04c8 100644 (file)
                1CFCEEFA0AACC7A700348750 /* DOMHTMLInputElementPrivate.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 1CFCEEF90AACC79000348750 /* DOMHTMLInputElementPrivate.h */; };
                2D9066060BE141D400956998 /* LayoutState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D9066040BE141D400956998 /* LayoutState.cpp */; };
                2D9066070BE141D400956998 /* LayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9066050BE141D400956998 /* LayoutState.h */; };
-               371F4F400D25B9AF00ECE0D5 /* FontDataBaseClass.h in Headers */ = {isa = PBXBuildFile; fileRef = 371F4F3E0D25B9AF00ECE0D5 /* FontDataBaseClass.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               371F4F410D25B9AF00ECE0D5 /* FontDataBaseClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 371F4F3F0D25B9AF00ECE0D5 /* FontDataBaseClass.cpp */; };
+               371F4F400D25B9AF00ECE0D5 /* FontData.h in Headers */ = {isa = PBXBuildFile; fileRef = 371F4F3E0D25B9AF00ECE0D5 /* FontData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               371F4F410D25B9AF00ECE0D5 /* FontData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 371F4F3F0D25B9AF00ECE0D5 /* FontData.cpp */; };
                371F4FFC0D25E7F300ECE0D5 /* SegmentedFontData.h in Headers */ = {isa = PBXBuildFile; fileRef = 371F4FFA0D25E7F300ECE0D5 /* SegmentedFontData.h */; };
                371F4FFD0D25E7F300ECE0D5 /* SegmentedFontData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 371F4FFB0D25E7F300ECE0D5 /* SegmentedFontData.cpp */; };
                371F51A10D262FA000ECE0D5 /* CSSSegmentedFontFace.h in Headers */ = {isa = PBXBuildFile; fileRef = 371F519F0D262FA000ECE0D5 /* CSSSegmentedFontFace.h */; };
                2D9066050BE141D400956998 /* LayoutState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LayoutState.h; sourceTree = "<group>"; };
                2D90660B0665D937006B6F1A /* ClipboardMac.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ClipboardMac.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                2D90660C0665D937006B6F1A /* ClipboardMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ClipboardMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               371F4F3E0D25B9AF00ECE0D5 /* FontDataBaseClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontDataBaseClass.h; sourceTree = "<group>"; };
-               371F4F3F0D25B9AF00ECE0D5 /* FontDataBaseClass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontDataBaseClass.cpp; sourceTree = "<group>"; };
+               371F4F3E0D25B9AF00ECE0D5 /* FontData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontData.h; sourceTree = "<group>"; };
+               371F4F3F0D25B9AF00ECE0D5 /* FontData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontData.cpp; sourceTree = "<group>"; };
                371F4FFA0D25E7F300ECE0D5 /* SegmentedFontData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentedFontData.h; sourceTree = "<group>"; };
                371F4FFB0D25E7F300ECE0D5 /* SegmentedFontData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentedFontData.cpp; sourceTree = "<group>"; };
                371F519F0D262FA000ECE0D5 /* CSSSegmentedFontFace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSSegmentedFontFace.h; sourceTree = "<group>"; };
                                B2C3DA520D006CD600EF6F26 /* FontCache.h */,
                                B2C3DA530D006CD600EF6F26 /* SimpleFontData.cpp */,
                                B2C3DA540D006CD600EF6F26 /* SimpleFontData.h */,
-                               371F4F3F0D25B9AF00ECE0D5 /* FontDataBaseClass.cpp */,
-                               371F4F3E0D25B9AF00ECE0D5 /* FontDataBaseClass.h */,
+                               371F4F3F0D25B9AF00ECE0D5 /* FontData.cpp */,
+                               371F4F3E0D25B9AF00ECE0D5 /* FontData.h */,
                                B2C3DA550D006CD600EF6F26 /* FontDescription.h */,
                                B2C3DA560D006CD600EF6F26 /* FontFallbackList.cpp */,
                                B2C3DA570D006CD600EF6F26 /* FontFallbackList.h */,
                                BC60DA3A0D2A302800B9918F /* JSXMLHttpRequestException.h in Headers */,
                                BC60DA5B0D2A31F700B9918F /* XPathException.h in Headers */,
                                BC60DB4A0D2A3D1E00B9918F /* JSXPathException.h in Headers */,
-                               371F4F400D25B9AF00ECE0D5 /* FontDataBaseClass.h in Headers */,
+                               371F4F400D25B9AF00ECE0D5 /* FontData.h in Headers */,
                                371F4FFC0D25E7F300ECE0D5 /* SegmentedFontData.h in Headers */,
                                371F51A10D262FA000ECE0D5 /* CSSSegmentedFontFace.h in Headers */,
                                371F53E90D2704F900ECE0D5 /* CSSUnicodeRangeValue.h in Headers */,
                                BC60D9BF0D2A269A00B9918F /* JSEventException.cpp in Sources */,
                                BC60DA390D2A302800B9918F /* JSXMLHttpRequestException.cpp in Sources */,
                                BC60DB490D2A3D1E00B9918F /* JSXPathException.cpp in Sources */,
-                               371F4F410D25B9AF00ECE0D5 /* FontDataBaseClass.cpp in Sources */,
+                               371F4F410D25B9AF00ECE0D5 /* FontData.cpp in Sources */,
                                371F4FFD0D25E7F300ECE0D5 /* SegmentedFontData.cpp in Sources */,
                                371F51A20D262FA000ECE0D5 /* CSSSegmentedFontFace.cpp in Sources */,
                                371F53EA0D2704F900ECE0D5 /* CSSUnicodeRangeValue.cpp in Sources */,
index 09fbb572afaabf0ea6609e4c13855654109fd90a..b443960d1126f7a3ed23571c5a48107dfdc4bcdb 100644 (file)
@@ -571,7 +571,7 @@ This file contains the list of files needed to build WebCore.
         platform/FileChooser.cpp
         platform/graphics/Font.cpp
         platform/graphics/FontCache.cpp
-        platform/graphics/FontDataBaseClass.cpp
+        platform/graphics/FontData.cpp
         platform/graphics/FontFallbackList.cpp
         platform/graphics/FontFamily.cpp
         platform/graphics/GlyphPageTreeNode.cpp
index 4861fee888ab5393306b07c6626f876d2c987422..cd656cc90904ff6a425a9382cf7cd37bf5fdf434 100644 (file)
@@ -41,7 +41,7 @@
 #include "EventHandler.h"
 #include "EventNames.h"
 #include "FocusController.h"
-#include "FontDataBaseClass.h"
+#include "FontData.h"
 #include "FrameView.h"
 #include "HTMLInputElement.h"
 #include "HTMLTextAreaElement.h"
similarity index 97%
rename from WebCore/platform/graphics/FontDataBaseClass.cpp
rename to WebCore/platform/graphics/FontData.cpp
index 2d4daa01e3aa1c038bfee5106262208c66314722..c40e13cbdb8153695f8eefbde1eb5aa2f03fe697 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "FontDataBaseClass.h"
+#include "FontData.h"
 
 namespace WebCore {
 
similarity index 95%
rename from WebCore/platform/graphics/FontDataBaseClass.h
rename to WebCore/platform/graphics/FontData.h
index a3e934f7f01d52456bb6679560a46613c43c4dbd..352d965864585020bf28205e2e4bb1f5550f2830 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef FontDataBaseClass_h
-#define FontDataBaseClass_h
+#ifndef FontData_h
+#define FontData_h
 
 #include <wtf/Noncopyable.h>
 #include <wtf/unicode/Unicode.h>
@@ -46,4 +46,4 @@ public:
 
 } // namespace WebCore
 
-#endif // FontDataBaseClass_h
+#endif // FontData_h
index 23ef898e2e37a46342848da7753873ffc99d466d..14dc27778bb22246d160e1cf9a2f993d3e859f59 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef SegmentedFontData_h
 #define SegmentedFontData_h
 
-#include "FontDataBaseClass.h"
+#include "FontData.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
index bd6d9dc0c6cff3bf1acb0c44f38dd5bc1bea8b56..fea59a827633569e4cdc2f975dc52b16e0cbf271 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef SimpleFontData_h
 #define SimpleFontData_h
 
-#include "FontDataBaseClass.h"
+#include "FontData.h"
 #include "FontPlatformData.h"
 #include "GlyphPageTreeNode.h"
 #include "GlyphWidthMap.h"