[WTF] Move TextStream into WTF

author don.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Thu, 10 Aug 2017 01:15:14 +0000 (01:15 +0000)

committer don.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Thu, 10 Aug 2017 01:15:14 +0000 (01:15 +0000)
author don.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Aug 2017 01:15:14 +0000 (01:15 +0000)
committer don.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Aug 2017 01:15:14 +0000 (01:15 +0000)
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog

index 0f873cf..e676729 100644 (file)
--- 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-09  Commit Queue  <commit-queue@webkit.org>
  
          Unreviewed, rolling out r220466, r220477, and r220487.
diff --git a/Source/WTF/WTF.xcodeproj/project.pbxproj b/Source/WTF/WTF.xcodeproj/project.pbxproj

index 6af063c..ce06f5d 100644 (file)
--- 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

index 3736824..5869610 100644 (file)
--- 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 b/Source/WTF/wtf/text/TextStream.cpp

similarity index 98%

rename from Source/WebCore/platform/text/TextStream.cpp

rename to Source/WTF/wtf/text/TextStream.cpp

index 16b492a..c2f2ef2 100644 (file)
--- a/Source/WebCore/platform/text/TextStream.cpp
+++ b/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 b/Source/WTF/wtf/text/TextStream.h

similarity index 73%

rename from Source/WebCore/platform/text/TextStream.h

rename to Source/WTF/wtf/text/TextStream.h

index 01aac47..9cbb230 100644 (file)
--- a/Source/WebCore/platform/text/TextStream.h
+++ b/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 @@ public:
      {
      }
  
-    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 @@ public:
          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

index fdba5da..e1ad58e 100644 (file)
--- 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
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog

index 8eff23a..130e4f0 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,261 @@
+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.
+
+        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:
+
  2017-08-09  Commit Queue  <commit-queue@webkit.org>
  
          Unreviewed, rolling out r220466, r220477, and r220487.
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj

index 3c4dd0d..b8dde40 100644 (file)
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -5270,8 +5270,6 @@
                 B2C3DA470D006C1D00EF6F26 /* TextEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA170D006C1D00EF6F26 /* TextEncoding.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 B2C3DA480D006C1D00EF6F26 /* TextEncodingRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA180D006C1D00EF6F26 /* TextEncodingRegistry.cpp */; };
                 B2C3DA490D006C1D00EF6F26 /* TextEncodingRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA190D006C1D00EF6F26 /* TextEncodingRegistry.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               B2C3DA4A0D006C1D00EF6F26 /* TextStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA1A0D006C1D00EF6F26 /* TextStream.cpp */; };
-               B2C3DA4B0D006C1D00EF6F26 /* TextStream.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA1B0D006C1D00EF6F26 /* TextStream.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 B2C3DA600D006CD600EF6F26 /* FontCascade.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA4F0D006CD600EF6F26 /* FontCascade.cpp */; };
                 B2C3DA610D006CD600EF6F26 /* FontCascade.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA500D006CD600EF6F26 /* FontCascade.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 B2C3DA620D006CD600EF6F26 /* FontCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C3DA510D006CD600EF6F26 /* FontCache.cpp */; };
@@ -13759,8 +13757,6 @@
                 B2C3DA170D006C1D00EF6F26 /* TextEncoding.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextEncoding.h; sourceTree = "<group>"; };
                 B2C3DA180D006C1D00EF6F26 /* TextEncodingRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextEncodingRegistry.cpp; sourceTree = "<group>"; };
                 B2C3DA190D006C1D00EF6F26 /* TextEncodingRegistry.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextEncodingRegistry.h; sourceTree = "<group>"; };
-               B2C3DA1A0D006C1D00EF6F26 /* TextStream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextStream.cpp; sourceTree = "<group>"; };
-               B2C3DA1B0D006C1D00EF6F26 /* TextStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextStream.h; sourceTree = "<group>"; };
                 B2C3DA4F0D006CD600EF6F26 /* FontCascade.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontCascade.cpp; sourceTree = "<group>"; };
                 B2C3DA500D006CD600EF6F26 /* FontCascade.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontCascade.h; sourceTree = "<group>"; };
                 B2C3DA510D006CD600EF6F26 /* FontCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontCache.cpp; sourceTree = "<group>"; };
@@ -23474,8 +23470,6 @@
                                 B2C3DA180D006C1D00EF6F26 /* TextEncodingRegistry.cpp */,
                                 B2C3DA190D006C1D00EF6F26 /* TextEncodingRegistry.h */,
                                 B2C3DA150D006C1D00EF6F26 /* TextFlags.h */,
-                               B2C3DA1A0D006C1D00EF6F26 /* TextStream.cpp */,
-                               B2C3DA1B0D006C1D00EF6F26 /* TextStream.h */,
                                 A863E2001343412000274926 /* UnicodeBidi.h */,
                                 14476AA715DC4BB100305DB2 /* WritingMode.h */,
                         );
@@ -29978,7 +29972,6 @@
                                 93F198F608245E59001E9ABC /* TextResourceDecoder.h in Headers */,
                                 A824B4650E2EF2EA0081A7B7 /* TextRun.h in Headers */,
                                 448B1B7A0F3A2F9B0047A9E2 /* TextSizeAdjustment.h in Headers */,
-                               B2C3DA4B0D006C1D00EF6F26 /* TextStream.h in Headers */,
                                 9759E94014EF1CF80026A2DD /* TextTrack.h in Headers */,
                                 9759E94314EF1CF80026A2DD /* TextTrackCue.h in Headers */,
                                 071A9EC3168FBC55002629F9 /* TextTrackCueGeneric.h in Headers */,
@@ -33702,7 +33695,6 @@
                                 E4C91A101802343900A17F6D /* TextPaintStyle.cpp in Sources */,
                                 93F19A9D08245E59001E9ABC /* TextResourceDecoder.cpp in Sources */,
                                 376DCCE113B4F966002EBEFC /* TextRun.cpp in Sources */,
-                               B2C3DA4A0D006C1D00EF6F26 /* TextStream.cpp in Sources */,
                                 9759E93F14EF1CF80026A2DD /* TextTrack.cpp in Sources */,
                                 9759E94214EF1CF80026A2DD /* TextTrackCue.cpp in Sources */,
                                 071A9EC2168FBC43002629F9 /* TextTrackCueGeneric.cpp in Sources */,
diff --git a/Source/WebCore/dom/ComposedTreeIterator.cpp b/Source/WebCore/dom/ComposedTreeIterator.cpp

index af554ac..80ca4de 100644 (file)
--- a/Source/WebCore/dom/ComposedTreeIterator.cpp
+++ b/Source/WebCore/dom/ComposedTreeIterator.cpp
@@ -27,7 +27,7 @@
  #include "ComposedTreeIterator.h"
  
  #include "HTMLSlotElement.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/dom/Position.cpp b/Source/WebCore/dom/Position.cpp

index b6f5575..0c6bc25 100644 (file)
--- a/Source/WebCore/dom/Position.cpp
+++ b/Source/WebCore/dom/Position.cpp
@@ -48,11 +48,11 @@
  #include "RuntimeEnabledFeatures.h"
  #include "Text.h"
  #include "TextIterator.h"
-#include "TextStream.h"
  #include "VisiblePosition.h"
  #include "VisibleUnits.h"
  #include <stdio.h>
  #include <wtf/text/CString.h>
+#include <wtf/text/TextStream.h>
  #include <wtf/unicode/CharacterNames.h>
  
  #if ENABLE(TREE_DEBUGGING)
diff --git a/Source/WebCore/dom/Position.h b/Source/WebCore/dom/Position.h

index 2cf6802..2dcfe59 100644 (file)
--- a/Source/WebCore/dom/Position.h
+++ b/Source/WebCore/dom/Position.h
@@ -31,6 +31,10 @@
  #include <wtf/Assertions.h>
  #include <wtf/RefPtr.h>
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class CSSComputedStyleDeclaration;
@@ -41,7 +45,6 @@ class Range;
  class RenderElement;
  class RenderObject;
  class Text;
-class TextStream;
  
  enum PositionMoveType {
      CodePoint,       // Move by a single code point.
@@ -327,7 +330,7 @@ inline bool offsetIsBeforeLastNodeOffset(int offset, Node* anchorNode)
      return offset < currentOffset;
  }
  
-TextStream& operator<<(TextStream&, const Position&);
+WTF::TextStream& operator<<(WTF::TextStream&, const Position&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/dom/Range.cpp b/Source/WebCore/dom/Range.cpp

index 0494cb2..5dae063 100644 (file)
--- a/Source/WebCore/dom/Range.cpp
+++ b/Source/WebCore/dom/Range.cpp
@@ -1861,12 +1861,12 @@ FloatRect Range::absoluteBoundingRect(RespectClippingForTextRects respectClippin
      return boundingRect(CoordinateSpace::Absolute, respectClippingForTextRects);
  }
  
-TextStream& operator<<(TextStream& ts, const RangeBoundaryPoint& r)
+WTF::TextStream& operator<<(WTF::TextStream& ts, const RangeBoundaryPoint& r)
  {
      return ts << r.toPosition();
  }
      
-TextStream& operator<<(TextStream& ts, const Range& r)
+WTF::TextStream& operator<<(WTF::TextStream& ts, const Range& r)
  {
      return ts << "Range: " << "start: " << r.startPosition() << " end: " << r.endPosition();
  }
diff --git a/Source/WebCore/dom/Range.h b/Source/WebCore/dom/Range.h

index f43db39..3f1c50c 100644 (file)
--- a/Source/WebCore/dom/Range.h
+++ b/Source/WebCore/dom/Range.h
@@ -184,8 +184,8 @@ inline bool documentOrderComparator(const Node* a, const Node* b)
      return Range::compareBoundaryPoints(const_cast<Node*>(a), 0, const_cast<Node*>(b), 0).releaseReturnValue() < 0;
  }
      
-TextStream& operator<<(TextStream&, const RangeBoundaryPoint&);
-TextStream& operator<<(TextStream&, const Range&);
+WTF::TextStream& operator<<(WTF::TextStream&, const RangeBoundaryPoint&);
+WTF::TextStream& operator<<(WTF::TextStream&, const Range&);
  
  } // namespace
  
diff --git a/Source/WebCore/dom/ViewportArguments.cpp b/Source/WebCore/dom/ViewportArguments.cpp

index e1c54d2..b174153 100644 (file)
--- a/Source/WebCore/dom/ViewportArguments.cpp
+++ b/Source/WebCore/dom/ViewportArguments.cpp
@@ -33,7 +33,7 @@
  #include "IntSize.h"
  #include "ScriptableDocumentParser.h"
  #include "Settings.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/dom/ViewportArguments.h b/Source/WebCore/dom/ViewportArguments.h

index 22e5b97..ac2ab5a 100644 (file)
--- a/Source/WebCore/dom/ViewportArguments.h
+++ b/Source/WebCore/dom/ViewportArguments.h
@@ -145,6 +145,6 @@ float computeMinimumScaleFactorForContentContained(const ViewportAttributes& res
  
  void setViewportFeature(ViewportArguments&, Document&, StringView key, StringView value);
  
-TextStream& operator<<(TextStream&, const ViewportArguments&);
+WTF::TextStream& operator<<(WTF::TextStream&, const ViewportArguments&);
  
  } // namespace WebCore
diff --git a/Source/WebCore/editing/VisiblePosition.cpp b/Source/WebCore/editing/VisiblePosition.cpp

index 62a5833..19ecaf6 100644 (file)
--- a/Source/WebCore/editing/VisiblePosition.cpp
+++ b/Source/WebCore/editing/VisiblePosition.cpp
@@ -39,10 +39,10 @@
  #include "RenderBlock.h"
  #include "RootInlineBox.h"
  #include "Text.h"
-#include "TextStream.h"
  #include "VisibleUnits.h"
  #include <stdio.h>
  #include <wtf/text/CString.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/editing/VisiblePosition.h b/Source/WebCore/editing/VisiblePosition.h

index 98a1142..be3b5f9 100644 (file)
--- a/Source/WebCore/editing/VisiblePosition.h
+++ b/Source/WebCore/editing/VisiblePosition.h
@@ -28,6 +28,10 @@
  #include "EditingBoundary.h"
  #include "Position.h"
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  // VisiblePosition default affinity is downstream because
@@ -45,7 +49,6 @@ namespace WebCore {
  
  class InlineBox;
  class Node;
-class TextStream;
  
  class VisiblePosition {
  public:
@@ -162,8 +165,8 @@ WEBCORE_EXPORT Element* enclosingBlockFlowElement(const VisiblePosition&);
  bool isFirstVisiblePositionInNode(const VisiblePosition&, const Node*);
  bool isLastVisiblePositionInNode(const VisiblePosition&, const Node*);
  
-TextStream& operator<<(TextStream&, EAffinity);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const VisiblePosition&);
+WTF::TextStream& operator<<(WTF::TextStream&, EAffinity);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const VisiblePosition&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/editing/VisibleSelection.cpp b/Source/WebCore/editing/VisibleSelection.cpp

index 7ef9555..2581785 100644 (file)
--- a/Source/WebCore/editing/VisibleSelection.cpp
+++ b/Source/WebCore/editing/VisibleSelection.cpp
@@ -31,12 +31,12 @@
  #include "Element.h"
  #include "HTMLInputElement.h"
  #include "TextIterator.h"
-#include "TextStream.h"
  #include "VisibleUnits.h"
  #include <stdio.h>
  #include <wtf/Assertions.h>
  #include <wtf/text/CString.h>
  #include <wtf/text/StringBuilder.h>
+#include <wtf/text/TextStream.h>
  #include <wtf/unicode/CharacterNames.h>
  
  namespace WebCore {
diff --git a/Source/WebCore/editing/VisibleSelection.h b/Source/WebCore/editing/VisibleSelection.h

index 2bfe60d..3015e6d 100644 (file)
--- a/Source/WebCore/editing/VisibleSelection.h
+++ b/Source/WebCore/editing/VisibleSelection.h
@@ -153,7 +153,7 @@ inline bool operator!=(const VisibleSelection& a, const VisibleSelection& b)
      return !(a == b);
  }
      
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const VisibleSelection&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const VisibleSelection&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/html/HTMLVideoElement.cpp b/Source/WebCore/html/HTMLVideoElement.cpp

index d6aefdf..72390ee 100644 (file)
--- a/Source/WebCore/html/HTMLVideoElement.cpp
+++ b/Source/WebCore/html/HTMLVideoElement.cpp
@@ -43,7 +43,7 @@
  #include "RenderVideo.h"
  #include "ScriptController.h"
  #include "Settings.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #if ENABLE(VIDEO_PRESENTATION_MODE)
  #include "VideoFullscreenModel.h"
diff --git a/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

index cc8cbdc..281cf0c 100644 (file)
--- a/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -60,11 +60,11 @@
  #include "StyleResolver.h"
  #include "TextMetrics.h"
  #include "TextRun.h"
-#include "TextStream.h"
  #include <wtf/CheckedArithmetic.h>
  #include <wtf/MathExtras.h>
  #include <wtf/NeverDestroyed.h>
  #include <wtf/text/StringBuilder.h>
+#include <wtf/text/TextStream.h>
  
  #if USE(CG) && !PLATFORM(IOS)
  #include <ApplicationServices/ApplicationServices.h>
diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp

index a6cb59d..a2d1840 100644 (file)
--- a/Source/WebCore/page/FrameView.cpp
+++ b/Source/WebCore/page/FrameView.cpp
@@ -92,9 +92,9 @@
  #include "StyleResolver.h"
  #include "StyleScope.h"
  #include "TextResourceDecoder.h"
-#include "TextStream.h"
  #include "TiledBacking.h"
  #include "WheelEventTestTrigger.h"
+#include <wtf/text/TextStream.h>
  
  #include <wtf/CurrentTime.h>
  #include <wtf/MemoryPressureHandler.h>
diff --git a/Source/WebCore/page/ViewportConfiguration.cpp b/Source/WebCore/page/ViewportConfiguration.cpp

index d212910..e0962c0 100644 (file)
--- a/Source/WebCore/page/ViewportConfiguration.cpp
+++ b/Source/WebCore/page/ViewportConfiguration.cpp
@@ -26,10 +26,10 @@
  #include "config.h"
  #include "ViewportConfiguration.h"
  
-#include "TextStream.h"
  #include <wtf/Assertions.h>
  #include <wtf/MathExtras.h>
  #include <wtf/text/CString.h>
+#include <wtf/text/TextStream.h>
  
  #if PLATFORM(IOS)
  #include "PlatformScreen.h"
diff --git a/Source/WebCore/page/ViewportConfiguration.h b/Source/WebCore/page/ViewportConfiguration.h

index 6f8e58c..ba2fa9b 100644 (file)
--- a/Source/WebCore/page/ViewportConfiguration.h
+++ b/Source/WebCore/page/ViewportConfiguration.h
@@ -30,13 +30,15 @@
  #include "ViewportArguments.h"
  #include <wtf/Noncopyable.h>
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  static const double forceAlwaysUserScalableMaximumScale = 5.0;
  static const double forceAlwaysUserScalableMinimumScale = 1.0;
  
-class TextStream;
-
  class ViewportConfiguration {
      WTF_MAKE_NONCOPYABLE(ViewportConfiguration); WTF_MAKE_FAST_ALLOCATED;
  public:
@@ -116,6 +118,6 @@ private:
      bool m_forceAlwaysUserScalable;
  };
  
-TextStream& operator<<(TextStream&, const ViewportConfiguration::Parameters&);
+WTF::TextStream& operator<<(WTF::TextStream&, const ViewportConfiguration::Parameters&);
  
  } // namespace WebCore
diff --git a/Source/WebCore/page/WheelEventDeltaFilter.cpp b/Source/WebCore/page/WheelEventDeltaFilter.cpp

index 2a60643..04e28eb 100644 (file)
--- a/Source/WebCore/page/WheelEventDeltaFilter.cpp
+++ b/Source/WebCore/page/WheelEventDeltaFilter.cpp
@@ -28,7 +28,7 @@
  
  #include "FloatSize.h"
  #include "Logging.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #if PLATFORM(MAC)
  #include "WheelEventDeltaFilterMac.h"
diff --git a/Source/WebCore/page/animation/CSSPropertyAnimation.cpp b/Source/WebCore/page/animation/CSSPropertyAnimation.cpp

index 3d52ba6..b4c3e22 100644 (file)
--- a/Source/WebCore/page/animation/CSSPropertyAnimation.cpp
+++ b/Source/WebCore/page/animation/CSSPropertyAnimation.cpp
@@ -54,7 +54,6 @@
  #include "StyleGeneratedImage.h"
  #include "StylePropertyShorthand.h"
  #include "StyleResolver.h"
-#include "TextStream.h"
  #include <algorithm>
  #include <memory>
  #include <wtf/MathExtras.h>
@@ -62,6 +61,7 @@
  #include <wtf/Noncopyable.h>
  #include <wtf/PointerComparison.h>
  #include <wtf/RefCounted.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp b/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp

index 70c0d00..45c9c7e 100644 (file)
--- a/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp
+++ b/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp
@@ -46,8 +46,8 @@
  #include "ScrollingStateStickyNode.h"
  #include "ScrollingStateTree.h"
  #include "Settings.h"
-#include "TextStream.h"
  #include "WheelEventTestTrigger.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/page/scrolling/ScrollingConstraints.cpp b/Source/WebCore/page/scrolling/ScrollingConstraints.cpp

index 00f101a..1254e5d 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingConstraints.cpp
+++ b/Source/WebCore/page/scrolling/ScrollingConstraints.cpp
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "ScrollingConstraints.h"
  
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/page/scrolling/ScrollingConstraints.h b/Source/WebCore/page/scrolling/ScrollingConstraints.h

index 9d38600..fb69670 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingConstraints.h
+++ b/Source/WebCore/page/scrolling/ScrollingConstraints.h
@@ -195,7 +195,7 @@ private:
      FloatPoint m_layerPositionAtLastLayout;
  };
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FixedPositionViewportConstraints&);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const StickyPositionViewportConstraints&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const FixedPositionViewportConstraints&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const StickyPositionViewportConstraints&);
  
  } // namespace WebCore
