diff options
author | 2011-08-26 14:40:38 +0000 | |
---|---|---|
committer | 2011-08-26 14:40:38 +0000 | |
commit | 17b78946096265d80215a6c946286ecaa35ea7ed (patch) | |
tree | 3af45529670451a9df0bd13ca71fa6a4a98d0eae /gpu/src/GrClip.cpp | |
parent | 5f226572b3b6e1a6fea11f5f3c862a47158f66fe (diff) |
rolling back the experimental rollbacks in r2178-2179
git-svn-id: http://skia.googlecode.com/svn/trunk@2180 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu/src/GrClip.cpp')
-rw-r--r-- | gpu/src/GrClip.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gpu/src/GrClip.cpp b/gpu/src/GrClip.cpp index 7ccec261a1..ade8c2b971 100644 --- a/gpu/src/GrClip.cpp +++ b/gpu/src/GrClip.cpp @@ -138,13 +138,9 @@ void GrClip::setFromIterator(GrClipIterator* iter, GrScalar tx, GrScalar ty, } } fConservativeBoundsValid = false; - if (isectRectValid) { + if (isectRectValid && rectCount) { + fConservativeBounds = fList[0].fRect; fConservativeBoundsValid = true; - if (rectCount > 0) { - fConservativeBounds = fList[0].fRect; - } else { - fConservativeBounds.setEmpty(); - } } else if (NULL != conservativeBounds) { fConservativeBounds = *conservativeBounds; fConservativeBoundsValid = true; |