From 847092c88be671c06bdf24aa02b5a66e7a593a15 Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 6 Aug 2014 06:55:12 -0700 Subject: [PATCH] SkThreadPool and co. are not public. BUG=skia: R=reed@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/444583006 --- gyp/public_headers.gypi | 12 ------------ gyp/utils.gypi | 6 +++--- {include => src}/utils/SkCondVar.h | 0 {include => src}/utils/SkRunnable.h | 0 {include => src}/utils/SkThreadPool.h | 0 5 files changed, 3 insertions(+), 15 deletions(-) rename {include => src}/utils/SkCondVar.h (100%) rename {include => src}/utils/SkRunnable.h (100%) rename {include => src}/utils/SkThreadPool.h (100%) diff --git a/gyp/public_headers.gypi b/gyp/public_headers.gypi index 2c9c9ab..283ab83 100644 --- a/gyp/public_headers.gypi +++ b/gyp/public_headers.gypi @@ -215,35 +215,23 @@ 'utils/SkDebugUtils.h', 'utils/SkDeferredCanvas.h', 'utils/SkDumpCanvas.h', - 'utils/SkDumpCanvas.h', - 'utils/SkInterpolator.h', 'utils/SkInterpolator.h', 'utils/SkLayer.h', 'utils/SkLua.h', - 'utils/SkLua.h', 'utils/SkLuaCanvas.h', 'utils/SkMatrix44.h', - 'utils/SkMatrix44.h', 'utils/SkMeshUtils.h', 'utils/SkNWayCanvas.h', 'utils/SkNinePatch.h', 'utils/SkNullCanvas.h', 'utils/SkParse.h', - 'utils/SkParse.h', - 'utils/SkParsePaint.h', 'utils/SkParsePaint.h', 'utils/SkParsePath.h', 'utils/SkPathUtils.h', 'utils/SkPictureUtils.h', 'utils/SkProxyCanvas.h', 'utils/SkRTConf.h', - 'utils/SkRTConf.h', 'utils/SkRandom.h', - 'utils/SkRunnable.h', - 'utils/SkRunnable.h', - 'utils/SkThreadPool.h', - 'utils/SkThreadPool.h', - 'utils/SkWGL.h', 'utils/SkWGL.h', 'utils/ios/SkStream_NSData.h', 'utils/mac/SkCGUtils.h', diff --git a/gyp/utils.gypi b/gyp/utils.gypi index c90d193..b033573 100644 --- a/gyp/utils.gypi +++ b/gyp/utils.gypi @@ -8,9 +8,9 @@ { 'sources': [ # Classes for a threadpool. - '<(skia_include_path)/utils/SkCondVar.h', - '<(skia_include_path)/utils/SkRunnable.h', - '<(skia_include_path)/utils/SkThreadPool.h', + '<(skia_src_path)/utils/SkCondVar.h', + '<(skia_src_path)/utils/SkRunnable.h', + '<(skia_src_path)/utils/SkThreadPool.h', '<(skia_src_path)/utils/SkCondVar.cpp', '<(skia_include_path)/utils/SkBoundaryPatch.h', diff --git a/include/utils/SkCondVar.h b/src/utils/SkCondVar.h similarity index 100% rename from include/utils/SkCondVar.h rename to src/utils/SkCondVar.h diff --git a/include/utils/SkRunnable.h b/src/utils/SkRunnable.h similarity index 100% rename from include/utils/SkRunnable.h rename to src/utils/SkRunnable.h diff --git a/include/utils/SkThreadPool.h b/src/utils/SkThreadPool.h similarity index 100% rename from include/utils/SkThreadPool.h rename to src/utils/SkThreadPool.h -- 2.7.4