diff options
| author |  djsollen <djsollen@google.com> | 2014-06-17 13:42:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-17 13:42:59 -0700 |
| commit | dbb7b30429691d3a340e49f62c2b3f6f4cb81120 (patch) | |
| tree | 20d22bedd30257e1c70cf6c2601d57cff3f9f85e /include | |
| parent | 4a24cd8ff41a8b3d292d60e4351a631240a7ed75 (diff) | |
Update the name of the friended android class and add the appropriate guards.
R=scroggo@google.com, robertphillips@google.com, reed@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/344473002
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkPictureRecorder.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/core/SkPictureRecorder.h b/include/core/SkPictureRecorder.h index b13b8a809b..a58e827562 100644 --- a/include/core/SkPictureRecorder.h +++ b/include/core/SkPictureRecorder.h @@ -12,6 +12,12 @@ #include "SkPicture.h" #include "SkRefCnt.h" +#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK +namespace android { + class Picture; +}; +#endif + class SkCanvas; class SkPictureRecord; class SkRecord; @@ -65,7 +71,10 @@ private: /** Replay the current (partially recorded) operation stream into canvas. This call doesn't close the current recording. */ - friend class AndroidPicture; +#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK + friend class AndroidPicture; // This is temporary until we remove this from the framework + friend class android::Picture; +#endif friend class SkPictureRecorderReplayTester; // for unit testing void partialReplay(SkCanvas* canvas) const; |