Rubber stamped by Brady.
authorzimmermann@webkit.org <zimmermann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Nov 2007 17:41:22 +0000 (17:41 +0000)
committerzimmermann@webkit.org <zimmermann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Nov 2007 17:41:22 +0000 (17:41 +0000)
Started platform reorganization (platform/text addition).
Moving string/text/font related classes into new places - as discussed on webkit-dev.

In a follow-up commit I'll move classes out of platform/{mac,win,...} into
platform/text/{mac,win,...}, and also do the ksvg2/ -> svg/ move.

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

99 files changed:
WebCore/ChangeLog
WebCore/WebCore.order
WebCore/WebCore.pro
WebCore/WebCore.vcproj/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/WebCoreSources.bkl
WebCore/editing/ReplaceSelectionCommand.cpp
WebCore/platform/graphics/Font.cpp [moved from WebCore/platform/Font.cpp with 96% similarity]
WebCore/platform/graphics/Font.h [moved from WebCore/platform/Font.h with 86% similarity]
WebCore/platform/graphics/FontCache.cpp [moved from WebCore/platform/FontCache.cpp with 100% similarity]
WebCore/platform/graphics/FontCache.h [moved from WebCore/platform/FontCache.h with 100% similarity]
WebCore/platform/graphics/FontData.cpp [moved from WebCore/platform/FontData.cpp with 100% similarity]
WebCore/platform/graphics/FontData.h [moved from WebCore/platform/FontData.h with 100% similarity]
WebCore/platform/graphics/FontDescription.h [moved from WebCore/platform/FontDescription.h with 100% similarity]
WebCore/platform/graphics/FontFallbackList.cpp [moved from WebCore/platform/FontFallbackList.cpp with 100% similarity]
WebCore/platform/graphics/FontFallbackList.h [moved from WebCore/platform/FontFallbackList.h with 100% similarity]
WebCore/platform/graphics/FontFamily.cpp [moved from WebCore/platform/FontFamily.cpp with 100% similarity]
WebCore/platform/graphics/FontFamily.h [moved from WebCore/platform/FontFamily.h with 100% similarity]
WebCore/platform/graphics/FontSelector.h [moved from WebCore/platform/FontSelector.h with 100% similarity]
WebCore/platform/graphics/GlyphBuffer.h [moved from WebCore/platform/GlyphBuffer.h with 100% similarity]
WebCore/platform/graphics/GlyphPageTreeNode.cpp [moved from WebCore/platform/GlyphPageTreeNode.cpp with 100% similarity]
WebCore/platform/graphics/GlyphPageTreeNode.h [moved from WebCore/platform/GlyphPageTreeNode.h with 100% similarity]
WebCore/platform/graphics/GlyphWidthMap.cpp [moved from WebCore/platform/GlyphWidthMap.cpp with 100% similarity]
WebCore/platform/graphics/GlyphWidthMap.h [moved from WebCore/platform/GlyphWidthMap.h with 100% similarity]
WebCore/platform/graphics/GraphicsContext.cpp
WebCore/platform/graphics/GraphicsContext.h
WebCore/platform/graphics/StringTruncator.cpp [moved from WebCore/platform/StringTruncator.cpp with 99% similarity]
WebCore/platform/graphics/StringTruncator.h [moved from WebCore/platform/StringTruncator.h with 100% similarity]
WebCore/platform/graphics/qt/GraphicsContextQt.cpp
WebCore/platform/gtk/FontGtk.cpp
WebCore/platform/mac/FontMac.mm
WebCore/platform/mac/WebCoreTextRenderer.mm
WebCore/platform/qt/FontQt.cpp
WebCore/platform/text/AtomicString.cpp [moved from WebCore/platform/AtomicString.cpp with 100% similarity]
WebCore/platform/text/AtomicString.h [moved from WebCore/platform/AtomicString.h with 100% similarity]
WebCore/platform/text/AtomicStringImpl.h [moved from WebCore/platform/AtomicStringImpl.h with 100% similarity]
WebCore/platform/text/Base64.cpp [moved from WebCore/platform/Base64.cpp with 100% similarity]
WebCore/platform/text/Base64.h [moved from WebCore/platform/Base64.h with 100% similarity]
WebCore/platform/text/BidiContext.cpp [moved from WebCore/platform/BidiContext.cpp with 100% similarity]
WebCore/platform/text/BidiContext.h [moved from WebCore/platform/BidiContext.h with 100% similarity]
WebCore/platform/text/BidiResolver.h [moved from WebCore/platform/BidiResolver.h with 100% similarity]
WebCore/platform/text/CString.cpp [moved from WebCore/platform/CString.cpp with 100% similarity]
WebCore/platform/text/CString.h [moved from WebCore/platform/CString.h with 100% similarity]
WebCore/platform/text/CharacterNames.h [moved from WebCore/platform/CharacterNames.h with 100% similarity]
WebCore/platform/text/FontStyle.h [moved from WebCore/platform/TextStyle.h with 94% similarity]
WebCore/platform/text/PlatformString.h [moved from WebCore/platform/PlatformString.h with 100% similarity]
WebCore/platform/text/RegularExpression.cpp [moved from WebCore/platform/RegularExpression.cpp with 100% similarity]
WebCore/platform/text/RegularExpression.h [moved from WebCore/platform/RegularExpression.h with 100% similarity]
WebCore/platform/text/SegmentedString.cpp [moved from WebCore/platform/SegmentedString.cpp with 100% similarity]
WebCore/platform/text/SegmentedString.h [moved from WebCore/platform/SegmentedString.h with 100% similarity]
WebCore/platform/text/String.cpp [moved from WebCore/platform/String.cpp with 100% similarity]
WebCore/platform/text/StringHash.h [moved from WebCore/platform/StringHash.h with 100% similarity]
WebCore/platform/text/StringImpl.cpp [moved from WebCore/platform/StringImpl.cpp with 100% similarity]
WebCore/platform/text/StringImpl.h [moved from WebCore/platform/StringImpl.h with 100% similarity]
WebCore/platform/text/TextBoundaries.h [moved from WebCore/platform/TextBoundaries.h with 100% similarity]
WebCore/platform/text/TextBoundariesICU.cpp [moved from WebCore/platform/TextBoundariesICU.cpp with 98% similarity]
WebCore/platform/text/TextBreakIterator.h [moved from WebCore/platform/TextBreakIterator.h with 100% similarity]
WebCore/platform/text/TextBreakIteratorICU.cpp [moved from WebCore/platform/TextBreakIteratorICU.cpp with 100% similarity]
WebCore/platform/text/TextBreakIteratorInternalICU.h [moved from WebCore/platform/TextBreakIteratorInternalICU.h with 100% similarity]
WebCore/platform/text/TextCodec.cpp [moved from WebCore/platform/TextCodec.cpp with 100% similarity]
WebCore/platform/text/TextCodec.h [moved from WebCore/platform/TextCodec.h with 100% similarity]
WebCore/platform/text/TextCodecICU.cpp [moved from WebCore/platform/TextCodecICU.cpp with 100% similarity]
WebCore/platform/text/TextCodecICU.h [moved from WebCore/platform/TextCodecICU.h with 100% similarity]
WebCore/platform/text/TextCodecLatin1.cpp [moved from WebCore/platform/TextCodecLatin1.cpp with 100% similarity]
WebCore/platform/text/TextCodecLatin1.h [moved from WebCore/platform/TextCodecLatin1.h with 100% similarity]
WebCore/platform/text/TextCodecUTF16.cpp [moved from WebCore/platform/TextCodecUTF16.cpp with 100% similarity]
WebCore/platform/text/TextCodecUTF16.h [moved from WebCore/platform/TextCodecUTF16.h with 100% similarity]
WebCore/platform/text/TextCodecUserDefined.cpp [moved from WebCore/platform/TextCodecUserDefined.cpp with 100% similarity]
WebCore/platform/text/TextCodecUserDefined.h [moved from WebCore/platform/TextCodecUserDefined.h with 100% similarity]
WebCore/platform/text/TextDecoder.cpp [moved from WebCore/platform/TextDecoder.cpp with 100% similarity]
WebCore/platform/text/TextDecoder.h [moved from WebCore/platform/TextDecoder.h with 100% similarity]
WebCore/platform/text/TextDirection.h [moved from WebCore/platform/TextDirection.h with 100% similarity]
WebCore/platform/text/TextEncoding.cpp [moved from WebCore/platform/TextEncoding.cpp with 100% similarity]
WebCore/platform/text/TextEncoding.h [moved from WebCore/platform/TextEncoding.h with 100% similarity]
WebCore/platform/text/TextEncodingRegistry.cpp [moved from WebCore/platform/TextEncodingRegistry.cpp with 100% similarity]
WebCore/platform/text/TextEncodingRegistry.h [moved from WebCore/platform/TextEncodingRegistry.h with 100% similarity]
WebCore/platform/text/TextStream.cpp [moved from WebCore/platform/TextStream.cpp with 100% similarity]
WebCore/platform/text/TextStream.h [moved from WebCore/platform/TextStream.h with 100% similarity]
WebCore/platform/text/UnicodeRange.cpp [moved from WebCore/platform/UnicodeRange.cpp with 100% similarity]
WebCore/platform/text/UnicodeRange.h [moved from WebCore/platform/UnicodeRange.h with 100% similarity]
WebCore/platform/text/mac/CharsetData.h [moved from WebCore/platform/CharsetData.h with 100% similarity]
WebCore/platform/win/FontWin.cpp
WebCore/platform/win/PopupMenuWin.cpp
WebCore/platform/win/UniscribeController.cpp
WebCore/platform/win/UniscribeController.h
WebCore/platform/win/WebCoreTextRenderer.cpp
WebCore/platform/wx/FontWx.cpp
WebCore/rendering/EllipsisBox.cpp
WebCore/rendering/InlineTextBox.cpp
WebCore/rendering/RenderFileUploadControl.cpp
WebCore/rendering/RenderImage.cpp
WebCore/rendering/RenderListBox.cpp
WebCore/rendering/RenderMenuList.cpp
WebCore/rendering/RenderText.cpp
WebCore/rendering/RenderTextControl.cpp
WebCore/rendering/RenderTextControl.h
WebCore/rendering/SVGInlineTextBox.cpp
WebCore/rendering/SVGRootInlineBox.cpp
WebCore/rendering/SVGRootInlineBox.h

index de13e3a..fbc7e53 100644 (file)
@@ -1,3 +1,254 @@
+2007-11-30  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Rubber stamped by Brady.
+
+        Started platform reorganization (platform/text addition).
+        Moving string/text/font related classes into new places - as discussed on webkit-dev.
+
+        In a follow-up commit I'll move classes out of platform/{mac,win,...} into
+        platform/text/{mac,win,...}, and also do the ksvg2/ -> svg/ move.
+
+        * WebCore.order:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * WebCoreSources.bkl:
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplacementFragment::insertFragmentForTestRendering):
+        * platform/AtomicString.cpp: Removed.
+        * platform/AtomicString.h: Removed.
+        * platform/AtomicStringImpl.h: Removed.
+        * platform/Base64.cpp: Removed.
+        * platform/Base64.h: Removed.
+        * platform/BidiContext.cpp: Removed.
+        * platform/BidiContext.h: Removed.
+        * platform/BidiResolver.h: Removed.
+        * platform/CString.cpp: Removed.
+        * platform/CString.h: Removed.
+        * platform/CharacterNames.h: Removed.
+        * platform/CharsetData.h: Removed.
+        * platform/Font.cpp: Removed.
+        * platform/Font.h: Removed.
+        * platform/FontCache.cpp: Removed.
+        * platform/FontCache.h: Removed.
+        * platform/FontData.cpp: Removed.
+        * platform/FontData.h: Removed.
+        * platform/FontDescription.h: Removed.
+        * platform/FontFallbackList.cpp: Removed.
+        * platform/FontFallbackList.h: Removed.
+        * platform/FontFamily.cpp: Removed.
+        * platform/FontFamily.h: Removed.
+        * platform/FontSelector.h: Removed.
+        * platform/GlyphBuffer.h: Removed.
+        * platform/GlyphPageTreeNode.cpp: Removed.
+        * platform/GlyphPageTreeNode.h: Removed.
+        * platform/GlyphWidthMap.cpp: Removed.
+        * platform/GlyphWidthMap.h: Removed.
+        * platform/PlatformString.h: Removed.
+        * platform/RegularExpression.cpp: Removed.
+        * platform/RegularExpression.h: Removed.
+        * platform/SegmentedString.cpp: Removed.
+        * platform/SegmentedString.h: Removed.
+        * platform/String.cpp: Removed.
+        * platform/StringHash.h: Removed.
+        * platform/StringImpl.cpp: Removed.
+        * platform/StringImpl.h: Removed.
+        * platform/StringTruncator.cpp: Removed.
+        * platform/StringTruncator.h: Removed.
+        * platform/TextBoundaries.h: Removed.
+        * platform/TextBoundariesICU.cpp: Removed.
+        * platform/TextBreakIterator.h: Removed.
+        * platform/TextBreakIteratorICU.cpp: Removed.
+        * platform/TextBreakIteratorInternalICU.h: Removed.
+        * platform/TextCodec.cpp: Removed.
+        * platform/TextCodec.h: Removed.
+        * platform/TextCodecICU.cpp: Removed.
+        * platform/TextCodecICU.h: Removed.
+        * platform/TextCodecLatin1.cpp: Removed.
+        * platform/TextCodecLatin1.h: Removed.
+        * platform/TextCodecUTF16.cpp: Removed.
+        * platform/TextCodecUTF16.h: Removed.
+        * platform/TextCodecUserDefined.cpp: Removed.
+        * platform/TextCodecUserDefined.h: Removed.
+        * platform/TextDecoder.cpp: Removed.
+        * platform/TextDecoder.h: Removed.
+        * platform/TextDirection.h: Removed.
+        * platform/TextEncoding.cpp: Removed.
+        * platform/TextEncoding.h: Removed.
+        * platform/TextEncodingRegistry.cpp: Removed.
+        * platform/TextEncodingRegistry.h: Removed.
+        * platform/TextStream.cpp: Removed.
+        * platform/TextStream.h: Removed.
+        * platform/TextStyle.h: Removed.
+        * platform/UnicodeRange.cpp: Removed.
+        * platform/UnicodeRange.h: Removed.
+        * platform/graphics/Font.cpp: Copied from platform/Font.cpp.
+        (WebCore::WidthIterator::WidthIterator):
+        (WebCore::Font::width):
+        (WebCore::Font::drawSimpleText):
+        (WebCore::Font::drawGlyphBuffer):
+        (WebCore::Font::drawText):
+        (WebCore::Font::floatWidth):
+        (WebCore::Font::floatWidthForSimpleText):
+        (WebCore::Font::selectionRectForText):
+        (WebCore::Font::selectionRectForSimpleText):
+        (WebCore::Font::offsetForPosition):
+        (WebCore::Font::offsetForPositionForSimpleText):
+        * platform/graphics/Font.h: Copied from platform/Font.h.
+        * platform/graphics/FontCache.cpp: Copied from platform/FontCache.cpp.
+        * platform/graphics/FontCache.h: Copied from platform/FontCache.h.
+        * platform/graphics/FontData.cpp: Copied from platform/FontData.cpp.
+        * platform/graphics/FontData.h: Copied from platform/FontData.h.
+        * platform/graphics/FontDescription.h: Copied from platform/FontDescription.h.
+        * platform/graphics/FontFallbackList.cpp: Copied from platform/FontFallbackList.cpp.
+        * platform/graphics/FontFallbackList.h: Copied from platform/FontFallbackList.h.
+        * platform/graphics/FontFamily.cpp: Copied from platform/FontFamily.cpp.
+        * platform/graphics/FontFamily.h: Copied from platform/FontFamily.h.
+        * platform/graphics/FontSelector.h: Copied from platform/FontSelector.h.
+        * platform/graphics/GlyphBuffer.h: Copied from platform/GlyphBuffer.h.
+        * platform/graphics/GlyphPageTreeNode.cpp: Copied from platform/GlyphPageTreeNode.cpp.
+        * platform/graphics/GlyphPageTreeNode.h: Copied from platform/GlyphPageTreeNode.h.
+        * platform/graphics/GlyphWidthMap.cpp: Copied from platform/GlyphWidthMap.cpp.
+        * platform/graphics/GlyphWidthMap.h: Copied from platform/GlyphWidthMap.h.
+        * platform/graphics/GraphicsContext.cpp:
+        (WebCore::GraphicsContext::drawText):
+        (WebCore::GraphicsContext::drawBidiText):
+        (WebCore::GraphicsContext::drawHighlightForText):
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/StringTruncator.cpp: Copied from platform/StringTruncator.cpp.
+        (WebCore::stringWidth):
+        * platform/graphics/StringTruncator.h: Copied from platform/StringTruncator.h.
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        * platform/gtk/FontGtk.cpp:
+        (WebCore::Font::drawComplexText):
+        (WebCore::Font::floatWidthForComplexText):
+        (WebCore::Font::offsetForPositionForComplexText):
+        (WebCore::Font::selectionRectForComplexText):
+        * platform/mac/FontMac.mm:
+        (WebCore::ATSULayoutParameters::ATSULayoutParameters):
+        (WebCore::Font::selectionRectForComplexText):
+        (WebCore::Font::drawComplexText):
+        (WebCore::Font::floatWidthForComplexText):
+        (WebCore::Font::offsetForPositionForComplexText):
+        * platform/mac/WebCoreTextRenderer.mm:
+        (WebCoreDrawTextAtPoint):
+        (WebCoreTextFloatWidth):
+        * platform/qt/FontQt.cpp:
+        (WebCore::generateComponents):
+        (WebCore::Font::drawText):
+        (WebCore::Font::width):
+        (WebCore::Font::floatWidth):
+        (WebCore::Font::offsetForPosition):
+        (WebCore::cursorToX):
+        (WebCore::Font::selectionRectForText):
+        * platform/text: Added.
+        * platform/text/AtomicString.cpp: Copied from platform/AtomicString.cpp.
+        * platform/text/AtomicString.h: Copied from platform/AtomicString.h.
+        * platform/text/AtomicStringImpl.h: Copied from platform/AtomicStringImpl.h.
+        * platform/text/Base64.cpp: Copied from platform/Base64.cpp.
+        * platform/text/Base64.h: Copied from platform/Base64.h.
+        * platform/text/BidiContext.cpp: Copied from platform/BidiContext.cpp.
+        * platform/text/BidiContext.h: Copied from platform/BidiContext.h.
+        * platform/text/BidiResolver.h: Copied from platform/BidiResolver.h.
+        * platform/text/CString.cpp: Copied from platform/CString.cpp.
+        * platform/text/CString.h: Copied from platform/CString.h.
+        * platform/text/CharacterNames.h: Copied from platform/CharacterNames.h.
+        * platform/text/FontStyle.h: Copied from platform/TextStyle.h.
+        (WebCore::FontStyle::FontStyle):
+        * platform/text/PlatformString.h: Copied from platform/PlatformString.h.
+        * platform/text/RegularExpression.cpp: Copied from platform/RegularExpression.cpp.
+        * platform/text/RegularExpression.h: Copied from platform/RegularExpression.h.
+        * platform/text/SegmentedString.cpp: Copied from platform/SegmentedString.cpp.
+        * platform/text/SegmentedString.h: Copied from platform/SegmentedString.h.
+        * platform/text/String.cpp: Copied from platform/String.cpp.
+        * platform/text/StringHash.h: Copied from platform/StringHash.h.
+        * platform/text/StringImpl.cpp: Copied from platform/StringImpl.cpp.
+        * platform/text/StringImpl.h: Copied from platform/StringImpl.h.
+        * platform/text/TextBoundaries.h: Copied from platform/TextBoundaries.h.
+        * platform/text/TextBoundariesICU.cpp: Copied from platform/TextBoundariesICU.cpp.
+        (WebCore::findNextWordFromIndex):
+        * platform/text/TextBreakIterator.h: Copied from platform/TextBreakIterator.h.
+        * platform/text/TextBreakIteratorICU.cpp: Copied from platform/TextBreakIteratorICU.cpp.
+        * platform/text/TextBreakIteratorInternalICU.h: Copied from platform/TextBreakIteratorInternalICU.h.
+        * platform/text/TextCodec.cpp: Copied from platform/TextCodec.cpp.
+        * platform/text/TextCodec.h: Copied from platform/TextCodec.h.
+        * platform/text/TextCodecICU.cpp: Copied from platform/TextCodecICU.cpp.
+        * platform/text/TextCodecICU.h: Copied from platform/TextCodecICU.h.
+        * platform/text/TextCodecLatin1.cpp: Copied from platform/TextCodecLatin1.cpp.
+        * platform/text/TextCodecLatin1.h: Copied from platform/TextCodecLatin1.h.
+        * platform/text/TextCodecUTF16.cpp: Copied from platform/TextCodecUTF16.cpp.
+        * platform/text/TextCodecUTF16.h: Copied from platform/TextCodecUTF16.h.
+        * platform/text/TextCodecUserDefined.cpp: Copied from platform/TextCodecUserDefined.cpp.
+        * platform/text/TextCodecUserDefined.h: Copied from platform/TextCodecUserDefined.h.
+        * platform/text/TextDecoder.cpp: Copied from platform/TextDecoder.cpp.
+        * platform/text/TextDecoder.h: Copied from platform/TextDecoder.h.
+        * platform/text/TextDirection.h: Copied from platform/TextDirection.h.
+        * platform/text/TextEncoding.cpp: Copied from platform/TextEncoding.cpp.
+        * platform/text/TextEncoding.h: Copied from platform/TextEncoding.h.
+        * platform/text/TextEncodingRegistry.cpp: Copied from platform/TextEncodingRegistry.cpp.
+        * platform/text/TextEncodingRegistry.h: Copied from platform/TextEncodingRegistry.h.
+        * platform/text/TextStream.cpp: Copied from platform/TextStream.cpp.
+        * platform/text/TextStream.h: Copied from platform/TextStream.h.
+        * platform/text/UnicodeRange.cpp: Copied from platform/UnicodeRange.cpp.
+        * platform/text/UnicodeRange.h: Copied from platform/UnicodeRange.h.
+        * platform/text/mac: Added.
+        * platform/text/mac/CharsetData.h: Copied from platform/CharsetData.h.
+        * platform/win/FontWin.cpp:
+        (WebCore::Font::selectionRectForComplexText):
+        (WebCore::Font::drawComplexText):
+        (WebCore::Font::floatWidthForComplexText):
+        (WebCore::Font::offsetForPositionForComplexText):
+        * platform/win/PopupMenuWin.cpp:
+        (WebCore::PopupMenu::paint):
+        * platform/win/UniscribeController.cpp:
+        (WebCore::UniscribeController::UniscribeController):
+        * platform/win/UniscribeController.h:
+        * platform/win/WebCoreTextRenderer.cpp:
+        (WebCore::doDrawTextAtPoint):
+        * platform/wx/FontWx.cpp:
+        (WebCore::Font::selectionRectForComplexText):
+        (WebCore::Font::drawComplexText):
+        (WebCore::Font::floatWidthForComplexText):
+        (WebCore::Font::offsetForPositionForComplexText):
+        * rendering/EllipsisBox.cpp:
+        (WebCore::EllipsisBox::paint):
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::selectionRect):
+        (WebCore::InlineTextBox::paint):
+        (WebCore::InlineTextBox::paintSelection):
+        (WebCore::InlineTextBox::paintCompositionBackground):
+        (WebCore::InlineTextBox::paintSpellingOrGrammarMarker):
+        (WebCore::InlineTextBox::paintTextMatchMarker):
+        (WebCore::InlineTextBox::offsetForPosition):
+        (WebCore::InlineTextBox::positionForOffset):
+        * rendering/RenderFileUploadControl.cpp:
+        (WebCore::RenderFileUploadControl::paintObject):
+        (WebCore::RenderFileUploadControl::calcPrefWidths):
+        * rendering/RenderImage.cpp:
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::updateFromElement):
+        (WebCore::RenderListBox::paintItemForeground):
+        * rendering/RenderMenuList.cpp:
+        (WebCore::RenderMenuList::updateOptionsWidth):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::widthFromCache):
+        (WebCore::RenderText::calcPrefWidths):
+        (WebCore::RenderText::width):
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::setStyle):
+        (WebCore::RenderTextControl::createInnerFontStyle):
+        (WebCore::RenderTextControl::createSubtreeIfNeeded):
+        (WebCore::RenderTextControl::calcPrefWidths):
+        * rendering/RenderTextControl.h:
+        * rendering/SVGInlineTextBox.cpp:
+        (WebCore::SVGInlineTextBox::calculateGlyphWidth):
+        (WebCore::SVGInlineTextBox::paintCharacters):
+        (WebCore::SVGInlineTextBox::paintSelection):
+        * rendering/SVGRootInlineBox.cpp:
+        (WebCore::cummulatedWidthOfInlineBoxCharacterRange):
+        (WebCore::svgFontStyleForInlineTextBox):
+        * rendering/SVGRootInlineBox.h:
+
 2007-11-30  Adele Peterson  <adele@apple.com>
 
         Reviewed by Darin.
index 935be14..c53d488 100644 (file)
@@ -882,10 +882,10 @@ __ZZN3WTF9HashTableIN7WebCore16FontPlatformDataESt4pairIS2_iENS_18PairFirstExtra
 __ZN7WebCore15StringTruncator14centerTruncateERKNS_6StringEfRKNS_4FontEb
 __ZZN7WebCore14truncateStringERKNS_6StringEfRKNS_4FontEPFjS2_jjPtEbE19__PRETTY_FUNCTION__
 __ZN7WebCore11stringWidthERKNS_4FontEPKtjb
-__ZNK7WebCore4Font10floatWidthERKNS_7TextRunERKNS_9TextStyleE
+__ZNK7WebCore4Font10floatWidthERKNS_7TextRunERKNS_9FontStyleE
 __ZNK7WebCore4Font16canUseGlyphCacheERKNS_7TextRunE
-__ZNK7WebCore4Font23floatWidthForSimpleTextERKNS_7TextRunERKNS_9TextStyleEPNS_11GlyphBufferE
-__ZN7WebCore13WidthIteratorC1EPKNS_4FontERKNS_7TextRunERKNS_9TextStyleE
+__ZNK7WebCore4Font23floatWidthForSimpleTextERKNS_7TextRunERKNS_9FontStyleEPNS_11GlyphBufferE
+__ZN7WebCore13WidthIteratorC1EPKNS_4FontERKNS_7TextRunERKNS_9FontStyleE
 __ZN7WebCore13WidthIterator7advanceEiPNS_11GlyphBufferE
 __ZNK7WebCore4Font21glyphDataForCharacterEiPKtjbb
 __ZNK7WebCore4Font11primaryFontEv
@@ -2248,7 +2248,7 @@ __ZNK7WebCore14RenderThemeMac17sizeForSystemFontEPNS_11RenderStyleEPKNS_7IntSize
 __ZNK7WebCore14RenderThemeMac24controlSizeForSystemFontEPNS_11RenderStyleE
 __ZN7WebCore11RenderStyle14addPseudoStyleEPS0_
 __ZN7WebCore29HTMLTextFieldInnerTextElementC1EPNS_8DocumentEPNS_4NodeE
-__ZN7WebCore17RenderTextControl20createInnerTextStyleEPNS_11RenderStyleE
+__ZN7WebCore17RenderTextControl20createInnerFontStyleEPNS_11RenderStyleE
 __ZNK7WebCore22HTMLGenericFormElement17isReadOnlyControlEv
 __ZNK7WebCore22HTMLGenericFormElement8disabledEv
 __ZNK7WebCore4Font11lineSpacingEv
@@ -2385,7 +2385,7 @@ __ZN7WebCore10RenderText14calcPrefWidthsEi
 __ZNK7WebCore4Font12isFixedPitchEv
 __ZNK7WebCore16FontFallbackList14determinePitchEPKNS_4FontE
 __ZZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyESt4pairIS2_iENS_18PairFirstExtractorIS4_EENS1_28FontPlatformDataCacheKeyHashENS_14PairHashTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIiEEEES9_E6lookupIS2_NS_17HashMapTranslatorILb1ES3_IS2_PNS1_16FontPlatformDataEENS_18PairBaseHashTraitsIS9_NSA_ISH_EEEESC_S7_EEEES3_IS3_IPS4_bEjERKT_E8__func__
-__ZNK7WebCore4Font5widthERKNS_7TextRunERKNS_9TextStyleE
+__ZNK7WebCore4Font5widthERKNS_7TextRunERKNS_9FontStyleE
 __ZN7WebCore11RenderBlock15bidiReorderLineERKNS_12BidiIteratorES3_RNS_12BidiResolverIS1_NS_7BidiRunEEE
 __ZZN7WebCore12BidiResolverINS_12BidiIteratorENS_7BidiRunEE21createBidiRunsForLineERKS1_S5_bbE19__PRETTY_FUNCTION__
 __ZNK7WebCore12RenderObject12isListMarkerEv
@@ -3196,10 +3196,10 @@ __ZN3WTF6VectorIN7WebCore14DocumentMarkerELm0EE6resizeEm
 __ZN7WebCore21updateGraphicsContextEPNS_15GraphicsContextERKNS_5ColorES4_f
 __ZN7WebCore15GraphicsContext15textDrawingModeEv
 __ZNK7WebCore13InlineTextBox7textPosEv