diff --git a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

index e96d9f0..bc85580 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
+++ b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
@@ -40,9 +40,9 @@
  #include "RenderView.h"
  #include "ScrollAnimator.h"
  #include "Settings.h"
-#include "TextStream.h"
  #include <wtf/MainThread.h>
  #include <wtf/text/StringBuilder.h>
+#include <wtf/text/TextStream.h>
  
  #if USE(COORDINATED_GRAPHICS)
  #include "ScrollingCoordinatorCoordinatedGraphics.h"
diff --git a/Source/WebCore/page/scrolling/ScrollingCoordinator.h b/Source/WebCore/page/scrolling/ScrollingCoordinator.h

index c74988f..1d658a8 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingCoordinator.h
+++ b/Source/WebCore/page/scrolling/ScrollingCoordinator.h
@@ -45,6 +45,10 @@
  #include "AxisScrollSnapOffsets.h"
  #endif
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  typedef unsigned SynchronousScrollingReasons;
@@ -68,7 +72,6 @@ class GraphicsLayer;
  class Page;
  class Region;
  class ScrollableArea;
-class TextStream;
  class ViewportConstraints;
  
  #if ENABLE(ASYNC_SCROLLING)
@@ -247,10 +250,10 @@ private:
      bool m_forceSynchronousScrollLayerPositionUpdates { false };
  };
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, ScrollableAreaParameters);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, ScrollingNodeType);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, ScrollingLayerPositionAction);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, ViewportRectStability);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, ScrollableAreaParameters);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, ScrollingNodeType);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, ScrollingLayerPositionAction);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, ViewportRectStability);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp

index d452170..ae6da82 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp
+++ b/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp
@@ -29,7 +29,7 @@
  #include "GraphicsLayer.h"
  #include "Logging.h"
  #include "ScrollingStateTree.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
  
diff --git a/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h b/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h

index 8ac0a7a..576712a 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h
+++ b/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h
@@ -57,7 +57,7 @@ private:
  
      void reconcileLayerPositionForViewportRect(const LayoutRect& viewportRect, ScrollingLayerPositionAction) override;
  
-    void dumpProperties(TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+    void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
  
      FixedPositionViewportConstraints m_constraints;
  };
diff --git a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp

index c97a8a0..eaa0446 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp
+++ b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp
@@ -29,7 +29,7 @@
  #if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
  
  #include "ScrollingStateTree.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h

index 9e35b35..52a3ddc 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h
+++ b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h
@@ -131,7 +131,7 @@ public:
  #endif
      void setScrollerImpsFromScrollbars(Scrollbar* verticalScrollbar, Scrollbar* horizontalScrollbar);
  
