Include the SkTSort header only where it is used.

Change-Id: If51be35205b40c4a22979a4b49b031126af1dde7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/302500
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

src/gpu/gl/GrGLCaps.cpp

@@ -10,7 +10,6 @@
 #include "include/gpu/GrContextOptions.h"
 #include "src/core/SkCompressedDataUtils.h"
 #include "src/core/SkTSearch.h"
-#include "src/core/SkTSort.h"
 #include "src/gpu/GrBackendUtils.h"
 #include "src/gpu/GrProgramDesc.h"
 #include "src/gpu/GrRenderTargetProxyPriv.h"

src/pathops/SkOpContour.cpp

@@ -4,7 +4,6 @@
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
-#include "src/core/SkTSort.h"
 #include "src/pathops/SkOpContour.h"
 #include "src/pathops/SkPathWriter.h"
 #include "src/pathops/SkReduceOrder.h"

src/pathops/SkOpContour.h

@@ -8,7 +8,6 @@
 #define SkOpContour_DEFINED
 
 #include "include/private/SkTDArray.h"
-#include "src/core/SkTSort.h"
 #include "src/pathops/SkOpSegment.h"
 
 enum class SkOpRayDir;

src/pathops/SkOpEdgeBuilder.cpp

@@ -6,6 +6,7 @@
  */
 #include "src/core/SkGeometry.h"
 #include "src/core/SkPathPriv.h"
+#include "src/core/SkTSort.h"
 #include "src/pathops/SkOpEdgeBuilder.h"
 #include "src/pathops/SkReduceOrder.h"
 

src/pathops/SkPathOpsTSect.cpp

@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 
+#include "src/core/SkTSort.h"
 #include "src/pathops/SkPathOpsTSect.h"
 
 #define COINCIDENT_SPAN_COUNT 9

src/pathops/SkPathOpsTSect.h

@@ -9,7 +9,6 @@
 
 #include "include/private/SkMacros.h"
 #include "src/core/SkArenaAlloc.h"
-#include "src/core/SkTSort.h"
 #include "src/pathops/SkIntersections.h"
 #include "src/pathops/SkPathOpsBounds.h"
 #include "src/pathops/SkPathOpsRect.h"

src/pathops/SkPathOpsWinding.cpp

@@ -21,6 +21,7 @@
 
 // bestXY is initialized by caller with basePt
 
+#include "src/core/SkTSort.h"
 #include "src/pathops/SkOpContour.h"
 #include "src/pathops/SkOpSegment.h"
 #include "src/pathops/SkPathOpsCurve.h"

tests/PathOpsAngleTest.cpp

@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 #include "include/utils/SkRandom.h"
-#include "src/core/SkTSort.h"
 #include "src/pathops/SkIntersections.h"
 #include "src/pathops/SkOpContour.h"
 #include "src/pathops/SkOpSegment.h"

tests/PathOpsTightBoundsTest.cpp

@@ -6,7 +6,6 @@
  */
 #include "include/core/SkCanvas.h"
 #include "include/utils/SkRandom.h"
-#include "src/core/SkTSort.h"
 #include "tests/PathOpsExtendedTest.h"
 #include "tests/PathOpsThreadedCommon.h"
 #include "tests/Test.h"

tools/fonts/create_test_font.cpp

@@ -19,7 +19,6 @@
 #include "src/core/SkOSFile.h"
 #include "src/core/SkPathPriv.h"
 #include "src/core/SkSpan.h"
-#include "src/core/SkTSort.h"
 #include "src/utils/SkOSPath.h"
 #include "src/utils/SkUTF.h"
 

tools/sk_app/CommandSet.cpp

@@ -9,7 +9,6 @@
 
 #include "include/core/SkCanvas.h"
 #include "include/core/SkFont.h"
-#include "src/core/SkTSort.h"
 
 namespace sk_app {
 

tools/viewer/Viewer.cpp

@@ -19,6 +19,7 @@
 #include "src/core/SkMD5.h"
 #include "src/core/SkOSFile.h"
 #include "src/core/SkScan.h"
+#include "src/core/SkTSort.h"
 #include "src/core/SkTaskGroup.h"
 #include "src/core/SkTextBlobPriv.h"
 #include "src/gpu/GrContextPriv.h"