-__ZN7WebCore15GraphicsContext8drawTextERKNS_7TextRunERKNS_8IntPointERKNS_9TextStyleEii
-__ZNK7WebCore4Font8drawTextEPNS_15GraphicsContextERKNS_7TextRunERKNS_9TextStyleERKNS_10FloatPointEii
-__ZNK7WebCore4Font14drawSimpleTextEPNS_15GraphicsContextERKNS_7TextRunERKNS_9TextStyleERKNS_10FloatPointEii
-__ZNK7WebCore4Font15drawGlyphBufferEPNS_15GraphicsContextERKNS_11GlyphBufferERKNS_7TextRunERKNS_9TextStyleERKNS_10FloatPointE
+__ZN7WebCore15GraphicsContext8drawTextERKNS_7TextRunERKNS_8IntPointERKNS_9FontStyleEii
+__ZNK7WebCore4Font8drawTextEPNS_15GraphicsContextERKNS_7TextRunERKNS_9FontStyleERKNS_10FloatPointEii
+__ZNK7WebCore4Font14drawSimpleTextEPNS_15GraphicsContextERKNS_7TextRunERKNS_9FontStyleERKNS_10FloatPointEii
+__ZNK7WebCore4Font15drawGlyphBufferEPNS_15GraphicsContextERKNS_11GlyphBufferERKNS_7TextRunERKNS_9FontStyleERKNS_10FloatPointE
 __ZZNK7WebCore4Font10drawGlyphsEPNS_15GraphicsContextEPKNS_8FontDataERKNS_11GlyphBufferEiiRKNS_10FloatPointEE19__PRETTY_FUNCTION__
 _WebCoreShouldUseFontSmoothing
 __ZN3WTF6VectorI6CGSizeLm2048EE6resizeEm
@@ -5087,8 +5087,8 @@ __ZNK7WebCore10RenderText14caretMinOffsetEv
 __ZNK7WebCore13InlineTextBox19containsCaretOffsetEi
 __ZN7WebCore10RenderText9caretRectEiNS_9EAffinityEPi
 __ZNK7WebCore13InlineTextBox17positionForOffsetEi
-__ZNK7WebCore4Font20selectionRectForTextERKNS_7TextRunERKNS_9TextStyleERKNS_8IntPointEiii
-__ZNK7WebCore4Font26selectionRectForSimpleTextERKNS_7TextRunERKNS_9TextStyleERKNS_8IntPointEiii
+__ZNK7WebCore4Font20selectionRectForTextERKNS_7TextRunERKNS_9FontStyleERKNS_8IntPointEiii
+__ZNK7WebCore4Font26selectionRectForSimpleTextERKNS_7TextRunERKNS_9FontStyleERKNS_8IntPointEiii
 __ZNK7WebCore12RenderObject16absolutePositionERiS1_b
 __ZNK7WebCore10RenderText14previousOffsetEi
 __ZN7WebCore18textBreakPrecedingEPNS_17TextBreakIteratorEi
@@ -5411,8 +5411,8 @@ __ZNK7WebCore4Node16isMouseFocusableEv
 __ZNK7WebCore28MouseEventWithHitTestResults10localPointEv
 __ZN7WebCore10RenderText22positionForCoordinatesEii
 __ZNK7WebCore13InlineTextBox17offsetForPositionEib
-__ZNK7WebCore4Font17offsetForPositionERKNS_7TextRunERKNS_9TextStyleEib
-__ZNK7WebCore4Font30offsetForPositionForSimpleTextERKNS_7TextRunERKNS_9TextStyleEib
+__ZNK7WebCore4Font17offsetForPositionERKNS_7TextRunERKNS_9FontStyleEib
+__ZNK7WebCore4Font30offsetForPositionForSimpleTextERKNS_7TextRunERKNS_9FontStyleEib
 __ZN7WebCore13WidthIterator19advanceOneCharacterERfPNS_11GlyphBufferE
 __ZNK7WebCore12RenderObject14caretMinOffsetEv
 __ZNK7WebCore16PositionIterator11atEndOfNodeEv
@@ -5739,7 +5739,7 @@ __ZNK7WebCore16CSSStyleSelector14largerFontSizeEfb
 __ZNK7WebCore14RenderThemeMac25adjustMenuListButtonStyleEPNS_16CSSStyleSelectorEPNS_11RenderStyleEPNS_7ElementE
 __ZN7WebCore13WidthIterator21normalizeVoicingMarksEi
 __ZN7WebCore12BidiResolverINS_12BidiIteratorENS_7BidiRunEE5embedEN3WTF7Unicode9DirectionE
-__ZNK7WebCore4Font24floatWidthForComplexTextERKNS_7TextRunERKNS_9TextStyleE
+__ZNK7WebCore4Font24floatWidthForComplexTextERKNS_7TextRunERKNS_9FontStyleE
 __ZN7WebCore20ATSULayoutParameters10initializeEPKNS_4FontEPKNS_15GraphicsContextE
 __ZN7WebCore19initializeATSUStyleEPKNS_8FontDataE
 __ZNK7WebCore4Font21fontDataForCharactersEPKti
@@ -5750,7 +5750,7 @@ __ZN7WebCore27disposeATSULayoutParametersEPNS_20ATSULayoutParametersE
 __ZNK7WebCore11BidiContext5derefEv
 __ZN7WebCore12BidiResolverINS_12BidiIteratorENS_7BidiRunEE11reverseRunsEii
 __ZNK7WebCore9InlineBox16prevOnLineExistsEv
-__ZZNK7WebCore4Font15drawComplexTextEPNS_15GraphicsContextERKNS_7TextRunERKNS_9TextStyleERKNS_10FloatPointEiiE19__PRETTY_FUNCTION__
+__ZZNK7WebCore4Font15drawComplexTextEPNS_15GraphicsContextERKNS_7TextRunERKNS_9FontStyleERKNS_10FloatPointEiiE19__PRETTY_FUNCTION__
 __ZN7WebCore14RenderFieldset19paintBoxDecorationsERNS_12RenderObject9PaintInfoEii
 __ZN7WebCore15GraphicsContext18addRoundedRectClipERKNS_7IntRectERKNS_7IntSizeES6_S6_S6_
 __ZN7WebCore4Path22createRoundedRectangleERKNS_9FloatRectERKNS_9FloatSizeES6_S6_S6_
@@ -5829,7 +5829,7 @@ __ZNK7WebCore5Range20editingStartPositionEv
 __ZNK7WebCore5Range9collapsedERi
 __ZN7WebCore13InlineTextBox14paintSelectionEPNS_15GraphicsContextEiiPNS_11RenderStyleEPKNS_4FontE
 __ZN7WebCore13InlineTextBox17selectionStartEndERiS1_
-__ZN7WebCore15GraphicsContext20drawHighlightForTextERKNS_7TextRunERKNS_8IntPointEiRKNS_9TextStyleERKNS_5ColorEii
+__ZN7WebCore15GraphicsContext20drawHighlightForTextERKNS_7TextRunERKNS_8IntPointEiRKNS_9FontStyleERKNS_5ColorEii
 __ZN7WebCore15GraphicsContext8fillRectERKNS_9FloatRectERKNS_5ColorE
 __ZNK7WebCore12RenderObject24selectionForegroundColorEv
 __ZNK7WebCore11RenderTheme38platformActiveSelectionForegroundColorEv
@@ -8587,22 +8587,22 @@ __ZNK3WTF6VectorIPKN7WebCore8FontDataELm1EE8capacityEv
 __ZNK3WTF12VectorBufferIPKN7WebCore8FontDataELm0EE8capacityEv
 __ZN7WebCore6SharedINS_16FontFallbackListEE5derefEv
 __ZN7WebCore7TextRunC1EPKti
-__ZN7WebCore9TextStyleC1Ebiibbbbb
-__ZN7WebCore9TextStyle20disableRoundingHacksEv
+__ZN7WebCore9FontStyleC1Ebiibbbbb
+__ZN7WebCore9FontStyle20disableRoundingHacksEv
 __ZNK7WebCore7TextRun6lengthEv
 __ZNK7WebCore7TextRunixEi
-__ZNK7WebCore9TextStyle7paddingEv
+__ZNK7WebCore9FontStyle7paddingEv
 __ZNK7WebCore7TextRun4dataEi
-__ZNK7WebCore9TextStyle3rtlEv
-__ZNK7WebCore9TextStyle23attemptFontSubstitutionEv
+__ZNK7WebCore9FontStyle3rtlEv
+__ZNK7WebCore9FontStyle23attemptFontSubstitutionEv
 __ZNK7WebCore15FontDescription9smallCapsEv
 __ZN3WTFeqINS_9HashTableIiSt4pairIiiENS_18PairFirstExtractorIS3_EENS_7IntHashIjEENS_14PairHashTraitsINS_10HashTraitsIiEENS9_IsEEEESA_EES2_IitEEEbRKNS_29HashTableConstIteratorAdapterIT_T0_EESK_
 __ZNK7WebCore16FontFallbackList11primaryFontEPKNS_4FontE
 __ZN3WTF6VectorIPKN7WebCore8FontDataELm1EEixEm
 __ZN3WTF6VectorIPKN7WebCore8FontDataELm1EE2atEm
 __ZN3WTF17HashMapTranslatorILb1ESt4pairIiPN7WebCore17GlyphPageTreeNodeEENS_18PairBaseHashTraitsINS_10HashTraitsIiEENS7_IS4_EEEENS_14PairHashTraitsIS8_S8_EENS_7IntHashIjEEE5equalERKiSH_
-__ZNK7WebCore9TextStyle17applyWordRoundingEv
-__ZNK7WebCore9TextStyle16applyRunRoundingEv
+__ZNK7WebCore9FontStyle17applyWordRoundingEv
+__ZNK7WebCore9FontStyle16applyRunRoundingEv
 __ZN3WTF22IdentityHashTranslatorIiSt4pairIiiENS_7IntHashIjEEE4hashERKi
 __ZN3WTF22IdentityHashTranslatorIiSt4pairIiiENS_7IntHashIjEEE5equalERKiS7_
 __ZN3WTF7IntHashIjE5equalEjj
@@ -13797,7 +13797,7 @@ __ZN7WebCore19DeprecatedValueListINS_18SegmentedSubstringEE6removeENS_27Deprecat
 __ZNK7WebCore19DeprecatedValueListINS_18SegmentedSubstringEE7isEmptyEv
 __ZNK7WebCore8Document9textColorEv
 __ZNK7WebCore11RenderBlock10MarginInfo8topQuirkEv
-__ZNK7WebCore9TextStyle9allowTabsEv
+__ZNK7WebCore9FontStyle9allowTabsEv
 __ZN7WebCore13HTMLTokenizer5State26setInProcessingInstructionEb
 __ZN7WebCore14RenderListItem12setNotInListEb
 __ZN7WebCore5Color6setRGBEiii
@@ -14717,12 +14717,12 @@ __ZNK7WebCore11RenderBlock14firstLineBlockEv
 __ZNK7WebCore12RenderObject19isBottomMarginQuirkEv
 __ZNK7WebCore19HTMLTextAreaElement4colsEv
 __ZNK7WebCore4Font8tabWidthEv
-__ZNK7WebCore9TextStyle4xPosEv
-__ZN7WebCore20ATSULayoutParametersC1ERKNS_7TextRunERKNS_9TextStyleE
+__ZNK7WebCore9FontStyle4xPosEv
+__ZN7WebCore20ATSULayoutParametersC1ERKNS_7TextRunERKNS_9FontStyleE
 __ZNK7WebCore4Font11isSmallCapsEv
 __ZNK7WebCore7TextRun10charactersEv
 __ZNK7WebCore8FontData12shapesArabicEv
-__ZNK7WebCore9TextStyle3ltrEv
+__ZNK7WebCore9FontStyle3ltrEv
 __ZN7WebCore9ValueList13deleteValueAtEj
 __ZN3WTF6VectorIN7WebCore5ValueELm16EE6removeEm
 __ZN3WTF20VectorTypeOperationsIN7WebCore5ValueEE15moveOverlappingEPKS2_S5_PS2_
@@ -17369,10 +17369,10 @@ __ZN7WebCore13RenderListBox19paintItemBackgroundERNS_12RenderObject9PaintInfoEii
 __ZN7WebCore13RenderListBox19itemBoundingBoxRectEiii
 __ZNK7WebCore11RenderTheme39inactiveListBoxSelectionBackgroundColorEv
 __ZN7WebCore13RenderListBox19paintItemForegroundERNS_12RenderObject9PaintInfoEiii
-__ZN7WebCore15GraphicsContext12drawBidiTextERKNS_7TextRunERKNS_8IntPointERKNS_9TextStyleE
+__ZN7WebCore15GraphicsContext12drawBidiTextERKNS_7TextRunERKNS_8IntPointERKNS_9FontStyleE
 __ZN7WebCore12BidiResolverINS_15TextRunIteratorENS_16BidiCharacterRunEEC1Ev
 __ZN7WebCore15TextRunIteratorC1Ev
-__ZNK7WebCore9TextStyle19directionalOverrideEv
+__ZNK7WebCore9FontStyle19directionalOverrideEv
 __ZN7WebCore12BidiResolverINS_15TextRunIteratorENS_16BidiCharacterRunEE9setStatusENS_10BidiStatusE
 __ZN7WebCore15TextRunIteratorC1EPKNS_7TextRunEj
 __ZZN7WebCore12BidiResolverINS_15TextRunIteratorENS_16BidiCharacterRunEE21createBidiRunsForLineERKS1_S5_bbE19__PRETTY_FUNCTION__
@@ -17390,8 +17390,8 @@ __ZNK7WebCore16BidiCharacterRun4nextEv
 __ZNK7WebCore12BidiResolverINS_15TextRunIteratorENS_16BidiCharacterRunEE8runCountEv
 __ZN7WebCore12BidiResolverINS_15TextRunIteratorENS_16BidiCharacterRunEED1Ev
 __ZNK7WebCore16BidiCharacterRun5levelEv
-__ZN7WebCore9TextStyle6setRTLEb
-__ZN7WebCore9TextStyle22setDirectionalOverrideEb
+__ZN7WebCore9FontStyle6setRTLEb
+__ZN7WebCore9FontStyle22setDirectionalOverrideEb
 __ZNK7WebCore16BidiCharacterRun4stopEv
 __ZNK7WebCore16BidiCharacterRun5startEv
 __ZN7WebCore12BidiResolverINS_15TextRunIteratorENS_16BidiCharacterRunEE10deleteRunsEv
index dd02505..49a9ed1 100644 (file)
@@ -28,7 +28,7 @@ INCLUDEPATH += $$GENERATED_SOURCES_DIR
 }
 
 DEPENDPATH += css dom loader editing history html \
-    loader page platform platform/graphics rendering xml
+    loader page platform platform/graphics platform/text rendering xml
 
 include($$OUTPUT_DIR/config.pri)
 
@@ -179,6 +179,7 @@ INCLUDEPATH +=  $$PWD \
                 $$PWD/platform/graphics/svg \
                 $$PWD/platform/graphics/svg/filters \
                 $$PWD/platform/sql \
+                               $$PWD/platform/text \
                 $$PWD/storage \
                 $$PWD/loader $$PWD/loader/icon \
                 $$PWD/css \
@@ -688,11 +689,11 @@ SOURCES += \
     page/Settings.cpp \
     platform/Arena.cpp \
     platform/ArrayImpl.cpp \
-    platform/AtomicString.cpp \
-    platform/Base64.cpp \
-    platform/BidiContext.cpp \
+    platform/text/AtomicString.cpp \
+    platform/text/Base64.cpp \
+    platform/text/BidiContext.cpp \
     platform/ContextMenu.cpp \
-    platform/CString.cpp \
+    platform/text/CString.cpp \
     platform/DeprecatedCString.cpp \
     platform/DeprecatedPtrListImpl.cpp \
     platform/DeprecatedString.cpp \
@@ -701,7 +702,7 @@ SOURCES += \
     platform/DragData.cpp \
     platform/DragImage.cpp \
     platform/FileChooser.cpp \
-    platform/FontFamily.cpp \
+    platform/text/FontFamily.cpp \
     platform/graphics/AffineTransform.cpp \
     platform/graphics/BitmapImage.cpp \
     platform/graphics/Color.cpp \
@@ -727,25 +728,25 @@ SOURCES += \
     platform/network/ResourceHandle.cpp \
     platform/network/ResourceRequestBase.cpp \
     platform/network/ResourceResponseBase.cpp \
-    platform/RegularExpression.cpp \
+    platform/text/RegularExpression.cpp \
     platform/ScrollBar.cpp \
 #    platform/SearchPopupMenu.cpp \
     platform/SecurityOrigin.cpp \
     platform/SecurityOriginData.cpp \
-    platform/SegmentedString.cpp \
+    platform/text/SegmentedString.cpp \
     platform/SharedBuffer.cpp \
-    platform/String.cpp \
-    platform/StringImpl.cpp \
-    platform/TextCodec.cpp \
-    platform/TextCodecLatin1.cpp \
-    platform/TextCodecUserDefined.cpp \
-    platform/TextCodecUTF16.cpp \
-    platform/TextDecoder.cpp \
-    platform/TextEncoding.cpp \
-    platform/TextEncodingRegistry.cpp \
-    platform/TextStream.cpp \
+    platform/text/String.cpp \
+    platform/text/StringImpl.cpp \
+    platform/text/TextCodec.cpp \
+    platform/text/TextCodecLatin1.cpp \
+    platform/text/TextCodecUserDefined.cpp \
+    platform/text/TextCodecUTF16.cpp \
+    platform/text/TextDecoder.cpp \
+    platform/text/TextEncoding.cpp \
+    platform/text/TextEncodingRegistry.cpp \
+    platform/text/TextStream.cpp \
     platform/Timer.cpp \
-    platform/UnicodeRange.cpp \
+    platform/text/UnicodeRange.cpp \
     platform/Widget.cpp \
     rendering/AutoTableLayout.cpp \
     rendering/bidi.cpp \
