Orphan ProcXfermode, with an eye towards removing it
BUG=skia:
R=scroggo@google.com, mtklein@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/240533003
git-svn-id: http://skia.googlecode.com/svn/trunk@14238 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index ab2f22f..350860c 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -325,7 +325,7 @@
SkWriteBuffer writer;
SkPaint::FlatteningTraits::Flatten(writer, paint);
- const size_t expectedBytesWritten = sizeof(void*) == 8 ? 44 : 36;
+ const size_t expectedBytesWritten = sizeof(void*) == 8 ? 36 : 28;
ASSERT(expectedBytesWritten == writer.bytesWritten());
const uint32_t* written = writer.getWriter32()->contiguousArray();
diff --git a/tests/XfermodeTest.cpp b/tests/XfermodeTest.cpp
index 4afa522..34f5233 100644
--- a/tests/XfermodeTest.cpp
+++ b/tests/XfermodeTest.cpp
@@ -9,10 +9,6 @@
#include "SkXfermode.h"
#include "Test.h"
-static SkPMColor bogusXfermodeProc(SkPMColor src, SkPMColor dst) {
- return 42;
-}
-
#define ILLEGAL_MODE ((SkXfermode::Mode)-1)
static void test_asMode(skiatest::Reporter* reporter) {
@@ -36,14 +32,6 @@
REPORTER_ASSERT(reporter, SkXfermode::kSrcOver_Mode == mode);
}
}
-
- SkXfermode* bogusXfer = SkProcXfermode::Create(bogusXfermodeProc);
- SkXfermode::Mode reportedMode = ILLEGAL_MODE;
- REPORTER_ASSERT(reporter, !bogusXfer->asMode(&reportedMode));
- REPORTER_ASSERT(reporter, reportedMode == ILLEGAL_MODE);
- REPORTER_ASSERT(reporter, !SkXfermode::AsMode(bogusXfer, &reportedMode));
- REPORTER_ASSERT(reporter, reportedMode == ILLEGAL_MODE);
- bogusXfer->unref();
}
static void test_IsMode(skiatest::Reporter* reporter) {