Rubber stamped by David.
authorzimmermann@webkit.org <zimmermann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Nov 2007 20:35:24 +0000 (20:35 +0000)
committerzimmermann@webkit.org <zimmermann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Nov 2007 20:35:24 +0000 (20:35 +0000)
Next round of moves - platform reorganization.
Move text/font/glyph related files from the individual port directories
into platform/text/<port> or platform/graphics/<port>.

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

66 files changed:
WebCore/ChangeLog
WebCore/DerivedSources.make
WebCore/WebCore.pro
WebCore/WebCore.vcproj/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/platform/graphics/gtk/FontCacheGtk.cpp [moved from WebCore/platform/gtk/FontCacheGtk.cpp with 100% similarity]
WebCore/platform/graphics/gtk/FontDataGtk.cpp [moved from WebCore/platform/gtk/FontDataGtk.cpp with 100% similarity]
WebCore/platform/graphics/gtk/FontGtk.cpp [moved from WebCore/platform/gtk/FontGtk.cpp with 100% similarity]
WebCore/platform/graphics/gtk/FontPlatformData.h [moved from WebCore/platform/gtk/FontPlatformData.h with 100% similarity]
WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp [moved from WebCore/platform/gtk/FontPlatformDataGtk.cpp with 100% similarity]
WebCore/platform/graphics/gtk/GlyphPageTreeNodeGtk.cpp [moved from WebCore/platform/gtk/GlyphPageTreeNodeGtk.cpp with 100% similarity]
WebCore/platform/graphics/mac/FontCacheMac.mm [moved from WebCore/platform/mac/FontCacheMac.mm with 100% similarity]
WebCore/platform/graphics/mac/FontCustomPlatformData.cpp [moved from WebCore/platform/mac/FontCustomPlatformData.cpp with 100% similarity]
WebCore/platform/graphics/mac/FontCustomPlatformData.h [moved from WebCore/platform/mac/FontCustomPlatformData.h with 100% similarity]
WebCore/platform/graphics/mac/FontDataMac.mm [moved from WebCore/platform/mac/FontDataMac.mm with 100% similarity]
WebCore/platform/graphics/mac/FontMac.mm [moved from WebCore/platform/mac/FontMac.mm with 100% similarity]
WebCore/platform/graphics/mac/FontPlatformData.h [moved from WebCore/platform/mac/FontPlatformData.h with 100% similarity]
WebCore/platform/graphics/mac/FontPlatformDataMac.mm [moved from WebCore/platform/mac/FontPlatformDataMac.mm with 100% similarity]
WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp [moved from WebCore/platform/mac/GlyphPageTreeNodeMac.cpp with 100% similarity]
WebCore/platform/graphics/qt/FontCacheQt.cpp [moved from WebCore/platform/qt/FontCacheQt.cpp with 100% similarity]
WebCore/platform/graphics/qt/FontCustomPlatformData.cpp [moved from WebCore/platform/qt/FontCustomPlatformData.cpp with 100% similarity]
WebCore/platform/graphics/qt/FontCustomPlatformData.h [moved from WebCore/platform/qt/FontCustomPlatformData.h with 100% similarity]
WebCore/platform/graphics/qt/FontDataQt.cpp [moved from WebCore/platform/qt/FontDataQt.cpp with 100% similarity]
WebCore/platform/graphics/qt/FontPlatformData.h [moved from WebCore/platform/qt/FontPlatformData.h with 100% similarity]
WebCore/platform/graphics/qt/FontQt.cpp [moved from WebCore/platform/qt/FontQt.cpp with 100% similarity]
WebCore/platform/graphics/qt/GlyphPageTreeNodeQt.cpp [moved from WebCore/platform/qt/GlyphPageTreeNodeQt.cpp with 100% similarity]
WebCore/platform/graphics/win/FontCacheWin.cpp [moved from WebCore/platform/win/FontCacheWin.cpp with 100% similarity]
WebCore/platform/graphics/win/FontCustomPlatformData.cpp [moved from WebCore/platform/win/FontCustomPlatformData.cpp with 100% similarity]
WebCore/platform/graphics/win/FontCustomPlatformData.h [moved from WebCore/platform/win/FontCustomPlatformData.h with 100% similarity]
WebCore/platform/graphics/win/FontDataWin.cpp [moved from WebCore/platform/win/FontDataWin.cpp with 100% similarity]
WebCore/platform/graphics/win/FontDatabase.cpp [moved from WebCore/platform/win/FontDatabase.cpp with 100% similarity]
WebCore/platform/graphics/win/FontDatabase.h [moved from WebCore/platform/win/FontDatabase.h with 100% similarity]
WebCore/platform/graphics/win/FontPlatformData.h [moved from WebCore/platform/win/FontPlatformData.h with 100% similarity]
WebCore/platform/graphics/win/FontPlatformDataWin.cpp [moved from WebCore/platform/win/FontPlatformDataWin.cpp with 100% similarity]
WebCore/platform/graphics/win/FontWin.cpp [moved from WebCore/platform/win/FontWin.cpp with 100% similarity]
WebCore/platform/graphics/win/GlyphPageTreeNodeWin.cpp [moved from WebCore/platform/win/GlyphPageTreeNodeWin.cpp with 100% similarity]
WebCore/platform/graphics/wx/FontCacheWx.cpp [moved from WebCore/platform/wx/FontCacheWx.cpp with 100% similarity]
WebCore/platform/graphics/wx/FontDataWx.cpp [moved from WebCore/platform/wx/FontDataWx.cpp with 100% similarity]
WebCore/platform/graphics/wx/FontPlatformData.h [moved from WebCore/platform/wx/FontPlatformData.h with 100% similarity]
WebCore/platform/graphics/wx/FontPlatformDataWx.cpp [moved from WebCore/platform/wx/FontPlatformDataWx.cpp with 100% similarity]
WebCore/platform/graphics/wx/FontWx.cpp [moved from WebCore/platform/wx/FontWx.cpp with 100% similarity]
WebCore/platform/graphics/wx/GlyphMapWx.cpp [moved from WebCore/platform/wx/GlyphMapWx.cpp with 100% similarity]
WebCore/platform/text/cf/StringCF.cpp [moved from WebCore/platform/cf/StringCF.cpp with 100% similarity]
WebCore/platform/text/cf/StringImplCF.cpp [moved from WebCore/platform/cf/StringImplCF.cpp with 100% similarity]
WebCore/platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp [moved from WebCore/platform/gtk/TextBreakIteratorInternalICUGtk.cpp with 100% similarity]
WebCore/platform/text/mac/ShapeArabic.c [moved from WebCore/platform/mac/ShapeArabic.c with 100% similarity]
WebCore/platform/text/mac/ShapeArabic.h [moved from WebCore/platform/mac/ShapeArabic.h with 100% similarity]
WebCore/platform/text/mac/StringImplMac.mm [moved from WebCore/platform/mac/StringImplMac.mm with 100% similarity]
WebCore/platform/text/mac/StringMac.mm [moved from WebCore/platform/mac/StringMac.mm with 100% similarity]
WebCore/platform/text/mac/TextBoundaries.mm [moved from WebCore/platform/mac/TextBoundaries.mm with 100% similarity]
WebCore/platform/text/mac/TextBreakIteratorInternalICUMac.mm [moved from WebCore/platform/mac/TextBreakIteratorInternalICUMac.mm with 100% similarity]
WebCore/platform/text/mac/TextCodecMac.cpp [moved from WebCore/platform/mac/TextCodecMac.cpp with 100% similarity]
WebCore/platform/text/mac/TextCodecMac.h [moved from WebCore/platform/mac/TextCodecMac.h with 100% similarity]
WebCore/platform/text/mac/character-sets.txt [moved from WebCore/platform/mac/character-sets.txt with 100% similarity]
WebCore/platform/text/mac/mac-encodings.txt [moved from WebCore/platform/mac/mac-encodings.txt with 100% similarity]
WebCore/platform/text/mac/make-charset-table.pl [moved from WebCore/platform/mac/make-charset-table.pl with 100% similarity]
WebCore/platform/text/qt/StringQt.cpp [moved from WebCore/platform/qt/StringQt.cpp with 100% similarity]
WebCore/platform/text/qt/TextBoundaries.cpp [moved from WebCore/platform/qt/TextBoundaries.cpp with 100% similarity]
WebCore/platform/text/qt/TextBreakIteratorQt.cpp [moved from WebCore/platform/qt/TextBreakIteratorQt.cpp with 100% similarity]
WebCore/platform/text/qt/TextCodecQt.cpp [moved from WebCore/platform/qt/TextCodecQt.cpp with 100% similarity]
WebCore/platform/text/qt/TextCodecQt.h [moved from WebCore/platform/qt/TextCodecQt.h with 100% similarity]
WebCore/platform/text/symbian/StringImplSymbian.cpp [moved from WebCore/platform/symbian/StringImplSymbian.cpp with 100% similarity]
WebCore/platform/text/symbian/StringSymbian.cpp [moved from WebCore/platform/symbian/StringSymbian.cpp with 100% similarity]
WebCore/platform/text/win/TextBreakIteratorInternalICUWin.cpp [moved from WebCore/platform/win/TextBreakIteratorInternalICUWin.cpp with 100% similarity]
WebCore/platform/text/wx/StringWx.cpp [moved from WebCore/platform/wx/StringWx.cpp with 100% similarity]
WebCore/webcore-wx.bkl