-    void dumpProperties(TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+    void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
  
  private:
      ScrollingStateFrameScrollingNode(ScrollingStateTree&, ScrollingNodeID);
diff --git a/Source/WebCore/page/scrolling/ScrollingStateNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateNode.cpp

index ed42952..0d9c482 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingStateNode.cpp
+++ b/Source/WebCore/page/scrolling/ScrollingStateNode.cpp
@@ -30,7 +30,7 @@
  
  #include "ScrollingStateFixedNode.h"
  #include "ScrollingStateTree.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #include <wtf/text/WTFString.h>
  
diff --git a/Source/WebCore/page/scrolling/ScrollingStateNode.h b/Source/WebCore/page/scrolling/ScrollingStateNode.h

index 82e8e8c..5d712db 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingStateNode.h
+++ b/Source/WebCore/page/scrolling/ScrollingStateNode.h
@@ -34,11 +34,14 @@
  #include <wtf/TypeCasts.h>
  #include <wtf/Vector.h>
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class GraphicsLayer;
  class ScrollingStateTree;
-class TextStream;
  
  // Used to allow ScrollingStateNodes to refer to layers in various contexts:
  // a) Async scrolling, main thread: ScrollingStateNode holds onto a GraphicsLayer, and uses m_layerID
@@ -237,10 +240,10 @@ public:
  protected:
      ScrollingStateNode(const ScrollingStateNode&, ScrollingStateTree&);
  
-    virtual void dumpProperties(TextStream&, ScrollingStateTreeAsTextBehavior) const;
+    virtual void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const;
      
  private:
-    void dump(TextStream&, ScrollingStateTreeAsTextBehavior) const;
+    void dump(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const;
  
      const ScrollingNodeType m_nodeType;
      ScrollingNodeID m_nodeID;
diff --git a/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp

index 3cf0fe8..b95aef0 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp
+++ b/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp
@@ -29,7 +29,7 @@
  #if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
  
  #include "ScrollingStateTree.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h b/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h

index 028938f..a394bbb 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h
+++ b/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h
@@ -39,7 +39,7 @@ public:
  
      virtual ~ScrollingStateOverflowScrollingNode();
  
-    void dumpProperties(TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+    void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
  
  private:
      ScrollingStateOverflowScrollingNode(ScrollingStateTree&, ScrollingNodeID);
diff --git a/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp

index 3d07281..8bb63a1 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp
+++ b/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp
@@ -29,7 +29,7 @@
  #if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
  
  #include "ScrollingStateTree.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h b/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h

index f61290b..cc4bff7 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h
+++ b/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h
@@ -112,7 +112,7 @@ protected:
      ScrollingStateScrollingNode(ScrollingStateTree&, ScrollingNodeType, ScrollingNodeID);
      ScrollingStateScrollingNode(const ScrollingStateScrollingNode&, ScrollingStateTree&);
  
-    void dumpProperties(TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+    void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
      
  private:
      FloatSize m_scrollableAreaSize;
diff --git a/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp

index 248f947..86706a5 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp
+++ b/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp
@@ -31,7 +31,7 @@
  #include "GraphicsLayer.h"
  #include "Logging.h"
  #include "ScrollingStateTree.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h b/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h

index 673c262..6136a84 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h
+++ b/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h
@@ -57,7 +57,7 @@ private:
  
      void reconcileLayerPositionForViewportRect(const LayoutRect& viewportRect, ScrollingLayerPositionAction) override;
  
-    void dumpProperties(TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+    void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
  
      StickyPositionViewportConstraints m_constraints;
  };
diff --git a/Source/WebCore/page/scrolling/ScrollingTree.cpp b/Source/WebCore/page/scrolling/ScrollingTree.cpp

index 673916f..f91f3e6 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingTree.cpp
+++ b/Source/WebCore/page/scrolling/ScrollingTree.cpp
@@ -36,8 +36,8 @@
  #include "ScrollingTreeNode.h"
  #include "ScrollingTreeOverflowScrollingNode.h"
  #include "ScrollingTreeScrollingNode.h"
-#include "TextStream.h"
  #include <wtf/SetForScope.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp

index ae36d94..17911e7 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp
+++ b/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp
@@ -32,7 +32,7 @@
  #include "Logging.h"
  #include "ScrollingStateTree.h"
  #include "ScrollingTree.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h b/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h

index 760bb06..cbc8d63 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h
+++ b/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h
@@ -80,7 +80,7 @@ protected:
      ScrollBehaviorForFixedElements scrollBehaviorForFixedElements() const { return m_behaviorForFixed; }
  
  private:
-    void dumpProperties(TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+    void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
  
      FloatRect m_layoutViewport;
      FloatPoint m_minLayoutViewportOrigin;
diff --git a/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp b/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp

index ba5ba3e..e5cd5ae 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp
+++ b/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp
@@ -30,7 +30,7 @@
  
  #include "ScrollingStateTree.h"
  #include "ScrollingTreeFrameScrollingNode.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/page/scrolling/ScrollingTreeNode.h b/Source/WebCore/page/scrolling/ScrollingTreeNode.h

index 93fded1..d0fb892 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingTreeNode.h
+++ b/Source/WebCore/page/scrolling/ScrollingTreeNode.h
@@ -68,7 +68,7 @@ public:
  
      WEBCORE_EXPORT ScrollingTreeFrameScrollingNode* enclosingFrameNode() const;
  
-    WEBCORE_EXPORT void dump(TextStream&, ScrollingStateTreeAsTextBehavior) const;
+    WEBCORE_EXPORT void dump(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const;
  
  protected:
      ScrollingTreeNode(ScrollingTree&, ScrollingNodeType, ScrollingNodeID);
@@ -76,7 +76,7 @@ protected:
  
      std::unique_ptr<Vector<RefPtr<ScrollingTreeNode>>> m_children;
  
-    WEBCORE_EXPORT virtual void dumpProperties(TextStream&, ScrollingStateTreeAsTextBehavior) const;
+    WEBCORE_EXPORT virtual void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const;
  
  private:
      ScrollingTree& m_scrollingTree;
diff --git a/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp

index 57410e6..a3f9fa1 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp
+++ b/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp
@@ -30,7 +30,7 @@
  
  #include "ScrollingStateTree.h"
  #include "ScrollingTree.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h b/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h

index 3594b10..5a3de87 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h
+++ b/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h
@@ -95,7 +95,7 @@ protected:
  
      bool canHaveScrollbars() const { return m_scrollableAreaParameters.horizontalScrollbarMode != ScrollbarAlwaysOff || m_scrollableAreaParameters.verticalScrollbarMode != ScrollbarAlwaysOff; }
  
-    WEBCORE_EXPORT void dumpProperties(TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+    WEBCORE_EXPORT void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
  
  private:
      FloatSize m_scrollableAreaSize;
diff --git a/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h b/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h

index 3c68497..9407296 100644 (file)
--- a/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h
+++ b/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h
@@ -49,7 +49,7 @@ private:
      void commitStateBeforeChildren(const ScrollingStateNode&) override;
      void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) override;
  
-    void dumpProperties(TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+    void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
  
      FixedPositionViewportConstraints m_constraints;
      RetainPtr<CALayer> m_layer;
diff --git a/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm b/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm

index 46c6084..c9de1c0 100644 (file)
--- a/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm
+++ b/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm
@@ -31,8 +31,8 @@
  #include "Logging.h"
  #include "ScrollingStateFixedNode.h"
  #include "ScrollingTree.h"
-#include "TextStream.h"
  #include <QuartzCore/CALayer.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm b/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm

index 872550e..0468798 100644 (file)
--- a/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
+++ b/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
@@ -35,11 +35,11 @@
  #import "PlatformWheelEvent.h"
  #import "ScrollableArea.h"
  #import "ScrollingCoordinator.h"
-#import "ScrollingTree.h"
  #import "ScrollingStateTree.h"
-#import "TextStream.h"
+#import "ScrollingTree.h"
  #import "TileController.h"
  #import "WebLayer.h"
+#import <wtf/text/TextStream.h>
  
  #import <QuartzCore/QuartzCore.h>
  #import <wtf/CurrentTime.h>
diff --git a/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h b/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h

index dc5e513..2def5d2 100644 (file)
--- a/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h
+++ b/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h
@@ -49,7 +49,7 @@ private:
      void commitStateBeforeChildren(const ScrollingStateNode&) override;
      void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) override;
  
-    void dumpProperties(TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+    void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
  
      StickyPositionViewportConstraints m_constraints;
      RetainPtr<CALayer> m_layer;
diff --git a/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm b/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm

index 70731f8..ed216ca 100644 (file)
--- a/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm
+++ b/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm
@@ -33,8 +33,8 @@
  #include "ScrollingTree.h"
  #include "ScrollingTreeFrameScrollingNode.h"
  #include "ScrollingTreeOverflowScrollingNode.h"
-#include "TextStream.h"
  #include <QuartzCore/CALayer.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/CalculationValue.cpp b/Source/WebCore/platform/CalculationValue.cpp

index 043178b..01dab64 100644 (file)
--- a/Source/WebCore/platform/CalculationValue.cpp
+++ b/Source/WebCore/platform/CalculationValue.cpp
@@ -31,10 +31,10 @@
  
  #include "config.h"
  #include "CalculationValue.h"
-#include "LengthFunctions.h"
-#include "TextStream.h"
  
+#include "LengthFunctions.h"
  #include <limits>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/CalculationValue.h b/Source/WebCore/platform/CalculationValue.h

index 056dc4a..37a70ea 100644 (file)
--- a/Source/WebCore/platform/CalculationValue.h
+++ b/Source/WebCore/platform/CalculationValue.h
@@ -36,9 +36,11 @@
  #include <wtf/Ref.h>
  #include <wtf/RefCounted.h>
  
-namespace WebCore {
-
+namespace WTF {
  class TextStream;
+}
+
+namespace WebCore {
  
  enum CalcOperator {
      CalcAdd = '+',
@@ -65,7 +67,7 @@ public:
  
      virtual float evaluate(float maxValue) const = 0;
      virtual bool operator==(const CalcExpressionNode&) const = 0;
-    virtual void dump(TextStream&) const = 0;
+    virtual void dump(WTF::TextStream&) const = 0;
  
  private:
      CalcExpressionNodeType m_type;
@@ -80,7 +82,7 @@ public:
  private:
      float evaluate(float) const override;
      bool operator==(const CalcExpressionNode&) const override;
-    void dump(TextStream&) const override;
+    void dump(WTF::TextStream&) const override;
  
      float m_value;
  };
@@ -94,7 +96,7 @@ public:
  private:
      float evaluate(float maxValue) const override;
      bool operator==(const CalcExpressionNode&) const override;
-    void dump(TextStream&) const override;
+    void dump(WTF::TextStream&) const override;
  
      Length m_length;
  };
@@ -110,7 +112,7 @@ public:
  private:
      float evaluate(float maxValue) const override;
      bool operator==(const CalcExpressionNode&) const override;
-    void dump(TextStream&) const override;
+    void dump(WTF::TextStream&) const override;
  
      std::unique_ptr<CalcExpressionNode> m_leftSide;
      std::unique_ptr<CalcExpressionNode> m_rightSide;
@@ -128,7 +130,7 @@ public:
  private:
      float evaluate(float maxValue) const override;
      bool operator==(const CalcExpressionNode&) const override;
-    void dump(TextStream&) const override;
+    void dump(WTF::TextStream&) const override;
  
      Length m_from;
      Length m_to;
@@ -238,9 +240,9 @@ inline const CalcExpressionBlendLength& toCalcExpressionBlendLength(const CalcEx
      return static_cast<const CalcExpressionBlendLength&>(value);
  }
  
-TextStream& operator<<(TextStream&, const CalculationValue&);
-TextStream& operator<<(TextStream&, const CalcExpressionNode&);
-TextStream& operator<<(TextStream&, CalcOperator);
+WTF::TextStream& operator<<(WTF::TextStream&, const CalculationValue&);
+WTF::TextStream& operator<<(WTF::TextStream&, const CalcExpressionNode&);
+WTF::TextStream& operator<<(WTF::TextStream&, CalcOperator);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/LayoutUnit.cpp b/Source/WebCore/platform/LayoutUnit.cpp

index 185694e..2ac560c 100644 (file)
--- a/Source/WebCore/platform/LayoutUnit.cpp
+++ b/Source/WebCore/platform/LayoutUnit.cpp
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "LayoutUnit.h"
  
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/LayoutUnit.h b/Source/WebCore/platform/LayoutUnit.h

index 79bc3d3..095aaa0 100644 (file)
--- a/Source/WebCore/platform/LayoutUnit.h
+++ b/Source/WebCore/platform/LayoutUnit.h
@@ -38,9 +38,11 @@
  #include <wtf/MathExtras.h>
  #include <wtf/SaturatedArithmetic.h>
  
-namespace WebCore {
-
+namespace WTF {
  class TextStream;
+}
+
+namespace WebCore {
  
  #ifdef NDEBUG
  
@@ -776,7 +778,7 @@ inline float& operator/=(float& a, const LayoutUnit& b)
      return a;
  }
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const LayoutUnit&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const LayoutUnit&);
  
  inline int roundToInt(LayoutUnit value)
  {
diff --git a/Source/WebCore/platform/Length.cpp b/Source/WebCore/platform/Length.cpp

index cd14fc5..7576bd0 100644 (file)
--- a/Source/WebCore/platform/Length.cpp
+++ b/Source/WebCore/platform/Length.cpp
@@ -26,13 +26,14 @@
  #include "Length.h"
  
  #include "CalculationValue.h"
-#include "TextStream.h"
  #include <wtf/ASCIICType.h>
  #include <wtf/HashMap.h>
+#include <wtf/MallocPtr.h>
  #include <wtf/NeverDestroyed.h>
  #include <wtf/StdLibExtras.h>
  #include <wtf/text/StringBuffer.h>
  #include <wtf/text/StringView.h>
+#include <wtf/text/TextStream.h>
  
  using namespace WTF;
  
diff --git a/Source/WebCore/platform/Length.h b/Source/WebCore/platform/Length.h

index 8c45117..57ce0ce 100644 (file)
--- a/Source/WebCore/platform/Length.h
+++ b/Source/WebCore/platform/Length.h
@@ -30,6 +30,10 @@
  #include <wtf/FastMalloc.h>
  #include <wtf/Forward.h>
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  enum LengthType {
@@ -46,7 +50,6 @@ enum ValueRange {
  };
  
  class CalculationValue;
-class TextStream;
  
  struct Length {
      WTF_MAKE_FAST_ALLOCATED;
@@ -417,7 +420,7 @@ inline bool Length::isFitContent() const
  
  Length convertTo100PercentMinusLength(const Length&);
  
-TextStream& operator<<(TextStream&, Length);
+WTF::TextStream& operator<<(WTF::TextStream&, Length);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/LengthBox.cpp b/Source/WebCore/platform/LengthBox.cpp

index c862160..1f32725 100644 (file)
--- a/Source/WebCore/platform/LengthBox.cpp
+++ b/Source/WebCore/platform/LengthBox.cpp
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "LengthBox.h"
  
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/LengthBox.h b/Source/WebCore/platform/LengthBox.h

index 313eea2..b8b63fc 100644 (file)
--- a/Source/WebCore/platform/LengthBox.h
+++ b/Source/WebCore/platform/LengthBox.h
@@ -157,7 +157,7 @@ public:
  using LayoutBoxExtent = BoxExtent<LayoutUnit>;
  using FloatBoxExtent = BoxExtent<float>;
  
-TextStream& operator<<(TextStream&, const LengthBox&);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FloatBoxExtent&);
+WTF::TextStream& operator<<(WTF::TextStream&, const LengthBox&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const FloatBoxExtent&);
  
  } // namespace WebCore
diff --git a/Source/WebCore/platform/LengthPoint.cpp b/Source/WebCore/platform/LengthPoint.cpp

index 6e6235c..9a36759 100644 (file)
--- a/Source/WebCore/platform/LengthPoint.cpp
+++ b/Source/WebCore/platform/LengthPoint.cpp
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "LengthPoint.h"
  
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/LengthPoint.h b/Source/WebCore/platform/LengthPoint.h

index f73cb55..f7add60 100644 (file)
--- a/Source/WebCore/platform/LengthPoint.h
+++ b/Source/WebCore/platform/LengthPoint.h
@@ -69,7 +69,7 @@ inline LengthPoint blend(const LengthPoint& from, const LengthPoint& to, double
      return LengthPoint(blend(from.x(), to.x(), progress), blend(from.y(), to.y(), progress));
  }
  
-TextStream& operator<<(TextStream&, const LengthPoint&);
+WTF::TextStream& operator<<(WTF::TextStream&, const LengthPoint&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/LengthSize.cpp b/Source/WebCore/platform/LengthSize.cpp

index 7f350e7..b1bb9cb 100644 (file)
--- a/Source/WebCore/platform/LengthSize.cpp
+++ b/Source/WebCore/platform/LengthSize.cpp
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "LengthSize.h"
  
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/LengthSize.h b/Source/WebCore/platform/LengthSize.h

index 9d353c8..03b2775 100644 (file)
--- a/Source/WebCore/platform/LengthSize.h
+++ b/Source/WebCore/platform/LengthSize.h
@@ -38,6 +38,6 @@ inline LengthSize blend(const LengthSize& from, const LengthSize& to, double pro
      return { blend(from.width, to.width, progress), blend(from.height, to.height, progress) };
  }
  
-TextStream& operator<<(TextStream&, const LengthSize&);
+WTF::TextStream& operator<<(WTF::TextStream&, const LengthSize&);
  
  } // namespace WebCore
diff --git a/Source/WebCore/platform/LogMacros.h b/Source/WebCore/platform/LogMacros.h

index 9d99125..aa4e374 100644 (file)
--- a/Source/WebCore/platform/LogMacros.h
+++ b/Source/WebCore/platform/LogMacros.h
@@ -32,7 +32,7 @@
  #else
  
  #define LOG_WITH_STREAM(channel, commands) do { \
-        WebCore::TextStream stream(WebCore::TextStream::LineMode::SingleLine); \
+        WTF::TextStream stream(WTF::TextStream::LineMode::SingleLine); \
          commands; \
          WTFLog(&JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), "%s", stream.release().utf8().data()); \
      } while (0)
diff --git a/Source/WebCore/platform/ScrollView.cpp b/Source/WebCore/platform/ScrollView.cpp

index 7ddb753..7521a62 100644 (file)
--- a/Source/WebCore/platform/ScrollView.cpp
+++ b/Source/WebCore/platform/ScrollView.cpp
@@ -35,8 +35,8 @@
  #include "ScrollAnimator.h"
  #include "Scrollbar.h"
  #include "ScrollbarTheme.h"
-#include "TextStream.h"
  #include <wtf/StdLibExtras.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/ScrollableArea.cpp b/Source/WebCore/platform/ScrollableArea.cpp

index dead721..c053265 100644 (file)
--- a/Source/WebCore/platform/ScrollableArea.cpp
+++ b/Source/WebCore/platform/ScrollableArea.cpp
@@ -32,16 +32,16 @@
  #include "config.h"
  #include "ScrollableArea.h"
  
+#include "FloatPoint.h"
  #include "GraphicsContext.h"
  #include "GraphicsLayer.h"
-#include "FloatPoint.h"
  #include "LayoutRect.h"
  #include "Logging.h"
  #include "PlatformWheelEvent.h"
  #include "ScrollAnimator.h"
  #include "ScrollAnimatorMock.h"
  #include "ScrollbarTheme.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/animation/TimingFunction.cpp b/Source/WebCore/platform/animation/TimingFunction.cpp

index c0cc4be..937e460 100644 (file)
--- a/Source/WebCore/platform/animation/TimingFunction.cpp
+++ b/Source/WebCore/platform/animation/TimingFunction.cpp
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "TimingFunction.h"
  
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/animation/TimingFunction.h b/Source/WebCore/platform/animation/TimingFunction.h

index fcaa3c3..8d69d80 100644 (file)
--- a/Source/WebCore/platform/animation/TimingFunction.h
+++ b/Source/WebCore/platform/animation/TimingFunction.h
@@ -27,9 +27,11 @@
  #include <wtf/Ref.h>
  #include <wtf/RefCounted.h>
  
-namespace WebCore {
-
+namespace WTF {
  class TextStream;
+}
+
+namespace WebCore {
  
  class TimingFunction : public RefCounted<TimingFunction> {
  public:
@@ -274,6 +276,6 @@ private:
      double m_initialVelocity;
  };
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const TimingFunction&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const TimingFunction&);
  
  } // namespace WebCore
diff --git a/Source/WebCore/platform/graphics/BitmapImage.cpp b/Source/WebCore/platform/graphics/BitmapImage.cpp

index e49a6c3..5c08e4b 100644 (file)
--- a/Source/WebCore/platform/graphics/BitmapImage.cpp
+++ b/Source/WebCore/platform/graphics/BitmapImage.cpp
@@ -34,10 +34,10 @@
  #include "IntRect.h"
  #include "Logging.h"
  #include "Settings.h"
-#include "TextStream.h"
  #include "Timer.h"
  #include <wtf/CurrentTime.h>
  #include <wtf/Vector.h>
+#include <wtf/text/TextStream.h>
  #include <wtf/text/WTFString.h>
  
  namespace WebCore {
diff --git a/Source/WebCore/platform/graphics/BitmapImage.h b/Source/WebCore/platform/graphics/BitmapImage.h

index 0a20c6d..5a6de09 100644 (file)
--- a/Source/WebCore/platform/graphics/BitmapImage.h
+++ b/Source/WebCore/platform/graphics/BitmapImage.h
@@ -197,7 +197,7 @@ private:
      bool canDestroyDecodedData();
      void setCurrentFrameDecodingStatusIfNecessary(DecodingStatus);
      bool isBitmapImage() const override { return true; }
-    void dump(TextStream&) const override;
+    void dump(WTF::TextStream&) const override;
  
      // Animated images over a certain size are considered large enough that we'll only hang on to one frame at a time.
      static const unsigned LargeAnimationCutoff = 30 * 1014 * 1024;
diff --git a/Source/WebCore/platform/graphics/Color.cpp b/Source/WebCore/platform/graphics/Color.cpp

index 053a3bb..7bf363a 100644 (file)
--- a/Source/WebCore/platform/graphics/Color.cpp
+++ b/Source/WebCore/platform/graphics/Color.cpp
@@ -28,12 +28,12 @@
  
  #include "AnimationUtilities.h"
  #include "HashTools.h"
-#include "TextStream.h"
  #include <wtf/Assertions.h>
  #include <wtf/DecimalNumber.h>
  #include <wtf/HexNumber.h>
  #include <wtf/MathExtras.h>
  #include <wtf/text/StringBuilder.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/Color.h b/Source/WebCore/platform/graphics/Color.h

index fc2e108..c103962 100644 (file)
--- a/Source/WebCore/platform/graphics/Color.h
+++ b/Source/WebCore/platform/graphics/Color.h
@@ -56,9 +56,11 @@ typedef struct _GdkRGBA GdkRGBA;
  #endif
  #endif
  
-namespace WebCore {
-
+namespace WTF {
  class TextStream;
+}
+
+namespace WebCore {
  
  typedef unsigned RGBA32; // Deprecated: Type for an RGBA quadruplet. Use RGBA class instead.
  
@@ -432,7 +434,7 @@ inline void Color::setRGB(RGBA32 rgb)
      tagAsValid();
  }
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const Color&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const Color&);
  
  inline bool Color::isBlackColor(const Color& color)
  {
diff --git a/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp b/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp

index d9489ab..036274e 100644 (file)
--- a/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp
+++ b/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp
@@ -29,7 +29,7 @@
  #include "FloatRect.h"
  #include "GraphicsContext.h"
  #include "ImageBuffer.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h b/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h

index 4f85cf3..ec6dcc4 100644 (file)
--- a/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h
+++ b/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h
@@ -55,7 +55,7 @@ protected:
  
  private:
      bool isCrossfadeGeneratedImage() const override { return true; }
-    void dump(TextStream&) const override;
+    void dump(WTF::TextStream&) const override;
      
      void drawCrossfade(GraphicsContext&);
  
diff --git a/Source/WebCore/platform/graphics/FloatPoint.cpp b/Source/WebCore/platform/graphics/FloatPoint.cpp

index 7a1343c..3b661ae 100644 (file)
--- a/Source/WebCore/platform/graphics/FloatPoint.cpp
+++ b/Source/WebCore/platform/graphics/FloatPoint.cpp
@@ -30,10 +30,10 @@
  #include "AffineTransform.h"
  #include "FloatConversion.h"
  #include "IntPoint.h"
-#include "TextStream.h"
  #include "TransformationMatrix.h"
  #include <limits>
  #include <math.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/FloatPoint.h b/Source/WebCore/platform/graphics/FloatPoint.h

index 07a79b6..2ef2bc5 100644 (file)
--- a/Source/WebCore/platform/graphics/FloatPoint.h
+++ b/Source/WebCore/platform/graphics/FloatPoint.h
@@ -51,13 +51,16 @@ struct D2D_POINT_2F;
  typedef D2D_POINT_2F D2D1_POINT_2F;
  #endif
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class AffineTransform;
  class TransformationMatrix;
  class IntPoint;
  class IntSize;
-class TextStream;
  
  class FloatPoint {
  public:
@@ -294,7 +297,7 @@ inline bool areEssentiallyEqual(const FloatPoint& a, const FloatPoint& b)
      return WTF::areEssentiallyEqual(a.x(), b.x()) && WTF::areEssentiallyEqual(a.y(), b.y());
  }
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FloatPoint&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const FloatPoint&);
  
  }
  
diff --git a/Source/WebCore/platform/graphics/FloatPoint3D.cpp b/Source/WebCore/platform/graphics/FloatPoint3D.cpp

index c6fbdab..2b671dc 100644 (file)
--- a/Source/WebCore/platform/graphics/FloatPoint3D.cpp
+++ b/Source/WebCore/platform/graphics/FloatPoint3D.cpp
@@ -22,8 +22,8 @@
  #include "config.h"
  #include "FloatPoint3D.h"
  
-#include "TextStream.h"
  #include <math.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/FloatPoint3D.h b/Source/WebCore/platform/graphics/FloatPoint3D.h

index 3c6e2a7..f973d8d 100644 (file)
--- a/Source/WebCore/platform/graphics/FloatPoint3D.h
+++ b/Source/WebCore/platform/graphics/FloatPoint3D.h
@@ -182,7 +182,7 @@ inline float FloatPoint3D::distanceTo(const FloatPoint3D& a) const
      return (*this - a).length();
  }
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FloatPoint3D&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const FloatPoint3D&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/FloatRect.cpp b/Source/WebCore/platform/graphics/FloatRect.cpp

index 5556c28..eb16518 100644 (file)
--- a/Source/WebCore/platform/graphics/FloatRect.cpp
+++ b/Source/WebCore/platform/graphics/FloatRect.cpp
@@ -29,10 +29,10 @@
  
  #include "FloatConversion.h"
  #include "IntRect.h"
-#include "TextStream.h"
  #include <algorithm>
  #include <math.h>
  #include <wtf/MathExtras.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/FloatRect.h b/Source/WebCore/platform/graphics/FloatRect.h

index 7e5558d..3745e1f 100644 (file)
--- a/Source/WebCore/platform/graphics/FloatRect.h
+++ b/Source/WebCore/platform/graphics/FloatRect.h
@@ -49,11 +49,14 @@ struct D2D_RECT_F;
  typedef D2D_RECT_F D2D1_RECT_F;
  #endif
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class IntRect;
  class IntPoint;
-class TextStream;
  
  class FloatRect {
  public:
@@ -260,7 +263,7 @@ WEBCORE_EXPORT FloatRect encloseRectToDevicePixels(const FloatRect&, float devic
  WEBCORE_EXPORT IntRect enclosingIntRect(const FloatRect&);
  WEBCORE_EXPORT IntRect roundedIntRect(const FloatRect&);
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FloatRect&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const FloatRect&);
  
  }
  
diff --git a/Source/WebCore/platform/graphics/FloatRoundedRect.cpp b/Source/WebCore/platform/graphics/FloatRoundedRect.cpp

index 20a88b8..cbc3b16 100644 (file)
--- a/Source/WebCore/platform/graphics/FloatRoundedRect.cpp
+++ b/Source/WebCore/platform/graphics/FloatRoundedRect.cpp
@@ -30,8 +30,8 @@
  #include "config.h"
  #include "FloatRoundedRect.h"
  
-#include "TextStream.h"
  #include <algorithm>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/FloatRoundedRect.h b/Source/WebCore/platform/graphics/FloatRoundedRect.h

index eed0e35..a35b393 100644 (file)
--- a/Source/WebCore/platform/graphics/FloatRoundedRect.h
+++ b/Source/WebCore/platform/graphics/FloatRoundedRect.h
@@ -191,7 +191,7 @@ inline float calcBorderRadiiConstraintScaleFor(const FloatRect& rect, const Floa
      return factor;
  }
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FloatRoundedRect&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const FloatRoundedRect&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/FloatSize.cpp b/Source/WebCore/platform/graphics/FloatSize.cpp

index 73eed54..8bb86d7 100644 (file)
--- a/Source/WebCore/platform/graphics/FloatSize.cpp
+++ b/Source/WebCore/platform/graphics/FloatSize.cpp
@@ -29,9 +29,9 @@
  
  #include "FloatConversion.h"
  #include "IntSize.h"
-#include "TextStream.h"
  #include <limits>
  #include <math.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/FloatSize.h b/Source/WebCore/platform/graphics/FloatSize.h

index 51e52ac..831719e 100644 (file)
--- a/Source/WebCore/platform/graphics/FloatSize.h
+++ b/Source/WebCore/platform/graphics/FloatSize.h
@@ -51,10 +51,13 @@ struct D2D_SIZE_F;
  typedef D2D_SIZE_F D2D1_SIZE_F;
  #endif
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class IntSize;
-class TextStream;
  
  class FloatSize {
  public:
@@ -244,7 +247,7 @@ inline IntPoint flooredIntPoint(const FloatSize& p)
      return IntPoint(clampToInteger(floorf(p.width())), clampToInteger(floorf(p.height())));
  }
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FloatSize&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const FloatSize&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/FontTaggedSettings.cpp b/Source/WebCore/platform/graphics/FontTaggedSettings.cpp

index 3aaad5a..61b2ebe 100644 (file)
--- a/Source/WebCore/platform/graphics/FontTaggedSettings.cpp
+++ b/Source/WebCore/platform/graphics/FontTaggedSettings.cpp
@@ -27,7 +27,7 @@
  #include "config.h"
  #include "FontTaggedSettings.h"
  
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #include <wtf/text/AtomicStringHash.h>
  
diff --git a/Source/WebCore/platform/graphics/FontTaggedSettings.h b/Source/WebCore/platform/graphics/FontTaggedSettings.h

index 9d55dd2..23ca2ee 100644 (file)
--- a/Source/WebCore/platform/graphics/FontTaggedSettings.h
+++ b/Source/WebCore/platform/graphics/FontTaggedSettings.h
@@ -30,9 +30,11 @@
  #include <wtf/HashTraits.h>
  #include <wtf/Vector.h>
  
-namespace WebCore {
-
+namespace WTF {
  class TextStream;
+}
+
+namespace WebCore {
  
  typedef std::array<char, 4> FontTag;
  
@@ -140,7 +142,7 @@ typedef FontTaggedSettings<int> FontFeatureSettings;
  #if ENABLE(VARIATION_FONTS)
  
  typedef FontTaggedSettings<float> FontVariationSettings;
-TextStream& operator<<(TextStream&, const FontVariationSettings&);
+WTF::TextStream& operator<<(WTF::TextStream&, const FontVariationSettings&);
  
  #else
  
diff --git a/Source/WebCore/platform/graphics/GradientImage.cpp b/Source/WebCore/platform/graphics/GradientImage.cpp

index 43f4ff2..ec8deef 100644 (file)
--- a/Source/WebCore/platform/graphics/GradientImage.cpp
+++ b/Source/WebCore/platform/graphics/GradientImage.cpp
@@ -93,7 +93,7 @@ void GradientImage::drawPattern(GraphicsContext& destContext, const FloatRect& d
      m_cachedImageBuffer->drawPattern(destContext, destRect, adjustedSrcRect, adjustedPatternCTM, phase, spacing, compositeOp, blendMode);
  }
  
-void GradientImage::dump(TextStream& ts) const
+void GradientImage::dump(WTF::TextStream& ts) const
  {
      GeneratedImage::dump(ts);
      // FIXME: dump the gradient.
diff --git a/Source/WebCore/platform/graphics/GradientImage.h b/Source/WebCore/platform/graphics/GradientImage.h

index b2226fb..4a68499 100644 (file)
--- a/Source/WebCore/platform/graphics/GradientImage.h
+++ b/Source/WebCore/platform/graphics/GradientImage.h
@@ -47,7 +47,7 @@ private:
      ImageDrawResult draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, BlendMode, DecodingMode, ImageOrientationDescription) final;
      void drawPattern(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode) final;
      bool isGradientImage() const final { return true; }
-    void dump(TextStream&) const final;
+    void dump(WTF::TextStream&) const final;
      
      Ref<Gradient> m_gradient;
      std::unique_ptr<ImageBuffer> m_cachedImageBuffer;
diff --git a/Source/WebCore/platform/graphics/GraphicsContext.cpp b/Source/WebCore/platform/graphics/GraphicsContext.cpp

index dff54ff..98f8a03 100644 (file)
--- a/Source/WebCore/platform/graphics/GraphicsContext.cpp
+++ b/Source/WebCore/platform/graphics/GraphicsContext.cpp
@@ -35,7 +35,7 @@
  #include "IntRect.h"
  #include "RoundedRect.h"
  #include "TextRun.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/GraphicsContext.h b/Source/WebCore/platform/graphics/GraphicsContext.h

index 1fc042a..18acddb 100644 (file)
--- a/Source/WebCore/platform/graphics/GraphicsContext.h
+++ b/Source/WebCore/platform/graphics/GraphicsContext.h
@@ -238,13 +238,13 @@ struct GraphicsContextStateChange {
      void accumulate(const GraphicsContextState&, GraphicsContextState::StateChangeFlags);
      void apply(GraphicsContext&) const;
      
-    void dump(TextStream&) const;
+    void dump(WTF::TextStream&) const;
  
      GraphicsContextState m_state;
      GraphicsContextState::StateChangeFlags m_changeFlags { GraphicsContextState::NoChange };
  };
  
-TextStream& operator<<(TextStream&, const GraphicsContextStateChange&);
+WTF::TextStream& operator<<(WTF::TextStream&, const GraphicsContextStateChange&);
  
  
  class GraphicsContext {
diff --git a/Source/WebCore/platform/graphics/GraphicsLayer.cpp b/Source/WebCore/platform/graphics/GraphicsLayer.cpp

index 28c34b6..f53f33d 100644 (file)
--- a/Source/WebCore/platform/graphics/GraphicsLayer.cpp
+++ b/Source/WebCore/platform/graphics/GraphicsLayer.cpp
@@ -32,11 +32,11 @@
  #include "GraphicsContext.h"
  #include "LayoutRect.h"
  #include "RotateTransformOperation.h"
-#include "TextStream.h"
  #include <wtf/HashMap.h>
  #include <wtf/NeverDestroyed.h>
  #include <wtf/text/CString.h>
  #include <wtf/text/StringBuilder.h>
+#include <wtf/text/TextStream.h>
  #include <wtf/text/WTFString.h>
  
  #ifndef NDEBUG
diff --git a/Source/WebCore/platform/graphics/GraphicsLayer.h b/Source/WebCore/platform/graphics/GraphicsLayer.h

index d234bb2..058ef2a 100644 (file)
--- a/Source/WebCore/platform/graphics/GraphicsLayer.h
+++ b/Source/WebCore/platform/graphics/GraphicsLayer.h
@@ -44,12 +44,15 @@
  #include "GraphicsTypes.h"
  #endif
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class GraphicsContext;
  class GraphicsLayerFactory;
  class Image;
-class TextStream;
  class TiledBacking;
  class TimingFunction;
  class TransformationMatrix;
@@ -477,7 +480,7 @@ public:
      virtual void setContentsOrientation(CompositingCoordinatesOrientation orientation) { m_contentsOrientation = orientation; }
      CompositingCoordinatesOrientation contentsOrientation() const { return m_contentsOrientation; }
  
-    void dumpLayer(TextStream&, int indent = 0, LayerTreeAsTextBehavior = LayerTreeAsTextBehaviorNormal) const;
+    void dumpLayer(WTF::TextStream&, int indent = 0, LayerTreeAsTextBehavior = LayerTreeAsTextBehaviorNormal) const;
  
      virtual void setShowDebugBorder(bool show) { m_showDebugBorder = show; }
      bool isShowingDebugBorder() const { return m_showDebugBorder; }
@@ -606,8 +609,8 @@ protected:
      GraphicsLayer* replicatedLayer() const { return m_replicatedLayer; }
      virtual void setReplicatedLayer(GraphicsLayer* layer) { m_replicatedLayer = layer; }
  
-    void dumpProperties(TextStream&, int indent, LayerTreeAsTextBehavior) const;
-    virtual void dumpAdditionalProperties(TextStream&, int /*indent*/, LayerTreeAsTextBehavior) const { }
+    void dumpProperties(WTF::TextStream&, int indent, LayerTreeAsTextBehavior) const;
+    virtual void dumpAdditionalProperties(WTF::TextStream&, int /*indent*/, LayerTreeAsTextBehavior) const { }
  
      WEBCORE_EXPORT virtual void getDebugBorderInfo(Color&, float& width) const;
  
@@ -690,8 +693,8 @@ protected:
  #endif
  };
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const Vector<GraphicsLayer::PlatformLayerID>&);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const GraphicsLayer::CustomAppearance&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const Vector<GraphicsLayer::PlatformLayerID>&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const GraphicsLayer::CustomAppearance&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/GraphicsTypes.cpp b/Source/WebCore/platform/graphics/GraphicsTypes.cpp

index 28e5cc6..9ff1670 100644 (file)
--- a/Source/WebCore/platform/graphics/GraphicsTypes.cpp
+++ b/Source/WebCore/platform/graphics/GraphicsTypes.cpp
@@ -28,8 +28,8 @@
  #include "config.h"
  #include "GraphicsTypes.h"
  
-#include "TextStream.h"
  #include <wtf/Assertions.h>
+#include <wtf/text/TextStream.h>
  #include <wtf/text/WTFString.h>
  
  namespace WebCore {
diff --git a/Source/WebCore/platform/graphics/GraphicsTypes.h b/Source/WebCore/platform/graphics/GraphicsTypes.h

index ede792d..fd35276 100644 (file)
--- a/Source/WebCore/platform/graphics/GraphicsTypes.h
+++ b/Source/WebCore/platform/graphics/GraphicsTypes.h
@@ -29,6 +29,10 @@
  #include "WindRule.h"
  #include <wtf/Forward.h>
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  enum CompositeOperator {
@@ -115,12 +119,11 @@ bool parseTextAlign(const String&, TextAlign&);
  String textBaselineName(TextBaseline);
  bool parseTextBaseline(const String&, TextBaseline&);
  
-class TextStream;
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, BlendMode);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, CompositeOperator);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, WindRule);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, LineCap);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, LineJoin);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, BlendMode);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, CompositeOperator);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, WindRule);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, LineCap);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, LineJoin);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/Image.cpp b/Source/WebCore/platform/graphics/Image.cpp