@@ -830,12 +831,12 @@ SOURCES += \
 
 gtk-port {
   SOURCES += \
-    platform/GlyphPageTreeNode.cpp \
-    platform/GlyphWidthMap.cpp \
-    platform/FontCache.cpp \
-    platform/Font.cpp \
-    platform/FontData.cpp \
-    platform/FontFallbackList.cpp 
+    platform/graphics/GlyphPageTreeNode.cpp \
+    platform/graphics/GlyphWidthMap.cpp \
+    platform/graphics/FontCache.cpp \
+    platform/graphics/Font.cpp \
+    platform/graphics/FontData.cpp \
+    platform/graphics/FontFallbackList.cpp 
 }
 
 qt-port {
@@ -952,9 +953,9 @@ gtk-port {
         ../WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
         ../WebKit/gtk/WebCoreSupport/InspectorClientGtk.h
     SOURCES += \
-        platform/StringTruncator.cpp \
-        platform/TextCodecICU.cpp \
-        platform/TextBreakIteratorICU.cpp \
+        platform/graphics/StringTruncator.cpp \
+        platform/text/TextCodecICU.cpp \
+        platform/text/TextBreakIteratorICU.cpp \
         page/gtk/EventHandlerGtk.cpp \
         page/gtk/FrameGtk.cpp \
         page/gtk/DragControllerGtk.cpp \
index 9fe74a3..09aebf2 100644 (file)
@@ -43,7 +43,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(ProjectDir)..\&quot;;&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\css&quot;;&quot;$(ProjectDir)..\editing&quot;;&quot;$(ProjectDir)..\rendering&quot;;&quot;$(ProjectDir)..\bindings\js&quot;;&quot;$(ProjectDir)..\dom&quot;;&quot;$(ProjectDir)..\history&quot;;&quot;$(ProjectDir)..\html&quot;;&quot;$(ProjectDir)..\bridge&quot;;&quot;$(ProjectDir)..\bridge\win&quot;;&quot;$(ProjectDir)..\loader&quot;;&quot;$(ProjectDir)..\loader\icon&quot;;&quot;$(ProjectDir)..\page&quot;;&quot;$(ProjectDir)..\platform&quot;;&quot;$(ProjectDir)..\platform\sql&quot;;&quot;$(ProjectDir)..\platform\win&quot;;&quot;$(ProjectDir)..\platform\network&quot;;&quot;$(ProjectDir)..\platform\network\win&quot;;&quot;$(ProjectDir)..\platform\cf&quot;;&quot;$(ProjectDir)..\platform\network\cf&quot;;&quot;$(ProjectDir)..\platform\graphics&quot;;&quot;$(ProjectDir)..\platform\graphics\cairo&quot;;&quot;$(ProjectDir)..\platform\graphics\cg&quot;;&quot;$(ProjectDir)..\platform\graphics\win&quot;;&quot;$(ProjectDir)..\platform\image-decoders&quot;;&quot;$(ProjectDir)..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)..\xml&quot;;&quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;;&quot;$(ProjectDir)..\plugins\win&quot;;&quot;$(ProjectDir)..\platform\cairo\pixman\src&quot;;&quot;$(ProjectDir)..\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)..\platform\graphics\svg&quot;;&quot;$(ProjectDir)..\platform\graphics\svg\cg&quot;;&quot;$(ProjectDir)..\platform\graphics\svg\filters&quot;;&quot;$(ProjectDir)..\kcanvas&quot;;&quot;$(ProjectDir)..\kcanvas\device&quot;;&quot;$(ProjectDir)..\kcanvas\device\quartz&quot;;&quot;$(ProjectDir)..\ksvg2&quot;;&quot;$(ProjectDir)..\ksvg2\css&quot;;&quot;$(ProjectDir)..\ksvg2\events&quot;;&quot;$(ProjectDir)..\ksvg2\misc&quot;;&quot;$(ProjectDir)..\ksvg2\svg&quot;;&quot;$(ProjectDir)..\storage&quot;;&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(ProjectDir)..\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\icu&quot;;&quot;$(WebKitLibrariesDir)\include\iconv&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitLibrariesDir)\include\sqlite&quot;;&quot;$(WebKitLibrariesDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(ProjectDir)..\&quot;;&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\css&quot;;&quot;$(ProjectDir)..\editing&quot;;&quot;$(ProjectDir)..\rendering&quot;;&quot;$(ProjectDir)..\bindings\js&quot;;&quot;$(ProjectDir)..\dom&quot;;&quot;$(ProjectDir)..\history&quot;;&quot;$(ProjectDir)..\html&quot;;&quot;$(ProjectDir)..\bridge&quot;;&quot;$(ProjectDir)..\bridge\win&quot;;&quot;$(ProjectDir)..\loader&quot;;&quot;$(ProjectDir)..\loader\icon&quot;;&quot;$(ProjectDir)..\page&quot;;&quot;$(ProjectDir)..\platform&quot;;&quot;$(ProjectDir)..\platform\sql&quot;;&quot;$(ProjectDir)..\platform\win&quot;;&quot;$(ProjectDir)..\platform\network&quot;;&quot;$(ProjectDir)..\platform\network\win&quot;;&quot;$(ProjectDir)..\platform\cf&quot;;&quot;$(ProjectDir)..\platform\network\cf&quot;;&quot;$(ProjectDir)..\platform\graphics&quot;;&quot;$(ProjectDir)..\platform\text&quot;;&quot;$(ProjectDir)..\platform\graphics\cairo&quot;;&quot;$(ProjectDir)..\platform\graphics\cg&quot;;&quot;$(ProjectDir)..\platform\graphics\win&quot;;&quot;$(ProjectDir)..\platform\image-decoders&quot;;&quot;$(ProjectDir)..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)..\xml&quot;;&quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;;&quot;$(ProjectDir)..\plugins\win&quot;;&quot;$(ProjectDir)..\platform\cairo\pixman\src&quot;;&quot;$(ProjectDir)..\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)..\platform\graphics\svg&quot;;&quot;$(ProjectDir)..\platform\graphics\svg\cg&quot;;&quot;$(ProjectDir)..\platform\graphics\svg\filters&quot;;&quot;$(ProjectDir)..\kcanvas&quot;;&quot;$(ProjectDir)..\kcanvas\device&quot;;&quot;$(ProjectDir)..\kcanvas\device\quartz&quot;;&quot;$(ProjectDir)..\ksvg2&quot;;&quot;$(ProjectDir)..\ksvg2\css&quot;;&quot;$(ProjectDir)..\ksvg2\events&quot;;&quot;$(ProjectDir)..\ksvg2\misc&quot;;&quot;$(ProjectDir)..\ksvg2\svg&quot;;&quot;$(ProjectDir)..\storage&quot;;&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(ProjectDir)..\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\icu&quot;;&quot;$(WebKitLibrariesDir)\include\iconv&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitLibrariesDir)\include\sqlite&quot;;&quot;$(WebKitLibrariesDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;"\r
                                PreprocessorDefinitions="WIN32;__WIN32__;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;ENABLE_SVG_EXPERIMENTAL_FEATURES;WEBCORE_CONTEXT_MENUS;USE_SAFARI_THEME"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="0"\r
@@ -86,7 +86,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\bindings&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\kjs&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\pcre&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode\icu&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\config.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\loader\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\loader\icon\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\history\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\html\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\css\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\cf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\graphics\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\cf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\sql\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\cairo\cairo\src\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bindings\js\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bridge\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bridge\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\page\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\plugins\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\rendering\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\editing\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\dom\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\xml\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\css\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\events\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\misc\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\scripts\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\svg\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\storage\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\bindings\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\kjs\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\kjs&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\pcre\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\pcre&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\unicode\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\unicode\icu\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode\icu&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin\WebKit.resources\inspector&quot;&#x0D;&#x0A;xcopy /y /d /s /exclude:xcopy.excludes &quot;$(ProjectDir)\..\page\inspector\*&quot; &quot;$(WebKitOutputDir)\bin\WebKit.resources\inspector&quot;&#x0D;&#x0A;"\r
+                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\bindings&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\kjs&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\pcre&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode\icu&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\config.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\loader\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\loader\icon\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\history\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\html\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\css\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\cf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\graphics\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\text\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\cf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\sql\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\cairo\cairo\src\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bindings\js\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bridge\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bridge\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\page\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\plugins\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\rendering\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\editing\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\dom\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\xml\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\css\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\events\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\misc\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\scripts\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\svg\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\storage\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\bindings\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\kjs\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\kjs&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\pcre\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\pcre&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\unicode\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\unicode\icu\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode\icu&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin\WebKit.resources\inspector&quot;&#x0D;&#x0A;xcopy /y /d /s /exclude:xcopy.excludes &quot;$(ProjectDir)\..\page\inspector\*&quot; &quot;$(WebKitOutputDir)\bin\WebKit.resources\inspector&quot;&#x0D;&#x0A;"\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(ProjectDir)..\&quot;;&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\css&quot;;&quot;$(ProjectDir)..\editing&quot;;&quot;$(ProjectDir)..\rendering&quot;;&quot;$(ProjectDir)..\bindings\js&quot;;&quot;$(ProjectDir)..\dom&quot;;&quot;$(ProjectDir)..\history&quot;;&quot;$(ProjectDir)..\html&quot;;&quot;$(ProjectDir)..\bridge&quot;;&quot;$(ProjectDir)..\bridge\win&quot;;&quot;$(ProjectDir)..\loader&quot;;&quot;$(ProjectDir)..\loader\icon&quot;;&quot;$(ProjectDir)..\page&quot;;&quot;$(ProjectDir)..\platform&quot;;&quot;$(ProjectDir)..\platform\sql&quot;;&quot;$(ProjectDir)..\platform\win&quot;;&quot;$(ProjectDir)..\platform\network&quot;;&quot;$(ProjectDir)..\platform\network\win&quot;;&quot;$(ProjectDir)..\platform\cf&quot;;&quot;$(ProjectDir)..\platform\network\cf&quot;;&quot;$(ProjectDir)..\platform\graphics&quot;;&quot;$(ProjectDir)..\platform\graphics\cairo&quot;;&quot;$(ProjectDir)..\platform\graphics\cg&quot;;&quot;$(ProjectDir)..\platform\graphics\win&quot;;&quot;$(ProjectDir)..\platform\image-decoders&quot;;&quot;$(ProjectDir)..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)..\xml&quot;;&quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;;&quot;$(ProjectDir)..\plugins\win&quot;;&quot;$(ProjectDir)..\platform\cairo\pixman\src&quot;;&quot;$(ProjectDir)..\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)..\platform\graphics\svg&quot;;&quot;$(ProjectDir)..\platform\graphics\svg\cg&quot;;&quot;$(ProjectDir)..\platform\graphics\svg\filters&quot;;&quot;$(ProjectDir)..\kcanvas&quot;;&quot;$(ProjectDir)..\kcanvas\device&quot;;&quot;$(ProjectDir)..\kcanvas\device\quartz&quot;;&quot;$(ProjectDir)..\ksvg2&quot;;&quot;$(ProjectDir)..\ksvg2\css&quot;;&quot;$(ProjectDir)..\ksvg2\events&quot;;&quot;$(ProjectDir)..\ksvg2\misc&quot;;&quot;$(ProjectDir)..\ksvg2\svg&quot;;&quot;$(ProjectDir)..\storage&quot;;&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(ProjectDir)..\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\icu&quot;;&quot;$(WebKitLibrariesDir)\include\iconv&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitLibrariesDir)\include\sqlite&quot;;&quot;$(WebKitLibrariesDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(ProjectDir)..\&quot;;&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\css&quot;;&quot;$(ProjectDir)..\editing&quot;;&quot;$(ProjectDir)..\rendering&quot;;&quot;$(ProjectDir)..\bindings\js&quot;;&quot;$(ProjectDir)..\dom&quot;;&quot;$(ProjectDir)..\history&quot;;&quot;$(ProjectDir)..\html&quot;;&quot;$(ProjectDir)..\bridge&quot;;&quot;$(ProjectDir)..\bridge\win&quot;;&quot;$(ProjectDir)..\loader&quot;;&quot;$(ProjectDir)..\loader\icon&quot;;&quot;$(ProjectDir)..\page&quot;;&quot;$(ProjectDir)..\platform&quot;;&quot;$(ProjectDir)..\platform\sql&quot;;&quot;$(ProjectDir)..\platform\win&quot;;&quot;$(ProjectDir)..\platform\network&quot;;&quot;$(ProjectDir)..\platform\network\win&quot;;&quot;$(ProjectDir)..\platform\cf&quot;;&quot;$(ProjectDir)..\platform\network\cf&quot;;&quot;$(ProjectDir)..\platform\graphics&quot;;&quot;$(ProjectDir)..\platform\text&quot;;&quot;$(ProjectDir)..\platform\graphics\cairo&quot;;&quot;$(ProjectDir)..\platform\graphics\cg&quot;;&quot;$(ProjectDir)..\platform\graphics\win&quot;;&quot;$(ProjectDir)..\platform\image-decoders&quot;;&quot;$(ProjectDir)..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)..\xml&quot;;&quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;;&quot;$(ProjectDir)..\plugins\win&quot;;&quot;$(ProjectDir)..\platform\cairo\pixman\src&quot;;&quot;$(ProjectDir)..\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)..\platform\graphics\svg&quot;;&quot;$(ProjectDir)..\platform\graphics\svg\cg&quot;;&quot;$(ProjectDir)..\platform\graphics\svg\filters&quot;;&quot;$(ProjectDir)..\kcanvas&quot;;&quot;$(ProjectDir)..\kcanvas\device&quot;;&quot;$(ProjectDir)..\kcanvas\device\quartz&quot;;&quot;$(ProjectDir)..\ksvg2&quot;;&quot;$(ProjectDir)..\ksvg2\css&quot;;&quot;$(ProjectDir)..\ksvg2\events&quot;;&quot;$(ProjectDir)..\ksvg2\misc&quot;;&quot;$(ProjectDir)..\ksvg2\svg&quot;;&quot;$(ProjectDir)..\storage&quot;;&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(ProjectDir)..\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\icu&quot;;&quot;$(WebKitLibrariesDir)\include\iconv&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitLibrariesDir)\include\sqlite&quot;;&quot;$(WebKitLibrariesDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;"\r
                                PreprocessorDefinitions="WIN32;__WIN32__;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;ENABLE_SVG_EXPERIMENTAL_FEATURES;NDEBUG;WEBCORE_CONTEXT_MENUS;USE_SAFARI_THEME"\r
                                ExceptionHandling="0"\r
                                RuntimeLibrary="2"\r
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\bindings&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\kjs&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\pcre&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode\icu&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\config.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\loader\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\loader\icon\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\history\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\html\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\css\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\cf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\graphics\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\cf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\sql\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\cairo\cairo\src\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bindings\js\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bridge\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bridge\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\page\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\plugins\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\rendering\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\editing\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\dom\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\xml\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\css\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\events\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\misc\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\scripts\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\svg\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\storage\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\bindings\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\kjs\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\kjs&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\pcre\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\pcre&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\unicode\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\unicode\icu\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode\icu&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin\WebKit.resources\inspector&quot;&#x0D;&#x0A;xcopy /y /d /s /exclude:xcopy.excludes &quot;$(ProjectDir)\..\page\inspector\*&quot; &quot;$(WebKitOutputDir)\bin\WebKit.resources\inspector&quot;&#x0D;&#x0A;"\r
+                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\bindings&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\kjs&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\pcre&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode\icu&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\config.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\loader\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\loader\icon\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\history\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\html\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\css\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\cf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\graphics\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\text\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\cf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\sql\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\cairo\cairo\src\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bindings\js\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bridge\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bridge\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\page\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\plugins\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\rendering\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\editing\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\dom\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\xml\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\css\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\events\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\misc\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\scripts\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\svg\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\storage\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\bindings\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\kjs\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\kjs&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\pcre\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\pcre&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\unicode\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\unicode\icu\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode\icu&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin\WebKit.resources\inspector&quot;&#x0D;&#x0A;xcopy /y /d /s /exclude:xcopy.excludes &quot;$(ProjectDir)\..\page\inspector\*&quot; &quot;$(WebKitOutputDir)\bin\WebKit.resources\inspector&quot;&#x0D;&#x0A;"\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(ProjectDir)..\&quot;;&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\css&quot;;&quot;$(ProjectDir)..\editing&quot;;&quot;$(ProjectDir)..\rendering&quot;;&quot;$(ProjectDir)..\bindings\js&quot;;&quot;$(ProjectDir)..\dom&quot;;&quot;$(ProjectDir)..\history&quot;;&quot;$(ProjectDir)..\html&quot;;&quot;$(ProjectDir)..\bridge&quot;;&quot;$(ProjectDir)..\bridge\win&quot;;&quot;$(ProjectDir)..\loader&quot;;&quot;$(ProjectDir)..\loader\icon&quot;;&quot;$(ProjectDir)..\page&quot;;&quot;$(ProjectDir)..\platform&quot;;&quot;$(ProjectDir)..\platform\sql&quot;;&quot;$(ProjectDir)..\platform\win&quot;;&quot;$(ProjectDir)..\platform\network&quot;;&quot;$(ProjectDir)..\platform\network\win&quot;;&quot;$(ProjectDir)..\platform\cf&quot;;&quot;$(ProjectDir)..\platform\network\cf&quot;;&quot;$(ProjectDir)..\platform\graphics&quot;;&quot;$(ProjectDir)..\platform\graphics\cairo&quot;;&quot;$(ProjectDir)..\platform\graphics\cg&quot;;&quot;$(ProjectDir)..\platform\graphics\win&quot;;&quot;$(ProjectDir)..\platform\image-decoders&quot;;&quot;$(ProjectDir)..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)..\xml&quot;;&quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;;&quot;$(ProjectDir)..\plugins\win&quot;;&quot;$(ProjectDir)..\platform\cairo\pixman\src&quot;;&quot;$(ProjectDir)..\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)..\platform\graphics\svg&quot;;&quot;$(ProjectDir)..\platform\graphics\svg\cg&quot;;&quot;$(ProjectDir)..\platform\graphics\svg\filters&quot;;&quot;$(ProjectDir)..\kcanvas&quot;;&quot;$(ProjectDir)..\kcanvas\device&quot;;&quot;$(ProjectDir)..\kcanvas\device\quartz&quot;;&quot;$(ProjectDir)..\ksvg2&quot;;&quot;$(ProjectDir)..\ksvg2\css&quot;;&quot;$(ProjectDir)..\ksvg2\events&quot;;&quot;$(ProjectDir)..\ksvg2\misc&quot;;&quot;$(ProjectDir)..\ksvg2\svg&quot;;&quot;$(ProjectDir)..\storage&quot;;&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(ProjectDir)..\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\icu&quot;;&quot;$(WebKitLibrariesDir)\include\iconv&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitLibrariesDir)\include\sqlite&quot;;&quot;$(WebKitLibrariesDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(ProjectDir)..\&quot;;&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\css&quot;;&quot;$(ProjectDir)..\editing&quot;;&quot;$(ProjectDir)..\rendering&quot;;&quot;$(ProjectDir)..\bindings\js&quot;;&quot;$(ProjectDir)..\dom&quot;;&quot;$(ProjectDir)..\history&quot;;&quot;$(ProjectDir)..\html&quot;;&quot;$(ProjectDir)..\bridge&quot;;&quot;$(ProjectDir)..\bridge\win&quot;;&quot;$(ProjectDir)..\loader&quot;;&quot;$(ProjectDir)..\loader\icon&quot;;&quot;$(ProjectDir)..\page&quot;;&quot;$(ProjectDir)..\platform&quot;;&quot;$(ProjectDir)..\platform\sql&quot;;&quot;$(ProjectDir)..\platform\win&quot;;&quot;$(ProjectDir)..\platform\network&quot;;&quot;$(ProjectDir)..\platform\network\win&quot;;&quot;$(ProjectDir)..\platform\cf&quot;;&quot;$(ProjectDir)..\platform\network\cf&quot;;&quot;$(ProjectDir)..\platform\graphics&quot;;&quot;$(ProjectDir)..\platform\text&quot;;&quot;$(ProjectDir)..\platform\graphics\cairo&quot;;&quot;$(ProjectDir)..\platform\graphics\cg&quot;;&quot;$(ProjectDir)..\platform\graphics\win&quot;;&quot;$(ProjectDir)..\platform\image-decoders&quot;;&quot;$(ProjectDir)..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)..\xml&quot;;&quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;;&quot;$(ProjectDir)..\plugins\win&quot;;&quot;$(ProjectDir)..\platform\cairo\pixman\src&quot;;&quot;$(ProjectDir)..\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)..\platform\graphics\svg&quot;;&quot;$(ProjectDir)..\platform\graphics\svg\cg&quot;;&quot;$(ProjectDir)..\platform\graphics\svg\filters&quot;;&quot;$(ProjectDir)..\kcanvas&quot;;&quot;$(ProjectDir)..\kcanvas\device&quot;;&quot;$(ProjectDir)..\kcanvas\device\quartz&quot;;&quot;$(ProjectDir)..\ksvg2&quot;;&quot;$(ProjectDir)..\ksvg2\css&quot;;&quot;$(ProjectDir)..\ksvg2\events&quot;;&quot;$(ProjectDir)..\ksvg2\misc&quot;;&quot;$(ProjectDir)..\ksvg2\svg&quot;;&quot;$(ProjectDir)..\storage&quot;;&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(ProjectDir)..\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\icu&quot;;&quot;$(WebKitLibrariesDir)\include\iconv&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitLibrariesDir)\include\sqlite&quot;;&quot;$(WebKitLibrariesDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;"\r
                                PreprocessorDefinitions="WIN32;__WIN32__;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;ENABLE_SVG_EXPERIMENTAL_FEATURES;WEBCORE_CONTEXT_MENUS;USE_SAFARI_THEME"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="0"\r
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\bindings&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\kjs&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\pcre&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode\icu&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\config.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\loader\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\loader\icon\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\history\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\html\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\css\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\cf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\graphics\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\cf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\sql\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\cairo\cairo\src\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bindings\js\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bridge\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bridge\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\page\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\plugins\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\rendering\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\editing\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\dom\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\xml\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\css\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\events\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\misc\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\scripts\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\svg\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\storage\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\bindings\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\kjs\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\kjs&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\pcre\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\pcre&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\unicode\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\unicode\icu\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode\icu&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin\WebKit.resources\inspector&quot;&#x0D;&#x0A;xcopy /y /d /s /exclude:xcopy.excludes &quot;$(ProjectDir)\..\page\inspector\*&quot; &quot;$(WebKitOutputDir)\bin\WebKit.resources\inspector&quot;&#x0D;&#x0A;"\r
+                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\bindings&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\kjs&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\pcre&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode\icu&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\config.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\loader\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\loader\icon\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\history\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\html\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\css\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\cf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\graphics\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\text\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\cf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\network\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\sql\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\platform\cairo\cairo\src\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bindings\js\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bridge\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\bridge\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\page\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\plugins\win\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\rendering\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\editing\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\dom\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\xml\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\css\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\events\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\misc\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\scripts\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\ksvg2\svg\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\storage\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\bindings\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\kjs\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\kjs&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\pcre\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\pcre&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\unicode\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\ForwardingHeaders\wtf\unicode\icu\*.h&quot; &quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders\wtf\unicode\icu&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin\WebKit.resources\inspector&quot;&#x0D;&#x0A;xcopy /y /d /s /exclude:xcopy.excludes &quot;$(ProjectDir)\..\page\inspector\*&quot; &quot;$(WebKitOutputDir)\bin\WebKit.resources\inspector&quot;&#x0D;&#x0A;"\r
                        />\r
                </Configuration>\r
        </Configurations>\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\AtomicString.cpp"\r
+                               RelativePath="..\platform\text\AtomicString.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\AtomicString.h"\r
+                               RelativePath="..\platform\text\AtomicString.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\AtomicStringImpl.h"\r
+                               RelativePath="..\platform\text\AtomicStringImpl.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\Base64.cpp"\r
+                               RelativePath="..\platform\text\Base64.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\Base64.h"\r
+                               RelativePath="..\platform\text\Base64.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\BidiContext.cpp"\r
+                               RelativePath="..\platform\text\BidiContext.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\BidiContext.h"\r
+                               RelativePath="..\platform\text\BidiContext.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\BidiResolver.h"\r
+                               RelativePath="..\platform\text\BidiResolver.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\CharacterNames.h"\r
+                               RelativePath="..\platform\text\CharacterNames.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\CString.cpp"\r
+                               RelativePath="..\platform\text\CString.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\CString.h"\r
+                               RelativePath="..\platform\text\CString.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\Font.cpp"\r
+                               RelativePath="..\platform\graphics\Font.cpp"\r
                                >\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\Font.h"\r
+                               RelativePath="..\platform\graphics\Font.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\FontCache.cpp"\r
+                               RelativePath="..\platform\graphics\FontCache.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\FontCache.h"\r
+                               RelativePath="..\platform\graphics\FontCache.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\FontData.cpp"\r
+                               RelativePath="..\platform\graphics\FontData.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\FontData.h"\r
+                               RelativePath="..\platform\graphics\FontData.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\FontDescription.h"\r
+                               RelativePath="..\platform\graphics\FontDescription.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\FontFallbackList.cpp"\r
+                               RelativePath="..\platform\graphics\FontFallbackList.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\FontFallbackList.h"\r
+                               RelativePath="..\platform\graphics\FontFallbackList.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\FontFamily.cpp"\r
+                               RelativePath="..\platform\graphics\FontFamily.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\FontFamily.h"\r
+                               RelativePath="..\platform\graphics\FontFamily.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\FontSelector.h"\r
+                               RelativePath="..\platform\graphics\FontSelector.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\GlyphBuffer.h"\r
+                               RelativePath="..\platform\graphics\GlyphBuffer.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\GlyphPageTreeNode.cpp"\r
+                               RelativePath="..\platform\graphics\GlyphPageTreeNode.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\GlyphPageTreeNode.h"\r
+                               RelativePath="..\platform\graphics\GlyphPageTreeNode.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\GlyphWidthMap.cpp"\r
+                               RelativePath="..\platform\graphics\GlyphWidthMap.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\GlyphWidthMap.h"\r
+                               RelativePath="..\platform\graphics\GlyphWidthMap.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\RegularExpression.cpp"\r
+                               RelativePath="..\platform\text\RegularExpression.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\RegularExpression.h"\r
+                               RelativePath="..\platform\text\RegularExpression.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\SegmentedString.cpp"\r
+                               RelativePath="..\platform\text\SegmentedString.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\SegmentedString.h"\r
+                               RelativePath="..\platform\text\SegmentedString.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\String.cpp"\r
+                               RelativePath="..\platform\text\String.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\StringHash.h"\r
+                               RelativePath="..\platform\text\StringHash.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\StringImpl.cpp"\r
+                               RelativePath="..\platform\text\StringImpl.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\StringImpl.h"\r
+                               RelativePath="..\platform\text\StringImpl.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\StringTruncator.cpp"\r
+                               RelativePath="..\platform\graphics\StringTruncator.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\StringTruncator.h"\r
+                               RelativePath="..\platform\graphics\StringTruncator.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextBoundaries.h"\r
+                               RelativePath="..\platform\text\TextBoundaries.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextBoundariesICU.cpp"\r
+                               RelativePath="..\platform\text\TextBoundariesICU.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextBreakIterator.h"\r
+                               RelativePath="..\platform\text\TextBreakIterator.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextBreakIteratorICU.cpp"\r
+                               RelativePath="..\platform\text\TextBreakIteratorICU.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextBreakIteratorInternalICU.h"\r
+                               RelativePath="..\platform\text\TextBreakIteratorInternalICU.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextCodec.cpp"\r
+                               RelativePath="..\platform\text\TextCodec.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextCodec.h"\r
+                               RelativePath="..\platform\text\TextCodec.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextCodecICU.cpp"\r
+                               RelativePath="..\platform\text\TextCodecICU.cpp"\r
                                >\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextCodecICU.h"\r
+                               RelativePath="..\platform\text\TextCodecICU.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextCodecLatin1.cpp"\r
+                               RelativePath="..\platform\text\TextCodecLatin1.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextCodecLatin1.h"\r
+                               RelativePath="..\platform\text\TextCodecLatin1.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextCodecUserDefined.cpp"\r
+                               RelativePath="..\platform\text\TextCodecUserDefined.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextCodecUserDefined.h"\r
+                               RelativePath="..\platform\text\TextCodecUserDefined.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextCodecUTF16.cpp"\r
+                               RelativePath="..\platform\text\TextCodecUTF16.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextCodecUTF16.h"\r
+                               RelativePath="..\platform\text\TextCodecUTF16.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextDecoder.cpp"\r
+                               RelativePath="..\platform\text\TextDecoder.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextDecoder.h"\r
+                               RelativePath="..\platform\text\TextDecoder.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextDirection.h"\r
+                               RelativePath="..\platform\text\TextDirection.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextEncoding.cpp"\r
+                               RelativePath="..\platform\text\TextEncoding.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextEncoding.h"\r
+                               RelativePath="..\platform\text\TextEncoding.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextEncodingRegistry.cpp"\r
+                               RelativePath="..\platform\text\TextEncodingRegistry.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextEncodingRegistry.h"\r
+                               RelativePath="..\platform\text\TextEncodingRegistry.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextStream.cpp"\r
+                               RelativePath="..\platform\text\TextStream.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextStream.h"\r
+                               RelativePath="..\platform\text\TextStream.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\TextStyle.h"\r
+                               RelativePath="..\platform\text\TextStyle.h"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\UnicodeRange.cpp"\r
+                               RelativePath="..\platform\text\UnicodeRange.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\platform\UnicodeRange.h"\r
+                               RelativePath="..\platform\text\UnicodeRange.h"\r
                                >\r
                        </File>\r
                        <File\r
index 0dcca7d..83d35f5 100644 (file)
                066C772D0AB603D200238CC4 /* FileChooserMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 066C772C0AB603D200238CC4 /* FileChooserMac.mm */; };
                066C77300AB603FD00238CC4 /* RenderFileUploadControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 066C772E0AB603FD00238CC4 /* RenderFileUploadControl.cpp */; };
                066C77310AB603FD00238CC4 /* RenderFileUploadControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 066C772F0AB603FD00238CC4 /* RenderFileUploadControl.h */; };
-               06A6A73C0B8BA44800DF1703 /* StringTruncator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06A6A73A0B8BA44800DF1703 /* StringTruncator.cpp */; };
-               06A6A73D0B8BA44800DF1703 /* StringTruncator.h in Headers */ = {isa = PBXBuildFile; fileRef = 06A6A73B0B8BA44800DF1703 /* StringTruncator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                06E81ED70AB5D5E900C87837 /* LocalCurrentGraphicsContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 06E81ED60AB5D5E900C87837 /* LocalCurrentGraphicsContext.h */; };
                06E81EEC0AB5DA9700C87837 /* LocalCurrentGraphicsContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 06E81EEB0AB5DA9700C87837 /* LocalCurrentGraphicsContext.mm */; };
                06FC442D0BAE5A9E0090EDE1 /* JavaScriptStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06FC442B0BAE5A9E0090EDE1 /* JavaScriptStatistics.cpp */; };
                06FC442E0BAE5A9E0090EDE1 /* JavaScriptStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = 06FC442C0BAE5A9E0090EDE1 /* JavaScriptStatistics.h */; settings = {ATTRIBUTES = (Private, ); }; };
                0A4844990CA44CB200B7BD48 /* SoftLinking.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A4844980CA44CB200B7BD48 /* SoftLinking.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               0F31CBF92B654730BA0535E8 /* BidiContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 514AF320BE854014A7DA49FB /* BidiContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1402645E0AFDC19B005919E2 /* LoggingMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1402645D0AFDC19B005919E2 /* LoggingMac.mm */; };
                1403B99709EB13AF00797C7F /* DOMWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 1403B99509EB13AF00797C7F /* DOMWindow.h */; };
                1403B99809EB13AF00797C7F /* DOMWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1403B99609EB13AF00797C7F /* DOMWindow.cpp */; };
                1A85B2110A1B258700D8C87C /* JSHTMLUListElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A85B20F0A1B258700D8C87C /* JSHTMLUListElement.h */; };
                1A85B2B60A1B2AC700D8C87C /* JSHTMLDivElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A85B2B40A1B2AC700D8C87C /* JSHTMLDivElement.cpp */; };
                1A85B2B70A1B2AC700D8C87C /* JSHTMLDivElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A85B2B50A1B2AC700D8C87C /* JSHTMLDivElement.h */; };
-               1A98955C0AA78149005EF5EF /* CString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A98955A0AA78149005EF5EF /* CString.cpp */; };
-               1A98955D0AA78149005EF5EF /* CString.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A98955B0AA78149005EF5EF /* CString.h */; };
                1A98956B0AA78F80005EF5EF /* KURLCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A98956A0AA78F80005EF5EF /* KURLCFNet.cpp */; };
                1A9EF4570A1B957D00332B63 /* JSCanvasRenderingContext2DCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A9EF4560A1B957D00332B63 /* JSCanvasRenderingContext2DCustom.cpp */; };
                1AB1AE7A0C051FDE00139F4F /* zoomInCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AB1AE780C051FDE00139F4F /* zoomInCursor.png */; };
                514185EF0CD65F0400763C99 /* ChangeVersionWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514185ED0CD65F0400763C99 /* ChangeVersionWrapper.cpp */; };
                514B3F730C722047000530DF /* FileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 514B3F720C722047000530DF /* FileSystem.h */; };
                514B3F760C722055000530DF /* FileSystemMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514B3F750C722055000530DF /* FileSystemMac.mm */; };
-               514C762E0CE921F4007EF3CD /* UnicodeRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514C762C0CE921F4007EF3CD /* UnicodeRange.cpp */; };
-               514C762F0CE921F4007EF3CD /* UnicodeRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 514C762D0CE921F4007EF3CD /* UnicodeRange.h */; };
                514C76370CE9225E007EF3CD /* JSSQLError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514C76350CE9225E007EF3CD /* JSSQLError.cpp */; };
                514C76380CE9225E007EF3CD /* JSSQLTransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514C76360CE9225E007EF3CD /* JSSQLTransaction.cpp */; };
                514C764C0CE9234E007EF3CD /* AuthenticationMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 514C76420CE9234E007EF3CD /* AuthenticationMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
                656D37440ADBA5DE00A4554D /* NetscapePlugInStreamLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656D372C0ADBA5DE00A4554D /* NetscapePlugInStreamLoaderMac.mm */; };
                656D37450ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D372D0ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                656D37480ADBA5DE00A4554D /* SubresourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37300ADBA5DE00A4554D /* SubresourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               657BD74D09AFDC54005A2056 /* TextCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 657BD74909AFDC54005A2056 /* TextCodec.cpp */; };
-               657BD74E09AFDC54005A2056 /* TextCodec.h in Headers */ = {isa = PBXBuildFile; fileRef = 657BD74A09AFDC54005A2056 /* TextCodec.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               657BD74F09AFDC54005A2056 /* TextEncoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 657BD74B09AFDC54005A2056 /* TextEncoding.cpp */; };
-               657BD75009AFDC54005A2056 /* TextEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 657BD74C09AFDC54005A2056 /* TextEncoding.h */; settings = {ATTRIBUTES = (Private, ); }; };
                6582A13F09999CD600BEEB6D /* DeprecatedString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6582A13D09999CD600BEEB6D /* DeprecatedString.cpp */; };
                6582A14009999CD600BEEB6D /* DeprecatedString.h in Headers */ = {isa = PBXBuildFile; fileRef = 6582A13E09999CD600BEEB6D /* DeprecatedString.h */; settings = {ATTRIBUTES = (Private, ); }; };
                6582A16309999D6D00BEEB6D /* SystemTimeMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6582A15509999D6D00BEEB6D /* SystemTimeMac.cpp */; };
                85E9E0A80AB3A11900069CD0 /* DOMXPathExpression.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85E9E09B0AB3A0C700069CD0 /* DOMXPathExpression.h */; };
                85E9E0AA0AB3A11900069CD0 /* DOMXPathNSResolver.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85E9E09E0AB3A0C700069CD0 /* DOMXPathNSResolver.h */; };
                85E9E0AB0AB3A11900069CD0 /* DOMXPathResult.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85E9E09F0AB3A0C700069CD0 /* DOMXPathResult.h */; };
-               85EC9AFA0A71A2C600EEEAED /* FontData.h in Headers */ = {isa = PBXBuildFile; fileRef = 85EC9AF80A71A2C600EEEAED /* FontData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                85EC9AFB0A71A2C600EEEAED /* Language.h in Headers */ = {isa = PBXBuildFile; fileRef = 85EC9AF90A71A2C600EEEAED /* Language.h */; };
                85ECBEEB0AA7626900544F0B /* DOMHTMLAreaElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 85ECBEDD0AA7626800544F0B /* DOMHTMLAreaElement.h */; };
                85ECBEEC0AA7626900544F0B /* DOMHTMLAreaElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 85ECBEDE0AA7626800544F0B /* DOMHTMLAreaElement.mm */; };
                9307F1D70AF2D59000DBA31A /* HitTestResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9307F1D50AF2D59000DBA31A /* HitTestResult.cpp */; };
                9307F1D80AF2D59000DBA31A /* HitTestResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 9307F1D60AF2D59000DBA31A /* HitTestResult.h */; settings = {ATTRIBUTES = (Private, ); }; };
                930908910AF7EDE40081DF01 /* HitTestRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 930908900AF7EDE40081DF01 /* HitTestRequest.h */; };
-               93126F6109D7A736008D9626 /* StringHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 93126F6009D7A736008D9626 /* StringHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               9326DC0B09DAD5BE00AFC847 /* CharsetData.h in Headers */ = {isa = PBXBuildFile; fileRef = 9326DC0A09DAD5BE00AFC847 /* CharsetData.h */; };
                9326DC0C09DAD5D600AFC847 /* CharsetData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 656581AC09D14EE6000E61D7 /* CharsetData.cpp */; };
                9327A94209968D1A0068A546 /* HTMLOptionsCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */; };
                932871C00B20DEB70049035A /* PlatformMenuDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 932871BF0B20DEB70049035A /* PlatformMenuDescription.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932CA7650AAA1DF500AD1FAD /* TextDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932CA7640AAA1DF500AD1FAD /* TextDecoder.cpp */; };
-               932CA7C10AAA20C100AD1FAD /* TextCodecLatin1.h in Headers */ = {isa = PBXBuildFile; fileRef = 932CA7C00AAA20C100AD1FAD /* TextCodecLatin1.h */; };
-               932CA7C50AAA20D200AD1FAD /* TextCodecLatin1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932CA7C40AAA20D200AD1FAD /* TextCodecLatin1.cpp */; };
-               932CA83B0AAA667F00AD1FAD /* TextCodecUTF16.h in Headers */ = {isa = PBXBuildFile; fileRef = 932CA83A0AAA667F00AD1FAD /* TextCodecUTF16.h */; };
-               932CA8480AAA66CB00AD1FAD /* TextCodecUTF16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932CA8470AAA66CB00AD1FAD /* TextCodecUTF16.cpp */; };
                932E16090AF578340025F408 /* FrameLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932E16080AF578340025F408 /* FrameLoader.cpp */; };
                93309DD6099E64920056E581 /* AppendNodeCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309D87099E64910056E581 /* AppendNodeCommand.cpp */; };
                93309DD7099E64920056E581 /* AppendNodeCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309D88099E64910056E581 /* AppendNodeCommand.h */; };
                933A14AA0B7D1D0900A53FFD /* DOMTextEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 933A14A90B7D1D0900A53FFD /* DOMTextEvent.mm */; };
                933A14B80B7D1D5200A53FFD /* JSTextEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 933A14B60B7D1D5200A53FFD /* JSTextEvent.cpp */; };
                933A14B90B7D1D5200A53FFD /* JSTextEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 933A14B70B7D1D5200A53FFD /* JSTextEvent.h */; };
-               934706AB0AACD809002C1D43 /* TextDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 932CA7420AAA198E00AD1FAD /* TextDecoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
                934D9BA50B8C116B007B42A9 /* WebCoreNSStringExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 934D9BA40B8C116B007B42A9 /* WebCoreNSStringExtras.mm */; };
                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 */; };
-               9352071A09BD3BA500F2038D /* TextBoundaries.h in Headers */ = {isa = PBXBuildFile; fileRef = 9352071809BD3BA500F2038D /* TextBoundaries.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 */; };
                9352087709BD453400F2038D /* CookieJar.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9352087609BD453400F2038D /* CookieJar.mm */; };
                9352088209BD45E900F2038D /* CookieJar.h in Headers */ = {isa = PBXBuildFile; fileRef = 9352088109BD45E900F2038D /* CookieJar.h */; };
                9353676B09AED88B00D35CD6 /* ScrollViewMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9353676A09AED88B00D35CD6 /* ScrollViewMac.mm */; };
-               9353686B09AF78F600D35CD6 /* TextDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 9353686A09AF78F600D35CD6 /* TextDirection.h */; settings = {ATTRIBUTES = (Private, ); }; };
                935C476109AC4CD100A6AAB4 /* Length.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476009AC4CD100A6AAB4 /* Length.h */; settings = {ATTRIBUTES = (Private, ); }; };
                935C476309AC4CE600A6AAB4 /* MouseEventWithHitTestResults.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476209AC4CE600A6AAB4 /* MouseEventWithHitTestResults.h */; };
                935C476809AC4D4300A6AAB4 /* PlatformKeyboardEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476609AC4D4300A6AAB4 /* PlatformKeyboardEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
                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 */; };
-               93AC8DE10A955FAC00239794 /* TextStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 93AC8DE00A955FAC00239794 /* TextStyle.h */; };
-               93AE23180AAB51E500CD8A35 /* TextEncodingRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 93AE23170AAB51E500CD8A35 /* TextEncodingRegistry.h */; };
-               93AE23210AAB521B00CD8A35 /* TextEncodingRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AE23200AAB521B00CD8A35 /* TextEncodingRegistry.cpp */; };
                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, ); }; };
                93C09A7F0B064EEF005ABD4D /* EventHandlerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93C09A7E0B064EEF005ABD4D /* EventHandlerMac.mm */; };
                93C09A810B064F00005ABD4D /* EventHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93C09A800B064F00005ABD4D /* EventHandler.cpp */; };
                93C09C860B0657AA005ABD4D /* ScrollTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C09C850B0657AA005ABD4D /* ScrollTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               93C7B5F40B52D89100B5477E /* CharacterNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C7B5F30B52D89100B5477E /* CharacterNames.h */; };
                93C841F809CE855C00DFF5E5 /* DOMImplementationFront.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C841F709CE855C00DFF5E5 /* DOMImplementationFront.h */; };
                93C841FF09CE858300DFF5E5 /* DOMImplementationFront.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93C841FE09CE858300DFF5E5 /* DOMImplementationFront.cpp */; };
                93CCF0270AF6C52900018E89 /* NavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CCF0260AF6C52900018E89 /* NavigationAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93CCF0600AF6CA7600018E89 /* NavigationAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93CCF05F0AF6CA7600018E89 /* NavigationAction.cpp */; };
