AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SIMPLE_GM generates less code

Browse Source 
Review URL: https://codereview.chromium.org/811703005
This commit is contained in:
halcanary 2015-01-12 15:27:46 -08:00 committed by Commit bot
parent 4fc48af0d7
commit f62c63490f
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gm/gm.cpp
View File

@ -66,3 +66,15 @@ void GM::drawSizeBounds(SkCanvas* canvas, SkColor color) {
// need to explicitly declare this, or we get some weird infinite loop llist
template GMRegistry* GMRegistry::gHead;
void skiagm::SimpleGM::onDraw(SkCanvas* canvas) {
fDrawProc(canvas);
}
SkISize skiagm::SimpleGM::onISize() {
return fSize;
}
SkString skiagm::SimpleGM::onShortName() {
return fName;
}

35
gm/gm.h
View File

@ -25,18 +25,13 @@
static skiagm::GMRegistry SK_MACRO_APPEND_LINE(R_)(SK_MACRO_APPEND_LINE(F_));
// See colorwheel.cpp for example usage.
#define DEF_SIMPLE_GM(NAME, CANVAS, W, H) \
class SK_MACRO_CONCAT(NAME, _GM) : public skiagm::GM { \
void onDraw(SkCanvas* canvas) SK_OVERRIDE; \
SkISize onISize() SK_OVERRIDE { \
return SkISize::Make((W), (H)); \
} \
SkString onShortName() SK_OVERRIDE { \
return SkString(#NAME); \
} \
}; \
DEF_GM( return SkNEW(SK_MACRO_CONCAT(NAME, _GM)); ) \
void SK_MACRO_CONCAT(NAME, _GM)::onDraw(SkCanvas* CANVAS)
#define DEF_SIMPLE_GM(NAME, CANVAS, W, H) \
static void SK_MACRO_CONCAT(NAME, _GM)(SkCanvas* CANVAS); \
DEF_GM( return SkNEW_ARGS(skiagm::SimpleGM, \
(SkString(#NAME), \
SK_MACRO_CONCAT(NAME, _GM), \
SkISize::Make(W, H))); ) \
void SK_MACRO_CONCAT(NAME, _GM)(SkCanvas* CANVAS)
namespace skiagm {
@ -136,6 +131,22 @@ namespace skiagm {
};
typedef SkTRegistry<GM*(*)(void*)> GMRegistry;
class SimpleGM : public skiagm::GM {
public:
SimpleGM(const SkString& name,
void (*drawProc)(SkCanvas*),
const SkISize& size)
: fName(name), fDrawProc(drawProc), fSize(size) {}
protected:
void onDraw(SkCanvas* canvas) SK_OVERRIDE;
SkISize onISize() SK_OVERRIDE;
SkString onShortName() SK_OVERRIDE;
private:
SkString fName;
void (*fDrawProc)(SkCanvas*);
SkISize fSize;
};
}
#endif