Prepare SkiaBenchmarkingExtensionTest for upcoming Skia changes

content/renderer/skia_benchmarking_extension_unittest.cc

Index: content/renderer/skia_benchmarking_extension_unittest.cc
diff --git a/content/renderer/skia_benchmarking_extension_unittest.cc b/content/renderer/skia_benchmarking_extension_unittest.cc
index 1c1bf9a9c0c3bb6141207f28d97dec7679fffeda..19f6429a7fdff76a2601c3d420faaad4c7f6590d 100644
--- a/content/renderer/skia_benchmarking_extension_unittest.cc
+++ b/content/renderer/skia_benchmarking_extension_unittest.cc
@@ -49,55 +49,50 @@ TEST(SkiaBenchmarkingExtensionTest, SkDebugCanvas) {
   SkRect fillRect = SkRect::MakeXYWH(SkIntToScalar(25), SkIntToScalar(25),
                                      SkIntToScalar(50), SkIntToScalar(50));
 
+  SkMatrix trans;
+  trans.setTranslate(SkIntToScalar(10), SkIntToScalar(10));
+
   // Draw a trivial scene.
   canvas.save();
   canvas.clipRect(fullRect, SkRegion::kIntersect_Op, false);
-  canvas.translate(SkIntToScalar(10), SkIntToScalar(10));
-  canvas.scale(SkIntToScalar(2), SkIntToScalar(2));
+  canvas.setMatrix(trans);
   canvas.drawRect(fillRect, red_paint);
   canvas.restore();
 
   // Verify the recorded commands.
-  DrawType cmd;
+  SkDrawCommand::OpType cmd;
   int idx = 0;
-  ASSERT_EQ(canvas.getSize(), 6);
+  ASSERT_EQ(canvas.getSize(), 5);
 
   ASSERT_TRUE(canvas.getDrawCommandAt(idx) != NULL);
   cmd = canvas.getDrawCommandAt(idx)->getType();
-  EXPECT_EQ(cmd, SAVE);
+  EXPECT_EQ(cmd, SkDrawCommand::kSave_OpType);
   EXPECT_STREQ(SkDrawCommand::GetCommandString(cmd), "Save");
 
   ASSERT_TRUE(canvas.getDrawCommandAt(++idx) != NULL);
   cmd = canvas.getDrawCommandAt(idx)->getType();
-  EXPECT_EQ(cmd, CLIP_RECT);
-  EXPECT_STREQ(SkDrawCommand::GetCommandString(cmd), "Clip Rect");
+  EXPECT_EQ(cmd, SkDrawCommand::kClipRect_OpType);
+  EXPECT_STREQ(SkDrawCommand::GetCommandString(cmd),
+               SkDrawCommand::kClipRectString);
   EXPECT_TRUE(HasInfoField(canvas, idx, "SkRect"));
   EXPECT_TRUE(HasInfoField(canvas, idx, "Op"));
   EXPECT_TRUE(HasInfoField(canvas, idx, "doAA"));
 

[robertphillips, 2015/02/11 23:01:45]

Skia converts all the matrix calls to a setMatrix when they're sent through a
picture.

   ASSERT_TRUE(canvas.getDrawCommandAt(++idx) != NULL);
   cmd = canvas.getDrawCommandAt(idx)->getType();
-  EXPECT_EQ(cmd, TRANSLATE);
-  EXPECT_STREQ(SkDrawCommand::GetCommandString(cmd), "Translate");
-  EXPECT_TRUE(HasInfoField(canvas, idx, "dx"));
-  EXPECT_TRUE(HasInfoField(canvas, idx, "dy"));
-
-  ASSERT_TRUE(canvas.getDrawCommandAt(++idx) != NULL);
-  cmd = canvas.getDrawCommandAt(idx)->getType();
-  EXPECT_EQ(cmd, SCALE);
-  EXPECT_STREQ(SkDrawCommand::GetCommandString(cmd), "Scale");
-  EXPECT_TRUE(HasInfoField(canvas, idx, "sx"));
-  EXPECT_TRUE(HasInfoField(canvas, idx, "sy"));
+  EXPECT_EQ(cmd, SkDrawCommand::kSetMatrix_OpType);
+  EXPECT_STREQ(SkDrawCommand::GetCommandString(cmd), "SetMatrix");
 
   ASSERT_TRUE(canvas.getDrawCommandAt(++idx) != NULL);
   cmd = canvas.getDrawCommandAt(idx)->getType();
-  EXPECT_EQ(cmd, DRAW_RECT);
-  EXPECT_STREQ(SkDrawCommand::GetCommandString(cmd), "Draw Rect");
+  EXPECT_EQ(cmd, SkDrawCommand::kDrawRect_OpType);
+  EXPECT_STREQ(SkDrawCommand::GetCommandString(cmd),
+               SkDrawCommand::kDrawRectString);
   EXPECT_TRUE(HasInfoField(canvas, idx, "SkRect"));
 
   ASSERT_TRUE(canvas.getDrawCommandAt(++idx) != NULL);
   cmd = canvas.getDrawCommandAt(idx)->getType();
-  EXPECT_EQ(cmd, RESTORE);
+  EXPECT_EQ(cmd, SkDrawCommand::kRestore_OpType);
   EXPECT_STREQ(SkDrawCommand::GetCommandString(cmd), "Restore");
 }