-               93CD4FDE0995F9EA007ECC97 /* AtomicString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93CD4FD70995F9EA007ECC97 /* AtomicString.cpp */; };
-               93CD4FDF0995F9EA007ECC97 /* AtomicString.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CD4FD80995F9EA007ECC97 /* AtomicString.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               93CD4FE00995F9EA007ECC97 /* AtomicStringImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CD4FD90995F9EA007ECC97 /* AtomicStringImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               93CD4FE10995F9EA007ECC97 /* String.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93CD4FDA0995F9EA007ECC97 /* String.cpp */; };
-               93CD4FE30995F9EA007ECC97 /* StringImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93CD4FDC0995F9EA007ECC97 /* StringImpl.cpp */; };
-               93CD4FE40995F9EA007ECC97 /* StringImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CD4FDD0995F9EA007ECC97 /* StringImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               93CD4FEC0995FD2A007ECC97 /* PlatformString.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CD4FEB0995FD2A007ECC97 /* PlatformString.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93E227E00AF589AD00D48324 /* DocumentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93E227DB0AF589AD00D48324 /* DocumentLoader.cpp */; };
                93E227E10AF589AD00D48324 /* MainResourceLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93E227DC0AF589AD00D48324 /* MainResourceLoader.cpp */; };
                93E227E20AF589AD00D48324 /* NetscapePlugInStreamLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93E227DD0AF589AD00D48324 /* NetscapePlugInStreamLoader.cpp */; };
                93F1996D08245E59001E9ABC /* DeprecatedPtrListImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851502DE375901EA4122 /* DeprecatedPtrListImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F1998208245E59001E9ABC /* DeprecatedPtrList.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869902DE3B8601EA4122 /* DeprecatedPtrList.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F1998308245E59001E9ABC /* DeprecatedPtrQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786AD02DE3B8601EA4122 /* DeprecatedPtrQueue.h */; };
-               93F1998A08245E59001E9ABC /* RegularExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786B302DE3B8601EA4122 /* RegularExpression.h */; };
                93F1998C08245E59001E9ABC /* RenderTreeAsText.h in Headers */ = {isa = PBXBuildFile; fileRef = 93955A4103D72932008635CE /* RenderTreeAsText.h */; };
-               93F1999B08245E59001E9ABC /* TextStream.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786BF02DE3B8601EA4122 /* TextStream.h */; };
                93F1999D08245E59001E9ABC /* DeprecatedValueList.h in Headers */ = {isa = PBXBuildFile; fileRef = F58786C202DE3B8601EA4122 /* DeprecatedValueList.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F1999E08245E59001E9ABC /* DeprecatedValueListImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587853B02DE375901EA4122 /* DeprecatedValueListImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199A808245E59001E9ABC /* WebCoreFrameView.h in Headers */ = {isa = PBXBuildFile; fileRef = F587854C02DE375901EA4122 /* WebCoreFrameView.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F19A1808245E59001E9ABC /* DeprecatedCString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F58784D502DE375901EA4122 /* DeprecatedCString.cpp */; };
                93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F002DE375901EA4122 /* CursorMac.mm */; };
                93F19A3C08245E59001E9ABC /* DeprecatedPtrListImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587851602DE375901EA4122 /* DeprecatedPtrListImpl.cpp */; };
-               93F19A4A08245E59001E9ABC /* RegularExpression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587852B02DE375901EA4122 /* RegularExpression.cpp */; };
-               93F19A5408245E59001E9ABC /* TextStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587853902DE375901EA4122 /* TextStream.cpp */; };
                93F19A5608245E59001E9ABC /* DeprecatedValueListImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587853C02DE375901EA4122 /* DeprecatedValueListImpl.cpp */; };
                93F19A5F08245E59001E9ABC /* WebCoreViewFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = F587855502DE375901EA4122 /* WebCoreViewFactory.m */; };
                93F19A9108245E59001E9ABC /* HTMLDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D23B02DE4396018635CA /* HTMLDocument.cpp */; };
                B2310B760B1F46A200D55D87 /* CgSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2310B730B1F46A200D55D87 /* CgSupport.cpp */; };
                B2310B770B1F46A200D55D87 /* CgSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = B2310B740B1F46A200D55D87 /* CgSupport.h */; };
                B2310B780B1F46A300D55D87 /* RenderPathCg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2310B750B1F46A200D55D87 /* RenderPathCg.cpp */; };
+               B23540F20D00782E002382FA /* StringTruncator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23540F00D00782E002382FA /* StringTruncator.cpp */; };
+               B23540F30D00782E002382FA /* StringTruncator.h in Headers */ = {isa = PBXBuildFile; fileRef = B23540F10D00782E002382FA /* StringTruncator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                B24055650B5BE640002A28C0 /* DOMSVGElementInstanceInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = B24055630B5BE640002A28C0 /* DOMSVGElementInstanceInternal.h */; };
                B24055660B5BE640002A28C0 /* DOMSVGElementInstanceListInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = B24055640B5BE640002A28C0 /* DOMSVGElementInstanceListInternal.h */; };
                B25AE55F0B49D6630074C726 /* LinearGradientAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = B25AE55D0B49D6630074C726 /* LinearGradientAttributes.h */; };
                B2AE9B9D0C3AF27400F23F7F /* DOMSVGTextPathElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2AE9B9C0C3AF27400F23F7F /* DOMSVGTextPathElement.mm */; };
                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 */; };
+               B2C3DA1F0D006C1D00EF6F26 /* AtomicString.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9EE0D006C1D00EF6F26 /* AtomicString.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA200D006C1D00EF6F26 /* AtomicStringImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9EF0D006C1D00EF6F26 /* AtomicStringImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA210D006C1D00EF6F26 /* Base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3D9F00D006C1D00EF6F26 /* Base64.cpp */; };
+               B2C3DA220D006C1D00EF6F26 /* Base64.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9F10D006C1D00EF6F26 /* Base64.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA230D006C1D00EF6F26 /* BidiContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3D9F20D006C1D00EF6F26 /* BidiContext.cpp */; };
+               B2C3DA240D006C1D00EF6F26 /* BidiContext.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9F30D006C1D00EF6F26 /* BidiContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA250D006C1D00EF6F26 /* BidiResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9F40D006C1D00EF6F26 /* BidiResolver.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA260D006C1D00EF6F26 /* CharacterNames.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9F50D006C1D00EF6F26 /* CharacterNames.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA270D006C1D00EF6F26 /* CString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3D9F60D006C1D00EF6F26 /* CString.cpp */; };
+               B2C3DA280D006C1D00EF6F26 /* CString.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9F70D006C1D00EF6F26 /* CString.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA290D006C1D00EF6F26 /* FontStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9F80D006C1D00EF6F26 /* FontStyle.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA2A0D006C1D00EF6F26 /* CharsetData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9FA0D006C1D00EF6F26 /* CharsetData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA2B0D006C1D00EF6F26 /* PlatformString.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9FB0D006C1D00EF6F26 /* PlatformString.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA2C0D006C1D00EF6F26 /* RegularExpression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3D9FC0D006C1D00EF6F26 /* RegularExpression.cpp */; };
+               B2C3DA2D0D006C1D00EF6F26 /* RegularExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9FD0D006C1D00EF6F26 /* RegularExpression.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA2E0D006C1D00EF6F26 /* SegmentedString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3D9FE0D006C1D00EF6F26 /* SegmentedString.cpp */; };
+               B2C3DA2F0D006C1D00EF6F26 /* SegmentedString.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9FF0D006C1D00EF6F26 /* SegmentedString.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA300D006C1D00EF6F26 /* String.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA000D006C1D00EF6F26 /* String.cpp */; };
+               B2C3DA310D006C1D00EF6F26 /* StringHash.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA010D006C1D00EF6F26 /* StringHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA320D006C1D00EF6F26 /* StringImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA020D006C1D00EF6F26 /* StringImpl.cpp */; };
+               B2C3DA330D006C1D00EF6F26 /* StringImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA030D006C1D00EF6F26 /* StringImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA340D006C1D00EF6F26 /* TextBoundaries.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA040D006C1D00EF6F26 /* TextBoundaries.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA360D006C1D00EF6F26 /* TextBreakIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA060D006C1D00EF6F26 /* TextBreakIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA370D006C1D00EF6F26 /* TextBreakIteratorICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA070D006C1D00EF6F26 /* TextBreakIteratorICU.cpp */; };
+               B2C3DA380D006C1D00EF6F26 /* TextBreakIteratorInternalICU.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA080D006C1D00EF6F26 /* TextBreakIteratorInternalICU.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA390D006C1D00EF6F26 /* TextCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA090D006C1D00EF6F26 /* TextCodec.cpp */; };
+               B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA0A0D006C1D00EF6F26 /* TextCodec.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA3B0D006C1D00EF6F26 /* TextCodecICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA0B0D006C1D00EF6F26 /* TextCodecICU.cpp */; };
+               B2C3DA3C0D006C1D00EF6F26 /* TextCodecICU.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA0C0D006C1D00EF6F26 /* TextCodecICU.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA3D0D006C1D00EF6F26 /* TextCodecLatin1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA0D0D006C1D00EF6F26 /* TextCodecLatin1.cpp */; };
+               B2C3DA3E0D006C1D00EF6F26 /* TextCodecLatin1.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA0E0D006C1D00EF6F26 /* TextCodecLatin1.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA3F0D006C1D00EF6F26 /* TextCodecUserDefined.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA0F0D006C1D00EF6F26 /* TextCodecUserDefined.cpp */; };
+               B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA100D006C1D00EF6F26 /* TextCodecUserDefined.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA410D006C1D00EF6F26 /* TextCodecUTF16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA110D006C1D00EF6F26 /* TextCodecUTF16.cpp */; };
+               B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA120D006C1D00EF6F26 /* TextCodecUTF16.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA430D006C1D00EF6F26 /* TextDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA130D006C1D00EF6F26 /* TextDecoder.cpp */; };
+               B2C3DA440D006C1D00EF6F26 /* TextDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA140D006C1D00EF6F26 /* TextDecoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA450D006C1D00EF6F26 /* TextDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA150D006C1D00EF6F26 /* TextDirection.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA460D006C1D00EF6F26 /* TextEncoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA160D006C1D00EF6F26 /* TextEncoding.cpp */; };
+               B2C3DA470D006C1D00EF6F26 /* TextEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA170D006C1D00EF6F26 /* TextEncoding.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA480D006C1D00EF6F26 /* TextEncodingRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA180D006C1D00EF6F26 /* TextEncodingRegistry.cpp */; };
+               B2C3DA490D006C1D00EF6F26 /* TextEncodingRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA190D006C1D00EF6F26 /* TextEncodingRegistry.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA4A0D006C1D00EF6F26 /* TextStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA1A0D006C1D00EF6F26 /* TextStream.cpp */; };
+               B2C3DA4B0D006C1D00EF6F26 /* TextStream.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA1B0D006C1D00EF6F26 /* TextStream.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA4C0D006C1D00EF6F26 /* UnicodeRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA1C0D006C1D00EF6F26 /* UnicodeRange.cpp */; };
+               B2C3DA4D0D006C1D00EF6F26 /* UnicodeRange.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA1D0D006C1D00EF6F26 /* UnicodeRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA600D006CD600EF6F26 /* Font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA4F0D006CD600EF6F26 /* Font.cpp */; };
+               B2C3DA610D006CD600EF6F26 /* Font.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA500D006CD600EF6F26 /* Font.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA620D006CD600EF6F26 /* FontCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA510D006CD600EF6F26 /* FontCache.cpp */; };
+               B2C3DA630D006CD600EF6F26 /* FontCache.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA520D006CD600EF6F26 /* FontCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA640D006CD600EF6F26 /* FontData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA530D006CD600EF6F26 /* FontData.cpp */; };
+               B2C3DA650D006CD600EF6F26 /* FontData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA540D006CD600EF6F26 /* FontData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA660D006CD600EF6F26 /* FontDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA550D006CD600EF6F26 /* FontDescription.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA670D006CD600EF6F26 /* FontFallbackList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA560D006CD600EF6F26 /* FontFallbackList.cpp */; };
+               B2C3DA680D006CD600EF6F26 /* FontFallbackList.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA570D006CD600EF6F26 /* FontFallbackList.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA690D006CD600EF6F26 /* FontFamily.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA580D006CD600EF6F26 /* FontFamily.cpp */; };
+               B2C3DA6A0D006CD600EF6F26 /* FontFamily.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA590D006CD600EF6F26 /* FontFamily.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA6B0D006CD600EF6F26 /* FontSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA5A0D006CD600EF6F26 /* FontSelector.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA6C0D006CD600EF6F26 /* GlyphBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA5B0D006CD600EF6F26 /* GlyphBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA6D0D006CD600EF6F26 /* GlyphPageTreeNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA5C0D006CD600EF6F26 /* GlyphPageTreeNode.cpp */; };
+               B2C3DA6E0D006CD600EF6F26 /* GlyphPageTreeNode.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA5D0D006CD600EF6F26 /* GlyphPageTreeNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               B2C3DA6F0D006CD600EF6F26 /* GlyphWidthMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA5E0D006CD600EF6F26 /* GlyphWidthMap.cpp */; };
+               B2C3DA700D006CD600EF6F26 /* GlyphWidthMap.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA5F0D006CD600EF6F26 /* GlyphWidthMap.h */; settings = {ATTRIBUTES = (Private, ); }; };
                B2C96D8D0B3AF2B7005E80EC /* JSSVGPathSegCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C96D8C0B3AF2B7005E80EC /* JSSVGPathSegCustom.cpp */; };
                B2CB41930AB75904004D9C45 /* SVGRenderingIntent.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CB414C0AB75904004D9C45 /* SVGRenderingIntent.h */; };
                B2CB41A60AB75904004D9C45 /* SVGUnitTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CB415F0AB75904004D9C45 /* SVGUnitTypes.h */; };
                B2FA3E170AB75A6F000E5AC4 /* JSSVGViewElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3D2F0AB75A6F000E5AC4 /* JSSVGViewElement.h */; };
                B2FA3E180AB75A6F000E5AC4 /* JSSVGZoomEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3D300AB75A6F000E5AC4 /* JSSVGZoomEvent.cpp */; };
                B2FA3E190AB75A6F000E5AC4 /* JSSVGZoomEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3D310AB75A6F000E5AC4 /* JSSVGZoomEvent.h */; };
-               B402FD0B0C4C9C3900210AA6 /* BidiResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = B402FD090C4C9C3900210AA6 /* BidiResolver.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC014C740CC5579D009C4B20 /* SecurityOrigin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC014C720CC5579D009C4B20 /* SecurityOrigin.cpp */; };
                BC014C750CC5579D009C4B20 /* SecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = BC014C730CC5579D009C4B20 /* SecurityOrigin.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC066F6F09FEB2FA00C589A7 /* WebCoreTextRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = BC066F6C09FEB2FA00C589A7 /* WebCoreTextRenderer.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC124EFF0C26447A009E2349 /* JSBarInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC124EFD0C26447A009E2349 /* JSBarInfo.cpp */; };
                BC124F000C26447A009E2349 /* JSBarInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BC124EFE0C26447A009E2349 /* JSBarInfo.h */; };
                BC17F9660B64EBB8004A65CB /* JSHTMLSelectElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC17F9650B64EBB8004A65CB /* JSHTMLSelectElementCustom.cpp */; };
-               BC18C5D00B2A886F0018461D /* TextBreakIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = BC18C5CE0B2A886F0018461D /* TextBreakIterator.h */; };
-               BC18C5D10B2A886F0018461D /* TextBreakIteratorICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC18C5CF0B2A886F0018461D /* TextBreakIteratorICU.cpp */; };
                BC1A37AD097C715F0019F3D8 /* DOM.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1A3797097C715F0019F3D8 /* DOM.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC1A37AE097C715F0019F3D8 /* DOM.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC1A3798097C715F0019F3D8 /* DOM.mm */; };
                BC1A37AF097C715F0019F3D8 /* DOMCore.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1A3799097C715F0019F3D8 /* DOMCore.h */; settings = {ATTRIBUTES = (Private, ); }; };
                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 */; };
-               BC64B4B90CB428C7005F2B62 /* FontSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = BC64B4B80CB428C7005F2B62 /* FontSelector.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 */; };
                BC6D44BE0C07EFB60072D2C9 /* JSHTMLEmbedElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC6D44BD0C07EFB60072D2C9 /* JSHTMLEmbedElementCustom.cpp */; };
                BC6D44EC0C07F2ED0072D2C9 /* JSHTMLEmbedElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC6D44EA0C07F2ED0072D2C9 /* JSHTMLEmbedElement.cpp */; };
                BC6D44ED0C07F2ED0072D2C9 /* JSHTMLEmbedElement.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6D44EB0C07F2ED0072D2C9 /* JSHTMLEmbedElement.h */; };
-               BC6D6DD209AF906600F59759 /* Font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC6D6DD009AF906600F59759 /* Font.cpp */; };
-               BC6D6DD309AF906600F59759 /* Font.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6D6DD109AF906600F59759 /* Font.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC6D6E2609AF943500F59759 /* ScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6D6E2509AF943500F59759 /* ScrollView.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC6DABF30A19015700E5CD14 /* FontCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC6DABF20A19015700E5CD14 /* FontCache.cpp */; };
                BC6DADEF0A195FDF00E5CD14 /* WebFontCache.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6DADEE0A195FDF00E5CD14 /* WebFontCache.h */; };
                BC6DADFA0A19602B00E5CD14 /* WebFontCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC6DADF90A19602B00E5CD14 /* WebFontCache.mm */; };
-               BC6DB3690A1A7CB700E5CD14 /* GlyphPageTreeNode.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6DB3680A1A7CB700E5CD14 /* GlyphPageTreeNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC6DB4740A1A90FB00E5CD14 /* GlyphPageTreeNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC6DB4730A1A90FB00E5CD14 /* GlyphPageTreeNode.cpp */; };
                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 */; };
                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 */; };
-               BCC0891A0A1C4652006189A6 /* FontData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC089190A1C4652006189A6 /* FontData.cpp */; };
-               BCC0892A0A1C4991006189A6 /* GlyphWidthMap.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC089290A1C4991006189A6 /* GlyphWidthMap.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BCC089560A1C4CC9006189A6 /* GlyphWidthMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC089550A1C4CC9006189A6 /* GlyphWidthMap.cpp */; };
-               BCC47E2609A3D6F100ADB771 /* FontFamily.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC47E2409A3D6F100ADB771 /* FontFamily.cpp */; };
-               BCC47E2709A3D6F100ADB771 /* FontFamily.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC47E2509A3D6F100ADB771 /* FontFamily.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BCC47E6B09A3FE4700ADB771 /* FontDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC47E6A09A3FE4700ADB771 /* FontDescription.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BCC5BE000C0E93110011C2DB /* JSCSSStyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC5BDFE0C0E93110011C2DB /* JSCSSStyleSheet.cpp */; };
                BCC5BE010C0E93110011C2DB /* JSCSSStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC5BDFF0C0E93110011C2DB /* JSCSSStyleSheet.h */; };
-               BCC71A130A0FF94D0014EE6E /* GlyphBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC71A120A0FF94D0014EE6E /* GlyphBuffer.h */; };
                BCCBAD3B0C18BFF800CE890F /* JSHTMLCollectionCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCBAD3A0C18BFF800CE890F /* JSHTMLCollectionCustom.cpp */; };
                BCCBAD400C18C14200CE890F /* JSHTMLCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCCBAD3E0C18C14200CE890F /* JSHTMLCollection.cpp */; };
                BCCBAD410C18C14200CE890F /* JSHTMLCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = BCCBAD3F0C18C14200CE890F /* JSHTMLCollection.h */; };
                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 */; };
-               BCEB377609B7BB0D00CB38B1 /* FontFallbackList.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEB377509B7BB0D00CB38B1 /* FontFallbackList.h */; };
                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 */; };
-               BCF7C0780A1680C00032F75B /* FontFallbackList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF7C0770A1680C00032F75B /* FontFallbackList.cpp */; };
-               BCF7C0B80A1687CC0032F75B /* FontCache.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF7C0B70A1687CC0032F75B /* FontCache.h */; };
                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, ); }; };
-               BCFB2F41097A24B500BA703D /* SegmentedString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCFB2F3F097A24B500BA703D /* SegmentedString.cpp */; };
-               BCFB2F42097A24B500BA703D /* SegmentedString.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB2F40097A24B500BA703D /* SegmentedString.h */; };
                BCFB2F76097A2E1A00BA703D /* Arena.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCFB2F74097A2E1A00BA703D /* Arena.cpp */; };
                BCFB2F77097A2E1A00BA703D /* Arena.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB2F75097A2E1A00BA703D /* Arena.h */; };
                BCFE2F110C1B58370020235F /* JSRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCFE2F0F0C1B58370020235F /* JSRect.cpp */; };
                E10B9B6D0B747599003ED890 /* NativeXPathNSResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E10B9B6B0B747599003ED890 /* NativeXPathNSResolver.cpp */; };
                E10B9CCC0B747A44003ED890 /* DOMCustomXPathNSResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = E10B9CCA0B747A44003ED890 /* DOMCustomXPathNSResolver.h */; };
                E10B9CCD0B747A44003ED890 /* DOMCustomXPathNSResolver.mm in Sources */ = {isa = PBXBuildFile; fileRef = E10B9CCB0B747A44003ED890 /* DOMCustomXPathNSResolver.mm */; };
-               E11D51930B2E7A5F0056C188 /* Base64.h in Headers */ = {isa = PBXBuildFile; fileRef = E11D51910B2E7A5F0056C188 /* Base64.h */; };
-               E11D51940B2E7A5F0056C188 /* Base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E11D51920B2E7A5F0056C188 /* Base64.cpp */; };
                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 */; };
-               E14842DE0A674934007E4D39 /* TextCodecICU.h in Headers */ = {isa = PBXBuildFile; fileRef = E14842DD0A674934007E4D39 /* TextCodecICU.h */; };
-               E14842FF0A674A31007E4D39 /* TextCodecICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14842FE0A674A31007E4D39 /* TextCodecICU.cpp */; };
                E148432F0A674FC2007E4D39 /* TextCodecMac.h in Headers */ = {isa = PBXBuildFile; fileRef = E148432E0A674FC2007E4D39 /* TextCodecMac.h */; };
                E14843D60A6754A6007E4D39 /* TextCodecMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14843910A6752BF007E4D39 /* TextCodecMac.cpp */; };
-               E15863990CD10B730066E2C9 /* TextCodecUserDefined.h in Headers */ = {isa = PBXBuildFile; fileRef = E15863970CD10B730066E2C9 /* TextCodecUserDefined.h */; };
-               E158639A0CD10B730066E2C9 /* TextCodecUserDefined.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E15863980CD10B730066E2C9 /* TextCodecUserDefined.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 */; };
                ED501DC60B249F2900AE18D9 /* EditorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED501DC50B249F2900AE18D9 /* EditorMac.mm */; };
                EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
                EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEC98020AED7E170059137F /* WebCorePrefix.h */; };
