diff options
| author |  mtklein <mtklein@chromium.org> | 2014-08-06 06:55:12 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-06 06:55:12 -0700 |
| commit | 847092c88be671c06bdf24aa02b5a66e7a593a15 (patch) | |
| tree | 60909e9c901e0310d1e1379d8c8193fefd38cad3 | |
| parent | 70f25c1a3f5677ff582399e138a82653a5bfe7c8 (diff) | |
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
| -rw-r--r-- | gyp/public_headers.gypi | 12 | ||||
| -rw-r--r-- | gyp/utils.gypi | 6 | ||||
| -rw-r--r-- | src/utils/SkCondVar.h (renamed from include/utils/SkCondVar.h) | 0 | ||||
| -rw-r--r-- | src/utils/SkRunnable.h (renamed from include/utils/SkRunnable.h) | 0 | ||||
| -rw-r--r-- | src/utils/SkThreadPool.h (renamed from include/utils/SkThreadPool.h) | 0 |
5 files changed, 3 insertions, 15 deletions
diff --git a/gyp/public_headers.gypi b/gyp/public_headers.gypi index 2c9c9ab95b..283ab834fa 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 c90d19344c..b033573dd9 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 index 6f18e1a651..6f18e1a651 100644 --- a/include/utils/SkCondVar.h +++ b/src/utils/SkCondVar.h diff --git a/include/utils/SkRunnable.h b/src/utils/SkRunnable.h index 5acf4dbc61..5acf4dbc61 100644 --- a/include/utils/SkRunnable.h +++ b/src/utils/SkRunnable.h diff --git a/include/utils/SkThreadPool.h b/src/utils/SkThreadPool.h index c99c5c4188..c99c5c4188 100644 --- a/include/utils/SkThreadPool.h +++ b/src/utils/SkThreadPool.h |