Merge r220503 - [WTF] Move TextStream into WTF

https://bugs.webkit.org/show_bug.cgi?id=175211 Reviewed by Myles C. Maxfield. Source/WebCore: No new tests. No change in behavior. * CMakeLists.txt: * WebCore.xcodeproj/project.pbxproj: * dom/ComposedTreeIterator.cpp: * dom/Position.cpp: * dom/Position.h: * dom/Range.cpp: (WebCore::operator<<): * dom/Range.h: * dom/ViewportArguments.cpp: * dom/ViewportArguments.h: * editing/VisiblePosition.cpp: * editing/VisiblePosition.h: * editing/VisibleSelection.cpp: * editing/VisibleSelection.h: * html/HTMLVideoElement.cpp: * html/canvas/CanvasRenderingContext2D.cpp: * page/FrameView.cpp: * page/ViewportConfiguration.cpp: * page/ViewportConfiguration.h: * page/WheelEventDeltaFilter.cpp: * page/animation/CSSPropertyAnimation.cpp: * page/scrolling/AsyncScrollingCoordinator.cpp: * page/scrolling/ScrollingConstraints.cpp: * page/scrolling/ScrollingConstraints.h: * page/scrolling/ScrollingCoordinator.cpp: * page/scrolling/ScrollingCoordinator.h: * page/scrolling/ScrollingStateFixedNode.cpp: * page/scrolling/ScrollingStateFixedNode.h: * page/scrolling/ScrollingStateFrameScrollingNode.cpp: * page/scrolling/ScrollingStateFrameScrollingNode.h: * page/scrolling/ScrollingStateNode.cpp: * page/scrolling/ScrollingStateNode.h: * page/scrolling/ScrollingStateOverflowScrollingNode.cpp: * page/scrolling/ScrollingStateOverflowScrollingNode.h: * page/scrolling/ScrollingStateScrollingNode.cpp: * page/scrolling/ScrollingStateScrollingNode.h: * page/scrolling/ScrollingStateStickyNode.cpp: * page/scrolling/ScrollingStateStickyNode.h: * page/scrolling/ScrollingTree.cpp: * page/scrolling/ScrollingTreeFrameScrollingNode.cpp: * page/scrolling/ScrollingTreeFrameScrollingNode.h: * page/scrolling/ScrollingTreeNode.cpp: * page/scrolling/ScrollingTreeNode.h: * page/scrolling/ScrollingTreeScrollingNode.cpp: * page/scrolling/ScrollingTreeScrollingNode.h: * page/scrolling/mac/ScrollingTreeFixedNode.h: * page/scrolling/mac/ScrollingTreeFixedNode.mm: * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm: * page/scrolling/mac/ScrollingTreeStickyNode.h: * page/scrolling/mac/ScrollingTreeStickyNode.mm: * platform/CalculationValue.cpp: * platform/CalculationValue.h: * platform/LayoutUnit.cpp: * platform/LayoutUnit.h: * platform/Length.cpp: * platform/Length.h: * platform/LengthBox.cpp: * platform/LengthBox.h: * platform/LengthPoint.cpp: * platform/LengthPoint.h: * platform/LengthSize.cpp: * platform/LengthSize.h: * platform/LogMacros.h: * platform/ScrollView.cpp: * platform/ScrollableArea.cpp: * platform/animation/TimingFunction.cpp: * platform/animation/TimingFunction.h: * platform/graphics/BitmapImage.cpp: * platform/graphics/BitmapImage.h: * platform/graphics/Color.cpp: * platform/graphics/Color.h: * platform/graphics/CrossfadeGeneratedImage.cpp: * platform/graphics/CrossfadeGeneratedImage.h: * platform/graphics/FloatPoint.cpp: * platform/graphics/FloatPoint.h: * platform/graphics/FloatPoint3D.cpp: * platform/graphics/FloatPoint3D.h: * platform/graphics/FloatRect.cpp: * platform/graphics/FloatRect.h: * platform/graphics/FloatRoundedRect.cpp: * platform/graphics/FloatRoundedRect.h: * platform/graphics/FloatSize.cpp: * platform/graphics/FloatSize.h: * platform/graphics/FontTaggedSettings.cpp: * platform/graphics/FontTaggedSettings.h: * platform/graphics/GradientImage.cpp: (WebCore::GradientImage::dump const): * platform/graphics/GradientImage.h: * platform/graphics/GraphicsContext.cpp: * platform/graphics/GraphicsContext.h: * platform/graphics/GraphicsLayer.cpp: * platform/graphics/GraphicsLayer.h: (WebCore::GraphicsLayer::dumpAdditionalProperties const): * platform/graphics/GraphicsTypes.cpp: * platform/graphics/GraphicsTypes.h: * platform/graphics/Image.cpp: * platform/graphics/Image.h: * platform/graphics/ImageSource.h: * platform/graphics/IntPoint.cpp: * platform/graphics/IntPoint.h: * platform/graphics/IntRect.cpp: * platform/graphics/IntRect.h: * platform/graphics/IntSize.cpp: * platform/graphics/IntSize.h: * platform/graphics/LayoutPoint.cpp: * platform/graphics/LayoutPoint.h: * platform/graphics/LayoutRect.cpp: * platform/graphics/LayoutRect.h: * platform/graphics/LayoutSize.cpp: * platform/graphics/LayoutSize.h: * platform/graphics/NamedImageGeneratedImage.cpp: * platform/graphics/NamedImageGeneratedImage.h: * platform/graphics/Path.cpp: * platform/graphics/Path.h: * platform/graphics/ca/GraphicsLayerCA.cpp: * platform/graphics/ca/GraphicsLayerCA.h: * platform/graphics/ca/PlatformCAAnimation.cpp: * platform/graphics/ca/PlatformCAAnimation.h: * platform/graphics/ca/PlatformCALayer.cpp: * platform/graphics/ca/PlatformCALayer.h: * platform/graphics/ca/TileController.cpp: * platform/graphics/ca/TileGrid.cpp: * platform/graphics/cg/GraphicsContextCG.cpp: * platform/graphics/cg/PDFDocumentImage.cpp: * platform/graphics/cg/PDFDocumentImage.h: * platform/graphics/cocoa/IOSurface.h: * platform/graphics/cocoa/IOSurface.mm: * platform/graphics/displaylists/DisplayList.cpp: (WebCore::DisplayList::DisplayList::description const): * platform/graphics/displaylists/DisplayList.h: * platform/graphics/displaylists/DisplayListItems.cpp: * platform/graphics/displaylists/DisplayListItems.h: * platform/graphics/displaylists/DisplayListRecorder.cpp: * platform/graphics/displaylists/DisplayListReplayer.cpp: * platform/graphics/filters/DistantLightSource.cpp: * platform/graphics/filters/DistantLightSource.h: * platform/graphics/filters/FEBlend.cpp: * platform/graphics/filters/FEBlend.h: * platform/graphics/filters/FEColorMatrix.cpp: * platform/graphics/filters/FEColorMatrix.h: * platform/graphics/filters/FEComponentTransfer.cpp: * platform/graphics/filters/FEComponentTransfer.h: * platform/graphics/filters/FEComposite.cpp: * platform/graphics/filters/FEComposite.h: * platform/graphics/filters/FEConvolveMatrix.cpp: * platform/graphics/filters/FEConvolveMatrix.h: * platform/graphics/filters/FEDiffuseLighting.cpp: * platform/graphics/filters/FEDiffuseLighting.h: * platform/graphics/filters/FEDisplacementMap.cpp: * platform/graphics/filters/FEDisplacementMap.h: * platform/graphics/filters/FEDropShadow.cpp: * platform/graphics/filters/FEDropShadow.h: * platform/graphics/filters/FEFlood.cpp: * platform/graphics/filters/FEFlood.h: * platform/graphics/filters/FEGaussianBlur.cpp: * platform/graphics/filters/FEGaussianBlur.h: * platform/graphics/filters/FEMerge.cpp: * platform/graphics/filters/FEMerge.h: * platform/graphics/filters/FEMorphology.cpp: * platform/graphics/filters/FEMorphology.h: * platform/graphics/filters/FEOffset.cpp: * platform/graphics/filters/FEOffset.h: * platform/graphics/filters/FESpecularLighting.cpp: * platform/graphics/filters/FESpecularLighting.h: * platform/graphics/filters/FETile.cpp: * platform/graphics/filters/FETile.h: * platform/graphics/filters/FETurbulence.cpp: * platform/graphics/filters/FETurbulence.h: * platform/graphics/filters/FilterEffect.cpp: * platform/graphics/filters/FilterEffect.h: * platform/graphics/filters/FilterOperation.cpp: * platform/graphics/filters/FilterOperation.h: * platform/graphics/filters/FilterOperations.cpp: * platform/graphics/filters/FilterOperations.h: * platform/graphics/filters/LightSource.h: * platform/graphics/filters/PointLightSource.cpp: * platform/graphics/filters/PointLightSource.h: * platform/graphics/filters/SourceAlpha.cpp: * platform/graphics/filters/SourceAlpha.h: * platform/graphics/filters/SourceGraphic.cpp: * platform/graphics/filters/SourceGraphic.h: * platform/graphics/filters/SpotLightSource.cpp: * platform/graphics/filters/SpotLightSource.h: * platform/graphics/transforms/AffineTransform.cpp: * platform/graphics/transforms/AffineTransform.h: * platform/graphics/transforms/IdentityTransformOperation.h: * platform/graphics/transforms/Matrix3DTransformOperation.cpp: * platform/graphics/transforms/Matrix3DTransformOperation.h: * platform/graphics/transforms/MatrixTransformOperation.cpp: * platform/graphics/transforms/MatrixTransformOperation.h: * platform/graphics/transforms/PerspectiveTransformOperation.cpp: * platform/graphics/transforms/PerspectiveTransformOperation.h: * platform/graphics/transforms/RotateTransformOperation.cpp: * platform/graphics/transforms/RotateTransformOperation.h: * platform/graphics/transforms/ScaleTransformOperation.cpp: * platform/graphics/transforms/ScaleTransformOperation.h: * platform/graphics/transforms/SkewTransformOperation.cpp: * platform/graphics/transforms/SkewTransformOperation.h: * platform/graphics/transforms/TransformOperation.cpp: * platform/graphics/transforms/TransformOperation.h: * platform/graphics/transforms/TransformOperations.cpp: * platform/graphics/transforms/TransformOperations.h: * platform/graphics/transforms/TransformationMatrix.cpp: * platform/graphics/transforms/TransformationMatrix.h: * platform/graphics/transforms/TranslateTransformOperation.cpp: * platform/graphics/transforms/TranslateTransformOperation.h: * platform/ios/SelectionRect.cpp: (WebCore::operator<<): * platform/ios/SelectionRect.h: * platform/mac/ScrollAnimatorMac.mm: * platform/text/TextAllInOne.cpp: * rendering/InlineBox.cpp: * rendering/InlineBox.h: * rendering/InlineFlowBox.cpp: (WebCore::InlineFlowBox::outputLineTreeAndMark const): * rendering/InlineFlowBox.h: * rendering/InlineTextBox.cpp: * rendering/InlineTextBox.h: * rendering/RenderBlockFlow.cpp: (WebCore::RenderBlockFlow::outputLineTreeAndMark const): * rendering/RenderBlockFlow.h: * rendering/RenderLayer.cpp: * rendering/RenderLayerCompositor.cpp: * rendering/RenderObject.cpp: * rendering/RenderObject.h: * rendering/RenderTreeAsText.cpp: * rendering/RenderTreeAsText.h: * rendering/ScrollAlignment.cpp: * rendering/ScrollAlignment.h: * rendering/SimpleLineLayoutCoverage.cpp: * rendering/SimpleLineLayoutFunctions.cpp: * rendering/SimpleLineLayoutFunctions.h: * rendering/style/FillLayer.cpp: * rendering/style/FillLayer.h: * rendering/style/NinePieceImage.cpp: * rendering/style/NinePieceImage.h: * rendering/style/RenderStyleConstants.cpp: * rendering/style/RenderStyleConstants.h: * rendering/svg/SVGRenderTreeAsText.cpp: (WebCore::operator<<): * rendering/svg/SVGRenderTreeAsText.h: (WebCore::operator<<): * svg/SVGLengthValue.cpp: * svg/SVGLengthValue.h: * svg/graphics/SVGImage.cpp: * svg/graphics/SVGImage.h: * svg/graphics/filters/SVGFEImage.cpp: * svg/graphics/filters/SVGFEImage.h: Source/WebKit: * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp: * Shared/VisibleContentRectUpdateInfo.cpp: * Shared/VisibleContentRectUpdateInfo.h: * Shared/mac/RemoteLayerTreeTransaction.mm: * UIProcess/API/Cocoa/WKWebView.mm: * UIProcess/ios/WKContentView.mm: * UIProcess/ios/WKContentViewInteraction.h: * UIProcess/ios/WKContentViewInteraction.mm: (WebKit::operator<<): * UIProcess/ios/WebPageProxyIOS.mm: * WebProcess/WebPage/ios/WebPageIOS.mm: * WebProcess/WebPage/mac/PlatformCAAnimationRemote.h: * WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm: Source/WTF: * WTF.xcodeproj/project.pbxproj: * wtf/CMakeLists.txt: * wtf/text/TextStream.cpp: Renamed from Source/WebCore/platform/text/TextStream.cpp. (WTF::TextStream::writeIndent): * wtf/text/TextStream.h: Renamed from Source/WebCore/platform/text/TextStream.h. (WTF::TextStream::FormatNumberRespectingIntegers::FormatNumberRespectingIntegers): Tools: * TestWebKitAPI/Tests/WebCore/CalculationValue.cpp:
WebKit · Aug 14, 2017 · b25716c · b25716c
1 parent 4bcc2e2
commit b25716c
Show file tree

