Move SkTSearch.h into src.

No public headers are using it anymore, so move it from include/private
into src/core where SkTSearch.cpp resides.

Change-Id: I4499c629487ff1b8c391b44708616d67567a3e9b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/213674
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
This commit is contained in:
Ben Wagner 2019-05-15 09:28:52 -04:00 committed by Skia Commit-Bot
parent 39ef2ef586
commit 8bd6e8f198
22 changed files with 22 additions and 22 deletions

View File

@ -28,9 +28,9 @@
#include "experimental/svg/model/SkSVGValue.h"
#include "include/core/SkCanvas.h"
#include "include/core/SkString.h"
#include "include/private/SkTSearch.h"
#include "include/private/SkTo.h"
#include "include/utils/SkParsePath.h"
#include "src/core/SkTSearch.h"
#include "src/xml/SkDOM.h"
namespace {

View File

@ -375,6 +375,7 @@ skia_core_sources = [
"$_src/core/SkTraceEvent.h",
"$_src/core/SkTraceEventCommon.h",
"$_src/core/SkTSearch.cpp",
"$_src/core/SkTSearch.h",
"$_src/core/SkTSort.h",
"$_src/core/SkTTopoSort.h",
"$_src/core/SkTypeface.cpp",
@ -467,7 +468,6 @@ skia_core_sources = [
"$_include/private/SkTInternalLList.h",
"$_include/private/SkThreadAnnotations.h",
"$_include/private/SkThreadID.h",
"$_include/private/SkTSearch.h",
"$_include/private/SkTLogic.h",
"$_include/private/SkWeakRefCnt.h",
]

View File

@ -7,9 +7,9 @@
#include "include/core/SkContourMeasure.h"
#include "include/core/SkPath.h"
#include "include/private/SkTSearch.h"
#include "src/core/SkGeometry.h"
#include "src/core/SkPathMeasurePriv.h"
#include "src/core/SkTSearch.h"
#define kMaxTValue 0x3FFFFFFF

View File

@ -17,7 +17,6 @@
#include "include/core/SkShader.h"
#include "include/core/SkStream.h"
#include "include/core/SkTime.h"
#include "include/private/SkTSearch.h"
#include "src/core/SkBlitter.h"
#include "src/core/SkCpu.h"
#include "src/core/SkGeometry.h"
@ -25,6 +24,7 @@
#include "src/core/SkResourceCache.h"
#include "src/core/SkScalerContext.h"
#include "src/core/SkStrikeCache.h"
#include "src/core/SkTSearch.h"
#include "src/core/SkTypefaceCache.h"
#include "src/utils/SkUTF.h"

View File

@ -10,12 +10,12 @@
#include "include/core/SkRRect.h"
#include "include/core/SkRSXform.h"
#include "include/core/SkTextBlob.h"
#include "include/private/SkTSearch.h"
#include "include/private/SkTo.h"
#include "src/core/SkCanvasPriv.h"
#include "src/core/SkClipOpPriv.h"
#include "src/core/SkDrawShadowInfo.h"
#include "src/core/SkMatrixPriv.h"
#include "src/core/SkTSearch.h"
#include "src/image/SkImage_Base.h"
#include "src/utils/SkPatchUtils.h"

View File

@ -4,8 +4,8 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "include/private/SkTSearch.h"
#include "src/core/SkPtrRecorder.h"
#include "src/core/SkTSearch.h"
void SkPtrSet::reset() {
Pair* p = fList.begin();

View File

@ -6,7 +6,7 @@
*/
#include "include/private/SkTSearch.h"
#include "src/core/SkTSearch.h"
#include "include/private/SkMalloc.h"

View File

@ -6,7 +6,7 @@
*/
#include "include/gpu/GrContextOptions.h"
#include "include/private/SkTSearch.h"
#include "src/core/SkTSearch.h"
#include "src/core/SkTSort.h"
#include "src/gpu/GrRenderTargetProxyPriv.h"
#include "src/gpu/GrShaderCaps.h"

View File

@ -9,8 +9,8 @@
#include "src/gpu/gl/GrGLDefines.h"
#include "src/gpu/gl/GrGLUtil.h"
#include "include/private/SkTSearch.h"
#include "src/core/SkMakeUnique.h"
#include "src/core/SkTSearch.h"
#include "src/core/SkTSort.h"
#include "src/utils/SkJSONWriter.h"

View File

@ -7,7 +7,7 @@
#include "src/gpu/gl/GrGLGpu.h"
#include "include/private/SkTSearch.h"
#include "src/core/SkTSearch.h"
#include "src/gpu/GrProcessor.h"
#include "src/gpu/GrProgramDesc.h"
#include "src/gpu/gl/GrGLPathRendering.h"

View File

@ -10,7 +10,7 @@
// Can remove this once we get rid of the extension flags.
#include "include/gpu/vk/GrVkBackendContext.h"
#include "include/private/SkTSearch.h"
#include "src/core/SkTSearch.h"
#include "src/core/SkTSort.h"
// finds the index of ext in infos or a negative result if ext is not found.

View File

@ -1838,7 +1838,7 @@ bool SkTypeface_FreeType::Scanner::recognizedFont(SkStreamAsset* stream, int* nu
return true;
}
#include "include/private/SkTSearch.h"
#include "src/core/SkTSearch.h"
bool SkTypeface_FreeType::Scanner::scanFont(
SkStreamAsset* stream, int ttcIndex,
SkString* name, SkFontStyle* style, bool* isFixedPitch, AxisDefinitions* axes) const

View File

@ -18,11 +18,11 @@
#include "include/private/SkFixed.h"
#include "include/private/SkTArray.h"
#include "include/private/SkTDArray.h"
#include "include/private/SkTSearch.h"
#include "include/private/SkTemplates.h"
#include "src/core/SkFontDescriptor.h"
#include "src/core/SkMakeUnique.h"
#include "src/core/SkOSFile.h"
#include "src/core/SkTSearch.h"
#include "src/core/SkTypefaceCache.h"
#include "src/ports/SkFontHost_FreeType_common.h"
#include "src/ports/SkFontMgr_android_parser.h"

View File

@ -13,9 +13,9 @@
#include "include/private/SkMalloc.h"
#include "include/private/SkTDArray.h"
#include "include/private/SkTLogic.h"
#include "include/private/SkTSearch.h"
#include "include/private/SkTemplates.h"
#include "src/core/SkOSFile.h"
#include "src/core/SkTSearch.h"
#include "src/ports/SkFontMgr_android_parser.h"
#include <expat.h>

View File

@ -7,10 +7,10 @@
#include "src/sfnt/SkOTTable_name.h"
#include "include/private/SkTSearch.h"
#include "include/private/SkTemplates.h"
#include "src/core/SkEndian.h"
#include "src/core/SkStringUtils.h"
#include "src/core/SkTSearch.h"
#include "src/core/SkUtils.h"
static SkUnichar next_unichar_UTF16BE(const uint8_t** srcPtr, size_t* length) {

View File

@ -10,8 +10,8 @@
#include "include/core/SkMath.h"
#include "include/private/SkFixed.h"
#include "include/private/SkMalloc.h"
#include "include/private/SkTSearch.h"
#include "include/private/SkTo.h"
#include "src/core/SkTSearch.h"
SkInterpolatorBase::SkInterpolatorBase() {
fStorage = nullptr;

View File

@ -12,7 +12,7 @@
#include "include/private/SkOnce.h"
#include "include/private/SkTDArray.h"
#include "include/private/SkTSearch.h"
#include "src/core/SkTSearch.h"
#include "src/core/SkTSort.h"
bool SkWGLExtensions::hasExtension(HDC dc, const char* ext) const {

View File

@ -6,8 +6,8 @@
*/
#include "include/core/SkRefCnt.h"
#include "include/private/SkTSearch.h"
#include "include/utils/SkRandom.h"
#include "src/core/SkTSearch.h"
#include "src/core/SkTSort.h"
#include "tests/Test.h"

View File

@ -10,8 +10,8 @@
#include "include/core/SkPixelRef.h"
#include "include/core/SkStream.h"
#include "include/private/SkTDArray.h"
#include "include/private/SkTSearch.h"
#include "src/core/SkOSFile.h"
#include "src/core/SkTSearch.h"
#include "src/utils/SkOSPath.h"
#include "tools/skdiff/skdiff.h"
#include "tools/skdiff/skdiff_html.h"

View File

@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
#include "windows.h"
#include <windows.h>
#include "tools/win_dbghelp.h"
#include <process.h>

View File

@ -4,8 +4,8 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "windows.h"
#include "stdio.h"
#include <windows.h>
#include <stdio.h>
#define BUFFER_SIZE 512
BOOL CALLBACK MyFuncLocaleEx(LPWSTR pStr, DWORD dwFlags, LPARAM lparam) {