| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2012 Google Inc. | 2  * Copyright 2012 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 #ifndef SkPathOps_DEFINED | 7 #ifndef SkPathOps_DEFINED | 
| 8 #define SkPathOps_DEFINED | 8 #define SkPathOps_DEFINED | 
| 9 | 9 | 
| 10 #include "../private/SkTArray.h" | 10 #include "../private/SkTArray.h" | 
|  | 11 #include "../private/SkTDArray.h" | 
| 11 #include "SkPreConfig.h" | 12 #include "SkPreConfig.h" | 
| 12 #include "SkTDArray.h" |  | 
| 13 | 13 | 
| 14 class SkPath; | 14 class SkPath; | 
| 15 struct SkRect; | 15 struct SkRect; | 
| 16 | 16 | 
| 17 | 17 | 
| 18 // FIXME: move everything below into the SkPath class | 18 // FIXME: move everything below into the SkPath class | 
| 19 /** | 19 /** | 
| 20   *  The logical operations that can be performed when combining two paths. | 20   *  The logical operations that can be performed when combining two paths. | 
| 21   */ | 21   */ | 
| 22 enum SkPathOp { | 22 enum SkPathOp { | 
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 88     bool resolve(SkPath* result); | 88     bool resolve(SkPath* result); | 
| 89 | 89 | 
| 90 private: | 90 private: | 
| 91     SkTArray<SkPath> fPathRefs; | 91     SkTArray<SkPath> fPathRefs; | 
| 92     SkTDArray<SkPathOp> fOps; | 92     SkTDArray<SkPathOp> fOps; | 
| 93 | 93 | 
| 94     void reset(); | 94     void reset(); | 
| 95 }; | 95 }; | 
| 96 | 96 | 
| 97 #endif | 97 #endif | 
| OLD | NEW | 
|---|