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

Side by Side Diff: src/gpu/effects/GrRRectEffect.cpp

Issue 199433002: Attempt to fix -1->unsigned warning on mac 10.6 (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: try again 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 | « no previous file | no next file » | 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 2014 Google Inc. 2 * Copyright 2014 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 "GrRRectEffect.h" 8 #include "GrRRectEffect.h"
9 9
10 #include "gl/GrGLEffect.h" 10 #include "gl/GrGLEffect.h"
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 // Check for the "tab" cases - two adjacent circular corners and two squ are corners. 662 // Check for the "tab" cases - two adjacent circular corners and two squ are corners.
663 SkScalar radius = 0; 663 SkScalar radius = 0;
664 cornerFlags = 0; 664 cornerFlags = 0;
665 for (int c = 0; c < 4; ++c) { 665 for (int c = 0; c < 4; ++c) {
666 const SkVector& r = rrect.radii((SkRRect::Corner)c); 666 const SkVector& r = rrect.radii((SkRRect::Corner)c);
667 SkASSERT((0 == r.fX) == (0 == r.fY)); 667 SkASSERT((0 == r.fX) == (0 == r.fY));
668 if (0 == r.fX) { 668 if (0 == r.fX) {
669 continue; 669 continue;
670 } 670 }
671 if (r.fX != r.fY) { 671 if (r.fX != r.fY) {
672 cornerFlags = -1; 672 cornerFlags = ~0U;
673 break; 673 break;
674 } 674 }
675 if (!cornerFlags) { 675 if (!cornerFlags) {
676 radius = r.fX; 676 radius = r.fX;
677 if (radius < CircularRRectEffect::kRadiusMin) { 677 if (radius < CircularRRectEffect::kRadiusMin) {
678 cornerFlags = -1; 678 cornerFlags = ~0U;
679 break; 679 break;
680 } 680 }
681 cornerFlags = 1 << c; 681 cornerFlags = 1 << c;
682 } else { 682 } else {
683 if (r.fX != radius) { 683 if (r.fX != radius) {
684 cornerFlags = -1; 684 cornerFlags = ~0U;
685 break; 685 break;
686 } 686 }
687 cornerFlags |= 1 << c; 687 cornerFlags |= 1 << c;
688 } 688 }
689 } 689 }
690 690
691 switch (cornerFlags) { 691 switch (cornerFlags) {
692 case CircularRRectEffect::kTopLeft_CornerFlag: 692 case CircularRRectEffect::kTopLeft_CornerFlag:
693 case CircularRRectEffect::kTopRight_CornerFlag: 693 case CircularRRectEffect::kTopRight_CornerFlag:
694 case CircularRRectEffect::kBottomRight_CornerFlag: 694 case CircularRRectEffect::kBottomRight_CornerFlag:
(...skipping 17 matching lines...) Expand all
712 rrect); 712 rrect);
713 } 713 }
714 } 714 }
715 return NULL; 715 return NULL;
716 } 716 }
717 } else { 717 } else {
718 return NULL; 718 return NULL;
719 } 719 }
720 return CircularRRectEffect::Create(edgeType, cornerFlags, rrect); 720 return CircularRRectEffect::Create(edgeType, cornerFlags, rrect);
721 } 721 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698