Hide file tree

Showing 260 changed files with 811 additions and 418 deletions.
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
@@ -1,3 +1,17 @@
+2017-08-09  Don Olmstead  <don.olmstead@sony.com>
+
+        [WTF] Move TextStream into WTF
+        https://bugs.webkit.org/show_bug.cgi?id=175211
+
+        Reviewed by Myles C. Maxfield.
+
+        * WTF.xcodeproj/project.pbxproj:
+        * wtf/CMakeLists.txt:
+        * wtf/text/TextStream.cpp: Renamed from Source/WebCore/platform/text/TextStream.cpp.
+        (WTF::TextStream::writeIndent):
+        * wtf/text/TextStream.h: Renamed from Source/WebCore/platform/text/TextStream.h.
+        (WTF::TextStream::FormatNumberRespectingIntegers::FormatNumberRespectingIntegers):
+
 2017-08-08  Filip Pizlo  <fpizlo@apple.com>
 
         Baseline JIT should do caging

diff --git a/Source/WTF/WTF.xcodeproj/project.pbxproj b/Source/WTF/WTF.xcodeproj/project.pbxproj
@@ -76,6 +76,7 @@
 		93F1993E19D7958D00C2390B /* StringView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F1993D19D7958D00C2390B /* StringView.cpp */; };
 		9BC70F05176C379D00101DEC /* AtomicStringTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BC70F04176C379D00101DEC /* AtomicStringTable.cpp */; };
 		A3B725EC987446AD93F1A440 /* RandomDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8F597CA2A57417FBAB92FD6 /* RandomDevice.cpp */; };
