Index: include/core/SkCanvas.h |
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h |
index 6eb42d2f5a0e705929eeb468cf9891275f30b6a0..ed83b8bab137830a2a9810eee941d56d87a64e9c 100644 |
--- a/include/core/SkCanvas.h |
+++ b/include/core/SkCanvas.h |
@@ -33,7 +33,10 @@ |
#define SK_LEGACY_DRAWTEXT_VIRTUAL |
#endif |
+#ifdef SK_SUPPORT_LEGACY_BOUNDER |
scroggo
2014/06/03 13:52:59
Does anyone need this? (Sorry I keep complaining a
reed1
2014/06/03 17:38:49
This was added before you confirmed that Android d
|
class SkBounder; |
+#endif |
+ |
class SkBaseDevice; |
class SkDraw; |
class SkDrawFilter; |
@@ -1069,21 +1072,10 @@ public: |
////////////////////////////////////////////////////////////////////////// |
- /** Get the current bounder object. |
- The bounder's reference count is unchaged. |
- @return the canva's bounder (or NULL). |
- */ |
- SkBounder* getBounder() const { return fBounder; } |
- |
- /** Set a new bounder (or NULL). |
- Pass NULL to clear any previous bounder. |
- As a convenience, the parameter passed is also returned. |
- If a previous bounder exists, its reference count is decremented. |
- If bounder is not NULL, its reference count is incremented. |
- @param bounder the new bounder (or NULL) to be installed in the canvas |
- @return the set bounder object |
- */ |
- virtual SkBounder* setBounder(SkBounder* bounder); |
+#ifdef SK_SUPPORT_LEGACY_BOUNDER |
+ SkBounder* getBounder() const { return NULL; } |
+ virtual SkBounder* setBounder(SkBounder*) { return NULL; } |
+#endif |
/** Get the current filter object. The filter's reference count is not |
affected. The filter is saved/restored, just like the matrix and clip. |
@@ -1304,7 +1296,6 @@ private: |
// the first N recs that can fit here mean we won't call malloc |
uint32_t fMCRecStorage[32]; |
- SkBounder* fBounder; |
int fSaveLayerCount; // number of successful saveLayer calls |
int fCullCount; // number of active culls |