diff options
| -rw-r--r-- | gyp/core.gypi | 1 | ||||
| -rw-r--r-- | gyp/public_headers.gypi | 2 | ||||
| -rw-r--r-- | src/core/SkChecksum.h (renamed from include/core/SkChecksum.h) | 0 | ||||
| -rw-r--r-- | src/core/SkEmptyShader.h (renamed from include/core/SkEmptyShader.h) | 0 | ||||
| -rw-r--r-- | src/effects/gradients/SkGradientShader.cpp | 4 | ||||
| -rw-r--r-- | tests/GradientTest.cpp | 3 | ||||
| -rw-r--r-- | tests/RecorderTest.cpp | 5 |
7 files changed, 4 insertions, 11 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi index 0775e521bd..49191402ea 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 72c16bc1a1..f98cab3ce7 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 index bf3228f91d..bf3228f91d 100644 --- a/include/core/SkChecksum.h +++ b/src/core/SkChecksum.h diff --git a/include/core/SkEmptyShader.h b/src/core/SkEmptyShader.h index 7de3bc1f8f..7de3bc1f8f 100644 --- a/include/core/SkEmptyShader.h +++ b/src/core/SkEmptyShader.h diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index 038044d561..fe720b832c 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -698,8 +698,6 @@ void SkGradientShaderBase::toString(SkString* str) const { /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -#include "SkEmptyShader.h" - // assumes colors is SkColor* and pos is SkScalar* #define EXPAND_1_COLOR(count) \ SkColor tmp[2]; \ @@ -790,7 +788,7 @@ SkShader* SkGradientShader::CreateTwoPointConical(const SkPoint& start, 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 3b09f857b3..e6fd7b99fd 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 @@ struct GradRec { 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 c1d96384eb..5fcac4d93e 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 @@ DEF_TEST(Recorder_RefLeaking, r) { SkRect bounds = SkRect::MakeWH(320, 240); SkPaint paint; - paint.setShader(SkNEW(SkEmptyShader))->unref(); + paint.setShader(SkShader::CreateEmptyShader())->unref(); REPORTER_ASSERT(r, paint.getShader()->unique()); { |