Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: include/effects/SkArithmeticMode.h

Issue 23021015: Initial error handling code (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Fixing comments Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: include/effects/SkArithmeticMode.h
diff --git a/include/effects/SkArithmeticMode.h b/include/effects/SkArithmeticMode.h
index 9de332caef4016e414165549ae07b8eca8de6289..8e5d79a9b274b756d13e60ee3fef4f6585468def 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]
@@ -25,10 +28,10 @@ public:
static SkXfermode* Create(SkScalar k1, SkScalar k2,
SkScalar k3, SkScalar k4);
- SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP();
+ SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
sugoi1 2013/10/09 14:29:58 I added the missing semicolon to remove this line
private:
- typedef SkXfermode INHERITED;
+ SkArithmeticMode(); // can't be instantiated
};
#endif

Powered by Google App Engine
This is Rietveld 408576698