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

No longer limit SkPictureRecorder::partialReplay to Android

Browse Source 
Toggling this for local testing is a bit of a chore.

R=mtklein@google.com, reed@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/316173004
This commit is contained in:
robertphillips 2014-06-08 13:12:44 -07:00 committed by Commit bot
parent 91359bed48
commit e2f2b98444
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/core/SkPictureRecorder.h
View File

@ -55,14 +55,12 @@ public:
void internalOnly_EnableOpts(bool enableOpts); void internalOnly_EnableOpts(bool enableOpts);
private: private:
#ifdef SK_BUILD_FOR_ANDROID
/** Replay the current (partially recorded) operation stream into /** Replay the current (partially recorded) operation stream into
canvas. This call doesn't close the current recording. canvas. This call doesn't close the current recording.
*/ */
friend class AndroidPicture; friend class AndroidPicture;
friend class SkPictureRecorderReplayTester; // for unit testing friend class SkPictureRecorderReplayTester; // for unit testing
void partialReplay(SkCanvas* canvas) const; void partialReplay(SkCanvas* canvas) const;
#endif
SkAutoTUnref<SkPicture> fPicture; SkAutoTUnref<SkPicture> fPicture;
SkPictureRecord* fCanvas; // ref counted SkPictureRecord* fCanvas; // ref counted

2
src/core/SkPictureRecorder.cpp
View File

@ -68,7 +68,6 @@ void SkPictureRecorder::internalOnly_EnableOpts(bool enableOpts) {
} }
} }
#ifdef SK_BUILD_FOR_ANDROID
void SkPictureRecorder::partialReplay(SkCanvas* canvas) const { void SkPictureRecorder::partialReplay(SkCanvas* canvas) const {
if (NULL == fPicture.get() || NULL == canvas) { if (NULL == fPicture.get() || NULL == canvas) {
// Not recording or nothing to replay into // Not recording or nothing to replay into
@ -82,4 +81,3 @@ void SkPictureRecorder::partialReplay(SkCanvas* canvas) const {
false)); false));
playback->draw(*canvas, NULL); playback->draw(*canvas, NULL);
} }
#endif

2
tests/PictureTest.cpp
View File

@ -919,7 +919,6 @@ static void set_canvas_to_save_count_4(SkCanvas* canvas) {
canvas->save(); canvas->save();
} }
#ifdef SK_BUILD_FOR_ANDROID
/** /**
* A canvas that records the number of saves, saveLayers and restores. * A canvas that records the number of saves, saveLayers and restores.
*/ */
@ -1042,7 +1041,6 @@ DEF_TEST(PictureRecorder_replay, reporter) {
REPORTER_ASSERT(reporter, !copy->willPlayBackBitmaps()); REPORTER_ASSERT(reporter, !copy->willPlayBackBitmaps());
} }
} }
#endif
static void test_unbalanced_save_restores(skiatest::Reporter* reporter) { static void test_unbalanced_save_restores(skiatest::Reporter* reporter) {
SkCanvas testCanvas(100, 100); SkCanvas testCanvas(100, 100);