aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/viewer/Viewer.h
diff options
context:
space:
mode:
authorGravatar Florin Malita <fmalita@google.com>2018-01-16 20:05:09 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-01-16 20:05:20 +0000
commit3d1869453e90954f4b8b76d122e7795039dfb8c5 (patch)
tree268e11a181593569d6645ebebd78bfc5135ceb0c /tools/viewer/Viewer.h
parentbe46e24d57537f7ab6854fcd6f6ec07e2c50495c (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/Viewer.h')
-rw-r--r--tools/viewer/Viewer.h2
1 files changed, 1 insertions, 1 deletions
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();