skiagm::make_isize -> SkISize::Make

gm/dashing.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
@@ skipping 28 matching lines @@
 
 protected:
     virtual uint32_t onGetFlags() const SK_OVERRIDE {
         return kSkipTiled_Flag;
     }
 
     SkString onShortName() {
         return SkString("dashing");
     }
 
-    SkISize onISize() { return skiagm::make_isize(640, 300); }
+    SkISize onISize() { return SkISize::Make(640, 300); }
 
     virtual void onDraw(SkCanvas* canvas) {
         static const struct {
             int fOnInterval;
             int fOffInterval;
         } gData[] = {
             { 1, 1 },
             { 4, 1 },
         };
 
@@ skipping 65 matching lines @@
 
 protected:
     virtual uint32_t onGetFlags() const SK_OVERRIDE {
         return kSkipTiled_Flag;
     }
 
     SkString onShortName() {
         return SkString("dashing2");
     }
 
-    SkISize onISize() { return skiagm::make_isize(640, 480); }
+    SkISize onISize() { return SkISize::Make(640, 480); }
 
     virtual void onDraw(SkCanvas* canvas) {
         static const int gIntervals[] = {
             3,  // 3 dashes: each count [0] followed by intervals [1..count]
             2,  10, 10,
             4,  20, 5, 5, 5,
             2,  2, 2
         };
 
         void (*gProc[])(SkPath*, const SkRect&) = {
@@ skipping 41 matching lines @@
 
 protected:
     virtual uint32_t onGetFlags() const SK_OVERRIDE {
         return kSkipTiled_Flag;
     }
 
     SkString onShortName() {
         return SkString("dashing3");
     }
 
-    SkISize onISize() { return skiagm::make_isize(640, 480); }
+    SkISize onISize() { return SkISize::Make(640, 480); }
 
     // Draw a 100x100 block of dashed lines. The horizontal ones are BW
     // while the vertical ones are AA.
     void drawDashedLines(SkCanvas* canvas,
                          SkScalar lineLength,
                          SkScalar phase,
                          SkScalar dashLength,
                          int strokeWidth,
                          bool circles) {
         SkPaint p;
@@ skipping 113 matching lines @@
 
 protected:
     virtual uint32_t onGetFlags() const SK_OVERRIDE {
         return kSkipTiled_Flag;
     }
 
     SkString onShortName() {
         return SkString("dashing4");
     }
 
-    SkISize onISize() { return skiagm::make_isize(640, 950); }
+    SkISize onISize() { return SkISize::Make(640, 950); }
 
     virtual void onDraw(SkCanvas* canvas) {
         static const struct {
             int fOnInterval;
             int fOffInterval;
         } gData[] = {
             { 1, 1 },
             { 4, 2 },
             { 0, 4 }, // test for zero length on interval
         };
@@ skipping 59 matching lines @@
 
 static skiagm::GM* F0(void*) { return new DashingGM; }
 static skiagm::GM* F1(void*) { return new Dashing2GM; }
 static skiagm::GM* F2(void*) { return new Dashing3GM; }
 static skiagm::GM* F3(void*) { return new Dashing4GM; }
 
 static skiagm::GMRegistry gR0(F0);
 static skiagm::GMRegistry gR1(F1);
 static skiagm::GMRegistry gR2(F2);
 static skiagm::GMRegistry gR3(F3);