index 11ec7e0..5ba83cf 100644 (file)
@@ -1,3 +1,143 @@
+2007-11-30  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Rubber stamped by David.
+
+        Next round of moves - platform reorganization.
+        Move text/font/glyph related files from the individual port directories
+        into platform/text/<port> or platform/graphics/<port>.
+
+        * DerivedSources.make:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/cf/StringCF.cpp: Removed.
+        * platform/cf/StringImplCF.cpp: Removed.
+        * platform/graphics/gtk/FontCacheGtk.cpp: Copied from platform/gtk/FontCacheGtk.cpp.
+        * platform/graphics/gtk/FontDataGtk.cpp: Copied from platform/gtk/FontDataGtk.cpp.
+        * platform/graphics/gtk/FontGtk.cpp: Copied from platform/gtk/FontGtk.cpp.
+        * platform/graphics/gtk/FontPlatformData.h: Copied from platform/gtk/FontPlatformData.h.
+        * platform/graphics/gtk/FontPlatformDataGtk.cpp: Copied from platform/gtk/FontPlatformDataGtk.cpp.
+        * platform/graphics/gtk/GlyphPageTreeNodeGtk.cpp: Copied from platform/gtk/GlyphPageTreeNodeGtk.cpp.
+        * platform/graphics/mac/FontCacheMac.mm: Copied from platform/mac/FontCacheMac.mm.
+        * platform/graphics/mac/FontCustomPlatformData.cpp: Copied from platform/mac/FontCustomPlatformData.cpp.
+        * platform/graphics/mac/FontCustomPlatformData.h: Copied from platform/mac/FontCustomPlatformData.h.
+        * platform/graphics/mac/FontDataMac.mm: Copied from platform/mac/FontDataMac.mm.
+        * platform/graphics/mac/FontMac.mm: Copied from platform/mac/FontMac.mm.
+        * platform/graphics/mac/FontPlatformData.h: Copied from platform/mac/FontPlatformData.h.
+        * platform/graphics/mac/FontPlatformDataMac.mm: Copied from platform/mac/FontPlatformDataMac.mm.
+        * platform/graphics/mac/GlyphPageTreeNodeMac.cpp: Copied from platform/mac/GlyphPageTreeNodeMac.cpp.
+        * platform/graphics/qt/FontCacheQt.cpp: Copied from platform/qt/FontCacheQt.cpp.
+        * platform/graphics/qt/FontCustomPlatformData.cpp: Copied from platform/qt/FontCustomPlatformData.cpp.
+        * platform/graphics/qt/FontCustomPlatformData.h: Copied from platform/qt/FontCustomPlatformData.h.
+        * platform/graphics/qt/FontDataQt.cpp: Copied from platform/qt/FontDataQt.cpp.
+        * platform/graphics/qt/FontPlatformData.h: Copied from platform/qt/FontPlatformData.h.
+        * platform/graphics/qt/FontQt.cpp: Copied from platform/qt/FontQt.cpp.
+        * platform/graphics/qt/GlyphPageTreeNodeQt.cpp: Copied from platform/qt/GlyphPageTreeNodeQt.cpp.
+        * platform/graphics/win/FontCacheWin.cpp: Copied from platform/win/FontCacheWin.cpp.
+        * platform/graphics/win/FontCustomPlatformData.cpp: Copied from platform/win/FontCustomPlatformData.cpp.
+        * platform/graphics/win/FontCustomPlatformData.h: Copied from platform/win/FontCustomPlatformData.h.
+        * platform/graphics/win/FontDataWin.cpp: Copied from platform/win/FontDataWin.cpp.
+        * platform/graphics/win/FontDatabase.cpp: Copied from platform/win/FontDatabase.cpp.
+        * platform/graphics/win/FontDatabase.h: Copied from platform/win/FontDatabase.h.
+        * platform/graphics/win/FontPlatformData.h: Copied from platform/win/FontPlatformData.h.
+        * platform/graphics/win/FontPlatformDataWin.cpp: Copied from platform/win/FontPlatformDataWin.cpp.
+        * platform/graphics/win/FontWin.cpp: Copied from platform/win/FontWin.cpp.
+        * platform/graphics/win/GlyphPageTreeNodeWin.cpp: Copied from platform/win/GlyphPageTreeNodeWin.cpp.
+        * platform/graphics/wx/FontCacheWx.cpp: Copied from platform/wx/FontCacheWx.cpp.
+        * platform/graphics/wx/FontDataWx.cpp: Copied from platform/wx/FontDataWx.cpp.
+        * platform/graphics/wx/FontPlatformData.h: Copied from platform/wx/FontPlatformData.h.
+        * platform/graphics/wx/FontPlatformDataWx.cpp: Copied from platform/wx/FontPlatformDataWx.cpp.
+        * platform/graphics/wx/FontWx.cpp: Copied from platform/wx/FontWx.cpp.
+        * platform/graphics/wx/GlyphMapWx.cpp: Copied from platform/wx/GlyphMapWx.cpp.
+        * platform/gtk/FontCacheGtk.cpp: Removed.
+        * platform/gtk/FontDataGtk.cpp: Removed.
+        * platform/gtk/FontGtk.cpp: Removed.
+        * platform/gtk/FontPlatformData.h: Removed.
+        * platform/gtk/FontPlatformDataGtk.cpp: Removed.
+        * platform/gtk/GlyphPageTreeNodeGtk.cpp: Removed.
+        * platform/gtk/TextBreakIteratorInternalICUGtk.cpp: Removed.
+        * platform/mac/FontCacheMac.mm: Removed.
+        * platform/mac/FontCustomPlatformData.cpp: Removed.
+        * platform/mac/FontCustomPlatformData.h: Removed.
+        * platform/mac/FontDataMac.mm: Removed.
+        * platform/mac/FontMac.mm: Removed.
+        * platform/mac/FontPlatformData.h: Removed.
+        * platform/mac/FontPlatformDataMac.mm: Removed.
+        * platform/mac/GlyphPageTreeNodeMac.cpp: Removed.
+        * platform/mac/ShapeArabic.c: Removed.
+        * platform/mac/ShapeArabic.h: Removed.
+        * platform/mac/StringImplMac.mm: Removed.
+        * platform/mac/StringMac.mm: Removed.
+        * platform/mac/TextBoundaries.mm: Removed.
+        * platform/mac/TextBreakIteratorInternalICUMac.mm: Removed.
+        * platform/mac/TextCodecMac.cpp: Removed.
+        * platform/mac/TextCodecMac.h: Removed.
+        * platform/mac/character-sets.txt: Removed.
+        * platform/mac/mac-encodings.txt: Removed.
+        * platform/mac/make-charset-table.pl: Removed.
+        * platform/qt/FontCacheQt.cpp: Removed.
+        * platform/qt/FontCustomPlatformData.cpp: Removed.
+        * platform/qt/FontCustomPlatformData.h: Removed.
+        * platform/qt/FontDataQt.cpp: Removed.
+        * platform/qt/FontPlatformData.h: Removed.
+        * platform/qt/FontQt.cpp: Removed.
+        * platform/qt/GlyphPageTreeNodeQt.cpp: Removed.
+        * platform/qt/StringQt.cpp: Removed.
+        * platform/qt/TextBoundaries.cpp: Removed.
+        * platform/qt/TextBreakIteratorQt.cpp: Removed.
+        * platform/qt/TextCodecQt.cpp: Removed.
+        * platform/qt/TextCodecQt.h: Removed.
+        * platform/symbian/StringImplSymbian.cpp: Removed.
+        * platform/symbian/StringSymbian.cpp: Removed.
+        * platform/text/cf: Added.
+        * platform/text/cf/StringCF.cpp: Copied from platform/cf/StringCF.cpp.
+        * platform/text/cf/StringImplCF.cpp: Copied from platform/cf/StringImplCF.cpp.
+        * platform/text/gtk: Added.
+        * platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp: Copied from platform/gtk/TextBreakIteratorInternalICUGtk.cpp.
+        * platform/text/mac/ShapeArabic.c: Copied from platform/mac/ShapeArabic.c.
+        * platform/text/mac/ShapeArabic.h: Copied from platform/mac/ShapeArabic.h.
+        * platform/text/mac/StringImplMac.mm: Copied from platform/mac/StringImplMac.mm.
+        * platform/text/mac/StringMac.mm: Copied from platform/mac/StringMac.mm.
+        * platform/text/mac/TextBoundaries.mm: Copied from platform/mac/TextBoundaries.mm.
+        * platform/text/mac/TextBreakIteratorInternalICUMac.mm: Copied from platform/mac/TextBreakIteratorInternalICUMac.mm.
+        * platform/text/mac/TextCodecMac.cpp: Copied from platform/mac/TextCodecMac.cpp.
+        * platform/text/mac/TextCodecMac.h: Copied from platform/mac/TextCodecMac.h.
+        * platform/text/mac/character-sets.txt: Copied from platform/mac/character-sets.txt.
+        * platform/text/mac/mac-encodings.txt: Copied from platform/mac/mac-encodings.txt.
+        * platform/text/mac/make-charset-table.pl: Copied from platform/mac/make-charset-table.pl.
+        * platform/text/qt: Added.
+        * platform/text/qt/StringQt.cpp: Copied from platform/qt/StringQt.cpp.
+        * platform/text/qt/TextBoundaries.cpp: Copied from platform/qt/TextBoundaries.cpp.
+        * platform/text/qt/TextBreakIteratorQt.cpp: Copied from platform/qt/TextBreakIteratorQt.cpp.
+        * platform/text/qt/TextCodecQt.cpp: Copied from platform/qt/TextCodecQt.cpp.
+        * platform/text/qt/TextCodecQt.h: Copied from platform/qt/TextCodecQt.h.
+        * platform/text/symbian: Added.
+        * platform/text/symbian/StringImplSymbian.cpp: Copied from platform/symbian/StringImplSymbian.cpp.
+        * platform/text/symbian/StringSymbian.cpp: Copied from platform/symbian/StringSymbian.cpp.
+        * platform/text/win: Added.
+        * platform/text/win/TextBreakIteratorInternalICUWin.cpp: Copied from platform/win/TextBreakIteratorInternalICUWin.cpp.
+        * platform/text/wx: Added.
+        * platform/text/wx/StringWx.cpp: Copied from platform/wx/StringWx.cpp.
+        * platform/win/FontCacheWin.cpp: Removed.
+        * platform/win/FontCustomPlatformData.cpp: Removed.
+        * platform/win/FontCustomPlatformData.h: Removed.
+        * platform/win/FontDataWin.cpp: Removed.
+        * platform/win/FontDatabase.cpp: Removed.
+        * platform/win/FontDatabase.h: Removed.
+        * platform/win/FontPlatformData.h: Removed.
+        * platform/win/FontPlatformDataWin.cpp: Removed.
+        * platform/win/FontWin.cpp: Removed.
+        * platform/win/GlyphPageTreeNodeWin.cpp: Removed.
+        * platform/win/TextBreakIteratorInternalICUWin.cpp: Removed.
+        * platform/wx/FontCacheWx.cpp: Removed.
+        * platform/wx/FontDataWx.cpp: Removed.
+        * platform/wx/FontPlatformData.h: Removed.
+        * platform/wx/FontPlatformDataWx.cpp: Removed.
+        * platform/wx/FontWx.cpp: Removed.
+        * platform/wx/GlyphMapWx.cpp: Removed.
+        * platform/wx/StringWx.cpp: Removed.
+        * webcore-wx.bkl:
+
 2007-11-30  Kevin Ollivier  <kevino@theolliviers.com>
 
         Build fix for wx port. Adding editing/RemoveFormatCommand.cpp
