diff options
| author | reed <reed@chromium.org> | 2015-01-13 19:43:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-13 19:43:04 -0800 |
| commit | 63121f0db6ebbefb17f47ec4ec108d77d619fad5 (patch) | |
| tree | d44be87071d015c3b9d079707a4d80904e64c88d /samplecode/SampleApp.cpp | |
| parent | 812c0283b9f9f1b795557f1ee76ae46ce0585d5d (diff) | |
delete the dreaded TransitionView
BUG=skia:
TBR=
Review URL: https://codereview.chromium.org/850843002
Diffstat (limited to 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 6c78810b99..05eac2f471 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -20,8 +20,6 @@ #include "SkGraphics.h" #include "SkImageEncoder.h" #include "SkOSFile.h" -//#include "SkPDFDevice.h" -//#include "SkPDFDocument.h" #include "SkPaint.h" #include "SkPicture.h" #include "SkPictureRecorder.h" @@ -31,7 +29,6 @@ #include "SkTime.h" #include "SkTypeface.h" #include "SkWindow.h" -#include "TransitionView.h" #include "sk_tool_utils.h" #if SK_SUPPORT_GPU @@ -1515,21 +1512,19 @@ void SampleWindow::updateMatrix(){ } bool SampleWindow::previousSample() { fCurrIndex = (fCurrIndex - 1 + fSamples.count()) % fSamples.count(); - this->loadView(create_transition(curr_view(this), (*fSamples[fCurrIndex])(), - fTransitionPrev)); + this->loadView((*fSamples[fCurrIndex])()); return true; } bool SampleWindow::nextSample() { fCurrIndex = (fCurrIndex + 1) % fSamples.count(); - this->loadView(create_transition(curr_view(this), (*fSamples[fCurrIndex])(), - fTransitionNext)); + this->loadView((*fSamples[fCurrIndex])()); return true; } bool SampleWindow::goToSample(int i) { fCurrIndex = (i) % fSamples.count(); - this->loadView(create_transition(curr_view(this),(*fSamples[fCurrIndex])(), 6)); + this->loadView((*fSamples[fCurrIndex])()); return true; } @@ -1542,9 +1537,7 @@ int SampleWindow::sampleCount() { } void SampleWindow::showOverview() { - this->loadView(create_transition(curr_view(this), - create_overview(fSamples.count(), fSamples.begin()), - 4)); + this->loadView(create_overview(fSamples.count(), fSamples.begin())); } void SampleWindow::installDrawFilter(SkCanvas* canvas) { |