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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: include/effects/SkMergeImageFilter.h

Issue 23021015: Initial error handling code (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: New serialization method Created 7 years, 3 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
« include/effects/SkFlattenableUtils.h ('K') | « include/effects/SkMatrixConvolutionImageFilter.h ('k') | include/effects/SkMorphologyImageFilter.h » ('j') | src/core/SkFlattenableSerialization.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/effects/SkMergeImageFilter.h
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
index 8c4313dd13a8ec610df6271185fd54edf2339b25..f2485a69be97b4fd898b151258fdb16d5d4ff189 100755
--- a/include/effects/SkMergeImageFilter.h
+++ b/include/effects/SkMergeImageFilter.h
@@ -13,6 +13,8 @@
#include "SkXfermode.h"
class SK_API SkMergeImageFilter : public SkImageFilter {
+ typedef SkImageFilter INHERITED;
+
public:
SkMergeImageFilter(SkImageFilter* first, SkImageFilter* second,
SkXfermode::Mode = SkXfermode::kSrcOver_Mode);
@@ -39,8 +41,6 @@ private:
void initAllocModes();
void initModes(const SkXfermode::Mode []);
-
- typedef SkImageFilter INHERITED;
};
#endif
« include/effects/SkFlattenableUtils.h ('K') | « include/effects/SkMatrixConvolutionImageFilter.h ('k') | include/effects/SkMorphologyImageFilter.h » ('j') | src/core/SkFlattenableSerialization.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698