index b586bfe..e24aaec 100644 (file)
--- a/Source/WebCore/platform/graphics/Image.cpp
+++ b/Source/WebCore/platform/graphics/Image.cpp
@@ -34,11 +34,11 @@
  #include "Length.h"
  #include "MIMETypeRegistry.h"
  #include "SharedBuffer.h"
-#include "TextStream.h"
  #include "URL.h"
  #include <math.h>
  #include <wtf/MainThread.h>
  #include <wtf/StdLibExtras.h>
+#include <wtf/text/TextStream.h>
  
  #if USE(CG)
  #include <CoreFoundation/CoreFoundation.h>
diff --git a/Source/WebCore/platform/graphics/Image.h b/Source/WebCore/platform/graphics/Image.h

index af514db..5029684 100644 (file)
--- a/Source/WebCore/platform/graphics/Image.h
+++ b/Source/WebCore/platform/graphics/Image.h
@@ -181,7 +181,7 @@ public:
      virtual bool notSolidColor() { return true; }
  #endif
  
-    virtual void dump(TextStream&) const;
+    virtual void dump(WTF::TextStream&) const;
  
  protected:
      Image(ImageObserver* = nullptr);
@@ -204,7 +204,7 @@ private:
      Timer m_animationStartTimer;
  };
  
-TextStream& operator<<(TextStream&, const Image&);
+WTF::TextStream& operator<<(WTF::TextStream&, const Image&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/ImageSource.h b/Source/WebCore/platform/graphics/ImageSource.h

index f4dd4d8..9186320 100644 (file)
--- a/Source/WebCore/platform/graphics/ImageSource.h
+++ b/Source/WebCore/platform/graphics/ImageSource.h
@@ -31,10 +31,10 @@
  #include "ImageOrientation.h"
  #include "IntPoint.h"
  #include "NativeImage.h"
-#include "TextStream.h"
  #include <wtf/Forward.h>
  #include <wtf/Noncopyable.h>
  #include <wtf/Optional.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
@@ -112,7 +112,7 @@ public:
      NativeImagePtr createFrameImageAtIndex(size_t, SubsamplingLevel = SubsamplingLevel::Default);
  
  private:
-    void dump(TextStream&);
+    void dump(WTF::TextStream&);
  
      void setDecoderTargetContext(const GraphicsContext*);
  
diff --git a/Source/WebCore/platform/graphics/IntPoint.cpp b/Source/WebCore/platform/graphics/IntPoint.cpp

index 58df526..36b41c0 100644 (file)
--- a/Source/WebCore/platform/graphics/IntPoint.cpp
+++ b/Source/WebCore/platform/graphics/IntPoint.cpp
@@ -27,7 +27,7 @@
  #include "IntPoint.h"
  
  #include "FloatPoint.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/IntPoint.h b/Source/WebCore/platform/graphics/IntPoint.h

index 1a8d79b..494ac43 100644 (file)
--- a/Source/WebCore/platform/graphics/IntPoint.h
+++ b/Source/WebCore/platform/graphics/IntPoint.h
@@ -58,10 +58,13 @@ struct D2D_POINT_2F;
  typedef D2D_POINT_2F D2D1_POINT_2F;
  #endif
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class FloatPoint;
-class TextStream;
  
  class IntPoint {
  public:
@@ -208,7 +211,7 @@ inline int IntPoint::distanceSquaredToPoint(const IntPoint& point) const
      return ((*this) - point).diagonalLengthSquared();
  }
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const IntPoint&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const IntPoint&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/IntRect.cpp b/Source/WebCore/platform/graphics/IntRect.cpp

index f021810..3157950 100644 (file)
--- a/Source/WebCore/platform/graphics/IntRect.cpp
+++ b/Source/WebCore/platform/graphics/IntRect.cpp
@@ -28,8 +28,8 @@
  
  #include "FloatRect.h"
  #include "LayoutRect.h"
-#include "TextStream.h"
  #include <algorithm>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/IntRect.h b/Source/WebCore/platform/graphics/IntRect.h

index e262bfb..4f14b21 100644 (file)
--- a/Source/WebCore/platform/graphics/IntRect.h
+++ b/Source/WebCore/platform/graphics/IntRect.h
@@ -60,11 +60,14 @@ typedef D2D_RECT_F D2D1_RECT_F;
  typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
  #endif
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class FloatRect;
  class LayoutRect;
-class TextStream;
  
  class IntRect {
      WTF_MAKE_FAST_ALLOCATED;
@@ -244,7 +247,7 @@ WEBCORE_EXPORT IntRect enclosingIntRect(const CGRect&);
  WEBCORE_EXPORT IntRect enclosingIntRect(const NSRect&);
  #endif
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const IntRect&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const IntRect&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/IntSize.cpp b/Source/WebCore/platform/graphics/IntSize.cpp

index a3dccb3..375a1a1 100644 (file)
--- a/Source/WebCore/platform/graphics/IntSize.cpp
+++ b/Source/WebCore/platform/graphics/IntSize.cpp
@@ -27,7 +27,7 @@
  #include "IntSize.h"
  
  #include "FloatSize.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/IntSize.h b/Source/WebCore/platform/graphics/IntSize.h

index 5dcdfd1..6b181c0 100644 (file)
--- a/Source/WebCore/platform/graphics/IntSize.h
+++ b/Source/WebCore/platform/graphics/IntSize.h
@@ -60,10 +60,13 @@ struct D2D_SIZE_F;
  typedef D2D_SIZE_F D2D1_SIZE_F;
  #endif
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class FloatSize;
-class TextStream;
  
  class IntSize {
  public:
@@ -213,7 +216,7 @@ inline bool operator!=(const IntSize& a, const IntSize& b)
      return a.width() != b.width() || a.height() != b.height();
  }
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const IntSize&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const IntSize&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/LayoutPoint.cpp b/Source/WebCore/platform/graphics/LayoutPoint.cpp

index eeb0159..6e4cb71 100644 (file)
--- a/Source/WebCore/platform/graphics/LayoutPoint.cpp
+++ b/Source/WebCore/platform/graphics/LayoutPoint.cpp
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "LayoutPoint.h"
  
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/LayoutPoint.h b/Source/WebCore/platform/graphics/LayoutPoint.h

index 51262d2..dd28db9 100644 (file)
--- a/Source/WebCore/platform/graphics/LayoutPoint.h
+++ b/Source/WebCore/platform/graphics/LayoutPoint.h
@@ -230,7 +230,7 @@ inline FloatSize snapSizeToDevicePixel(const LayoutSize& size, const LayoutPoint
      return FloatSize(snap(size.width(), location.x()), snap(size.height(), location.y()));
  }
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const LayoutPoint&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const LayoutPoint&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/LayoutRect.cpp b/Source/WebCore/platform/graphics/LayoutRect.cpp

index 71b7c62..fd0b699 100644 (file)
--- a/Source/WebCore/platform/graphics/LayoutRect.cpp
+++ b/Source/WebCore/platform/graphics/LayoutRect.cpp
@@ -31,8 +31,8 @@
  #include "config.h"
  #include "LayoutRect.h"
  
-#include "TextStream.h"
  #include <algorithm>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/LayoutRect.h b/Source/WebCore/platform/graphics/LayoutRect.h

index 12ab420..9d191f0 100644 (file)
--- a/Source/WebCore/platform/graphics/LayoutRect.h
+++ b/Source/WebCore/platform/graphics/LayoutRect.h
@@ -36,9 +36,11 @@
  #include "LengthBox.h"
  #include <wtf/Vector.h>
  
-namespace WebCore {
-
+namespace WTF {
  class TextStream;
+}
+
+namespace WebCore {
  
  class LayoutRect {
  public:
@@ -246,7 +248,7 @@ inline FloatRect snapRectToDevicePixelsWithWritingDirection(const LayoutRect& re
  
  FloatRect encloseRectToDevicePixels(const LayoutRect&, float pixelSnappingFactor);
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const LayoutRect&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const LayoutRect&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/LayoutSize.cpp b/Source/WebCore/platform/graphics/LayoutSize.cpp

index 1f5e01d..27331bb 100644 (file)
--- a/Source/WebCore/platform/graphics/LayoutSize.cpp
+++ b/Source/WebCore/platform/graphics/LayoutSize.cpp
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "LayoutSize.h"
  
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/LayoutSize.h b/Source/WebCore/platform/graphics/LayoutSize.h

index 395ccea..64d2d90 100644 (file)
--- a/Source/WebCore/platform/graphics/LayoutSize.h
+++ b/Source/WebCore/platform/graphics/LayoutSize.h
@@ -34,10 +34,13 @@
  #include "IntSize.h"
  #include "LayoutUnit.h"
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class LayoutPoint;
-class TextStream;
  
  enum AspectRatioFit {
      AspectRatioFitShrink,
@@ -190,7 +193,7 @@ inline FloatSize floorSizeToDevicePixels(const LayoutSize& size, float pixelSnap
      return FloatSize(floorToDevicePixel(size.width(), pixelSnappingFactor), floorToDevicePixel(size.height(), pixelSnappingFactor));
  }
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const LayoutSize&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const LayoutSize&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp b/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp

index 0af3302..8b3d4b8 100644 (file)
--- a/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp
+++ b/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp
@@ -29,8 +29,8 @@
  #include "FloatRect.h"
  #include "GraphicsContext.h"
  #include "ImageBuffer.h"
-#include "TextStream.h"
  #include "Theme.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/NamedImageGeneratedImage.h b/Source/WebCore/platform/graphics/NamedImageGeneratedImage.h

index 129a7bb..2e5d716 100644 (file)
--- a/Source/WebCore/platform/graphics/NamedImageGeneratedImage.h
+++ b/Source/WebCore/platform/graphics/NamedImageGeneratedImage.h
@@ -47,7 +47,7 @@ protected:
  
  private:
      bool isNamedImageGeneratedImage() const override { return true; }
-    void dump(TextStream&) const override;
+    void dump(WTF::TextStream&) const override;
  
      String m_name;
  };
diff --git a/Source/WebCore/platform/graphics/Path.cpp b/Source/WebCore/platform/graphics/Path.cpp

index 9a3596b..454bc53 100644 (file)
--- a/Source/WebCore/platform/graphics/Path.cpp
+++ b/Source/WebCore/platform/graphics/Path.cpp
@@ -34,9 +34,9 @@
  #include "FloatRoundedRect.h"
  #include "PathTraversalState.h"
  #include "RoundedRect.h"
-#include "TextStream.h"
  #include <math.h>
  #include <wtf/MathExtras.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/Path.h b/Source/WebCore/platform/graphics/Path.h

index 7caba4c..8b2e7e2 100644 (file)
--- a/Source/WebCore/platform/graphics/Path.h
+++ b/Source/WebCore/platform/graphics/Path.h
@@ -73,6 +73,10 @@ typedef void PlatformPath;
  
  typedef PlatformPath* PlatformPathPtr;
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
      class AffineTransform;
@@ -83,7 +87,6 @@ namespace WebCore {
      class PathTraversalState;
      class RoundedRect;
      class StrokeStyleApplier;
-    class TextStream;
  
      enum PathElementType {
          PathElementMoveToPoint, // The points member will contain 1 value.
@@ -212,7 +215,7 @@ namespace WebCore {
  #endif
      };
  
-TextStream& operator<<(TextStream&, const Path&);
+WTF::TextStream& operator<<(WTF::TextStream&, const Path&);
  
  }
  
diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

index 37d3b01..184361b 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
+++ b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
@@ -42,7 +42,6 @@
  #include "PlatformScreen.h"
  #include "RotateTransformOperation.h"
  #include "ScaleTransformOperation.h"
-#include "TextStream.h"
  #include "TiledBacking.h"
  #include "TransformState.h"
  #include "TranslateTransformOperation.h"
@@ -53,6 +52,7 @@
  #include <wtf/NeverDestroyed.h>
  #include <wtf/SetForScope.h>
  #include <wtf/SystemTracing.h>
+#include <wtf/text/TextStream.h>
  #include <wtf/text/WTFString.h>
  
  #if PLATFORM(IOS)
diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h

index f7fbd23..9860780 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
+++ b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
@@ -288,7 +288,7 @@ private:
      WEBCORE_EXPORT bool canThrottleLayerFlush() const override;
  
      WEBCORE_EXPORT void getDebugBorderInfo(Color&, float& width) const override;
-    WEBCORE_EXPORT void dumpAdditionalProperties(TextStream&, int indent, LayerTreeAsTextBehavior) const override;
+    WEBCORE_EXPORT void dumpAdditionalProperties(WTF::TextStream&, int indent, LayerTreeAsTextBehavior) const override;
  
      void computePixelAlignment(float contentsScale, const FloatPoint& positionRelativeToBase,
          FloatPoint& position, FloatPoint3D& anchorPoint, FloatSize& alignmentOffset) const;
diff --git a/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.cpp b/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.cpp

index ded90eb..da9a71b 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.cpp
+++ b/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.cpp
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "PlatformCAAnimation.h"
  
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h b/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h

index a02b315..68d4d5e 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h
+++ b/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h
@@ -138,9 +138,9 @@ private:
      AnimationType m_type;
  };
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, PlatformCAAnimation::AnimationType);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, PlatformCAAnimation::FillModeType);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, PlatformCAAnimation::ValueFunctionType);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, PlatformCAAnimation::AnimationType);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, PlatformCAAnimation::FillModeType);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, PlatformCAAnimation::ValueFunctionType);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp b/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp

index d0c538e..da2ba9b 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp
+++ b/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp
@@ -28,13 +28,13 @@
  
  #if USE(CA)
  
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreText/CoreText.h>
  #include "GraphicsContextCG.h"
  #include "LayerPool.h"
  #include "PlatformCALayerClient.h"
-#include "TextStream.h"
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreText/CoreText.h>
  #include <wtf/StringExtras.h>
+#include <wtf/text/TextStream.h>
  
  #if PLATFORM(WIN)
  #include "CoreTextSPIWin.h"
diff --git a/Source/WebCore/platform/graphics/ca/PlatformCALayer.h b/Source/WebCore/platform/graphics/ca/PlatformCALayer.h

index 9361cf7..48bd2b1 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/PlatformCALayer.h
+++ b/Source/WebCore/platform/graphics/ca/PlatformCALayer.h
@@ -293,8 +293,8 @@ protected:
      PlatformCALayerClient* m_owner;
  };
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, PlatformCALayer::LayerType);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, PlatformCALayer::FilterType);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, PlatformCALayer::LayerType);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, PlatformCALayer::FilterType);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/ca/TileController.cpp b/Source/WebCore/platform/graphics/ca/TileController.cpp

index a80d45d..973417f 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/TileController.cpp
+++ b/Source/WebCore/platform/graphics/ca/TileController.cpp
@@ -32,11 +32,11 @@
  #include "Logging.h"
  #include "PlatformCALayer.h"
  #include "Region.h"
-#include "TextStream.h"
  #include "TileCoverageMap.h"
  #include "TileGrid.h"
  #include <utility>
  #include <wtf/MainThread.h>
+#include <wtf/text/TextStream.h>
  
  #if USE(IOSURFACE)
  #include "IOSurface.h"
diff --git a/Source/WebCore/platform/graphics/ca/TileGrid.cpp b/Source/WebCore/platform/graphics/ca/TileGrid.cpp

index cb16873..51a5497 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/TileGrid.cpp
+++ b/Source/WebCore/platform/graphics/ca/TileGrid.cpp
@@ -33,10 +33,10 @@
  #include "LayerPool.h"
  #include "Logging.h"
  #include "PlatformCALayer.h"
-#include "TextStream.h"
  #include "TileController.h"
  #include <wtf/MainThread.h>
  #include <wtf/text/CString.h>
+#include <wtf/text/TextStream.h>
  
  #if PLATFORM(IOS)
  #include "TileControllerMemoryHandlerIOS.h"
diff --git a/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp b/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

index f7003c1..909783d 100644 (file)
--- a/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
+++ b/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
@@ -41,12 +41,12 @@
  #include "Pattern.h"
  #include "ShadowBlur.h"
  #include "SubimageCacheWithTimer.h"
-#include "TextStream.h"
  #include "Timer.h"
  #include "URL.h"
  #include <wtf/CurrentTime.h>
  #include <wtf/MathExtras.h>
  #include <wtf/RetainPtr.h>
+#include <wtf/text/TextStream.h>
  
  #if PLATFORM(COCOA)
  #include "WebCoreSystemInterface.h"
diff --git a/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp b/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp

index 5b43323..2429b4b 100644 (file)
--- a/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp
+++ b/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp
@@ -40,13 +40,13 @@
  #include "Length.h"
  #include "NotImplemented.h"
  #include "SharedBuffer.h"
-#include "TextStream.h"
  #include <CoreGraphics/CGContext.h>
  #include <CoreGraphics/CGPDFDocument.h>
  #include <wtf/MathExtras.h>
  #include <wtf/RAMSize.h>
  #include <wtf/RetainPtr.h>
  #include <wtf/StdLibExtras.h>
+#include <wtf/text/TextStream.h>
  
  #if !PLATFORM(COCOA)
  #include "ImageSourceCG.h"
diff --git a/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h b/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h

index b1c9528..3f03668 100644 (file)
--- a/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h
+++ b/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h
@@ -77,7 +77,7 @@ private:
      // FIXME: Implement this to be less conservative.
      bool currentFrameKnownToBeOpaque() const override { return false; }
  
-    void dump(TextStream&) const override;
+    void dump(WTF::TextStream&) const override;
  
      void createPDFDocument();
      void computeBoundsForCurrentPage();
diff --git a/Source/WebCore/platform/graphics/cocoa/IOSurface.h b/Source/WebCore/platform/graphics/cocoa/IOSurface.h