index 8e96376..bc2577a 100644 (file)
@@ -675,7 +675,7 @@ UserAgentStyleSheets.h : css/make-css-file-arrays.pl $(USER_AGENT_STYLE_SHEETS)
 
 # character set name table
 
-CharsetData.cpp : platform/mac/make-charset-table.pl platform/mac/character-sets.txt platform/mac/mac-encodings.txt
+CharsetData.cpp : platform/text/mac/make-charset-table.pl platform/text/mac/character-sets.txt platform/text/mac/mac-encodings.txt
        perl $^ kTextEncoding > $@
 
 # lookup tables for old-style JavaScript bindings
index 0feefee..54521ef 100644 (file)
@@ -886,11 +886,11 @@ qt-port {
     platform/qt/DragImageQt.cpp \
     platform/qt/FileChooserQt.cpp \
     platform/qt/FileSystemQt.cpp \
-    platform/qt/FontCacheQt.cpp \
-    platform/qt/FontCustomPlatformData.cpp \
-    platform/qt/FontDataQt.cpp \
-    platform/qt/FontQt.cpp \
-    platform/qt/GlyphPageTreeNodeQt.cpp \
+    platform/graphics/qt/FontCacheQt.cpp \
+    platform/graphics/qt/FontCustomPlatformData.cpp \
+    platform/graphics/qt/FontDataQt.cpp \
+    platform/graphics/qt/FontQt.cpp \
+    platform/graphics/qt/GlyphPageTreeNodeQt.cpp \
     platform/qt/Localizations.cpp \
     platform/qt/MIMETypeRegistryQt.cpp \
     platform/qt/PasteboardQt.cpp \
@@ -906,11 +906,11 @@ qt-port {
     platform/qt/SearchPopupMenuQt.cpp \
     platform/qt/SharedTimerQt.cpp \
     platform/qt/SoundQt.cpp \
-    platform/qt/StringQt.cpp \
+    platform/text/qt/StringQt.cpp \
     platform/qt/TemporaryLinkStubs.cpp \
-    platform/qt/TextBoundaries.cpp \
-    platform/qt/TextBreakIteratorQt.cpp \
-    platform/qt/TextCodecQt.cpp \
+    platform/text/qt/TextBoundaries.cpp \
+    platform/text/qt/TextBreakIteratorQt.cpp \
+    platform/text/qt/TextCodecQt.cpp \
     platform/qt/ThreadingQt.cpp \
     platform/qt/WheelEventQt.cpp \
     platform/qt/WidgetQt.cpp \
@@ -969,11 +969,11 @@ gtk-port {
         platform/gtk/DragImageGtk.cpp \
         platform/gtk/FileChooserGtk.cpp \
         platform/gtk/FileSystemGtk.cpp \
-        platform/gtk/FontCacheGtk.cpp \
-        platform/gtk/FontDataGtk.cpp \
-        platform/gtk/FontGtk.cpp \
-        platform/gtk/FontPlatformDataGtk.cpp \
-        platform/gtk/GlyphPageTreeNodeGtk.cpp \
+        platform/graphics/gtk/FontCacheGtk.cpp \
+        platform/graphics/gtk/FontDataGtk.cpp \
+        platform/graphics/gtk/FontGtk.cpp \
+        platform/graphics/gtk/FontPlatformDataGtk.cpp \
+        platform/graphics/gtk/GlyphPageTreeNodeGtk.cpp \
         platform/gtk/KeyEventGtk.cpp \
         platform/gtk/Language.cpp \
         platform/gtk/LocalizedStringsGtk.cpp \
@@ -991,7 +991,7 @@ gtk-port {
         platform/gtk/SoundGtk.cpp \
         platform/gtk/SystemTimeGtk.cpp \
         platform/gtk/TemporaryLinkStubs.cpp \
-        platform/gtk/TextBreakIteratorInternalICUGtk.cpp \
+        platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp \
         platform/gtk/ThreadingGtk.cpp \
         platform/gtk/WheelEventGtk.cpp \
         platform/gtk/WidgetGtk.cpp \
index 09aebf2..c4ead0e 100644 (file)
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\platform\win\FontCacheWin.cpp"\r
+                                       RelativePath="..\platform\graphics\win\FontCacheWin.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\platform\win\FontCustomPlatformData.cpp"\r
+                                       RelativePath="..\platform\graphics\win\FontCustomPlatformData.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\platform\win\FontCustomPlatformData.h"\r
+                                       RelativePath="..\platform\graphics\win\FontCustomPlatformData.h"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\platform\win\FontDatabase.cpp"\r
+                                       RelativePath="..\platform\graphics\win\FontDatabase.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\platform\win\FontDatabase.h"\r
+                                       RelativePath="..\platform\graphics\win\FontDatabase.h"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\platform\win\FontDataWin.cpp"\r
+                                       RelativePath="..\platform\graphics\win\FontDataWin.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\platform\win\FontPlatformData.h"\r
+                                       RelativePath="..\platform\graphics\win\FontPlatformData.h"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\platform\win\FontPlatformDataWin.cpp"\r
+                                       RelativePath="..\platform\graphics\win\FontPlatformDataWin.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\platform\win\FontWin.cpp"\r
+                                       RelativePath="..\platform\graphics\win\FontWin.cpp"\r
                                        >\r
                                        <FileConfiguration\r
                                                Name="Debug|Win32"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\platform\win\GlyphPageTreeNodeWin.cpp"\r
+                                       RelativePath="..\platform\graphics\win\GlyphPageTreeNodeWin.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\platform\win\TextBreakIteratorInternalICUWin.cpp"\r
+                                       RelativePath="..\platform\text\win\TextBreakIteratorInternalICUWin.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
index 8f20a8d..b978622 100644 (file)
@@ -57,7 +57,6 @@
                1432E8490C51493F00B1500F /* GCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1432E8480C51493F00B1500F /* GCController.cpp */; };
                1477E7760BF4134A00152872 /* PageCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1477E7740BF4134A00152872 /* PageCache.cpp */; };
                1477E7770BF4134A00152872 /* PageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1477E7750BF4134A00152872 /* PageCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               148A00110AF59F3F008CC700 /* FontPlatformData.h in Headers */ = {isa = PBXBuildFile; fileRef = 148A00100AF59F3F008CC700 /* FontPlatformData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                148AFDA50AF58360008CC700 /* ExceptionHandlers.h in Headers */ = {isa = PBXBuildFile; fileRef = 148AFDA30AF58360008CC700 /* ExceptionHandlers.h */; settings = {ATTRIBUTES = (Private, ); }; };
                148AFDA60AF58360008CC700 /* ExceptionHandlers.mm in Sources */ = {isa = PBXBuildFile; fileRef = 148AFDA40AF58360008CC700 /* ExceptionHandlers.mm */; };
                14993BE50B2F2B1C0050497F /* FocusController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14993BE30B2F2B1C0050497F /* FocusController.cpp */; };
                1AE2AEC80A1D297B00B42B25 /* JSHTMLQuoteElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE2AEC40A1D297B00B42B25 /* JSHTMLQuoteElement.h */; };
                1AE2AEE60A1D2A7500B42B25 /* JSHTMLBlockquoteElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE2AEE40A1D2A7500B42B25 /* JSHTMLBlockquoteElement.cpp */; };
                1AE2AEE70A1D2A7500B42B25 /* JSHTMLBlockquoteElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE2AEE50A1D2A7500B42B25 /* JSHTMLBlockquoteElement.h */; };
-               1AE42F6A0AA4B8CB00C8612D /* StringCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE42F680AA4B8CB00C8612D /* StringCF.cpp */; };
-               1AE42F6B0AA4B8CB00C8612D /* StringImplCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE42F690AA4B8CB00C8612D /* StringImplCF.cpp */; };
                1AE82F8F0CAAFA9D002237AE /* JSDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE82F8D0CAAFA9D002237AE /* JSDatabase.cpp */; };
                1AE82F900CAAFA9D002237AE /* JSDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE82F8E0CAAFA9D002237AE /* JSDatabase.h */; };
                1AE82FEC0CAB07EE002237AE /* JSSQLResultSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE82FEA0CAB07EE002237AE /* JSSQLResultSet.cpp */; };
                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 */; };
-               37919C190BF375DD00956998 /* ShapeArabic.c in Sources */ = {isa = PBXBuildFile; fileRef = 37919C180BF375DD00956998 /* ShapeArabic.c */; };
-               37919C1D0BF3762800956998 /* ShapeArabic.h in Headers */ = {isa = PBXBuildFile; fileRef = 37919C1C0BF3762800956998 /* ShapeArabic.h */; };
                37919C230B7D188600A56998 /* PositionIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37919C210B7D188600A56998 /* PositionIterator.cpp */; };
                37919C240B7D188600A56998 /* PositionIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 37919C220B7D188600A56998 /* PositionIterator.h */; settings = {ATTRIBUTES = (); }; };
                441B05560CD779B6007C1F18 /* DOMCSSStyleSheetPrivate.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 4429AAEA0CB84DC7007647C5 /* DOMCSSStyleSheetPrivate.h */; };
                934D9BA70B8C1175007B42A9 /* WebCoreNSStringExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 934D9BA60B8C1175007B42A9 /* WebCoreNSStringExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
                934FE9E50B5CA539003E4A73 /* FileChooser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 934FE9E40B5CA539003E4A73 /* FileChooser.cpp */; };
                9352071909BD3BA500F2038D /* StaticConstructors.h in Headers */ = {isa = PBXBuildFile; fileRef = 9352071709BD3BA500F2038D /* StaticConstructors.h */; };