-               F971E27FD70F4382BC66D792 /* BidiContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A579C284B928484FB9A446BC /* BidiContext.cpp */; };
                FAE0418F097596C9000540BE /* SVGImageLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAE0418D097596C9000540BE /* SVGImageLoader.cpp */; };
                FAE04190097596C9000540BE /* SVGImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE0418E097596C9000540BE /* SVGImageLoader.h */; };
 /* End PBXBuildFile section */
                066C772C0AB603D200238CC4 /* FileChooserMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FileChooserMac.mm; sourceTree = "<group>"; };
                066C772E0AB603FD00238CC4 /* RenderFileUploadControl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderFileUploadControl.cpp; sourceTree = "<group>"; };
                066C772F0AB603FD00238CC4 /* RenderFileUploadControl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderFileUploadControl.h; sourceTree = "<group>"; };
-               06A6A73A0B8BA44800DF1703 /* StringTruncator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = StringTruncator.cpp; sourceTree = "<group>"; };
-               06A6A73B0B8BA44800DF1703 /* StringTruncator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = StringTruncator.h; sourceTree = "<group>"; };
                06E81ED60AB5D5E900C87837 /* LocalCurrentGraphicsContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalCurrentGraphicsContext.h; sourceTree = "<group>"; };
                06E81EEB0AB5DA9700C87837 /* LocalCurrentGraphicsContext.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalCurrentGraphicsContext.mm; sourceTree = "<group>"; };
                06FC442B0BAE5A9E0090EDE1 /* JavaScriptStatistics.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JavaScriptStatistics.cpp; sourceTree = "<group>"; };
                1A85B2AD0A1B2A6D00D8C87C /* HTMLDivElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLDivElement.idl; sourceTree = "<group>"; };
                1A85B2B40A1B2AC700D8C87C /* JSHTMLDivElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLDivElement.cpp; sourceTree = "<group>"; };
                1A85B2B50A1B2AC700D8C87C /* JSHTMLDivElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLDivElement.h; sourceTree = "<group>"; };
-               1A98955A0AA78149005EF5EF /* CString.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CString.cpp; sourceTree = "<group>"; };
-               1A98955B0AA78149005EF5EF /* CString.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CString.h; sourceTree = "<group>"; };
                1A98956A0AA78F80005EF5EF /* KURLCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = KURLCFNet.cpp; sourceTree = "<group>"; };
                1A9EF4560A1B957D00332B63 /* JSCanvasRenderingContext2DCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCanvasRenderingContext2DCustom.cpp; sourceTree = "<group>"; };
                1AB1AE780C051FDE00139F4F /* zoomInCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoomInCursor.png; sourceTree = "<group>"; };
                513F14520AB634C400094DDF /* IconLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IconLoader.h; sourceTree = "<group>"; };
                514185EC0CD65F0400763C99 /* ChangeVersionWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeVersionWrapper.h; sourceTree = "<group>"; };
                514185ED0CD65F0400763C99 /* ChangeVersionWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChangeVersionWrapper.cpp; sourceTree = "<group>"; };
-               514AF320BE854014A7DA49FB /* BidiContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BidiContext.h; sourceTree = "<group>"; };
                514B3F720C722047000530DF /* FileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSystem.h; sourceTree = "<group>"; };
                514B3F750C722055000530DF /* FileSystemMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FileSystemMac.mm; sourceTree = "<group>"; };
-               514C762C0CE921F4007EF3CD /* UnicodeRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UnicodeRange.cpp; sourceTree = "<group>"; };
-               514C762D0CE921F4007EF3CD /* UnicodeRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnicodeRange.h; sourceTree = "<group>"; };
                514C76350CE9225E007EF3CD /* JSSQLError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLError.cpp; sourceTree = "<group>"; };
                514C76360CE9225E007EF3CD /* JSSQLTransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLTransaction.cpp; sourceTree = "<group>"; };
                514C76420CE9234E007EF3CD /* AuthenticationMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationMac.h; sourceTree = "<group>"; };
                656D372C0ADBA5DE00A4554D /* NetscapePlugInStreamLoaderMac.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = NetscapePlugInStreamLoaderMac.mm; sourceTree = "<group>"; };
                656D372D0ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebPlugInStreamLoaderDelegate.h; sourceTree = "<group>"; };
                656D37300ADBA5DE00A4554D /* SubresourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SubresourceLoader.h; sourceTree = "<group>"; };
-               657BD74909AFDC54005A2056 /* TextCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = TextCodec.cpp; sourceTree = "<group>"; };
-               657BD74A09AFDC54005A2056 /* TextCodec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextCodec.h; sourceTree = "<group>"; };
-               657BD74B09AFDC54005A2056 /* TextEncoding.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextEncoding.cpp; sourceTree = "<group>"; };
-               657BD74C09AFDC54005A2056 /* TextEncoding.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextEncoding.h; sourceTree = "<group>"; };
                6582A13D09999CD600BEEB6D /* DeprecatedString.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedString.cpp; sourceTree = "<group>"; };
                6582A13E09999CD600BEEB6D /* DeprecatedString.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DeprecatedString.h; sourceTree = "<group>"; };
                6582A15509999D6D00BEEB6D /* SystemTimeMac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SystemTimeMac.cpp; sourceTree = "<group>"; };
                85E9E09E0AB3A0C700069CD0 /* DOMXPathNSResolver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMXPathNSResolver.h; sourceTree = "<group>"; };
                85E9E09F0AB3A0C700069CD0 /* DOMXPathResult.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMXPathResult.h; sourceTree = "<group>"; };
                85E9E0A00AB3A0C700069CD0 /* DOMXPathResult.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMXPathResult.mm; sourceTree = "<group>"; };
-               85EC9AF80A71A2C600EEEAED /* FontData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontData.h; sourceTree = "<group>"; };
                85EC9AF90A71A2C600EEEAED /* Language.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Language.h; sourceTree = "<group>"; };
                85ECBEDD0AA7626800544F0B /* DOMHTMLAreaElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLAreaElement.h; sourceTree = "<group>"; };
                85ECBEDE0AA7626800544F0B /* DOMHTMLAreaElement.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMHTMLAreaElement.mm; sourceTree = "<group>"; };
                930CAAD609C495B600229C04 /* CanvasRenderingContext2D.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CanvasRenderingContext2D.idl; sourceTree = "<group>"; };
                930CAB8809C49EFA00229C04 /* CanvasGradient.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CanvasGradient.idl; sourceTree = "<group>"; };
                930CAB8F09C49F1B00229C04 /* CanvasPattern.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CanvasPattern.idl; sourceTree = "<group>"; };
-               93126F6009D7A736008D9626 /* StringHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringHash.h; sourceTree = "<group>"; };
-               9326DC0A09DAD5BE00AFC847 /* CharsetData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharsetData.h; sourceTree = "<group>"; };
                9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLOptionsCollection.cpp; sourceTree = "<group>"; };
                932871BF0B20DEB70049035A /* PlatformMenuDescription.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlatformMenuDescription.h; sourceTree = "<group>"; };
-               932CA7420AAA198E00AD1FAD /* TextDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextDecoder.h; sourceTree = "<group>"; };
-               932CA7640AAA1DF500AD1FAD /* TextDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextDecoder.cpp; sourceTree = "<group>"; };
-               932CA7C00AAA20C100AD1FAD /* TextCodecLatin1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCodecLatin1.h; sourceTree = "<group>"; };
-               932CA7C40AAA20D200AD1FAD /* TextCodecLatin1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecLatin1.cpp; sourceTree = "<group>"; };
-               932CA83A0AAA667F00AD1FAD /* TextCodecUTF16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCodecUTF16.h; sourceTree = "<group>"; };
-               932CA8470AAA66CB00AD1FAD /* TextCodecUTF16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecUTF16.cpp; sourceTree = "<group>"; };
                932E16080AF578340025F408 /* FrameLoader.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = FrameLoader.cpp; sourceTree = "<group>"; };
                93309D87099E64910056E581 /* AppendNodeCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppendNodeCommand.cpp; sourceTree = "<group>"; };
                93309D88099E64910056E581 /* AppendNodeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppendNodeCommand.h; sourceTree = "<group>"; };
                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>"; };
-               9352071809BD3BA500F2038D /* TextBoundaries.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextBoundaries.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>"; };
                9352087609BD453400F2038D /* CookieJar.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CookieJar.mm; sourceTree = "<group>"; };
                9352088109BD45E900F2038D /* CookieJar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CookieJar.h; sourceTree = "<group>"; };
                9353676A09AED88B00D35CD6 /* ScrollViewMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollViewMac.mm; sourceTree = "<group>"; };
-               9353686A09AF78F600D35CD6 /* TextDirection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextDirection.h; sourceTree = "<group>"; };
                935C476009AC4CD100A6AAB4 /* Length.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Length.h; sourceTree = "<group>"; };
                935C476209AC4CE600A6AAB4 /* MouseEventWithHitTestResults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MouseEventWithHitTestResults.h; sourceTree = "<group>"; };
                935C476609AC4D4300A6AAB4 /* PlatformKeyboardEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformKeyboardEvent.h; 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>"; };
-               93AC8DE00A955FAC00239794 /* TextStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextStyle.h; sourceTree = "<group>"; };
-               93AE23170AAB51E500CD8A35 /* TextEncodingRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextEncodingRegistry.h; sourceTree = "<group>"; };
-               93AE23200AAB521B00CD8A35 /* TextEncodingRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextEncodingRegistry.cpp; 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>"; };
                93C09A7E0B064EEF005ABD4D /* EventHandlerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EventHandlerMac.mm; sourceTree = "<group>"; };
                93C09A800B064F00005ABD4D /* EventHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventHandler.cpp; sourceTree = "<group>"; };
                93C09C850B0657AA005ABD4D /* ScrollTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollTypes.h; sourceTree = "<group>"; };
-               93C7B5F30B52D89100B5477E /* CharacterNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharacterNames.h; sourceTree = "<group>"; };
                93C841F709CE855C00DFF5E5 /* DOMImplementationFront.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMImplementationFront.h; sourceTree = "<group>"; };
                93C841FE09CE858300DFF5E5 /* DOMImplementationFront.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMImplementationFront.cpp; sourceTree = "<group>"; };
                93CA4C9909DF93FA00DF8677 /* html4.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = html4.css; sourceTree = "<group>"; };
                93CA4CA309DF93FA00DF8677 /* tokenizer.flex */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tokenizer.flex; sourceTree = "<group>"; };
                93CCF0260AF6C52900018E89 /* NavigationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationAction.h; sourceTree = "<group>"; };
                93CCF05F0AF6CA7600018E89 /* NavigationAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigationAction.cpp; sourceTree = "<group>"; };
-               93CD4FD70995F9EA007ECC97 /* AtomicString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomicString.cpp; sourceTree = "<group>"; };
-               93CD4FD80995F9EA007ECC97 /* AtomicString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicString.h; sourceTree = "<group>"; };
-               93CD4FD90995F9EA007ECC97 /* AtomicStringImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicStringImpl.h; sourceTree = "<group>"; };
-               93CD4FDA0995F9EA007ECC97 /* String.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = String.cpp; sourceTree = "<group>"; };
-               93CD4FDC0995F9EA007ECC97 /* StringImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringImpl.cpp; sourceTree = "<group>"; };
-               93CD4FDD0995F9EA007ECC97 /* StringImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringImpl.h; sourceTree = "<group>"; };
-               93CD4FEB0995FD2A007ECC97 /* PlatformString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformString.h; sourceTree = "<group>"; };
                93E227DB0AF589AD00D48324 /* DocumentLoader.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = DocumentLoader.cpp; sourceTree = "<group>"; };
                93E227DC0AF589AD00D48324 /* MainResourceLoader.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = MainResourceLoader.cpp; sourceTree = "<group>"; };
                93E227DD0AF589AD00D48324 /* NetscapePlugInStreamLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePlugInStreamLoader.cpp; sourceTree = "<group>"; };
                93F9B79E0BA6032600854064 /* JSCDATASection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCDATASection.cpp; sourceTree = "<group>"; };
                93F9B79F0BA6032600854064 /* JSCDATASection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCDATASection.h; sourceTree = "<group>"; };
                93FDAFC90B11307400E2746F /* EditorInsertAction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EditorInsertAction.h; sourceTree = "<group>"; };
-               A579C284B928484FB9A446BC /* BidiContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BidiContext.cpp; sourceTree = "<group>"; };
                A718760D0B2A120100A16ECE /* DragActions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragActions.h; sourceTree = "<group>"; };
                A718788F0B2D04AC00A16ECE /* DragControllerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DragControllerMac.mm; sourceTree = "<group>"; };
                A7352C170B1BB89D00A986D0 /* RenderSVGBlock.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGBlock.cpp; sourceTree = "<group>"; };
                B2310B730B1F46A200D55D87 /* CgSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CgSupport.cpp; sourceTree = "<group>"; };
                B2310B740B1F46A200D55D87 /* CgSupport.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CgSupport.h; sourceTree = "<group>"; };
                B2310B750B1F46A200D55D87 /* RenderPathCg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderPathCg.cpp; sourceTree = "<group>"; };
+               B23540F00D00782E002382FA /* StringTruncator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = StringTruncator.cpp; sourceTree = "<group>"; };
+               B23540F10D00782E002382FA /* StringTruncator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = StringTruncator.h; sourceTree = "<group>"; };
                B24055630B5BE640002A28C0 /* DOMSVGElementInstanceInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGElementInstanceInternal.h; sourceTree = "<group>"; };
                B24055640B5BE640002A28C0 /* DOMSVGElementInstanceListInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGElementInstanceListInternal.h; sourceTree = "<group>"; };
                B25AE55D0B49D6630074C726 /* LinearGradientAttributes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LinearGradientAttributes.h; sourceTree = "<group>"; };
                B2AE9B9C0C3AF27400F23F7F /* DOMSVGTextPathElement.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMSVGTextPathElement.mm; 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>"; };
+               B2C3D9EE0D006C1D00EF6F26 /* AtomicString.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AtomicString.h; sourceTree = "<group>"; };
+               B2C3D9EF0D006C1D00EF6F26 /* AtomicStringImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AtomicStringImpl.h; sourceTree = "<group>"; };
+               B2C3D9F00D006C1D00EF6F26 /* Base64.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Base64.cpp; sourceTree = "<group>"; };
+               B2C3D9F10D006C1D00EF6F26 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
+               B2C3D9F20D006C1D00EF6F26 /* BidiContext.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = BidiContext.cpp; sourceTree = "<group>"; };
+               B2C3D9F30D006C1D00EF6F26 /* BidiContext.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BidiContext.h; sourceTree = "<group>"; };
+               B2C3D9F40D006C1D00EF6F26 /* BidiResolver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BidiResolver.h; sourceTree = "<group>"; };
+               B2C3D9F50D006C1D00EF6F26 /* CharacterNames.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CharacterNames.h; sourceTree = "<group>"; };
+               B2C3D9F60D006C1D00EF6F26 /* CString.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CString.cpp; sourceTree = "<group>"; };
+               B2C3D9F70D006C1D00EF6F26 /* CString.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CString.h; sourceTree = "<group>"; };
+               B2C3D9F80D006C1D00EF6F26 /* FontStyle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontStyle.h; sourceTree = "<group>"; };
+               B2C3D9FA0D006C1D00EF6F26 /* CharsetData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CharsetData.h; sourceTree = "<group>"; };
+               B2C3D9FB0D006C1D00EF6F26 /* PlatformString.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlatformString.h; sourceTree = "<group>"; };
+               B2C3D9FC0D006C1D00EF6F26 /* RegularExpression.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RegularExpression.cpp; sourceTree = "<group>"; };
+               B2C3D9FD0D006C1D00EF6F26 /* RegularExpression.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RegularExpression.h; sourceTree = "<group>"; };
+               B2C3D9FE0D006C1D00EF6F26 /* SegmentedString.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentedString.cpp; sourceTree = "<group>"; };
+               B2C3D9FF0D006C1D00EF6F26 /* SegmentedString.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SegmentedString.h; sourceTree = "<group>"; };
+               B2C3DA000D006C1D00EF6F26 /* String.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = String.cpp; sourceTree = "<group>"; };
+               B2C3DA010D006C1D00EF6F26 /* StringHash.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = StringHash.h; sourceTree = "<group>"; };
+               B2C3DA020D006C1D00EF6F26 /* StringImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = StringImpl.cpp; sourceTree = "<group>"; };
+               B2C3DA030D006C1D00EF6F26 /* StringImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = StringImpl.h; sourceTree = "<group>"; };
+               B2C3DA040D006C1D00EF6F26 /* TextBoundaries.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextBoundaries.h; sourceTree = "<group>"; };
+               B2C3DA060D006C1D00EF6F26 /* TextBreakIterator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextBreakIterator.h; sourceTree = "<group>"; };
+               B2C3DA070D006C1D00EF6F26 /* TextBreakIteratorICU.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextBreakIteratorICU.cpp; sourceTree = "<group>"; };
+               B2C3DA080D006C1D00EF6F26 /* TextBreakIteratorInternalICU.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextBreakIteratorInternalICU.h; sourceTree = "<group>"; };
+               B2C3DA090D006C1D00EF6F26 /* TextCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodec.cpp; sourceTree = "<group>"; };
+               B2C3DA0A0D006C1D00EF6F26 /* TextCodec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextCodec.h; sourceTree = "<group>"; };
+               B2C3DA0B0D006C1D00EF6F26 /* TextCodecICU.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecICU.cpp; sourceTree = "<group>"; };
+               B2C3DA0C0D006C1D00EF6F26 /* TextCodecICU.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextCodecICU.h; sourceTree = "<group>"; };
+               B2C3DA0D0D006C1D00EF6F26 /* TextCodecLatin1.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecLatin1.cpp; sourceTree = "<group>"; };
+               B2C3DA0E0D006C1D00EF6F26 /* TextCodecLatin1.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextCodecLatin1.h; sourceTree = "<group>"; };
+               B2C3DA0F0D006C1D00EF6F26 /* TextCodecUserDefined.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecUserDefined.cpp; sourceTree = "<group>"; };
+               B2C3DA100D006C1D00EF6F26 /* TextCodecUserDefined.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextCodecUserDefined.h; sourceTree = "<group>"; };
+               B2C3DA110D006C1D00EF6F26 /* TextCodecUTF16.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecUTF16.cpp; sourceTree = "<group>"; };
+               B2C3DA120D006C1D00EF6F26 /* TextCodecUTF16.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextCodecUTF16.h; sourceTree = "<group>"; };
+               B2C3DA130D006C1D00EF6F26 /* TextDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextDecoder.cpp; sourceTree = "<group>"; };
+               B2C3DA140D006C1D00EF6F26 /* TextDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextDecoder.h; sourceTree = "<group>"; };
+               B2C3DA150D006C1D00EF6F26 /* TextDirection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextDirection.h; sourceTree = "<group>"; };
+               B2C3DA160D006C1D00EF6F26 /* TextEncoding.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextEncoding.cpp; sourceTree = "<group>"; };
+               B2C3DA170D006C1D00EF6F26 /* TextEncoding.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextEncoding.h; sourceTree = "<group>"; };
+               B2C3DA180D006C1D00EF6F26 /* TextEncodingRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextEncodingRegistry.cpp; sourceTree = "<group>"; };
+               B2C3DA190D006C1D00EF6F26 /* TextEncodingRegistry.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextEncodingRegistry.h; sourceTree = "<group>"; };
+               B2C3DA1A0D006C1D00EF6F26 /* TextStream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextStream.cpp; sourceTree = "<group>"; };
+               B2C3DA1B0D006C1D00EF6F26 /* TextStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextStream.h; sourceTree = "<group>"; };
+               B2C3DA1C0D006C1D00EF6F26 /* UnicodeRange.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = UnicodeRange.cpp; sourceTree = "<group>"; };
+               B2C3DA1D0D006C1D00EF6F26 /* UnicodeRange.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UnicodeRange.h; sourceTree = "<group>"; };
+               B2C3DA4F0D006CD600EF6F26 /* Font.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Font.cpp; sourceTree = "<group>"; };
+               B2C3DA500D006CD600EF6F26 /* Font.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Font.h; sourceTree = "<group>"; };
+               B2C3DA510D006CD600EF6F26 /* FontCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontCache.cpp; sourceTree = "<group>"; };
+               B2C3DA520D006CD600EF6F26 /* FontCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontCache.h; sourceTree = "<group>"; };
+               B2C3DA530D006CD600EF6F26 /* FontData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontData.cpp; sourceTree = "<group>"; };
+               B2C3DA540D006CD600EF6F26 /* FontData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontData.h; sourceTree = "<group>"; };
+               B2C3DA550D006CD600EF6F26 /* FontDescription.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontDescription.h; sourceTree = "<group>"; };
+               B2C3DA560D006CD600EF6F26 /* FontFallbackList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontFallbackList.cpp; sourceTree = "<group>"; };
+               B2C3DA570D006CD600EF6F26 /* FontFallbackList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontFallbackList.h; sourceTree = "<group>"; };
+               B2C3DA580D006CD600EF6F26 /* FontFamily.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontFamily.cpp; sourceTree = "<group>"; };
+               B2C3DA590D006CD600EF6F26 /* FontFamily.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontFamily.h; sourceTree = "<group>"; };
+               B2C3DA5A0D006CD600EF6F26 /* FontSelector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontSelector.h; sourceTree = "<group>"; };
+               B2C3DA5B0D006CD600EF6F26 /* GlyphBuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GlyphBuffer.h; sourceTree = "<group>"; };
+               B2C3DA5C0D006CD600EF6F26 /* GlyphPageTreeNode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphPageTreeNode.cpp; sourceTree = "<group>"; };
+               B2C3DA5D0D006CD600EF6F26 /* GlyphPageTreeNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GlyphPageTreeNode.h; sourceTree = "<group>"; };
+               B2C3DA5E0D006CD600EF6F26 /* GlyphWidthMap.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphWidthMap.cpp; sourceTree = "<group>"; };
+               B2C3DA5F0D006CD600EF6F26 /* GlyphWidthMap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GlyphWidthMap.h; sourceTree = "<group>"; };
                B2C96D8C0B3AF2B7005E80EC /* JSSVGPathSegCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGPathSegCustom.cpp; sourceTree = "<group>"; };
                B2CB41010AB758E6004D9C45 /* SVGAElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGAElement.idl; sourceTree = "<group>"; };
                B2CB41020AB758E6004D9C45 /* SVGAnimateColorElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGAnimateColorElement.idl; sourceTree = "<group>"; };
                B2FA3D2F0AB75A6F000E5AC4 /* JSSVGViewElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGViewElement.h; sourceTree = "<group>"; };
                B2FA3D300AB75A6F000E5AC4 /* JSSVGZoomEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGZoomEvent.cpp; sourceTree = "<group>"; };
                B2FA3D310AB75A6F000E5AC4 /* JSSVGZoomEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGZoomEvent.h; sourceTree = "<group>"; };
-               B402FD090C4C9C3900210AA6 /* BidiResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BidiResolver.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>"; };
                BC124EFD0C26447A009E2349 /* JSBarInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSBarInfo.cpp; sourceTree = "<group>"; };
                BC124EFE0C26447A009E2349 /* JSBarInfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSBarInfo.h; sourceTree = "<group>"; };
                BC17F9650B64EBB8004A65CB /* JSHTMLSelectElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLSelectElementCustom.cpp; sourceTree = "<group>"; };
-               BC18C5CE0B2A886F0018461D /* TextBreakIterator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextBreakIterator.h; sourceTree = "<group>"; };
-               BC18C5CF0B2A886F0018461D /* TextBreakIteratorICU.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextBreakIteratorICU.cpp; sourceTree = "<group>"; };
                BC1A3797097C715F0019F3D8 /* DOM.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOM.h; sourceTree = "<group>"; };
                BC1A3798097C715F0019F3D8 /* DOM.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOM.mm; sourceTree = "<group>"; };
                BC1A3799097C715F0019F3D8 /* DOMCore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMCore.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>"; };
-               BC64B4B80CB428C7005F2B62 /* FontSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSelector.h; 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>"; };
                BC6D44BD0C07EFB60072D2C9 /* JSHTMLEmbedElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLEmbedElementCustom.cpp; sourceTree = "<group>"; };
                BC6D44EA0C07F2ED0072D2C9 /* JSHTMLEmbedElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLEmbedElement.cpp; sourceTree = "<group>"; };
                BC6D44EB0C07F2ED0072D2C9 /* JSHTMLEmbedElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLEmbedElement.h; sourceTree = "<group>"; };
-               BC6D6DD009AF906600F59759 /* Font.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Font.cpp; sourceTree = "<group>"; };
-               BC6D6DD109AF906600F59759 /* Font.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Font.h; sourceTree = "<group>"; };
                BC6D6E2509AF943500F59759 /* ScrollView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ScrollView.h; sourceTree = "<group>"; };
-               BC6DABF20A19015700E5CD14 /* FontCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontCache.cpp; 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>"; };
-               BC6DB3680A1A7CB700E5CD14 /* GlyphPageTreeNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GlyphPageTreeNode.h; sourceTree = "<group>"; };
-               BC6DB4730A1A90FB00E5CD14 /* GlyphPageTreeNode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphPageTreeNode.cpp; 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>"; };
                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>"; };
-               BCC089190A1C4652006189A6 /* FontData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontData.cpp; sourceTree = "<group>"; };
-               BCC089290A1C4991006189A6 /* GlyphWidthMap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GlyphWidthMap.h; sourceTree = "<group>"; };
-               BCC089550A1C4CC9006189A6 /* GlyphWidthMap.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphWidthMap.cpp; sourceTree = "<group>"; };
-               BCC47E2409A3D6F100ADB771 /* FontFamily.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontFamily.cpp; sourceTree = "<group>"; };
-               BCC47E2509A3D6F100ADB771 /* FontFamily.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontFamily.h; sourceTree = "<group>"; };
-               BCC47E6A09A3FE4700ADB771 /* FontDescription.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontDescription.h; 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>"; };
-               BCC71A120A0FF94D0014EE6E /* GlyphBuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GlyphBuffer.h; sourceTree = "<group>"; };
                BCC8CFCA0986CD2400140BF2 /* ColorData.gperf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ColorData.gperf; sourceTree = "<group>"; };
                BCCBAD3A0C18BFF800CE890F /* JSHTMLCollectionCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLCollectionCustom.cpp; sourceTree = "<group>"; };
                BCCBAD3E0C18C14200CE890F /* JSHTMLCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLCollection.cpp; 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>"; };
-               BCEB377509B7BB0D00CB38B1 /* FontFallbackList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontFallbackList.h; 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>"; };
-               BCF7C0770A1680C00032F75B /* FontFallbackList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontFallbackList.cpp; sourceTree = "<group>"; };
-               BCF7C0B70A1687CC0032F75B /* FontCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontCache.h; 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>"; };
-               BCFB2F3F097A24B500BA703D /* SegmentedString.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentedString.cpp; sourceTree = "<group>"; };
-               BCFB2F40097A24B500BA703D /* SegmentedString.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SegmentedString.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>"; };
                BCFE2F0F0C1B58370020235F /* JSRect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSRect.cpp; sourceTree = "<group>"; };
                E10B9B6B0B747599003ED890 /* NativeXPathNSResolver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NativeXPathNSResolver.cpp; sourceTree = "<group>"; };
                E10B9CCA0B747A44003ED890 /* DOMCustomXPathNSResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCustomXPathNSResolver.h; sourceTree = "<group>"; };
                E10B9CCB0B747A44003ED890 /* DOMCustomXPathNSResolver.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMCustomXPathNSResolver.mm; sourceTree = "<group>"; };
-               E11D51910B2E7A5F0056C188 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
-               E11D51920B2E7A5F0056C188 /* Base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Base64.cpp; 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>"; };
-               E14842DD0A674934007E4D39 /* TextCodecICU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCodecICU.h; sourceTree = "<group>"; };
-               E14842FE0A674A31007E4D39 /* TextCodecICU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecICU.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>"; };
-               E15863970CD10B730066E2C9 /* TextCodecUserDefined.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCodecUserDefined.h; sourceTree = "<group>"; };
-               E15863980CD10B730066E2C9 /* TextCodecUserDefined.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecUserDefined.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>"; };
                F58784F002DE375901EA4122 /* CursorMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CursorMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587851502DE375901EA4122 /* DeprecatedPtrListImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrListImpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587851602DE375901EA4122 /* DeprecatedPtrListImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedPtrListImpl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587852B02DE375901EA4122 /* RegularExpression.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RegularExpression.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587853902DE375901EA4122 /* TextStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextStream.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587853B02DE375901EA4122 /* DeprecatedValueListImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedValueListImpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587853C02DE375901EA4122 /* DeprecatedValueListImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedValueListImpl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587854C02DE375901EA4122 /* WebCoreFrameView.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreFrameView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587868402DE3B8601EA4122 /* Cursor.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Cursor.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587869902DE3B8601EA4122 /* DeprecatedPtrList.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrList.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58786AD02DE3B8601EA4122 /* DeprecatedPtrQueue.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrQueue.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F58786B302DE3B8601EA4122 /* RegularExpression.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RegularExpression.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F58786BF02DE3B8601EA4122 /* TextStream.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = TextStream.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58786C202DE3B8601EA4122 /* DeprecatedValueList.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedValueList.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58EF58E02DFDFB7018635CA /* WebCore.base.exp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.exports; path = WebCore.base.exp; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
                F5C2869302846DCD018635CA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
                B2A015910AF6CD53006BCE0E /* graphics */ = {
                        isa = PBXGroup;
                        children = (
+                               B23540F00D00782E002382FA /* StringTruncator.cpp */,
+                               B23540F10D00782E002382FA /* StringTruncator.h */,
+                               B2C3DA4F0D006CD600EF6F26 /* Font.cpp */,
+                               B2C3DA500D006CD600EF6F26 /* Font.h */,
+                               B2C3DA510D006CD600EF6F26 /* FontCache.cpp */,
+                               B2C3DA520D006CD600EF6F26 /* FontCache.h */,
+                               B2C3DA530D006CD600EF6F26 /* FontData.cpp */,
+                               B2C3DA540D006CD600EF6F26 /* FontData.h */,
+                               B2C3DA550D006CD600EF6F26 /* FontDescription.h */,
+                               B2C3DA560D006CD600EF6F26 /* FontFallbackList.cpp */,
+                               B2C3DA570D006CD600EF6F26 /* FontFallbackList.h */,
+                               B2C3DA580D006CD600EF6F26 /* FontFamily.cpp */,
+                               B2C3DA590D006CD600EF6F26 /* FontFamily.h */,
+                               B2C3DA5A0D006CD600EF6F26 /* FontSelector.h */,
+                               B2C3DA5B0D006CD600EF6F26 /* GlyphBuffer.h */,
+                               B2C3DA5C0D006CD600EF6F26 /* GlyphPageTreeNode.cpp */,
+                               B2C3DA5D0D006CD600EF6F26 /* GlyphPageTreeNode.h */,
+                               B2C3DA5E0D006CD600EF6F26 /* GlyphWidthMap.cpp */,
+                               B2C3DA5F0D006CD600EF6F26 /* GlyphWidthMap.h */,
                                B27535270B053814002CE64F /* AffineTransform.cpp */,
                                B27535280B053814002CE64F /* AffineTransform.h */,
                                A89943270B42338700D7C802 /* BitmapImage.cpp */,
                        path = cg;
                        sourceTree = "<group>";
                };
+               B2C3D9EC0D006C1D00EF6F26 /* text */ = {
+                       isa = PBXGroup;
+                       children = (
+                               B2C3D9ED0D006C1D00EF6F26 /* AtomicString.cpp */,
+                               B2C3D9EE0D006C1D00EF6F26 /* AtomicString.h */,
+                               B2C3D9EF0D006C1D00EF6F26 /* AtomicStringImpl.h */,
+                               B2C3D9F00D006C1D00EF6F26 /* Base64.cpp */,
+                               B2C3D9F10D006C1D00EF6F26 /* Base64.h */,
+                               B2C3D9F20D006C1D00EF6F26 /* BidiContext.cpp */,
+                               B2C3D9F30D006C1D00EF6F26 /* BidiContext.h */,
+                               B2C3D9F40D006C1D00EF6F26 /* BidiResolver.h */,
+                               B2C3D9F50D006C1D00EF6F26 /* CharacterNames.h */,
+                               B2C3D9F60D006C1D00EF6F26 /* CString.cpp */,
+                               B2C3D9F70D006C1D00EF6F26 /* CString.h */,
+                               B2C3D9F80D006C1D00EF6F26 /* FontStyle.h */,
+                               B2C3D9F90D006C1D00EF6F26 /* mac */,
+                               B2C3D9FB0D006C1D00EF6F26 /* PlatformString.h */,
+                               B2C3D9FC0D006C1D00EF6F26 /* RegularExpression.cpp */,
+                               B2C3D9FD0D006C1D00EF6F26 /* RegularExpression.h */,
+                               B2C3D9FE0D006C1D00EF6F26 /* SegmentedString.cpp */,
+                               B2C3D9FF0D006C1D00EF6F26 /* SegmentedString.h */,
+                               B2C3DA000D006C1D00EF6F26 /* String.cpp */,
+                               B2C3DA010D006C1D00EF6F26 /* StringHash.h */,
+                               B2C3DA020D006C1D00EF6F26 /* StringImpl.cpp */,
+                               B2C3DA030D006C1D00EF6F26 /* StringImpl.h */,
+                               B2C3DA040D006C1D00EF6F26 /* TextBoundaries.h */,
+                               B2C3DA060D006C1D00EF6F26 /* TextBreakIterator.h */,
+                               B2C3DA070D006C1D00EF6F26 /* TextBreakIteratorICU.cpp */,
+                               B2C3DA080D006C1D00EF6F26 /* TextBreakIteratorInternalICU.h */,
+                               B2C3DA090D006C1D00EF6F26 /* TextCodec.cpp */,
+                               B2C3DA0A0D006C1D00EF6F26 /* TextCodec.h */,
+                               B2C3DA0B0D006C1D00EF6F26 /* TextCodecICU.cpp */,
+                               B2C3DA0C0D006C1D00EF6F26 /* TextCodecICU.h */,
+                               B2C3DA0D0D006C1D00EF6F26 /* TextCodecLatin1.cpp */,
+                               B2C3DA0E0D006C1D00EF6F26 /* TextCodecLatin1.h */,
+                               B2C3DA0F0D006C1D00EF6F26 /* TextCodecUserDefined.cpp */,
+                               B2C3DA100D006C1D00EF6F26 /* TextCodecUserDefined.h */,
+                               B2C3DA110D006C1D00EF6F26 /* TextCodecUTF16.cpp */,
+                               B2C3DA120D006C1D00EF6F26 /* TextCodecUTF16.h */,
+                               B2C3DA130D006C1D00EF6F26 /* TextDecoder.cpp */,
+                               B2C3DA140D006C1D00EF6F26 /* TextDecoder.h */,
+                               B2C3DA150D006C1D00EF6F26 /* TextDirection.h */,
+                               B2C3DA160D006C1D00EF6F26 /* TextEncoding.cpp */,
+                               B2C3DA170D006C1D00EF6F26 /* TextEncoding.h */,
+                               B2C3DA180D006C1D00EF6F26 /* TextEncodingRegistry.cpp */,
+                               B2C3DA190D006C1D00EF6F26 /* TextEncodingRegistry.h */,
+                               B2C3DA1A0D006C1D00EF6F26 /* TextStream.cpp */,
+                               B2C3DA1B0D006C1D00EF6F26 /* TextStream.h */,
+                               B2C3DA1C0D006C1D00EF6F26 /* UnicodeRange.cpp */,
+                               B2C3DA1D0D006C1D00EF6F26 /* UnicodeRange.h */,
+                       );
+                       path = text;
+                       sourceTree = "<group>";
+               };
+               B2C3D9F90D006C1D00EF6F26 /* mac */ = {
+                       isa = PBXGroup;
+                       children = (
+                               B2C3D9FA0D006C1D00EF6F26 /* CharsetData.h */,
+                       );
+                       path = mac;
+                       sourceTree = "<group>";
+               };
                B2E27BDD0B0F2AE500F17C7B /* filters */ = {
                        isa = PBXGroup;
                        children = (
                                516030090CC4245400C8AC25 /* posix */,
                                5154498E0CAA35F600194B2D /* pthreads */,
                                1A2E6E560CC551E0004A2062 /* sql */,
+                               B2C3D9EC0D006C1D00EF6F26 /* text */,
                                BCFB2F74097A2E1A00BA703D /* Arena.cpp */,
                                BCFB2F75097A2E1A00BA703D /* Arena.h */,
                                BCB16B890979B01400467741 /* ArrayImpl.cpp */,
                                BCB16B8A0979B01400467741 /* ArrayImpl.h */,
-                               93CD4FD70995F9EA007ECC97 /* AtomicString.cpp */,
-                               93CD4FD80995F9EA007ECC97 /* AtomicString.h */,
-                               93CD4FD90995F9EA007ECC97 /* AtomicStringImpl.h */,
                                51E1ECB10C91C55600DC255B /* AutodrainedPool.h */,
-                               E11D51910B2E7A5F0056C188 /* Base64.h */,
-                               E11D51920B2E7A5F0056C188 /* Base64.cpp */,
-                               514AF320BE854014A7DA49FB /* BidiContext.h */,
-                               A579C284B928484FB9A446BC /* BidiContext.cpp */,
-                               B402FD090C4C9C3900210AA6 /* BidiResolver.h */,
-                               93C7B5F30B52D89100B5477E /* CharacterNames.h */,
-                               9326DC0A09DAD5BE00AFC847 /* CharsetData.h */,
                                BCC8CFCA0986CD2400140BF2 /* ColorData.gperf */,
                                93B6A0E70B0BCA6700F5027A /* ContextMenu.cpp */,
                                93B6A0E50B0BCA5C00F5027A /* ContextMenu.h */,
                                06027CAC0B1CBFC000884B2D /* ContextMenuItem.h */,
                                9352088109BD45E900F2038D /* CookieJar.h */,
-                               1A98955A0AA78149005EF5EF /* CString.cpp */,
-                               1A98955B0AA78149005EF5EF /* CString.h */,
                                F587868402DE3B8601EA4122 /* Cursor.h */,
                                BCB16B880979B01400467741 /* DeprecatedArray.h */,
                                F58784D502DE375901EA4122 /* DeprecatedCString.cpp */,
                                934FE9E40B5CA539003E4A73 /* FileChooser.cpp */,
                                066C772A0AB603B700238CC4 /* FileChooser.h */,
                                514B3F720C722047000530DF /* FileSystem.h */,
-                               BC6D6DD009AF906600F59759 /* Font.cpp */,
-                               BC6D6DD109AF906600F59759 /* Font.h */,
-                               BC6DABF20A19015700E5CD14 /* FontCache.cpp */,
-                               BCF7C0B70A1687CC0032F75B /* FontCache.h */,
-                               BCC089190A1C4652006189A6 /* FontData.cpp */,
-                               85EC9AF80A71A2C600EEEAED /* FontData.h */,
-                               BCC47E6A09A3FE4700ADB771 /* FontDescription.h */,
-                               BCF7C0770A1680C00032F75B /* FontFallbackList.cpp */,
-                               BCEB377509B7BB0D00CB38B1 /* FontFallbackList.h */,
-                               BCC47E2409A3D6F100ADB771 /* FontFamily.cpp */,
-                               BCC47E2509A3D6F100ADB771 /* FontFamily.h */,
-                               BC64B4B80CB428C7005F2B62 /* FontSelector.h */,
-                               BCC71A120A0FF94D0014EE6E /* GlyphBuffer.h */,
-                               BC6DB4730A1A90FB00E5CD14 /* GlyphPageTreeNode.cpp */,
-                               BC6DB3680A1A7CB700E5CD14 /* GlyphPageTreeNode.h */,
-                               BCC089550A1C4CC9006189A6 /* GlyphWidthMap.cpp */,
-                               BCC089290A1C4991006189A6 /* GlyphWidthMap.h */,
                                6593923509AE4346002C531F /* KURL.cpp */,
                                6593923609AE4346002C531F /* KURL.h */,
                                85EC9AF90A71A2C600EEEAED /* Language.h */,
                                932871BF0B20DEB70049035A /* PlatformMenuDescription.h */,
                                935C476709AC4D4300A6AAB4 /* PlatformMouseEvent.h */,
                                BCEC01D60C274EB4009F4EC9 /* PlatformScreen.h */,
-                               93CD4FEB0995FD2A007ECC97 /* PlatformString.h */,
                                935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */,
                                A82398A509B3ACDB00B60641 /* PlugInInfoStore.h */,
                                0668E1890ADD9624004128E0 /* PopupMenu.h */,
                                ABC128760B33AA6D00C693D5 /* PopupMenuClient.h */,
-                               F587852B02DE375901EA4122 /* RegularExpression.cpp */,
-                               F58786B302DE3B8601EA4122 /* RegularExpression.h */,
                                BC7B2AF80450824100A8000F /* ScrollBar.h */,
                                93C09C850B0657AA005ABD4D /* ScrollTypes.h */,
                                BC6D6E2509AF943500F59759 /* ScrollView.h */,
                                BC014C730CC5579D009C4B20 /* SecurityOrigin.h */,
                                51079DD40CED2A820077247D /* SecurityOriginData.cpp */,
                                512F2F440CEC3516006537E3 /* SecurityOriginData.h */,
-                               BCFB2F3F097A24B500BA703D /* SegmentedString.cpp */,
-                               BCFB2F40097A24B500BA703D /* SegmentedString.h */,
                                1A4A954B0B4EDCCB002D8C3C /* SharedBuffer.cpp */,
                                1A4A954C0B4EDCCB002D8C3C /* SharedBuffer.h */,
                                93309EA0099EB78C0056E581 /* SharedTimer.h */,
                                4B3043C60AE0370300A82647 /* Sound.h */,
                                F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */,
                                9352071709BD3BA500F2038D /* StaticConstructors.h */,
-                               93CD4FDA0995F9EA007ECC97 /* String.cpp */,
-                               93126F6009D7A736008D9626 /* StringHash.h */,
-                               93CD4FDC0995F9EA007ECC97 /* StringImpl.cpp */,
-                               93CD4FDD0995F9EA007ECC97 /* StringImpl.h */,
-                               06A6A73A0B8BA44800DF1703 /* StringTruncator.cpp */,
-                               06A6A73B0B8BA44800DF1703 /* StringTruncator.h */,
                                93E62D990985F41600E1B5E3 /* SystemTime.h */,
-                               9352071809BD3BA500F2038D /* TextBoundaries.h */,
-                               BC18C5CE0B2A886F0018461D /* TextBreakIterator.h */,
-                               BC18C5CF0B2A886F0018461D /* TextBreakIteratorICU.cpp */,
-                               657BD74909AFDC54005A2056 /* TextCodec.cpp */,
-                               657BD74A09AFDC54005A2056 /* TextCodec.h */,
-                               E14842FE0A674A31007E4D39 /* TextCodecICU.cpp */,
-                               E14842DD0A674934007E4D39 /* TextCodecICU.h */,
-                               932CA7C40AAA20D200AD1FAD /* TextCodecLatin1.cpp */,
-                               932CA7C00AAA20C100AD1FAD /* TextCodecLatin1.h */,
                                E14843910A6752BF007E4D39 /* TextCodecMac.cpp */,
                                E148432E0A674FC2007E4D39 /* TextCodecMac.h */,
-                               E15863970CD10B730066E2C9 /* TextCodecUserDefined.h */,
-                               E15863980CD10B730066E2C9 /* TextCodecUserDefined.cpp */,
-                               932CA8470AAA66CB00AD1FAD /* TextCodecUTF16.cpp */,
-                               932CA83A0AAA667F00AD1FAD /* TextCodecUTF16.h */,
-                               932CA7640AAA1DF500AD1FAD /* TextDecoder.cpp */,
-                               932CA7420AAA198E00AD1FAD /* TextDecoder.h */,
-                               9353686A09AF78F600D35CD6 /* TextDirection.h */,
-                               657BD74B09AFDC54005A2056 /* TextEncoding.cpp */,
-                               657BD74C09AFDC54005A2056 /* TextEncoding.h */,
-                               93AE23200AAB521B00CD8A35 /* TextEncodingRegistry.cpp */,
-                               93AE23170AAB51E500CD8A35 /* TextEncodingRegistry.h */,
-                               F587853902DE375901EA4122 /* TextStream.cpp */,
-                               F58786BF02DE3B8601EA4122 /* TextStream.h */,
-                               93AC8DE00A955FAC00239794 /* TextStyle.h */,
                                51DF6D7D0B92A16D00C2DC85 /* ThreadCheck.h */,
                                51E1ECB20C91C55600DC255B /* Threading.h */,
                                93309EA1099EB78C0056E581 /* Timer.cpp */,
                                9305B24C098F1B6B00C28855 /* Timer.h */,
                                1419D2C40CEA6F6100FF507A /* TreeShared.h */,
-                               514C762C0CE921F4007EF3CD /* UnicodeRange.cpp */,
-                               514C762D0CE921F4007EF3CD /* UnicodeRange.h */,
                                9380F47109A11AB4001FDB34 /* Widget.cpp */,
                                9380F47209A11AB4001FDB34 /* Widget.h */,
                                93B780C909B3B7FE00690162 /* WidgetClient.h */,
                                93309DD9099E64920056E581 /* ApplyStyleCommand.h in Headers */,
                                BCFB2F77097A2E1A00BA703D /* Arena.h in Headers */,
                                BCB16B8D0979B01400467741 /* ArrayImpl.h in Headers */,
-                               93CD4FDF0995F9EA007ECC97 /* AtomicString.h in Headers */,
-                               93CD4FE00995F9EA007ECC97 /* AtomicStringImpl.h in Headers */,
                                93F199CF08245E59001E9ABC /* AtomicStringList.h in Headers */,
                                A8C4A80D09D563270003AC8D /* Attr.h in Headers */,
                                A8C4A80B09D563270003AC8D /* Attribute.h in Headers */,
                                51E1ECB30C91C55600DC255B /* AutodrainedPool.h in Headers */,
                                51741D0F0B07259A00ED442C /* BackForwardList.h in Headers */,
                                BC124EE80C2641CD009E2349 /* BarInfo.h in Headers */,
-                               E11D51930B2E7A5F0056C188 /* Base64.h in Headers */,
                                AB23A32809BBA7D00067CC53 /* BeforeTextInsertedEvent.h in Headers */,
                                85031B3D0A44EFC700F992E0 /* BeforeUnloadEvent.h in Headers */,
-                               0F31CBF92B654730BA0535E8 /* BidiContext.h in Headers */,
-                               B402FD0B0C4C9C3900210AA6 /* BidiResolver.h in Headers */,
                                A89943280B42338800D7C802 /* BitmapImage.h in Headers */,
                                93F199BE08245E59001E9ABC /* BlockExceptions.h in Headers */,
                                93309DDB099E64920056E581 /* BreakBlockquoteCommand.h in Headers */,
                                A80E6CEE0A1989CA007FB8C5 /* CSSValue.h in Headers */,
                                6565815109D13043000E61D7 /* CSSValueKeywords.h in Headers */,
                                A80E6CE90A1989CA007FB8C5 /* CSSValueList.h in Headers */,
-                               1A98955D0AA78149005EF5EF /* CString.h in Headers */,
                                BCB16C180979C3BD00467741 /* Cache.h in Headers */,
                                93F1995008245E59001E9ABC /* CachePolicy.h in Headers */,
                                BCB16C1A0979C3BD00467741 /* CachedCSSStyleSheet.h in Headers */,
                                B2310B770B1F46A200D55D87 /* CgSupport.h in Headers */,
                                514185EE0CD65F0400763C99 /* ChangeVersionWrapper.h in Headers */,
                                6550B6A0099DF0270090D781 /* CharacterData.h in Headers */,
-                               93C7B5F40B52D89100B5477E /* CharacterNames.h in Headers */,
-                               9326DC0B09DAD5BE00AFC847 /* CharsetData.h in Headers */,
                                A81872200977D3C0005826D9 /* ChildNodeList.h in Headers */,
                                14D823520AF92A790004F057 /* Chrome.h in Headers */,
                                14D824080AF93AEB0004F057 /* ChromeClient.h in Headers */,
                                B275356D0B053814002CE64F /* FloatSize.h in Headers */,
                                14993BE60B2F2B1C0050497F /* FocusController.h in Headers */,
                                062287840B4DB322000C34DF /* FocusDirection.h in Headers */,
-                               BC6D6DD309AF906600F59759 /* Font.h in Headers */,
-                               BCF7C0B80A1687CC0032F75B /* FontCache.h in Headers */,
                                BC64B4BE0CB42929005F2B62 /* FontCustomPlatformData.h in Headers */,
-                               85EC9AFA0A71A2C600EEEAED /* FontData.h in Headers */,
-                               BCC47E6B09A3FE4700ADB771 /* FontDescription.h in Headers */,
-                               BCEB377609B7BB0D00CB38B1 /* FontFallbackList.h in Headers */,
-                               BCC47E2709A3D6F100ADB771 /* FontFamily.h in Headers */,
                                A80E6CF30A1989CA007FB8C5 /* FontFamilyValue.h in Headers */,
                                148A00110AF59F3F008CC700 /* FontPlatformData.h in Headers */,
-                               BC64B4B90CB428C7005F2B62 /* FontSelector.h in Headers */,
                                A80E6CED0A1989CA007FB8C5 /* FontValue.h in Headers */,
                                514C76700CE923A1007EF3CD /* FormData.h in Headers */,
                                A8136D380973A8E700D74463 /* FormDataList.h in Headers */,
                                1432E8470C51493800B1500F /* GCController.h in Headers */,
                                935C477509AC4D8E00A6AAB4 /* GapRects.h in Headers */,
                                BC94D1570C275CAB006BC617 /* GlobalHistory.h in Headers */,
-                               BCC71A130A0FF94D0014EE6E /* GlyphBuffer.h in Headers */,
-                               BC6DB3690A1A7CB700E5CD14 /* GlyphPageTreeNode.h in Headers */,
-                               BCC0892A0A1C4991006189A6 /* GlyphWidthMap.h in Headers */,
                                B2DDF0670B482A030064A4B1 /* GradientAttributes.h in Headers */,
                                B2A015A90AF6CD53006BCE0E /* GraphicsContext.h in Headers */,
                                B275355D0B053814002CE64F /* GraphicsContextPlatformPrivate.h in Headers */,
                                935C476909AC4D4300A6AAB4 /* PlatformMouseEvent.h in Headers */,
                                BCEC01D70C274EB4009F4EC9 /* PlatformScreen.h in Headers */,
                                BC3FCAA90AC3DB5800BA54AD /* PlatformScrollBar.h in Headers */,
-                               93CD4FEC0995FD2A007ECC97 /* PlatformString.h in Headers */,
                                935C476B09AC4D4F00A6AAB4 /* PlatformWheelEvent.h in Headers */,
                                A82398A609B3ACDB00B60641 /* PlugInInfoStore.h in Headers */,
                                65D1C1CA09932B22000CB324 /* Plugin.h in Headers */,
                                D23CA56C0AB0EB8D005108A5 /* RangeException.h in Headers */,
                                BC4368E80C226E32005EFB5F /* Rect.h in Headers */,
                                85031B4C0A44EFC700F992E0 /* RegisteredEventListener.h in Headers */,
-                               93F1998A08245E59001E9ABC /* RegularExpression.h in Headers */,
                                93309E01099E64920056E581 /* RemoveCSSPropertyCommand.h in Headers */,
                                93309E03099E64920056E581 /* RemoveNodeAttributeCommand.h in Headers */,
                                93309E05099E64920056E581 /* RemoveNodeCommand.h in Headers */,
                                AB7170890B3118080017123E /* SearchPopupMenu.h in Headers */,
                                BC014C750CC5579D009C4B20 /* SecurityOrigin.h in Headers */,
                                512F2F450CEC3516006537E3 /* SecurityOriginData.h in Headers */,
-                               BCFB2F42097A24B500BA703D /* SegmentedString.h in Headers */,
                                93309E0C099E64920056E581 /* Selection.h in Headers */,
                                93309E0E099E64920056E581 /* SelectionController.h in Headers */,
                                93309E10099E64920056E581 /* SetNodeAttributeCommand.h in Headers */,
                                93309E14099E64920056E581 /* SplitTextNodeCommand.h in Headers */,
                                93309E16099E64920056E581 /* SplitTextNodeContainingElementCommand.h in Headers */,
                                9352071909BD3BA500F2038D /* StaticConstructors.h in Headers */,
-                               93126F6109D7A736008D9626 /* StringHash.h in Headers */,
-                               93CD4FE40995F9EA007ECC97 /* StringImpl.h in Headers */,
-                               06A6A73D0B8BA44800DF1703 /* StringTruncator.h in Headers */,
                                A80E73500A199C77007FB8C5 /* StyleBase.h in Headers */,
                                AA4C3A770B2B1679002334A2 /* StyleElement.h in Headers */,
                                A80E73510A199C77007FB8C5 /* StyleList.h in Headers */,
                                A8CFF0510A154F09000A4234 /* TableLayout.h in Headers */,
                                6550B6A6099DF0270090D781 /* Text.h in Headers */,
                                93309E17099E64920056E581 /* TextAffinity.h in Headers */,
-                               9352071A09BD3BA500F2038D /* TextBoundaries.h in Headers */,
-                               BC18C5D00B2A886F0018461D /* TextBreakIterator.h in Headers */,
-                               657BD74E09AFDC54005A2056 /* TextCodec.h in Headers */,
-                               E14842DE0A674934007E4D39 /* TextCodecICU.h in Headers */,
-                               932CA7C10AAA20C100AD1FAD /* TextCodecLatin1.h in Headers */,
                                E148432F0A674FC2007E4D39 /* TextCodecMac.h in Headers */,
-                               932CA83B0AAA667F00AD1FAD /* TextCodecUTF16.h in Headers */,
-                               E15863990CD10B730066E2C9 /* TextCodecUserDefined.h in Headers */,
-                               934706AB0AACD809002C1D43 /* TextDecoder.h in Headers */,
-                               9353686B09AF78F600D35CD6 /* TextDirection.h in Headers */,
                                1A6938020A11100A00C127FE /* TextDocument.h in Headers */,
-                               657BD75009AFDC54005A2056 /* TextEncoding.h in Headers */,
-                               93AE23180AAB51E500CD8A35 /* TextEncodingRegistry.h in Headers */,
                                933A14300B7D188600A53FFD /* TextEvent.h in Headers */,
                                93309E18099E64920056E581 /* TextGranularity.h in Headers */,
                                93309E1C099E64920056E581 /* TextIterator.h in Headers */,
                                93F198F608245E59001E9ABC /* TextResourceDecoder.h in Headers */,
-                               93F1999B08245E59001E9ABC /* TextStream.h in Headers */,
-                               93AC8DE10A955FAC00239794 /* TextStyle.h in Headers */,
                                51DF6D7E0B92A16D00C2DC85 /* ThreadCheck.h in Headers */,
                                51E1ECB40C91C55600DC255B /* Threading.h in Headers */,
                                E44613B00CD6331000FADA75 /* TimeRanges.h in Headers */,
                                93309E1A099E64920056E581 /* TypingCommand.h in Headers */,
                                85031B4E0A44EFC700F992E0 /* UIEvent.h in Headers */,
                                85031B4F0A44EFC700F992E0 /* UIEventWithKeyState.h in Headers */,
-                               514C762F0CE921F4007EF3CD /* UnicodeRange.h in Headers */,
                                D086FE9809D53AAB005BC74D /* UnlinkCommand.h in Headers */,
                                656581B209D14EE6000E61D7 /* UserAgentStyleSheets.h in Headers */,
                                93309E20099E64920056E581 /* VisiblePosition.h in Headers */,
                                E4C279590CF9741900E97B98 /* RenderMedia.h in Headers */,
                                E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
                                D06C0D8F0CFD11460065F43F /* RemoveFormatCommand.h in Headers */,
+                               B2C3DA1F0D006C1D00EF6F26 /* AtomicString.h in Headers */,
+                               B2C3DA200D006C1D00EF6F26 /* AtomicStringImpl.h in Headers */,
+                               B2C3DA220D006C1D00EF6F26 /* Base64.h in Headers */,
+                               B2C3DA240D006C1D00EF6F26 /* BidiContext.h in Headers */,
+                               B2C3DA250D006C1D00EF6F26 /* BidiResolver.h in Headers */,
+                               B2C3DA260D006C1D00EF6F26 /* CharacterNames.h in Headers */,
+                               B2C3DA280D006C1D00EF6F26 /* CString.h in Headers */,
+                               B2C3DA290D006C1D00EF6F26 /* FontStyle.h in Headers */,
+                               B2C3DA2A0D006C1D00EF6F26 /* CharsetData.h in Headers */,
+                               B2C3DA2B0D006C1D00EF6F26 /* PlatformString.h in Headers */,
+                               B2C3DA2D0D006C1D00EF6F26 /* RegularExpression.h in Headers */,
+                               B2C3DA2F0D006C1D00EF6F26 /* SegmentedString.h in Headers */,
+                               B2C3DA310D006C1D00EF6F26 /* StringHash.h in Headers */,
+                               B2C3DA330D006C1D00EF6F26 /* StringImpl.h in Headers */,
+                               B2C3DA340D006C1D00EF6F26 /* TextBoundaries.h in Headers */,
+                               B2C3DA360D006C1D00EF6F26 /* TextBreakIterator.h in Headers */,
+                               B2C3DA380D006C1D00EF6F26 /* TextBreakIteratorInternalICU.h in Headers */,
+                               B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */,
+                               B2C3DA3C0D006C1D00EF6F26 /* TextCodecICU.h in Headers */,
+                               B2C3DA3E0D006C1D00EF6F26 /* TextCodecLatin1.h in Headers */,
+                               B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */,
+                               B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */,
+                               B2C3DA440D006C1D00EF6F26 /* TextDecoder.h in Headers */,
+                               B2C3DA450D006C1D00EF6F26 /* TextDirection.h in Headers */,
+                               B2C3DA470D006C1D00EF6F26 /* TextEncoding.h in Headers */,
+                               B2C3DA490D006C1D00EF6F26 /* TextEncodingRegistry.h in Headers */,
+                               B2C3DA4B0D006C1D00EF6F26 /* TextStream.h in Headers */,
+                               B2C3DA4D0D006C1D00EF6F26 /* UnicodeRange.h in Headers */,
+                               B2C3DA610D006CD600EF6F26 /* Font.h in Headers */,
+                               B2C3DA630D006CD600EF6F26 /* FontCache.h in Headers */,
+                               B2C3DA650D006CD600EF6F26 /* FontData.h in Headers */,
+                               B2C3DA660D006CD600EF6F26 /* FontDescription.h in Headers */,
+                               B2C3DA680D006CD600EF6F26 /* FontFallbackList.h in Headers */,
+                               B2C3DA6A0D006CD600EF6F26 /* FontFamily.h in Headers */,
+                               B2C3DA6B0D006CD600EF6F26 /* FontSelector.h in Headers */,
+                               B2C3DA6C0D006CD600EF6F26 /* GlyphBuffer.h in Headers */,
+                               B2C3DA6E0D006CD600EF6F26 /* GlyphPageTreeNode.h in Headers */,
+                               B2C3DA700D006CD600EF6F26 /* GlyphWidthMap.h in Headers */,
+                               B23540F30D00782E002382FA /* StringTruncator.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
-                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
                                93309DD8099E64920056E581 /* ApplyStyleCommand.cpp in Sources */,
                                BCFB2F76097A2E1A00BA703D /* Arena.cpp in Sources */,
                                BCB16B8C0979B01400467741 /* ArrayImpl.cpp in Sources */,
-                               93CD4FDE0995F9EA007ECC97 /* AtomicString.cpp in Sources */,
                                A8C4A80E09D563270003AC8D /* Attr.cpp in Sources */,
                                A8C4A80C09D563270003AC8D /* Attribute.cpp in Sources */,
                                514C766B0CE923A1007EF3CD /* AuthenticationChallenge.cpp in Sources */,
                                51E1ECAF0C91C54600DC255B /* AutodrainedPool.mm in Sources */,
                                51741D100B07259A00ED442C /* BackForwardList.cpp in Sources */,
                                BC124EE70C2641CD009E2349 /* BarInfo.cpp in Sources */,
-                               E11D51940B2E7A5F0056C188 /* Base64.cpp in Sources */,
                                AB23A32709BBA7D00067CC53 /* BeforeTextInsertedEvent.cpp in Sources */,
                                85031B3C0A44EFC700F992E0 /* BeforeUnloadEvent.cpp in Sources */,
-                               F971E27FD70F4382BC66D792 /* BidiContext.cpp in Sources */,
                                A89943290B42338800D7C802 /* BitmapImage.cpp in Sources */,
                                93F19AE108245E59001E9ABC /* BlockExceptions.mm in Sources */,
                                93309DDA099E64920056E581 /* BreakBlockquoteCommand.cpp in Sources */,
                                BC80C9870CD294EE00A0B7B3 /* CSSTimingFunctionValue.cpp in Sources */,
                                BC9ADD800CC4092200098C4C /* CSSTransformValue.cpp in Sources */,
                                A80E6CE40A1989CA007FB8C5 /* CSSValueList.cpp in Sources */,
-                               1A98955C0AA78149005EF5EF /* CString.cpp in Sources */,
                                BCB16C170979C3BD00467741 /* Cache.cpp in Sources */,
                                BCB16C190979C3BD00467741 /* CachedCSSStyleSheet.cpp in Sources */,
                                BC64B4CB0CB4295D005F2B62 /* CachedFont.cpp in Sources */,
                                B275355B0B053814002CE64F /* FloatSizeCG.cpp in Sources */,
                                B275357A0B053814002CE64F /* FloatSizeMac.mm in Sources */,
                                14993BE50B2F2B1C0050497F /* FocusController.cpp in Sources */,
-                               BC6D6DD209AF906600F59759 /* Font.cpp in Sources */,
-                               BC6DABF30A19015700E5CD14 /* FontCache.cpp in Sources */,
                                BCF7C2340A16B5F80032F75B /* FontCacheMac.mm in Sources */,
                                BC64B4BD0CB42929005F2B62 /* FontCustomPlatformData.cpp in Sources */,
-                               BCC0891A0A1C4652006189A6 /* FontData.cpp in Sources */,
                                BCC088860A1BD78D006189A6 /* FontDataMac.mm in Sources */,
-                               BCF7C0780A1680C00032F75B /* FontFallbackList.cpp in Sources */,
-                               BCC47E2609A3D6F100ADB771 /* FontFamily.cpp in Sources */,
                                A80E6CEC0A1989CA007FB8C5 /* FontFamilyValue.cpp in Sources */,
                                BCEB377309B7BA3900CB38B1 /* FontMac.mm in Sources */,
                                BC64B4BF0CB42929005F2B62 /* FontPlatformDataMac.mm in Sources */,
                                65CBFEF90974F607001DAC25 /* FrameView.cpp in Sources */,
                                1432E8490C51493F00B1500F /* GCController.cpp in Sources */,
                                BC94D1590C275CB6006BC617 /* GlobalHistoryMac.mm in Sources */,
-                               BC6DB4740A1A90FB00E5CD14 /* GlyphPageTreeNode.cpp in Sources */,
                                BC6DB4D40A1AFEEF00E5CD14 /* GlyphPageTreeNodeMac.cpp in Sources */,
-                               BCC089560A1C4CC9006189A6 /* GlyphWidthMap.cpp in Sources */,
                                B2A015A80AF6CD53006BCE0E /* GraphicsContext.cpp in Sources */,
                                B2ED97710B1F55CE00257D0F /* GraphicsContextCG.cpp in Sources */,
                                B277B4040B22F37C0004BEC6 /* GraphicsContextMac.mm in Sources */,
                                550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */,
                                93F19AB908245E59001E9ABC /* Range.cpp in Sources */,
                                85031B4B0A44EFC700F992E0 /* RegisteredEventListener.cpp in Sources */,
-                               93F19A4A08245E59001E9ABC /* RegularExpression.cpp in Sources */,
                                93309E00099E64920056E581 /* RemoveCSSPropertyCommand.cpp in Sources */,
                                93309E02099E64920056E581 /* RemoveNodeAttributeCommand.cpp in Sources */,
                                93309E04099E64920056E581 /* RemoveNodeCommand.cpp in Sources */,
                                AB7170A00B31193B0017123E /* SearchPopupMenuMac.mm in Sources */,
                                BC014C740CC5579D009C4B20 /* SecurityOrigin.cpp in Sources */,
                                51079DD50CED2A820077247D /* SecurityOriginData.cpp in Sources */,
-                               BCFB2F41097A24B500BA703D /* SegmentedString.cpp in Sources */,
                                93309E0B099E64920056E581 /* Selection.cpp in Sources */,
                                93309E0D099E64920056E581 /* SelectionController.cpp in Sources */,
                                4A8C96EB0BE69032004EEFF0 /* SelectionControllerMac.mm in Sources */,
                                93309E11099E64920056E581 /* SplitElementCommand.cpp in Sources */,
                                93309E13099E64920056E581 /* SplitTextNodeCommand.cpp in Sources */,
                                93309E15099E64920056E581 /* SplitTextNodeContainingElementCommand.cpp in Sources */,
-                               93CD4FE10995F9EA007ECC97 /* String.cpp in Sources */,
                                1AE42F6A0AA4B8CB00C8612D /* StringCF.cpp in Sources */,
-                               93CD4FE30995F9EA007ECC97 /* StringImpl.cpp in Sources */,
                                1AE42F6B0AA4B8CB00C8612D /* StringImplCF.cpp in Sources */,
                                93B0FD8A0A759BED0080AD44 /* StringImplMac.mm in Sources */,
                                93B0FD8B0A759BED0080AD44 /* StringMac.mm in Sources */,
-                               06A6A73C0B8BA44800DF1703 /* StringTruncator.cpp in Sources */,
                                A80E73530A199C77007FB8C5 /* StyleBase.cpp in Sources */,
                                AA4C3A760B2B1679002334A2 /* StyleElement.cpp in Sources */,
                                A80E734D0A199C77007FB8C5 /* StyleList.cpp in Sources */,
                                6582A16309999D6D00BEEB6D /* SystemTimeMac.cpp in Sources */,
                                6550B6A5099DF0270090D781 /* Text.cpp in Sources */,
                                9352071D09BD3BBB00F2038D /* TextBoundaries.mm in Sources */,
-                               BC18C5D10B2A886F0018461D /* TextBreakIteratorICU.cpp in Sources */,
                                AACF144D0BEC1EF000827982 /* TextBreakIteratorInternalICUMac.mm in Sources */,
-                               657BD74D09AFDC54005A2056 /* TextCodec.cpp in Sources */,
-                               E14842FF0A674A31007E4D39 /* TextCodecICU.cpp in Sources */,
-                               932CA7C50AAA20D200AD1FAD /* TextCodecLatin1.cpp in Sources */,
                                E14843D60A6754A6007E4D39 /* TextCodecMac.cpp in Sources */,
-                               932CA8480AAA66CB00AD1FAD /* TextCodecUTF16.cpp in Sources */,
-                               E158639A0CD10B730066E2C9 /* TextCodecUserDefined.cpp in Sources */,
-                               932CA7650AAA1DF500AD1FAD /* TextDecoder.cpp in Sources */,
                                1A6938010A11100A00C127FE /* TextDocument.cpp in Sources */,
-                               657BD74F09AFDC54005A2056 /* TextEncoding.cpp in Sources */,
-                               93AE23210AAB521B00CD8A35 /* TextEncodingRegistry.cpp in Sources */,
                                933A142E0B7D188600A53FFD /* TextEvent.cpp in Sources */,
                                93309E1B099E64920056E581 /* TextIterator.cpp in Sources */,
                                93F19A9D08245E59001E9ABC /* TextResourceDecoder.cpp in Sources */,
-                               93F19A5408245E59001E9ABC /* TextStream.cpp in Sources */,
                                51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */,
                                51E1ECB00C91C54600DC255B /* Threading.mm in Sources */,
                                1A2E6FA40CC5795D004A2062 /* ThreadingPthreads.cpp in Sources */,
                                93309E19099E64920056E581 /* TypingCommand.cpp in Sources */,
                                85031B4D0A44EFC700F992E0 /* UIEvent.cpp in Sources */,
                                93354A3C0B24F8C9003F6DEA /* UIEventWithKeyState.cpp in Sources */,
-                               514C762E0CE921F4007EF3CD /* UnicodeRange.cpp in Sources */,
                                D086FE9909D53AAB005BC74D /* UnlinkCommand.cpp in Sources */,
                                65DF326109D1E199000BE325 /* UserAgentStyleSheetsData.cpp in Sources */,
                                93309E1F099E64920056E581 /* VisiblePosition.cpp in Sources */,
                                E4C279580CF9741900E97B98 /* RenderMedia.cpp in Sources */,
                                E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
                                D06C0D900CFD11460065F43F /* RemoveFormatCommand.cpp in Sources */,
+                               B2C3DA1E0D006C1D00EF6F26 /* AtomicString.cpp in Sources */,
+                               B2C3DA210D006C1D00EF6F26 /* Base64.cpp in Sources */,
+                               B2C3DA230D006C1D00EF6F26 /* BidiContext.cpp in Sources */,
+                               B2C3DA270D006C1D00EF6F26 /* CString.cpp in Sources */,
+                               B2C3DA2C0D006C1D00EF6F26 /* RegularExpression.cpp in Sources */,
+                               B2C3DA2E0D006C1D00EF6F26 /* SegmentedString.cpp in Sources */,
+                               B2C3DA300D006C1D00EF6F26 /* String.cpp in Sources */,
+                               B2C3DA320D006C1D00EF6F26 /* StringImpl.cpp in Sources */,
+                               B2C3DA370D006C1D00EF6F26 /* TextBreakIteratorICU.cpp in Sources */,
+                               B2C3DA390D006C1D00EF6F26 /* TextCodec.cpp in Sources */,
+                               B2C3DA3B0D006C1D00EF6F26 /* TextCodecICU.cpp in Sources */,
+                               B2C3DA3D0D006C1D00EF6F26 /* TextCodecLatin1.cpp in Sources */,
+                               B2C3DA3F0D006C1D00EF6F26 /* TextCodecUserDefined.cpp in Sources */,
+                               B2C3DA410D006C1D00EF6F26 /* TextCodecUTF16.cpp in Sources */,
+                               B2C3DA430D006C1D00EF6F26 /* TextDecoder.cpp in Sources */,
+                               B2C3DA460D006C1D00EF6F26 /* TextEncoding.cpp in Sources */,
+                               B2C3DA480D006C1D00EF6F26 /* TextEncodingRegistry.cpp in Sources */,
+                               B2C3DA4A0D006C1D00EF6F26 /* TextStream.cpp in Sources */,
+                               B2C3DA4C0D006C1D00EF6F26 /* UnicodeRange.cpp in Sources */,
+                               B2C3DA600D006CD600EF6F26 /* Font.cpp in Sources */,
+                               B2C3DA620D006CD600EF6F26 /* FontCache.cpp in Sources */,
+                               B2C3DA640D006CD600EF6F26 /* FontData.cpp in Sources */,
+                               B2C3DA670D006CD600EF6F26 /* FontFallbackList.cpp in Sources */,
+                               B2C3DA690D006CD600EF6F26 /* FontFamily.cpp in Sources */,
+                               B2C3DA6D0D006CD600EF6F26 /* GlyphPageTreeNode.cpp in Sources */,
+                               B2C3DA6F0D006CD600EF6F26 /* GlyphWidthMap.cpp in Sources */,
+                               B23540F20D00782E002382FA /* StringTruncator.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index 958289f..1243bfd 100644 (file)
@@ -536,10 +536,10 @@ This file contains the list of files needed to build WebCore.
     <set append="1" var="WEBCORE_SOURCES_PLATFORM">
         platform/Arena.cpp
         platform/ArrayImpl.cpp
-        platform/AtomicString.cpp
-        platform/Base64.cpp
-        platform/BidiContext.cpp
-        platform/CString.cpp
+        platform/text/AtomicString.cpp
+        platform/text/Base64.cpp
+        platform/text/BidiContext.cpp
+        platform/text/CString.cpp
         platform/ContextMenu.cpp
         platform/DeprecatedCString.cpp
         platform/DeprecatedPtrListImpl.cpp
@@ -548,34 +548,34 @@ This file contains the list of files needed to build WebCore.
         platform/DeprecatedValueListImpl.cpp
         platform/DragImage.cpp
         platform/FileChooser.cpp
-        platform/Font.cpp
-        platform/FontCache.cpp
-        platform/FontData.cpp
-        platform/FontFallbackList.cpp
-        platform/FontFamily.cpp
-        platform/GlyphPageTreeNode.cpp
-        platform/GlyphWidthMap.cpp
+        platform/graphics/Font.cpp
+        platform/graphics/FontCache.cpp
+        platform/graphics/FontData.cpp
+        platform/graphics/FontFallbackList.cpp
+        platform/graphics/FontFamily.cpp
+        platform/graphics/GlyphPageTreeNode.cpp
+        platform/graphics/GlyphWidthMap.cpp
         platform/KURL.cpp
         platform/Logging.cpp
         platform/MIMETypeRegistry.cpp
-        platform/RegularExpression.cpp
+        platform/text/RegularExpression.cpp
         platform/ScrollBar.cpp
         platform/SecurityOrigin.cpp
         platform/SecurityOriginData.cpp
-        platform/SegmentedString.cpp
+        platform/text/SegmentedString.cpp
         platform/SharedBuffer.cpp
-        platform/String.cpp
-        platform/StringImpl.cpp
-        platform/TextBreakIteratorICU.cpp
-        platform/TextCodec.cpp
-        platform/TextCodecICU.cpp
-        platform/TextCodecLatin1.cpp
-        platform/TextCodecUTF16.cpp
-        platform/TextCodecUserDefined.cpp
-        platform/TextDecoder.cpp
-        platform/TextEncoding.cpp
-        platform/TextEncodingRegistry.cpp
-        platform/TextStream.cpp
+        platform/text/String.cpp
+        platform/text/StringImpl.cpp
+        platform/text/TextBreakIteratorICU.cpp
+        platform/text/TextCodec.cpp
+        platform/text/TextCodecICU.cpp
+        platform/text/TextCodecLatin1.cpp
+        platform/text/TextCodecUTF16.cpp
+        platform/text/TextCodecUserDefined.cpp
+        platform/text/TextDecoder.cpp
+        platform/text/TextEncoding.cpp
+        platform/text/TextEncodingRegistry.cpp
+        platform/text/TextStream.cpp
         platform/ThreadingNone.cpp
         platform/Timer.cpp
         platform/Widget.cpp
index fcad5c3..309eaa1 100644 (file)
@@ -195,11 +195,11 @@ PassRefPtr<Node> ReplacementFragment::insertFragmentForTestRendering(Node* conte
     while (n && !n->isElementNode())
         n = n->parentNode();
     if (n) {
-        RefPtr<CSSComputedStyleDeclaration> contextStyle = new CSSComputedStyleDeclaration(static_cast<Element*>(n));
+        RefPtr<CSSComputedStyleDeclaration> conFontStyle = new CSSComputedStyleDeclaration(static_cast<Element*>(n));
         CSSStyleDeclaration* style = holder->style();
-        style->setProperty(CSS_PROP_WHITE_SPACE, contextStyle->getPropertyValue(CSS_PROP_WHITE_SPACE), false, ec);
+        style->setProperty(CSS_PROP_WHITE_SPACE, conFontStyle->getPropertyValue(CSS_PROP_WHITE_SPACE), false, ec);
         ASSERT(ec == 0);
-        style->setProperty(CSS_PROP__WEBKIT_USER_SELECT, contextStyle->getPropertyValue(CSS_PROP__WEBKIT_USER_SELECT), false, ec);
+        style->setProperty(CSS_PROP__WEBKIT_USER_SELECT, conFontStyle->getPropertyValue(CSS_PROP__WEBKIT_USER_SELECT), false, ec);
         ASSERT(ec == 0);
     }
     
similarity index 96%
rename from WebCore/platform/Font.cpp
rename to WebCore/platform/graphics/Font.cpp
index 9097e6d..5a2eb7a 100644 (file)
@@ -32,7 +32,7 @@
 #include "FontFallbackList.h"
 #include "IntPoint.h"
 #include "GlyphBuffer.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 #include <wtf/unicode/Unicode.h>
 #include <wtf/MathExtras.h>
 
@@ -62,7 +62,7 @@ const uint8_t Font::gRoundingHackCharacterTable[256] = {
 Font::CodePath Font::codePath = Auto;
 
 struct WidthIterator {
-    WidthIterator(const Font* font, const TextRun& run, const TextStyle& style);
+    WidthIterator(const Font* font, const TextRun& run, const FontStyle& style);
 
     void advance(int to, GlyphBuffer* glyphBuffer = 0);
     bool advanceOneCharacter(float& width, GlyphBuffer* glyphBuffer = 0);
@@ -72,7 +72,7 @@ struct WidthIterator {
     const TextRun& m_run;
     int m_end;
 
-    const TextStyle& m_style;
+    const FontStyle& m_style;
     
     unsigned m_currentCharacter;
     float m_runWidthSoFar;
@@ -84,7 +84,7 @@ private:
     UChar32 normalizeVoicingMarks(int currentCharacter);
 };
 
-WidthIterator::WidthIterator(const Font* font, const TextRun& run, const TextStyle& style)
+WidthIterator::WidthIterator(const Font* font, const TextRun& run, const FontStyle& style)
     : m_font(font)
     , m_run(run)
     , m_end(run.length())
@@ -510,10 +510,10 @@ void Font::update(PassRefPtr<FontSelector> fontSelector) const
 
 int Font::width(const TextRun& run) const
 {
-    return width(run, TextStyle());
+    return width(run, FontStyle());
 }
 
-int Font::width(const TextRun& run, const TextStyle& style) const
+int Font::width(const TextRun& run, const FontStyle& style) const
 {
     return lroundf(floatWidth(run, style));
 }
@@ -618,7 +618,7 @@ bool Font::canUseGlyphCache(const TextRun& run) const
 
 }
 
-void Font::drawSimpleText(GraphicsContext* context, const TextRun& run, const TextStyle& style, const FloatPoint& point, int from, int to) const
+void Font::drawSimpleText(GraphicsContext* context, const TextRun& run, const FontStyle& style, const FloatPoint& point, int from, int to) const
 {
     // This glyph buffer holds our glyphs+advances+font data for each glyph.
     GlyphBuffer glyphBuffer;
@@ -654,7 +654,7 @@ void Font::drawSimpleText(GraphicsContext* context, const TextRun& run, const Te
 }
 
 void Font::drawGlyphBuffer(GraphicsContext* context, const GlyphBuffer& glyphBuffer, 
-                           const TextRun& run, const TextStyle& style, const FloatPoint& point) const
+                           const TextRun& run, const FontStyle& style, const FloatPoint& point) const
 {   
     // Draw each contiguous run of glyphs that use the same font data.
     const FontData* fontData = glyphBuffer.fontDataAt(0);
@@ -679,7 +679,7 @@ void Font::drawGlyphBuffer(GraphicsContext* context, const GlyphBuffer& glyphBuf
     drawGlyphs(context, fontData, glyphBuffer, lastFrom, nextGlyph - lastFrom, startPoint);
 }
 
-void Font::drawText(GraphicsContext* context, const TextRun& run, const TextStyle& style, const FloatPoint& point, int from, int to) const
+void Font::drawText(GraphicsContext* context, const TextRun& run, const FontStyle& style, const FloatPoint& point, int from, int to) const
 {
     // Don't draw anything while we are using custom fonts that are in the process of loading.
     if (m_fontList && m_fontList->loadingCustomFonts())
@@ -692,21 +692,21 @@ void Font::drawText(GraphicsContext* context, const TextRun& run, const TextStyl
         drawComplexText(context, run, style, point, from, to);
 }
 
-float Font::floatWidth(const TextRun& run, const TextStyle& style) const
+float Font::floatWidth(const TextRun& run, const FontStyle& style) const
 {
     if (canUseGlyphCache(run))
         return floatWidthForSimpleText(run, style, 0);
     return floatWidthForComplexText(run, style);
 }
 
-float Font::floatWidthForSimpleText(const TextRun& run, const TextStyle& style, GlyphBuffer* glyphBuffer) const
+float Font::floatWidthForSimpleText(const TextRun& run, const FontStyle& style, GlyphBuffer* glyphBuffer) const
 {
     WidthIterator it(this, run, style);
     it.advance(run.length(), glyphBuffer);
     return it.m_runWidthSoFar;
 }
 
-FloatRect Font::selectionRectForText(const TextRun& run, const TextStyle& style, const IntPoint& point, int h, int from, int to) const
+FloatRect Font::selectionRectForText(const TextRun& run, const FontStyle& style, const IntPoint& point, int h, int from, int to) const
 {
     to = (to == -1 ? run.length() : to);
     if (canUseGlyphCache(run))
@@ -714,7 +714,7 @@ FloatRect Font::selectionRectForText(const TextRun& run, const TextStyle& style,
     return selectionRectForComplexText(run, style, point, h, from, to);
 }
 
-FloatRect Font::selectionRectForSimpleText(const TextRun& run, const TextStyle& style, const IntPoint& point, int h, int from, int to) const
+FloatRect Font::selectionRectForSimpleText(const TextRun& run, const FontStyle& style, const IntPoint& point, int h, int from, int to) const
 {
     WidthIterator it(this, run, style);
     it.advance(from);
@@ -732,14 +732,14 @@ FloatRect Font::selectionRectForSimpleText(const TextRun& run, const TextStyle&
     }
 }
 
-int Font::offsetForPosition(const TextRun& run, const TextStyle& style, int x, bool includePartialGlyphs) const
+int Font::offsetForPosition(const TextRun& run, const FontStyle& style, int x, bool includePartialGlyphs) const
 {
     if (canUseGlyphCache(run))
         return offsetForPositionForSimpleText(run, style, x, includePartialGlyphs);
     return offsetForPositionForComplexText(run, style, x, includePartialGlyphs);
 }
 
-int Font::offsetForPositionForSimpleText(const TextRun& run, const TextStyle& style, int x, bool includePartialGlyphs) const
+int Font::offsetForPositionForSimpleText(const TextRun& run, const FontStyle& style, int x, bool includePartialGlyphs) const
 {
     float delta = (float)x;
 
similarity index 86%
rename from WebCore/platform/Font.h
rename to WebCore/platform/graphics/Font.h
index fa92057..67c41df 100644 (file)
@@ -46,7 +46,7 @@ class GlyphBuffer;
 class GlyphPageTreeNode;
 class GraphicsContext;
 class IntPoint;
-class TextStyle;
+class FontStyle;
 
 struct GlyphData;
 
@@ -95,15 +95,15 @@ public:
     
     void update(PassRefPtr<FontSelector>) const;
 
-    void drawText(GraphicsContext*, const TextRun&, const TextStyle&, const FloatPoint&, int from = 0, int to = -1) const;
+    void drawText(GraphicsContext*, const TextRun&, const FontStyle&, const FloatPoint&, int from = 0, int to = -1) const;
 
-    int width(const TextRun&, const TextStyle&) const;
+    int width(const TextRun&, const FontStyle&) const;
     int width(const TextRun&) const;
-    float floatWidth(const TextRun&, const TextStyle&) const;
+    float floatWidth(const TextRun&, const FontStyle&) const;
     float floatWidth(const TextRun&) const;
     
-    int offsetForPosition(const TextRun&, const TextStyle&, int position, bool includePartialGlyphs) const;
-    FloatRect selectionRectForText(const TextRun&, const TextStyle&, const IntPoint&, int h, int from = 0, int to = -1) const;
+    int offsetForPosition(const TextRun&, const FontStyle&, int position, bool includePartialGlyphs) const;
+    FloatRect selectionRectForText(const TextRun&, const FontStyle&, const IntPoint&, int h, int from = 0, int to = -1) const;
 
     bool isSmallCaps() const { return m_fontDescription.smallCaps(); }
 
@@ -150,16 +150,16 @@ public:
 
 private:
     bool canUseGlyphCache(const TextRun&) const;
-    void drawSimpleText(GraphicsContext*, const TextRun&, const TextStyle&, const FloatPoint&, int from, int to) const;
+    void drawSimpleText(GraphicsContext*, const TextRun&, const FontStyle&, const FloatPoint&, int from, int to) const;
     void drawGlyphs(GraphicsContext*, const FontData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const;
-    void drawGlyphBuffer(GraphicsContext*, const GlyphBuffer&, const TextRun&, const TextStyle&, const FloatPoint&) const;
-    void drawComplexText(GraphicsContext*, const TextRun&, const TextStyle&, const FloatPoint&, int from, int to) const;
-    float floatWidthForSimpleText(const TextRun&, const TextStyle&, GlyphBuffer*) const;
-    float floatWidthForComplexText(const TextRun&, const TextStyle&) const;
-    int offsetForPositionForSimpleText(const TextRun&, const TextStyle&, int position, bool includePartialGlyphs) const;
-    int offsetForPositionForComplexText(const TextRun&, const TextStyle&, int position, bool includePartialGlyphs) const;
-    FloatRect selectionRectForSimpleText(const TextRun&, const TextStyle&, const IntPoint&, int h, int from, int to) const;
-    FloatRect selectionRectForComplexText(const TextRun&, const TextStyle&, const IntPoint&, int h, int from, int to) const;
+    void drawGlyphBuffer(GraphicsContext*, const GlyphBuffer&, const TextRun&, const FontStyle&, const FloatPoint&) const;
+    void drawComplexText(GraphicsContext*, const TextRun&, const FontStyle&, const FloatPoint&, int from, int to) const;
+    float floatWidthForSimpleText(const TextRun&, const FontStyle&, GlyphBuffer*) const;
+    float floatWidthForComplexText(const TextRun&, const FontStyle&) const;
+    int offsetForPositionForSimpleText(const TextRun&, const FontStyle&, int position, bool includePartialGlyphs) const;
+    int offsetForPositionForComplexText(const TextRun&, const FontStyle&, int position, bool includePartialGlyphs) const;
+    FloatRect selectionRectForSimpleText(const TextRun&, const FontStyle&, const IntPoint&, int h, int from, int to) const;
+    FloatRect selectionRectForComplexText(const TextRun&, const FontStyle&, const IntPoint&, int h, int from, int to) const;
 #endif
     friend struct WidthIterator;
     
index cc9c144..b28acfb 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "BidiResolver.h"
 #include "Font.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 
 using namespace std;
 
@@ -243,10 +243,10 @@ void GraphicsContext::drawImage(Image* image, const IntRect& dest, const IntRect
 
 void GraphicsContext::drawText(const TextRun& run, const IntPoint& point, int from, int to)
 {
-    drawText(run, point, TextStyle(), from, to);
+    drawText(run, point, FontStyle(), from, to);
 }
 
-void GraphicsContext::drawText(const TextRun& run, const IntPoint& point, const TextStyle& style, int from, int to)
+void GraphicsContext::drawText(const TextRun& run, const IntPoint& point, const FontStyle& style, int from, int to)
 {
     if (paintingDisabled())
         return;
@@ -254,7 +254,7 @@ void GraphicsContext::drawText(const TextRun& run, const IntPoint& point, const
     font().drawText(this, run, style, point, from, to);
 }
 
-void GraphicsContext::drawBidiText(const TextRun& run, const IntPoint& point, const TextStyle& style)
+void GraphicsContext::drawBidiText(const TextRun& run, const IntPoint& point, const FontStyle& style)
 {
     if (paintingDisabled())
         return;
@@ -272,7 +272,7 @@ void GraphicsContext::drawBidiText(const TextRun& run, const IntPoint& point, co
     FloatPoint currPoint = point;
     BidiCharacterRun* bidiRun = bidiResolver.firstRun();
     while (bidiRun) {
-        TextStyle subrunStyle(style);
+        FontStyle subrunStyle(style);
         subrunStyle.setRTL(bidiRun->level() % 2);
         subrunStyle.setDirectionalOverride(bidiRun->dirOverride(false));
 
@@ -289,7 +289,7 @@ void GraphicsContext::drawBidiText(const TextRun& run, const IntPoint& point, co
     bidiResolver.deleteRuns();
 }
 
-void GraphicsContext::drawHighlightForText(const TextRun& run, const IntPoint& point, int h, const TextStyle& style, const Color& backgroundColor, int from, int to)
+void GraphicsContext::drawHighlightForText(const TextRun& run, const IntPoint& point, int h, const FontStyle& style, const Color& backgroundColor, int from, int to)
 {
     if (paintingDisabled())
         return;
index cb2e4ce..94901d8 100644 (file)
@@ -86,7 +86,7 @@ namespace WebCore {
     class KURL;
     class Path;
     class TextRun;
-    class TextStyle;
+    class FontStyle;
 
     // These bits can be ORed together for a total of 8 possible text drawing modes.
     const int cTextInvisible = 0;
@@ -173,9 +173,9 @@ namespace WebCore {
         void setTextDrawingMode(int);
 
         void drawText(const TextRun&, const IntPoint&, int from = 0, int to = -1);
-        void drawText(const TextRun&, const IntPoint&, const TextStyle&, int from = 0, int to = -1);
-        void drawBidiText(const TextRun&, const IntPoint&, const TextStyle&);
-        void drawHighlightForText(const TextRun&, const IntPoint&, int h, const TextStyle&, const Color& backgroundColor, int from = 0, int to = -1);
+        void drawText(const TextRun&, const IntPoint&, const FontStyle&, int from = 0, int to = -1);
+        void drawBidiText(const TextRun&, const IntPoint&, const FontStyle&);
+        void drawHighlightForText(const TextRun&, const IntPoint&, int h, const FontStyle&, const Color& backgroundColor, int from = 0, int to = -1);
 
         FloatRect roundToDevicePixels(const FloatRect&);
         
similarity index 99%
rename from WebCore/platform/StringTruncator.cpp
rename to WebCore/platform/graphics/StringTruncator.cpp
index 3806833..e362f93 100644 (file)
@@ -33,7 +33,7 @@
 #include "Font.h"
 #include "FontPlatformData.h"
 #include "TextBreakIterator.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 #include <wtf/Assertions.h>
 #include <wtf/Vector.h>
 
@@ -96,7 +96,7 @@ static unsigned rightTruncateToBuffer(const String& string, unsigned length, uns
 static float stringWidth(const Font& renderer, const UChar* characters, unsigned length, bool disableRoundingHacks)
 {
     TextRun run(characters, length);
-    TextStyle style;
+    FontStyle style;
     if (disableRoundingHacks)
         style.disableRoundingHacks();
     return renderer.floatWidth(run, style);
index 7c3407d..400bf2c 100644 (file)
@@ -279,7 +279,7 @@ void GraphicsContext::restorePlatformState()
 }
 
 /* FIXME: DISABLED WHILE MERGING BACK FROM UNITY
-void GraphicsContext::drawTextShadow(const TextRun& run, const IntPoint& point, const TextStyle& style)
+void GraphicsContext::drawTextShadow(const TextRun& run, const IntPoint& point, const FontStyle& style)
 {
     if (paintingDisabled())
         return;
index 56ef94c..b51f26f 100644 (file)
@@ -61,24 +61,24 @@ void Font::drawGlyphs(GraphicsContext* graphicsContext, const FontData* font, co
     cairo_show_glyphs(context, glyphs, numGlyphs);
 }
 
-void Font::drawComplexText(GraphicsContext*, const TextRun&, const TextStyle&, const FloatPoint&, int from, int to) const
+void Font::drawComplexText(GraphicsContext*, const TextRun&, const FontStyle&, const FloatPoint&, int from, int to) const
 {
     notImplemented();
 }
 
-float Font::floatWidthForComplexText(const TextRun&, const TextStyle&) const
+float Font::floatWidthForComplexText(const TextRun&, const FontStyle&) const
 {
     notImplemented();
     return 0.0f;
 }
 
-int Font::offsetForPositionForComplexText(const TextRun&, const TextStyle&, int, bool) const
+int Font::offsetForPositionForComplexText(const TextRun&, const FontStyle&, int, bool) const
 {
     notImplemented();
     return 0;
 }
 
-FloatRect Font::selectionRectForComplexText(const TextRun&, const TextStyle&, const IntPoint&, int, int, int) const
+FloatRect Font::selectionRectForComplexText(const TextRun&, const FontStyle&, const IntPoint&, int, int, int) const
 {
     notImplemented();
     return FloatRect();
index 079b2e2..b5f1dea 100644 (file)
@@ -34,7 +34,7 @@
 #import "GraphicsContext.h"
 #import "IntRect.h"
 #import "Logging.h"
-#import "TextStyle.h"
+#import "FontStyle.h"
 #import "WebCoreSystemInterface.h"
 #import "WebCoreTextRenderer.h"
 #import "ShapeArabic.h"
@@ -57,7 +57,7 @@ namespace WebCore {
 
 struct ATSULayoutParameters
 {
-    ATSULayoutParameters(const TextRun& run, const TextStyle& style)
+    ATSULayoutParameters(const TextRun& run, const FontStyle& style)
         : m_run(run)
         , m_style(style)
         , m_font(0)
@@ -71,7 +71,7 @@ struct ATSULayoutParameters
     void initialize(const Font*, const GraphicsContext* = 0);
 
     const TextRun& m_run;
-    const TextStyle& m_style;
+    const FontStyle& m_style;
     
     const Font* m_font;
     
@@ -477,7 +477,7 @@ static void disposeATSULayoutParameters(ATSULayoutParameters *params)
     delete []params->m_fonts;
 }
 
-FloatRect Font::selectionRectForComplexText(const TextRun& run, const TextStyle& style, const IntPoint& point, int h, int from, int to) const
+FloatRect Font::selectionRectForComplexText(const TextRun& run, const FontStyle& style, const IntPoint& point, int h, int from, int to) const
 {        
     TextRun adjustedRun = style.directionalOverride() ? addDirectionalOverride(run, style.rtl()) : run;
     if (style.directionalOverride()) {
@@ -509,7 +509,7 @@ FloatRect Font::selectionRectForComplexText(const TextRun& run, const TextStyle&
     return rect;
 }
 
-void Font::drawComplexText(GraphicsContext* graphicsContext, const TextRun& run, const TextStyle& style, const FloatPoint& point, int from, int to) const
+void Font::drawComplexText(GraphicsContext* graphicsContext, const TextRun& run, const FontStyle& style, const FloatPoint& point, int from, int to) const
 {
     OSStatus status;
     
@@ -544,7 +544,7 @@ void Font::drawComplexText(GraphicsContext* graphicsContext, const TextRun& run,
         delete []adjustedRun.characters();
 }
 
-float Font::floatWidthForComplexText(const TextRun& run, const TextStyle& style) const
+float Font::floatWidthForComplexText(const TextRun& run, const FontStyle& style) const
 {
     if (run.length() == 0)
         return 0;
@@ -568,7 +568,7 @@ float Font::floatWidthForComplexText(const TextRun& run, const TextStyle& style)
            MIN(FixedToFloat(firstGlyphBounds.upperLeft.x), FixedToFloat(firstGlyphBounds.lowerLeft.x));
 }
 
-int Font::offsetForPositionForComplexText(const TextRun& run, const TextStyle& style, int x, bool includePartialGlyphs) const
+int Font::offsetForPositionForComplexText(const TextRun& run, const FontStyle& style, int x, bool includePartialGlyphs) const
 {
     TextRun adjustedRun = style.directionalOverride() ? addDirectionalOverride(run, style.rtl()) : run;
     
index bda93e1..52c47f8 100644 (file)
@@ -30,7 +30,7 @@
 #import "FontData.h"
 #import "GraphicsContext.h"
 #import "IntPoint.h"
-#import "TextStyle.h"
+#import "FontStyle.h"
 #import "WebFontCache.h"
 
 using namespace WebCore;
@@ -48,7 +48,7 @@ void WebCoreDrawTextAtPoint(const UniChar* buffer, unsigned length, NSPoint poin
     FontPlatformData f(font);
     Font renderer(f, ![[NSGraphicsContext currentContext] isDrawingToScreen]);
     TextRun run(buffer, length);
-    TextStyle style;
+    FontStyle style;
     style.disableRoundingHacks();
     CGFloat red, green, blue, alpha;
     [[textColor colorUsingColorSpaceName:NSDeviceRGBColorSpace] getRed:&red green:&green blue:&blue alpha:&alpha];
@@ -63,7 +63,7 @@ float WebCoreTextFloatWidth(const UniChar* buffer, unsigned length , NSFont* fon
     FontPlatformData f(font);
     Font renderer(f, ![[NSGraphicsContext currentContext] isDrawingToScreen]);
     TextRun run(buffer, length);
-    TextStyle style;
+    FontStyle style;
     style.disableRoundingHacks();
     return renderer.floatWidth(run, style);
 }
index d615d7d..57b279c 100644 (file)
@@ -23,7 +23,7 @@
 #include "Font.h"
 #include "FontDescription.h"
 #include "FontSelector.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 
 #include "GraphicsContext.h"
 #include <QTextLayout>
@@ -157,7 +157,7 @@ void Font::update(PassRefPtr<FontSelector>) const
     // don't think we need this
 }
 
-static int generateComponents(Vector<TextRunComponent, 1024>* components, const Font &font, const TextRun &run, const TextStyle &style)
+static int generateComponents(Vector<TextRunComponent, 1024>* components, const Font &font, const TextRun &run, const FontStyle &style)
 {
 //     qDebug() << "generateComponents" << QString((const QChar *)run.characters(), run.length());
     int letterSpacing = font.letterSpacing();
@@ -278,7 +278,7 @@ static int generateComponents(Vector<TextRunComponent, 1024>* components, const
     return offset;
 }
 
-void Font::drawText(GraphicsContext* ctx, const TextRun& run, const TextStyle& style, const FloatPoint& point, int from, int to) const
+void Font::drawText(GraphicsContext* ctx, const TextRun& run, const FontStyle& style, const FloatPoint& point, int from, int to) const
 {
     if (to < 0)
         to = run.length();
@@ -319,7 +319,7 @@ void Font::drawText(GraphicsContext* ctx, const TextRun& run, const TextStyle& s
         p->restore();
 }
 
-int Font::width(const TextRun& run, const TextStyle& style) const
+int Font::width(const TextRun& run, const FontStyle& style) const
 {
     Vector<TextRunComponent, 1024> components;
     int w = generateComponents(&components, *this, run, style);
@@ -330,10 +330,10 @@ int Font::width(const TextRun& run, const TextStyle& style) const
 
 int Font::width(const TextRun& run) const
 {
-    return width(run, TextStyle());
+    return width(run, FontStyle());
 }
 
-float Font::floatWidth(const TextRun& run, const TextStyle& style) const
+float Font::floatWidth(const TextRun& run, const FontStyle& style) const
 {
     return width(run, style);
 }
@@ -343,7 +343,7 @@ float Font::floatWidth(const TextRun& run) const
     return width(run);
 }
 
-int Font::offsetForPosition(const TextRun& run, const TextStyle& style, int position, bool includePartialGlyphs) const
+int Font::offsetForPosition(const TextRun& run, const FontStyle& style, int position, bool includePartialGlyphs) const
 {
     Vector<TextRunComponent, 1024> components;
     int w = generateComponents(&components, *this, run, style);
@@ -402,7 +402,7 @@ int Font::offsetForPosition(const TextRun& run, const TextStyle& style, int posi
 }
 
 static float cursorToX(const Vector<TextRunComponent, 1024>& components, int width,
-                     const TextStyle& style, int cursor)
+                     const FontStyle& style, int cursor)
 {
     int start = 0;
     for (int i = 0; i < components.size(); ++i) {
@@ -427,7 +427,7 @@ static float cursorToX(const Vector<TextRunComponent, 1024>& components, int wid
     return width;
 }
 
-FloatRect Font::selectionRectForText(const TextRun& run, const TextStyle& style, const IntPoint& pt,
+FloatRect Font::selectionRectForText(const TextRun& run, const FontStyle& style, const IntPoint& pt,
                                      int h, int from, int to) const
 {
     Vector<TextRunComponent, 1024> components;
similarity index 94%
rename from WebCore/platform/TextStyle.h
rename to WebCore/platform/text/FontStyle.h
index 7c49c72..08cc681 100644 (file)
  *
  */
 
-#ifndef TextStyle_h
-#define TextStyle_h
+#ifndef FontStyle_h
+#define FontStyle_h
 
 namespace WebCore {
 
-class TextStyle {
+class FontStyle {
 public:
-    TextStyle(bool allowTabs = false, int xpos = 0, int padding = 0, bool rtl = false, bool directionalOverride = false,
+    FontStyle(bool allowTabs = false, int xpos = 0, int padding = 0, bool rtl = false, bool directionalOverride = false,
               bool applyRunRounding = true, bool applyWordRounding = true)
         : m_allowTabs(allowTabs)
         , m_xpos(xpos)
similarity index 98%
rename from WebCore/platform/TextBoundariesICU.cpp
rename to WebCore/platform/text/TextBoundariesICU.cpp
index e633f9b..d226048 100644 (file)
@@ -37,8 +37,6 @@ int findNextWordFromIndex(const UChar* chars, int len, int position, bool forwar
 {
     UBreakIterator* it = wordBreakIterator(chars, len);
 
-    int newPosition = position;
-
     if (forward) {
         position = ubrk_following(it, position);
         while (position != UBRK_DONE) {
index b45893f..a9b11f6 100644 (file)
@@ -32,7 +32,7 @@
 #include "GraphicsContext.h"
 #include "IntRect.h"
 #include "NotImplemented.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 #include "UniscribeController.h"
 #include <ApplicationServices/ApplicationServices.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
@@ -95,7 +95,7 @@ void Font::drawGlyphs(GraphicsContext* graphicsContext, const FontData* font, co
     wkRestoreFontSmoothingStyle(cgContext, oldFontSmoothingStyle);
 }
 
-FloatRect Font::selectionRectForComplexText(const TextRun& run, const TextStyle& style, const IntPoint& point, int h,
+FloatRect Font::selectionRectForComplexText(const TextRun& run, const FontStyle& style, const IntPoint& point, int h,
                                             int from, int to) const
 {
     UniscribeController it(this, run, style);
@@ -114,7 +114,7 @@ FloatRect Font::selectionRectForComplexText(const TextRun& run, const TextStyle&
     return FloatRect(point.x() + floorf(beforeWidth), point.y(), roundf(afterWidth) - floorf(beforeWidth), h);
 }
 
-void Font::drawComplexText(GraphicsContext* context, const TextRun& run, const TextStyle& style, const FloatPoint& point,
+void Font::drawComplexText(GraphicsContext* context, const TextRun& run, const FontStyle& style, const FloatPoint& point,
                            int from, int to) const
 {
     // This glyph buffer holds our glyphs + advances + font data for each glyph.
@@ -143,14 +143,14 @@ void Font::drawComplexText(GraphicsContext* context, const TextRun& run, const T
     drawGlyphBuffer(context, glyphBuffer, run, style, startPoint);
 }
 
-float Font::floatWidthForComplexText(const TextRun& run, const TextStyle& style) const
+float Font::floatWidthForComplexText(const TextRun& run, const FontStyle& style) const
 {
     UniscribeController controller(this, run, style);
     controller.advance(run.length());
     return controller.runWidthSoFar();
 }
 
-int Font::offsetForPositionForComplexText(const TextRun& run, const TextStyle& style, int x, bool includePartialGlyphs) const
+int Font::offsetForPositionForComplexText(const TextRun& run, const FontStyle& style, int x, bool includePartialGlyphs) const
 {
     UniscribeController controller(this, run, style);
     return controller.offsetForPosition(x, includePartialGlyphs);
index 1e3b9a3..ee9a0de 100644 (file)
@@ -35,7 +35,7 @@
 #include "PlatformScrollBar.h"
 #include "RenderTheme.h"
 #include "RenderView.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 #include <tchar.h>
 #include <windows.h>
 
@@ -510,7 +510,7 @@ void PopupMenu::paint(const IntRect& damageRect, HDC hdc)
             
         unsigned length = itemText.length();
         const UChar* string = itemText.characters();
-        TextStyle textStyle(0, 0, 0, itemText.defaultWritingDirection() == WTF::Unicode::RightToLeft);
+        FontStyle FontStyle(0, 0, 0, itemText.defaultWritingDirection() == WTF::Unicode::RightToLeft);
         TextRun textRun(string, length);
 
         context.setFillColor(optionTextColor);
@@ -528,7 +528,7 @@ void PopupMenu::paint(const IntRect& damageRect, HDC hdc)
         if (itemStyle->visibility() != HIDDEN) {
             int textX = max(0, client()->clientPaddingLeft() - client()->clientInsetLeft());
             int textY = itemRect.y() + itemFont.ascent() + (itemRect.height() - itemFont.height()) / 2;
-            context.drawBidiText(textRun, IntPoint(textX, textY), textStyle);
+            context.drawBidiText(textRun, IntPoint(textX, textY), FontStyle);
         }
     }
 
index 917725e..6eac6b1 100644 (file)
@@ -30,7 +30,7 @@
 #include "UniscribeController.h"
 #include "Font.h"
 #include "FontData.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 #include <wtf/MathExtras.h>
 
 namespace WebCore {
@@ -39,7 +39,7 @@ namespace WebCore {
 // that does stuff in that method instead of doing everything in the constructor.  Have advance()
 // take the GlyphBuffer as an arg so that we don't have to populate the glyph buffer when
 // measuring.
-UniscribeController::UniscribeController(const Font* font, const TextRun& run, const TextStyle& style)
+UniscribeController::UniscribeController(const Font* font, const TextRun& run, const FontStyle& style)
 : m_font(*font)
 , m_run(run)
 , m_style(style)
index f34fb5a..a4a030f 100644 (file)
@@ -38,7 +38,7 @@ namespace WebCore {
 
 class UniscribeController {
 public:
-    UniscribeController(const Font*, const TextRun&, const TextStyle&);
+    UniscribeController(const Font*, const TextRun&, const FontStyle&);
 
     // Advance and measure/place up to the specified character.
     void advance(unsigned to, GlyphBuffer* = 0);
@@ -60,7 +60,7 @@ private:
 
     const Font& m_font;
     const TextRun& m_run;
-    const TextStyle& m_style;
+    const FontStyle& m_style;
 
     SCRIPT_CONTROL m_control;
     SCRIPT_STATE m_state;
index e1f07aa..304ca4a 100644 (file)
@@ -29,7 +29,7 @@
 #include "FontDescription.h"
 #include "GraphicsContext.h"
 #include "StringTruncator.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 #include <wtf/unicode/Unicode.h>
 
 namespace WebCore {
@@ -47,7 +47,7 @@ static bool isOneLeftToRightRun(const TextRun& run)
 static void doDrawTextAtPoint(GraphicsContext& context, const String& text, const IntPoint& point, const Font& font, const Color& color, int underlinedIndex)
 {
     TextRun run(text.characters(), text.length());
-    TextStyle style;
+    FontStyle style;
 
     context.setFillColor(color);
     if (isOneLeftToRightRun(run))
index 679bf44..0d818b0 100644 (file)
@@ -74,24 +74,24 @@ void Font::drawGlyphs(GraphicsContext* graphicsContext, const FontData* font, co
     dc->DrawText(text, (wxCoord)point.x(), ypoint);
 }
 
-FloatRect Font::selectionRectForComplexText(const TextRun& run, const TextStyle& style, const IntPoint& point, int h, int from, int to) const
+FloatRect Font::selectionRectForComplexText(const TextRun& run, const FontStyle& style, const IntPoint& point, int h, int from, int to) const
 {
     notImplemented();
     return FloatRect();
 }
 
-void Font::drawComplexText(GraphicsContext* graphicsContext, const TextRun& run, const TextStyle& style, const FloatPoint& point, int from, int to) const
+void Font::drawComplexText(GraphicsContext* graphicsContext, const TextRun& run, const FontStyle& style, const FloatPoint& point, int from, int to) const
 {
     notImplemented();
 }
 
-float Font::floatWidthForComplexText(const TextRun& run, const TextStyle& style) const
+float Font::floatWidthForComplexText(const TextRun& run, const FontStyle& style) const
 {
     notImplemented();
     return 0;
 }
 
-int Font::offsetForPositionForComplexText(const TextRun& run, const TextStyle& style, int x, bool includePartialGlyphs) const
+int Font::offsetForPositionForComplexText(const TextRun& run, const FontStyle& style, int x, bool includePartialGlyphs) const
 {
     notImplemented();
     return 0;
index 1ebbac9..0dd4c50 100644 (file)
@@ -25,7 +25,7 @@
 #include "Document.h"
 #include "GraphicsContext.h"
 #include "HitTestResult.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 
 namespace WebCore {
 
@@ -47,8 +47,8 @@ void EllipsisBox::paint(RenderObject::PaintInfo& paintInfo, int tx, int ty)
     }
 
     const String& str = m_str;
-    TextStyle textStyle(0, 0, 0, false, style->visuallyOrdered());
-    context->drawText(TextRun(str.characters(), str.length()), IntPoint(m_x + tx, m_y + ty + m_baseline), textStyle);
+    FontStyle FontStyle(0, 0, 0, false, style->visuallyOrdered());
+    context->drawText(TextRun(str.characters(), str.length()), IntPoint(m_x + tx, m_y + ty + m_baseline), FontStyle);
 
     if (setShadow)
         context->clearShadow();
index 8298834..ca67370 100644 (file)
@@ -32,7 +32,7 @@
 #include "RenderBlock.h"
 #include "RenderTheme.h"
 #include "Text.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 #include "break_lines.h"
 #include <wtf/AlwaysInline.h>
 
@@ -97,7 +97,7 @@ IntRect InlineTextBox::selectionRect(int tx, int ty, int startPos, int endPos)
     const Font& f = textObj->style(m_firstLine)->font();
 
     IntRect r = enclosingIntRect(f.selectionRectForText(TextRun(textObj->text()->characters() + m_start, m_len),
-                                                        TextStyle(textObj->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride),
+                                                        FontStyle(textObj->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride),
                                                         IntPoint(tx + m_x, ty + selTop), selHeight, sPos, ePos));
     if (r.x() > tx + m_x + m_width)
         r.setWidth(0);
@@ -374,7 +374,7 @@ void InlineTextBox::paint(RenderObject::PaintInfo& paintInfo, int tx, int ty)
 
     StringImpl* textStr = textObject()->text();
 
-    TextStyle textStyle(textObject()->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride || styleToUse->visuallyOrdered());
+    FontStyle fontStyle(textObject()->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride || styleToUse->visuallyOrdered());
 
     if (!paintSelectedTextOnly && !paintSelectedTextSeparately) {
         // paint all the text
@@ -383,19 +383,19 @@ void InlineTextBox::paint(RenderObject::PaintInfo& paintInfo, int tx, int ty)
         int endPoint = m_len;
         if (m_truncation != cNoTruncation)
             endPoint = m_truncation;
-        paintInfo.context->drawText(TextRun(textStr->characters() + m_start, endPoint), IntPoint(m_x + tx, m_y + ty + m_baseline), textStyle);
+        paintInfo.context->drawText(TextRun(textStr->characters() + m_start, endPoint), IntPoint(m_x + tx, m_y + ty + m_baseline), fontStyle);
     } else {
         int sPos, ePos;
         selectionStartEnd(sPos, ePos);
         if (paintSelectedTextSeparately) {
             // paint only the text that is not selected
             if (sPos >= ePos)
-                paintInfo.context->drawText(TextRun(textStr->characters() + m_start, m_len), IntPoint(m_x + tx, m_y + ty + m_baseline), textStyle);
+                paintInfo.context->drawText(TextRun(textStr->characters() + m_start, m_len), IntPoint(m_x + tx, m_y + ty + m_baseline), fontStyle);
             else {
                 if (sPos - 1 >= 0)
-                    paintInfo.context->drawText(TextRun(textStr->characters() + m_start, m_len), IntPoint(m_x + tx, m_y + ty + m_baseline), textStyle,  0, sPos);
+                    paintInfo.context->drawText(TextRun(textStr->characters() + m_start, m_len), IntPoint(m_x + tx, m_y + ty + m_baseline), fontStyle,  0, sPos);
                 if (ePos < m_start + m_len)
-                    paintInfo.context->drawText(TextRun(textStr->characters() + m_start, m_len), IntPoint(m_x + tx, m_y + ty + m_baseline), textStyle, ePos);
+                    paintInfo.context->drawText(TextRun(textStr->characters() + m_start, m_len), IntPoint(m_x + tx, m_y + ty + m_baseline), fontStyle, ePos);
             }
         }
 
@@ -409,7 +409,7 @@ void InlineTextBox::paint(RenderObject::PaintInfo& paintInfo, int tx, int ty)
             if (selectionTextShadow)
                 paintInfo.context->setShadow(IntSize(selectionTextShadow->x, selectionTextShadow->y),
                                              selectionTextShadow->blur, selectionTextShadow->color);
-            paintInfo.context->drawText(TextRun(textStr->characters() + m_start, m_len), IntPoint(m_x + tx, m_y + ty + m_baseline), textStyle, sPos, ePos);
+            paintInfo.context->drawText(TextRun(textStr->characters() + m_start, m_len), IntPoint(m_x + tx, m_y + ty + m_baseline), fontStyle, sPos, ePos);
             if (selectionTextShadow)
                 paintInfo.context->clearShadow();
                 
@@ -502,7 +502,7 @@ void InlineTextBox::paintSelection(GraphicsContext* p, int tx, int ty, RenderSty
     int h = selectionHeight();
     p->clip(IntRect(m_x + tx, y + ty, m_width, h));
     p->drawHighlightForText(TextRun(textObject()->text()->characters() + m_start, m_len), IntPoint(m_x + tx, y + ty), h, 
-                            TextStyle(textObject()->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride || style->visuallyOrdered()), c,
+                            FontStyle(textObject()->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride || style->visuallyOrdered()), c,
                             sPos, ePos);
     p->restore();
 }
@@ -526,7 +526,7 @@ void InlineTextBox::paintCompositionBackground(GraphicsContext* p, int tx, int t
     int h = selectionHeight();
     p->drawHighlightForText(TextRun(textObject()->text()->characters() + m_start, m_len),
                             IntPoint(m_x + tx, y + ty), h, 
-                            TextStyle(textObject()->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride || style->visuallyOrdered()), c, sPos, ePos);
+                            FontStyle(textObject()->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride || style->visuallyOrdered()), c, sPos, ePos);
     p->restore();
 }
 
@@ -613,11 +613,11 @@ void InlineTextBox::paintSpellingOrGrammarMarker(GraphicsContext* pt, int tx, in
     if (grammar) {
         int y = selectionTop();
         IntPoint startPoint = IntPoint(m_x + tx, y + ty);
-        TextStyle textStyle = TextStyle(textObject()->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride || style->visuallyOrdered());
+        FontStyle fontStyle = FontStyle(textObject()->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride || style->visuallyOrdered());
         int startPosition = max(marker.startOffset - m_start, (unsigned)0);
         int endPosition = min(marker.endOffset - m_start, (unsigned)m_len);    
         TextRun run = TextRun(textObject()->text()->characters() + m_start, m_len);
-        IntRect markerRect = enclosingIntRect(f->selectionRectForText(run, textStyle, startPoint, selectionHeight(), startPosition, endPosition));
+        IntRect markerRect = enclosingIntRect(f->selectionRectForText(run, fontStyle, startPoint, selectionHeight(), startPosition, endPosition));
         object()->document()->setRenderedRectForMarker(object()->node(), marker, markerRect);
     }
     
@@ -650,7 +650,7 @@ void InlineTextBox::paintTextMatchMarker(GraphicsContext* pt, int tx, int ty, Do
     int sPos = max(marker.startOffset - m_start, (unsigned)0);
     int ePos = min(marker.endOffset - m_start, (unsigned)m_len);    
     TextRun run = TextRun(textObject()->text()->characters() + m_start, m_len);
-    TextStyle renderStyle = TextStyle(textObject()->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride || style->visuallyOrdered());
+    FontStyle renderStyle = FontStyle(textObject()->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride || style->visuallyOrdered());
     IntPoint startPoint = IntPoint(m_x + tx, y + ty);
     
     // Always compute and store the rect associated with this marker
@@ -802,7 +802,7 @@ int InlineTextBox::offsetForPosition(int _x, bool includePartialGlyphs) const
     RenderStyle *style = text->style(m_firstLine);
     const Font* f = &style->font();
     return f->offsetForPosition(TextRun(textObject()->text()->characters() + m_start, m_len),
-                                TextStyle(textObject()->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride || style->visuallyOrdered()),
+                                FontStyle(textObject()->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride || style->visuallyOrdered()),
                                 _x - m_x, includePartialGlyphs);
 }
 
@@ -817,7 +817,7 @@ int InlineTextBox::positionForOffset(int offset) const
     int to = m_reversed ? m_len : offset - m_start;
     // FIXME: Do we need to add rightBearing here?
     return enclosingIntRect(f.selectionRectForText(TextRun(text->text()->characters() + m_start, m_len),
-                                                   TextStyle(textObject()->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride),
+                                                   FontStyle(textObject()->allowTabs(), textPos(), m_toAdd, m_reversed, m_dirOverride),
                                                    IntPoint(m_x, 0), 0, from, to)).right();
 }
 
index a8c9144..0315dac 100644 (file)
@@ -31,7 +31,7 @@
 #include "RenderText.h"
 #include "RenderTheme.h"
 #include "RenderView.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 #include <math.h>
 
 using namespace std;
@@ -176,7 +176,7 @@ void RenderFileUploadControl::paintObject(PaintInfo& paintInfo, int tx, int ty)
         const String& displayedFilename = m_fileChooser->basenameForWidth(style()->font(), maxFilenameWidth());        
         unsigned length = displayedFilename.length();
         const UChar* string = displayedFilename.characters();
-        TextStyle textStyle(0, 0, 0, style()->direction() == RTL, style()->unicodeBidi() == Override);
+        FontStyle FontStyle(0, 0, 0, style()->direction() == RTL, style()->unicodeBidi() == Override);
         TextRun textRun(string, length);
         
         // Determine where the filename should be placed
@@ -198,7 +198,7 @@ void RenderFileUploadControl::paintObject(PaintInfo& paintInfo, int tx, int ty)
         paintInfo.context->setFillColor(style()->color());
         
         // Draw the filename
-        paintInfo.context->drawBidiText(textRun, IntPoint(textX, textY), textStyle);
+        paintInfo.context->drawBidiText(textRun, IntPoint(textX, textY), FontStyle);
         
         if (m_fileChooser->icon()) {
             // Determine where the icon should be placed
@@ -235,7 +235,7 @@ void RenderFileUploadControl::calcPrefWidths()
         // Figure out how big the filename space needs to be for a given number of characters
         // (using "0" as the nominal character).
         const UChar ch = '0';
-        float charWidth = style()->font().floatWidth(TextRun(&ch, 1), TextStyle(0, 0, 0, false, false, false));
+        float charWidth = style()->font().floatWidth(TextRun(&ch, 1), FontStyle(0, 0, 0, false, false, false));
         m_maxPrefWidth = (int)ceilf(charWidth * defaultWidthNumChars);
     }
 
index 117a76d..b556f8f 100644 (file)
@@ -38,7 +38,7 @@
 #include "HitTestResult.h"
 #include "Page.h"
 #include "RenderView.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 
 using namespace std;
 
index 9f2dca3..b6601f9 100644 (file)
@@ -46,7 +46,7 @@
 #include "PlatformScrollBar.h" 
 #include "RenderTheme.h"
 #include "RenderView.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 #include <math.h>
 
 using namespace std;
@@ -101,7 +101,7 @@ void RenderListBox::updateFromElement()
         int size = numItems();
         
         float width = 0;
-        TextStyle textStyle(0, 0, 0, false, false, false, false);
+        FontStyle FontStyle(0, 0, 0, false, false, false, false);
         for (int i = 0; i < size; ++i) {
             HTMLElement* element = listItems[i];
             String text;
@@ -117,7 +117,7 @@ void RenderListBox::updateFromElement()
             }
                 
             if (!text.isEmpty()) {
-                float textWidth = itemFont.floatWidth(TextRun(text.impl()), textStyle);
+                float textWidth = itemFont.floatWidth(TextRun(text.impl()), FontStyle);
                 width = max(width, textWidth);
             }
         }
@@ -338,12 +338,12 @@ void RenderListBox::paintItemForeground(PaintInfo& paintInfo, int tx, int ty, in
     
     unsigned length = itemText.length();
     const UChar* string = itemText.characters();
-    TextStyle textStyle(0, 0, 0, itemStyle->direction() == RTL, itemStyle->unicodeBidi() == Override, false, false);
+    FontStyle FontStyle(0, 0, 0, itemStyle->direction() == RTL, itemStyle->unicodeBidi() == Override, false, false);
     TextRun textRun(string, length);
 
     // Draw the item text
     if (itemStyle->visibility() != HIDDEN)
-        paintInfo.context->drawBidiText(textRun, r.location(), textStyle);
+        paintInfo.context->drawBidiText(textRun, r.location(), FontStyle);
 }
 
 void RenderListBox::paintItemBackground(PaintInfo& paintInfo, int tx, int ty, int listIndex)
index 9667cab..370d20b 100644 (file)
@@ -36,7 +36,7 @@
 #include "RenderBR.h"
 #include "RenderText.h"
 #include "RenderTheme.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 #include <math.h>
 
 using namespace std;
@@ -140,7 +140,7 @@ void RenderMenuList::updateOptionsWidth()
         if (element->hasTagName(optionTag)) {
             String text = static_cast<HTMLOptionElement*>(element)->optionText();
             if (!text.isEmpty())
-                maxOptionWidth = max(maxOptionWidth, style()->font().floatWidth(text, TextStyle()));
+                maxOptionWidth = max(maxOptionWidth, style()->font().floatWidth(text, FontStyle()));
         }
     }
 
index de754b0..90b9ee2 100644 (file)
@@ -33,7 +33,7 @@
 #include "RenderLayer.h"
 #include "Text.h"
 #include "TextBreakIterator.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 #include "break_lines.h"
 #include <wtf/AlwaysInline.h>
 
@@ -412,7 +412,7 @@ ALWAYS_INLINE int RenderText::widthFromCache(const Font& f, int start, int len,
         return w;
     }
 
-    return f.width(TextRun(text()->characters() + start, len), TextStyle(allowTabs(), xPos));
+    return f.width(TextRun(text()->characters() + start, len), FontStyle(allowTabs(), xPos));
 }
 
 void RenderText::trimmedPrefWidths(int leadWidth,
@@ -671,7 +671,7 @@ void RenderText::calcPrefWidths(int leadWidth)
                     m_maxWidth = currMaxWidth;
                 currMaxWidth = 0;
             } else {
-                currMaxWidth += f.width(TextRun(txt + i, 1), TextStyle(allowTabs(), leadWidth + currMaxWidth));
+                currMaxWidth += f.width(TextRun(txt + i, 1), FontStyle(allowTabs(), leadWidth + currMaxWidth));
                 needsWordSpacing = isSpace && !previousCharacterIsSpace && i == len - 1;
             }
             ASSERT(lastWordBoundary == i);
@@ -1025,7 +1025,7 @@ unsigned int RenderText::width(unsigned int from, unsigned int len, const Font&
         else
             w = widthFromCache(f, from, len, xPos);
     } else
-        w = f.width(TextRun(text()->characters() + from, len), TextStyle(allowTabs(), xPos));
+        w = f.width(TextRun(text()->characters() + from, len), FontStyle(allowTabs(), xPos));
 
     return w;
 }
index 643a61a..051f3e6 100644 (file)
@@ -46,7 +46,7 @@
 #include "Settings.h"
 #include "Text.h"
 #include "TextIterator.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 #include "htmlediting.h"
 #include "visible_units.h"
 #include <math.h>
@@ -113,7 +113,7 @@ void RenderTextControl::setStyle(RenderStyle* style)
 
     if (m_innerText) {
         RenderBlock* textBlockRenderer = static_cast<RenderBlock*>(m_innerText->renderer());
-        RenderStyle* textBlockStyle = createInnerTextStyle(style);
+        RenderStyle* textBlockStyle = createInnerFontStyle(style);
         // We may have set the width and the height in the old style in layout(). Reset them now to avoid
         // getting a spurious layout hint.
         textBlockRenderer->style()->setHeight(Length());
@@ -156,7 +156,7 @@ RenderStyle* RenderTextControl::createInnerBlockStyle(RenderStyle* startStyle)
     return innerBlockStyle;
 }
 
-RenderStyle* RenderTextControl::createInnerTextStyle(RenderStyle* startStyle)
+RenderStyle* RenderTextControl::createInnerFontStyle(RenderStyle* startStyle)
 {
     RenderStyle* textBlockStyle = new (renderArena()) RenderStyle();
     HTMLGenericFormElement* element = static_cast<HTMLGenericFormElement*>(node());
@@ -344,7 +344,7 @@ void RenderTextControl::createSubtreeIfNeeded()
         RenderStyle* parentStyle = style();
         if (m_innerBlock)
             parentStyle = m_innerBlock->renderer()->style();
-        RenderStyle* textBlockStyle = createInnerTextStyle(parentStyle);
+        RenderStyle* textBlockStyle = createInnerFontStyle(parentStyle);
         textBlockRenderer->setStyle(textBlockStyle);
 
         // Add text block renderer to Render tree
@@ -849,7 +849,7 @@ void RenderTextControl::calcPrefWidths()
         // Figure out how big a text control needs to be for a given number of characters
         // (using "0" as the nominal character).
         const UChar ch = '0';
-        float charWidth = style()->font().floatWidth(TextRun(&ch, 1), TextStyle(0, 0, 0, false, false, false));
+        float charWidth = style()->font().floatWidth(TextRun(&ch, 1), FontStyle(0, 0, 0, false, false, false));
         int factor;
         int scrollbarSize = 0;
         if (m_multiLine) {
index 75d12c8..9cc6f89 100644 (file)
@@ -130,7 +130,7 @@ private:
     virtual FontSelector* fontSelector() const;
 
     RenderStyle* createInnerBlockStyle(RenderStyle* startStyle);
-    RenderStyle* createInnerTextStyle(RenderStyle* startStyle);
+    RenderStyle* createInnerFontStyle(RenderStyle* startStyle);
     RenderStyle* createCancelButtonStyle(RenderStyle* startStyle);
     RenderStyle* createResultsButtonStyle(RenderStyle* startStyle);
 
index 99a5af8..2b385eb 100644 (file)
@@ -35,7 +35,7 @@
 #include "SVGPaintServer.h"
 #include "SVGRootInlineBox.h"
 #include "Text.h"
-#include "TextStyle.h"
+#include "FontStyle.h"
 
 #include <float.h>
 
@@ -74,7