index 5d067a9..c14520e 100644 (file)
--- a/Source/WebCore/platform/graphics/cocoa/IOSurface.h
+++ b/Source/WebCore/platform/graphics/cocoa/IOSurface.h
@@ -30,10 +30,13 @@
  #include "GraphicsContext.h"
  #include "IntSize.h"
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class MachSendRight;
-class TextStream;
  
  class IOSurface final {
      WTF_MAKE_FAST_ALLOCATED;
@@ -119,7 +122,7 @@ private:
      RetainPtr<IOSurfaceRef> m_surface;
  };
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const WebCore::IOSurface&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const WebCore::IOSurface&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/cocoa/IOSurface.mm b/Source/WebCore/platform/graphics/cocoa/IOSurface.mm

index acfa752..09fb920 100644 (file)
--- a/Source/WebCore/platform/graphics/cocoa/IOSurface.mm
+++ b/Source/WebCore/platform/graphics/cocoa/IOSurface.mm
@@ -36,9 +36,9 @@
  #import "ImageBufferDataCG.h"
  #import "Logging.h"
  #import "MachSendRight.h"
-#import "TextStream.h"
  #import <wtf/Assertions.h>
  #import <wtf/MathExtras.h>
+#import <wtf/text/TextStream.h>
  
  #if PLATFORM(IOS)
  // Move this into the SPI header once it's possible to put inside the APPLE_INTERNAL_SDK block.
diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp b/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp

index cd9c933..a40f89f 100644 (file)
--- a/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp
+++ b/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp
@@ -28,8 +28,8 @@
  
  #include "DisplayListItems.h"
  #include "Logging.h"
-#include "TextStream.h"
  #include <wtf/StdLibExtras.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  namespace DisplayList {
@@ -38,7 +38,7 @@ namespace DisplayList {
  WTF::CString DisplayList::description() const
  {
      TextStream ts;
-    ts << *this;
+    ts << this;
      return ts.release().utf8();
  }
  
diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayList.h b/Source/WebCore/platform/graphics/displaylists/DisplayList.h

index da455d2..c08667b 100644 (file)
--- a/Source/WebCore/platform/graphics/displaylists/DisplayList.h
+++ b/Source/WebCore/platform/graphics/displaylists/DisplayList.h
@@ -31,11 +31,14 @@
  #include <wtf/Noncopyable.h>
  #include <wtf/text/WTFString.h>
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class FloatRect;
  class GraphicsContext;
-class TextStream;
  
  namespace DisplayList {
  
@@ -58,7 +61,7 @@ public:
  
      DisplayList& operator=(DisplayList&&) = default;
  
-    void dump(TextStream&) const;
+    void dump(WTF::TextStream&) const;
  
      const Vector<Ref<Item>>& list() const { return m_list; }
      Item& itemAt(size_t index)
@@ -102,7 +105,7 @@ private:
  
  } // DisplayList
  
-TextStream& operator<<(TextStream&, const DisplayList::DisplayList&);
+WTF::TextStream& operator<<(WTF::TextStream&, const DisplayList::DisplayList&);
  
  } // WebCore
  
diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp b/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp

index 0fca123..0a7caba 100644 (file)
--- a/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp
+++ b/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp
@@ -27,7 +27,7 @@
  #include "DisplayListItems.h"
  
  #include "FontCascade.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  namespace DisplayList {
diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h b/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h

index 8158d3d..5e176f7 100644 (file)
--- a/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h
+++ b/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h
@@ -40,9 +40,12 @@
  #include "GraphicsContextPlatformPrivateCG.h"
  #endif
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
-class TextStream;
  struct ImagePaintingOptions;
  
  namespace DisplayList {
@@ -316,7 +319,7 @@ public:
  
      static void applyState(GraphicsContext&, const GraphicsContextState&, GraphicsContextState::StateChangeFlags);
  
-    static void dumpStateChanges(TextStream&, const GraphicsContextState&, GraphicsContextState::StateChangeFlags);
+    static void dumpStateChanges(WTF::TextStream&, const GraphicsContextState&, GraphicsContextState::StateChangeFlags);
  private:
      SetState(const GraphicsContextState& state, GraphicsContextState::StateChangeFlags flags)
          : Item(ItemType::SetState)
@@ -1314,7 +1317,7 @@ private:
      float m_scaleFactor;
  };
  
-TextStream& operator<<(TextStream&, const Item&);
+WTF::TextStream& operator<<(WTF::TextStream&, const Item&);
  
  } // namespace DisplayList
  } // namespace WebCore
diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp b/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp

index 6d68533..d51dba3 100644 (file)
--- a/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp
+++ b/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp
@@ -30,8 +30,8 @@
  #include "DisplayListItems.h"
  #include "GraphicsContext.h"
  #include "Logging.h"
-#include "TextStream.h"
  #include <wtf/MathExtras.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  namespace DisplayList {
diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayListReplayer.cpp b/Source/WebCore/platform/graphics/displaylists/DisplayListReplayer.cpp

index 8cc9154..eb2d727 100644 (file)
--- a/Source/WebCore/platform/graphics/displaylists/DisplayListReplayer.cpp
+++ b/Source/WebCore/platform/graphics/displaylists/DisplayListReplayer.cpp
@@ -29,7 +29,7 @@
  #include "DisplayListItems.h"
  #include "GraphicsContext.h"
  #include "Logging.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  namespace DisplayList {
diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.cpp b/Source/WebCore/platform/graphics/filters/DistantLightSource.cpp

index 4bc7670..b2e5531 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/DistantLightSource.cpp
+++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.cpp
@@ -31,7 +31,7 @@
  #include "config.h"
  #include "DistantLightSource.h"
  
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h

index 663abae..6dba6d4 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h
+++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h
@@ -44,7 +44,7 @@ public:
      void initPaintingData(PaintingData&) override;
      void updatePaintingData(PaintingData&, int x, int y, float z) override;
  
-    TextStream& externalRepresentation(TextStream&) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&) const override;
  
  private:
      DistantLightSource(float azimuth, float elevation)
diff --git a/Source/WebCore/platform/graphics/filters/FEBlend.cpp b/Source/WebCore/platform/graphics/filters/FEBlend.cpp

index ff9111c..59b2bea 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEBlend.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEBlend.cpp
@@ -29,7 +29,7 @@
  #include "Filter.h"
  #include "FloatPoint.h"
  #include "GraphicsContext.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #include <runtime/Uint8ClampedArray.h>
  
diff --git a/Source/WebCore/platform/graphics/filters/FEBlend.h b/Source/WebCore/platform/graphics/filters/FEBlend.h

index 1c50a77..12b438a 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEBlend.h
+++ b/Source/WebCore/platform/graphics/filters/FEBlend.h
@@ -43,7 +43,7 @@ public:
      void platformApplySoftware() override;
      void dump() override;
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
      FEBlend(Filter&, BlendMode);
diff --git a/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp b/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp

index ade1b8b..76c9f63 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp
@@ -25,7 +25,7 @@
  
  #include "Filter.h"
  #include "GraphicsContext.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #include <runtime/Uint8ClampedArray.h>
  #include <wtf/MathExtras.h>
diff --git a/Source/WebCore/platform/graphics/filters/FEColorMatrix.h b/Source/WebCore/platform/graphics/filters/FEColorMatrix.h

index 36d3a24..d63ef4a 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEColorMatrix.h
+++ b/Source/WebCore/platform/graphics/filters/FEColorMatrix.h
@@ -50,7 +50,7 @@ public:
      void platformApplySoftware() override;
      void dump() override;
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
      static inline void calculateSaturateComponents(float* components, float value);
      static inline void calculateHueRotateComponents(float* components, float value);
diff --git a/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp b/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp

index 780398d..9735d4b 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp
@@ -26,7 +26,7 @@
  
  #include "Filter.h"
  #include "GraphicsContext.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #include <runtime/Uint8ClampedArray.h>
  #include <wtf/MathExtras.h>
diff --git a/Source/WebCore/platform/graphics/filters/FEComponentTransfer.h b/Source/WebCore/platform/graphics/filters/FEComponentTransfer.h

index 6619755..293f8a1 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEComponentTransfer.h
+++ b/Source/WebCore/platform/graphics/filters/FEComponentTransfer.h
@@ -80,7 +80,7 @@ public:
      void platformApplySoftware() override;
      void dump() override;
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
      FEComponentTransfer(Filter&, const ComponentTransferFunction& redFunc, const ComponentTransferFunction& greenFunc,
diff --git a/Source/WebCore/platform/graphics/filters/FEComposite.cpp b/Source/WebCore/platform/graphics/filters/FEComposite.cpp

index 94d1628..e7a2b62 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEComposite.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEComposite.cpp
@@ -27,7 +27,7 @@
  #include "FECompositeArithmeticNEON.h"
  #include "Filter.h"
  #include "GraphicsContext.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #include <runtime/Uint8ClampedArray.h>
  
diff --git a/Source/WebCore/platform/graphics/filters/FEComposite.h b/Source/WebCore/platform/graphics/filters/FEComposite.h

index f515e95..8158b1e 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEComposite.h
+++ b/Source/WebCore/platform/graphics/filters/FEComposite.h
@@ -66,7 +66,7 @@ public:
      
      void determineAbsolutePaintRect() override;
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  protected:
      bool requiresValidPreMultipliedPixels() override { return m_type != FECOMPOSITE_OPERATOR_ARITHMETIC; }
diff --git a/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp b/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp

index 7d4800d..bea1d91 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp
@@ -25,7 +25,7 @@
  #include "FEConvolveMatrix.h"
  
  #include "Filter.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #include <runtime/Uint8ClampedArray.h>
  #include <wtf/ParallelJobs.h>
diff --git a/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.h b/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.h

index 3970301..3182b72 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.h
+++ b/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.h
@@ -72,7 +72,7 @@ public:
  
      void determineAbsolutePaintRect() override { setAbsolutePaintRect(enclosingIntRect(maxEffectRect())); }
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
  
diff --git a/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp b/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp

index 6b9ae9e..583975c 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp
@@ -23,7 +23,7 @@
  #include "FEDiffuseLighting.h"
  
  #include "LightSource.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.h b/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.h

index 7037c33..5ee3831 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.h
+++ b/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.h
@@ -52,7 +52,7 @@ public:
  
      void dump() override;
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
      FEDiffuseLighting(Filter&, const Color&, float, float, float, float, Ref<LightSource>&&);
diff --git a/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp b/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp

index 51eb774..9cfe4f8 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp
@@ -26,7 +26,7 @@
  
  #include "Filter.h"
  #include "GraphicsContext.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #include <runtime/Uint8ClampedArray.h>
  
diff --git a/Source/WebCore/platform/graphics/filters/FEDisplacementMap.h b/Source/WebCore/platform/graphics/filters/FEDisplacementMap.h

index f9afbae..16ba7e3 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEDisplacementMap.h
+++ b/Source/WebCore/platform/graphics/filters/FEDisplacementMap.h
@@ -57,7 +57,7 @@ public:
  
      void determineAbsolutePaintRect() override { setAbsolutePaintRect(enclosingIntRect(maxEffectRect())); }
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
      FEDisplacementMap(Filter&, ChannelSelectorType xChannelSelector, ChannelSelectorType yChannelSelector, float);
diff --git a/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp b/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp

index 6f1d3db..a2d6899 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp
@@ -24,9 +24,9 @@
  #include "Filter.h"
  #include "GraphicsContext.h"
  #include "ShadowBlur.h"
-#include "TextStream.h"
  #include <runtime/Uint8ClampedArray.h>
  #include <wtf/MathExtras.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
      
diff --git a/Source/WebCore/platform/graphics/filters/FEDropShadow.h b/Source/WebCore/platform/graphics/filters/FEDropShadow.h

index 36c9d74..2783d56 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEDropShadow.h
+++ b/Source/WebCore/platform/graphics/filters/FEDropShadow.h
@@ -53,7 +53,7 @@ public:
  
      void determineAbsolutePaintRect() override;
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
      FEDropShadow(Filter&, float, float, float, float, const Color&, float);
diff --git a/Source/WebCore/platform/graphics/filters/FEFlood.cpp b/Source/WebCore/platform/graphics/filters/FEFlood.cpp

index f6c4086..12dd21b 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEFlood.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEFlood.cpp
@@ -25,7 +25,7 @@
  
  #include "Filter.h"
  #include "GraphicsContext.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/filters/FEFlood.h b/Source/WebCore/platform/graphics/filters/FEFlood.h

index ae03b19..c1262d1 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEFlood.h
+++ b/Source/WebCore/platform/graphics/filters/FEFlood.h
@@ -50,7 +50,7 @@ public:
  
      void determineAbsolutePaintRect() override { setAbsolutePaintRect(enclosingIntRect(maxEffectRect())); }
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
      FEFlood(Filter&, const Color&, float);
diff --git a/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp b/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp

index 0b3b5ca..f152096 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp
@@ -29,7 +29,7 @@
  #include "FEGaussianBlurNEON.h"
  #include "Filter.h"
  #include "GraphicsContext.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #if USE(ACCELERATE)
  #include <Accelerate/Accelerate.h>
diff --git a/Source/WebCore/platform/graphics/filters/FEGaussianBlur.h b/Source/WebCore/platform/graphics/filters/FEGaussianBlur.h

index 0748a22..e42c39b 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEGaussianBlur.h
+++ b/Source/WebCore/platform/graphics/filters/FEGaussianBlur.h
@@ -48,7 +48,7 @@ public:
      static IntSize calculateKernelSize(const Filter&, const FloatPoint& stdDeviation);
      static IntSize calculateUnscaledKernelSize(const FloatPoint& stdDeviation);
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
      static const int s_minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs
diff --git a/Source/WebCore/platform/graphics/filters/FEMerge.cpp b/Source/WebCore/platform/graphics/filters/FEMerge.cpp

index 32cf254..6244491 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEMerge.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEMerge.cpp
@@ -24,7 +24,7 @@
  
  #include "Filter.h"
  #include "GraphicsContext.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/filters/FEMerge.h b/Source/WebCore/platform/graphics/filters/FEMerge.h

index 620f220..ef5c169 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEMerge.h
+++ b/Source/WebCore/platform/graphics/filters/FEMerge.h
@@ -34,7 +34,7 @@ public:
      void platformApplySoftware() override;
      void dump() override;
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
      FEMerge(Filter&);
diff --git a/Source/WebCore/platform/graphics/filters/FEMorphology.cpp b/Source/WebCore/platform/graphics/filters/FEMorphology.cpp

index 894fd3d..7f52c4d 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEMorphology.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEMorphology.cpp
@@ -25,7 +25,7 @@
  #include "FEMorphology.h"
  
  #include "Filter.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #include <runtime/Uint8ClampedArray.h>
  #include <wtf/ParallelJobs.h>
diff --git a/Source/WebCore/platform/graphics/filters/FEMorphology.h b/Source/WebCore/platform/graphics/filters/FEMorphology.h

index 050fc73..2d8eb10 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEMorphology.h
+++ b/Source/WebCore/platform/graphics/filters/FEMorphology.h
@@ -51,7 +51,7 @@ public:
  
      void determineAbsolutePaintRect() override;
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
      struct PaintingData {
          Uint8ClampedArray* srcPixelArray;
diff --git a/Source/WebCore/platform/graphics/filters/FEOffset.cpp b/Source/WebCore/platform/graphics/filters/FEOffset.cpp

index ddef587..e41c086 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEOffset.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEOffset.cpp
@@ -26,7 +26,7 @@
  
  #include "Filter.h"
  #include "GraphicsContext.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/filters/FEOffset.h b/Source/WebCore/platform/graphics/filters/FEOffset.h

index f196d49..67c2371 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEOffset.h
+++ b/Source/WebCore/platform/graphics/filters/FEOffset.h
@@ -42,7 +42,7 @@ public:
      
      void determineAbsolutePaintRect() override;
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
      FEOffset(Filter&, float dx, float dy);
diff --git a/Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp b/Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp

index 8c14083..931a92d 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp
+++ b/Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp
@@ -23,7 +23,7 @@
  #include "FESpecularLighting.h"
  
  #include "LightSource.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/filters/FESpecularLighting.h b/Source/WebCore/platform/graphics/filters/FESpecularLighting.h

index 9f927f2..d4d0978 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FESpecularLighting.h
+++ b/Source/WebCore/platform/graphics/filters/FESpecularLighting.h
@@ -53,7 +53,7 @@ public:
  
      void dump() override;
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
      FESpecularLighting(Filter&, const Color&, float, float, float, float, float, Ref<LightSource>&&);
diff --git a/Source/WebCore/platform/graphics/filters/FETile.cpp b/Source/WebCore/platform/graphics/filters/FETile.cpp

index 78920ec..963f1a5 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FETile.cpp
+++ b/Source/WebCore/platform/graphics/filters/FETile.cpp
@@ -27,7 +27,7 @@
  #include "Pattern.h"
  #include "RenderTreeAsText.h"
  #include "SVGRenderingContext.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/filters/FETile.h b/Source/WebCore/platform/graphics/filters/FETile.h

index c264cef..974fe75 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FETile.h
+++ b/Source/WebCore/platform/graphics/filters/FETile.h
@@ -38,7 +38,7 @@ public:
  
      FilterEffectType filterEffectType() const override { return FilterEffectTypeTile; }
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
      FETile(Filter&);
diff --git a/Source/WebCore/platform/graphics/filters/FETurbulence.cpp b/Source/WebCore/platform/graphics/filters/FETurbulence.cpp

index 37d9f6f..9892f49 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FETurbulence.cpp
+++ b/Source/WebCore/platform/graphics/filters/FETurbulence.cpp
@@ -26,7 +26,7 @@
  #include "FETurbulence.h"
  
  #include "Filter.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #include <runtime/Uint8ClampedArray.h>
  #include <wtf/MathExtras.h>
diff --git a/Source/WebCore/platform/graphics/filters/FETurbulence.h b/Source/WebCore/platform/graphics/filters/FETurbulence.h

index 4987e3d..d91bdd9 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FETurbulence.h
+++ b/Source/WebCore/platform/graphics/filters/FETurbulence.h
@@ -64,7 +64,7 @@ public:
      
      void determineAbsolutePaintRect() override { setAbsolutePaintRect(enclosingIntRect(maxEffectRect())); }
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
      static const int s_blockSize = 256;
diff --git a/Source/WebCore/platform/graphics/filters/FilterEffect.cpp b/Source/WebCore/platform/graphics/filters/FilterEffect.cpp

index 98b86d0..83052b1 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FilterEffect.cpp
+++ b/Source/WebCore/platform/graphics/filters/FilterEffect.cpp
@@ -26,10 +26,10 @@
  
  #include "Filter.h"
  #include "ImageBuffer.h"
-#include "TextStream.h"
  #include <runtime/JSCInlines.h>
  #include <runtime/TypedArrayInlines.h>
  #include <runtime/Uint8ClampedArray.h>
+#include <wtf/text/TextStream.h>
  
  #if HAVE(ARM_NEON_INTRINSICS)
  #include <arm_neon.h>
diff --git a/Source/WebCore/platform/graphics/filters/FilterEffect.h b/Source/WebCore/platform/graphics/filters/FilterEffect.h

index 6d317ca..2125a74 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FilterEffect.h
+++ b/Source/WebCore/platform/graphics/filters/FilterEffect.h
@@ -31,12 +31,15 @@
  #include <wtf/RefPtr.h>
  #include <wtf/Vector.h>
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class Filter;
  class FilterEffect;
  class ImageBuffer;
-class TextStream;
  
  typedef Vector<RefPtr<FilterEffect>> FilterEffectVector;
  
@@ -117,7 +120,7 @@ public:
  
      virtual FilterEffectType filterEffectType() const { return FilterEffectTypeUnknown; }
  
-    virtual TextStream& externalRepresentation(TextStream&, int indention = 0) const;
+    virtual WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention = 0) const;
  
  public:
      // The following functions are SVG specific and will move to RenderSVGResourceFilterPrimitive.
diff --git a/Source/WebCore/platform/graphics/filters/FilterOperation.cpp b/Source/WebCore/platform/graphics/filters/FilterOperation.cpp

index d79b8b2..e58bf12 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FilterOperation.cpp
+++ b/Source/WebCore/platform/graphics/filters/FilterOperation.cpp
@@ -31,7 +31,7 @@
  #include "CachedSVGDocumentReference.h"
  #include "FilterEffect.h"
  #include "SVGURIReference.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
      
diff --git a/Source/WebCore/platform/graphics/filters/FilterOperation.h b/Source/WebCore/platform/graphics/filters/FilterOperation.h

index a5ad6d8..fef1dcf 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FilterOperation.h
+++ b/Source/WebCore/platform/graphics/filters/FilterOperation.h
@@ -344,7 +344,7 @@ private:
      Color m_color;
  };
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FilterOperation&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const FilterOperation&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/filters/FilterOperations.cpp b/Source/WebCore/platform/graphics/filters/FilterOperations.cpp