-               9352071D09BD3BBB00F2038D /* TextBoundaries.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9352071B09BD3BBB00F2038D /* TextBoundaries.mm */; };
                935207BE09BD410A00F2038D /* LocalizedStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = 935207BD09BD410A00F2038D /* LocalizedStrings.h */; };
                935207C009BD412100F2038D /* LocalizedStringsMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935207BF09BD412000F2038D /* LocalizedStringsMac.mm */; };
                9352084509BD43B900F2038D /* Language.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9352084409BD43B900F2038D /* Language.mm */; };
                939885C408B7E3D100E707C4 /* EventNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 939885C208B7E3D100E707C4 /* EventNames.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93A1EAA00A5634C9006960A0 /* ImageDocumentMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93A1EA9F0A5634C9006960A0 /* ImageDocumentMac.mm */; };
                93A1EAA80A563508006960A0 /* ImageDocumentMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 93A1EAA70A563508006960A0 /* ImageDocumentMac.h */; };
-               93B0FD8A0A759BED0080AD44 /* StringImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93B0FD880A759BED0080AD44 /* StringImplMac.mm */; };
-               93B0FD8B0A759BED0080AD44 /* StringMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93B0FD890A759BED0080AD44 /* StringMac.mm */; };
                93B6A0E60B0BCA5C00F5027A /* ContextMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B6A0E50B0BCA5C00F5027A /* ContextMenu.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93B6A0E80B0BCA6700F5027A /* ContextMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B6A0E70B0BCA6700F5027A /* ContextMenu.cpp */; };
                93B6A0EA0B0BCA8400F5027A /* ContextMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93B6A0E90B0BCA8400F5027A /* ContextMenuMac.mm */; };
                AA882B300B4EF5EB006D26D1 /* PointerEventsHitRules.h in Headers */ = {isa = PBXBuildFile; fileRef = AA882B2E0B4EF5EB006D26D1 /* PointerEventsHitRules.h */; };
                AAC8DAB10AA1002000DC0907 /* SVGMetadataElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAC8DAAF0AA1002000DC0907 /* SVGMetadataElement.cpp */; };
                AAC8DAB20AA1002000DC0907 /* SVGMetadataElement.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC8DAB00AA1002000DC0907 /* SVGMetadataElement.h */; };
-               AACF144D0BEC1EF000827982 /* TextBreakIteratorInternalICUMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = AACF144C0BEC1EF000827982 /* TextBreakIteratorInternalICUMac.mm */; };
                AACF7C4E0B42EE6000080BD8 /* SVGParserUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = AACF7C4C0B42EE6000080BD8 /* SVGParserUtilities.h */; };
                AACF7C4F0B42EE6000080BD8 /* SVGParserUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AACF7C4D0B42EE6000080BD8 /* SVGParserUtilities.cpp */; };
                AB23A31209BBA7760067CC53 /* HTMLTextFieldInnerElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB23A31009BBA7760067CC53 /* HTMLTextFieldInnerElement.cpp */; };
                B2A10B920B3818BD00099AA4 /* ImageBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = B2A10B910B3818BD00099AA4 /* ImageBuffer.h */; };
                B2A10B940B3818D700099AA4 /* ImageBufferCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2A10B930B3818D700099AA4 /* ImageBufferCG.cpp */; };
                B2AE9B9D0C3AF27400F23F7F /* DOMSVGTextPathElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2AE9B9C0C3AF27400F23F7F /* DOMSVGTextPathElement.mm */; };
+               B2AFFC7C0D00A5C10030074D /* FontCacheMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2AFFC740D00A5C10030074D /* FontCacheMac.mm */; };
+               B2AFFC7D0D00A5C10030074D /* FontCustomPlatformData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AFFC750D00A5C10030074D /* FontCustomPlatformData.cpp */; };
+               B2AFFC7E0D00A5C10030074D /* FontCustomPlatformData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AFFC760D00A5C10030074D /* FontCustomPlatformData.h */; };
+               B2AFFC7F0D00A5C10030074D /* FontDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2AFFC770D00A5C10030074D /* FontDataMac.mm */; };
+               B2AFFC800D00A5C10030074D /* FontMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2AFFC780D00A5C10030074D /* FontMac.mm */; };
+               B2AFFC810D00A5C10030074D /* FontPlatformData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AFFC790D00A5C10030074D /* FontPlatformData.h */; };
+               B2AFFC820D00A5C10030074D /* FontPlatformDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2AFFC7A0D00A5C10030074D /* FontPlatformDataMac.mm */; };
+               B2AFFC830D00A5C10030074D /* GlyphPageTreeNodeMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AFFC7B0D00A5C10030074D /* GlyphPageTreeNodeMac.cpp */; };
+               B2AFFC900D00A5DF0030074D /* character-sets.txt in Resources */ = {isa = PBXBuildFile; fileRef = B2AFFC850D00A5DF0030074D /* character-sets.txt */; };
+               B2AFFC910D00A5DF0030074D /* mac-encodings.txt in Resources */ = {isa = PBXBuildFile; fileRef = B2AFFC860D00A5DF0030074D /* mac-encodings.txt */; };
+               B2AFFC920D00A5DF0030074D /* make-charset-table.pl in Resources */ = {isa = PBXBuildFile; fileRef = B2AFFC870D00A5DF0030074D /* make-charset-table.pl */; };
+               B2AFFC930D00A5DF0030074D /* ShapeArabic.c in Sources */ = {isa = PBXBuildFile; fileRef = B2AFFC880D00A5DF0030074D /* ShapeArabic.c */; };
+               B2AFFC940D00A5DF0030074D /* ShapeArabic.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AFFC890D00A5DF0030074D /* ShapeArabic.h */; };
+               B2AFFC950D00A5DF0030074D /* StringImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2AFFC8A0D00A5DF0030074D /* StringImplMac.mm */; };
+               B2AFFC960D00A5DF0030074D /* StringMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2AFFC8B0D00A5DF0030074D /* StringMac.mm */; };
+               B2AFFC970D00A5DF0030074D /* TextBoundaries.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2AFFC8C0D00A5DF0030074D /* TextBoundaries.mm */; };
+               B2AFFC980D00A5DF0030074D /* TextBreakIteratorInternalICUMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2AFFC8D0D00A5DF0030074D /* TextBreakIteratorInternalICUMac.mm */; };
+               B2AFFC990D00A5DF0030074D /* TextCodecMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AFFC8E0D00A5DF0030074D /* TextCodecMac.cpp */; };
+               B2AFFC9A0D00A5DF0030074D /* TextCodecMac.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AFFC8F0D00A5DF0030074D /* TextCodecMac.h */; };
+               B2B2645C0D00A77E000ACC1D /* StringCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2B2645A0D00A77E000ACC1D /* StringCF.cpp */; };
+               B2B2645D0D00A77E000ACC1D /* StringImplCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2B2645B0D00A77E000ACC1D /* StringImplCF.cpp */; };
                B2B33A5F0B887CEF00C15984 /* SVGCharacterLayoutInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2B33A5D0B887CEF00C15984 /* SVGCharacterLayoutInfo.cpp */; };
                B2B33A600B887CEF00C15984 /* SVGCharacterLayoutInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = B2B33A5E0B887CEF00C15984 /* SVGCharacterLayoutInfo.h */; };
                B2C3DA1E0D006C1D00EF6F26 /* AtomicString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3D9ED0D006C1D00EF6F26 /* AtomicString.cpp */; };
                BC5A86850C33676000EEA649 /* DOMSelection.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5A86820C33676000EEA649 /* DOMSelection.h */; };
                BC5A86B50C3367E800EEA649 /* JSDOMSelection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5A86B30C3367E800EEA649 /* JSDOMSelection.cpp */; };
                BC5A86B60C3367E800EEA649 /* JSDOMSelection.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5A86B40C3367E800EEA649 /* JSDOMSelection.h */; };
-               BC64B4BD0CB42929005F2B62 /* FontCustomPlatformData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC64B4BA0CB42929005F2B62 /* FontCustomPlatformData.cpp */; };
-               BC64B4BE0CB42929005F2B62 /* FontCustomPlatformData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC64B4BB0CB42929005F2B62 /* FontCustomPlatformData.h */; };
-               BC64B4BF0CB42929005F2B62 /* FontPlatformDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC64B4BC0CB42929005F2B62 /* FontPlatformDataMac.mm */; };
                BC64B4CB0CB4295D005F2B62 /* CachedFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC64B4C90CB4295D005F2B62 /* CachedFont.cpp */; };
                BC64B4CC0CB4295D005F2B62 /* CachedFont.h in Headers */ = {isa = PBXBuildFile; fileRef = BC64B4CA0CB4295D005F2B62 /* CachedFont.h */; };
                BC64B4D50CB4298A005F2B62 /* CSSFontFace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC64B4CD0CB4298A005F2B62 /* CSSFontFace.cpp */; };
                BC6D6E2609AF943500F59759 /* ScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6D6E2509AF943500F59759 /* ScrollView.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC6DADEF0A195FDF00E5CD14 /* WebFontCache.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6DADEE0A195FDF00E5CD14 /* WebFontCache.h */; };
                BC6DADFA0A19602B00E5CD14 /* WebFontCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC6DADF90A19602B00E5CD14 /* WebFontCache.mm */; };
