Change SkTime::GetMSecs to double; ensure values stored in SkMSec do not overflow.

tests/PathOpsSkpClipTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "CrashHandler.h"
 // #include "OverwriteLine.h"
 #include "Resources.h"
@@ skipping 197 matching lines @@
         strcpy(fFilename, filename.c_str());
         testOne();
     }
 
     void testOne();
 
     char fFilename[kMaxLength];
     TestStep fTestStep;
     int fDirNo;
     int fPixelError;
-    int fTime;
+    SkMSec fTime;
     int fScale;
 };
 
 class SortByPixel : public TestResult {
 public:
     bool operator<(const SortByPixel& rh) const {
         return fPixelError < rh.fPixelError;
     }
 };
 
@@ skipping 136 matching lines @@
     int pixelError = testResult.fPixelError;
     if (pixelError > 0) {
         for (int index = 0; index < worstCount; ++index) {
             if (pixelError > data->fPixelWorst[index].fPixelError) {
                 data->fPixelWorst[index] = *(SortByPixel*) &testResult;
                 return true;
             }
         }
     }
     int slowCount = data->fSlowest.count();
-    int time = testResult.fTime;
+    SkMSec time = testResult.fTime;
     if (time > 0) {
         for (int index = 0; index < slowCount; ++index) {
             if (time > data->fSlowest[index].fTime) {
                 data->fSlowest[index] = *(SortByTime*) &testResult;
                 return true;
             }
         }
     }
     if (pixelError > 0 && worstCount < kMaxFiles) {
         *data->fPixelWorst.append() = *(SortByPixel*) &testResult;
         return true;
     }
     if (time > 0 && slowCount < kMaxFiles) {
         *data->fSlowest.append() = *(SortByTime*) &testResult;
         return true;
     }
     return false;
 }
 
 static SkMSec timePict(SkPicture* pic, SkCanvas* canvas) {
     canvas->save();
     SkScalar pWidth = pic->cullRect().width();
     SkScalar pHeight = pic->cullRect().height();
     const SkScalar maxDimension = 1000.0f;
     const int slices = 3;
     SkScalar xInterval = SkTMax(pWidth - maxDimension, 0.0f) / (slices - 1);
     SkScalar yInterval = SkTMax(pHeight - maxDimension, 0.0f) / (slices - 1);
     SkRect rect = {0, 0, SkTMin(maxDimension, pWidth), SkTMin(maxDimension, pHeight) };
     canvas->clipRect(rect);
-    SkMSec start = SkTime::GetMSecs();
+    double start = SkTime::GetMSecs();
     for (int x = 0; x < slices; ++x) {
         for (int y = 0; y < slices; ++y) {
             pic->playback(canvas);
             canvas->translate(0, yInterval);
         }
         canvas->translate(xInterval, -yInterval * slices);
     }
-    SkMSec end = SkTime::GetMSecs();
+    double end = SkTime::GetMSecs();
     canvas->restore();
-    return end - start;
+    return static_cast<SkMSec>(end - start);
 }
 
 static void drawPict(SkPicture* pic, SkCanvas* canvas, int scale) {
     canvas->clear(SK_ColorWHITE);
     if (scale != 1) {
         canvas->save();
         canvas->scale(1.0f / scale, 1.0f / scale);
     }
     pic->playback(canvas);
     if (scale != 1) {
@@ skipping 69 matching lines @@
         oldBitmap.eraseColor(SK_ColorWHITE);
         SkCanvas oldCanvas(oldBitmap);
         oldCanvas.setAllowSimplifyClip(false);
         opBitmap.eraseColor(SK_ColorWHITE);
         SkCanvas opCanvas(opBitmap);
         opCanvas.setAllowSimplifyClip(true);
         drawPict(pic.get(), &oldCanvas, fScale);
         drawPict(pic.get(), &opCanvas, fScale);
         if (fTestStep == kCompareBits) {
             fPixelError = similarBits(oldBitmap, opBitmap);
-            int oldTime = timePict(pic.get(), &oldCanvas);
-            int opTime = timePict(pic.get(), &opCanvas);
-            fTime = SkTMax(0, oldTime - opTime);
+            SkMSec oldTime = timePict(pic.get(), &oldCanvas);
+            SkMSec opTime = timePict(pic.get(), &opCanvas);
+            fTime = SkTMax(static_cast<SkMSec>(0), oldTime - opTime);
         } else if (fTestStep == kEncodeFiles) {
             SkString pngStr = make_png_name(fFilename);
             const char* pngName = pngStr.c_str();
             writePict(oldBitmap, outOldDir, pngName);
             writePict(opBitmap, outOpDir, pngName);
         }
     }
 }
 
 DEFINE_string2(match, m, "PathOpsSkpClipThreaded",
@@ skipping 575 matching lines @@
         }
     }
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif