aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/effects
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-10-23 17:06:21 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-10-23 17:06:21 +0000
commitc0b7e10c6a68f59e1653e6c18e6bc954b3c3f0cf (patch)
tree6a0bb372e8e3dfe22909629962e95d9c11ece4a9 /include/effects
parent759befb72c558202de65a480c44d7b27428ec312 (diff)
Initial error handling code
I made it as simple as possible. The impact seems minimal and it should do what's necessary to make this code secure. BUG= Committed: http://code.google.com/p/skia/source/detail?r=11247 R=reed@google.com, scroggo@google.com, djsollen@google.com, sugoi@google.com, bsalomon@google.com, mtklein@google.com, senorblanco@google.com, senorblanco@chromium.org Author: sugoi@chromium.org Review URL: https://codereview.chromium.org/23021015 git-svn-id: http://skia.googlecode.com/svn/trunk@11922 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/effects')
-rw-r--r--include/effects/SkArithmeticMode.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/effects/SkArithmeticMode.h b/include/effects/SkArithmeticMode.h
index 9de332caef..46b7121bb4 100644
--- a/include/effects/SkArithmeticMode.h
+++ b/include/effects/SkArithmeticMode.h
@@ -8,9 +8,12 @@
#ifndef SkArithmeticMode_DEFINED
#define SkArithmeticMode_DEFINED
-#include "SkXfermode.h"
+#include "SkFlattenable.h"
+#include "SkScalar.h"
-class SK_API SkArithmeticMode : public SkXfermode {
+class SkXfermode;
+
+class SK_API SkArithmeticMode {
public:
/**
* result = clamp[k1 * src * dst + k2 * src + k3 * dst + k4]
@@ -28,7 +31,7 @@ public:
SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP();
private:
- typedef SkXfermode INHERITED;
+ SkArithmeticMode(); // can't be instantiated
};
#endif