index a1824f9..9b3baac 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FilterOperations.cpp
+++ b/Source/WebCore/platform/graphics/filters/FilterOperations.cpp
@@ -29,7 +29,7 @@
  #include "FEGaussianBlur.h"
  #include "IntSize.h"
  #include "LengthFunctions.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/filters/FilterOperations.h b/Source/WebCore/platform/graphics/filters/FilterOperations.h

index 0752e8d..78a41c2 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FilterOperations.h
+++ b/Source/WebCore/platform/graphics/filters/FilterOperations.h
@@ -64,6 +64,6 @@ private:
      Vector<RefPtr<FilterOperation>> m_operations;
  };
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FilterOperations&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const FilterOperations&);
  
  } // namespace WebCore
diff --git a/Source/WebCore/platform/graphics/filters/LightSource.h b/Source/WebCore/platform/graphics/filters/LightSource.h

index 7677d58..5ef6886 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/LightSource.h
+++ b/Source/WebCore/platform/graphics/filters/LightSource.h
@@ -27,6 +27,10 @@
  #include "FloatPoint3D.h"
  #include <wtf/RefCounted.h>
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  enum LightType {
@@ -35,8 +39,6 @@ enum LightType {
      LS_SPOT
  };
  
-class TextStream;
-
  class LightSource : public RefCounted<LightSource> {
  public:
  
@@ -65,7 +67,7 @@ public:
      virtual ~LightSource() { }
  
      LightType type() const { return m_type; }
-    virtual TextStream& externalRepresentation(TextStream&) const = 0;
+    virtual WTF::TextStream& externalRepresentation(WTF::TextStream&) const = 0;
  
      virtual void initPaintingData(PaintingData&) = 0;
      // z is a float number, since it is the alpha value scaled by a user
diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.cpp b/Source/WebCore/platform/graphics/filters/PointLightSource.cpp

index d50ba04..7cc485c 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/PointLightSource.cpp
+++ b/Source/WebCore/platform/graphics/filters/PointLightSource.cpp
@@ -31,7 +31,7 @@
  #include "config.h"
  #include "PointLightSource.h"
  
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h

index 75415aa..5d43087 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/PointLightSource.h
+++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h
@@ -43,7 +43,7 @@ public:
      void initPaintingData(PaintingData&) override;
      void updatePaintingData(PaintingData&, int x, int y, float z) override;
  
-    TextStream& externalRepresentation(TextStream&) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&) const override;
  
  private:
      PointLightSource(const FloatPoint3D& position)
diff --git a/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp b/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp

index 6140256..d7d1cf9 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp
+++ b/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp
@@ -23,9 +23,9 @@
  #include "Color.h"
  #include "Filter.h"
  #include "GraphicsContext.h"
-#include "TextStream.h"
  #include <wtf/NeverDestroyed.h>
  #include <wtf/StdLibExtras.h>
+#include <wtf/text/TextStream.h>
  #include <wtf/text/WTFString.h>
  
  namespace WebCore {
diff --git a/Source/WebCore/platform/graphics/filters/SourceAlpha.h b/Source/WebCore/platform/graphics/filters/SourceAlpha.h

index f6088a2..2a0e2c7 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/SourceAlpha.h
+++ b/Source/WebCore/platform/graphics/filters/SourceAlpha.h
@@ -37,7 +37,7 @@ public:
  
      FilterEffectType filterEffectType() const override { return FilterEffectTypeSourceInput; }
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
      explicit SourceAlpha(FilterEffect&);
diff --git a/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp b/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp

index 2313b03..7ed307a 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp
+++ b/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp
@@ -22,9 +22,9 @@
  
  #include "Filter.h"
  #include "GraphicsContext.h"
-#include "TextStream.h"
  #include <wtf/NeverDestroyed.h>
  #include <wtf/StdLibExtras.h>
+#include <wtf/text/TextStream.h>
  #include <wtf/text/WTFString.h>
  
  namespace WebCore {
diff --git a/Source/WebCore/platform/graphics/filters/SourceGraphic.h b/Source/WebCore/platform/graphics/filters/SourceGraphic.h

index 3ffd249..7e314dd 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/SourceGraphic.h
+++ b/Source/WebCore/platform/graphics/filters/SourceGraphic.h
@@ -39,7 +39,7 @@ public:
  
      FilterEffectType filterEffectType() const override { return FilterEffectTypeSourceInput; }
  
-    TextStream& externalRepresentation(TextStream&, int indention) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const override;
  
  private:
      SourceGraphic(Filter& filter)
diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.cpp b/Source/WebCore/platform/graphics/filters/SpotLightSource.cpp

index 30c4f61..0f7fb56 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/SpotLightSource.cpp
+++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.cpp
@@ -32,7 +32,7 @@
  #include "config.h"
  #include "SpotLightSource.h"
  
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h

index bd3ee36..539ea06 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h
+++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h
@@ -54,7 +54,7 @@ public:
      void initPaintingData(PaintingData&) override;
      void updatePaintingData(PaintingData&, int x, int y, float z) override;
  
-    TextStream& externalRepresentation(TextStream&) const override;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&) const override;
  
  private:
      SpotLightSource(const FloatPoint3D& position, const FloatPoint3D& direction,
diff --git a/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp b/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp

index 8ebdd98..6f95646 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp
+++ b/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp
@@ -31,8 +31,8 @@
  #include "FloatQuad.h"
  #include "FloatRect.h"
  #include "IntRect.h"
-#include "TextStream.h"
  #include "TransformationMatrix.h"
+#include <wtf/text/TextStream.h>
  
  #include <wtf/MathExtras.h>
  
diff --git a/Source/WebCore/platform/graphics/transforms/AffineTransform.h b/Source/WebCore/platform/graphics/transforms/AffineTransform.h

index a0b1f7b..68bb525 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/AffineTransform.h
+++ b/Source/WebCore/platform/graphics/transforms/AffineTransform.h
@@ -43,6 +43,10 @@ struct D2D_MATRIX_3X2_F;
  typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F;
  #endif
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class FloatPoint;
@@ -52,7 +56,6 @@ class FloatSize;
  class IntPoint;
  class IntSize;
  class IntRect;
-class TextStream;
  class TransformationMatrix;
  
  class AffineTransform {
@@ -207,7 +210,7 @@ private:
  
  WEBCORE_EXPORT AffineTransform makeMapBetweenRects(const FloatRect& source, const FloatRect& dest);
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const AffineTransform&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const AffineTransform&);
  
  }
  
diff --git a/Source/WebCore/platform/graphics/transforms/IdentityTransformOperation.h b/Source/WebCore/platform/graphics/transforms/IdentityTransformOperation.h

index 08d6d87..03d9280 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/IdentityTransformOperation.h
+++ b/Source/WebCore/platform/graphics/transforms/IdentityTransformOperation.h
@@ -59,7 +59,7 @@ private:
          return *this;
      }
  
-    void dump(TextStream&) const final;
+    void dump(WTF::TextStream&) const final;
  
      IdentityTransformOperation()
          : TransformOperation(IDENTITY)
diff --git a/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp b/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp

index c710f39..08db770 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp
+++ b/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp
@@ -26,8 +26,8 @@
  #include "config.h"
  #include "Matrix3DTransformOperation.h"
  
-#include "TextStream.h"
  #include <algorithm>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h b/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h

index 0405326..8f3fa98 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h
+++ b/Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h
@@ -58,7 +58,7 @@ private:
  
      Ref<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
      
-    void dump(TextStream&) const final;
+    void dump(WTF::TextStream&) const final;
  
      Matrix3DTransformOperation(const TransformationMatrix& mat)
          : TransformOperation(MATRIX_3D)
diff --git a/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp b/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp

index 17860e4..46ac601 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp
+++ b/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp
@@ -22,8 +22,8 @@
  #include "config.h"
  #include "MatrixTransformOperation.h"
  
-#include "TextStream.h"
  #include <algorithm>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.h b/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.h

index ea2b2df..b567bc7 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.h
+++ b/Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.h
@@ -64,7 +64,7 @@ private:
  
      Ref<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
  
-    void dump(TextStream&) const final;
+    void dump(WTF::TextStream&) const final;
  
      MatrixTransformOperation(double a, double b, double c, double d, double e, double f)
          : TransformOperation(MATRIX)
diff --git a/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp b/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp

index a612aed..efb9353 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp
+++ b/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp
@@ -27,8 +27,8 @@
  #include "PerspectiveTransformOperation.h"
  
  #include "AnimationUtilities.h"
-#include "TextStream.h"
  #include <wtf/MathExtras.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h b/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h

index d4348b5..1cd7a19 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h
+++ b/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h
@@ -60,7 +60,7 @@ private:
  
      Ref<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
  
-    void dump(TextStream&) const final;
+    void dump(WTF::TextStream&) const final;
  
      PerspectiveTransformOperation(const Length& p)
          : TransformOperation(PERSPECTIVE)
diff --git a/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp b/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp

index 3214863..7316d33 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp
+++ b/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp
@@ -23,9 +23,9 @@
  #include "RotateTransformOperation.h"
  
  #include "AnimationUtilities.h"
-#include "TextStream.h"
  #include <algorithm>
  #include <wtf/MathExtras.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.h b/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.h

index df3dd09..fdde053 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.h
+++ b/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.h
@@ -65,7 +65,7 @@ private:
  
      Ref<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
  
-    void dump(TextStream&) const final;
+    void dump(WTF::TextStream&) const final;
  
      RotateTransformOperation(double x, double y, double z, double angle, OperationType type)
          : TransformOperation(type)
diff --git a/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.cpp b/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.cpp

index 417d1da..83cf3d4 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.cpp
+++ b/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.cpp
@@ -23,7 +23,7 @@
  #include "ScaleTransformOperation.h"
  
  #include "AnimationUtilities.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.h b/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.h

index c582af4..6e21c75 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.h
+++ b/Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.h
@@ -64,7 +64,7 @@ private:
  
      Ref<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
  
-    void dump(TextStream&) const final;
+    void dump(WTF::TextStream&) const final;
  
      ScaleTransformOperation(double sx, double sy, double sz, OperationType type)
          : TransformOperation(type)
diff --git a/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.cpp b/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.cpp

index 88f2249..809070a 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.cpp
+++ b/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.cpp
@@ -23,7 +23,7 @@
  #include "SkewTransformOperation.h"
  
  #include "AnimationUtilities.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.h b/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.h

index ee2dd2f..797dc95 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.h
+++ b/Source/WebCore/platform/graphics/transforms/SkewTransformOperation.h
@@ -58,7 +58,7 @@ private:
  
      Ref<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
  
-    void dump(TextStream&) const final;
+    void dump(WTF::TextStream&) const final;
      
      SkewTransformOperation(double angleX, double angleY, OperationType type)
          : TransformOperation(type)
diff --git a/Source/WebCore/platform/graphics/transforms/TransformOperation.cpp b/Source/WebCore/platform/graphics/transforms/TransformOperation.cpp

index 2ec90c1..557f0d8 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/TransformOperation.cpp
+++ b/Source/WebCore/platform/graphics/transforms/TransformOperation.cpp
@@ -27,7 +27,7 @@
  #include "TransformOperation.h"
  
  #include "IdentityTransformOperation.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/transforms/TransformOperation.h b/Source/WebCore/platform/graphics/transforms/TransformOperation.h

index da44348..5363be0 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/TransformOperation.h
+++ b/Source/WebCore/platform/graphics/transforms/TransformOperation.h
@@ -108,14 +108,14 @@ public:
          return type() == TRANSLATE_X || type() == TRANSLATE_Y || type() == TRANSLATE_Z || type() == TRANSLATE || type() == TRANSLATE_3D;
      }
      
-    virtual void dump(TextStream&) const = 0;
+    virtual void dump(WTF::TextStream&) const = 0;
  
  private:
      OperationType m_type;
  };
  
-TextStream& operator<<(TextStream&, TransformOperation::OperationType);
-TextStream& operator<<(TextStream&, const TransformOperation&);
+WTF::TextStream& operator<<(WTF::TextStream&, TransformOperation::OperationType);
+WTF::TextStream& operator<<(WTF::TextStream&, const TransformOperation&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/transforms/TransformOperations.cpp b/Source/WebCore/platform/graphics/transforms/TransformOperations.cpp

index 9b156bd..f944f07 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/TransformOperations.cpp
+++ b/Source/WebCore/platform/graphics/transforms/TransformOperations.cpp
@@ -24,8 +24,8 @@
  
  #include "IdentityTransformOperation.h"
  #include "Matrix3DTransformOperation.h"
-#include "TextStream.h"
  #include <algorithm>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/transforms/TransformOperations.h b/Source/WebCore/platform/graphics/transforms/TransformOperations.h

index 3e1d08e..8d070f7 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/TransformOperations.h
+++ b/Source/WebCore/platform/graphics/transforms/TransformOperations.h
@@ -82,7 +82,7 @@ private:
      Vector<RefPtr<TransformOperation>> m_operations;
  };
  
-TextStream& operator<<(TextStream&, const TransformOperations&);
+WTF::TextStream& operator<<(WTF::TextStream&, const TransformOperations&);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp b/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp

index fa83cdb..1bc3e4b 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
+++ b/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
@@ -28,14 +28,14 @@
  #include "TransformationMatrix.h"
  
  #include "AffineTransform.h"
-#include "FloatRect.h"
  #include "FloatQuad.h"
+#include "FloatRect.h"
  #include "IntRect.h"
  #include "LayoutRect.h"
-#include "TextStream.h"
  #include <cmath>
  #include <wtf/Assertions.h>
  #include <wtf/MathExtras.h>
+#include <wtf/text/TextStream.h>
  
  #if CPU(X86_64)
  #include <emmintrin.h>
diff --git a/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h b/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h

index 1bd8334..14b6206 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h
+++ b/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h
@@ -54,6 +54,10 @@ struct D2D_MATRIX_3X2_F;
  typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F;
  #endif
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class AffineTransform;
@@ -61,7 +65,6 @@ class IntRect;
  class LayoutRect;
  class FloatRect;
  class FloatQuad;
-class TextStream;
  
  #if CPU(X86_64)
  #define TRANSFORMATION_MATRIX_USE_X86_64_SSE2
@@ -424,6 +427,6 @@ private:
      Matrix4 m_matrix;
  };
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const TransformationMatrix&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const TransformationMatrix&);
  
  } // namespace WebCore
diff --git a/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.cpp b/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.cpp

index 96e597f..b5d3eb9 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.cpp
+++ b/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.cpp
@@ -23,7 +23,7 @@
  #include "TranslateTransformOperation.h"
  
  #include "FloatConversion.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h b/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h

index d057632..02e4b7f 100644 (file)
--- a/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h
+++ b/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h
@@ -69,7 +69,7 @@ private:
  
      Ref<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
  
-    void dump(TextStream&) const final;
+    void dump(WTF::TextStream&) const final;
  
      TranslateTransformOperation(const Length& tx, const Length& ty, const Length& tz, OperationType type)
          : TransformOperation(type)
diff --git a/Source/WebCore/platform/ios/SelectionRect.cpp b/Source/WebCore/platform/ios/SelectionRect.cpp

index 0ad4df1..d5c7822 100644 (file)
--- a/Source/WebCore/platform/ios/SelectionRect.cpp
+++ b/Source/WebCore/platform/ios/SelectionRect.cpp
@@ -25,7 +25,8 @@
  
  #include "config.h"
  #include "SelectionRect.h"
-#include "TextStream.h"
+
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
@@ -116,7 +117,7 @@ TextStream& operator<<(TextStream& stream, SelectionRect rect)
  
      if (rect.isHorizontal())
          stream.dumpProperty("is horizontal", true);
-    
+
      if (rect.isInFixedPosition())
          stream.dumpProperty("is in fixed position", true);
  
diff --git a/Source/WebCore/platform/ios/SelectionRect.h b/Source/WebCore/platform/ios/SelectionRect.h

index 15b33b6..67d810f 100644 (file)
--- a/Source/WebCore/platform/ios/SelectionRect.h
+++ b/Source/WebCore/platform/ios/SelectionRect.h
@@ -128,7 +128,7 @@ private:
      int m_pageNumber;
  };
  
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, SelectionRect);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, SelectionRect);
  
  } // namespace WebCore
  
diff --git a/Source/WebCore/platform/mac/ScrollAnimatorMac.mm b/Source/WebCore/platform/mac/ScrollAnimatorMac.mm

index 0da349b..204a5d3 100644 (file)
--- a/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
+++ b/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
@@ -39,9 +39,9 @@
  #include "ScrollableArea.h"
  #include "ScrollbarTheme.h"
  #include "ScrollbarThemeMac.h"
-#include "TextStream.h"
  #include "WebCoreSystemInterface.h"
  #include <wtf/BlockObjCExceptions.h>
+#include <wtf/text/TextStream.h>
  
  using namespace WebCore;
  
diff --git a/Source/WebCore/platform/text/TextAllInOne.cpp b/Source/WebCore/platform/text/TextAllInOne.cpp

index 2c1d5b4..5813c0c 100644 (file)
--- a/Source/WebCore/platform/text/TextAllInOne.cpp
+++ b/Source/WebCore/platform/text/TextAllInOne.cpp
@@ -36,4 +36,3 @@
  #include "TextEncoding.cpp"
  #include "TextEncodingDetectorICU.cpp"
  #include "TextEncodingRegistry.cpp"
-#include "TextStream.cpp"
diff --git a/Source/WebCore/rendering/InlineBox.cpp b/Source/WebCore/rendering/InlineBox.cpp

index 8ad978d..310260b 100644 (file)
--- a/Source/WebCore/rendering/InlineBox.cpp
+++ b/Source/WebCore/rendering/InlineBox.cpp
@@ -27,7 +27,7 @@
  #include "RenderBlockFlow.h"
  #include "RenderLineBreak.h"
  #include "RootInlineBox.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #if ENABLE(TREE_DEBUGGING)
  #include <stdio.h>
diff --git a/Source/WebCore/rendering/InlineBox.h b/Source/WebCore/rendering/InlineBox.h

index 8261fb2..5bee869 100644 (file)
--- a/Source/WebCore/rendering/InlineBox.h
+++ b/Source/WebCore/rendering/InlineBox.h
@@ -76,8 +76,8 @@ public:
      void showNodeTreeForThis() const;
      void showLineTreeForThis() const;
      
-    virtual void outputLineTreeAndMark(TextStream&, const InlineBox* markedBox, int depth) const;
-    virtual void outputLineBox(TextStream&, bool mark, int depth) const;
+    virtual void outputLineTreeAndMark(WTF::TextStream&, const InlineBox* markedBox, int depth) const;
+    virtual void outputLineBox(WTF::TextStream&, bool mark, int depth) const;
      virtual const char* boxName() const;
  #endif
  
diff --git a/Source/WebCore/rendering/InlineFlowBox.cpp b/Source/WebCore/rendering/InlineFlowBox.cpp

index a70474f..2c82375 100644 (file)
--- a/Source/WebCore/rendering/InlineFlowBox.cpp
+++ b/Source/WebCore/rendering/InlineFlowBox.cpp
@@ -1735,7 +1735,7 @@ const char* InlineFlowBox::boxName() const
      return "InlineFlowBox";
  }
  
