diff options
author | jvanverth <jvanverth@google.com> | 2016-06-16 09:52:35 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-16 09:52:35 -0700 |
commit | c7027ab03f2e8bab4c74bc1b047642622d3d682b (patch) | |
tree | 72baa4e6345d6e3bbdb2b0165130a637a9778f19 /tools/viewer/Viewer.cpp | |
parent | c4ce6b592487305de251bbebaf8eeee38371b877 (diff) |
Add samples to Viewer.
This adds support with animation, assuming the sample has
implemented onAnimate. Event handling has not been
implemented.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2056343004
Committed: https://skia.googlesource.com/skia/+/76963e73704a42a18c29d6fbdcccb566e5c67658
Review-Url: https://codereview.chromium.org/2056343004
Diffstat (limited to 'tools/viewer/Viewer.cpp')
-rw-r--r-- | tools/viewer/Viewer.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index 7052a3ac79..43697f88b8 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -9,6 +9,7 @@ #include "GMSlide.h" #include "ImageSlide.h" +#include "SampleSlide.h" #include "SKPSlide.h" #include "SkCanvas.h" @@ -205,6 +206,14 @@ void Viewer::initSlides() { fSlides[fSlides.count() - i - 1] = temp; } + // samples + const SkViewRegister* reg = SkViewRegister::Head(); + while (reg) { + sk_sp<Slide> slide(new SampleSlide(reg->factory())); + fSlides.push_back(slide); + reg = reg->next(); + } + // SKPs for (int i = 0; i < FLAGS_skps.count(); i++) { if (SkStrEndsWith(FLAGS_skps[i], ".skp")) { @@ -270,7 +279,7 @@ void Viewer::setupCurrentSlide(int previousSlide) { } // prepare dimensions for image slides - fSlides[fCurrentSlide]->load(); + fSlides[fCurrentSlide]->load(SkIntToScalar(fWindow->width()), SkIntToScalar(fWindow->height())); fGesture.reset(); fDefaultMatrix.reset(); |