Clean up transform methods in GraphicsContext.

Source/platform/graphics/GraphicsContextTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 1024 matching lines @@
     context.setFillColor(opaque);
     path.moveTo(FloatPoint(10, 10));
     path.addLineTo(FloatPoint(40, 40));
     context.strokePath(path);
 
     context.endLayer();
     EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH_EXACT(bitmap, context.opaqueRegion().asRect());
 }
 
-#define DISPATCH(c1, c2, op, params) do { c1.op(params); c2.op(params); } while (0);
+#define DISPATCH1(c1, c2, op, param1) do { c1.op(param1); c2.op(param1); } while (0);
+#define DISPATCH2(c1, c2, op, param1, param2) do { c1.op(param1, param2); c2.op(param1, param2); } while (0);
 
 TEST(GraphicsContextTest, RecordingTotalMatrix)
 {
     SkBitmap bitmap;
     ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
     GraphicsContext context(&canvas);
 
     SkCanvas controlCanvas(400, 400);
     GraphicsContext controlContext(&controlCanvas);
 
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
-    DISPATCH(context, controlContext, scale, FloatSize(2, 2));
+    DISPATCH2(context, controlContext, scale, 2, 2);
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 
     controlContext.save();
     context.beginRecording(FloatRect(0, 0, 200, 200));
-    DISPATCH(context, controlContext, translate, FloatSize(10, 10));
+    DISPATCH2(context, controlContext, translate, 10, 10);
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 
     controlContext.save();
     context.beginRecording(FloatRect(10, 10, 100, 100));
-    DISPATCH(context, controlContext, rotate, 45);
+    DISPATCH1(context, controlContext, rotate, 45);
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 
     controlContext.restore();
     context.endRecording();
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 
     controlContext.restore();
     context.endRecording();
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 }
@@ skipping 33 matching lines @@
     EXPECT_FALSE(pic);
 
     // endRecording finally makes the picture accessible
     dl->endRecording();
     pic = dl->picture();
     EXPECT_TRUE(pic);
     EXPECT_EQ(1, pic->getRefCnt());
 }
 
 } // namespace