+		A3E4DD931F3A803400DED0B4 /* TextStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3E4DD911F3A803400DED0B4 /* TextStream.cpp */; };
 		A5BA15F3182433A900A82E69 /* StringMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F2182433A900A82E69 /* StringMac.mm */; };
 		A5BA15F51824348000A82E69 /* StringImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F41824348000A82E69 /* StringImplMac.mm */; };
 		A5BA15FA182435A600A82E69 /* AtomicStringImplCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15F7182435A600A82E69 /* AtomicStringImplCF.cpp */; };
@@ -352,6 +353,8 @@
 		9C67C542589348E285B49699 /* IndexedContainerIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexedContainerIterator.h; sourceTree = "<group>"; };
 		A30D412C1F0DE0BA00B71954 /* SoftLinking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoftLinking.h; sourceTree = "<group>"; };
 		A30D412D1F0DE13F00B71954 /* SoftLinking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoftLinking.h; sourceTree = "<group>"; };
+		A3E4DD911F3A803400DED0B4 /* TextStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextStream.cpp; sourceTree = "<group>"; };
+		A3E4DD921F3A803400DED0B4 /* TextStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextStream.h; sourceTree = "<group>"; };
 		A5098AFF1C169E0700087797 /* SandboxSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SandboxSPI.h; sourceTree = "<group>"; };
 		A5098B011C16A4F900087797 /* SecuritySPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecuritySPI.h; sourceTree = "<group>"; };
 		A561F30F1DF2642100FF675D /* DeprecatedOptional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedOptional.h; sourceTree = "<group>"; };
@@ -1086,6 +1089,8 @@
 				1C181C7E1D3078DA00F5FA16 /* TextBreakIterator.h */,
 				1C181C821D3079AC00F5FA16 /* TextBreakIteratorInternalICU.h */,
 				A8A4732C151A825B004123FF /* TextPosition.h */,