-               BC6DB4D40A1AFEEF00E5CD14 /* GlyphPageTreeNodeMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC6DB4D30A1AFEEF00E5CD14 /* GlyphPageTreeNodeMac.cpp */; };
                BC6DC7A10C1A4BFA004E2017 /* JSHTMLAllCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6DC7A00C1A4BFA004E2017 /* JSHTMLAllCollection.h */; };
                BC6E2B1A0C04B93600444EF8 /* DOMHTMLDocumentPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6E2B190C04B93600444EF8 /* DOMHTMLDocumentPrivate.h */; };
                BC6E2B290C04B95400444EF8 /* DOMHTMLDocumentPrivate.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = BC6E2B190C04B93600444EF8 /* DOMHTMLDocumentPrivate.h */; };
                BCB773610C17853D00132BA4 /* JSNodeFilterCondition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB7735E0C17853D00132BA4 /* JSNodeFilterCondition.cpp */; };
                BCB773620C17853D00132BA4 /* JSNodeFilterCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB7735F0C17853D00132BA4 /* JSNodeFilterCondition.h */; };
                BCB773630C17853D00132BA4 /* JSNodeFilterCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB773600C17853D00132BA4 /* JSNodeFilterCustom.cpp */; };
-               BCC088860A1BD78D006189A6 /* FontDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCC088850A1BD78D006189A6 /* FontDataMac.mm */; };
                BCC5BE000C0E93110011C2DB /* JSCSSStyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC5BDFE0C0E93110011C2DB /* JSCSSStyleSheet.cpp */; };
                BCC5BE010C0E93110011C2DB /* JSCSSStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC5BDFF0C0E93110011C2DB /* JSCSSStyleSheet.h */; };
                BCCBAD3B0C18BFF800CE890F /* JSHTMLCollectionCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCBAD3A0C18BFF800CE890F /* JSHTMLCollectionCustom.cpp */; };
                BCEA488C097D93020094C9E4 /* RenderText.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA484D097D93020094C9E4 /* RenderText.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BCEA488D097D93020094C9E4 /* RenderTextFragment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA484E097D93020094C9E4 /* RenderTextFragment.cpp */; };
                BCEA488E097D93020094C9E4 /* RenderTextFragment.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA484F097D93020094C9E4 /* RenderTextFragment.h */; };
-               BCEB377309B7BA3900CB38B1 /* FontMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCEB377209B7BA3900CB38B1 /* FontMac.mm */; };
                BCEC01BD0C274DAC009F4EC9 /* Screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEC01BA0C274DAC009F4EC9 /* Screen.cpp */; };
                BCEC01BE0C274DAC009F4EC9 /* Screen.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEC01BB0C274DAC009F4EC9 /* Screen.h */; };
                BCEC01C20C274DDD009F4EC9 /* JSScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEC01C00C274DDD009F4EC9 /* JSScreen.cpp */; };
                BCEF3434087B563E00BBF833 /* HTMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEF3432087B563E00BBF833 /* HTMLElementFactory.cpp */; };
                BCEF3435087B563E00BBF833 /* HTMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEF3433087B563E00BBF833 /* HTMLElementFactory.h */; };
                BCEFAF4E0C317E6900FA81F6 /* JSEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEFAF4D0C317E6900FA81F6 /* JSEventCustom.cpp */; };
-               BCF7C2340A16B5F80032F75B /* FontCacheMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCF7C2330A16B5F80032F75B /* FontCacheMac.mm */; };
                BCFB2E5E0979E46400BA703D /* CachedResourceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BCFB2F76097A2E1A00BA703D /* Arena.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCFB2F74097A2E1A00BA703D /* Arena.cpp */; };
                BCFB2F77097A2E1A00BA703D /* Arena.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB2F75097A2E1A00BA703D /* Arena.h */; };
                E10B9CCD0B747A44003ED890 /* DOMCustomXPathNSResolver.mm in Sources */ = {isa = PBXBuildFile; fileRef = E10B9CCB0B747A44003ED890 /* DOMCustomXPathNSResolver.mm */; };
                E12EDB7B0B308A78002704B6 /* EventTarget.h in Headers */ = {isa = PBXBuildFile; fileRef = E12EDB7A0B308A78002704B6 /* EventTarget.h */; settings = {ATTRIBUTES = (Private, ); }; };
                E12EDBEA0B308E0B002704B6 /* EventTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E12EDBE90B308E0B002704B6 /* EventTarget.cpp */; };
-               E148432F0A674FC2007E4D39 /* TextCodecMac.h in Headers */ = {isa = PBXBuildFile; fileRef = E148432E0A674FC2007E4D39 /* TextCodecMac.h */; };
-               E14843D60A6754A6007E4D39 /* TextCodecMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14843910A6752BF007E4D39 /* TextCodecMac.cpp */; };
                E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1BE512B0CF6C512002EA959 /* XSLTUnicodeSort.cpp */; };
                E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BE512C0CF6C512002EA959 /* XSLTUnicodeSort.h */; };
                E1E6EEA40B628DA8005F2F70 /* JSHTMLSelectElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1E6EEA30B628DA8005F2F70 /* JSHTMLSelectElement.cpp */; };
                1477E7740BF4134A00152872 /* PageCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PageCache.cpp; sourceTree = "<group>"; };
                1477E7750BF4134A00152872 /* PageCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PageCache.h; sourceTree = "<group>"; };
                14813BF309EDF88E00F757E1 /* IDLParser.pm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.perl; name = IDLParser.pm; path = scripts/IDLParser.pm; sourceTree = "<group>"; };
-               148A00100AF59F3F008CC700 /* FontPlatformData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontPlatformData.h; sourceTree = "<group>"; };
                148AFDA30AF58360008CC700 /* ExceptionHandlers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ExceptionHandlers.h; sourceTree = "<group>"; };
                148AFDA40AF58360008CC700 /* ExceptionHandlers.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ExceptionHandlers.mm; sourceTree = "<group>"; };
                14993BE30B2F2B1C0050497F /* FocusController.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FocusController.cpp; sourceTree = "<group>"; };
                1AE2AEC40A1D297B00B42B25 /* JSHTMLQuoteElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLQuoteElement.h; sourceTree = "<group>"; };
                1AE2AEE40A1D2A7500B42B25 /* JSHTMLBlockquoteElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLBlockquoteElement.cpp; sourceTree = "<group>"; };
                1AE2AEE50A1D2A7500B42B25 /* JSHTMLBlockquoteElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLBlockquoteElement.h; sourceTree = "<group>"; };
-               1AE42F680AA4B8CB00C8612D /* StringCF.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = StringCF.cpp; sourceTree = "<group>"; };
-               1AE42F690AA4B8CB00C8612D /* StringImplCF.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = StringImplCF.cpp; sourceTree = "<group>"; };
                1AE82F8D0CAAFA9D002237AE /* JSDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDatabase.cpp; sourceTree = "<group>"; };
                1AE82F8E0CAAFA9D002237AE /* JSDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDatabase.h; sourceTree = "<group>"; };
                1AE82FEA0CAB07EE002237AE /* JSSQLResultSet.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = JSSQLResultSet.cpp; sourceTree = "<group>"; };
                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; };
-               37919C180BF375DD00956998 /* ShapeArabic.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ShapeArabic.c; sourceTree = "<group>"; };
-               37919C1C0BF3762800956998 /* ShapeArabic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeArabic.h; sourceTree = "<group>"; };
                37919C210B7D188600A56998 /* PositionIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PositionIterator.cpp; sourceTree = "<group>"; };
                37919C220B7D188600A56998 /* PositionIterator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PositionIterator.h; sourceTree = "<group>"; };
                441244D80CB853ED008F0C79 /* JSHTMLInputElementBaseTable.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 30; path = JSHTMLInputElementBaseTable.cpp; sourceTree = "<group>"; };
                65DF323609D1DE65000BE325 /* JSCanvasPattern.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSCanvasPattern.h; sourceTree = "<group>"; };
                65DF323709D1DE65000BE325 /* JSCanvasRenderingContext2D.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSCanvasRenderingContext2D.cpp; sourceTree = "<group>"; };
                65DF323809D1DE65000BE325 /* JSCanvasRenderingContext2D.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSCanvasRenderingContext2D.h; sourceTree = "<group>"; };
-               65F5382409B2B57500F3DC4A /* mac-encodings.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "mac-encodings.txt"; sourceTree = "<group>"; };
                65F80697054D9F86008BF776 /* BlockExceptions.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = BlockExceptions.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                65FEA86809833ADE00BED4AB /* Page.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Page.cpp; sourceTree = "<group>"; };
                7E6FEED60898582300C44C3F /* WebCoreScriptDebugger.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreScriptDebugger.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                934D9BA60B8C1175007B42A9 /* WebCoreNSStringExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreNSStringExtras.h; sourceTree = "<group>"; };
                934FE9E40B5CA539003E4A73 /* FileChooser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileChooser.cpp; sourceTree = "<group>"; };
                9352071709BD3BA500F2038D /* StaticConstructors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StaticConstructors.h; sourceTree = "<group>"; };
-               9352071B09BD3BBB00F2038D /* TextBoundaries.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextBoundaries.mm; sourceTree = "<group>"; };
                935207BD09BD410A00F2038D /* LocalizedStrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalizedStrings.h; sourceTree = "<group>"; };
                935207BF09BD412000F2038D /* LocalizedStringsMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalizedStringsMac.mm; sourceTree = "<group>"; };
                9352084409BD43B900F2038D /* Language.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Language.mm; sourceTree = "<group>"; };
                939885C208B7E3D100E707C4 /* EventNames.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = EventNames.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                93A1EA9F0A5634C9006960A0 /* ImageDocumentMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ImageDocumentMac.mm; sourceTree = "<group>"; };
                93A1EAA70A563508006960A0 /* ImageDocumentMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageDocumentMac.h; sourceTree = "<group>"; };
-               93B0FD880A759BED0080AD44 /* StringImplMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = StringImplMac.mm; sourceTree = "<group>"; };
-               93B0FD890A759BED0080AD44 /* StringMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = StringMac.mm; sourceTree = "<group>"; };
                93B6A0E50B0BCA5C00F5027A /* ContextMenu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ContextMenu.h; sourceTree = "<group>"; };
                93B6A0E70B0BCA6700F5027A /* ContextMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ContextMenu.cpp; sourceTree = "<group>"; };
                93B6A0E90B0BCA8400F5027A /* ContextMenuMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ContextMenuMac.mm; sourceTree = "<group>"; };
                AA882B2E0B4EF5EB006D26D1 /* PointerEventsHitRules.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PointerEventsHitRules.h; sourceTree = "<group>"; };
                AAC8DAAF0AA1002000DC0907 /* SVGMetadataElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGMetadataElement.cpp; sourceTree = "<group>"; };
                AAC8DAB00AA1002000DC0907 /* SVGMetadataElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGMetadataElement.h; sourceTree = "<group>"; };
-               AACF144C0BEC1EF000827982 /* TextBreakIteratorInternalICUMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = TextBreakIteratorInternalICUMac.mm; sourceTree = "<group>"; };
                AACF7C4C0B42EE6000080BD8 /* SVGParserUtilities.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGParserUtilities.h; sourceTree = "<group>"; };
                AACF7C4D0B42EE6000080BD8 /* SVGParserUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGParserUtilities.cpp; sourceTree = "<group>"; };
                AB23A31009BBA7760067CC53 /* HTMLTextFieldInnerElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLTextFieldInnerElement.cpp; sourceTree = "<group>"; };
                B2A10B910B3818BD00099AA4 /* ImageBuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageBuffer.h; sourceTree = "<group>"; };
                B2A10B930B3818D700099AA4 /* ImageBufferCG.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImageBufferCG.cpp; sourceTree = "<group>"; };
                B2AE9B9C0C3AF27400F23F7F /* DOMSVGTextPathElement.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMSVGTextPathElement.mm; sourceTree = "<group>"; };
+               B2AFFC740D00A5C10030074D /* FontCacheMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FontCacheMac.mm; sourceTree = "<group>"; };
+               B2AFFC750D00A5C10030074D /* FontCustomPlatformData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontCustomPlatformData.cpp; sourceTree = "<group>"; };
+               B2AFFC760D00A5C10030074D /* FontCustomPlatformData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontCustomPlatformData.h; sourceTree = "<group>"; };
+               B2AFFC770D00A5C10030074D /* FontDataMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FontDataMac.mm; sourceTree = "<group>"; };
+               B2AFFC780D00A5C10030074D /* FontMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FontMac.mm; sourceTree = "<group>"; };
+               B2AFFC790D00A5C10030074D /* FontPlatformData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontPlatformData.h; sourceTree = "<group>"; };
+               B2AFFC7A0D00A5C10030074D /* FontPlatformDataMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FontPlatformDataMac.mm; sourceTree = "<group>"; };
+               B2AFFC7B0D00A5C10030074D /* GlyphPageTreeNodeMac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphPageTreeNodeMac.cpp; sourceTree = "<group>"; };
+               B2AFFC850D00A5DF0030074D /* character-sets.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "character-sets.txt"; sourceTree = "<group>"; };
+               B2AFFC860D00A5DF0030074D /* mac-encodings.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "mac-encodings.txt"; sourceTree = "<group>"; };
+               B2AFFC870D00A5DF0030074D /* make-charset-table.pl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.perl; path = "make-charset-table.pl"; sourceTree = "<group>"; };
+               B2AFFC880D00A5DF0030074D /* ShapeArabic.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ShapeArabic.c; sourceTree = "<group>"; };
+               B2AFFC890D00A5DF0030074D /* ShapeArabic.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ShapeArabic.h; sourceTree = "<group>"; };
+               B2AFFC8A0D00A5DF0030074D /* StringImplMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = StringImplMac.mm; sourceTree = "<group>"; };
+               B2AFFC8B0D00A5DF0030074D /* StringMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = StringMac.mm; sourceTree = "<group>"; };
+               B2AFFC8C0D00A5DF0030074D /* TextBoundaries.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = TextBoundaries.mm; sourceTree = "<group>"; };
+               B2AFFC8D0D00A5DF0030074D /* TextBreakIteratorInternalICUMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = TextBreakIteratorInternalICUMac.mm; sourceTree = "<group>"; };
+               B2AFFC8E0D00A5DF0030074D /* TextCodecMac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecMac.cpp; sourceTree = "<group>"; };
+               B2AFFC8F0D00A5DF0030074D /* TextCodecMac.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextCodecMac.h; sourceTree = "<group>"; };
+               B2B2645A0D00A77E000ACC1D /* StringCF.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = StringCF.cpp; sourceTree = "<group>"; };
+               B2B2645B0D00A77E000ACC1D /* StringImplCF.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = StringImplCF.cpp; sourceTree = "<group>"; };
                B2B33A5D0B887CEF00C15984 /* SVGCharacterLayoutInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGCharacterLayoutInfo.cpp; sourceTree = "<group>"; };
                B2B33A5E0B887CEF00C15984 /* SVGCharacterLayoutInfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGCharacterLayoutInfo.h; sourceTree = "<group>"; };
                B2C3D9ED0D006C1D00EF6F26 /* AtomicString.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AtomicString.cpp; sourceTree = "<group>"; };
                B2FA3D310AB75A6F000E5AC4 /* JSSVGZoomEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGZoomEvent.h; sourceTree = "<group>"; };
                BC014C720CC5579D009C4B20 /* SecurityOrigin.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SecurityOrigin.cpp; sourceTree = "<group>"; };
                BC014C730CC5579D009C4B20 /* SecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SecurityOrigin.h; sourceTree = "<group>"; };
-               BC0564990C6ABC1000ACE412 /* character-sets.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "character-sets.txt"; sourceTree = "<group>"; };
-               BC05649A0C6ABC1000ACE412 /* make-charset-table.pl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.perl; path = "make-charset-table.pl"; sourceTree = "<group>"; };
                BC066F6C09FEB2FA00C589A7 /* WebCoreTextRenderer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreTextRenderer.h; sourceTree = "<group>"; };
                BC06ED040BFD5BAE00856E9D /* JSHTMLTableSectionElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLTableSectionElement.cpp; sourceTree = "<group>"; };
                BC06ED050BFD5BAE00856E9D /* JSHTMLTableSectionElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLTableSectionElement.h; sourceTree = "<group>"; };
                BC5A86B30C3367E800EEA649 /* JSDOMSelection.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMSelection.cpp; sourceTree = "<group>"; };
                BC5A86B40C3367E800EEA649 /* JSDOMSelection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSDOMSelection.h; sourceTree = "<group>"; };
                BC5EC1760A507E3E006007F5 /* view-source.css */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "view-source.css"; sourceTree = "<group>"; };
