| OLD | NEW | 
|---|
| 1 | 1 | 
| 2 /* | 2 /* | 
| 3  * Copyright 2012 Google Inc. | 3  * Copyright 2012 Google Inc. | 
| 4  * | 4  * | 
| 5  * Use of this source code is governed by a BSD-style license that can be | 5  * Use of this source code is governed by a BSD-style license that can be | 
| 6  * found in the LICENSE file. | 6  * found in the LICENSE file. | 
| 7  */ | 7  */ | 
| 8 | 8 | 
| 9 /*  Description: | 9 /*  Description: | 
| 10  *      This test defines a series of elementatry test steps that perform | 10  *      This test defines a series of elementatry test steps that perform | 
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 332 SIMPLE_TEST_STEP(DrawSpritePaint, drawSprite(kTestBitmap, 0, 0, &kTestPaint)); | 332 SIMPLE_TEST_STEP(DrawSpritePaint, drawSprite(kTestBitmap, 0, 0, &kTestPaint)); | 
| 333 SIMPLE_TEST_STEP(DrawText, drawText(kTestText.c_str(), kTestText.size(), | 333 SIMPLE_TEST_STEP(DrawText, drawText(kTestText.c_str(), kTestText.size(), | 
| 334     0, 1, kTestPaint)); | 334     0, 1, kTestPaint)); | 
| 335 SIMPLE_TEST_STEP(DrawPosText, drawPosText(kTestText.c_str(), | 335 SIMPLE_TEST_STEP(DrawPosText, drawPosText(kTestText.c_str(), | 
| 336     kTestText.size(), kTestPoints2, kTestPaint)); | 336     kTestText.size(), kTestPoints2, kTestPaint)); | 
| 337 SIMPLE_TEST_STEP(DrawTextOnPath, drawTextOnPath(kTestText.c_str(), | 337 SIMPLE_TEST_STEP(DrawTextOnPath, drawTextOnPath(kTestText.c_str(), | 
| 338     kTestText.size(), kTestPath, NULL, kTestPaint)); | 338     kTestText.size(), kTestPath, NULL, kTestPaint)); | 
| 339 SIMPLE_TEST_STEP(DrawTextOnPathMatrix, drawTextOnPath(kTestText.c_str(), | 339 SIMPLE_TEST_STEP(DrawTextOnPathMatrix, drawTextOnPath(kTestText.c_str(), | 
| 340     kTestText.size(), kTestPath, &kTestMatrix, kTestPaint)); | 340     kTestText.size(), kTestPath, &kTestMatrix, kTestPaint)); | 
| 341 SIMPLE_TEST_STEP(DrawData, drawData(kTestText.c_str(), kTestText.size())); | 341 SIMPLE_TEST_STEP(DrawData, drawData(kTestText.c_str(), kTestText.size())); | 
|  | 342 SIMPLE_TEST_STEP(BeginGroup, beginCommentGroup(kTestText.c_str())); | 
|  | 343 SIMPLE_TEST_STEP(AddComment, addComment(kTestText.c_str(), kTestText.c_str())); | 
|  | 344 SIMPLE_TEST_STEP(EndGroup, endCommentGroup()); | 
| 342 | 345 | 
| 343 /////////////////////////////////////////////////////////////////////////////// | 346 /////////////////////////////////////////////////////////////////////////////// | 
| 344 // Complex test steps | 347 // Complex test steps | 
| 345 | 348 | 
| 346 // Save/restore calls cannot be in isolated simple test steps because the test | 349 // Save/restore calls cannot be in isolated simple test steps because the test | 
| 347 // cases that use SkPicture require that save and restore calls be balanced. | 350 // cases that use SkPicture require that save and restore calls be balanced. | 
| 348 static void SaveMatrixStep(SkCanvas* canvas, | 351 static void SaveMatrixStep(SkCanvas* canvas, | 
| 349                            skiatest::Reporter* reporter, | 352                            skiatest::Reporter* reporter, | 
| 350                            CanvasTestStep* testStep) { | 353                            CanvasTestStep* testStep) { | 
| 351     int saveCount = canvas->getSaveCount(); | 354     int saveCount = canvas->getSaveCount(); | 
| (...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 923             TestPdfDevice(reporter, testStepArray()[testStep]); | 926             TestPdfDevice(reporter, testStepArray()[testStep]); | 
| 924         } | 927         } | 
| 925     } | 928     } | 
| 926 | 929 | 
| 927     // Explicitly call reset(), so we don't leak the pixels (since kTestBitmap i
     s a global) | 930     // Explicitly call reset(), so we don't leak the pixels (since kTestBitmap i
     s a global) | 
| 928     kTestBitmap.reset(); | 931     kTestBitmap.reset(); | 
| 929 } | 932 } | 
| 930 | 933 | 
| 931 #include "TestClassDef.h" | 934 #include "TestClassDef.h" | 
| 932 DEFINE_TESTCLASS("Canvas", TestCanvasClass, TestCanvas) | 935 DEFINE_TESTCLASS("Canvas", TestCanvasClass, TestCanvas) | 
| OLD | NEW | 
|---|