| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2011 Google Inc. | 2  * Copyright 2011 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 | 7 | 
| 8 #include "SkCanvas.h" | 8 #include "SkCanvas.h" | 
| 9 #include "SkPaint.h" | 9 #include "SkPaint.h" | 
| 10 #include "SkParse.h" | 10 #include "SkParse.h" | 
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 252 | 252 | 
| 253     SkPath c(a); | 253     SkPath c(a); | 
| 254     REPORTER_ASSERT(reporter, c.getGenerationID() == x); | 254     REPORTER_ASSERT(reporter, c.getGenerationID() == x); | 
| 255 | 255 | 
| 256     c.lineTo(3, 3); | 256     c.lineTo(3, 3); | 
| 257     const uint32_t w = c.getGenerationID(); | 257     const uint32_t w = c.getGenerationID(); | 
| 258     REPORTER_ASSERT(reporter, b.getGenerationID() == x); | 258     REPORTER_ASSERT(reporter, b.getGenerationID() == x); | 
| 259     REPORTER_ASSERT(reporter, a.getGenerationID() == x); | 259     REPORTER_ASSERT(reporter, a.getGenerationID() == x); | 
| 260     REPORTER_ASSERT(reporter, w != x); | 260     REPORTER_ASSERT(reporter, w != x); | 
| 261 | 261 | 
| 262 #ifdef SK_BUILD_FOR_ANDROID | 262 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK | 
| 263     static bool kExpectGenIDToIgnoreFill = false; | 263     static bool kExpectGenIDToIgnoreFill = false; | 
| 264 #else | 264 #else | 
| 265     static bool kExpectGenIDToIgnoreFill = true; | 265     static bool kExpectGenIDToIgnoreFill = true; | 
| 266 #endif | 266 #endif | 
| 267 | 267 | 
| 268     c.toggleInverseFillType(); | 268     c.toggleInverseFillType(); | 
| 269     const uint32_t v = c.getGenerationID(); | 269     const uint32_t v = c.getGenerationID(); | 
| 270     REPORTER_ASSERT(reporter, (v == w) == kExpectGenIDToIgnoreFill); | 270     REPORTER_ASSERT(reporter, (v == w) == kExpectGenIDToIgnoreFill); | 
| 271 | 271 | 
| 272     c.rewind(); | 272     c.rewind(); | 
| (...skipping 3440 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3713     test_addEmptyPath(reporter, SkPath::kAppend_AddPathMode); | 3713     test_addEmptyPath(reporter, SkPath::kAppend_AddPathMode); | 
| 3714     test_conicTo_special_case(reporter); | 3714     test_conicTo_special_case(reporter); | 
| 3715     test_get_point(reporter); | 3715     test_get_point(reporter); | 
| 3716     test_contains(reporter); | 3716     test_contains(reporter); | 
| 3717     PathTest_Private::TestPathTo(reporter); | 3717     PathTest_Private::TestPathTo(reporter); | 
| 3718     PathRefTest_Private::TestPathRef(reporter); | 3718     PathRefTest_Private::TestPathRef(reporter); | 
| 3719     test_dump(reporter); | 3719     test_dump(reporter); | 
| 3720     test_path_crbugskia2820(reporter); | 3720     test_path_crbugskia2820(reporter); | 
| 3721     test_skbug_3239(reporter); | 3721     test_skbug_3239(reporter); | 
| 3722 } | 3722 } | 
| OLD | NEW | 
|---|