-               BC64B4BA0CB42929005F2B62 /* FontCustomPlatformData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontCustomPlatformData.cpp; sourceTree = "<group>"; };
-               BC64B4BB0CB42929005F2B62 /* FontCustomPlatformData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontCustomPlatformData.h; sourceTree = "<group>"; };
-               BC64B4BC0CB42929005F2B62 /* FontPlatformDataMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FontPlatformDataMac.mm; sourceTree = "<group>"; };
                BC64B4C90CB4295D005F2B62 /* CachedFont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedFont.cpp; sourceTree = "<group>"; };
                BC64B4CA0CB4295D005F2B62 /* CachedFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedFont.h; sourceTree = "<group>"; };
                BC64B4CD0CB4298A005F2B62 /* CSSFontFace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontFace.cpp; sourceTree = "<group>"; };
                BC6D6E2509AF943500F59759 /* ScrollView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ScrollView.h; sourceTree = "<group>"; };
                BC6DADEE0A195FDF00E5CD14 /* WebFontCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFontCache.h; sourceTree = "<group>"; };
                BC6DADF90A19602B00E5CD14 /* WebFontCache.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFontCache.mm; sourceTree = "<group>"; };
-               BC6DB4D30A1AFEEF00E5CD14 /* GlyphPageTreeNodeMac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphPageTreeNodeMac.cpp; sourceTree = "<group>"; };
                BC6DC7A00C1A4BFA004E2017 /* JSHTMLAllCollection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLAllCollection.h; sourceTree = "<group>"; };
                BC6E2B190C04B93600444EF8 /* DOMHTMLDocumentPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLDocumentPrivate.h; sourceTree = "<group>"; };
                BC772B350C4EA91E0083285F /* CSSHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSHelper.cpp; sourceTree = "<group>"; };
                BCB7735E0C17853D00132BA4 /* JSNodeFilterCondition.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSNodeFilterCondition.cpp; sourceTree = "<group>"; };
                BCB7735F0C17853D00132BA4 /* JSNodeFilterCondition.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSNodeFilterCondition.h; sourceTree = "<group>"; };
                BCB773600C17853D00132BA4 /* JSNodeFilterCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSNodeFilterCustom.cpp; sourceTree = "<group>"; };
-               BCC088850A1BD78D006189A6 /* FontDataMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FontDataMac.mm; sourceTree = "<group>"; };
                BCC5BDFE0C0E93110011C2DB /* JSCSSStyleSheet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSStyleSheet.cpp; sourceTree = "<group>"; };
                BCC5BDFF0C0E93110011C2DB /* JSCSSStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSCSSStyleSheet.h; sourceTree = "<group>"; };
                BCC8CFCA0986CD2400140BF2 /* ColorData.gperf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ColorData.gperf; sourceTree = "<group>"; };
                BCEA484D097D93020094C9E4 /* RenderText.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderText.h; sourceTree = "<group>"; };
                BCEA484E097D93020094C9E4 /* RenderTextFragment.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextFragment.cpp; sourceTree = "<group>"; };
                BCEA484F097D93020094C9E4 /* RenderTextFragment.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderTextFragment.h; sourceTree = "<group>"; };
-               BCEB377209B7BA3900CB38B1 /* FontMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FontMac.mm; sourceTree = "<group>"; };
                BCEC01BA0C274DAC009F4EC9 /* Screen.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Screen.cpp; sourceTree = "<group>"; };
                BCEC01BB0C274DAC009F4EC9 /* Screen.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Screen.h; sourceTree = "<group>"; };
                BCEC01BC0C274DAC009F4EC9 /* Screen.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Screen.idl; sourceTree = "<group>"; };
                BCEF3432087B563E00BBF833 /* HTMLElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLElementFactory.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                BCEF3433087B563E00BBF833 /* HTMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HTMLElementFactory.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                BCEFAF4D0C317E6900FA81F6 /* JSEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSEventCustom.cpp; sourceTree = "<group>"; };
-               BCF7C2330A16B5F80032F75B /* FontCacheMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FontCacheMac.mm; sourceTree = "<group>"; };
                BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedResourceClient.h; sourceTree = "<group>"; };
                BCFB2F74097A2E1A00BA703D /* Arena.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Arena.cpp; sourceTree = "<group>"; };
                BCFB2F75097A2E1A00BA703D /* Arena.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Arena.h; sourceTree = "<group>"; };
                E10B9CCB0B747A44003ED890 /* DOMCustomXPathNSResolver.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMCustomXPathNSResolver.mm; sourceTree = "<group>"; };
                E12EDB7A0B308A78002704B6 /* EventTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventTarget.h; sourceTree = "<group>"; };
                E12EDBE90B308E0B002704B6 /* EventTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventTarget.cpp; sourceTree = "<group>"; };
-               E148432E0A674FC2007E4D39 /* TextCodecMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = TextCodecMac.h; path = mac/TextCodecMac.h; sourceTree = "<group>"; };
-               E14843910A6752BF007E4D39 /* TextCodecMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = TextCodecMac.cpp; path = mac/TextCodecMac.cpp; sourceTree = "<group>"; };
                E1BE512B0CF6C512002EA959 /* XSLTUnicodeSort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XSLTUnicodeSort.cpp; sourceTree = "<group>"; };
                E1BE512C0CF6C512002EA959 /* XSLTUnicodeSort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XSLTUnicodeSort.h; sourceTree = "<group>"; };
                E1E6EEA30B628DA8005F2F70 /* JSHTMLSelectElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLSelectElement.cpp; sourceTree = "<group>"; };
                        isa = PBXGroup;
                        children = (
                                1A98956A0AA78F80005EF5EF /* KURLCFNet.cpp */,