+				A3E4DD911F3A803400DED0B4 /* TextStream.cpp */,
+				A3E4DD921F3A803400DED0B4 /* TextStream.h */,
 				70ECA60C1B02426800449739 /* UniquedStringImpl.h */,
 				A8A4732D151A825B004123FF /* WTFString.cpp */,
 				A8A4732E151A825B004123FF /* WTFString.h */,
@@ -1308,6 +1313,7 @@
 				A8A473AA151A825B004123FF /* bignum.cc in Sources */,
 				A8A47451151A825B004123FF /* BinarySemaphore.cpp in Sources */,
 				A8A4738B151A825B004123FF /* BitVector.cpp in Sources */,
+				A3E4DD931F3A803400DED0B4 /* TextStream.cpp in Sources */,
 				DCEE22011CEA7551000C2396 /* BlockObjCExceptions.mm in Sources */,
 				A8A473AC151A825B004123FF /* cached-powers.cc in Sources */,
 				0F66B28A1DC97BAB004A1D3F /* ClockType.cpp in Sources */,

diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
@@ -186,6 +186,7 @@ set(WTF_HEADERS
     text/SymbolRegistry.h
     text/TextBreakIterator.h
     text/TextBreakIteratorInternalICU.h
+    text/TextStream.h
     text/UniquedStringImpl.h
     text/WTFString.h
 
@@ -286,6 +287,7 @@ set(WTF_SOURCES
     text/SymbolImpl.cpp
     text/SymbolRegistry.cpp
     text/TextBreakIterator.cpp
+    text/TextStream.cpp
     text/WTFString.cpp
 
     text/icu/UTextProvider.cpp

diff --git a/Source/WebCore/platform/text/TextStream.cpp → Source/WTF/wtf/text/TextStream.cpp b/Source/WebCore/platform/text/TextStream.cpp → Source/WTF/wtf/text/TextStream.cpp
@@ -30,7 +30,7 @@
 #include <wtf/StringExtras.h>
 #include <wtf/text/WTFString.h>
 
-namespace WebCore {
+namespace WTF {
 
 static const size_t printBufferSize = 100; // large enough for any integer or floating point value in string format, including trailing null character
 
@@ -172,7 +172,7 @@ void TextStream::nextLine()
 void TextStream::writeIndent()
 {
     if (m_multiLineMode)
-        WebCore::writeIndent(*this, m_indent);
+        WTF::writeIndent(*this, m_indent);
 }
 
 void writeIndent(TextStream& ts, int indent)

diff --git a/Source/WebCore/platform/text/TextStream.h → Source/WTF/wtf/text/TextStream.h b/Source/WebCore/platform/text/TextStream.h → Source/WTF/wtf/text/TextStream.h
@@ -28,12 +28,14 @@
 #include <wtf/Forward.h>
 #include <wtf/text/StringBuilder.h>
 
-namespace WebCore {
+namespace WTF {
 
 class TextStream {
 public:
     struct FormatNumberRespectingIntegers {
-        FormatNumberRespectingIntegers(double number) : value(number) { }
+        FormatNumberRespectingIntegers(double number)
+            : value(number) { }
+
         double value;
     };
 
@@ -52,21 +54,21 @@ class TextStream {
     {
     }
 
-    WEBCORE_EXPORT TextStream& operator<<(bool);
-    WEBCORE_EXPORT TextStream& operator<<(int);
-    WEBCORE_EXPORT TextStream& operator<<(unsigned);
-    WEBCORE_EXPORT TextStream& operator<<(long);
-    WEBCORE_EXPORT TextStream& operator<<(unsigned long);
-    WEBCORE_EXPORT TextStream& operator<<(long long);
-
-    WEBCORE_EXPORT TextStream& operator<<(unsigned long long);
-    WEBCORE_EXPORT TextStream& operator<<(float);
-    WEBCORE_EXPORT TextStream& operator<<(double);
-    WEBCORE_EXPORT TextStream& operator<<(const char*);
-    WEBCORE_EXPORT TextStream& operator<<(const void*);
-    WEBCORE_EXPORT TextStream& operator<<(const String&);
+    WTF_EXPORT_PRIVATE TextStream& operator<<(bool);
+    WTF_EXPORT_PRIVATE TextStream& operator<<(int);
+    WTF_EXPORT_PRIVATE TextStream& operator<<(unsigned);
+    WTF_EXPORT_PRIVATE TextStream& operator<<(long);
+    WTF_EXPORT_PRIVATE TextStream& operator<<(unsigned long);
+    WTF_EXPORT_PRIVATE TextStream& operator<<(long long);
+
+    WTF_EXPORT_PRIVATE TextStream& operator<<(unsigned long long);
+    WTF_EXPORT_PRIVATE TextStream& operator<<(float);
+    WTF_EXPORT_PRIVATE TextStream& operator<<(double);
+    WTF_EXPORT_PRIVATE TextStream& operator<<(const char*);
+    WTF_EXPORT_PRIVATE TextStream& operator<<(const void*);
+    WTF_EXPORT_PRIVATE TextStream& operator<<(const String&);
     // Deprecated. Use the NumberRespectingIntegers FormattingFlag instead.
-    WEBCORE_EXPORT TextStream& operator<<(const FormatNumberRespectingIntegers&);
+    WTF_EXPORT_PRIVATE TextStream& operator<<(const FormatNumberRespectingIntegers&);
 
     FormattingFlags formattingFlags() const { return m_formattingFlags; }
     void setFormattingFlags(FormattingFlags flags) { m_formattingFlags = flags; }
@@ -82,16 +84,16 @@ class TextStream {
         ts.endGroup();
     }
 
-    WEBCORE_EXPORT String release();
+    WTF_EXPORT_PRIVATE String release();
 
-    WEBCORE_EXPORT void startGroup();
-    WEBCORE_EXPORT void endGroup();
-    WEBCORE_EXPORT void nextLine(); // Output newline and indent.
+    WTF_EXPORT_PRIVATE void startGroup();
+    WTF_EXPORT_PRIVATE void endGroup();
+    WTF_EXPORT_PRIVATE void nextLine(); // Output newline and indent.
 
     void increaseIndent(int amount = 1) { m_indent += amount; }
     void decreaseIndent(int amount = 1) { m_indent -= amount; ASSERT(m_indent >= 0); }
 
-    WEBCORE_EXPORT void writeIndent();
+    WTF_EXPORT_PRIVATE void writeIndent();
 
     class GroupScope {
     public:
@@ -131,6 +133,8 @@ TextStream& operator<<(TextStream& ts, const Vector<Item>& vector)
     return ts << "]";
 }
 
-void writeIndent(TextStream&, int indent);
+WTF_EXPORT_PRIVATE void writeIndent(TextStream&, int indent);
+
+} // namespace WTF
 
-} // namespace WebCore
+using WTF::TextStream;
diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
@@ -2533,7 +2533,6 @@ set(WebCore_SOURCES
     platform/text/TextEncoding.cpp
     platform/text/TextEncodingDetectorICU.cpp
     platform/text/TextEncodingRegistry.cpp
-    platform/text/TextStream.cpp
 
     plugins/DOMMimeType.cpp
     plugins/DOMMimeTypeArray.cpp