[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
barraclough at apple.com
barraclough at apple.com
Wed Dec 22 11:53:10 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit bbb3cd433f051073ee449a067752d04dbde7e7bf
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 10 17:45:41 2010 +0000
Bug 43786 - Move AtomicStringHash from WebCore to WTF
Also remove deprecated string headers from WebCore/platform/text.
Rubber stamped by Sam Weinig.
JavaScriptCore:
* GNUmakefile.am:
* JavaScriptCore.gypi:
* JavaScriptCore.vcproj/WTF/WTF.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* wtf/text/AtomicString.h:
* wtf/text/AtomicStringHash.h: Copied from WebCore/platform/text/AtomicStringHash.h.
WebCore:
* ForwardingHeaders/wtf/text/AtomicStringHash.h: Added.
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
* bindings/cpp/WebDOMHTMLCollectionCustom.cpp:
* bindings/js/JSCSSStyleDeclarationCustom.cpp:
* bindings/js/JSClipboardCustom.cpp:
* bindings/js/JSDOMApplicationCacheCustom.cpp:
* bindings/js/JSDOMMimeTypeArrayCustom.cpp:
* bindings/js/JSDOMPluginArrayCustom.cpp:
* bindings/js/JSDOMPluginCustom.cpp:
* bindings/js/JSDOMStringMapCustom.cpp:
* bindings/js/JSDOMWindowCustom.cpp:
* bindings/js/JSDataGridColumnListCustom.cpp:
* bindings/js/JSHTMLAllCollectionCustom.cpp:
* bindings/js/JSHTMLCollectionCustom.cpp:
* bindings/js/JSMessagePortCustom.cpp:
* bindings/js/JSNodeListCustom.cpp:
* bindings/scripts/CodeGeneratorCPP.pm:
* bindings/scripts/CodeGeneratorJS.pm:
* bindings/scripts/CodeGeneratorV8.pm:
* bindings/scripts/test/CPP/WebDOMTestCallback.cpp:
* bindings/scripts/test/CPP/WebDOMTestObj.cpp:
* bindings/scripts/test/V8/V8TestInterface.h:
* bindings/scripts/test/V8/V8TestObj.h:
* bindings/v8/ScriptDebugServer.h:
* bindings/v8/V8Binding.cpp:
* bindings/v8/V8Binding.h:
* bridge/jni/v8/JavaClassV8.h:
* css/CSSFontFaceSource.h:
* css/CSSFontSelector.cpp:
* css/CSSFontSelector.h:
* css/CSSNamespace.h:
* css/CSSParser.cpp:
* css/CSSParser.h:
* css/CSSParserValues.h:
* css/CSSStyleSelector.h:
* css/CSSVariablesDeclaration.h:
* css/MediaFeatureNames.h:
* css/MediaQueryExp.h:
* css/WebKitCSSKeyframesRule.h:
* dom/CustomEvent.h:
* dom/Document.cpp:
* dom/Event.cpp:
* dom/Event.h:
* dom/EventNames.h:
* dom/EventTarget.h:
* dom/InputElement.h:
* dom/MessagePort.cpp:
* dom/MessagePort.h:
* dom/NameNodeList.h:
* dom/NodeRareData.h:
* dom/QualifiedName.h:
* dom/ScriptElement.cpp:
* dom/SpaceSplitString.h:
* dom/TagNodeList.h:
* dom/XMLDocumentParser.h:
* editing/EditorCommand.cpp:
* history/mac/HistoryItemMac.mm:
* html/BlobBuilder.cpp:
* html/DataGridColumn.h:
* html/DataGridColumnList.cpp:
* html/HTMLDocument.h:
* html/HTMLInputElement.cpp:
* html/HTMLTokenizer.cpp:
* html/HTMLTokenizer.h:
* html/LegacyPreloadScanner.cpp:
* html/LegacyPreloadScanner.h:
* inspector/InspectorCSSStore.h:
* inspector/InspectorController.h:
* inspector/InspectorDOMAgent.cpp:
* inspector/InspectorDOMAgent.h:
* inspector/InspectorDebuggerAgent.h:
* inspector/InspectorValues.h:
* loader/Cache.h:
* loader/CrossOriginAccessControl.cpp:
* loader/CrossOriginPreflightResultCache.h:
* loader/DocLoader.h:
* loader/ImageLoader.h:
* loader/appcache/ApplicationCache.h:
* loader/appcache/ApplicationCacheStorage.h:
* loader/appcache/DOMApplicationCache.h:
* loader/icon/IconDatabase.h:
* loader/icon/IconRecord.h:
* loader/loader.h:
* notifications/Notification.h:
* page/FrameTree.h:
* page/Page.cpp:
* page/PageGroup.h:
* page/SecurityOrigin.h:
* page/Settings.h:
* page/WindowFeatures.cpp:
* page/animation/AnimationBase.h:
* page/animation/AnimationControllerPrivate.h:
* page/animation/CompositeAnimation.h:
* platform/Cookie.h:
* platform/KURL.cpp:
* platform/KURLGoogle.cpp:
* platform/KURLHash.h:
* platform/Length.cpp:
* platform/LinkHash.cpp:
* platform/LinkHash.h:
* platform/MIMETypeRegistry.cpp:
* platform/MIMETypeRegistry.h:
* platform/SchemeRegistry.h:
* platform/ThreadGlobalData.cpp:
* platform/ThreadGlobalData.h:
* platform/cf/BinaryPropertyList.cpp:
* platform/chromium/SearchPopupMenuChromium.cpp:
* platform/efl/ClipboardEfl.cpp:
* platform/efl/CookieJarEfl.cpp:
* platform/efl/PlatformKeyboardEventEfl.cpp:
* platform/graphics/FontCache.cpp:
* platform/graphics/FontFamily.h:
* platform/graphics/MediaPlayer.h:
* platform/graphics/cg/ImageSourceCGWin.cpp:
* platform/graphics/chromium/FontCacheChromiumWin.cpp:
* platform/graphics/chromium/FontCacheLinux.cpp:
* platform/graphics/chromium/FontUtilsChromiumWin.cpp:
* platform/graphics/chromium/LayerChromium.h:
* platform/graphics/filters/Filter.h:
* platform/graphics/mac/FontPlatformData.h:
* platform/graphics/mac/GraphicsLayerCA.h:
* platform/graphics/qt/FontCacheQt.cpp:
* platform/graphics/win/FontCacheWin.cpp:
* platform/graphics/win/FontPlatformDataCGWin.cpp:
* platform/graphics/win/FontPlatformDataCairoWin.cpp:
* platform/graphics/win/FontPlatformDataWin.cpp:
* platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
* platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp:
* platform/graphics/win/WKCACFLayer.h:
* platform/graphics/wince/FontPlatformData.cpp:
* platform/graphics/wx/FontPlatformData.h:
* platform/gtk/ClipboardGtk.cpp:
* platform/gtk/DataObjectGtk.h:
* platform/haiku/ClipboardHaiku.cpp:
* platform/haiku/CookieJarHaiku.cpp:
* platform/haiku/SearchPopupMenuHaiku.cpp:
* platform/mac/SearchPopupMenuMac.mm:
* platform/mac/ThreadCheck.mm:
* platform/network/CredentialStorage.cpp:
* platform/network/HTTPHeaderMap.h:
* platform/network/cf/DNSCFNet.cpp:
* platform/network/curl/CookieJarCurl.cpp:
* platform/qt/ClipboardQt.cpp:
* platform/text/AtomicString.h: Removed.
* platform/text/AtomicStringHash.h: Removed.
* platform/text/AtomicStringImpl.h: Removed.
* platform/text/AtomicStringKeyedMRUCache.h:
* platform/text/StringBuilder.cpp:
* platform/text/StringHash.h: Removed.
* platform/text/StringImpl.h: Removed.
* platform/text/TextCodecLatin1.cpp:
* platform/text/TextCodecUTF16.cpp:
* platform/text/TextCodecUserDefined.cpp:
* platform/text/cf/HyphenationCF.cpp:
* platform/text/cf/StringImplCF.cpp:
* platform/text/mac/HyphenationMac.mm:
* platform/text/mac/StringImplMac.mm:
* platform/text/transcoder/FontTranscoder.h:
* platform/text/wince/TextCodecWinCE.cpp:
* platform/win/BString.cpp:
* platform/win/ClipboardWin.cpp:
* platform/win/SearchPopupMenuWin.cpp:
* platform/wince/SearchPopupMenuWince.cpp:
* platform/wx/ClipboardWx.cpp:
* plugins/DOMMimeTypeArray.cpp:
* plugins/DOMPlugin.cpp:
* plugins/DOMPluginArray.cpp:
* plugins/PluginDatabase.h:
* plugins/PluginPackage.h:
* plugins/PluginStream.h:
* rendering/RenderApplet.h:
* rendering/RenderText.cpp:
* rendering/style/BindingURI.h:
* rendering/style/ContentData.cpp:
* rendering/style/CounterContent.h:
* rendering/style/CounterDirectives.h:
* rendering/style/KeyframeList.h:
* rendering/style/StyleRareInheritedData.h:
* storage/AbstractDatabase.cpp:
* storage/DatabaseAuthorizer.h:
* storage/DatabaseTracker.h:
* storage/IDBDatabaseBackendImpl.h:
* storage/IDBFactoryBackendImpl.h:
* storage/IDBObjectStoreBackendImpl.h:
* storage/OriginQuotaManager.h:
* storage/OriginUsageRecord.h:
* storage/SQLTransactionCoordinator.h:
* storage/StorageAreaSync.h:
* storage/StorageMap.h:
* storage/StorageNamespaceImpl.cpp:
* storage/chromium/QuotaTracker.h:
* svg/SVGAltGlyphElement.h:
* svg/SVGDocumentExtensions.cpp:
* svg/SVGDocumentExtensions.h:
* svg/SVGFitToViewBox.cpp:
* svg/SVGLangSpace.h:
* svg/animation/SMILTimeContainer.h:
* svg/graphics/filters/SVGFilterBuilder.h:
* websockets/WebSocket.h:
* websockets/WebSocketChannel.cpp:
* websockets/WebSocketHandshake.cpp:
* websockets/WebSocketHandshakeResponse.cpp:
* wml/WMLPageState.h:
* workers/AbstractWorker.h:
* workers/DefaultSharedWorkerRepository.h:
* workers/Worker.h:
* workers/WorkerContext.h:
* xml/XMLHttpRequest.h:
* xml/XMLHttpRequestUpload.cpp:
* xml/XMLHttpRequestUpload.h:
* xml/XPathExpressionNode.h:
* xml/XPathNamespace.h:
* xml/XPathParser.cpp:
* xml/XSLTProcessor.h:
WebKit/chromium:
* src/WebKit.cpp:
* src/WebPageSerializerImpl.h:
* src/WebString.cpp:
WebKit/gtk:
* gdom/ConvertToGCharPrivate.h:
WebKit/wx:
* WebEdit.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65077 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index c7c09b0..ac927d6 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-10 Gavin Barraclough <barraclough at apple.com>
+
+ Rubber stamped by Sam Weinig.
+
+ Bug 43786 - Move AtomicStringHash from WebCore to WTF
+ Also remove deprecated string headers from WebCore/platform/text.
+
+ * GNUmakefile.am:
+ * JavaScriptCore.gypi:
+ * JavaScriptCore.vcproj/WTF/WTF.vcproj:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * wtf/text/AtomicString.h:
+ * wtf/text/AtomicStringHash.h: Copied from WebCore/platform/text/AtomicStringHash.h.
+
2010-08-09 Oliver Hunt <oliver at apple.com>
Fix Qt/ARM again, this time including the other changed file.
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 2ead8e0..fae85e1 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -491,6 +491,7 @@ javascriptcore_sources += \
JavaScriptCore/wtf/TCSystemAlloc.h \
JavaScriptCore/wtf/text/AtomicString.cpp \
JavaScriptCore/wtf/text/AtomicString.h \
+ JavaScriptCore/wtf/text/AtomicStringHash.h \
JavaScriptCore/wtf/text/AtomicStringImpl.h \
JavaScriptCore/wtf/text/CString.cpp \
JavaScriptCore/wtf/text/CString.h \
diff --git a/JavaScriptCore/JavaScriptCore.gypi b/JavaScriptCore/JavaScriptCore.gypi
index a85d11c..12614d0 100644
--- a/JavaScriptCore/JavaScriptCore.gypi
+++ b/JavaScriptCore/JavaScriptCore.gypi
@@ -445,6 +445,7 @@
'wtf/TypeTraits.h',
'wtf/text/AtomicString.cpp',
'wtf/text/AtomicString.h',
+ 'wtf/text/AtomicStringHash.h',
'wtf/text/AtomicStringImpl.h',
'wtf/text/CString.cpp',
'wtf/text/CString.h',
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
index 9d551d0..aedc122 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
@@ -577,6 +577,10 @@
>
</File>
<File
+ RelativePath="..\..\wtf\text\AtomicStringHash.h"
+ >
+ </File>
+ <File
RelativePath="..\..\wtf\text\AtomicStringImpl.h"
>
</File>
diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index de3afaa..1402a98 100644
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -255,6 +255,7 @@
86EAC49A0F93E8D1008EC948 /* RegexJIT.h in Headers */ = {isa = PBXBuildFile; fileRef = 86EAC4920F93E8D1008EC948 /* RegexJIT.h */; };
86EAC49B0F93E8D1008EC948 /* RegexParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 86EAC4930F93E8D1008EC948 /* RegexParser.h */; };
86EAC49C0F93E8D1008EC948 /* RegexPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = 86EAC4940F93E8D1008EC948 /* RegexPattern.h */; };
+ 86F38859121130CA007A7CE3 /* AtomicStringHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 86F38858121130CA007A7CE3 /* AtomicStringHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
905B02AE0E28640F006DF882 /* RefCountedLeakCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 905B02AD0E28640F006DF882 /* RefCountedLeakCounter.cpp */; };
90D3469C0E285280009492EE /* RefCountedLeakCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 90D3469B0E285280009492EE /* RefCountedLeakCounter.h */; settings = {ATTRIBUTES = (Private, ); }; };
93052C340FB792190048FDC3 /* ParserArena.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93052C320FB792190048FDC3 /* ParserArena.cpp */; };
@@ -842,6 +843,7 @@
86EAC4920F93E8D1008EC948 /* RegexJIT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegexJIT.h; path = yarr/RegexJIT.h; sourceTree = "<group>"; };
86EAC4930F93E8D1008EC948 /* RegexParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegexParser.h; path = yarr/RegexParser.h; sourceTree = "<group>"; };
86EAC4940F93E8D1008EC948 /* RegexPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegexPattern.h; path = yarr/RegexPattern.h; sourceTree = "<group>"; };
+ 86F38858121130CA007A7CE3 /* AtomicStringHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AtomicStringHash.h; path = text/AtomicStringHash.h; sourceTree = "<group>"; };
905B02AD0E28640F006DF882 /* RefCountedLeakCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RefCountedLeakCounter.cpp; sourceTree = "<group>"; };
90D3469B0E285280009492EE /* RefCountedLeakCounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefCountedLeakCounter.h; sourceTree = "<group>"; };
9303F567099118FA00AD71B8 /* OwnPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OwnPtr.h; sourceTree = "<group>"; };
@@ -1784,6 +1786,7 @@
children = (
868BFA00117CEFD100B908B1 /* AtomicString.cpp */,
868BFA01117CEFD100B908B1 /* AtomicString.h */,
+ 86F38858121130CA007A7CE3 /* AtomicStringHash.h */,
868BFA02117CEFD100B908B1 /* AtomicStringImpl.h */,
86565740115BE3DA00291F40 /* CString.cpp */,
86565741115BE3DA00291F40 /* CString.h */,
@@ -2229,6 +2232,7 @@
DDF7ABD411F60ED200108E36 /* GCActivityCallback.h in Headers */,
DD2724691208D1FF00F9ABE7 /* AlignedMemoryAllocator.h in Headers */,
DDE82AD81209D955005C1756 /* GCHandle.h in Headers */,
+ 86F38859121130CA007A7CE3 /* AtomicStringHash.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/JavaScriptCore/wtf/text/AtomicString.h b/JavaScriptCore/wtf/text/AtomicString.h
index d29981a..24c9ed1 100644
--- a/JavaScriptCore/wtf/text/AtomicString.h
+++ b/JavaScriptCore/wtf/text/AtomicString.h
@@ -32,14 +32,10 @@
#define ATOMICSTRING_CONVERSION
#endif
-// FIXME: this should be in WTF, too!
-namespace WebCore {
-struct AtomicStringHash;
-}
-using WebCore::AtomicStringHash;
-
namespace WTF {
+struct AtomicStringHash;
+
class AtomicString {
public:
static void init();
diff --git a/JavaScriptCore/wtf/text/AtomicStringHash.h b/JavaScriptCore/wtf/text/AtomicStringHash.h
new file mode 100644
index 0000000..f6e4ad1
--- /dev/null
+++ b/JavaScriptCore/wtf/text/AtomicStringHash.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2008 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef AtomicStringHash_h
+#define AtomicStringHash_h
+
+#include <wtf/text/AtomicString.h>
+#include <wtf/HashTraits.h>
+
+namespace WTF {
+
+ struct AtomicStringHash {
+ static unsigned hash(const AtomicString& key)
+ {
+ return key.impl()->existingHash();
+ }
+
+ static bool equal(const AtomicString& a, const AtomicString& b)
+ {
+ return a == b;
+ }
+
+ static const bool safeToCompareToEmptyOrDeleted = false;
+ };
+
+ // AtomicStringHash is the default hash for AtomicString
+ template<> struct HashTraits<WTF::AtomicString> : GenericHashTraits<WTF::AtomicString> {
+ static const bool emptyValueIsZero = true;
+ static void constructDeletedValue(WTF::AtomicString& slot) { new (&slot) WTF::AtomicString(HashTableDeletedValue); }
+ static bool isDeletedValue(const WTF::AtomicString& slot) { return slot.isHashTableDeletedValue(); }
+ };
+
+}
+
+using WTF::AtomicStringHash;
+
+#endif
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3c3caa5..42c4750 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,230 @@
+2010-08-10 Gavin Barraclough <barraclough at apple.com>
+
+ Rubber stamped by Sam Weinig.
+
+ Bug 43786 - Move AtomicStringHash from WebCore to WTF
+ Also remove deprecated string headers from WebCore/platform/text.
+
+ * ForwardingHeaders/wtf/text/AtomicStringHash.h: Added.
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+ * bindings/cpp/WebDOMHTMLCollectionCustom.cpp:
+ * bindings/js/JSCSSStyleDeclarationCustom.cpp:
+ * bindings/js/JSClipboardCustom.cpp:
+ * bindings/js/JSDOMApplicationCacheCustom.cpp:
+ * bindings/js/JSDOMMimeTypeArrayCustom.cpp:
+ * bindings/js/JSDOMPluginArrayCustom.cpp:
+ * bindings/js/JSDOMPluginCustom.cpp:
+ * bindings/js/JSDOMStringMapCustom.cpp:
+ * bindings/js/JSDOMWindowCustom.cpp:
+ * bindings/js/JSDataGridColumnListCustom.cpp:
+ * bindings/js/JSHTMLAllCollectionCustom.cpp:
+ * bindings/js/JSHTMLCollectionCustom.cpp:
+ * bindings/js/JSMessagePortCustom.cpp:
+ * bindings/js/JSNodeListCustom.cpp:
+ * bindings/scripts/CodeGeneratorCPP.pm:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ * bindings/scripts/CodeGeneratorV8.pm:
+ * bindings/scripts/test/CPP/WebDOMTestCallback.cpp:
+ * bindings/scripts/test/CPP/WebDOMTestObj.cpp:
+ * bindings/scripts/test/V8/V8TestInterface.h:
+ * bindings/scripts/test/V8/V8TestObj.h:
+ * bindings/v8/ScriptDebugServer.h:
+ * bindings/v8/V8Binding.cpp:
+ * bindings/v8/V8Binding.h:
+ * bridge/jni/v8/JavaClassV8.h:
+ * css/CSSFontFaceSource.h:
+ * css/CSSFontSelector.cpp:
+ * css/CSSFontSelector.h:
+ * css/CSSNamespace.h:
+ * css/CSSParser.cpp:
+ * css/CSSParser.h:
+ * css/CSSParserValues.h:
+ * css/CSSStyleSelector.h:
+ * css/CSSVariablesDeclaration.h:
+ * css/MediaFeatureNames.h:
+ * css/MediaQueryExp.h:
+ * css/WebKitCSSKeyframesRule.h:
+ * dom/CustomEvent.h:
+ * dom/Document.cpp:
+ * dom/Event.cpp:
+ * dom/Event.h:
+ * dom/EventNames.h:
+ * dom/EventTarget.h:
+ * dom/InputElement.h:
+ * dom/MessagePort.cpp:
+ * dom/MessagePort.h:
+ * dom/NameNodeList.h:
+ * dom/NodeRareData.h:
+ * dom/QualifiedName.h:
+ * dom/ScriptElement.cpp:
+ * dom/SpaceSplitString.h:
+ * dom/TagNodeList.h:
+ * dom/XMLDocumentParser.h:
+ * editing/EditorCommand.cpp:
+ * history/mac/HistoryItemMac.mm:
+ * html/BlobBuilder.cpp:
+ * html/DataGridColumn.h:
+ * html/DataGridColumnList.cpp:
+ * html/HTMLDocument.h:
+ * html/HTMLInputElement.cpp:
+ * html/HTMLTokenizer.cpp:
+ * html/HTMLTokenizer.h:
+ * html/LegacyPreloadScanner.cpp:
+ * html/LegacyPreloadScanner.h:
+ * inspector/InspectorCSSStore.h:
+ * inspector/InspectorController.h:
+ * inspector/InspectorDOMAgent.cpp:
+ * inspector/InspectorDOMAgent.h:
+ * inspector/InspectorDebuggerAgent.h:
+ * inspector/InspectorValues.h:
+ * loader/Cache.h:
+ * loader/CrossOriginAccessControl.cpp:
+ * loader/CrossOriginPreflightResultCache.h:
+ * loader/DocLoader.h:
+ * loader/ImageLoader.h:
+ * loader/appcache/ApplicationCache.h:
+ * loader/appcache/ApplicationCacheStorage.h:
+ * loader/appcache/DOMApplicationCache.h:
+ * loader/icon/IconDatabase.h:
+ * loader/icon/IconRecord.h:
+ * loader/loader.h:
+ * notifications/Notification.h:
+ * page/FrameTree.h:
+ * page/Page.cpp:
+ * page/PageGroup.h:
+ * page/SecurityOrigin.h:
+ * page/Settings.h:
+ * page/WindowFeatures.cpp:
+ * page/animation/AnimationBase.h:
+ * page/animation/AnimationControllerPrivate.h:
+ * page/animation/CompositeAnimation.h:
+ * platform/Cookie.h:
+ * platform/KURL.cpp:
+ * platform/KURLGoogle.cpp:
+ * platform/KURLHash.h:
+ * platform/Length.cpp:
+ * platform/LinkHash.cpp:
+ * platform/LinkHash.h:
+ * platform/MIMETypeRegistry.cpp:
+ * platform/MIMETypeRegistry.h:
+ * platform/SchemeRegistry.h:
+ * platform/ThreadGlobalData.cpp:
+ * platform/ThreadGlobalData.h:
+ * platform/cf/BinaryPropertyList.cpp:
+ * platform/chromium/SearchPopupMenuChromium.cpp:
+ * platform/efl/ClipboardEfl.cpp:
+ * platform/efl/CookieJarEfl.cpp:
+ * platform/efl/PlatformKeyboardEventEfl.cpp:
+ * platform/graphics/FontCache.cpp:
+ * platform/graphics/FontFamily.h:
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/cg/ImageSourceCGWin.cpp:
+ * platform/graphics/chromium/FontCacheChromiumWin.cpp:
+ * platform/graphics/chromium/FontCacheLinux.cpp:
+ * platform/graphics/chromium/FontUtilsChromiumWin.cpp:
+ * platform/graphics/chromium/LayerChromium.h:
+ * platform/graphics/filters/Filter.h:
+ * platform/graphics/mac/FontPlatformData.h:
+ * platform/graphics/mac/GraphicsLayerCA.h:
+ * platform/graphics/qt/FontCacheQt.cpp:
+ * platform/graphics/win/FontCacheWin.cpp:
+ * platform/graphics/win/FontPlatformDataCGWin.cpp:
+ * platform/graphics/win/FontPlatformDataCairoWin.cpp:
+ * platform/graphics/win/FontPlatformDataWin.cpp:
+ * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
+ * platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp:
+ * platform/graphics/win/WKCACFLayer.h:
+ * platform/graphics/wince/FontPlatformData.cpp:
+ * platform/graphics/wx/FontPlatformData.h:
+ * platform/gtk/ClipboardGtk.cpp:
+ * platform/gtk/DataObjectGtk.h:
+ * platform/haiku/ClipboardHaiku.cpp:
+ * platform/haiku/CookieJarHaiku.cpp:
+ * platform/haiku/SearchPopupMenuHaiku.cpp:
+ * platform/mac/SearchPopupMenuMac.mm:
+ * platform/mac/ThreadCheck.mm:
+ * platform/network/CredentialStorage.cpp:
+ * platform/network/HTTPHeaderMap.h:
+ * platform/network/cf/DNSCFNet.cpp:
+ * platform/network/curl/CookieJarCurl.cpp:
+ * platform/qt/ClipboardQt.cpp:
+ * platform/text/AtomicString.h: Removed.
+ * platform/text/AtomicStringHash.h: Removed.
+ * platform/text/AtomicStringImpl.h: Removed.
+ * platform/text/AtomicStringKeyedMRUCache.h:
+ * platform/text/StringBuilder.cpp:
+ * platform/text/StringHash.h: Removed.
+ * platform/text/StringImpl.h: Removed.
+ * platform/text/TextCodecLatin1.cpp:
+ * platform/text/TextCodecUTF16.cpp:
+ * platform/text/TextCodecUserDefined.cpp:
+ * platform/text/cf/HyphenationCF.cpp:
+ * platform/text/cf/StringImplCF.cpp:
+ * platform/text/mac/HyphenationMac.mm:
+ * platform/text/mac/StringImplMac.mm:
+ * platform/text/transcoder/FontTranscoder.h:
+ * platform/text/wince/TextCodecWinCE.cpp:
+ * platform/win/BString.cpp:
+ * platform/win/ClipboardWin.cpp:
+ * platform/win/SearchPopupMenuWin.cpp:
+ * platform/wince/SearchPopupMenuWince.cpp:
+ * platform/wx/ClipboardWx.cpp:
+ * plugins/DOMMimeTypeArray.cpp:
+ * plugins/DOMPlugin.cpp:
+ * plugins/DOMPluginArray.cpp:
+ * plugins/PluginDatabase.h:
+ * plugins/PluginPackage.h:
+ * plugins/PluginStream.h:
+ * rendering/RenderApplet.h:
+ * rendering/RenderText.cpp:
+ * rendering/style/BindingURI.h:
+ * rendering/style/ContentData.cpp:
+ * rendering/style/CounterContent.h:
+ * rendering/style/CounterDirectives.h:
+ * rendering/style/KeyframeList.h:
+ * rendering/style/StyleRareInheritedData.h:
+ * storage/AbstractDatabase.cpp:
+ * storage/DatabaseAuthorizer.h:
+ * storage/DatabaseTracker.h:
+ * storage/IDBDatabaseBackendImpl.h:
+ * storage/IDBFactoryBackendImpl.h:
+ * storage/IDBObjectStoreBackendImpl.h:
+ * storage/OriginQuotaManager.h:
+ * storage/OriginUsageRecord.h:
+ * storage/SQLTransactionCoordinator.h:
+ * storage/StorageAreaSync.h:
+ * storage/StorageMap.h:
+ * storage/StorageNamespaceImpl.cpp:
+ * storage/chromium/QuotaTracker.h:
+ * svg/SVGAltGlyphElement.h:
+ * svg/SVGDocumentExtensions.cpp:
+ * svg/SVGDocumentExtensions.h:
+ * svg/SVGFitToViewBox.cpp:
+ * svg/SVGLangSpace.h:
+ * svg/animation/SMILTimeContainer.h:
+ * svg/graphics/filters/SVGFilterBuilder.h:
+ * websockets/WebSocket.h:
+ * websockets/WebSocketChannel.cpp:
+ * websockets/WebSocketHandshake.cpp:
+ * websockets/WebSocketHandshakeResponse.cpp:
+ * wml/WMLPageState.h:
+ * workers/AbstractWorker.h:
+ * workers/DefaultSharedWorkerRepository.h:
+ * workers/Worker.h:
+ * workers/WorkerContext.h:
+ * xml/XMLHttpRequest.h:
+ * xml/XMLHttpRequestUpload.cpp:
+ * xml/XMLHttpRequestUpload.h:
+ * xml/XPathExpressionNode.h:
+ * xml/XPathNamespace.h:
+ * xml/XPathParser.cpp:
+ * xml/XSLTProcessor.h:
+
2010-08-10 Pavel Feldman <pfeldman at chromium.org>
Not reviewed. Adding changes that escaped from r65072.
diff --git a/WebCore/ForwardingHeaders/wtf/text/AtomicStringHash.h b/WebCore/ForwardingHeaders/wtf/text/AtomicStringHash.h
new file mode 100644
index 0000000..3ca1b77
--- /dev/null
+++ b/WebCore/ForwardingHeaders/wtf/text/AtomicStringHash.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_AtomicStringHash_h
+#define WebCore_FWD_AtomicStringHash_h
+#include <JavaScriptCore/AtomicStringHash.h>
+#endif
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 388b687..065c056 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2106,8 +2106,6 @@ webcore_sources += \
WebCore/platform/network/ResourceRequestBase.h \
WebCore/platform/network/ResourceResponseBase.cpp \
WebCore/platform/network/ResourceResponseBase.h \
- WebCore/platform/text/AtomicString.h \
- WebCore/platform/text/AtomicStringHash.h \
WebCore/platform/text/AtomicStringImpl.h \
WebCore/platform/text/Base64.cpp \
WebCore/platform/text/Base64.h \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 33645b5..9583e3a 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2854,8 +2854,6 @@
'platform/text/transcoder/FontTranscoder.h',
'platform/text/win/TextBreakIteratorInternalICUWin.cpp',
'platform/text/wx/StringWx.cpp',
- 'platform/text/AtomicString.h',
- 'platform/text/AtomicStringHash.h',
'platform/text/AtomicStringImpl.h',
'platform/text/Base64.cpp',
'platform/text/Base64.h',
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 652d443..f3c084c 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1744,7 +1744,6 @@ HEADERS += \
platform/sql/SQLiteStatement.h \
platform/sql/SQLiteTransaction.h \
platform/sql/SQLValue.h \
- platform/text/AtomicString.h \
platform/text/Base64.h \
platform/text/BidiContext.h \
platform/text/Hyphenation.h \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index c309955..7333067 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -27152,14 +27152,6 @@
Name="text"
>
<File
- RelativePath="..\platform\text\AtomicString.h"
- >
- </File>
- <File
- RelativePath="..\platform\text\AtomicStringHash.h"
- >
- </File>
- <File
RelativePath="..\platform\text\AtomicStringImpl.h"
>
</File>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 9e54ab5..403e006 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -237,7 +237,6 @@
0F69B9CA120FE1D6000E1FC7 /* RenderMathMLFenced.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F69B9C8120FE1D6000E1FC7 /* RenderMathMLFenced.h */; };
0F6ECD450F252F3700BDE271 /* CSSPropertyLonghand.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6ECD430F252F3700BDE271 /* CSSPropertyLonghand.h */; };
0F6ECD460F252F3700BDE271 /* CSSPropertyLonghand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F6ECD440F252F3700BDE271 /* CSSPropertyLonghand.cpp */; };
- 0FC705210EB1815600B90AD8 /* AtomicStringHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC705200EB1815600B90AD8 /* AtomicStringHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
0FCF33240F2B9715004B6795 /* ColorCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FCF33230F2B9715004B6795 /* ColorCG.cpp */; };
0FCF332C0F2B9A25004B6795 /* WebTiledLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCF33280F2B9A25004B6795 /* WebTiledLayer.mm */; };
0FCF332D0F2B9A25004B6795 /* WebTiledLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCF33290F2B9A25004B6795 /* WebTiledLayer.h */; };
@@ -4053,8 +4052,6 @@
B2B2645D0D00A77E000ACC1D /* StringImplCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2B2645B0D00A77E000ACC1D /* StringImplCF.cpp */; };
B2B33A5F0B887CEF00C15984 /* SVGCharacterLayoutInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2B33A5D0B887CEF00C15984 /* SVGCharacterLayoutInfo.cpp */; };
B2B33A600B887CEF00C15984 /* SVGCharacterLayoutInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = B2B33A5E0B887CEF00C15984 /* SVGCharacterLayoutInfo.h */; };
- 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 */; };
@@ -4068,8 +4065,6 @@
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, ); }; };
- 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 */; };
@@ -5943,7 +5938,6 @@
0F69B9C8120FE1D6000E1FC7 /* RenderMathMLFenced.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMathMLFenced.h; sourceTree = "<group>"; };
0F6ECD430F252F3700BDE271 /* CSSPropertyLonghand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSPropertyLonghand.h; sourceTree = "<group>"; };
0F6ECD440F252F3700BDE271 /* CSSPropertyLonghand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSPropertyLonghand.cpp; sourceTree = "<group>"; };
- 0FC705200EB1815600B90AD8 /* AtomicStringHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicStringHash.h; sourceTree = "<group>"; };
0FCF33230F2B9715004B6795 /* ColorCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ColorCG.cpp; sourceTree = "<group>"; };
0FCF33280F2B9A25004B6795 /* WebTiledLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebTiledLayer.mm; sourceTree = "<group>"; };
0FCF33290F2B9A25004B6795 /* WebTiledLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebTiledLayer.h; sourceTree = "<group>"; };
@@ -9753,8 +9747,6 @@
B2B2645B0D00A77E000ACC1D /* StringImplCF.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = StringImplCF.cpp; sourceTree = "<group>"; };
B2B33A5D0B887CEF00C15984 /* SVGCharacterLayoutInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGCharacterLayoutInfo.cpp; sourceTree = "<group>"; };
B2B33A5E0B887CEF00C15984 /* SVGCharacterLayoutInfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGCharacterLayoutInfo.h; sourceTree = "<group>"; };
- 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>"; };
@@ -9768,8 +9760,6 @@
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>"; };
- 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>"; };
@@ -15751,9 +15741,6 @@
B2B264590D00A77E000ACC1D /* cf */,
B2C3D9F90D006C1D00EF6F26 /* mac */,
B734B17F119B98DB006587BD /* transcoder */,
- B2C3D9EE0D006C1D00EF6F26 /* AtomicString.h */,
- 0FC705200EB1815600B90AD8 /* AtomicStringHash.h */,
- B2C3D9EF0D006C1D00EF6F26 /* AtomicStringImpl.h */,
37C61F0012095C87007A3C67 /* AtomicStringKeyedMRUCache.h */,
B2C3D9F00D006C1D00EF6F26 /* Base64.cpp */,
B2C3D9F10D006C1D00EF6F26 /* Base64.h */,
@@ -15774,8 +15761,6 @@
939B3E4D0D3C1E8400B4A92B /* StringBuffer.h */,
E1A302C00DE8376900C52F2C /* StringBuilder.cpp */,
E1A302BB0DE8370300C52F2C /* StringBuilder.h */,
- B2C3DA010D006C1D00EF6F26 /* StringHash.h */,
- B2C3DA030D006C1D00EF6F26 /* StringImpl.h */,
97C0784F1165D5BE003A32EF /* SuffixTree.h */,
B2C3DA040D006C1D00EF6F26 /* TextBoundaries.h */,
B2C3DA060D006C1D00EF6F26 /* TextBreakIterator.h */,
@@ -17502,9 +17487,6 @@
49EECDE010503C2400099FAB /* ArrayBufferView.h in Headers */,
B0149E7E11A4B21500196A7B /* AsyncImageResizer.h in Headers */,
8A413AE01207BBA50082016E /* AsyncScriptRunner.h in Headers */,
- B2C3DA1F0D006C1D00EF6F26 /* AtomicString.h in Headers */,
- 0FC705210EB1815600B90AD8 /* AtomicStringHash.h in Headers */,
- B2C3DA200D006C1D00EF6F26 /* AtomicStringImpl.h in Headers */,
37C61F0112095C87007A3C67 /* AtomicStringKeyedMRUCache.h in Headers */,
A8C4A80D09D563270003AC8D /* Attr.h in Headers */,
A8C4A80B09D563270003AC8D /* Attribute.h in Headers */,
@@ -19688,8 +19670,6 @@
C5102D940FD9AA2D00FAFF04 /* StorageSyncManager.h in Headers */,
939B3E4E0D3C1E8400B4A92B /* StringBuffer.h in Headers */,
E1A302BC0DE8370300C52F2C /* StringBuilder.h in Headers */,
- B2C3DA310D006C1D00EF6F26 /* StringHash.h in Headers */,
- B2C3DA330D006C1D00EF6F26 /* StringImpl.h in Headers */,
65488D6B0DD5A83D009D83B2 /* StringSourceProvider.h in Headers */,
B23540F30D00782E002382FA /* StringTruncator.h in Headers */,
849F77760EFEC6200090849D /* StrokeStyleApplier.h in Headers */,
@@ -20199,7 +20179,6 @@
isa = PBXProject;
buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
compatibilityVersion = "Xcode 2.4";
- developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
diff --git a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
index fd5d6bb..b162346 100644
--- a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
+++ b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
@@ -41,7 +41,6 @@
#include "AccessibilityTableCell.h"
#include "AccessibilityTableColumn.h"
#include "AccessibilityTableRow.h"
-#include "AtomicString.h"
#include "Document.h"
#include "DocumentType.h"
#include "Editor.h"
@@ -58,6 +57,7 @@
#include "RenderText.h"
#include "TextEncoding.h"
#include <wtf/text/CString.h>
+#include <wtf/text/AtomicString.h>
#include <atk/atk.h>
#include <glib.h>
diff --git a/WebCore/bindings/cpp/WebDOMHTMLCollectionCustom.cpp b/WebCore/bindings/cpp/WebDOMHTMLCollectionCustom.cpp
index 3f3378c..a16a329 100644
--- a/WebCore/bindings/cpp/WebDOMHTMLCollectionCustom.cpp
+++ b/WebCore/bindings/cpp/WebDOMHTMLCollectionCustom.cpp
@@ -20,10 +20,10 @@
#include "config.h"
#include "WebDOMHTMLCollection.h"
-#include "AtomicString.h"
#include "HTMLCollection.h"
#include "WebDOMNode.h"
#include <wtf/GetPtr.h>
+#include <wtf/text/AtomicString.h>
WebDOMNode WebDOMHTMLCollection::item(unsigned index)
{
diff --git a/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp b/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp
index 22bfee4..d0097e8 100644
--- a/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp
+++ b/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp
@@ -26,7 +26,6 @@
#include "config.h"
#include "JSCSSStyleDeclarationCustom.h"
-#include "AtomicString.h"
#include "CSSMutableStyleDeclaration.h"
#include "CSSPrimitiveValue.h"
#include "CSSValue.h"
@@ -34,6 +33,7 @@
#include <runtime/StringObjectThatMasqueradesAsUndefined.h>
#include <runtime/StringPrototype.h>
#include <wtf/ASCIICType.h>
+#include <wtf/text/AtomicString.h>
using namespace JSC;
using namespace WTF;
diff --git a/WebCore/bindings/js/JSClipboardCustom.cpp b/WebCore/bindings/js/JSClipboardCustom.cpp
index 9bdffdb..2a8d309 100644
--- a/WebCore/bindings/js/JSClipboardCustom.cpp
+++ b/WebCore/bindings/js/JSClipboardCustom.cpp
@@ -37,10 +37,10 @@
#include "JSNode.h"
#include "Node.h"
#include "PlatformString.h"
-#include "StringHash.h"
#include <runtime/ArrayPrototype.h>
#include <runtime/Error.h>
#include <wtf/HashSet.h>
+#include <wtf/text/StringHash.h>
using namespace JSC;
diff --git a/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp b/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp
index 4d7b6e1..263f2f9 100644
--- a/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp
+++ b/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp
@@ -28,7 +28,6 @@
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-#include "AtomicString.h"
#include "DOMApplicationCache.h"
#include "DOMWindow.h"
#include "Event.h"
@@ -37,6 +36,7 @@
#include "JSDOMWindowCustom.h"
#include "JSEvent.h"
#include "JSEventListener.h"
+#include <wtf/text/AtomicString.h>
using namespace JSC;
diff --git a/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp b/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp
index 2d41843..0194962 100644
--- a/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp
+++ b/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp
@@ -20,9 +20,9 @@
#include "config.h"
#include "JSDOMMimeTypeArray.h"
-#include "AtomicString.h"
#include "DOMMimeTypeArray.h"
#include "JSDOMMimeType.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp b/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp
index abf3148..20ce5e5 100644
--- a/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp
+++ b/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp
@@ -20,9 +20,9 @@
#include "config.h"
#include "JSDOMPluginArray.h"
-#include "AtomicString.h"
#include "DOMPluginArray.h"
#include "JSDOMPlugin.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/bindings/js/JSDOMPluginCustom.cpp b/WebCore/bindings/js/JSDOMPluginCustom.cpp
index c8d187e..319cb3c 100644
--- a/WebCore/bindings/js/JSDOMPluginCustom.cpp
+++ b/WebCore/bindings/js/JSDOMPluginCustom.cpp
@@ -19,9 +19,9 @@
#include "config.h"
#include "JSDOMPlugin.h"
-#include "AtomicString.h"
#include "DOMPlugin.h"
#include "JSDOMMimeType.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/bindings/js/JSDOMStringMapCustom.cpp b/WebCore/bindings/js/JSDOMStringMapCustom.cpp
index 455c7b1..d1c1d69 100644
--- a/WebCore/bindings/js/JSDOMStringMapCustom.cpp
+++ b/WebCore/bindings/js/JSDOMStringMapCustom.cpp
@@ -26,8 +26,8 @@
#include "config.h"
#include "JSDOMStringMap.h"
-#include "AtomicString.h"
#include "DOMStringMap.h"
+#include <wtf/text/AtomicString.h>
using namespace JSC;
diff --git a/WebCore/bindings/js/JSDOMWindowCustom.cpp b/WebCore/bindings/js/JSDOMWindowCustom.cpp
index 252ea93..d38a233 100644
--- a/WebCore/bindings/js/JSDOMWindowCustom.cpp
+++ b/WebCore/bindings/js/JSDOMWindowCustom.cpp
@@ -20,7 +20,6 @@
#include "config.h"
#include "JSDOMWindowCustom.h"
-#include "AtomicString.h"
#include "Chrome.h"
#include "DOMWindow.h"
#include "Document.h"
@@ -87,6 +86,7 @@
#include <runtime/JSFunction.h>
#include <runtime/JSObject.h>
#include <runtime/PrototypeFunction.h>
+#include <wtf/text/AtomicString.h>
using namespace JSC;
diff --git a/WebCore/bindings/js/JSDataGridColumnListCustom.cpp b/WebCore/bindings/js/JSDataGridColumnListCustom.cpp
index 5ee790c..cc41093 100644
--- a/WebCore/bindings/js/JSDataGridColumnListCustom.cpp
+++ b/WebCore/bindings/js/JSDataGridColumnListCustom.cpp
@@ -29,10 +29,10 @@
#include "JSDataGridColumnList.h"
-#include "AtomicString.h"
#include "DataGridColumn.h"
#include "DataGridColumnList.h"
#include "JSDataGridColumn.h"
+#include <wtf/text/AtomicString.h>
using namespace JSC;
diff --git a/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp b/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp
index a504f25..559efe5 100644
--- a/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp
+++ b/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp
@@ -26,7 +26,6 @@
#include "config.h"
#include "JSHTMLAllCollection.h"
-#include "AtomicString.h"
#include "HTMLAllCollection.h"
#include "JSDOMBinding.h"
#include "JSHTMLAllCollection.h"
@@ -36,6 +35,7 @@
#include "StaticNodeList.h"
#include <runtime/JSValue.h>
#include <wtf/Vector.h>
+#include <wtf/text/AtomicString.h>
using namespace JSC;
diff --git a/WebCore/bindings/js/JSHTMLCollectionCustom.cpp b/WebCore/bindings/js/JSHTMLCollectionCustom.cpp
index b0cfd99..7602e2e 100644
--- a/WebCore/bindings/js/JSHTMLCollectionCustom.cpp
+++ b/WebCore/bindings/js/JSHTMLCollectionCustom.cpp
@@ -20,7 +20,6 @@
#include "config.h"
#include "JSHTMLCollection.h"
-#include "AtomicString.h"
#include "HTMLCollection.h"
#include "HTMLOptionsCollection.h"
#include "HTMLAllCollection.h"
@@ -32,6 +31,7 @@
#include "Node.h"
#include "StaticNodeList.h"
#include <wtf/Vector.h>
+#include <wtf/text/AtomicString.h>
using namespace JSC;
diff --git a/WebCore/bindings/js/JSMessagePortCustom.cpp b/WebCore/bindings/js/JSMessagePortCustom.cpp
index 227d6ed..06b4178 100644
--- a/WebCore/bindings/js/JSMessagePortCustom.cpp
+++ b/WebCore/bindings/js/JSMessagePortCustom.cpp
@@ -26,7 +26,6 @@
#include "config.h"
#include "JSMessagePort.h"
-#include "AtomicString.h"
#include "Event.h"
#include "ExceptionCode.h"
#include "Frame.h"
@@ -36,6 +35,7 @@
#include "JSMessagePortCustom.h"
#include "MessagePort.h"
#include <runtime/Error.h>
+#include <wtf/text/AtomicString.h>
using namespace JSC;
diff --git a/WebCore/bindings/js/JSNodeListCustom.cpp b/WebCore/bindings/js/JSNodeListCustom.cpp
index dd59c15..27162ea 100644
--- a/WebCore/bindings/js/JSNodeListCustom.cpp
+++ b/WebCore/bindings/js/JSNodeListCustom.cpp
@@ -26,10 +26,10 @@
#include "config.h"
#include "JSNodeList.h"
-#include "AtomicString.h"
#include "JSNode.h"
#include "Node.h"
#include "NodeList.h"
+#include <wtf/text/AtomicString.h>
using namespace JSC;
diff --git a/WebCore/bindings/scripts/CodeGeneratorCPP.pm b/WebCore/bindings/scripts/CodeGeneratorCPP.pm
index ff63615..7f44d94 100644
--- a/WebCore/bindings/scripts/CodeGeneratorCPP.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorCPP.pm
@@ -284,7 +284,7 @@ sub AddIncludesForType
return if $type =~ /Constructor/;
if ($codeGenerator->IsStringType($type)) {
- $implIncludes{"AtomicString.h"} = 1;
+ $implIncludes{"wtf/text/AtomicString.h"} = 1;
$implIncludes{"KURL.h"} = 1;
$implIncludes{"WebDOMString.h"} = 1;
return;
diff --git a/WebCore/bindings/scripts/CodeGeneratorJS.pm b/WebCore/bindings/scripts/CodeGeneratorJS.pm
index 200a95d..18ac046 100644
--- a/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -450,9 +450,9 @@ sub GenerateGetOwnPropertySlotBody
push(@getOwnPropertySlotImpl, " return true;\n");
push(@getOwnPropertySlotImpl, " }\n");
if ($inlined) {
- $headerIncludes{"AtomicString.h"} = 1;
+ $headerIncludes{"wtf/text/AtomicString.h"} = 1;
} else {
- $implIncludes{"AtomicString.h"} = 1;
+ $implIncludes{"wtf/text/AtomicString.h"} = 1;
}
}
@@ -551,9 +551,9 @@ sub GenerateGetOwnPropertyDescriptorBody
push(@getOwnPropertyDescriptorImpl, " return true;\n");
push(@getOwnPropertyDescriptorImpl, " }\n");
if ($inlined) {
- $headerIncludes{"AtomicString.h"} = 1;
+ $headerIncludes{"wtf/text/AtomicString.h"} = 1;
} else {
- $implIncludes{"AtomicString.h"} = 1;
+ $implIncludes{"wtf/text/AtomicString.h"} = 1;
}
}
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm
index f803c87..310aafb 100644
--- a/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -172,7 +172,7 @@ sub AddIncludesForType
if ($type eq "Plugin" or $type eq "PluginArray" or $type eq "MimeTypeArray") {
# So we can get String -> AtomicString conversion for namedItem().
- $implIncludes{"AtomicString.h"} = 1;
+ $implIncludes{"wtf/text/AtomicString.h"} = 1;
}
}
@@ -231,7 +231,7 @@ sub GenerateHeader
my %headerInclues = ();
$headerIncludes{"$podType.h"} = 1 if $podType and ($podType ne "double" and $podType ne "float" and $podType ne "RGBA32");
- $headerIncludes{"StringHash.h"} = 1;
+ $headerIncludes{"wtf/text/StringHash.h"} = 1;
$headerIncludes{"WrapperTypeInfo.h"} = 1;
my $headerClassInclude = GetHeaderClassInclude($implClassName);
$headerIncludes{$headerClassInclude} = 1 if $headerClassInclude ne "";
diff --git a/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.cpp b/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.cpp
index 7235793..ab364fc 100644
--- a/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.cpp
+++ b/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.cpp
@@ -24,7 +24,6 @@
#include "WebDOMTestCallback.h"
-#include "AtomicString.h"
#include "Class1.h"
#include "Class2.h"
#include "Class3.h"
@@ -37,6 +36,7 @@
#include "WebExceptionHandler.h"
#include <wtf/GetPtr.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/AtomicString.h>
struct WebDOMTestCallback::WebDOMTestCallbackPrivate {
WebDOMTestCallbackPrivate(WebCore::TestCallback* object = 0)
diff --git a/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp b/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp
index 20de4fc..bfe2ec4 100644
--- a/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp
+++ b/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp
@@ -21,7 +21,6 @@
#include "config.h"
#include "WebDOMTestObj.h"
-#include "AtomicString.h"
#include "HTMLNames.h"
#include "IDBKey.h"
#include "KURL.h"
@@ -33,6 +32,7 @@
#include "WebNativeEventListener.h"
#include <wtf/GetPtr.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/AtomicString.h>
struct WebDOMTestObj::WebDOMTestObjPrivate {
WebDOMTestObjPrivate(WebCore::TestObj* object = 0)
diff --git a/WebCore/bindings/scripts/test/V8/V8TestInterface.h b/WebCore/bindings/scripts/test/V8/V8TestInterface.h
index d2192ca..05f5b9d 100644
--- a/WebCore/bindings/scripts/test/V8/V8TestInterface.h
+++ b/WebCore/bindings/scripts/test/V8/V8TestInterface.h
@@ -23,11 +23,11 @@
#ifndef V8TestInterface_h
#define V8TestInterface_h
-#include "StringHash.h"
#include "TestInterface.h"
#include "WrapperTypeInfo.h"
#include <v8.h>
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/bindings/scripts/test/V8/V8TestObj.h b/WebCore/bindings/scripts/test/V8/V8TestObj.h
index 5d6770a..cd5c83e 100644
--- a/WebCore/bindings/scripts/test/V8/V8TestObj.h
+++ b/WebCore/bindings/scripts/test/V8/V8TestObj.h
@@ -21,11 +21,11 @@
#ifndef V8TestObj_h
#define V8TestObj_h
-#include "StringHash.h"
#include "TestObj.h"
#include "WrapperTypeInfo.h"
#include <v8.h>
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/bindings/v8/ScriptDebugServer.h b/WebCore/bindings/v8/ScriptDebugServer.h
index a55388f..57d5566 100644
--- a/WebCore/bindings/v8/ScriptDebugServer.h
+++ b/WebCore/bindings/v8/ScriptDebugServer.h
@@ -36,12 +36,12 @@
#include "JavaScriptCallFrame.h"
#include "PlatformString.h"
#include "ScriptBreakpoint.h"
-#include "StringHash.h"
#include "Timer.h"
#include <v8-debug.h>
#include <wtf/HashMap.h>
#include <wtf/Noncopyable.h>
#include <wtf/PassOwnPtr.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/bindings/v8/V8Binding.cpp b/WebCore/bindings/v8/V8Binding.cpp
index 1272fd4..3799cdb 100644
--- a/WebCore/bindings/v8/V8Binding.cpp
+++ b/WebCore/bindings/v8/V8Binding.cpp
@@ -31,18 +31,18 @@
#include "config.h"
#include "V8Binding.h"
-#include "AtomicString.h"
#include "Element.h"
#include "MathExtras.h"
#include "PlatformString.h"
#include "QualifiedName.h"
#include "StdLibExtras.h"
-#include "StringBuffer.h"
-#include "StringHash.h"
#include "Threading.h"
#include "V8Element.h"
#include "V8Proxy.h"
+#include <wtf/text/AtomicString.h>
#include <wtf/text/CString.h>
+#include <wtf/text/StringBuffer.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/bindings/v8/V8Binding.h b/WebCore/bindings/v8/V8Binding.h
index 4656aa2..087c128 100644
--- a/WebCore/bindings/v8/V8Binding.h
+++ b/WebCore/bindings/v8/V8Binding.h
@@ -31,11 +31,11 @@
#ifndef V8Binding_h
#define V8Binding_h
-#include "AtomicString.h"
#include "BindingSecurity.h"
#include "MathExtras.h"
#include "PlatformString.h"
#include "V8DOMWrapper.h"
+#include <wtf/text/AtomicString.h>
#include <v8.h>
diff --git a/WebCore/bridge/jni/v8/JavaClassV8.h b/WebCore/bridge/jni/v8/JavaClassV8.h
index b7447b2..0c1d627 100644
--- a/WebCore/bridge/jni/v8/JavaClassV8.h
+++ b/WebCore/bridge/jni/v8/JavaClassV8.h
@@ -28,9 +28,9 @@
#include "JNIBridgeV8.h"
#include "PlatformString.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
namespace JSC {
diff --git a/WebCore/css/CSSFontFaceSource.h b/WebCore/css/CSSFontFaceSource.h
index 278ba72..4ec54d6 100644
--- a/WebCore/css/CSSFontFaceSource.h
+++ b/WebCore/css/CSSFontFaceSource.h
@@ -26,10 +26,10 @@
#ifndef CSSFontFaceSource_h
#define CSSFontFaceSource_h
-#include "AtomicString.h"
#include "CachedResourceClient.h"
#include "CachedResourceHandle.h"
#include <wtf/HashMap.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/css/CSSFontSelector.cpp b/WebCore/css/CSSFontSelector.cpp
index 752798d..b98dcae 100644
--- a/WebCore/css/CSSFontSelector.cpp
+++ b/WebCore/css/CSSFontSelector.cpp
@@ -27,7 +27,6 @@
#include "config.h"
#include "CSSFontSelector.h"
-#include "AtomicString.h"
#include "CachedFont.h"
#include "CSSFontFace.h"
#include "CSSFontFaceRule.h"
@@ -48,6 +47,7 @@
#include "RenderObject.h"
#include "Settings.h"
#include "SimpleFontData.h"
+#include <wtf/text/AtomicString.h>
#if ENABLE(SVG)
#include "SVGFontFaceElement.h"
diff --git a/WebCore/css/CSSFontSelector.h b/WebCore/css/CSSFontSelector.h
index d9cce1c..abf82cd 100644
--- a/WebCore/css/CSSFontSelector.h
+++ b/WebCore/css/CSSFontSelector.h
@@ -27,10 +27,10 @@
#define CSSFontSelector_h
#include "FontSelector.h"
-#include "StringHash.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/css/CSSNamespace.h b/WebCore/css/CSSNamespace.h
index 0a1119d..d7fab4c 100644
--- a/WebCore/css/CSSNamespace.h
+++ b/WebCore/css/CSSNamespace.h
@@ -22,7 +22,7 @@
#ifndef CSSNamespace_h
#define CSSNamespace_h
-#include "AtomicString.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index aa6cdd9..d45b3ec 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -66,12 +66,12 @@
#include "Pair.h"
#include "Rect.h"
#include "ShadowValue.h"
-#include "StringBuffer.h"
#include "WebKitCSSKeyframeRule.h"
#include "WebKitCSSKeyframesRule.h"
#include "WebKitCSSTransformValue.h"
#include <limits.h>
#include <wtf/dtoa.h>
+#include <wtf/text/StringBuffer.h>
#if ENABLE(DASHBOARD_SUPPORT)
#include "DashboardRegion.h"
diff --git a/WebCore/css/CSSParser.h b/WebCore/css/CSSParser.h
index 5d76a41..1e233c8 100644
--- a/WebCore/css/CSSParser.h
+++ b/WebCore/css/CSSParser.h
@@ -23,7 +23,6 @@
#ifndef CSSParser_h
#define CSSParser_h
-#include "AtomicString.h"
#include "Color.h"
#include "CSSParserValues.h"
#include "CSSSelectorList.h"
@@ -31,6 +30,7 @@
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/Vector.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/css/CSSParserValues.h b/WebCore/css/CSSParserValues.h
index a421fe0..5c6f55e 100644
--- a/WebCore/css/CSSParserValues.h
+++ b/WebCore/css/CSSParserValues.h
@@ -21,7 +21,7 @@
#ifndef CSSParserValues_h
#define CSSParserValues_h
-#include "AtomicString.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/css/CSSStyleSelector.h b/WebCore/css/CSSStyleSelector.h
index 6e4a26b..ad801da 100644
--- a/WebCore/css/CSSStyleSelector.h
+++ b/WebCore/css/CSSStyleSelector.h
@@ -26,11 +26,11 @@
#include "LinkHash.h"
#include "MediaQueryExp.h"
#include "RenderStyle.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/css/CSSVariablesDeclaration.h b/WebCore/css/CSSVariablesDeclaration.h
index f16b011..6838743 100644
--- a/WebCore/css/CSSVariablesDeclaration.h
+++ b/WebCore/css/CSSVariablesDeclaration.h
@@ -27,11 +27,11 @@
#define CSSVariablesDeclaration_h
#include "PlatformString.h"
-#include "StringHash.h"
#include "StyleBase.h"
#include <wtf/HashMap.h>
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/css/MediaFeatureNames.h b/WebCore/css/MediaFeatureNames.h
index b8f2720..1daa4e9 100644
--- a/WebCore/css/MediaFeatureNames.h
+++ b/WebCore/css/MediaFeatureNames.h
@@ -20,7 +20,7 @@
#ifndef MediaFeatureNames_h
#define MediaFeatureNames_h
-#include "AtomicString.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
namespace MediaFeatureNames {
diff --git a/WebCore/css/MediaQueryExp.h b/WebCore/css/MediaQueryExp.h
index 24f2207..4b42611 100644
--- a/WebCore/css/MediaQueryExp.h
+++ b/WebCore/css/MediaQueryExp.h
@@ -29,10 +29,10 @@
#ifndef MediaQueryExp_h
#define MediaQueryExp_h
-#include "AtomicString.h"
#include "CSSValue.h"
#include "MediaFeatureNames.h"
#include <wtf/RefPtr.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
class CSSParserValueList;
diff --git a/WebCore/css/WebKitCSSKeyframesRule.h b/WebCore/css/WebKitCSSKeyframesRule.h
index 2836942..6ac0243 100644
--- a/WebCore/css/WebKitCSSKeyframesRule.h
+++ b/WebCore/css/WebKitCSSKeyframesRule.h
@@ -29,7 +29,7 @@
#include "CSSRule.h"
#include <wtf/Forward.h>
#include <wtf/RefPtr.h>
-#include "AtomicString.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/dom/CustomEvent.h b/WebCore/dom/CustomEvent.h
index d287a65..8372af2 100644
--- a/WebCore/dom/CustomEvent.h
+++ b/WebCore/dom/CustomEvent.h
@@ -26,9 +26,9 @@
#ifndef CustomEvent_h
#define CustomEvent_h
-#include "AtomicString.h"
#include "Event.h"
#include "ScriptValue.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 8fa2346..0d39854 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -122,7 +122,6 @@
#include "SelectionController.h"
#include "Settings.h"
#include "StaticHashSetNodeList.h"
-#include "StringBuffer.h"
#include "StyleSheetList.h"
#include "TextEvent.h"
#include "TextIterator.h"
@@ -146,6 +145,7 @@
#include <wtf/MainThread.h>
#include <wtf/PassRefPtr.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringBuffer.h>
#if ENABLE(SHARED_WORKERS)
#include "SharedWorkerRepository.h"
diff --git a/WebCore/dom/Event.cpp b/WebCore/dom/Event.cpp
index 1aab5c7..c76f951 100644
--- a/WebCore/dom/Event.cpp
+++ b/WebCore/dom/Event.cpp
@@ -23,9 +23,9 @@
#include "config.h"
#include "Event.h"
-#include "AtomicString.h"
#include "UserGestureIndicator.h"
#include <wtf/CurrentTime.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/dom/Event.h b/WebCore/dom/Event.h
index e18258c..b992237 100644
--- a/WebCore/dom/Event.h
+++ b/WebCore/dom/Event.h
@@ -24,9 +24,9 @@
#ifndef Event_h
#define Event_h
-#include "AtomicString.h"
#include "EventTarget.h"
#include <wtf/RefCounted.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/dom/EventNames.h b/WebCore/dom/EventNames.h
index 455d6ac..5024bdd 100644
--- a/WebCore/dom/EventNames.h
+++ b/WebCore/dom/EventNames.h
@@ -22,8 +22,8 @@
#ifndef EventNames_h
#define EventNames_h
-#include "AtomicString.h"
#include "ThreadGlobalData.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/dom/EventTarget.h b/WebCore/dom/EventTarget.h
index 406c2fd..b4aa542 100644
--- a/WebCore/dom/EventTarget.h
+++ b/WebCore/dom/EventTarget.h
@@ -32,11 +32,11 @@
#ifndef EventTarget_h
#define EventTarget_h
-#include "AtomicStringHash.h"
#include "EventNames.h"
#include "RegisteredEventListener.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
+#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
diff --git a/WebCore/dom/InputElement.h b/WebCore/dom/InputElement.h
index dc87b3d..14cfda2 100644
--- a/WebCore/dom/InputElement.h
+++ b/WebCore/dom/InputElement.h
@@ -21,8 +21,8 @@
#ifndef InputElement_h
#define InputElement_h
-#include "AtomicString.h"
#include "PlatformString.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/dom/MessagePort.cpp b/WebCore/dom/MessagePort.cpp
index 1051920..8d4ed98 100644
--- a/WebCore/dom/MessagePort.cpp
+++ b/WebCore/dom/MessagePort.cpp
@@ -27,7 +27,6 @@
#include "config.h"
#include "MessagePort.h"
-#include "AtomicString.h"
#include "DOMWindow.h"
#include "Document.h"
#include "EventException.h"
@@ -35,6 +34,7 @@
#include "MessageEvent.h"
#include "SecurityOrigin.h"
#include "Timer.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/dom/MessagePort.h b/WebCore/dom/MessagePort.h
index 10426e5..1287834 100644
--- a/WebCore/dom/MessagePort.h
+++ b/WebCore/dom/MessagePort.h
@@ -27,7 +27,6 @@
#ifndef MessagePort_h
#define MessagePort_h
-#include "AtomicStringHash.h"
#include "EventListener.h"
#include "EventTarget.h"
#include "MessagePortChannel.h"
@@ -37,6 +36,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
+#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
diff --git a/WebCore/dom/NameNodeList.h b/WebCore/dom/NameNodeList.h
index b7f5bfc..6a1b22e 100644
--- a/WebCore/dom/NameNodeList.h
+++ b/WebCore/dom/NameNodeList.h
@@ -24,9 +24,9 @@
#ifndef NameNodeList_h
#define NameNodeList_h
-#include "AtomicString.h"
#include "DynamicNodeList.h"
#include <wtf/Forward.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/dom/NodeRareData.h b/WebCore/dom/NodeRareData.h
index 531fc57..ab208d2 100644
--- a/WebCore/dom/NodeRareData.h
+++ b/WebCore/dom/NodeRareData.h
@@ -26,11 +26,11 @@
#include "DynamicNodeList.h"
#include "NameNodeList.h"
#include "QualifiedName.h"
-#include "StringHash.h"
#include "TagNodeList.h"
#include <wtf/HashSet.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/dom/QualifiedName.h b/WebCore/dom/QualifiedName.h
index 4391570..ee90408 100644
--- a/WebCore/dom/QualifiedName.h
+++ b/WebCore/dom/QualifiedName.h
@@ -21,8 +21,8 @@
#ifndef QualifiedName_h
#define QualifiedName_h
-#include "AtomicString.h"
#include <wtf/HashTraits.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/dom/ScriptElement.cpp b/WebCore/dom/ScriptElement.cpp
index 0262e48..8626bb4 100644
--- a/WebCore/dom/ScriptElement.cpp
+++ b/WebCore/dom/ScriptElement.cpp
@@ -39,9 +39,9 @@
#include "ScriptSourceCode.h"
#include "ScriptValue.h"
#include "Settings.h"
-#include "StringHash.h"
#include "Text.h"
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
#if ENABLE(SVG)
#include "SVGNames.h"
diff --git a/WebCore/dom/SpaceSplitString.h b/WebCore/dom/SpaceSplitString.h
index 9fd1832..f49670b 100644
--- a/WebCore/dom/SpaceSplitString.h
+++ b/WebCore/dom/SpaceSplitString.h
@@ -21,10 +21,10 @@
#ifndef SpaceSplitString_h
#define SpaceSplitString_h
-#include "AtomicString.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/Vector.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/dom/TagNodeList.h b/WebCore/dom/TagNodeList.h
index 1b1a038..9053b53 100644
--- a/WebCore/dom/TagNodeList.h
+++ b/WebCore/dom/TagNodeList.h
@@ -24,8 +24,8 @@
#ifndef TagNodeList_h
#define TagNodeList_h
-#include "AtomicString.h"
#include "DynamicNodeList.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/dom/XMLDocumentParser.h b/WebCore/dom/XMLDocumentParser.h
index ddc9260..0b2c63b 100644
--- a/WebCore/dom/XMLDocumentParser.h
+++ b/WebCore/dom/XMLDocumentParser.h
@@ -30,9 +30,9 @@
#include "FragmentScriptingPermission.h"
#include "ScriptableDocumentParser.h"
#include "SegmentedString.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/OwnPtr.h>
+#include <wtf/text/StringHash.h>
#if USE(QXMLSTREAM)
#include <qxmlstream.h>
diff --git a/WebCore/editing/EditorCommand.cpp b/WebCore/editing/EditorCommand.cpp
index 1a77642..eb89593 100644
--- a/WebCore/editing/EditorCommand.cpp
+++ b/WebCore/editing/EditorCommand.cpp
@@ -28,7 +28,6 @@
#include "config.h"
#include "Editor.h"
-#include "AtomicString.h"
#include "CSSComputedStyleDeclaration.h"
#include "CSSMutableStyleDeclaration.h"
#include "CSSPropertyNames.h"
@@ -58,6 +57,7 @@
#include "UnlinkCommand.h"
#include "htmlediting.h"
#include "markup.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/history/mac/HistoryItemMac.mm b/WebCore/history/mac/HistoryItemMac.mm
index 52ae7be..09bf78d 100644
--- a/WebCore/history/mac/HistoryItemMac.mm
+++ b/WebCore/history/mac/HistoryItemMac.mm
@@ -26,7 +26,7 @@
#include "config.h"
#include "HistoryItem.h"
-#include "StringHash.h"
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/html/BlobBuilder.cpp b/WebCore/html/BlobBuilder.cpp
index 0592ff0..29a7595 100644
--- a/WebCore/html/BlobBuilder.cpp
+++ b/WebCore/html/BlobBuilder.cpp
@@ -32,11 +32,11 @@
#include "BlobBuilder.h"
-#include "AtomicString.h"
#include "Blob.h"
#include "ExceptionCode.h"
#include "LineEnding.h"
#include "TextEncoding.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/html/DataGridColumn.h b/WebCore/html/DataGridColumn.h
index 3d480a9..555389c 100644
--- a/WebCore/html/DataGridColumn.h
+++ b/WebCore/html/DataGridColumn.h
@@ -28,10 +28,10 @@
#if ENABLE(DATAGRID)
-#include "AtomicString.h"
#include "RenderStyle.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/html/DataGridColumnList.cpp b/WebCore/html/DataGridColumnList.cpp
index 9613402..15590b2 100644
--- a/WebCore/html/DataGridColumnList.cpp
+++ b/WebCore/html/DataGridColumnList.cpp
@@ -27,11 +27,11 @@
#if ENABLE(DATAGRID)
-#include "AtomicString.h"
#include "DataGridColumnList.h"
#include "HTMLDataGridElement.h"
#include "PlatformString.h"
#include "RenderObject.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/html/HTMLDocument.h b/WebCore/html/HTMLDocument.h
index f51822b..eeabda4 100644
--- a/WebCore/html/HTMLDocument.h
+++ b/WebCore/html/HTMLDocument.h
@@ -23,10 +23,10 @@
#ifndef HTMLDocument_h
#define HTMLDocument_h
-#include "AtomicStringHash.h"
#include "CachedResourceClient.h"
#include "Document.h"
#include <wtf/HashCountedSet.h>
+#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp
index 3a6c984..3488cde 100644
--- a/WebCore/html/HTMLInputElement.cpp
+++ b/WebCore/html/HTMLInputElement.cpp
@@ -65,12 +65,12 @@
#include "RenderTheme.h"
#include "ScriptEventListener.h"
#include "StepRange.h"
-#include "StringHash.h"
#include "TextEvent.h"
#include "WheelEvent.h"
#include <wtf/HashMap.h>
#include <wtf/MathExtras.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
using namespace std;
diff --git a/WebCore/html/HTMLTokenizer.cpp b/WebCore/html/HTMLTokenizer.cpp
index a52aba6..409d462 100644
--- a/WebCore/html/HTMLTokenizer.cpp
+++ b/WebCore/html/HTMLTokenizer.cpp
@@ -28,7 +28,6 @@
#include "config.h"
#include "HTMLTokenizer.h"
-#include "AtomicString.h"
#include "HTMLEntityParser.h"
#include "HTMLToken.h"
#include "HTMLNames.h"
@@ -36,6 +35,7 @@
#include <wtf/ASCIICType.h>
#include <wtf/CurrentTime.h>
#include <wtf/UnusedParam.h>
+#include <wtf/text/AtomicString.h>
#include <wtf/text/CString.h>
#include <wtf/unicode/Unicode.h>
diff --git a/WebCore/html/HTMLTokenizer.h b/WebCore/html/HTMLTokenizer.h
index 0e9ba3a..ca3183f 100644
--- a/WebCore/html/HTMLTokenizer.h
+++ b/WebCore/html/HTMLTokenizer.h
@@ -27,10 +27,10 @@
#ifndef HTMLTokenizer_h
#define HTMLTokenizer_h
-#include "AtomicString.h"
#include "SegmentedString.h"
#include <wtf/Noncopyable.h>
#include <wtf/Vector.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/html/LegacyPreloadScanner.cpp b/WebCore/html/LegacyPreloadScanner.cpp
index c9fda4f..613eb45 100644
--- a/WebCore/html/LegacyPreloadScanner.cpp
+++ b/WebCore/html/LegacyPreloadScanner.cpp
@@ -27,7 +27,6 @@
#include "config.h"
#include "LegacyPreloadScanner.h"
-#include "AtomicString.h"
#include "CachedCSSStyleSheet.h"
#include "CachedImage.h"
#include "CachedResource.h"
@@ -42,6 +41,7 @@
#include "HTMLNames.h"
#include <wtf/text/CString.h>
#include <wtf/CurrentTime.h>
+#include <wtf/text/AtomicString.h>
#include <wtf/unicode/Unicode.h>
// Use __GNUC__ instead of PLATFORM(GCC) to stay consistent with the gperf generated c file
diff --git a/WebCore/html/LegacyPreloadScanner.h b/WebCore/html/LegacyPreloadScanner.h
index 95710ab..333366d 100644
--- a/WebCore/html/LegacyPreloadScanner.h
+++ b/WebCore/html/LegacyPreloadScanner.h
@@ -26,10 +26,10 @@
#ifndef LegacyPreloadScanner_h
#define LegacyPreloadScanner_h
-#include "AtomicString.h"
#include "SegmentedString.h"
#include <wtf/Noncopyable.h>
#include <wtf/Vector.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/inspector/InspectorCSSStore.h b/WebCore/inspector/InspectorCSSStore.h
index 2a05d71..ee435e5 100644
--- a/WebCore/inspector/InspectorCSSStore.h
+++ b/WebCore/inspector/InspectorCSSStore.h
@@ -29,10 +29,10 @@
#ifndef InspectorCSSStore_h
#define InspectorCSSStore_h
-#include "StringHash.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 2125003..59d26ac 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -35,13 +35,13 @@
#include "PlatformString.h"
#include "ScriptProfile.h"
#include "ScriptState.h"
-#include "StringHash.h"
#include "Timer.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/ListHashSet.h>
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/inspector/InspectorDOMAgent.cpp b/WebCore/inspector/InspectorDOMAgent.cpp
index 7cf0a82..17bc59b 100644
--- a/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/WebCore/inspector/InspectorDOMAgent.cpp
@@ -33,7 +33,6 @@
#if ENABLE(INSPECTOR)
-#include "AtomicString.h"
#include "CSSComputedStyleDeclaration.h"
#include "CSSMutableStyleDeclaration.h"
#include "CSSRule.h"
@@ -78,6 +77,7 @@
#include <wtf/ListHashSet.h>
#include <wtf/OwnPtr.h>
#include <wtf/Vector.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/inspector/InspectorDOMAgent.h b/WebCore/inspector/InspectorDOMAgent.h
index bae65f5..5317a22 100644
--- a/WebCore/inspector/InspectorDOMAgent.h
+++ b/WebCore/inspector/InspectorDOMAgent.h
@@ -30,7 +30,6 @@
#ifndef InspectorDOMAgent_h
#define InspectorDOMAgent_h
-#include "AtomicString.h"
#include "Document.h"
#include "EventListener.h"
#include "EventTarget.h"
@@ -46,6 +45,7 @@
#include <wtf/HashSet.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
class ContainerNode;
diff --git a/WebCore/inspector/InspectorDebuggerAgent.h b/WebCore/inspector/InspectorDebuggerAgent.h
index 5428eb2..2cfbf55 100644
--- a/WebCore/inspector/InspectorDebuggerAgent.h
+++ b/WebCore/inspector/InspectorDebuggerAgent.h
@@ -34,10 +34,10 @@
#include "ScriptBreakpoint.h"
#include "ScriptDebugListener.h"
#include "ScriptState.h"
-#include "StringHash.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/PassOwnPtr.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
class InjectedScriptHost;
diff --git a/WebCore/inspector/InspectorValues.h b/WebCore/inspector/InspectorValues.h
index f6556d7..e523032 100644
--- a/WebCore/inspector/InspectorValues.h
+++ b/WebCore/inspector/InspectorValues.h
@@ -34,12 +34,12 @@
#if ENABLE(INSPECTOR)
#include "PlatformString.h"
-#include "StringHash.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/loader/Cache.h b/WebCore/loader/Cache.h
index 1ccd86d..bb86e60 100644
--- a/WebCore/loader/Cache.h
+++ b/WebCore/loader/Cache.h
@@ -28,12 +28,12 @@
#include "CachePolicy.h"
#include "CachedResource.h"
#include "PlatformString.h"
-#include "StringHash.h"
#include "loader.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/Noncopyable.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/loader/CrossOriginAccessControl.cpp b/WebCore/loader/CrossOriginAccessControl.cpp
index f019f28..630f2b7 100644
--- a/WebCore/loader/CrossOriginAccessControl.cpp
+++ b/WebCore/loader/CrossOriginAccessControl.cpp
@@ -27,11 +27,11 @@
#include "config.h"
#include "CrossOriginAccessControl.h"
-#include "AtomicString.h"
#include "HTTPParsers.h"
#include "ResourceResponse.h"
#include "SecurityOrigin.h"
#include <wtf/Threading.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/loader/CrossOriginPreflightResultCache.h b/WebCore/loader/CrossOriginPreflightResultCache.h
index 0f3e356..1016aed 100644
--- a/WebCore/loader/CrossOriginPreflightResultCache.h
+++ b/WebCore/loader/CrossOriginPreflightResultCache.h
@@ -28,10 +28,10 @@
#define CrossOriginPreflightResultCache_h
#include "KURLHash.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/PassOwnPtr.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/loader/DocLoader.h b/WebCore/loader/DocLoader.h
index 2e88797..138a9f4 100644
--- a/WebCore/loader/DocLoader.h
+++ b/WebCore/loader/DocLoader.h
@@ -29,10 +29,10 @@
#include "CachedResource.h"
#include "CachedResourceHandle.h"
#include "CachePolicy.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/ListHashSet.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/loader/ImageLoader.h b/WebCore/loader/ImageLoader.h
index a585354..02ddce8 100644
--- a/WebCore/loader/ImageLoader.h
+++ b/WebCore/loader/ImageLoader.h
@@ -23,9 +23,9 @@
#ifndef ImageLoader_h
#define ImageLoader_h
-#include "AtomicString.h"
#include "CachedResourceClient.h"
#include "CachedResourceHandle.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/loader/appcache/ApplicationCache.h b/WebCore/loader/appcache/ApplicationCache.h
index d6e15ed..f073499 100644
--- a/WebCore/loader/appcache/ApplicationCache.h
+++ b/WebCore/loader/appcache/ApplicationCache.h
@@ -29,11 +29,11 @@
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
#include "PlatformString.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/loader/appcache/ApplicationCacheStorage.h b/WebCore/loader/appcache/ApplicationCacheStorage.h
index c990fa7..7db34e6 100644
--- a/WebCore/loader/appcache/ApplicationCacheStorage.h
+++ b/WebCore/loader/appcache/ApplicationCacheStorage.h
@@ -30,9 +30,8 @@
#include "PlatformString.h"
#include "SQLiteDatabase.h"
-#include "StringHash.h"
-
#include <wtf/HashCountedSet.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/loader/appcache/DOMApplicationCache.h b/WebCore/loader/appcache/DOMApplicationCache.h
index de0614a..2a806fa 100644
--- a/WebCore/loader/appcache/DOMApplicationCache.h
+++ b/WebCore/loader/appcache/DOMApplicationCache.h
@@ -29,7 +29,6 @@
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
#include "ApplicationCacheHost.h"
-#include "AtomicStringHash.h"
#include "EventListener.h"
#include "EventNames.h"
#include "EventTarget.h"
@@ -38,6 +37,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
+#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
diff --git a/WebCore/loader/icon/IconDatabase.h b/WebCore/loader/icon/IconDatabase.h
index 44ef22a..9793d21 100644
--- a/WebCore/loader/icon/IconDatabase.h
+++ b/WebCore/loader/icon/IconDatabase.h
@@ -27,12 +27,12 @@
#ifndef IconDatabase_h
#define IconDatabase_h
-#include "StringHash.h"
#include "Timer.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/Noncopyable.h>
#include <wtf/OwnPtr.h>
+#include <wtf/text/StringHash.h>
#if ENABLE(ICONDATABASE)
#include "SQLiteDatabase.h"
diff --git a/WebCore/loader/icon/IconRecord.h b/WebCore/loader/icon/IconRecord.h
index aaea787..f1fe12f 100644
--- a/WebCore/loader/icon/IconRecord.h
+++ b/WebCore/loader/icon/IconRecord.h
@@ -33,10 +33,10 @@
#include <wtf/RefCounted.h>
#include "SharedBuffer.h"
+#include "PlatformString.h"
#include <wtf/HashSet.h>
#include <wtf/OwnPtr.h>
-#include "PlatformString.h"
-#include "StringHash.h"
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/loader/loader.h b/WebCore/loader/loader.h
index 1fdb9cf..52c61aa 100644
--- a/WebCore/loader/loader.h
+++ b/WebCore/loader/loader.h
@@ -22,8 +22,6 @@
#ifndef loader_h
#define loader_h
-#include "AtomicString.h"
-#include "AtomicStringImpl.h"
#include "FrameLoaderTypes.h"
#include "PlatformString.h"
#include "SubresourceLoaderClient.h"
@@ -31,6 +29,8 @@
#include <wtf/Deque.h>
#include <wtf/HashMap.h>
#include <wtf/Noncopyable.h>
+#include <wtf/text/AtomicString.h>
+#include <wtf/text/AtomicStringImpl.h>
namespace WebCore {
diff --git a/WebCore/notifications/Notification.h b/WebCore/notifications/Notification.h
index 20a319b..e8e29f4 100644
--- a/WebCore/notifications/Notification.h
+++ b/WebCore/notifications/Notification.h
@@ -33,7 +33,6 @@
#define Notification_h
#include "ActiveDOMObject.h"
-#include "AtomicStringHash.h"
#include "Event.h"
#include "EventListener.h"
#include "EventNames.h"
@@ -51,6 +50,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/AtomicStringHash.h>
#if ENABLE(NOTIFICATIONS)
namespace WebCore {
diff --git a/WebCore/page/FrameTree.h b/WebCore/page/FrameTree.h
index 9ab999f..b97aab6 100644
--- a/WebCore/page/FrameTree.h
+++ b/WebCore/page/FrameTree.h
@@ -20,7 +20,7 @@
#ifndef FrameTree_h
#define FrameTree_h
-#include "AtomicString.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index 5ab6425..434d295 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -65,12 +65,12 @@
#include "SharedBuffer.h"
#include "SpeechInput.h"
#include "SpeechInputClient.h"
-#include "StringHash.h"
#include "TextResourceDecoder.h"
#include "Widget.h"
#include <wtf/HashMap.h>
#include <wtf/RefCountedLeakCounter.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
#if ENABLE(DOM_STORAGE)
#include "StorageArea.h"
diff --git a/WebCore/page/PageGroup.h b/WebCore/page/PageGroup.h
index 08b03d7..95db8c3 100644
--- a/WebCore/page/PageGroup.h
+++ b/WebCore/page/PageGroup.h
@@ -29,9 +29,9 @@
#include <wtf/HashSet.h>
#include <wtf/Noncopyable.h>
#include "LinkHash.h"
-#include "StringHash.h"
#include "UserScript.h"
#include "UserStyleSheet.h"
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/page/SecurityOrigin.h b/WebCore/page/SecurityOrigin.h
index fa5b1e4..266ade0 100644
--- a/WebCore/page/SecurityOrigin.h
+++ b/WebCore/page/SecurityOrigin.h
@@ -33,10 +33,10 @@
#include <wtf/RefCounted.h>
#include <wtf/PassRefPtr.h>
#include <wtf/Threading.h>
+#include <wtf/text/StringHash.h>
#include "FrameLoaderTypes.h"
#include "PlatformString.h"
-#include "StringHash.h"
namespace WebCore {
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index 5ed6480..ae3ebea 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -27,11 +27,11 @@
#ifndef Settings_h
#define Settings_h
-#include "AtomicString.h"
#include "EditingBehaviorTypes.h"
#include "FontRenderingMode.h"
#include "KURL.h"
#include "ZoomMode.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/page/WindowFeatures.cpp b/WebCore/page/WindowFeatures.cpp
index 1654ff5..82e36b9 100644
--- a/WebCore/page/WindowFeatures.cpp
+++ b/WebCore/page/WindowFeatures.cpp
@@ -24,10 +24,10 @@
#include "WindowFeatures.h"
#include "PlatformString.h"
-#include "StringHash.h"
#include <wtf/Assertions.h>
#include <wtf/HashMap.h>
#include <wtf/MathExtras.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/page/animation/AnimationBase.h b/WebCore/page/animation/AnimationBase.h
index 33a0b1d..182cb3c 100644
--- a/WebCore/page/animation/AnimationBase.h
+++ b/WebCore/page/animation/AnimationBase.h
@@ -29,8 +29,8 @@
#ifndef AnimationBase_h
#define AnimationBase_h
-#include "AtomicString.h"
#include <wtf/HashMap.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/page/animation/AnimationControllerPrivate.h b/WebCore/page/animation/AnimationControllerPrivate.h
index 3ae15a5..3305e24 100644
--- a/WebCore/page/animation/AnimationControllerPrivate.h
+++ b/WebCore/page/animation/AnimationControllerPrivate.h
@@ -29,7 +29,6 @@
#ifndef AnimationControllerPrivate_h
#define AnimationControllerPrivate_h
-#include "AtomicString.h"
#include "CSSPropertyNames.h"
#include "PlatformString.h"
#include "Timer.h"
@@ -37,6 +36,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/page/animation/CompositeAnimation.h b/WebCore/page/animation/CompositeAnimation.h
index 51ba565..a0ac455 100644
--- a/WebCore/page/animation/CompositeAnimation.h
+++ b/WebCore/page/animation/CompositeAnimation.h
@@ -29,12 +29,11 @@
#ifndef CompositeAnimation_h
#define CompositeAnimation_h
-#include "AtomicString.h"
-
#include "ImplicitAnimation.h"
#include "KeyframeAnimation.h"
#include <wtf/HashMap.h>
#include <wtf/Noncopyable.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/platform/Cookie.h b/WebCore/platform/Cookie.h
index 0fe3851..4eea7d2 100644
--- a/WebCore/platform/Cookie.h
+++ b/WebCore/platform/Cookie.h
@@ -27,7 +27,7 @@
#define Cookie_h
#include "PlatformString.h"
-#include "StringHash.h"
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/KURL.cpp b/WebCore/platform/KURL.cpp
index 9ed900f..8c845b0 100644
--- a/WebCore/platform/KURL.cpp
+++ b/WebCore/platform/KURL.cpp
@@ -29,11 +29,11 @@
#include "KURL.h"
-#include "StringHash.h"
#include "TextEncoding.h"
#include <wtf/text/CString.h>
#include <wtf/HashMap.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
#if USE(ICU_UNICODE)
#include <unicode/uidna.h>
diff --git a/WebCore/platform/KURLGoogle.cpp b/WebCore/platform/KURLGoogle.cpp
index ac02630..3d23fcf 100644
--- a/WebCore/platform/KURLGoogle.cpp
+++ b/WebCore/platform/KURLGoogle.cpp
@@ -40,13 +40,13 @@
#include <algorithm>
-#include "StringHash.h"
#include "NotImplemented.h"
#include "TextEncoding.h"
#include <wtf/HashMap.h>
#include <wtf/Vector.h>
#include <wtf/StdLibExtras.h>
#include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
#include <googleurl/src/url_util.h>
diff --git a/WebCore/platform/KURLHash.h b/WebCore/platform/KURLHash.h
index 283170b..44a4624 100644
--- a/WebCore/platform/KURLHash.h
+++ b/WebCore/platform/KURLHash.h
@@ -28,7 +28,7 @@
#include "KURL.h"
#include "PlatformString.h"
-#include "StringHash.h"
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/Length.cpp b/WebCore/platform/Length.cpp
index 3757d92..00b096b 100644
--- a/WebCore/platform/Length.cpp
+++ b/WebCore/platform/Length.cpp
@@ -26,9 +26,9 @@
#include "Length.h"
#include "PlatformString.h"
-#include "StringBuffer.h"
#include <wtf/ASCIICType.h>
#include <wtf/Assertions.h>
+#include <wtf/text/StringBuffer.h>
using namespace WTF;
diff --git a/WebCore/platform/LinkHash.cpp b/WebCore/platform/LinkHash.cpp
index 12437ab..e239798 100644
--- a/WebCore/platform/LinkHash.cpp
+++ b/WebCore/platform/LinkHash.cpp
@@ -22,12 +22,12 @@
*/
#include "config.h"
-#include "AtomicString.h"
#include "KURL.h"
#include "LinkHash.h"
#include "PlatformString.h"
-#include "StringHash.h"
-#include "StringImpl.h"
+#include <wtf/text/AtomicString.h>
+#include <wtf/text/StringHash.h>
+#include <wtf/text/StringImpl.h>
namespace WebCore {
diff --git a/WebCore/platform/LinkHash.h b/WebCore/platform/LinkHash.h
index a499a8e..dc494d2 100644
--- a/WebCore/platform/LinkHash.h
+++ b/WebCore/platform/LinkHash.h
@@ -26,8 +26,8 @@
#ifndef LinkHash_h
#define LinkHash_h
-#include "StringHash.h"
#include <wtf/Forward.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/MIMETypeRegistry.cpp b/WebCore/platform/MIMETypeRegistry.cpp
index b4cc2fa..606a9bd 100644
--- a/WebCore/platform/MIMETypeRegistry.cpp
+++ b/WebCore/platform/MIMETypeRegistry.cpp
@@ -29,10 +29,10 @@
#include "ArchiveFactory.h"
#include "MediaPlayer.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
#if PLATFORM(CG)
#include "ImageSourceCG.h"
diff --git a/WebCore/platform/MIMETypeRegistry.h b/WebCore/platform/MIMETypeRegistry.h
index f71b478..64abea8 100644
--- a/WebCore/platform/MIMETypeRegistry.h
+++ b/WebCore/platform/MIMETypeRegistry.h
@@ -27,9 +27,9 @@
#define MIMETypeRegistry_h
#include "PlatformString.h"
-#include "StringHash.h"
#include <wtf/HashSet.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/SchemeRegistry.h b/WebCore/platform/SchemeRegistry.h
index d92ec4e..56e3b33 100644
--- a/WebCore/platform/SchemeRegistry.h
+++ b/WebCore/platform/SchemeRegistry.h
@@ -27,8 +27,8 @@
#define SchemeRegistry_h
#include "PlatformString.h"
-#include "StringHash.h"
#include <wtf/HashSet.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/ThreadGlobalData.cpp b/WebCore/platform/ThreadGlobalData.cpp
index 99cd44a..6d7eb51 100644
--- a/WebCore/platform/ThreadGlobalData.cpp
+++ b/WebCore/platform/ThreadGlobalData.cpp
@@ -28,10 +28,10 @@
#include "ThreadGlobalData.h"
#include "EventNames.h"
-#include "StringImpl.h"
#include "ThreadTimers.h"
#include <wtf/UnusedParam.h>
#include <wtf/WTFThreadData.h>
+#include <wtf/text/StringImpl.h>
#if USE(ICU_UNICODE)
#include "TextCodecICU.h"
diff --git a/WebCore/platform/ThreadGlobalData.h b/WebCore/platform/ThreadGlobalData.h
index c17fbeb..9f57f00 100644
--- a/WebCore/platform/ThreadGlobalData.h
+++ b/WebCore/platform/ThreadGlobalData.h
@@ -27,10 +27,10 @@
#ifndef ThreadGlobalData_h
#define ThreadGlobalData_h
-#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/Noncopyable.h>
+#include <wtf/text/StringHash.h>
#if ENABLE(WORKERS)
#include <wtf/ThreadSpecific.h>
diff --git a/WebCore/platform/cf/BinaryPropertyList.cpp b/WebCore/platform/cf/BinaryPropertyList.cpp
index f0facae..27b44d4 100644
--- a/WebCore/platform/cf/BinaryPropertyList.cpp
+++ b/WebCore/platform/cf/BinaryPropertyList.cpp
@@ -26,9 +26,9 @@
#include "config.h"
#include "BinaryPropertyList.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
+#include <wtf/text/StringHash.h>
#include <limits>
using namespace std;
diff --git a/WebCore/platform/chromium/SearchPopupMenuChromium.cpp b/WebCore/platform/chromium/SearchPopupMenuChromium.cpp
index d4d4ff5..dc06b5a 100644
--- a/WebCore/platform/chromium/SearchPopupMenuChromium.cpp
+++ b/WebCore/platform/chromium/SearchPopupMenuChromium.cpp
@@ -32,8 +32,8 @@
#include "config.h"
#include "SearchPopupMenuChromium.h"
-#include "AtomicString.h"
#include "NotImplemented.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/platform/efl/ClipboardEfl.cpp b/WebCore/platform/efl/ClipboardEfl.cpp
index 60146b5..caff813 100644
--- a/WebCore/platform/efl/ClipboardEfl.cpp
+++ b/WebCore/platform/efl/ClipboardEfl.cpp
@@ -24,7 +24,7 @@
#include "Editor.h"
#include "FileList.h"
#include "NotImplemented.h"
-#include "StringHash.h"
+#include <wtf/text/StringHash.h>
namespace WebCore {
PassRefPtr<Clipboard> Editor::newGeneralClipboard(ClipboardAccessPolicy policy, Frame*)
diff --git a/WebCore/platform/efl/CookieJarEfl.cpp b/WebCore/platform/efl/CookieJarEfl.cpp
index 01dcddb..6c78dbd 100644
--- a/WebCore/platform/efl/CookieJarEfl.cpp
+++ b/WebCore/platform/efl/CookieJarEfl.cpp
@@ -30,9 +30,8 @@
#include "KURL.h"
#include "PlatformString.h"
-#include "StringHash.h"
-
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp b/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp
index 70e317e..fd84b15 100644
--- a/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp
+++ b/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp
@@ -33,7 +33,6 @@
#include "PlatformKeyboardEvent.h"
#include "NotImplemented.h"
-#include "StringHash.h"
#include "TextEncoding.h"
#include "WindowsKeyboardCodes.h"
@@ -41,6 +40,7 @@
#include <stdio.h>
#include <wtf/HashMap.h>
#include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/graphics/FontCache.cpp b/WebCore/platform/graphics/FontCache.cpp
index cb54cdd..ff865c2 100644
--- a/WebCore/platform/graphics/FontCache.cpp
+++ b/WebCore/platform/graphics/FontCache.cpp
@@ -34,10 +34,10 @@
#include "FontFallbackList.h"
#include "FontPlatformData.h"
#include "FontSelector.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/ListHashSet.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
using namespace WTF;
diff --git a/WebCore/platform/graphics/FontFamily.h b/WebCore/platform/graphics/FontFamily.h
index 126bd83..21a6b64 100644
--- a/WebCore/platform/graphics/FontFamily.h
+++ b/WebCore/platform/graphics/FontFamily.h
@@ -26,9 +26,9 @@
#ifndef FontFamily_h
#define FontFamily_h
-#include "AtomicString.h"
#include <wtf/RefCounted.h>
#include <wtf/ListRefPtr.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/platform/graphics/MediaPlayer.h b/WebCore/platform/graphics/MediaPlayer.h
index 9277671..6823d9d 100644
--- a/WebCore/platform/graphics/MediaPlayer.h
+++ b/WebCore/platform/graphics/MediaPlayer.h
@@ -34,12 +34,12 @@
#include "Document.h"
#include "IntRect.h"
-#include "StringHash.h"
#include <wtf/Forward.h>
#include <wtf/HashSet.h>
#include <wtf/OwnPtr.h>
#include <wtf/Noncopyable.h>
#include <wtf/PassOwnPtr.h>
+#include <wtf/text/StringHash.h>
#if USE(ACCELERATED_COMPOSITING)
#include "GraphicsLayer.h"
diff --git a/WebCore/platform/graphics/cg/ImageSourceCGWin.cpp b/WebCore/platform/graphics/cg/ImageSourceCGWin.cpp
index c7d9a0b..ef69e5e 100644
--- a/WebCore/platform/graphics/cg/ImageSourceCGWin.cpp
+++ b/WebCore/platform/graphics/cg/ImageSourceCGWin.cpp
@@ -27,8 +27,8 @@
#include "ImageSourceCG.h"
#include "StdLibExtras.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp b/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp
index 8ba37c6..7c3e450 100644
--- a/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp
+++ b/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp
@@ -38,8 +38,8 @@
#include "HashMap.h"
#include "HashSet.h"
#include "SimpleFontData.h"
-#include "StringHash.h"
#include <unicode/uniset.h>
+#include <wtf/text/StringHash.h>
#include <windows.h>
#include <objidl.h>
diff --git a/WebCore/platform/graphics/chromium/FontCacheLinux.cpp b/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
index 53f4a52..2fda22d 100644
--- a/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
+++ b/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
@@ -31,7 +31,6 @@
#include "config.h"
#include "FontCache.h"
-#include "AtomicString.h"
#include "ChromiumBridge.h"
#include "Font.h"
#include "FontDescription.h"
@@ -46,6 +45,7 @@
#include <unicode/utf16.h>
#include <wtf/Assertions.h>
+#include <wtf/text/AtomicString.h>
#include <wtf/text/CString.h>
namespace WebCore {
diff --git a/WebCore/platform/graphics/chromium/FontUtilsChromiumWin.cpp b/WebCore/platform/graphics/chromium/FontUtilsChromiumWin.cpp
index 78170a9..e725c50 100644
--- a/WebCore/platform/graphics/chromium/FontUtilsChromiumWin.cpp
+++ b/WebCore/platform/graphics/chromium/FontUtilsChromiumWin.cpp
@@ -34,11 +34,11 @@
#include <limits>
#include "PlatformString.h"
-#include "StringHash.h"
#include "UniscribeHelper.h"
#include <unicode/locid.h>
#include <unicode/uchar.h>
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/graphics/chromium/LayerChromium.h b/WebCore/platform/graphics/chromium/LayerChromium.h
index ebb4504..9fba415 100644
--- a/WebCore/platform/graphics/chromium/LayerChromium.h
+++ b/WebCore/platform/graphics/chromium/LayerChromium.h
@@ -38,12 +38,12 @@
#include "GraphicsContext.h"
#include "GraphicsLayerChromium.h"
#include "PlatformString.h"
-#include "StringHash.h"
#include "TransformationMatrix.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
namespace skia {
diff --git a/WebCore/platform/graphics/filters/Filter.h b/WebCore/platform/graphics/filters/Filter.h
index 8924b94..16d499f 100644
--- a/WebCore/platform/graphics/filters/Filter.h
+++ b/WebCore/platform/graphics/filters/Filter.h
@@ -24,11 +24,11 @@
#include "FloatRect.h"
#include "FloatSize.h"
#include "ImageBuffer.h"
-#include "StringHash.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/graphics/mac/FontPlatformData.h b/WebCore/platform/graphics/mac/FontPlatformData.h
index 07ae4f8..dc876a8 100644
--- a/WebCore/platform/graphics/mac/FontPlatformData.h
+++ b/WebCore/platform/graphics/mac/FontPlatformData.h
@@ -24,7 +24,7 @@
#ifndef FontPlatformData_h
#define FontPlatformData_h
-#include "StringImpl.h"
+#include <wtf/text/StringImpl.h>
#ifdef __OBJC__
@class NSFont;
diff --git a/WebCore/platform/graphics/mac/GraphicsLayerCA.h b/WebCore/platform/graphics/mac/GraphicsLayerCA.h
index ee70338..a9f747a 100644
--- a/WebCore/platform/graphics/mac/GraphicsLayerCA.h
+++ b/WebCore/platform/graphics/mac/GraphicsLayerCA.h
@@ -29,11 +29,11 @@
#if USE(ACCELERATED_COMPOSITING)
#include "GraphicsLayer.h"
-#include "StringHash.h"
#include "WebLayer.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/RetainPtr.h>
+#include <wtf/text/StringHash.h>
@class CABasicAnimation;
@class CAKeyframeAnimation;
diff --git a/WebCore/platform/graphics/qt/FontCacheQt.cpp b/WebCore/platform/graphics/qt/FontCacheQt.cpp
index bfcc5c3..c59c523 100644
--- a/WebCore/platform/graphics/qt/FontCacheQt.cpp
+++ b/WebCore/platform/graphics/qt/FontCacheQt.cpp
@@ -29,10 +29,10 @@
#include "FontPlatformData.h"
#include "Font.h"
#include "PlatformString.h"
-#include "StringHash.h"
#include <utility>
#include <wtf/ListHashSet.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
#include <QFont>
diff --git a/WebCore/platform/graphics/win/FontCacheWin.cpp b/WebCore/platform/graphics/win/FontCacheWin.cpp
index d050243..2240f80 100644
--- a/WebCore/platform/graphics/win/FontCacheWin.cpp
+++ b/WebCore/platform/graphics/win/FontCacheWin.cpp
@@ -31,11 +31,11 @@
#include "FontCache.h"
#include "Font.h"
#include "SimpleFontData.h"
-#include "StringHash.h"
#include "UnicodeRange.h"
#include <mlang.h>
#include <windows.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
#if PLATFORM(CG)
#include <ApplicationServices/ApplicationServices.h>
#include <WebKitSystemInterface/WebKitSystemInterface.h>
diff --git a/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp b/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp
index a804432..9234229 100644
--- a/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp
+++ b/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp
@@ -25,12 +25,12 @@
#include "FontPlatformData.h"
#include "PlatformString.h"
-#include "StringHash.h"
#include <ApplicationServices/ApplicationServices.h>
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#include <wtf/HashMap.h>
#include <wtf/RetainPtr.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
using std::min;
diff --git a/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp b/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp
index 9b916bd..0f5c365 100644
--- a/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp
+++ b/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp
@@ -27,10 +27,10 @@
#include "FontPlatformData.h"
#include "PlatformString.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/RetainPtr.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
#include <cairo-win32.h>
diff --git a/WebCore/platform/graphics/win/FontPlatformDataWin.cpp b/WebCore/platform/graphics/win/FontPlatformDataWin.cpp
index 99f364c..09ed4a6 100644
--- a/WebCore/platform/graphics/win/FontPlatformDataWin.cpp
+++ b/WebCore/platform/graphics/win/FontPlatformDataWin.cpp
@@ -26,10 +26,10 @@
#include "FontPlatformData.h"
#include "PlatformString.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/RetainPtr.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
using std::min;
diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
index e0ecf78..9bc68d1 100644
--- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
+++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
@@ -43,7 +43,6 @@
#include "Settings.h"
#include "SoftLinking.h"
#include "StringBuilder.h"
-#include "StringHash.h"
#include "TimeRanges.h"
#include "Timer.h"
#include <AssertMacros.h>
@@ -54,6 +53,7 @@
#include <wtf/MainThread.h>
#include <wtf/MathExtras.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
#if USE(ACCELERATED_COMPOSITING)
#include "GraphicsLayerCACF.h"
diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
index 69aaeaf..34f1135 100644
--- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
+++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
@@ -39,7 +39,6 @@
#include "ScrollView.h"
#include "SoftLinking.h"
#include "StringBuilder.h"
-#include "StringHash.h"
#include "TimeRanges.h"
#include "Timer.h"
#include <Wininet.h>
@@ -47,6 +46,7 @@
#include <wtf/HashSet.h>
#include <wtf/MathExtras.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
#if USE(ACCELERATED_COMPOSITING)
#include "GraphicsLayerCACF.h"
diff --git a/WebCore/platform/graphics/win/WKCACFLayer.h b/WebCore/platform/graphics/win/WKCACFLayer.h
index ed39297..abc04c8 100644
--- a/WebCore/platform/graphics/win/WKCACFLayer.h
+++ b/WebCore/platform/graphics/win/WKCACFLayer.h
@@ -28,8 +28,6 @@
#if USE(ACCELERATED_COMPOSITING)
-#include "StringHash.h"
-
#include <wtf/RefCounted.h>
#include <QuartzCore/CACFLayer.h>
@@ -37,6 +35,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RetainPtr.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
#include "GraphicsContext.h"
#include "PlatformString.h"
diff --git a/WebCore/platform/graphics/wince/FontPlatformData.cpp b/WebCore/platform/graphics/wince/FontPlatformData.cpp
index 74cadc2..d84a7cc 100644
--- a/WebCore/platform/graphics/wince/FontPlatformData.cpp
+++ b/WebCore/platform/graphics/wince/FontPlatformData.cpp
@@ -26,10 +26,10 @@
#include "FontData.h"
#include "PlatformString.h"
#include "SimpleFontData.h"
-#include "StringHash.h"
#include "UnicodeRange.h"
#include "wtf/OwnPtr.h"
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
#include <windows.h>
#include <mlang.h>
diff --git a/WebCore/platform/graphics/wx/FontPlatformData.h b/WebCore/platform/graphics/wx/FontPlatformData.h
index 4f8d740..b328545 100644
--- a/WebCore/platform/graphics/wx/FontPlatformData.h
+++ b/WebCore/platform/graphics/wx/FontPlatformData.h
@@ -30,10 +30,10 @@
#define FontPlatformData_h
#include "FontDescription.h"
-#include "AtomicString.h"
#include "StringImpl.h"
#include <wtf/Forward.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/AtomicString.h>
#include <wtf/text/CString.h>
#include <wx/defs.h>
diff --git a/WebCore/platform/gtk/ClipboardGtk.cpp b/WebCore/platform/gtk/ClipboardGtk.cpp
index 7003cf0..21ebe4c 100644
--- a/WebCore/platform/gtk/ClipboardGtk.cpp
+++ b/WebCore/platform/gtk/ClipboardGtk.cpp
@@ -30,9 +30,9 @@
#include "PasteboardHelper.h"
#include "RenderImage.h"
#include "ScriptExecutionContext.h"
-#include "StringHash.h"
#include "markup.h"
#include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
#include <gtk/gtk.h>
namespace WebCore {
diff --git a/WebCore/platform/gtk/DataObjectGtk.h b/WebCore/platform/gtk/DataObjectGtk.h
index 8fba938..a7d8baf 100644
--- a/WebCore/platform/gtk/DataObjectGtk.h
+++ b/WebCore/platform/gtk/DataObjectGtk.h
@@ -23,9 +23,9 @@
#include <GRefPtr.h>
#include "KURL.h"
#include "Range.h"
-#include "StringHash.h"
#include <wtf/RefCounted.h>
#include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
typedef struct _GdkPixbuf GdkPixbuf;
typedef struct _GdkDragContext GdkDragContext;
diff --git a/WebCore/platform/haiku/ClipboardHaiku.cpp b/WebCore/platform/haiku/ClipboardHaiku.cpp
index 9931131..da242c1 100644
--- a/WebCore/platform/haiku/ClipboardHaiku.cpp
+++ b/WebCore/platform/haiku/ClipboardHaiku.cpp
@@ -31,13 +31,13 @@
#include "IntPoint.h"
#include "NotImplemented.h"
#include "PlatformString.h"
-#include "StringHash.h"
#include <support/Locker.h>
#include <app/Clipboard.h>
#include <Message.h>
#include <String.h>
#include <wtf/HashTable.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/haiku/CookieJarHaiku.cpp b/WebCore/platform/haiku/CookieJarHaiku.cpp
index f619f00..471ac59 100644
--- a/WebCore/platform/haiku/CookieJarHaiku.cpp
+++ b/WebCore/platform/haiku/CookieJarHaiku.cpp
@@ -32,9 +32,8 @@
#include "Cookie.h"
#include "KURL.h"
#include "PlatformString.h"
-#include "StringHash.h"
-
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/haiku/SearchPopupMenuHaiku.cpp b/WebCore/platform/haiku/SearchPopupMenuHaiku.cpp
index 109409a..ea73c61 100644
--- a/WebCore/platform/haiku/SearchPopupMenuHaiku.cpp
+++ b/WebCore/platform/haiku/SearchPopupMenuHaiku.cpp
@@ -21,8 +21,8 @@
#include "config.h"
#include "SearchPopupMenuHaiku.h"
-#include "AtomicString.h"
#include "NotImplemented.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/platform/mac/SearchPopupMenuMac.mm b/WebCore/platform/mac/SearchPopupMenuMac.mm
index 69018ee..47d6e57 100644
--- a/WebCore/platform/mac/SearchPopupMenuMac.mm
+++ b/WebCore/platform/mac/SearchPopupMenuMac.mm
@@ -21,7 +21,7 @@
#import "config.h"
#import "SearchPopupMenuMac.h"
-#import "AtomicString.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/platform/mac/ThreadCheck.mm b/WebCore/platform/mac/ThreadCheck.mm
index ddee05c..4792191 100644
--- a/WebCore/platform/mac/ThreadCheck.mm
+++ b/WebCore/platform/mac/ThreadCheck.mm
@@ -26,9 +26,9 @@
#import "config.h"
#import "ThreadCheck.h"
-#import "StringHash.h"
#import <wtf/HashSet.h>
#import <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/network/CredentialStorage.cpp b/WebCore/platform/network/CredentialStorage.cpp
index 14f4086..4dc2d0c 100644
--- a/WebCore/platform/network/CredentialStorage.cpp
+++ b/WebCore/platform/network/CredentialStorage.cpp
@@ -29,8 +29,8 @@
#include "Credential.h"
#include "KURL.h"
#include "ProtectionSpaceHash.h"
-#include "StringHash.h"
#include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/StdLibExtras.h>
diff --git a/WebCore/platform/network/HTTPHeaderMap.h b/WebCore/platform/network/HTTPHeaderMap.h
index 557ddb3..c6145bd 100644
--- a/WebCore/platform/network/HTTPHeaderMap.h
+++ b/WebCore/platform/network/HTTPHeaderMap.h
@@ -27,13 +27,13 @@
#ifndef HTTPHeaderMap_h
#define HTTPHeaderMap_h
-#include "AtomicString.h"
-#include "AtomicStringHash.h"
-#include "StringHash.h"
#include <utility>
#include <wtf/HashMap.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/Vector.h>
+#include <wtf/text/AtomicString.h>
+#include <wtf/text/AtomicStringHash.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/network/cf/DNSCFNet.cpp b/WebCore/platform/network/cf/DNSCFNet.cpp
index bda9e41..fbceb7d 100644
--- a/WebCore/platform/network/cf/DNSCFNet.cpp
+++ b/WebCore/platform/network/cf/DNSCFNet.cpp
@@ -27,11 +27,11 @@
#include "config.h"
#include "DNS.h"
-#include "StringHash.h"
#include "Timer.h"
#include <wtf/HashSet.h>
#include <wtf/RetainPtr.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
#if PLATFORM(WIN)
#include "LoaderRunLoopCF.h"
diff --git a/WebCore/platform/network/curl/CookieJarCurl.cpp b/WebCore/platform/network/curl/CookieJarCurl.cpp
index 7c906a0..e05947c 100644
--- a/WebCore/platform/network/curl/CookieJarCurl.cpp
+++ b/WebCore/platform/network/curl/CookieJarCurl.cpp
@@ -21,9 +21,8 @@
#include "Document.h"
#include "KURL.h"
#include "PlatformString.h"
-#include "StringHash.h"
-
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/qt/ClipboardQt.cpp b/WebCore/platform/qt/ClipboardQt.cpp
index 6ca4830..f677d28 100644
--- a/WebCore/platform/qt/ClipboardQt.cpp
+++ b/WebCore/platform/qt/ClipboardQt.cpp
@@ -43,8 +43,8 @@
#include "PlatformString.h"
#include "Range.h"
#include "RenderImage.h"
-#include "StringHash.h"
#include "markup.h"
+#include <wtf/text/StringHash.h>
#include <QApplication>
#include <QClipboard>
diff --git a/WebCore/platform/text/AtomicString.h b/WebCore/platform/text/AtomicString.h
deleted file mode 100644
index 6ce63b5..0000000
--- a/WebCore/platform/text/AtomicString.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef WebCoreAtomicString_h
-#define WebCoreAtomicString_h
-
-// FIXME: remove this header, use the forward from wtf directly.
-#include <wtf/text/AtomicString.h>
-
-#endif // AtomicString_h
diff --git a/WebCore/platform/text/AtomicStringHash.h b/WebCore/platform/text/AtomicStringHash.h
deleted file mode 100644
index d13332b..0000000
--- a/WebCore/platform/text/AtomicStringHash.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef AtomicStringHash_h
-#define AtomicStringHash_h
-
-#include "AtomicString.h"
-#include <wtf/HashTraits.h>
-
-namespace WebCore {
-
- struct AtomicStringHash {
- static unsigned hash(const AtomicString& key)
- {
- return key.impl()->existingHash();
- }
-
- static bool equal(const AtomicString& a, const AtomicString& b)
- {
- return a == b;
- }
-
- static const bool safeToCompareToEmptyOrDeleted = false;
- };
-
-}
-
-namespace WTF {
-
- // WebCore::AtomicStringHash is the default hash for AtomicString
- template<> struct HashTraits<WTF::AtomicString> : GenericHashTraits<WTF::AtomicString> {
- static const bool emptyValueIsZero = true;
- static void constructDeletedValue(WTF::AtomicString& slot) { new (&slot) WTF::AtomicString(HashTableDeletedValue); }
- static bool isDeletedValue(const WTF::AtomicString& slot) { return slot.isHashTableDeletedValue(); }
- };
-
-}
-
-#endif
diff --git a/WebCore/platform/text/AtomicStringImpl.h b/WebCore/platform/text/AtomicStringImpl.h
deleted file mode 100644
index 64bce77..0000000
--- a/WebCore/platform/text/AtomicStringImpl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2006 Apple Computer, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef WebCoreAtomicStringImpl_h
-#define WebCoreAtomicStringImpl_h
-
-// FIXME: remove this header, use the forward from wtf directly.
-#include <wtf/text/AtomicStringImpl.h>
-
-#endif
diff --git a/WebCore/platform/text/AtomicStringKeyedMRUCache.h b/WebCore/platform/text/AtomicStringKeyedMRUCache.h
index a47585a..b3004f7 100644
--- a/WebCore/platform/text/AtomicStringKeyedMRUCache.h
+++ b/WebCore/platform/text/AtomicStringKeyedMRUCache.h
@@ -26,6 +26,8 @@
#ifndef AtomicStringKeyedMRUCache_h
#define AtomicStringKeyedMRUCache_h
+#include <wtf/text/AtomicString.h>
+
namespace WebCore {
template<typename T, size_t capacity = 4>
diff --git a/WebCore/platform/text/StringBuilder.cpp b/WebCore/platform/text/StringBuilder.cpp
index 213daab..1c47129 100644
--- a/WebCore/platform/text/StringBuilder.cpp
+++ b/WebCore/platform/text/StringBuilder.cpp
@@ -30,7 +30,7 @@
#include "config.h"
#include "StringBuilder.h"
-#include "StringBuffer.h"
+#include <wtf/text/StringBuffer.h>
namespace WebCore {
diff --git a/WebCore/platform/text/StringHash.h b/WebCore/platform/text/StringHash.h
deleted file mode 100644
index 35de30d..0000000
--- a/WebCore/platform/text/StringHash.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved
- * Copyright (C) Research In Motion Limited 2009. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef WebCoreStringHash_h
-#define WebCoreStringHash_h
-
-// FIXME: remove this header, use the forward from wtf directly.
-#include <wtf/text/StringHash.h>
-
-#endif
diff --git a/WebCore/platform/text/StringImpl.h b/WebCore/platform/text/StringImpl.h
deleted file mode 100644
index fa79b61..0000000
--- a/WebCore/platform/text/StringImpl.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 1999 Lars Knoll (knoll at kde.org)
- * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2009 Google Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef WebCoreStringImpl_h
-#define WebCoreStringImpl_h
-
-// FIXME: remove this header, use the forward from wtf directly.
-#include <wtf/text/StringImpl.h>
-
-#endif
diff --git a/WebCore/platform/text/TextCodecLatin1.cpp b/WebCore/platform/text/TextCodecLatin1.cpp
index 1e9385d..4f9cbe0 100644
--- a/WebCore/platform/text/TextCodecLatin1.cpp
+++ b/WebCore/platform/text/TextCodecLatin1.cpp
@@ -27,9 +27,9 @@
#include "TextCodecLatin1.h"
#include "PlatformString.h"
-#include "StringBuffer.h"
#include <stdio.h>
#include <wtf/text/CString.h>
+#include <wtf/text/StringBuffer.h>
#include <wtf/PassOwnPtr.h>
namespace WebCore {
diff --git a/WebCore/platform/text/TextCodecUTF16.cpp b/WebCore/platform/text/TextCodecUTF16.cpp
index 16f8431..5c23732 100644
--- a/WebCore/platform/text/TextCodecUTF16.cpp
+++ b/WebCore/platform/text/TextCodecUTF16.cpp
@@ -27,8 +27,8 @@
#include "TextCodecUTF16.h"
#include "PlatformString.h"
-#include "StringBuffer.h"
#include <wtf/text/CString.h>
+#include <wtf/text/StringBuffer.h>
#include <wtf/PassOwnPtr.h>
namespace WebCore {
diff --git a/WebCore/platform/text/TextCodecUserDefined.cpp b/WebCore/platform/text/TextCodecUserDefined.cpp
index 851d693..70d8673 100644
--- a/WebCore/platform/text/TextCodecUserDefined.cpp
+++ b/WebCore/platform/text/TextCodecUserDefined.cpp
@@ -27,9 +27,9 @@
#include "TextCodecUserDefined.h"
#include "PlatformString.h"
-#include "StringBuffer.h"
#include <stdio.h>
#include <wtf/text/CString.h>
+#include <wtf/text/StringBuffer.h>
#include <wtf/PassOwnPtr.h>
namespace WebCore {
diff --git a/WebCore/platform/text/cf/HyphenationCF.cpp b/WebCore/platform/text/cf/HyphenationCF.cpp
index b983979..8be537d 100644
--- a/WebCore/platform/text/cf/HyphenationCF.cpp
+++ b/WebCore/platform/text/cf/HyphenationCF.cpp
@@ -28,7 +28,6 @@
#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-#include "AtomicString.h"
#include "AtomicStringKeyedMRUCache.h"
#include "TextBreakIteratorInternalICU.h"
#include <wtf/ListHashSet.h>
diff --git a/WebCore/platform/text/cf/StringImplCF.cpp b/WebCore/platform/text/cf/StringImplCF.cpp
index 18e137f..0157918 100644
--- a/WebCore/platform/text/cf/StringImplCF.cpp
+++ b/WebCore/platform/text/cf/StringImplCF.cpp
@@ -19,7 +19,7 @@
*/
#include "config.h"
-#include "StringImpl.h"
+#include <wtf/text/StringImpl.h>
#if PLATFORM(CF)
diff --git a/WebCore/platform/text/mac/HyphenationMac.mm b/WebCore/platform/text/mac/HyphenationMac.mm
index 56122df..d5c9283 100644
--- a/WebCore/platform/text/mac/HyphenationMac.mm
+++ b/WebCore/platform/text/mac/HyphenationMac.mm
@@ -28,7 +28,6 @@
#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
-#import "AtomicString.h"
#import "AtomicStringKeyedMRUCache.h"
#import "TextBreakIteratorInternalICU.h"
#import "WebCoreSystemInterface.h"
diff --git a/WebCore/platform/text/mac/StringImplMac.mm b/WebCore/platform/text/mac/StringImplMac.mm
index 843f396..6f5e953 100644
--- a/WebCore/platform/text/mac/StringImplMac.mm
+++ b/WebCore/platform/text/mac/StringImplMac.mm
@@ -19,7 +19,7 @@
*/
#include "config.h"
-#include "StringImpl.h"
+#include <wtf/text/StringImpl.h>
#include "FoundationExtras.h"
diff --git a/WebCore/platform/text/transcoder/FontTranscoder.h b/WebCore/platform/text/transcoder/FontTranscoder.h
index 1fdc936..67db977 100644
--- a/WebCore/platform/text/transcoder/FontTranscoder.h
+++ b/WebCore/platform/text/transcoder/FontTranscoder.h
@@ -31,9 +31,9 @@
#ifndef FontTranscoder_h
#define FontTranscoder_h
-#include "AtomicStringHash.h"
#include <wtf/HashMap.h>
#include <wtf/Noncopyable.h>
+#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
diff --git a/WebCore/platform/text/wince/TextCodecWinCE.cpp b/WebCore/platform/text/wince/TextCodecWinCE.cpp
index 644b12f..578f789 100644
--- a/WebCore/platform/text/wince/TextCodecWinCE.cpp
+++ b/WebCore/platform/text/wince/TextCodecWinCE.cpp
@@ -27,13 +27,13 @@
#include "ce_textcodecs.h"
#include "FontCache.h"
#include "PlatformString.h"
-#include "StringHash.h"
#include <mlang.h>
#include <winbase.h>
#include <winnls.h>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
#include <wtf/unicode/UTF8.h>
namespace WebCore {
diff --git a/WebCore/platform/win/BString.cpp b/WebCore/platform/win/BString.cpp
index 618ecf3..a23a38c 100644
--- a/WebCore/platform/win/BString.cpp
+++ b/WebCore/platform/win/BString.cpp
@@ -26,9 +26,9 @@
#include "config.h"
#include "BString.h"
-#include "AtomicString.h"
#include "KURL.h"
#include "PlatformString.h"
+#include <wtf/text/AtomicString.h>
#include <tchar.h>
#include <windows.h>
diff --git a/WebCore/platform/win/ClipboardWin.cpp b/WebCore/platform/win/ClipboardWin.cpp
index 6e026d6..2915f9d 100644
--- a/WebCore/platform/win/ClipboardWin.cpp
+++ b/WebCore/platform/win/ClipboardWin.cpp
@@ -49,7 +49,6 @@
#include "RenderImage.h"
#include "ResourceResponse.h"
#include "SharedBuffer.h"
-#include "StringHash.h"
#include "WCDataObject.h"
#include "csshelper.h"
#include "markup.h"
@@ -57,6 +56,7 @@
#include <wininet.h>
#include <wtf/RefPtr.h>
#include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
using namespace std;
diff --git a/WebCore/platform/win/SearchPopupMenuWin.cpp b/WebCore/platform/win/SearchPopupMenuWin.cpp
index 6655b1b..7ae800b 100644
--- a/WebCore/platform/win/SearchPopupMenuWin.cpp
+++ b/WebCore/platform/win/SearchPopupMenuWin.cpp
@@ -21,7 +21,7 @@
#include "config.h"
#include "SearchPopupMenuWin.h"
-#include "AtomicString.h"
+#include <wtf/text/AtomicString.h>
#if PLATFORM(CF)
#include <wtf/RetainPtr.h>
diff --git a/WebCore/platform/wince/SearchPopupMenuWince.cpp b/WebCore/platform/wince/SearchPopupMenuWince.cpp
index 756b7cf..f9d65a6 100644
--- a/WebCore/platform/wince/SearchPopupMenuWince.cpp
+++ b/WebCore/platform/wince/SearchPopupMenuWince.cpp
@@ -20,8 +20,8 @@
#include "config.h"
#include "SearchPopupMenu.h"
-#include "AtomicString.h"
#include "NotImplemented.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/platform/wx/ClipboardWx.cpp b/WebCore/platform/wx/ClipboardWx.cpp
index 336881d..2ef943f 100644
--- a/WebCore/platform/wx/ClipboardWx.cpp
+++ b/WebCore/platform/wx/ClipboardWx.cpp
@@ -32,7 +32,7 @@
#include "NotImplemented.h"
#include "Pasteboard.h"
#include "PlatformString.h"
-#include "StringHash.h"
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/plugins/DOMMimeTypeArray.cpp b/WebCore/plugins/DOMMimeTypeArray.cpp
index f36f2a2..8c81bb7 100644
--- a/WebCore/plugins/DOMMimeTypeArray.cpp
+++ b/WebCore/plugins/DOMMimeTypeArray.cpp
@@ -20,11 +20,11 @@
#include "config.h"
#include "DOMMimeTypeArray.h"
-#include "AtomicString.h"
#include "DOMPlugin.h"
#include "Frame.h"
#include "Page.h"
#include "PluginData.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/plugins/DOMPlugin.cpp b/WebCore/plugins/DOMPlugin.cpp
index 11ec929..ac4fd03 100644
--- a/WebCore/plugins/DOMPlugin.cpp
+++ b/WebCore/plugins/DOMPlugin.cpp
@@ -19,9 +19,9 @@
#include "config.h"
#include "DOMPlugin.h"
-#include "AtomicString.h"
#include "PluginData.h"
#include "Frame.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/plugins/DOMPluginArray.cpp b/WebCore/plugins/DOMPluginArray.cpp
index fb11da8..3717f32 100644
--- a/WebCore/plugins/DOMPluginArray.cpp
+++ b/WebCore/plugins/DOMPluginArray.cpp
@@ -20,11 +20,11 @@
#include "config.h"
#include "DOMPluginArray.h"
-#include "AtomicString.h"
#include "DOMPlugin.h"
#include "Frame.h"
#include "Page.h"
#include "PluginData.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/plugins/PluginDatabase.h b/WebCore/plugins/PluginDatabase.h
index 28d83a1..f80dd8c 100644
--- a/WebCore/plugins/PluginDatabase.h
+++ b/WebCore/plugins/PluginDatabase.h
@@ -30,10 +30,9 @@
#include "PlatformString.h"
#include "PluginPackage.h"
-#include "StringHash.h"
-
#include <wtf/HashSet.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
class Element;
diff --git a/WebCore/plugins/PluginPackage.h b/WebCore/plugins/PluginPackage.h
index 659f5ff..92a9c52 100644
--- a/WebCore/plugins/PluginPackage.h
+++ b/WebCore/plugins/PluginPackage.h
@@ -30,11 +30,11 @@
#include "FileSystem.h"
#include "PlatformString.h"
#include "PluginQuirkSet.h"
-#include "StringHash.h"
#include "Timer.h"
#include "npruntime_internal.h"
#include <wtf/HashMap.h>
#include <wtf/RefCounted.h>
+#include <wtf/text/StringHash.h>
#if OS(SYMBIAN)
class QPluginLoader;
diff --git a/WebCore/plugins/PluginStream.h b/WebCore/plugins/PluginStream.h
index 6066c8b..bb5194b 100644
--- a/WebCore/plugins/PluginStream.h
+++ b/WebCore/plugins/PluginStream.h
@@ -34,7 +34,6 @@
#include "PluginQuirkSet.h"
#include "ResourceRequest.h"
#include "ResourceResponse.h"
-#include "StringHash.h"
#include "Timer.h"
#include "npruntime_internal.h"
#include <wtf/HashMap.h>
@@ -42,6 +41,7 @@
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
#include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
class Frame;
diff --git a/WebCore/rendering/RenderApplet.h b/WebCore/rendering/RenderApplet.h
index 343421e..62f46cd 100644
--- a/WebCore/rendering/RenderApplet.h
+++ b/WebCore/rendering/RenderApplet.h
@@ -23,7 +23,7 @@
#define RenderApplet_h
#include "RenderWidget.h"
-#include "StringHash.h"
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/rendering/RenderText.cpp b/WebCore/rendering/RenderText.cpp
index bd050d8..da152b0 100644
--- a/WebCore/rendering/RenderText.cpp
+++ b/WebCore/rendering/RenderText.cpp
@@ -37,13 +37,13 @@
#include "RenderBlock.h"
#include "RenderLayer.h"
#include "RenderView.h"
-#include "StringBuffer.h"
#include "Text.h"
#include "TextBreakIterator.h"
#include "TextResourceDecoder.h"
#include "VisiblePosition.h"
#include "break_lines.h"
#include <wtf/AlwaysInline.h>
+#include <wtf/text/StringBuffer.h>
using namespace std;
using namespace WTF;
diff --git a/WebCore/rendering/style/BindingURI.h b/WebCore/rendering/style/BindingURI.h
index 923f1aa..c844b1d 100644
--- a/WebCore/rendering/style/BindingURI.h
+++ b/WebCore/rendering/style/BindingURI.h
@@ -26,7 +26,7 @@
#define BindingURI_h
#if ENABLE(XBL)
-#include "StringImpl.h"
+#include <wtf/text/StringImpl.h>
namespace WebCore {
diff --git a/WebCore/rendering/style/ContentData.cpp b/WebCore/rendering/style/ContentData.cpp
index 410cad4..b0f9e81 100644
--- a/WebCore/rendering/style/ContentData.cpp
+++ b/WebCore/rendering/style/ContentData.cpp
@@ -23,8 +23,8 @@
#include "ContentData.h"
#include "CounterContent.h"
-#include "StringImpl.h"
#include "StyleImage.h"
+#include <wtf/text/StringImpl.h>
namespace WebCore {
diff --git a/WebCore/rendering/style/CounterContent.h b/WebCore/rendering/style/CounterContent.h
index 702d9c2..52757ad 100644
--- a/WebCore/rendering/style/CounterContent.h
+++ b/WebCore/rendering/style/CounterContent.h
@@ -25,8 +25,8 @@
#ifndef CounterContent_h
#define CounterContent_h
-#include "AtomicString.h"
#include "RenderStyleConstants.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/rendering/style/CounterDirectives.h b/WebCore/rendering/style/CounterDirectives.h
index 9cbdeae..e54028e 100644
--- a/WebCore/rendering/style/CounterDirectives.h
+++ b/WebCore/rendering/style/CounterDirectives.h
@@ -25,9 +25,9 @@
#ifndef CounterDirectives_h
#define CounterDirectives_h
-#include "AtomicStringImpl.h"
#include <wtf/HashMap.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/AtomicStringImpl.h>
namespace WebCore {
diff --git a/WebCore/rendering/style/KeyframeList.h b/WebCore/rendering/style/KeyframeList.h
index b1009d2..bb5f180 100644
--- a/WebCore/rendering/style/KeyframeList.h
+++ b/WebCore/rendering/style/KeyframeList.h
@@ -25,10 +25,10 @@
#ifndef KeyframeList_h
#define KeyframeList_h
-#include "AtomicString.h"
#include <wtf/Vector.h>
#include <wtf/HashSet.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/rendering/style/StyleRareInheritedData.h b/WebCore/rendering/style/StyleRareInheritedData.h
index 83f7816..6d2e55d 100644
--- a/WebCore/rendering/style/StyleRareInheritedData.h
+++ b/WebCore/rendering/style/StyleRareInheritedData.h
@@ -25,11 +25,11 @@
#ifndef StyleRareInheritedData_h
#define StyleRareInheritedData_h
-#include "AtomicString.h"
#include "Color.h"
#include "Length.h"
#include <wtf/RefCounted.h>
#include <wtf/PassRefPtr.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/storage/AbstractDatabase.cpp b/WebCore/storage/AbstractDatabase.cpp
index 7827ec8..8d3bf1e 100644
--- a/WebCore/storage/AbstractDatabase.cpp
+++ b/WebCore/storage/AbstractDatabase.cpp
@@ -36,12 +36,12 @@
#include "SQLiteStatement.h"
#include "ScriptExecutionContext.h"
#include "SecurityOrigin.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/storage/DatabaseAuthorizer.h b/WebCore/storage/DatabaseAuthorizer.h
index 66bc5d8..e7c3922 100644
--- a/WebCore/storage/DatabaseAuthorizer.h
+++ b/WebCore/storage/DatabaseAuthorizer.h
@@ -29,10 +29,10 @@
#define DatabaseAuthorizer_h
#include "PlatformString.h"
-#include "StringHash.h"
#include <wtf/Forward.h>
#include <wtf/HashSet.h>
#include <wtf/ThreadSafeShared.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/storage/DatabaseTracker.h b/WebCore/storage/DatabaseTracker.h
index 1557f0a..7145e6b 100644
--- a/WebCore/storage/DatabaseTracker.h
+++ b/WebCore/storage/DatabaseTracker.h
@@ -32,9 +32,9 @@
#if ENABLE(DATABASE)
#include "PlatformString.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
+#include <wtf/text/StringHash.h>
#if !PLATFORM(CHROMIUM)
#include "DatabaseDetails.h"
diff --git a/WebCore/storage/IDBDatabaseBackendImpl.h b/WebCore/storage/IDBDatabaseBackendImpl.h
index f6ff058..4d01a93 100644
--- a/WebCore/storage/IDBDatabaseBackendImpl.h
+++ b/WebCore/storage/IDBDatabaseBackendImpl.h
@@ -28,8 +28,8 @@
#include "IDBCallbacks.h"
#include "IDBDatabase.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
#if ENABLE(INDEXED_DATABASE)
diff --git a/WebCore/storage/IDBFactoryBackendImpl.h b/WebCore/storage/IDBFactoryBackendImpl.h
index bbcc537..270fb75 100644
--- a/WebCore/storage/IDBFactoryBackendImpl.h
+++ b/WebCore/storage/IDBFactoryBackendImpl.h
@@ -29,8 +29,8 @@
#define IDBFactoryBackendImpl_h
#include "IDBFactoryBackendInterface.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
#if ENABLE(INDEXED_DATABASE)
diff --git a/WebCore/storage/IDBObjectStoreBackendImpl.h b/WebCore/storage/IDBObjectStoreBackendImpl.h
index fc63658..4b909af 100644
--- a/WebCore/storage/IDBObjectStoreBackendImpl.h
+++ b/WebCore/storage/IDBObjectStoreBackendImpl.h
@@ -27,8 +27,8 @@
#define IDBObjectStoreBackendImpl_h
#include "IDBObjectStoreBackendInterface.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
#if ENABLE(INDEXED_DATABASE)
diff --git a/WebCore/storage/OriginQuotaManager.h b/WebCore/storage/OriginQuotaManager.h
index c904737..ec9620c 100644
--- a/WebCore/storage/OriginQuotaManager.h
+++ b/WebCore/storage/OriginQuotaManager.h
@@ -31,10 +31,10 @@
#if ENABLE(DATABASE)
-#include "StringHash.h"
#include "SecurityOriginHash.h"
#include <wtf/HashMap.h>
#include <wtf/Threading.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/storage/OriginUsageRecord.h b/WebCore/storage/OriginUsageRecord.h
index 25bddf2..a830e68 100644
--- a/WebCore/storage/OriginUsageRecord.h
+++ b/WebCore/storage/OriginUsageRecord.h
@@ -31,10 +31,9 @@
#if ENABLE(DATABASE)
#include "PlatformString.h"
-#include "StringHash.h"
-
#include <wtf/HashMap.h>
-#include <wtf/HashSet.h>
+#include <wtf/HashSet.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/storage/SQLTransactionCoordinator.h b/WebCore/storage/SQLTransactionCoordinator.h
index 247ad13..94360c0 100644
--- a/WebCore/storage/SQLTransactionCoordinator.h
+++ b/WebCore/storage/SQLTransactionCoordinator.h
@@ -33,11 +33,11 @@
#if ENABLE(DATABASE)
-#include "StringHash.h"
#include <wtf/Deque.h>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/storage/StorageAreaSync.h b/WebCore/storage/StorageAreaSync.h
index 94c4670..90aa6a7 100644
--- a/WebCore/storage/StorageAreaSync.h
+++ b/WebCore/storage/StorageAreaSync.h
@@ -29,9 +29,9 @@
#if ENABLE(DOM_STORAGE)
#include "SQLiteDatabase.h"
-#include "StringHash.h"
#include "Timer.h"
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/storage/StorageMap.h b/WebCore/storage/StorageMap.h
index fa5f46c..d162124 100644
--- a/WebCore/storage/StorageMap.h
+++ b/WebCore/storage/StorageMap.h
@@ -29,11 +29,10 @@
#if ENABLE(DOM_STORAGE)
#include "PlatformString.h"
-#include "StringHash.h"
-
#include <wtf/HashMap.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/storage/StorageNamespaceImpl.cpp b/WebCore/storage/StorageNamespaceImpl.cpp
index 557dd76..0f07e07 100644
--- a/WebCore/storage/StorageNamespaceImpl.cpp
+++ b/WebCore/storage/StorageNamespaceImpl.cpp
@@ -29,11 +29,11 @@
#if ENABLE(DOM_STORAGE)
#include "SecurityOriginHash.h"
-#include "StringHash.h"
#include "StorageAreaImpl.h"
#include "StorageMap.h"
#include "StorageSyncManager.h"
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/storage/chromium/QuotaTracker.h b/WebCore/storage/chromium/QuotaTracker.h
index b913563..774475e 100644
--- a/WebCore/storage/chromium/QuotaTracker.h
+++ b/WebCore/storage/chromium/QuotaTracker.h
@@ -35,8 +35,8 @@
#include "PlatformString.h"
#include "SecurityOrigin.h"
-#include "StringHash.h"
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/svg/SVGAltGlyphElement.h b/WebCore/svg/SVGAltGlyphElement.h
index 8cba5bd..cc5364b 100644
--- a/WebCore/svg/SVGAltGlyphElement.h
+++ b/WebCore/svg/SVGAltGlyphElement.h
@@ -23,9 +23,9 @@
#define SVGAltGlyphElement_h
#if ENABLE(SVG_FONTS)
-#include "AtomicString.h"
#include "SVGTextPositioningElement.h"
#include "SVGURIReference.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/svg/SVGDocumentExtensions.cpp b/WebCore/svg/SVGDocumentExtensions.cpp
index 22ab399..819d12b 100644
--- a/WebCore/svg/SVGDocumentExtensions.cpp
+++ b/WebCore/svg/SVGDocumentExtensions.cpp
@@ -24,7 +24,6 @@
#if ENABLE(SVG)
#include "SVGDocumentExtensions.h"
-#include "AtomicString.h"
#include "Console.h"
#include "DOMWindow.h"
#include "Document.h"
@@ -37,6 +36,7 @@
#include "SVGSVGElement.h"
#include "ScriptController.h"
#include "ScriptableDocumentParser.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/svg/SVGDocumentExtensions.h b/WebCore/svg/SVGDocumentExtensions.h
index ad2fb60..da23cd0 100644
--- a/WebCore/svg/SVGDocumentExtensions.h
+++ b/WebCore/svg/SVGDocumentExtensions.h
@@ -22,13 +22,13 @@
#define SVGDocumentExtensions_h
#if ENABLE(SVG)
-#include "AtomicStringHash.h"
#include "SVGResourcesCache.h"
-#include "StringImpl.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/PassOwnPtr.h>
+#include <wtf/text/AtomicStringHash.h>
+#include <wtf/text/StringImpl.h>
namespace WebCore {
diff --git a/WebCore/svg/SVGFitToViewBox.cpp b/WebCore/svg/SVGFitToViewBox.cpp
index 83fd952..c78a619 100644
--- a/WebCore/svg/SVGFitToViewBox.cpp
+++ b/WebCore/svg/SVGFitToViewBox.cpp
@@ -30,7 +30,7 @@
#include "SVGNames.h"
#include "SVGParserUtilities.h"
#include "SVGPreserveAspectRatio.h"
-#include "StringImpl.h"
+#include <wtf/text/StringImpl.h>
namespace WebCore {
diff --git a/WebCore/svg/SVGLangSpace.h b/WebCore/svg/SVGLangSpace.h
index e2a5635..64e435d 100644
--- a/WebCore/svg/SVGLangSpace.h
+++ b/WebCore/svg/SVGLangSpace.h
@@ -22,7 +22,7 @@
#define SVGLangSpace_h
#if ENABLE(SVG)
-#include "AtomicString.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/svg/animation/SMILTimeContainer.h b/WebCore/svg/animation/SMILTimeContainer.h
index dde41f1..4664c68 100644
--- a/WebCore/svg/animation/SMILTimeContainer.h
+++ b/WebCore/svg/animation/SMILTimeContainer.h
@@ -30,12 +30,12 @@
#include "PlatformString.h"
#include "SMILTime.h"
-#include "StringHash.h"
#include "Timer.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/svg/graphics/filters/SVGFilterBuilder.h b/WebCore/svg/graphics/filters/SVGFilterBuilder.h
index 3325dac..4ef6ffe 100644
--- a/WebCore/svg/graphics/filters/SVGFilterBuilder.h
+++ b/WebCore/svg/graphics/filters/SVGFilterBuilder.h
@@ -23,12 +23,12 @@
#include "config.h"
#if ENABLE(SVG) && ENABLE(FILTERS)
-#include "AtomicStringHash.h"
#include "FilterEffect.h"
#include "PlatformString.h"
#include <wtf/HashMap.h>
#include <wtf/PassRefPtr.h>
+#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
diff --git a/WebCore/websockets/WebSocket.h b/WebCore/websockets/WebSocket.h
index 15508b4..fd3ee56 100644
--- a/WebCore/websockets/WebSocket.h
+++ b/WebCore/websockets/WebSocket.h
@@ -34,7 +34,6 @@
#if ENABLE(WEB_SOCKETS)
#include "ActiveDOMObject.h"
-#include "AtomicStringHash.h"
#include "EventListener.h"
#include "EventNames.h"
#include "EventTarget.h"
@@ -43,6 +42,7 @@
#include <wtf/Forward.h>
#include <wtf/OwnPtr.h>
#include <wtf/RefCounted.h>
+#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
diff --git a/WebCore/websockets/WebSocketChannel.cpp b/WebCore/websockets/WebSocketChannel.cpp
index 5859fd7..b8d6e8a 100644
--- a/WebCore/websockets/WebSocketChannel.cpp
+++ b/WebCore/websockets/WebSocketChannel.cpp
@@ -41,11 +41,11 @@
#include "ScriptExecutionContext.h"
#include "SocketStreamError.h"
#include "SocketStreamHandle.h"
-#include "StringHash.h"
#include "WebSocketChannelClient.h"
#include "WebSocketHandshake.h"
#include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
#include <wtf/Deque.h>
#include <wtf/FastMalloc.h>
#include <wtf/HashMap.h>
diff --git a/WebCore/websockets/WebSocketHandshake.cpp b/WebCore/websockets/WebSocketHandshake.cpp
index 7711604..effbb67 100644
--- a/WebCore/websockets/WebSocketHandshake.cpp
+++ b/WebCore/websockets/WebSocketHandshake.cpp
@@ -34,7 +34,6 @@
#include "WebSocketHandshake.h"
-#include "AtomicString.h"
#include "CharacterNames.h"
#include "Cookie.h"
#include "CookieJar.h"
@@ -51,6 +50,7 @@
#include <wtf/StdLibExtras.h>
#include <wtf/StringExtras.h>
#include <wtf/Vector.h>
+#include <wtf/text/AtomicString.h>
#include <wtf/text/CString.h>
namespace WebCore {
diff --git a/WebCore/websockets/WebSocketHandshakeResponse.cpp b/WebCore/websockets/WebSocketHandshakeResponse.cpp
index 753cecf..2e0dad7 100644
--- a/WebCore/websockets/WebSocketHandshakeResponse.cpp
+++ b/WebCore/websockets/WebSocketHandshakeResponse.cpp
@@ -34,8 +34,8 @@
#include "WebSocketHandshakeResponse.h"
-#include "AtomicString.h"
#include <wtf/Assertions.h>
+#include <wtf/text/AtomicString.h>
using namespace std;
diff --git a/WebCore/wml/WMLPageState.h b/WebCore/wml/WMLPageState.h
index 614bc94..0ea7cbb 100644
--- a/WebCore/wml/WMLPageState.h
+++ b/WebCore/wml/WMLPageState.h
@@ -24,9 +24,9 @@
#define WMLPageState_h
#if ENABLE(WML)
-#include "StringHash.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/workers/AbstractWorker.h b/WebCore/workers/AbstractWorker.h
index 789dba2..f4cc50b 100644
--- a/WebCore/workers/AbstractWorker.h
+++ b/WebCore/workers/AbstractWorker.h
@@ -34,13 +34,13 @@
#if ENABLE(WORKERS)
#include "ActiveDOMObject.h"
-#include "AtomicStringHash.h"
#include "EventListener.h"
#include "EventNames.h"
#include "EventTarget.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
diff --git a/WebCore/workers/DefaultSharedWorkerRepository.h b/WebCore/workers/DefaultSharedWorkerRepository.h
index 2ce4422..21e14a1 100644
--- a/WebCore/workers/DefaultSharedWorkerRepository.h
+++ b/WebCore/workers/DefaultSharedWorkerRepository.h
@@ -34,7 +34,6 @@
#if ENABLE(SHARED_WORKERS)
#include "ExceptionCode.h"
-#include "StringHash.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/Noncopyable.h>
@@ -42,6 +41,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
#include <wtf/Threading.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/workers/Worker.h b/WebCore/workers/Worker.h
index 2470b71..0e673ac 100644
--- a/WebCore/workers/Worker.h
+++ b/WebCore/workers/Worker.h
@@ -31,7 +31,6 @@
#include "AbstractWorker.h"
#include "ActiveDOMObject.h"
-#include "AtomicStringHash.h"
#include "EventListener.h"
#include "EventNames.h"
#include "EventTarget.h"
@@ -42,6 +41,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
diff --git a/WebCore/workers/WorkerContext.h b/WebCore/workers/WorkerContext.h
index 56b0324..9e9e54f 100644
--- a/WebCore/workers/WorkerContext.h
+++ b/WebCore/workers/WorkerContext.h
@@ -29,7 +29,6 @@
#if ENABLE(WORKERS)
-#include "AtomicStringHash.h"
#include "EventListener.h"
#include "EventNames.h"
#include "EventTarget.h"
@@ -40,6 +39,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
diff --git a/WebCore/xml/XMLHttpRequest.h b/WebCore/xml/XMLHttpRequest.h
index 363fdf8..2947b46 100644
--- a/WebCore/xml/XMLHttpRequest.h
+++ b/WebCore/xml/XMLHttpRequest.h
@@ -21,7 +21,6 @@
#define XMLHttpRequest_h
#include "ActiveDOMObject.h"
-#include "AtomicStringHash.h"
#include "EventListener.h"
#include "EventNames.h"
#include "EventTarget.h"
@@ -31,6 +30,7 @@
#include "ThreadableLoaderClient.h"
#include "XMLHttpRequestProgressEventThrottle.h"
#include <wtf/OwnPtr.h>
+#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
diff --git a/WebCore/xml/XMLHttpRequestUpload.cpp b/WebCore/xml/XMLHttpRequestUpload.cpp
index 9d0fafc..739082d 100644
--- a/WebCore/xml/XMLHttpRequestUpload.cpp
+++ b/WebCore/xml/XMLHttpRequestUpload.cpp
@@ -26,13 +26,13 @@
#include "config.h"
#include "XMLHttpRequestUpload.h"
-#include "AtomicString.h"
#include "Event.h"
#include "EventException.h"
#include "EventNames.h"
#include "XMLHttpRequest.h"
#include "XMLHttpRequestProgressEvent.h"
#include <wtf/Assertions.h>
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/xml/XMLHttpRequestUpload.h b/WebCore/xml/XMLHttpRequestUpload.h
index 7a605fb..984d86a 100644
--- a/WebCore/xml/XMLHttpRequestUpload.h
+++ b/WebCore/xml/XMLHttpRequestUpload.h
@@ -26,7 +26,6 @@
#ifndef XMLHttpRequestUpload_h
#define XMLHttpRequestUpload_h
-#include "AtomicStringHash.h"
#include "EventListener.h"
#include "EventNames.h"
#include "EventTarget.h"
@@ -36,6 +35,7 @@
#include <wtf/RefPtr.h>
#include <wtf/PassRefPtr.h>
#include <wtf/Vector.h>
+#include <wtf/text/AtomicStringHash.h>
namespace WebCore {
diff --git a/WebCore/xml/XPathExpressionNode.h b/WebCore/xml/XPathExpressionNode.h
index 38070b9..c04d45b 100644
--- a/WebCore/xml/XPathExpressionNode.h
+++ b/WebCore/xml/XPathExpressionNode.h
@@ -29,11 +29,11 @@
#if ENABLE(XPATH)
-#include "StringHash.h"
#include "Node.h"
#include "XPathValue.h"
#include <wtf/HashMap.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
diff --git a/WebCore/xml/XPathNamespace.h b/WebCore/xml/XPathNamespace.h
index 996cb9a..c34eeef 100644
--- a/WebCore/xml/XPathNamespace.h
+++ b/WebCore/xml/XPathNamespace.h
@@ -29,8 +29,8 @@
#if ENABLE(XPATH)
-#include "AtomicString.h"
#include "Node.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
diff --git a/WebCore/xml/XPathParser.cpp b/WebCore/xml/XPathParser.cpp
index 5501df1..aa633dc 100644
--- a/WebCore/xml/XPathParser.cpp
+++ b/WebCore/xml/XPathParser.cpp
@@ -31,12 +31,12 @@
#if ENABLE(XPATH)
#include "ExceptionCode.h"
-#include "StringHash.h"
#include "XPathEvaluator.h"
#include "XPathException.h"
#include "XPathNSResolver.h"
#include "XPathStep.h"
#include <wtf/StdLibExtras.h>
+#include <wtf/text/StringHash.h>
int xpathyyparse(void*);
diff --git a/WebCore/xml/XSLTProcessor.h b/WebCore/xml/XSLTProcessor.h
index 9b91017..5be6b17 100644
--- a/WebCore/xml/XSLTProcessor.h
+++ b/WebCore/xml/XSLTProcessor.h
@@ -26,9 +26,9 @@
#if ENABLE(XSLT)
#include "Node.h"
-#include "StringHash.h"
#include "XSLStyleSheet.h"
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
#if !USE(QXMLQUERY)
#include <libxml/parserInternals.h>
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 93d461e..812bedb 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-10 Gavin Barraclough <barraclough at apple.com>
+
+ Rubber stamped by Sam Weinig.
+
+ Bug 43786 - Move AtomicStringHash from WebCore to WTF
+ Also remove deprecated string headers from WebCore/platform/text.
+
+ * src/WebKit.cpp:
+ * src/WebPageSerializerImpl.h:
+ * src/WebString.cpp:
+
2010-08-10 James Robinson <jamesr at chromium.org>
Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/src/WebKit.cpp b/WebKit/chromium/src/WebKit.cpp
index 1d717ea..786d573 100644
--- a/WebKit/chromium/src/WebKit.cpp
+++ b/WebKit/chromium/src/WebKit.cpp
@@ -31,7 +31,6 @@
#include "config.h"
#include "WebKit.h"
-#include "AtomicString.h"
#include "DOMTimer.h"
#include "Logging.h"
#include "Page.h"
@@ -43,6 +42,7 @@
#include <wtf/Assertions.h>
#include <wtf/Threading.h>
+#include <wtf/text/AtomicString.h>
namespace WebKit {
diff --git a/WebKit/chromium/src/WebPageSerializerImpl.h b/WebKit/chromium/src/WebPageSerializerImpl.h
index 03f0a3b..a7f2fb4 100644
--- a/WebKit/chromium/src/WebPageSerializerImpl.h
+++ b/WebKit/chromium/src/WebPageSerializerImpl.h
@@ -32,10 +32,10 @@
#define WebPageSerializerImpl_h
#include "PlatformString.h"
-#include "StringHash.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
#include "StringBuilder.h"
#include "WebEntities.h"
diff --git a/WebKit/chromium/src/WebString.cpp b/WebKit/chromium/src/WebString.cpp
index bbbe9ce..a091ef4 100644
--- a/WebKit/chromium/src/WebString.cpp
+++ b/WebKit/chromium/src/WebString.cpp
@@ -31,9 +31,9 @@
#include "config.h"
#include "WebString.h"
-#include "AtomicString.h"
#include "PlatformString.h"
#include <wtf/text/CString.h>
+#include <wtf/text/AtomicString.h>
#include "WebCString.h"
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index dbba4a9..1d9e0de 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-10 Gavin Barraclough <barraclough at apple.com>
+
+ Rubber stamped by Sam Weinig.
+
+ Bug 43786 - Move AtomicStringHash from WebCore to WTF
+ Also remove deprecated string headers from WebCore/platform/text.
+
+ * gdom/ConvertToGCharPrivate.h:
+
2010-08-06 Gavin Barraclough <barraclough at apple.com>
Rubber stamped by Sam Weinig
diff --git a/WebKit/gtk/gdom/ConvertToGCharPrivate.h b/WebKit/gtk/gdom/ConvertToGCharPrivate.h
index ef42b08..afbed49 100644
--- a/WebKit/gtk/gdom/ConvertToGCharPrivate.h
+++ b/WebKit/gtk/gdom/ConvertToGCharPrivate.h
@@ -20,10 +20,10 @@
#ifndef ConvertToGCharPrivate_h
#define ConvertToGCharPrivate_h
-#include "AtomicString.h"
#include "KURL.h"
#include "PlatformString.h"
#include <wtf/text/CString.h>
+#include <wtf/text/AtomicString.h>
inline gchar* copyAsGchar(WTF::String const& s)
{
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index b66bf69..c5bf4f8 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-10 Gavin Barraclough <barraclough at apple.com>
+
+ Rubber stamped by Sam Weinig.
+
+ Bug 43786 - Move AtomicStringHash from WebCore to WTF
+ Also remove deprecated string headers from WebCore/platform/text.
+
+ * WebEdit.cpp:
+
2010-08-06 Gavin Barraclough <barraclough at apple.com>
Rubber stamped by Sam Weinig
diff --git a/WebKit/wx/WebEdit.cpp b/WebKit/wx/WebEdit.cpp
index 22ad193..00e5372 100644
--- a/WebKit/wx/WebEdit.cpp
+++ b/WebKit/wx/WebEdit.cpp
@@ -3,7 +3,6 @@
#include "config.h"
#include "WebEdit.h"
-#include "AtomicString.h"
#include "CompositeEditCommand.h"
#include "Document.h"
#include "Frame.h"
@@ -13,6 +12,7 @@
#include "WebFrame.h"
#include "WebDOMElement.h"
+#include <wtf/text/AtomicString.h>
namespace WebCore {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list