Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Side by Side Diff: src/core/SkRRect.cpp

Issue 196343015: Add nine patch type to SkRRect. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: fix inf loop in tests Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « include/core/SkRRect.h ('k') | src/effects/SkBlurMaskFilter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 7
8 #include "SkRRect.h" 8 #include "SkRRect.h"
9 #include "SkMatrix.h" 9 #include "SkMatrix.h"
10 10
(...skipping 25 matching lines...) Expand all
36 } 36 }
37 fType = kSimple_Type; 37 fType = kSimple_Type;
38 if (xRad >= SkScalarHalf(fRect.width()) && yRad >= SkScalarHalf(fRect.height ())) { 38 if (xRad >= SkScalarHalf(fRect.width()) && yRad >= SkScalarHalf(fRect.height ())) {
39 fType = kOval_Type; 39 fType = kOval_Type;
40 // TODO: assert that all the x&y radii are already W/2 & H/2 40 // TODO: assert that all the x&y radii are already W/2 & H/2
41 } 41 }
42 42
43 SkDEBUGCODE(this->validate();) 43 SkDEBUGCODE(this->validate();)
44 } 44 }
45 45
46 void SkRRect::setNinePatch(const SkRect& rect, SkScalar leftRad, SkScalar topRad ,
47 SkScalar rightRad, SkScalar bottomRad) {
48 if (rect.isEmpty()) {
49 this->setEmpty();
50 return;
51 }
52
53 leftRad = SkMaxScalar(leftRad, 0);
54 topRad = SkMaxScalar(topRad, 0);
55 rightRad = SkMaxScalar(rightRad, 0);
56 bottomRad = SkMaxScalar(bottomRad, 0);
57
58 SkScalar scale = SK_Scalar1;
59 if (leftRad + rightRad > rect.width()) {
60 scale = SkScalarDiv(rect.width(), leftRad + rightRad);
61 }
62 if (topRad + bottomRad > rect.height()) {
63 scale = SkMinScalar(scale, SkScalarDiv(rect.width(), leftRad + rightRad) );
64 }
65
66 if (scale < SK_Scalar1) {
67 leftRad = SkScalarMul(leftRad, scale);
68 topRad = SkScalarMul(topRad, scale);
69 rightRad = SkScalarMul(rightRad, scale);
70 bottomRad = SkScalarMul(bottomRad, scale);
71 }
72
73 if (leftRad == rightRad && topRad == bottomRad) {
74 if (leftRad >= SkScalarHalf(rect.width()) && topRad >= SkScalarHalf(rect .height())) {
75 fType = kOval_Type;
76 } else if (0 == leftRad || 0 == topRad) {
77 // If the left and (by equality check above) right radii are zero th en it is a rect.
78 // Same goes for top/bottom.
79 fType = kRect_Type;
80 leftRad = 0;
81 topRad = 0;
82 rightRad = 0;
83 bottomRad = 0;
84 } else {
85 fType = kSimple_Type;
86 }
87 } else {
88 fType = kNinePatch_Type;
89 }
90
91 fRect = rect;
92 fRadii[kUpperLeft_Corner].set(leftRad, topRad);
93 fRadii[kUpperRight_Corner].set(rightRad, topRad);
94 fRadii[kLowerRight_Corner].set(rightRad, bottomRad);
95 fRadii[kLowerLeft_Corner].set(leftRad, bottomRad);
96
97 SkDEBUGCODE(this->validate();)
98 }
99
100
46 void SkRRect::setRectRadii(const SkRect& rect, const SkVector radii[4]) { 101 void SkRRect::setRectRadii(const SkRect& rect, const SkVector radii[4]) {
47 if (rect.isEmpty()) { 102 if (rect.isEmpty()) {
48 this->setEmpty(); 103 this->setEmpty();
49 return; 104 return;
50 } 105 }
51 106
52 fRect = rect; 107 fRect = rect;
53 memcpy(fRadii, radii, sizeof(fRadii)); 108 memcpy(fRadii, radii, sizeof(fRadii));
54 109
55 bool allCornersSquare = true; 110 bool allCornersSquare = true;
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 248
194 // At this point we know all four corners of 'rect' are inside the 249 // At this point we know all four corners of 'rect' are inside the
195 // bounds of of this RR. Check to make sure all the corners are inside 250 // bounds of of this RR. Check to make sure all the corners are inside
196 // all the curves 251 // all the curves
197 return this->checkCornerContainment(rect.fLeft, rect.fTop) && 252 return this->checkCornerContainment(rect.fLeft, rect.fTop) &&
198 this->checkCornerContainment(rect.fRight, rect.fTop) && 253 this->checkCornerContainment(rect.fRight, rect.fTop) &&
199 this->checkCornerContainment(rect.fRight, rect.fBottom) && 254 this->checkCornerContainment(rect.fRight, rect.fBottom) &&
200 this->checkCornerContainment(rect.fLeft, rect.fBottom); 255 this->checkCornerContainment(rect.fLeft, rect.fBottom);
201 } 256 }
202 257
258 static bool radii_are_nine_patch(const SkVector radii[4]) {
259 return radii[SkRRect::kUpperLeft_Corner].fX == radii[SkRRect::kLowerLeft_Cor ner].fX &&
260 radii[SkRRect::kUpperLeft_Corner].fY == radii[SkRRect::kUpperRight_Co rner].fY &&
261 radii[SkRRect::kUpperRight_Corner].fX == radii[SkRRect::kLowerRight_C orner].fX &&
262 radii[SkRRect::kLowerLeft_Corner].fY == radii[SkRRect::kLowerRight_Co rner].fY;
263 }
264
203 // There is a simplified version of this method in setRectXY 265 // There is a simplified version of this method in setRectXY
204 void SkRRect::computeType() const { 266 void SkRRect::computeType() const {
205 SkDEBUGCODE(this->validate();) 267 SkDEBUGCODE(this->validate();)
206 268
207 if (fRect.isEmpty()) { 269 if (fRect.isEmpty()) {
208 fType = kEmpty_Type; 270 fType = kEmpty_Type;
209 return; 271 return;
210 } 272 }
211 273
212 bool allRadiiEqual = true; // are all x radii equal and all y radii? 274 bool allRadiiEqual = true; // are all x radii equal and all y radii?
(...skipping 18 matching lines...) Expand all
231 if (allRadiiEqual) { 293 if (allRadiiEqual) {
232 if (fRadii[0].fX >= SkScalarHalf(fRect.width()) && 294 if (fRadii[0].fX >= SkScalarHalf(fRect.width()) &&
233 fRadii[0].fY >= SkScalarHalf(fRect.height())) { 295 fRadii[0].fY >= SkScalarHalf(fRect.height())) {
234 fType = kOval_Type; 296 fType = kOval_Type;
235 } else { 297 } else {
236 fType = kSimple_Type; 298 fType = kSimple_Type;
237 } 299 }
238 return; 300 return;
239 } 301 }
240 302
241 fType = kComplex_Type; 303 if (radii_are_nine_patch(fRadii)) {
304 fType = kNinePatch_Type;
305 } else {
306 fType = kComplex_Type;
307 }
242 } 308 }
243 309
244 static bool matrix_only_scale_and_translate(const SkMatrix& matrix) { 310 static bool matrix_only_scale_and_translate(const SkMatrix& matrix) {
245 const SkMatrix::TypeMask m = (SkMatrix::TypeMask) (SkMatrix::kAffine_Mask 311 const SkMatrix::TypeMask m = (SkMatrix::TypeMask) (SkMatrix::kAffine_Mask
246 | SkMatrix::kPerspective_Mask); 312 | SkMatrix::kPerspective_Mask);
247 return (matrix.getType() & m) == 0; 313 return (matrix.getType() & m) == 0;
248 } 314 }
249 315
250 bool SkRRect::transform(const SkMatrix& matrix, SkRRect* dst) const { 316 bool SkRRect::transform(const SkMatrix& matrix, SkRRect* dst) const {
251 if (NULL == dst) { 317 if (NULL == dst) {
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 } 450 }
385 451
386 if (fRadii[i].fX != fRadii[i-1].fX || fRadii[i].fY != fRadii[i-1].fY) { 452 if (fRadii[i].fX != fRadii[i-1].fX || fRadii[i].fY != fRadii[i-1].fY) {
387 allRadiiSame = false; 453 allRadiiSame = false;
388 } 454 }
389 455
390 if (0 != fRadii[i].fX && 0 != fRadii[i].fY) { 456 if (0 != fRadii[i].fX && 0 != fRadii[i].fY) {
391 allCornersSquare = false; 457 allCornersSquare = false;
392 } 458 }
393 } 459 }
460 bool patchesOfNine = radii_are_nine_patch(fRadii);
394 461
395 switch (fType) { 462 switch (fType) {
396 case kEmpty_Type: 463 case kEmpty_Type:
397 SkASSERT(fRect.isEmpty()); 464 SkASSERT(fRect.isEmpty());
398 SkASSERT(allRadiiZero && allRadiiSame && allCornersSquare); 465 SkASSERT(allRadiiZero && allRadiiSame && allCornersSquare);
399 466
400 SkASSERT(0 == fRect.fLeft && 0 == fRect.fTop && 467 SkASSERT(0 == fRect.fLeft && 0 == fRect.fTop &&
401 0 == fRect.fRight && 0 == fRect.fBottom); 468 0 == fRect.fRight && 0 == fRect.fBottom);
402 break; 469 break;
403 case kRect_Type: 470 case kRect_Type:
404 SkASSERT(!fRect.isEmpty()); 471 SkASSERT(!fRect.isEmpty());
405 SkASSERT(allRadiiZero && allRadiiSame && allCornersSquare); 472 SkASSERT(allRadiiZero && allRadiiSame && allCornersSquare);
406 break; 473 break;
407 case kOval_Type: 474 case kOval_Type:
408 SkASSERT(!fRect.isEmpty()); 475 SkASSERT(!fRect.isEmpty());
409 SkASSERT(!allRadiiZero && allRadiiSame && !allCornersSquare); 476 SkASSERT(!allRadiiZero && allRadiiSame && !allCornersSquare);
410 477
411 for (int i = 0; i < 4; ++i) { 478 for (int i = 0; i < 4; ++i) {
412 SkASSERT(SkScalarNearlyEqual(fRadii[i].fX, SkScalarHalf(fRect.wi dth()))); 479 SkASSERT(SkScalarNearlyEqual(fRadii[i].fX, SkScalarHalf(fRect.wi dth())));
413 SkASSERT(SkScalarNearlyEqual(fRadii[i].fY, SkScalarHalf(fRect.he ight()))); 480 SkASSERT(SkScalarNearlyEqual(fRadii[i].fY, SkScalarHalf(fRect.he ight())));
414 } 481 }
415 break; 482 break;
416 case kSimple_Type: 483 case kSimple_Type:
417 SkASSERT(!fRect.isEmpty()); 484 SkASSERT(!fRect.isEmpty());
418 SkASSERT(!allRadiiZero && allRadiiSame && !allCornersSquare); 485 SkASSERT(!allRadiiZero && allRadiiSame && !allCornersSquare);
419 break; 486 break;
487 case kNinePatch_Type:
488 SkASSERT(!fRect.isEmpty());
489 SkASSERT(!allRadiiZero && !allRadiiSame && !allCornersSquare);
490 SkASSERT(patchesOfNine);
491 break;
420 case kComplex_Type: 492 case kComplex_Type:
421 SkASSERT(!fRect.isEmpty()); 493 SkASSERT(!fRect.isEmpty());
422 SkASSERT(!allRadiiZero && !allRadiiSame && !allCornersSquare); 494 SkASSERT(!allRadiiZero && !allRadiiSame && !allCornersSquare);
495 SkASSERT(!patchesOfNine);
423 break; 496 break;
424 case kUnknown_Type: 497 case kUnknown_Type:
425 // no limits on this 498 // no limits on this
426 break; 499 break;
427 } 500 }
428 } 501 }
429 #endif // SK_DEBUG 502 #endif // SK_DEBUG
430 503
431 /////////////////////////////////////////////////////////////////////////////// 504 ///////////////////////////////////////////////////////////////////////////////
OLDNEW
« no previous file with comments | « include/core/SkRRect.h ('k') | src/effects/SkBlurMaskFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698