-                               1AE42F680AA4B8CB00C8612D /* StringCF.cpp */,
-                               1AE42F690AA4B8CB00C8612D /* StringImplCF.cpp */,
                                5160306B0CC4362300C8AC25 /* FileSystemCF.cpp */,
                        );
                        path = cf;
                6582A14809999D6C00BEEB6D /* mac */ = {
                        isa = PBXGroup;
                        children = (
-                               BC64B4BA0CB42929005F2B62 /* FontCustomPlatformData.cpp */,
-                               BC64B4BB0CB42929005F2B62 /* FontCustomPlatformData.h */,
-                               BC64B4BC0CB42929005F2B62 /* FontPlatformDataMac.mm */,
                                51E1ECAD0C91C54600DC255B /* AutodrainedPool.mm */,
                                65A640F00533BB1F0085E777 /* BlockExceptions.h */,
                                65F80697054D9F86008BF776 /* BlockExceptions.mm */,
-                               BC0564990C6ABC1000ACE412 /* character-sets.txt */,
                                2D90660B0665D937006B6F1A /* ClipboardMac.h */,
                                2D90660C0665D937006B6F1A /* ClipboardMac.mm */,
                                06027CB20B1CC03D00884B2D /* ContextMenuItemMac.mm */,
                                A7CFB3D40B7ED1180070C32D /* DragImageMac.mm */,
                                066C772C0AB603D200238CC4 /* FileChooserMac.mm */,
                                514B3F750C722055000530DF /* FileSystemMac.mm */,
-                               BCF7C2330A16B5F80032F75B /* FontCacheMac.mm */,
-                               BCC088850A1BD78D006189A6 /* FontDataMac.mm */,
-                               BCEB377209B7BA3900CB38B1 /* FontMac.mm */,
-                               148A00100AF59F3F008CC700 /* FontPlatformData.h */,
                                935C476C09AC4D6300A6AAB4 /* FoundationExtras.h */,
-                               BC6DB4D30A1AFEEF00E5CD14 /* GlyphPageTreeNodeMac.cpp */,
                                935C476E09AC4D7300A6AAB4 /* KeyEventMac.mm */,
                                6593923909AE435C002C531F /* KURLMac.mm */,
                                9352084409BD43B900F2038D /* Language.mm */,
                                06E81EEB0AB5DA9700C87837 /* LocalCurrentGraphicsContext.mm */,
                                935207BF09BD412000F2038D /* LocalizedStringsMac.mm */,
                                1402645D0AFDC19B005919E2 /* LoggingMac.mm */,
-                               65F5382409B2B57500F3DC4A /* mac-encodings.txt */,
-                               BC05649A0C6ABC1000ACE412 /* make-charset-table.pl */,
                                BC772C5D0C4EB3440083285F /* MIMETypeRegistryMac.mm */,
                                A7D3C5230B576B4B002CA450 /* PasteboardHelper.h */,
                                4B2709810AF2E5E00065127F /* PasteboardMac.mm */,
                                BCAA90C20A7EBA60008B1229 /* ScrollBar.cpp */,
                                9353676A09AED88B00D35CD6 /* ScrollViewMac.mm */,
                                AB71709F0B31193B0017123E /* SearchPopupMenuMac.mm */,
-                               37919C180BF375DD00956998 /* ShapeArabic.c */,
-                               37919C1C0BF3762800956998 /* ShapeArabic.h */,
                                1A4A95510B4EDCFF002D8C3C /* SharedBufferMac.mm */,
                                93309E9F099EB78C0056E581 /* SharedTimerMac.cpp */,
                                0A4844980CA44CB200B7BD48 /* SoftLinking.h */,
                                4B3043C80AE0371D00A82647 /* SoundMac.mm */,
                                84B2B24F056BF15F00D2B771 /* SSLKeyGeneratorMac.mm */,
-                               93B0FD880A759BED0080AD44 /* StringImplMac.mm */,
-                               93B0FD890A759BED0080AD44 /* StringMac.mm */,
                                6582A15509999D6D00BEEB6D /* SystemTimeMac.cpp */,
-                               9352071B09BD3BBB00F2038D /* TextBoundaries.mm */,
-                               AACF144C0BEC1EF000827982 /* TextBreakIteratorInternalICUMac.mm */,
                                51DF6D7F0B92A18E00C2DC85 /* ThreadCheck.mm */,
                                51E1ECAE0C91C54600DC255B /* Threading.mm */,
                                F5517DC2031AB56301A80180 /* WebCoreHistory.h */,
                B27535490B053814002CE64F /* mac */ = {
                        isa = PBXGroup;
                        children = (
+                               B2AFFC740D00A5C10030074D /* FontCacheMac.mm */,
+                               B2AFFC750D00A5C10030074D /* FontCustomPlatformData.cpp */,
+                               B2AFFC760D00A5C10030074D /* FontCustomPlatformData.h */,
+                               B2AFFC770D00A5C10030074D /* FontDataMac.mm */,
+                               B2AFFC780D00A5C10030074D /* FontMac.mm */,
+                               B2AFFC790D00A5C10030074D /* FontPlatformData.h */,
+                               B2AFFC7A0D00A5C10030074D /* FontPlatformDataMac.mm */,
+                               B2AFFC7B0D00A5C10030074D /* GlyphPageTreeNodeMac.cpp */,
                                EDE3A4FF0C7A430600956A37 /* ColorMac.h */,
                                B275354A0B053814002CE64F /* ColorMac.mm */,
                                B275354B0B053814002CE64F /* FloatPointMac.mm */,
                        path = cg;
                        sourceTree = "<group>";
                };
+               B2B264590D00A77E000ACC1D /* cf */ = {
+                       isa = PBXGroup;
+                       children = (
+                               B2B2645A0D00A77E000ACC1D /* StringCF.cpp */,
+                               B2B2645B0D00A77E000ACC1D /* StringImplCF.cpp */,
+                       );
+                       path = cf;
+                       sourceTree = "<group>";
+               };
                B2C3D9EC0D006C1D00EF6F26 /* text */ = {
                        isa = PBXGroup;
                        children = (
+                               B2B264590D00A77E000ACC1D /* cf */,
                                B2C3D9ED0D006C1D00EF6F26 /* AtomicString.cpp */,
                                B2C3D9EE0D006C1D00EF6F26 /* AtomicString.h */,
                                B2C3D9EF0D006C1D00EF6F26 /* AtomicStringImpl.h */,
                B2C3D9F90D006C1D00EF6F26 /* mac */ = {
                        isa = PBXGroup;
                        children = (
+                               B2AFFC850D00A5DF0030074D /* character-sets.txt */,
+                               B2AFFC860D00A5DF0030074D /* mac-encodings.txt */,
+                               B2AFFC870D00A5DF0030074D /* make-charset-table.pl */,
+                               B2AFFC880D00A5DF0030074D /* ShapeArabic.c */,
+                               B2AFFC890D00A5DF0030074D /* ShapeArabic.h */,
+                               B2AFFC8A0D00A5DF0030074D /* StringImplMac.mm */,
+                               B2AFFC8B0D00A5DF0030074D /* StringMac.mm */,
+                               B2AFFC8C0D00A5DF0030074D /* TextBoundaries.mm */,
+                               B2AFFC8D0D00A5DF0030074D /* TextBreakIteratorInternalICUMac.mm */,
+                               B2AFFC8E0D00A5DF0030074D /* TextCodecMac.cpp */,
+                               B2AFFC8F0D00A5DF0030074D /* TextCodecMac.h */,
                                B2C3D9FA0D006C1D00EF6F26 /* CharsetData.h */,
                        );
                        path = mac;
                                F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */,
                                9352071709BD3BA500F2038D /* StaticConstructors.h */,
                                93E62D990985F41600E1B5E3 /* SystemTime.h */,
-                               E14843910A6752BF007E4D39 /* TextCodecMac.cpp */,
-                               E148432E0A674FC2007E4D39 /* TextCodecMac.h */,
                                51DF6D7D0B92A16D00C2DC85 /* ThreadCheck.h */,
                                51E1ECB20C91C55600DC255B /* Threading.h */,
                                93309EA1099EB78C0056E581 /* Timer.cpp */,
                                B275356D0B053814002CE64F /* FloatSize.h in Headers */,
                                14993BE60B2F2B1C0050497F /* FocusController.h in Headers */,
                                062287840B4DB322000C34DF /* FocusDirection.h in Headers */,
-                               BC64B4BE0CB42929005F2B62 /* FontCustomPlatformData.h in Headers */,
                                A80E6CF30A1989CA007FB8C5 /* FontFamilyValue.h in Headers */,
-                               148A00110AF59F3F008CC700 /* FontPlatformData.h in Headers */,
                                A80E6CED0A1989CA007FB8C5 /* FontValue.h in Headers */,
                                514C76700CE923A1007EF3CD /* FormData.h in Headers */,
                                A8136D380973A8E700D74463 /* FormDataList.h in Headers */,
                                93309E10099E64920056E581 /* SetNodeAttributeCommand.h in Headers */,
                                93F1994F08245E59001E9ABC /* Settings.h in Headers */,
                                A80E6CE80A1989CA007FB8C5 /* ShadowValue.h in Headers */,
-                               37919C1D0BF3762800956998 /* ShapeArabic.h in Headers */,
                                1A4A954E0B4EDCCB002D8C3C /* SharedBuffer.h in Headers */,
                                93309EA3099EB78C0056E581 /* SharedTimer.h in Headers */,
                                4B6FA6F40C39E48C00087011 /* SmartReplace.h in Headers */,
                                A8CFF0510A154F09000A4234 /* TableLayout.h in Headers */,
                                6550B6A6099DF0270090D781 /* Text.h in Headers */,
                                93309E17099E64920056E581 /* TextAffinity.h in Headers */,
-                               E148432F0A674FC2007E4D39 /* TextCodecMac.h in Headers */,
                                1A6938020A11100A00C127FE /* TextDocument.h in Headers */,
                                933A14300B7D188600A53FFD /* TextEvent.h in Headers */,
                                93309E18099E64920056E581 /* TextGranularity.h in Headers */,
                                B2C3DA700D006CD600EF6F26 /* GlyphWidthMap.h in Headers */,
                                B23540F30D00782E002382FA /* StringTruncator.h in Headers */,
                                B25E96BE0D00975100CFD296 /* FontStyle.h in Headers */,
+                               B2AFFC7E0D00A5C10030074D /* FontCustomPlatformData.h in Headers */,
+                               B2AFFC810D00A5C10030074D /* FontPlatformData.h in Headers */,
+                               B2AFFC940D00A5DF0030074D /* ShapeArabic.h in Headers */,
+                               B2AFFC9A0D00A5DF0030074D /* TextCodecMac.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                85136CA80AED665900F90A3D /* westResizeCursor.png in Resources */,
                                1AB1AE7A0C051FDE00139F4F /* zoomInCursor.png in Resources */,
                                1AB1AE7B0C051FDE00139F4F /* zoomOutCursor.png in Resources */,
+                               B2AFFC900D00A5DF0030074D /* character-sets.txt in Resources */,
+                               B2AFFC910D00A5DF0030074D /* mac-encodings.txt in Resources */,
+                               B2AFFC920D00A5DF0030074D /* make-charset-table.pl in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                B275355B0B053814002CE64F /* FloatSizeCG.cpp in Sources */,
                                B275357A0B053814002CE64F /* FloatSizeMac.mm in Sources */,
                                14993BE50B2F2B1C0050497F /* FocusController.cpp in Sources */,
-                               BCF7C2340A16B5F80032F75B /* FontCacheMac.mm in Sources */,
-                               BC64B4BD0CB42929005F2B62 /* FontCustomPlatformData.cpp in Sources */,
-                               BCC088860A1BD78D006189A6 /* FontDataMac.mm in Sources */,
                                A80E6CEC0A1989CA007FB8C5 /* FontFamilyValue.cpp in Sources */,
-                               BCEB377309B7BA3900CB38B1 /* FontMac.mm in Sources */,
-                               BC64B4BF0CB42929005F2B62 /* FontPlatformDataMac.mm in Sources */,
                                A80E6CF10A1989CA007FB8C5 /* FontValue.cpp in Sources */,
                                514C766F0CE923A1007EF3CD /* FormData.cpp in Sources */,
                                A8136D390973A8E700D74463 /* FormDataList.cpp in Sources */,
                                65CBFEF90974F607001DAC25 /* FrameView.cpp in Sources */,
                                1432E8490C51493F00B1500F /* GCController.cpp in Sources */,
                                BC94D1590C275CB6006BC617 /* GlobalHistoryMac.mm in Sources */,
-                               BC6DB4D40A1AFEEF00E5CD14 /* GlyphPageTreeNodeMac.cpp in Sources */,
                                B2A015A80AF6CD53006BCE0E /* GraphicsContext.cpp in Sources */,
                                B2ED97710B1F55CE00257D0F /* GraphicsContextCG.cpp in Sources */,
                                B277B4040B22F37C0004BEC6 /* GraphicsContextMac.mm in Sources */,
                                93309E0F099E64920056E581 /* SetNodeAttributeCommand.cpp in Sources */,
                                14C9A5EA0B3D105F005A0232 /* Settings.cpp in Sources */,
                                A80E6CF40A1989CA007FB8C5 /* ShadowValue.cpp in Sources */,
-                               37919C190BF375DD00956998 /* ShapeArabic.c in Sources */,
                                1A4A954D0B4EDCCB002D8C3C /* SharedBuffer.cpp in Sources */,
                                1A4A95520B4EDCFF002D8C3C /* SharedBufferMac.mm in Sources */,
                                93309EA2099EB78C0056E581 /* SharedTimerMac.cpp in Sources */,
                                93309E11099E64920056E581 /* SplitElementCommand.cpp in Sources */,
                                93309E13099E64920056E581 /* SplitTextNodeCommand.cpp in Sources */,
                                93309E15099E64920056E581 /* SplitTextNodeContainingElementCommand.cpp in Sources */,
-                               1AE42F6A0AA4B8CB00C8612D /* StringCF.cpp in Sources */,
-                               1AE42F6B0AA4B8CB00C8612D /* StringImplCF.cpp in Sources */,
-                               93B0FD8A0A759BED0080AD44 /* StringImplMac.mm in Sources */,
-                               93B0FD8B0A759BED0080AD44 /* StringMac.mm in Sources */,
                                A80E73530A199C77007FB8C5 /* StyleBase.cpp in Sources */,
                                AA4C3A760B2B1679002334A2 /* StyleElement.cpp in Sources */,
                                A80E734D0A199C77007FB8C5 /* StyleList.cpp in Sources */,
                                93E227E40AF589AD00D48324 /* SubresourceLoader.cpp in Sources */,
                                6582A16309999D6D00BEEB6D /* SystemTimeMac.cpp in Sources */,
                                6550B6A5099DF0270090D781 /* Text.cpp in Sources */,
-                               9352071D09BD3BBB00F2038D /* TextBoundaries.mm in Sources */,
-                               AACF144D0BEC1EF000827982 /* TextBreakIteratorInternalICUMac.mm in Sources */,
-                               E14843D60A6754A6007E4D39 /* TextCodecMac.cpp in Sources */,
                                1A6938010A11100A00C127FE /* TextDocument.cpp in Sources */,
                                933A142E0B7D188600A53FFD /* TextEvent.cpp in Sources */,
                                93309E1B099E64920056E581 /* TextIterator.cpp in Sources */,
                                B2C3DA6D0D006CD600EF6F26 /* GlyphPageTreeNode.cpp in Sources */,
                                B2C3DA6F0D006CD600EF6F26 /* GlyphWidthMap.cpp in Sources */,
                                B23540F20D00782E002382FA /* StringTruncator.cpp in Sources */,
+                               B2AFFC7C0D00A5C10030074D /* FontCacheMac.mm in Sources */,
+                               B2AFFC7D0D00A5C10030074D /* FontCustomPlatformData.cpp in Sources */,
+                               B2AFFC7F0D00A5C10030074D /* FontDataMac.mm in Sources */,
+                               B2AFFC800D00A5C10030074D /* FontMac.mm in Sources */,
+                               B2AFFC820D00A5C10030074D /* FontPlatformDataMac.mm in Sources */,
+                               B2AFFC830D00A5C10030074D /* GlyphPageTreeNodeMac.cpp in Sources */,
+                               B2AFFC930D00A5DF0030074D /* ShapeArabic.c in Sources */,
+                               B2AFFC950D00A5DF0030074D /* StringImplMac.mm in Sources */,
+                               B2AFFC960D00A5DF0030074D /* StringMac.mm in Sources */,
+                               B2AFFC970D00A5DF0030074D /* TextBoundaries.mm in Sources */,
+                               B2AFFC980D00A5DF0030074D /* TextBreakIteratorInternalICUMac.mm in Sources */,
+                               B2AFFC990D00A5DF0030074D /* TextCodecMac.cpp in Sources */,
+                               B2B2645C0D00A77E000ACC1D /* StringCF.cpp in Sources */,
+                               B2B2645D0D00A77E000ACC1D /* StringImplCF.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index b9181bb..bdaedc4 100644 (file)
@@ -69,11 +69,11 @@ wxWebCore port Bakefile project file.
             platform/wx/DragDataWx.cpp
             platform/wx/DragImageWx.cpp
             platform/wx/FileSystemWx.cpp
-            platform/wx/FontCacheWx.cpp
-            platform/wx/FontDataWx.cpp
-            platform/wx/FontPlatformDataWx.cpp
-            platform/wx/FontWx.cpp             
-            platform/wx/GlyphMapWx.cpp
+            platform/graphics/wx/FontCacheWx.cpp
+            platform/graphics/wx/FontDataWx.cpp
+            platform/graphics/wx/FontPlatformDataWx.cpp
+            platform/graphics/wx/FontWx.cpp             
+            platform/graphics/wx/GlyphMapWx.cpp
             platform/wx/KeyboardEventWx.cpp
             platform/wx/LocalizedStringsWx.cpp
             platform/wx/LoggingWx.cpp
@@ -86,7 +86,7 @@ wxWebCore port Bakefile project file.
             platform/wx/ScrollViewWx.cpp
             platform/wx/SharedTimerWx.cpp
             platform/wx/SoundWx.cpp
-            platform/wx/StringWx.cpp
+            platform/text/wx/StringWx.cpp
             platform/wx/SystemTimeWx.cpp
             platform/wx/ThreadingWx.cpp
             platform/wx/WidgetWx.cpp