More accurate render time and continuous fresh

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 "ImageSlide.h"
 #include "SampleSlide.h"
 #include "SKPSlide.h"
 
 #include "SkCanvas.h"
 #include "SkCommonFlags.h"
 #include "SkDashPathEffect.h"
 #include "SkMetaData.h"
 #include "SkOSFile.h"
 #include "SkRandom.h"
 #include "SkStream.h"
 #include "SkSurface.h"
+#include "SkTime.h"
 
 using namespace sk_app;
 
 Application* Application::Create(int argc, char** argv, void* platformData) {
     return new Viewer(argc, argv, platformData);
 }
 
 static void on_paint_handler(SkCanvas* canvas, void* userData) {
     Viewer* vv = reinterpret_cast<Viewer*>(userData);
 
@@ skipping 46 matching lines @@
 const char* kValue = "value";
 const char* kOptions = "options";
 const char* kSlideStateName = "Slide";
 const char* kBackendStateName = "Backend";
 const char* kSoftkeyStateName = "Softkey";
 const char* kSoftkeyHint = "Please select a softkey";
 const char* kFpsStateName = "FPS";
 const char* kSplitScreenStateName = "Split screen";
 const char* kON = "ON";
 const char* kOFF = "OFF";
+const char* kRefreshStateName = "Refresh";
 
 Viewer::Viewer(int argc, char** argv, void* platformData)
     : fCurrentMeasurement(0)
     , fDisplayStats(false)
+    , fRefresh(false)
     , fSplitScreen(false)
     , fBackendType(sk_app::Window::kNativeGL_BackendType)
     , fZoomCenterX(0.0f)
     , fZoomCenterY(0.0f)
     , fZoomLevel(0.0f)
     , fZoomScale(SK_Scalar1)
 {
     memset(fMeasurements, 0, sizeof(fMeasurements));
 
     SkDebugf("Command line arguments: ");
@@ skipping 290 matching lines @@
         SkPaint paint;
         SkScalar intervals[] = {10.0f, 5.0f};
         paint.setPathEffect(SkDashPathEffect::Make(intervals, 2, 0.0f));
         SkRect contentRect = fWindow->getContentRect();
         SkScalar middleX = (contentRect.fLeft + contentRect.fRight) * 0.5f;
         canvas->drawLine(middleX, contentRect.fTop, middleX, contentRect.fBottom, paint);
     }
 }
 
 void Viewer::onPaint(SkCanvas* canvas) {
+    // Record measurements
+    double startTime = SkTime::GetMSecs();
+
     drawSlide(canvas, false);
     if (fSplitScreen && fWindow->supportsContentRect()) {
         drawSlide(canvas, true);
     }
 
     if (fDisplayStats) {
         drawStats(canvas);
     }
     fCommands.drawHelp(canvas);
+
+    fMeasurements[fCurrentMeasurement++] = SkTime::GetMSecs() - startTime;
+    fCurrentMeasurement &= (kMeasurementCount - 1);  // fast mod
+    SkASSERT(fCurrentMeasurement < kMeasurementCount);
+    updateUIState(); // Update the FPS
 }
 
 bool Viewer::onTouch(intptr_t owner, Window::InputState state, float x, float y) {
     void* castedOwner = reinterpret_cast<void*>(owner);
     SkPoint touchPoint = fDefaultMatrixInv.mapXY(x, y);
     switch (state) {
         case Window::kUp_InputState: {
             fGesture.touchEnd(castedOwner);
             break;
         }
@@ skipping 51 matching lines @@
         canvas->drawLine(SkIntToScalar(x), SkIntToScalar(startY),
                          SkIntToScalar(x), SkIntToScalar(endY), paint);
         i++;
         i &= (kMeasurementCount - 1);  // fast mod
         x += xStep;
     } while (i != fCurrentMeasurement);
 
     canvas->restore();
 }
 
-void Viewer::onIdle(double ms) {
-    // Record measurements
-    fMeasurements[fCurrentMeasurement++] = ms;
-    fCurrentMeasurement &= (kMeasurementCount - 1);  // fast mod
-    SkASSERT(fCurrentMeasurement < kMeasurementCount);
-
+void Viewer::onIdle() {
     fAnimTimer.updateTime();
-    if (fSlides[fCurrentSlide]->animate(fAnimTimer) || fDisplayStats) {
+    if (fSlides[fCurrentSlide]->animate(fAnimTimer) || fDisplayStats || fRefresh) {
         fWindow->inval();
-        updateUIState(); // Update the FPS
     }
 }
 
 void Viewer::updateUIState() {
     // Slide state
     Json::Value slideState(Json::objectValue);
     slideState[kName] = kSlideStateName;
     slideState[kValue] = fSlides[fCurrentSlide]->getName().c_str();
     if (fAllSlideNames.size() == 0) {
         for(auto slide : fSlides) {
@@ skipping 86 matching lines @@
             fCommands.onSoftkey(stateValue);
             updateUIState(); // This is still needed to reset the value to kSoftkeyHint
         }
     } else if (stateName.equals(kSplitScreenStateName)) {
         bool newSplitScreen = stateValue.equals(kON);
         if (newSplitScreen != fSplitScreen) {
             fSplitScreen = newSplitScreen;
             fWindow->inval();
             updateUIState();
         }
+    } else if (stateName.equals(kRefreshStateName)) {
+        // This state is actually NOT in the UI state.
+        // We use this to allow Android to quickly set bool fRefresh.
+        fRefresh = stateValue.equals(kON);
     } else {
         SkDebugf("Unknown stateName: %s", stateName.c_str());
     }
 }