Revert of Add samples to Viewer.

tools/viewer/Viewer.cpp

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "Viewer.h"
 
 #include "GMSlide.h"
-#include "SampleSlide.h"
 #include "SKPSlide.h"
 
 #include "SkCanvas.h"
 #include "SkCommonFlags.h"
 #include "SkOSFile.h"
 #include "SkRandom.h"
 #include "SkStream.h"
 
 using namespace sk_app;
 
@@ skipping 14 matching lines @@
     return viewer->onTouch(owner, state, x, y);
 }
 
 static void on_ui_state_changed_handler(const SkString& stateName, const SkString& stateValue, void* userData) {
     Viewer* viewer = reinterpret_cast<Viewer*>(userData);
 
     return viewer->onUIStateChanged(stateName, stateValue);
 }
 
 DEFINE_bool2(fullscreen, f, true, "Run fullscreen.");
+DEFINE_string(key, "", "Space-separated key/value pairs to add to JSON identifying this builder.");
 DEFINE_string2(match, m, nullptr,
                "[~][^]substring[$] [...] of bench name to run.\n"
                "Multiple matches may be separated by spaces.\n"
                "~ causes a matching bench to always be skipped\n"
                "^ requires the start of the bench to match\n"
                "$ requires the end of the bench to match\n"
                "^ and $ requires an exact match\n"
                "If a bench does not match any list entry,\n"
                "it is skipped unless some list entry starts with ~");
 DEFINE_string(skps, "skps", "Directory to read skps from.");
@@ skipping 133 matching lines @@
         gms = gms->next();
     }
 
     // reverse array
     for (int i = 0; i < fSlides.count()/2; ++i) {
         sk_sp<Slide> temp = fSlides[i];
         fSlides[i] = fSlides[fSlides.count() - i - 1];
         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")) {
             if (SkCommandLineFlags::ShouldSkip(FLAGS_match, FLAGS_skps[i])) {
                 continue;
             }
 
             SkString path(FLAGS_skps[i]);
             sk_sp<SKPSlide> slide(new SKPSlide(SkOSPath::Basename(path.c_str()), path));
             if (slide) {
@@ skipping 56 matching lines @@
         const SkISize slideSize = fSlides[fCurrentSlide]->getDimensions();
         SkRect windowRect = fWindow->getContentRect();
         fDefaultMatrixInv.mapRect(&windowRect);
         fGesture.setTransLimit(SkRect::MakeWH(SkIntToScalar(slideSize.width()), 
                                               SkIntToScalar(slideSize.height())),
                                windowRect);
     }
 
     this->updateTitle();
     this->updateUIState();
-    fSlides[fCurrentSlide]->load(SkIntToScalar(fWindow->width()), SkIntToScalar(fWindow->height()));
+    fSlides[fCurrentSlide]->load();
     if (previousSlide >= 0) {
         fSlides[previousSlide]->unload();
     }
     fWindow->inval();
 }
 
 #define MAX_ZOOM_LEVEL  8
 #define MIN_ZOOM_LEVEL  -8
 
 void Viewer::changeZoomLevel(float delta) {
@@ skipping 219 matching lines @@
         }
     } else if (stateName.equals(kSoftkeyStateName)) {
         if (!stateValue.equals(kSoftkeyHint)) {
             fCommands.onSoftkey(stateValue);
             updateUIState(); // This is still needed to reset the value to kSoftkeyHint
         }
     } else {
         SkDebugf("Unknown stateName: %s", stateName.c_str());
     }
 }