diff options
author | Florin Malita <fmalita@google.com> | 2018-01-16 20:05:09 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-16 20:05:20 +0000 |
commit | 3d1869453e90954f4b8b76d122e7795039dfb8c5 (patch) | |
tree | 268e11a181593569d6645ebebd78bfc5135ceb0c /tools/viewer | |
parent | be46e24d57537f7ab6854fcd6f6ec07e2c50495c (diff) |
Revert "Fix Viewer slide load on backend change"
This reverts commit 5fb009df3c87167762b33483ee82b5fe632837a9.
Reason for revert: Broke first slide.
Original change's description:
> Fix Viewer slide load on backend change
>
> Currently Viewer fires unbalanced load events on backend change.
>
> Instead of calling setupCurrentSlide() with an invalid prevSlide and
> always forcing a slide load, pass a |force| argument on backend change.
>
> Change-Id: I146b42331f5aa9721d4f407b81c13f4512d67d61
> Reviewed-on: https://skia-review.googlesource.com/94960
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Florin Malita <fmalita@chromium.org>
TBR=brianosman@google.com,fmalita@chromium.org
Change-Id: I52bbc9fb44f6ed4e04bcc549b2ec72c8600c823a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/94861
Reviewed-by: Florin Malita <fmalita@google.com>
Commit-Queue: Florin Malita <fmalita@google.com>
Diffstat (limited to 'tools/viewer')
-rw-r--r-- | tools/viewer/Viewer.cpp | 15 | ||||
-rw-r--r-- | tools/viewer/Viewer.h | 2 |
2 files changed, 6 insertions, 11 deletions
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index 0597237e1e..59d5e50d5a 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -609,16 +609,12 @@ void Viewer::listNames() { } } -void Viewer::setupCurrentSlide(int previousSlide, bool force) { - if (fCurrentSlide == previousSlide && !force) { +void Viewer::setupCurrentSlide(int previousSlide) { + if (fCurrentSlide == previousSlide) { return; // no change; do nothing } - // prepare dimensions for image slides - if (fCurrentSlide != previousSlide) { - fSlides[fCurrentSlide]->load(SkIntToScalar(fWindow->width()), - SkIntToScalar(fWindow->height())); - } + fSlides[fCurrentSlide]->load(SkIntToScalar(fWindow->width()), SkIntToScalar(fWindow->height())); fGesture.resetTouchState(); fDefaultMatrix.reset(); @@ -639,7 +635,7 @@ void Viewer::setupCurrentSlide(int previousSlide, bool force) { this->updateTitle(); this->updateUIState(); - if (previousSlide >= 0 && fCurrentSlide != previousSlide) { + if (previousSlide >= 0) { fSlides[previousSlide]->unload(); } @@ -827,8 +823,7 @@ void Viewer::drawSlide(SkCanvas* canvas) { void Viewer::onBackendCreated() { this->updateTitle(); this->updateUIState(); - // Force slide setup without reload. - this->setupCurrentSlide(fCurrentSlide, true); + this->setupCurrentSlide(-1); fStatsLayer.resetMeasurements(); fWindow->show(); fWindow->inval(); diff --git a/tools/viewer/Viewer.h b/tools/viewer/Viewer.h index 956427782a..7d4980cf0e 100644 --- a/tools/viewer/Viewer.h +++ b/tools/viewer/Viewer.h @@ -50,7 +50,7 @@ private: void setBackend(sk_app::Window::BackendType); void setColorMode(ColorMode); void setStartupSlide(); - void setupCurrentSlide(int previousSlide, bool force = false); + void setupCurrentSlide(int previousSlide); void listNames(); void updateUIState(); |