OLD | NEW |
1 | 1 |
2 /* | 2 /* |
3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 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 #include "GrContext.h" | 9 #include "GrContext.h" |
10 | 10 |
(...skipping 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1273 return false; | 1273 return false; |
1274 } | 1274 } |
1275 | 1275 |
1276 // TODO: this restriction could be lifted if we were willing to apply | 1276 // TODO: this restriction could be lifted if we were willing to apply |
1277 // the matrix to all the points individually rather than just to the rect | 1277 // the matrix to all the points individually rather than just to the rect |
1278 if (!viewMatrix.preservesAxisAlignment()) { | 1278 if (!viewMatrix.preservesAxisAlignment()) { |
1279 return false; | 1279 return false; |
1280 } | 1280 } |
1281 | 1281 |
1282 SkPath::Direction dirs[2]; | 1282 SkPath::Direction dirs[2]; |
1283 if (!path.isNestedRects(rects, dirs)) { | 1283 if (!path.isNestedFillRects(rects, dirs)) { |
1284 return false; | 1284 return false; |
1285 } | 1285 } |
1286 | 1286 |
1287 if (SkPath::kWinding_FillType == path.getFillType() && dirs[0] == dirs[1]) { | 1287 if (SkPath::kWinding_FillType == path.getFillType() && dirs[0] == dirs[1]) { |
1288 // The two rects need to be wound opposite to each other | 1288 // The two rects need to be wound opposite to each other |
1289 return false; | 1289 return false; |
1290 } | 1290 } |
1291 | 1291 |
1292 // Right now, nested rects where the margin is not the same width | 1292 // Right now, nested rects where the margin is not the same width |
1293 // all around do not render correctly | 1293 // all around do not render correctly |
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2013 } | 2013 } |
2014 } | 2014 } |
2015 | 2015 |
2016 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) { | 2016 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) { |
2017 fGpu->removeGpuTraceMarker(marker); | 2017 fGpu->removeGpuTraceMarker(marker); |
2018 if (fDrawBuffer) { | 2018 if (fDrawBuffer) { |
2019 fDrawBuffer->removeGpuTraceMarker(marker); | 2019 fDrawBuffer->removeGpuTraceMarker(marker); |
2020 } | 2020 } |
2021 } | 2021 } |
2022 | 2022 |
OLD | NEW |