-void InlineFlowBox::outputLineTreeAndMark(TextStream& stream, const InlineBox* markedBox, int depth) const
+void InlineFlowBox::outputLineTreeAndMark(WTF::TextStream& stream, const InlineBox* markedBox, int depth) const
  {
      InlineBox::outputLineTreeAndMark(stream, markedBox, depth);
      for (const InlineBox* box = firstChild(); box; box = box->nextOnLine())
diff --git a/Source/WebCore/rendering/InlineFlowBox.h b/Source/WebCore/rendering/InlineFlowBox.h

index dda3b30..3921915 100644 (file)
--- a/Source/WebCore/rendering/InlineFlowBox.h
+++ b/Source/WebCore/rendering/InlineFlowBox.h
@@ -71,7 +71,7 @@ public:
  #endif
  
  #if ENABLE(TREE_DEBUGGING)
-    void outputLineTreeAndMark(TextStream&, const InlineBox* markedBox, int depth) const override;
+    void outputLineTreeAndMark(WTF::TextStream&, const InlineBox* markedBox, int depth) const override;
      const char* boxName() const override;
  #endif
  
diff --git a/Source/WebCore/rendering/InlineTextBox.cpp b/Source/WebCore/rendering/InlineTextBox.cpp

index 9d45e18..e30a155 100644 (file)
--- a/Source/WebCore/rendering/InlineTextBox.cpp
+++ b/Source/WebCore/rendering/InlineTextBox.cpp
@@ -36,7 +36,6 @@
  #include "InlineTextBoxStyle.h"
  #include "Page.h"
  #include "PaintInfo.h"
-#include "RenderedDocumentMarker.h"
  #include "RenderBlock.h"
  #include "RenderCombineText.h"
  #include "RenderLineBreak.h"
@@ -44,13 +43,14 @@
  #include "RenderRubyText.h"
  #include "RenderTheme.h"
  #include "RenderView.h"
+#include "RenderedDocumentMarker.h"
  #include "Text.h"
  #include "TextDecorationPainter.h"
  #include "TextPaintStyle.h"
  #include "TextPainter.h"
-#include "TextStream.h"
  #include <stdio.h>
  #include <wtf/text/CString.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/rendering/InlineTextBox.h b/Source/WebCore/rendering/InlineTextBox.h

index 28da0c2..5c487ff 100644 (file)
--- a/Source/WebCore/rendering/InlineTextBox.h
+++ b/Source/WebCore/rendering/InlineTextBox.h
@@ -97,7 +97,7 @@ public:
      virtual void dirtyOwnLineBoxes() { dirtyLineBoxes(); }
  
  #if ENABLE(TREE_DEBUGGING)
-    void outputLineBox(TextStream&, bool mark, int depth) const final;
+    void outputLineBox(WTF::TextStream&, bool mark, int depth) const final;
      const char* boxName() const final;
  #endif
  
diff --git a/Source/WebCore/rendering/RenderBlockFlow.cpp b/Source/WebCore/rendering/RenderBlockFlow.cpp

index 028358b..e5dec4e 100644 (file)
--- a/Source/WebCore/rendering/RenderBlockFlow.cpp
+++ b/Source/WebCore/rendering/RenderBlockFlow.cpp
@@ -3778,7 +3778,7 @@ void RenderBlockFlow::ensureLineBoxes()
  }
  
  #if ENABLE(TREE_DEBUGGING)
-void RenderBlockFlow::outputLineTreeAndMark(TextStream& stream, const InlineBox* markedBox, int depth) const
+void RenderBlockFlow::outputLineTreeAndMark(WTF::TextStream& stream, const InlineBox* markedBox, int depth) const
  {
      for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox())
          root->outputLineTreeAndMark(stream, markedBox, depth);
diff --git a/Source/WebCore/rendering/RenderBlockFlow.h b/Source/WebCore/rendering/RenderBlockFlow.h

index dd34272..925ba31 100644 (file)
--- a/Source/WebCore/rendering/RenderBlockFlow.h
+++ b/Source/WebCore/rendering/RenderBlockFlow.h
@@ -372,7 +372,7 @@ public:
      void ensureLineBoxes();
  
  #if ENABLE(TREE_DEBUGGING)
-    void outputLineTreeAndMark(TextStream&, const InlineBox* markedBox, int depth) const;
+    void outputLineTreeAndMark(WTF::TextStream&, const InlineBox* markedBox, int depth) const;
  #endif
  
      // Returns the logicalOffset at the top of the next page. If the offset passed in is already at the top of the current page,
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp

index 1212c76..aa8d0af 100644 (file)
--- a/Source/WebCore/rendering/RenderLayer.cpp
+++ b/Source/WebCore/rendering/RenderLayer.cpp
@@ -76,9 +76,9 @@
  #include "HTMLFrameOwnerElement.h"
  #include "HTMLIFrameElement.h"
  #include "HTMLNames.h"
-#include "HitTestingTransformState.h"
  #include "HitTestRequest.h"
  #include "HitTestResult.h"
+#include "HitTestingTransformState.h"
  #include "Logging.h"
  #include "MainFrame.h"
  #include "NoEventDispatchAssertion.h"
@@ -121,13 +121,13 @@
  #include "SourceGraphic.h"
  #include "StyleProperties.h"
  #include "StyleResolver.h"
-#include "TextStream.h"
  #include "TransformationMatrix.h"
  #include "TranslateTransformOperation.h"
  #include "WheelEventTestTrigger.h"
  #include <stdio.h>
  #include <wtf/StdLibExtras.h>
  #include <wtf/text/CString.h>
+#include <wtf/text/TextStream.h>
  
  #if ENABLE(CSS_SCROLL_SNAP)
  #include "AxisScrollSnapOffsets.h"
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp

index 4a7c9a5..12bb0b4 100644 (file)
--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
@@ -28,8 +28,8 @@
  #include "RenderLayerCompositor.h"
  
  #include "CSSAnimationController.h"
-#include "CanvasRenderingContext.h"
  #include "CSSPropertyNames.h"
+#include "CanvasRenderingContext.h"
  #include "Chrome.h"
  #include "ChromeClient.h"
  #include "FlowThreadController.h"
@@ -59,13 +59,13 @@
  #include "ScrollingConstraints.h"
  #include "ScrollingCoordinator.h"
  #include "Settings.h"
-#include "TextStream.h"
  #include "TiledBacking.h"
  #include "TransformState.h"
  #include <wtf/CurrentTime.h>
  #include <wtf/SetForScope.h>
  #include <wtf/text/CString.h>
  #include <wtf/text/StringBuilder.h>
+#include <wtf/text/TextStream.h>
  
  #if PLATFORM(IOS)
  #include "LegacyTileCache.h"
diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp

index 968a24c..c2dbef9 100644 (file)
--- a/Source/WebCore/rendering/RenderObject.cpp
+++ b/Source/WebCore/rendering/RenderObject.cpp
@@ -55,7 +55,7 @@
  #include "RenderLayerBacking.h"
  #include "RenderMultiColumnFlowThread.h"
  #include "RenderNamedFlowFragment.h"
-#include "RenderNamedFlowThread.h" 
+#include "RenderNamedFlowThread.h"
  #include "RenderRuby.h"
  #include "RenderSVGBlock.h"
  #include "RenderSVGInline.h"
@@ -69,11 +69,11 @@
  #include "RenderWidget.h"
  #include "SVGRenderSupport.h"
  #include "StyleResolver.h"
-#include "TextStream.h"
  #include "TransformState.h"
  #include <algorithm>
  #include <stdio.h>
  #include <wtf/RefCountedLeakCounter.h>
+#include <wtf/text/TextStream.h>
  
  #if PLATFORM(IOS)
  #include "SelectionRect.h"
diff --git a/Source/WebCore/rendering/RenderObject.h b/Source/WebCore/rendering/RenderObject.h

index b5a15d1..7aaffff 100644 (file)
--- a/Source/WebCore/rendering/RenderObject.h
+++ b/Source/WebCore/rendering/RenderObject.h
@@ -205,9 +205,9 @@ public:
      void showRenderTreeForThis() const;
      void showLineTreeForThis() const;
  
-    void outputRenderObject(TextStream&, bool mark, int depth) const;
-    void outputRenderSubTreeAndMark(TextStream&, const RenderObject* markedObject, int depth) const;
-    void outputRegionsInformation(TextStream&) const;
+    void outputRenderObject(WTF::TextStream&, bool mark, int depth) const;
+    void outputRenderSubTreeAndMark(WTF::TextStream&, const RenderObject* markedObject, int depth) const;
+    void outputRegionsInformation(WTF::TextStream&) const;
  #endif
  
      bool isPseudoElement() const { return node() && node()->isPseudoElement(); }
diff --git a/Source/WebCore/rendering/RenderTreeAsText.cpp b/Source/WebCore/rendering/RenderTreeAsText.cpp

index a7860fa..1e88a82 100644 (file)
--- a/Source/WebCore/rendering/RenderTreeAsText.cpp
+++ b/Source/WebCore/rendering/RenderTreeAsText.cpp
@@ -68,9 +68,9 @@
  #include "ShadowRoot.h"
  #include "SimpleLineLayoutResolver.h"
  #include "StyleProperties.h"
-#include "TextStream.h"
  #include <wtf/HexNumber.h>
  #include <wtf/Vector.h>
+#include <wtf/text/TextStream.h>
  #include <wtf/unicode/CharacterNames.h>
  
  #if PLATFORM(MAC)
diff --git a/Source/WebCore/rendering/RenderTreeAsText.h b/Source/WebCore/rendering/RenderTreeAsText.h

index aee29f4..f570026 100644 (file)
--- a/Source/WebCore/rendering/RenderTreeAsText.h
+++ b/Source/WebCore/rendering/RenderTreeAsText.h
@@ -27,12 +27,15 @@
  
  #include <wtf/Forward.h>
  
