move SkChecksum and SkEmptyShader to private
TBR=reed@google.com
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/366133002
diff --git a/gyp/core.gypi b/gyp/core.gypi
index 0775e52..4919140 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -230,7 +230,6 @@
'<(skia_include_path)/core/SkBitmapDevice.h',
'<(skia_include_path)/core/SkBlitRow.h',
'<(skia_include_path)/core/SkCanvas.h',
- '<(skia_include_path)/core/SkChecksum.h',
'<(skia_include_path)/core/SkChunkAlloc.h',
'<(skia_include_path)/core/SkClipStack.h',
'<(skia_include_path)/core/SkColor.h',
diff --git a/gyp/public_headers.gypi b/gyp/public_headers.gypi
index 72c16bc..f98cab3 100644
--- a/gyp/public_headers.gypi
+++ b/gyp/public_headers.gypi
@@ -222,7 +222,6 @@
'core/SkFlate.h',
'core/SkTDArray.h',
'core/SkAnnotation.h',
- 'core/SkChecksum.h',
'core/SkMath.h',
'core/SkDrawLooper.h',
'core/SkFlattenableBuffers.h',
@@ -250,7 +249,6 @@
'core/SkString.h',
'core/SkPixelRef.h',
'core/SkSize.h',
- 'core/SkEmptyShader.h',
'core/SkSurface.h',
'core/SkPostConfig.h',
'core/SkShader.h',
diff --git a/include/core/SkChecksum.h b/src/core/SkChecksum.h
similarity index 100%
rename from include/core/SkChecksum.h
rename to src/core/SkChecksum.h
diff --git a/include/core/SkEmptyShader.h b/src/core/SkEmptyShader.h
similarity index 100%
rename from include/core/SkEmptyShader.h
rename to src/core/SkEmptyShader.h
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index 038044d..fe720b8 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -698,8 +698,6 @@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-#include "SkEmptyShader.h"
-
// assumes colors is SkColor* and pos is SkScalar*
#define EXPAND_1_COLOR(count) \
SkColor tmp[2]; \
@@ -790,7 +788,7 @@
return NULL;
}
if (start == end && startRadius == endRadius) {
- return SkNEW(SkEmptyShader);
+ return SkShader::CreateEmptyShader();
}
EXPAND_1_COLOR(colorCount);
diff --git a/tests/GradientTest.cpp b/tests/GradientTest.cpp
index 3b09f85..e6fd7b9 100644
--- a/tests/GradientTest.cpp
+++ b/tests/GradientTest.cpp
@@ -7,7 +7,6 @@
#include "SkCanvas.h"
#include "SkColorShader.h"
-#include "SkEmptyShader.h"
#include "SkGradientShader.h"
#include "SkShader.h"
#include "SkTemplates.h"
@@ -43,7 +42,7 @@
static void none_gradproc(skiatest::Reporter* reporter, const GradRec&) {
- SkAutoTUnref<SkShader> s(new SkEmptyShader);
+ SkAutoTUnref<SkShader> s(SkShader::CreateEmptyShader());
REPORTER_ASSERT(reporter, SkShader::kNone_GradientType == s->asAGradient(NULL));
}
diff --git a/tests/RecorderTest.cpp b/tests/RecorderTest.cpp
index c1d9638..5fcac4d 100644
--- a/tests/RecorderTest.cpp
+++ b/tests/RecorderTest.cpp
@@ -10,8 +10,7 @@
#include "SkRecord.h"
#include "SkRecorder.h"
#include "SkRecords.h"
-
-#include "SkEmptyShader.h"
+#include "SkShader.h"
#define COUNT(T) + 1
static const int kRecordTypes = SK_RECORD_TYPES(COUNT);
@@ -57,7 +56,7 @@
SkRect bounds = SkRect::MakeWH(320, 240);
SkPaint paint;
- paint.setShader(SkNEW(SkEmptyShader))->unref();
+ paint.setShader(SkShader::CreateEmptyShader())->unref();
REPORTER_ASSERT(r, paint.getShader()->unique());
{
