diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ImageFilterTest.cpp | 23 | ||||
| -rw-r--r-- | tests/PDFPrimitivesTest.cpp | 5 |
2 files changed, 8 insertions, 20 deletions
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index 6fefe49dcb..9fd4351b42 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -58,13 +58,6 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(MatrixTestImageFilter) protected: -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit MatrixTestImageFilter(SkReadBuffer& buffer) : SkImageFilter(0, NULL) { - fReporter = static_cast<skiatest::Reporter*>(buffer.readFunctionPtr()); - buffer.readMatrix(&fExpectedMatrix); - } -#endif - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { this->INHERITED::flatten(buffer); buffer.writeFunctionPtr(fReporter); @@ -74,7 +67,7 @@ protected: private: skiatest::Reporter* fReporter; SkMatrix fExpectedMatrix; - + typedef SkImageFilter INHERITED; }; @@ -487,7 +480,7 @@ DEF_TEST(ImageFilterDrawTiled, reporter) { } } -static void draw_saveLayer_picture(int width, int height, int tileSize, +static void draw_saveLayer_picture(int width, int height, int tileSize, SkBBHFactory* factory, SkBitmap* result) { SkMatrix matrix; @@ -501,8 +494,8 @@ static void draw_saveLayer_picture(int width, int height, int tileSize, paint.setImageFilter(imageFilter.get()); SkPictureRecorder recorder; SkRect bounds = SkRect::Make(SkIRect::MakeXYWH(0, 0, 50, 50)); - SkCanvas* recordingCanvas = recorder.beginRecording(SkIntToScalar(width), - SkIntToScalar(height), + SkCanvas* recordingCanvas = recorder.beginRecording(SkIntToScalar(width), + SkIntToScalar(height), factory, 0); recordingCanvas->translate(-55, 0); recordingCanvas->saveLayer(&bounds, &paint); @@ -625,11 +618,11 @@ DEF_TEST(ImageFilterDrawTiledBlurRTree, reporter) { SkPictureRecorder recorder1, recorder2; // The only difference between these two pictures is that one has RTree aceleration. - SkCanvas* recordingCanvas1 = recorder1.beginRecording(SkIntToScalar(width), - SkIntToScalar(height), + SkCanvas* recordingCanvas1 = recorder1.beginRecording(SkIntToScalar(width), + SkIntToScalar(height), NULL, 0); - SkCanvas* recordingCanvas2 = recorder2.beginRecording(SkIntToScalar(width), - SkIntToScalar(height), + SkCanvas* recordingCanvas2 = recorder2.beginRecording(SkIntToScalar(width), + SkIntToScalar(height), &factory, 0); draw_blurred_rect(recordingCanvas1); draw_blurred_rect(recordingCanvas2); diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp index 05677cd1ab..60a1099136 100644 --- a/tests/PDFPrimitivesTest.cpp +++ b/tests/PDFPrimitivesTest.cpp @@ -444,11 +444,6 @@ public: return true; } SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(DummyImageFilter) -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit DummyImageFilter(SkReadBuffer& buffer) : SkImageFilter(0, NULL) { - fVisited = buffer.readBool(); - } -#endif bool visited() const { return fVisited; } private: |