+namespace WTF {
+class TextStream;
+}
+
  namespace WebCore {
  
  class Element;
  class Frame;
  class RenderObject;
-class TextStream;
  
  enum RenderAsTextBehaviorFlags {
      RenderAsTextBehaviorNormal          = 0,
@@ -53,15 +56,15 @@ typedef unsigned RenderAsTextBehavior;
  // You don't need pageWidthInPixels if you don't specify RenderAsTextInPrintingMode.
  WEBCORE_EXPORT String externalRepresentation(Frame*, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
  WEBCORE_EXPORT String externalRepresentation(Element*, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
-void write(TextStream&, const RenderObject&, int indent = 0, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
-void writeDebugInfo(TextStream&, const RenderObject&, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
+void write(WTF::TextStream&, const RenderObject&, int indent = 0, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
+void writeDebugInfo(WTF::TextStream&, const RenderObject&, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
  
  class RenderTreeAsText {
  // FIXME: This is a cheesy hack to allow easy access to RenderStyle colors.  It won't be needed if we convert
  // it to use visitedDependentColor instead. (This just involves rebaselining many results though, so for now it's
  // not being done).
  public:
-    static void writeRenderObject(TextStream&, const RenderObject&, RenderAsTextBehavior);
+    static void writeRenderObject(WTF::TextStream&, const RenderObject&, RenderAsTextBehavior);
  };
  
  // Helper function shared with SVGRenderTreeAsText
diff --git a/Source/WebCore/rendering/ScrollAlignment.cpp b/Source/WebCore/rendering/ScrollAlignment.cpp

index c28724c..5335fcf 100644 (file)
--- a/Source/WebCore/rendering/ScrollAlignment.cpp
+++ b/Source/WebCore/rendering/ScrollAlignment.cpp
@@ -45,7 +45,7 @@
  #include "ScrollAlignment.h"
  
  #include "Logging.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/rendering/ScrollAlignment.h b/Source/WebCore/rendering/ScrollAlignment.h

index 138204f..02c80cd 100644 (file)
--- a/Source/WebCore/rendering/ScrollAlignment.h
+++ b/Source/WebCore/rendering/ScrollAlignment.h
@@ -43,9 +43,11 @@
  
  #pragma once
  
-namespace WebCore {
-    
+namespace WTF {
  class TextStream;
+}
+
+namespace WebCore {
  
  struct ScrollAlignment {
  
@@ -78,7 +80,7 @@ struct ScrollAlignment {
      Behavior m_rectPartial;
  };
      
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, ScrollAlignment::Behavior);
-WEBCORE_EXPORT TextStream& operator<<(TextStream&, const ScrollAlignment&);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, ScrollAlignment::Behavior);
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const ScrollAlignment&);
  
  }; // namespace WebCore
diff --git a/Source/WebCore/rendering/SimpleLineLayoutCoverage.cpp b/Source/WebCore/rendering/SimpleLineLayoutCoverage.cpp

index 4d2e1e6..a916045 100644 (file)
--- a/Source/WebCore/rendering/SimpleLineLayoutCoverage.cpp
+++ b/Source/WebCore/rendering/SimpleLineLayoutCoverage.cpp
@@ -33,7 +33,7 @@
  #include "RenderView.h"
  #include "Settings.h"
  #include "SimpleLineLayout.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  namespace SimpleLineLayout {
diff --git a/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp b/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp

index 831bf35..40f4753 100644 (file)
--- a/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp
+++ b/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp
@@ -46,7 +46,7 @@
  #include "TextDecorationPainter.h"
  #include "TextPaintStyle.h"
  #include "TextPainter.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  #if ENABLE(TREE_DEBUGGING)
  #include <stdio.h>
diff --git a/Source/WebCore/rendering/SimpleLineLayoutFunctions.h b/Source/WebCore/rendering/SimpleLineLayoutFunctions.h

index 132353a..0641f37 100644 (file)
--- a/Source/WebCore/rendering/SimpleLineLayoutFunctions.h
+++ b/Source/WebCore/rendering/SimpleLineLayoutFunctions.h
@@ -67,7 +67,7 @@ LayoutUnit baselineFromFlow(const RenderBlockFlow&);
  const RenderObject& rendererForPosition(const FlowContents&, unsigned);
  
  #if ENABLE(TREE_DEBUGGING)
-void outputLineLayoutForFlow(TextStream&, const RenderBlockFlow&, const Layout&, int depth);
+void outputLineLayoutForFlow(WTF::TextStream&, const RenderBlockFlow&, const Layout&, int depth);
  #endif
  
  }
diff --git a/Source/WebCore/rendering/style/FillLayer.cpp b/Source/WebCore/rendering/style/FillLayer.cpp

index a4ed826..27f0412 100644 (file)
--- a/Source/WebCore/rendering/style/FillLayer.cpp
+++ b/Source/WebCore/rendering/style/FillLayer.cpp
@@ -22,8 +22,8 @@
  #include "config.h"
  #include "FillLayer.h"
  
-#include "TextStream.h"
  #include <wtf/PointerComparison.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/rendering/style/FillLayer.h b/Source/WebCore/rendering/style/FillLayer.h

index 1e624cd..895f5ae 100644 (file)
--- a/Source/WebCore/rendering/style/FillLayer.h
+++ b/Source/WebCore/rendering/style/FillLayer.h
@@ -214,7 +214,7 @@ private:
      mutable unsigned m_clipMax : 2; // EFillBox, maximum m_clip value from this to bottom layer
  };
  
-TextStream& operator<<(TextStream&, FillSize);
-TextStream& operator<<(TextStream&, const FillLayer&);
+WTF::TextStream& operator<<(WTF::TextStream&, FillSize);
+WTF::TextStream& operator<<(WTF::TextStream&, const FillLayer&);
  
  } // namespace WebCore
diff --git a/Source/WebCore/rendering/style/NinePieceImage.cpp b/Source/WebCore/rendering/style/NinePieceImage.cpp

index e8c9232..88e152f 100644 (file)
--- a/Source/WebCore/rendering/style/NinePieceImage.cpp
+++ b/Source/WebCore/rendering/style/NinePieceImage.cpp
@@ -27,9 +27,9 @@
  #include "GraphicsContext.h"
  #include "LengthFunctions.h"
  #include "RenderStyle.h"
-#include "TextStream.h"
  #include <wtf/NeverDestroyed.h>
  #include <wtf/PointerComparison.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/rendering/style/NinePieceImage.h b/Source/WebCore/rendering/style/NinePieceImage.h

index 2b5fe65..981d021 100644 (file)
--- a/Source/WebCore/rendering/style/NinePieceImage.h
+++ b/Source/WebCore/rendering/style/NinePieceImage.h
@@ -209,6 +209,6 @@ private:
      DataRef<Data> m_data;
  };
  
-TextStream& operator<<(TextStream&, const NinePieceImage&);
+WTF::TextStream& operator<<(WTF::TextStream&, const NinePieceImage&);
  
  } // namespace WebCore
diff --git a/Source/WebCore/rendering/style/RenderStyleConstants.cpp b/Source/WebCore/rendering/style/RenderStyleConstants.cpp

index a395231..0ca7f62 100644 (file)
--- a/Source/WebCore/rendering/style/RenderStyleConstants.cpp
+++ b/Source/WebCore/rendering/style/RenderStyleConstants.cpp
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "RenderStyleConstants.h"
  
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/rendering/style/RenderStyleConstants.h b/Source/WebCore/rendering/style/RenderStyleConstants.h

index bb99ac6..237a2d8 100644 (file)
--- a/Source/WebCore/rendering/style/RenderStyleConstants.h
+++ b/Source/WebCore/rendering/style/RenderStyleConstants.h
@@ -27,9 +27,11 @@
  
  #include <initializer_list>
  
-namespace WebCore {
-
+namespace WTF {
  class TextStream;
+}
+
+namespace WebCore {
  
  static const size_t PrintColorAdjustBits = 1;
  enum PrintColorAdjust {
@@ -727,12 +729,12 @@ enum class ApplePayButtonType {
  };
  #endif
  
-TextStream& operator<<(TextStream&, EFillSizeType);
-TextStream& operator<<(TextStream&, EFillAttachment);
-TextStream& operator<<(TextStream&, EFillBox);
-TextStream& operator<<(TextStream&, EFillRepeat);
-TextStream& operator<<(TextStream&, EMaskSourceType);
-TextStream& operator<<(TextStream&, Edge);
+WTF::TextStream& operator<<(WTF::TextStream&, EFillSizeType);
+WTF::TextStream& operator<<(WTF::TextStream&, EFillAttachment);
+WTF::TextStream& operator<<(WTF::TextStream&, EFillBox);
+WTF::TextStream& operator<<(WTF::TextStream&, EFillRepeat);
+WTF::TextStream& operator<<(WTF::TextStream&, EMaskSourceType);
+WTF::TextStream& operator<<(WTF::TextStream&, Edge);
  
  // These are all minimized combinations of paint-order.
  enum class PaintOrder {
diff --git a/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp b/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp

index 6e0f910..9afac66 100644 (file)
--- a/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp
+++ b/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp
@@ -89,6 +89,19 @@ TextStream& operator<<(TextStream& ts, TextStreamSeparator& sep)
      return ts;
  }
  
+static TextStream& operator<<(TextStream& ts, const DashArray& a)
+{
+    ts << "{";
+    DashArray::const_iterator end = a.end();
+    for (DashArray::const_iterator it = a.begin(); it != end; ++it) {
+        if (it != a.begin())
+            ts << ", ";
+        ts << *it;
+    }
+    ts << "}";
+    return ts;
+}
+
  template<typename ValueType>
  static void writeNameValuePair(TextStream& ts, const char* name, ValueType value)
  {
@@ -126,20 +139,6 @@ static TextStream& operator<<(TextStream& ts, const SVGMarkerUnitsType& markerUn
      return ts;
  }
  
-// FIXME: Maybe this should be in KCanvasRenderingStyle.cpp
-static TextStream& operator<<(TextStream& ts, const DashArray& a)
-{
-    ts << "{";
-    DashArray::const_iterator end = a.end();
-    for (DashArray::const_iterator it = a.begin(); it != end; ++it) {
-        if (it != a.begin())
-            ts << ", ";
-        ts << *it;
-    }
-    ts << "}";
-    return ts;
-}
-
  static TextStream& operator<<(TextStream& ts, const SVGSpreadMethodType& type)
  {
      ts << SVGPropertyTraits<SVGSpreadMethodType>::toString(type).convertToASCIIUppercase();
diff --git a/Source/WebCore/rendering/svg/SVGRenderTreeAsText.h b/Source/WebCore/rendering/svg/SVGRenderTreeAsText.h

index 7cce1c6..60d2dfb 100644 (file)
--- a/Source/WebCore/rendering/svg/SVGRenderTreeAsText.h
+++ b/Source/WebCore/rendering/svg/SVGRenderTreeAsText.h
@@ -26,7 +26,7 @@
  #pragma once
  
  #include "RenderTreeAsText.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
@@ -48,21 +48,21 @@ class AffineTransform;
  class SVGUnitTypes;
  
  // functions used by the main RenderTreeAsText code
-void write(TextStream&, const RenderSVGShape&, int indent, RenderAsTextBehavior);
-void write(TextStream&, const RenderSVGRoot&, int indent, RenderAsTextBehavior);
-void writeSVGGradientStop(TextStream&, const RenderSVGGradientStop&, int indent, RenderAsTextBehavior);
-void writeSVGResourceContainer(TextStream&, const RenderSVGResourceContainer&, int indent, RenderAsTextBehavior);
-void writeSVGContainer(TextStream&, const RenderSVGContainer&, int indent, RenderAsTextBehavior);
-void writeSVGImage(TextStream&, const RenderSVGImage&, int indent, RenderAsTextBehavior);
-void writeSVGInlineText(TextStream&, const RenderSVGInlineText&, int indent, RenderAsTextBehavior);
-void writeSVGText(TextStream&, const RenderSVGText&, int indent, RenderAsTextBehavior);
-void writeResources(TextStream&, const RenderObject&, int indent, RenderAsTextBehavior);
+void write(WTF::TextStream&, const RenderSVGShape&, int indent, RenderAsTextBehavior);
+void write(WTF::TextStream&, const RenderSVGRoot&, int indent, RenderAsTextBehavior);
+void writeSVGGradientStop(WTF::TextStream&, const RenderSVGGradientStop&, int indent, RenderAsTextBehavior);
+void writeSVGResourceContainer(WTF::TextStream&, const RenderSVGResourceContainer&, int indent, RenderAsTextBehavior);
+void writeSVGContainer(WTF::TextStream&, const RenderSVGContainer&, int indent, RenderAsTextBehavior);
+void writeSVGImage(WTF::TextStream&, const RenderSVGImage&, int indent, RenderAsTextBehavior);
+void writeSVGInlineText(WTF::TextStream&, const RenderSVGInlineText&, int indent, RenderAsTextBehavior);
+void writeSVGText(WTF::TextStream&, const RenderSVGText&, int indent, RenderAsTextBehavior);
+void writeResources(WTF::TextStream&, const RenderObject&, int indent, RenderAsTextBehavior);
  
  // helper operators specific to dumping the render tree. these are used in various classes to dump the render tree
  // these could be defined in separate namespace to avoid matching these generic signatures unintentionally.
  
  template<typename Item>
-TextStream& operator<<(TextStream& ts, const Vector<Item*>& v)
+WTF::TextStream& operator<<(WTF::TextStream& ts, const Vector<Item*>& v)
  {
      ts << "[";
  
@@ -77,7 +77,7 @@ TextStream& operator<<(TextStream& ts, const Vector<Item*>& v)
  }
  
  template<typename Pointer>
-TextStream& operator<<(TextStream& ts, Pointer* t)
+WTF::TextStream& operator<<(WTF::TextStream& ts, Pointer* t)
  {
      ts << reinterpret_cast<intptr_t>(t);
      return ts;
diff --git a/Source/WebCore/svg/SVGLengthValue.cpp b/Source/WebCore/svg/SVGLengthValue.cpp

index 05e0a39..ae63396 100644 (file)
--- a/Source/WebCore/svg/SVGLengthValue.cpp
+++ b/Source/WebCore/svg/SVGLengthValue.cpp
@@ -27,10 +27,10 @@
  #include "FloatConversion.h"
  #include "SVGNames.h"
  #include "SVGParserUtilities.h"
-#include "TextStream.h"
  #include <wtf/MathExtras.h>
  #include <wtf/NeverDestroyed.h>
  #include <wtf/text/StringView.h>
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/svg/SVGLengthValue.h b/Source/WebCore/svg/SVGLengthValue.h

index c7082b4..cc4aade 100644 (file)
--- a/Source/WebCore/svg/SVGLengthValue.h
+++ b/Source/WebCore/svg/SVGLengthValue.h
@@ -150,6 +150,6 @@ template<> struct SVGPropertyTraits<SVGLengthValue> {
      static String toString(const SVGLengthValue& type) { return type.valueAsString(); }
  };
  
-TextStream& operator<<(TextStream&, const SVGLengthValue&);
+WTF::TextStream& operator<<(WTF::TextStream&, const SVGLengthValue&);
  
  } // namespace WebCore
diff --git a/Source/WebCore/svg/graphics/SVGImage.cpp b/Source/WebCore/svg/graphics/SVGImage.cpp

index 364bd97..786e8f7 100644 (file)
--- a/Source/WebCore/svg/graphics/SVGImage.cpp
+++ b/Source/WebCore/svg/graphics/SVGImage.cpp
@@ -54,9 +54,9 @@
  #include "SVGSVGElement.h"
  #include "Settings.h"
  #include "SocketProvider.h"
-#include "TextStream.h"
  #include <runtime/JSCInlines.h>
  #include <runtime/JSLock.h>
+#include <wtf/text/TextStream.h>
  
  #if USE(DIRECT2D)
  #include "COMPtr.h"
diff --git a/Source/WebCore/svg/graphics/SVGImage.h b/Source/WebCore/svg/graphics/SVGImage.h

index 0eb5f93..479c36c 100644 (file)
--- a/Source/WebCore/svg/graphics/SVGImage.h
+++ b/Source/WebCore/svg/graphics/SVGImage.h
@@ -94,7 +94,7 @@ private:
      // FIXME: Implement this to be less conservative.
      bool currentFrameKnownToBeOpaque() const final { return false; }
  
-    void dump(TextStream&) const final;
+    void dump(WTF::TextStream&) const final;
  
      SVGImage(ImageObserver&, const URL&);
      ImageDrawResult draw(GraphicsContext&, const FloatRect& fromRect, const FloatRect& toRect, CompositeOperator, BlendMode, DecodingMode, ImageOrientationDescription) final;
diff --git a/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp b/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp

index d25893e..bfe7639 100644 (file)
--- a/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp
+++ b/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp
@@ -31,7 +31,7 @@
  #include "SVGElement.h"
  #include "SVGRenderingContext.h"
  #include "SVGURIReference.h"
-#include "TextStream.h"
+#include <wtf/text/TextStream.h>
  
  namespace WebCore {
  
diff --git a/Source/WebCore/svg/graphics/filters/SVGFEImage.h b/Source/WebCore/svg/graphics/filters/SVGFEImage.h

index 45d8a1b..4099bec 100644 (file)
--- a/Source/WebCore/svg/graphics/filters/SVGFEImage.h
+++ b/Source/WebCore/svg/graphics/filters/SVGFEImage.h
@@ -43,7 +43,7 @@ public:
  
      FilterEffectType filterEffectType() const final { return FilterEffectTypeImage; }
  
-    TextStream& externalRepresentation(TextStream&, int indention) const final;
+    WTF::TextStream& externalRepresentation(WTF::TextStream&, int indention) const final;
      
  private:
      virtual ~FEImage() { }
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog

index 84d090a..86da1c6 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@
author	don.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Thu, 10 Aug 2017 01:15:14 +0000 (01:15 +0000)
committer	don.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Thu, 10 Aug 2017 01:15:14 +0000 (01:15 +0000)
Source/WTF/ChangeLog		patch \| blob \| history
Source/WTF/WTF.xcodeproj/project.pbxproj		patch \| blob \| history
Source/WTF/wtf/CMakeLists.txt		patch \| blob \| history
Source/WTF/wtf/text/TextStream.cpp	[moved from Source/WebCore/platform/text/TextStream.cpp with 98% similarity]	patch \| blob \| history
Source/WTF/wtf/text/TextStream.h	[moved from Source/WebCore/platform/text/TextStream.h with 73% similarity]	patch \| blob \| history
Source/WebCore/CMakeLists.txt		patch \| blob \| history
Source/WebCore/ChangeLog		patch \| blob \| history
Source/WebCore/WebCore.xcodeproj/project.pbxproj		patch \| blob \| history
Source/WebCore/dom/ComposedTreeIterator.cpp		patch \| blob \| history
Source/WebCore/dom/Position.cpp		patch \| blob \| history
Source/WebCore/dom/Position.h		patch \| blob \| history
Source/WebCore/dom/Range.cpp		patch \| blob \| history
Source/WebCore/dom/Range.h		patch \| blob \| history
Source/WebCore/dom/ViewportArguments.cpp		patch \| blob \| history
Source/WebCore/dom/ViewportArguments.h		patch \| blob \| history
Source/WebCore/editing/VisiblePosition.cpp		patch \| blob \| history
Source/WebCore/editing/VisiblePosition.h		patch \| blob \| history
Source/WebCore/editing/VisibleSelection.cpp		patch \| blob \| history
Source/WebCore/editing/VisibleSelection.h		patch \| blob \| history
Source/WebCore/html/HTMLVideoElement.cpp		patch \| blob \| history
Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp		patch \| blob \| history
Source/WebCore/page/FrameView.cpp		patch \| blob \| history
Source/WebCore/page/ViewportConfiguration.cpp		patch \| blob \| history
Source/WebCore/page/ViewportConfiguration.h		patch \| blob \| history
Source/WebCore/page/WheelEventDeltaFilter.cpp		patch \| blob \| history
Source/WebCore/page/animation/CSSPropertyAnimation.cpp		patch \| blob \| history
Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingConstraints.cpp		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingConstraints.h		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingCoordinator.cpp		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingCoordinator.h		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingStateFixedNode.h		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingStateNode.cpp		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingStateNode.h		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingStateStickyNode.h		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingTree.cpp		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingTreeNode.cpp		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingTreeNode.h		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp		patch \| blob \| history
Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h		patch \| blob \| history
Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h		patch \| blob \| history
Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm		patch \| blob \| history
Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm		patch \| blob \| history
Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h		patch \| blob \| history
Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm		patch \| blob \| history
Source/WebCore/platform/CalculationValue.cpp		patch \| blob \| history
Source/WebCore/platform/CalculationValue.h		patch \| blob \| history
Source/WebCore/platform/LayoutUnit.cpp		patch \| blob \| history
Source/WebCore/platform/LayoutUnit.h		patch \| blob \| history
Source/WebCore/platform/Length.cpp		patch \| blob \| history
Source/WebCore/platform/Length.h		patch \| blob \| history
Source/WebCore/platform/LengthBox.cpp		patch \| blob \| history
Source/WebCore/platform/LengthBox.h		patch \| blob \| history
Source/WebCore/platform/LengthPoint.cpp		patch \| blob \| history
Source/WebCore/platform/LengthPoint.h		patch \| blob \| history
Source/WebCore/platform/LengthSize.cpp		patch \| blob \| history
Source/WebCore/platform/LengthSize.h		patch \| blob \| history
Source/WebCore/platform/LogMacros.h		patch \| blob \| history
Source/WebCore/platform/ScrollView.cpp		patch \| blob \| history
Source/WebCore/platform/ScrollableArea.cpp		patch \| blob \| history
Source/WebCore/platform/animation/TimingFunction.cpp		patch \| blob \| history
Source/WebCore/platform/animation/TimingFunction.h		patch \| blob \| history
Source/WebCore/platform/graphics/BitmapImage.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/BitmapImage.h		patch \| blob \| history
Source/WebCore/platform/graphics/Color.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/Color.h		patch \| blob \| history
Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h		patch \| blob \| history
Source/WebCore/platform/graphics/FloatPoint.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/FloatPoint.h		patch \| blob \| history
Source/WebCore/platform/graphics/FloatPoint3D.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/FloatPoint3D.h		patch \| blob \| history
Source/WebCore/platform/graphics/FloatRect.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/FloatRect.h		patch \| blob \| history
Source/WebCore/platform/graphics/FloatRoundedRect.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/FloatRoundedRect.h		patch \| blob \| history
Source/WebCore/platform/graphics/FloatSize.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/FloatSize.h		patch \| blob \| history
Source/WebCore/platform/graphics/FontTaggedSettings.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/FontTaggedSettings.h		patch \| blob \| history
Source/WebCore/platform/graphics/GradientImage.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/GradientImage.h		patch \| blob \| history
Source/WebCore/platform/graphics/GraphicsContext.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/GraphicsContext.h		patch \| blob \| history
Source/WebCore/platform/graphics/GraphicsLayer.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/GraphicsLayer.h		patch \| blob \| history
Source/WebCore/platform/graphics/GraphicsTypes.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/GraphicsTypes.h		patch \| blob \| history
Source/WebCore/platform/graphics/Image.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/Image.h		patch \| blob \| history
Source/WebCore/platform/graphics/ImageSource.h		patch \| blob \| history
Source/WebCore/platform/graphics/IntPoint.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/IntPoint.h		patch \| blob \| history
Source/WebCore/platform/graphics/IntRect.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/IntRect.h		patch \| blob \| history
Source/WebCore/platform/graphics/IntSize.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/IntSize.h		patch \| blob \| history
Source/WebCore/platform/graphics/LayoutPoint.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/LayoutPoint.h		patch \| blob \| history
Source/WebCore/platform/graphics/LayoutRect.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/LayoutRect.h		patch \| blob \| history
Source/WebCore/platform/graphics/LayoutSize.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/LayoutSize.h		patch \| blob \| history
Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/NamedImageGeneratedImage.h		patch \| blob \| history
Source/WebCore/platform/graphics/Path.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/Path.h		patch \| blob \| history
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h		patch \| blob \| history
Source/WebCore/platform/graphics/ca/PlatformCAAnimation.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h		patch \| blob \| history
Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/ca/PlatformCALayer.h		patch \| blob \| history
Source/WebCore/platform/graphics/ca/TileController.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/ca/TileGrid.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/cg/PDFDocumentImage.h		patch \| blob \| history
Source/WebCore/platform/graphics/cocoa/IOSurface.h		patch \| blob \| history
Source/WebCore/platform/graphics/cocoa/IOSurface.mm		patch \| blob \| history
Source/WebCore/platform/graphics/displaylists/DisplayList.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/displaylists/DisplayList.h		patch \| blob \| history
Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/displaylists/DisplayListItems.h		patch \| blob \| history
Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/displaylists/DisplayListReplayer.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/DistantLightSource.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/DistantLightSource.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEBlend.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEBlend.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEColorMatrix.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEComponentTransfer.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEComposite.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEComposite.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEConvolveMatrix.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEDiffuseLighting.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEDisplacementMap.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEDropShadow.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEDropShadow.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEFlood.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEFlood.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEGaussianBlur.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEMerge.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEMerge.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEMorphology.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEMorphology.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEOffset.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FEOffset.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FESpecularLighting.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FETile.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FETile.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FETurbulence.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FETurbulence.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FilterEffect.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FilterEffect.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FilterOperation.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FilterOperation.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FilterOperations.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FilterOperations.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/LightSource.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/PointLightSource.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/PointLightSource.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/SourceAlpha.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/SourceAlpha.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/SourceGraphic.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/SourceGraphic.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/SpotLightSource.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/SpotLightSource.h		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/AffineTransform.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/AffineTransform.h		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/IdentityTransformOperation.h		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/Matrix3DTransformOperation.h		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/MatrixTransformOperation.h		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.h		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/RotateTransformOperation.h		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/ScaleTransformOperation.h		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/SkewTransformOperation.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/SkewTransformOperation.h		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/TransformOperation.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/TransformOperation.h		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/TransformOperations.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/TransformOperations.h		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/TransformationMatrix.h		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h		patch \| blob \| history
Source/WebCore/platform/ios/SelectionRect.cpp		patch \| blob \| history
Source/WebCore/platform/ios/SelectionRect.h		patch \| blob \| history
Source/WebCore/platform/mac/ScrollAnimatorMac.mm		patch \| blob \| history
Source/WebCore/platform/text/TextAllInOne.cpp		patch \| blob \| history
Source/WebCore/rendering/InlineBox.cpp		patch \| blob \| history
Source/WebCore/rendering/InlineBox.h		patch \| blob \| history
Source/WebCore/rendering/InlineFlowBox.cpp		patch \| blob \| history
Source/WebCore/rendering/InlineFlowBox.h		patch \| blob \| history
Source/WebCore/rendering/InlineTextBox.cpp		patch \| blob \| history
Source/WebCore/rendering/InlineTextBox.h		patch \| blob \| history
Source/WebCore/rendering/RenderBlockFlow.cpp		patch \| blob \| history
Source/WebCore/rendering/RenderBlockFlow.h		patch \| blob \| history
Source/WebCore/rendering/RenderLayer.cpp		patch \| blob \| history
Source/WebCore/rendering/RenderLayerCompositor.cpp		patch \| blob \| history
Source/WebCore/rendering/RenderObject.cpp		patch \| blob \| history
Source/WebCore/rendering/RenderObject.h		patch \| blob \| history
Source/WebCore/rendering/RenderTreeAsText.cpp		patch \| blob \| history
Source/WebCore/rendering/RenderTreeAsText.h		patch \| blob \| history
Source/WebCore/rendering/ScrollAlignment.cpp		patch \| blob \| history
Source/WebCore/rendering/ScrollAlignment.h		patch \| blob \| history
Source/WebCore/rendering/SimpleLineLayoutCoverage.cpp		patch \| blob \| history
Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp		patch \| blob \| history
Source/WebCore/rendering/SimpleLineLayoutFunctions.h		patch \| blob \| history
Source/WebCore/rendering/style/FillLayer.cpp		patch \| blob \| history
Source/WebCore/rendering/style/FillLayer.h		patch \| blob \| history
Source/WebCore/rendering/style/NinePieceImage.cpp		patch \| blob \| history
Source/WebCore/rendering/style/NinePieceImage.h		patch \| blob \| history
Source/WebCore/rendering/style/RenderStyleConstants.cpp		patch \| blob \| history
Source/WebCore/rendering/style/RenderStyleConstants.h		patch \| blob \| history
Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp		patch \| blob \| history
Source/WebCore/rendering/svg/SVGRenderTreeAsText.h		patch \| blob \| history
Source/WebCore/svg/SVGLengthValue.cpp		patch \| blob \| history
Source/WebCore/svg/SVGLengthValue.h		patch \| blob \| history
Source/WebCore/svg/graphics/SVGImage.cpp		patch \| blob \| history
Source/WebCore/svg/graphics/SVGImage.h		patch \| blob \| history
Source/WebCore/svg/graphics/filters/SVGFEImage.cpp		patch \| blob \| history
Source/WebCore/svg/graphics/filters/SVGFEImage.h		patch \| blob \| history
Source/WebKit/ChangeLog		patch \| blob \| history
Source/WebKit/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp		patch \| blob \| history
Source/WebKit/Shared/VisibleContentRectUpdateInfo.cpp		patch \| blob \| history
Source/WebKit/Shared/VisibleContentRectUpdateInfo.h		patch \| blob \| history
Source/WebKit/Shared/mac/RemoteLayerTreeTransaction.mm		patch \| blob \| history
Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm		patch \| blob \| history
Source/WebKit/UIProcess/ios/WKContentView.mm		patch \| blob \| history
Source/WebKit/UIProcess/ios/WKContentViewInteraction.h		patch \| blob \| history
Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm		patch \| blob \| history
Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm		patch \| blob \| history
Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm		patch \| blob \| history
Source/WebKit/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h		patch \| blob \| history
Source/WebKit/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm		patch \| blob \| history
Tools/ChangeLog		patch \| blob \| history
Tools/TestWebKitAPI/Tests/WebCore/CalculationValue.cpp		patch \| blob \| history