Commit 78333174 authored by mitz@apple.com's avatar 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:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@29308 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 0b30af01
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.
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -3805,11 +3805,11 @@
>
</File>
<File
RelativePath="..\platform\graphics\FontDataBaseClass.cpp"
RelativePath="..\platform\graphics\FontData.cpp"
>
</File>
<File
RelativePath="..\platform\graphics\FontDataBaseClass.h"
RelativePath="..\platform\graphics\FontData.h"
>
</File>
<File
......
......@@ -301,8 +301,8 @@
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 */; };
......@@ -4709,8 +4709,8 @@
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>"; };
......@@ -11391,8 +11391,8 @@
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 */,
......@@ -14360,7 +14360,7 @@
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 */,
......@@ -16109,7 +16109,7 @@
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 */,
......@@ -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
......
......@@ -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"
......
......@@ -24,7 +24,7 @@
*/
#include "config.h"
#include "FontDataBaseClass.h"
#include "FontData.h"
namespace WebCore {
......
......@@ -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
......@@ -26,7 +26,7 @@
#ifndef SegmentedFontData_h
#define SegmentedFontData_h
#include "FontDataBaseClass.h"
#include "FontData.h"
#include <wtf/Vector.h>
namespace WebCore {
......
......@@ -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"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment