diff options
| author |  Mike Klein <mtklein@google.com> | 2015-07-28 16:01:24 -0400 |
|---|---|---|
| committer | Mike Klein <mtklein@google.com> | 2015-07-28 16:01:24 -0400 |
| commit | 3a4b13498885dc42970b9795c0cc3d71fcb8b810 (patch) | |
| tree | 0e8a9cc908b55aaf4684d9ac47a50ea374da0e8a | |
| parent | c3fb74693e25cf6dffc8add8669c54c4b7ace3a2 (diff) | |
Revert "Move the rest of src headers used by include to include/private."
This reverts commit d12e6ffa5cc1c1af47bf73c7c127d8d7f7443058.
Our Chrome roll canaries are failing with the dreaded
Ninja-says-there's-more-work-to-do message. I will break this up
smaller (if possible) and try again tomorrow.
BUG=skia:4126
Review URL: https://codereview.chromium.org/1258293004 .
| -rw-r--r-- | include/core/SkPictureRecorder.h | 2 | ||||
| -rw-r--r-- | include/gpu/gl/SkGLContext.h | 4 | ||||
| -rw-r--r-- | include/views/SkOSWindow_Win.h | 2 | ||||
| -rw-r--r-- | src/core/SkFunction.h (renamed from include/private/SkFunction.h) | 0 | ||||
| -rw-r--r-- | src/core/SkMiniRecorder.h (renamed from include/private/SkMiniRecorder.h) | 0 | ||||
| -rw-r--r-- | src/core/SkPathPriv.h (renamed from include/private/SkPathPriv.h) | 0 | ||||
| -rw-r--r-- | src/core/SkRecords.h (renamed from include/private/SkRecords.h) | 0 | ||||
| -rw-r--r-- | src/gpu/SkGpuFenceSync.h (renamed from include/private/SkGpuFenceSync.h) | 0 |
8 files changed, 4 insertions, 4 deletions
diff --git a/include/core/SkPictureRecorder.h b/include/core/SkPictureRecorder.h index a1ec7a70a3..b24975acde 100644 --- a/include/core/SkPictureRecorder.h +++ b/include/core/SkPictureRecorder.h @@ -8,7 +8,7 @@ #ifndef SkPictureRecorder_DEFINED #define SkPictureRecorder_DEFINED -#include "../private/SkMiniRecorder.h" +#include "../../src/core/SkMiniRecorder.h" #include "SkBBHFactory.h" #include "SkPicture.h" #include "SkRefCnt.h" diff --git a/include/gpu/gl/SkGLContext.h b/include/gpu/gl/SkGLContext.h index ba8506c980..3d232e558e 100644 --- a/include/gpu/gl/SkGLContext.h +++ b/include/gpu/gl/SkGLContext.h @@ -9,7 +9,7 @@ #define SkGLContext_DEFINED #include "GrGLInterface.h" -#include "../private/SkGpuFenceSync.h" +#include "../../src/gpu/SkGpuFenceSync.h" /** * Create an offscreen opengl context with an RGBA8 / 8bit stencil FBO. @@ -18,7 +18,7 @@ class SK_API SkGLContext : public SkRefCnt { public: - + ~SkGLContext() override; diff --git a/include/views/SkOSWindow_Win.h b/include/views/SkOSWindow_Win.h index ccab59066d..85cfec14f8 100644 --- a/include/views/SkOSWindow_Win.h +++ b/include/views/SkOSWindow_Win.h @@ -10,7 +10,7 @@ #ifndef SkOSWindow_Win_DEFINED #define SkOSWindow_Win_DEFINED -#include "../private/SkFunction.h" +#include "../../src/core/SkFunction.h" #include "../private/SkTHash.h" #include "SkWindow.h" diff --git a/include/private/SkFunction.h b/src/core/SkFunction.h index 8e41cba929..8e41cba929 100644 --- a/include/private/SkFunction.h +++ b/src/core/SkFunction.h diff --git a/include/private/SkMiniRecorder.h b/src/core/SkMiniRecorder.h index 5b68fc22f8..5b68fc22f8 100644 --- a/include/private/SkMiniRecorder.h +++ b/src/core/SkMiniRecorder.h diff --git a/include/private/SkPathPriv.h b/src/core/SkPathPriv.h index 934c730660..934c730660 100644 --- a/include/private/SkPathPriv.h +++ b/src/core/SkPathPriv.h diff --git a/include/private/SkRecords.h b/src/core/SkRecords.h index 9ab04c91e4..9ab04c91e4 100644 --- a/include/private/SkRecords.h +++ b/src/core/SkRecords.h diff --git a/include/private/SkGpuFenceSync.h b/src/gpu/SkGpuFenceSync.h index b78398fed8..b78398fed8 100644 --- a/include/private/SkGpuFenceSync.h +++ b/src/gpu/SkGpuFenceSync.h |