summaryrefslogtreecommitdiff
path: root/libs/hwui/RenderProperties.h
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2015-10-05 12:23:46 -0700
committerChris Craik <ccraik@google.com>2015-10-05 14:16:26 -0700
commitac02eb9035a13a3d09c2def9ed63d04225eb2509 (patch)
treef6305a3b32606d77e81eb1ff5766c22daa5506d7 /libs/hwui/RenderProperties.h
parent117e6daa420763e956c2125da09707b60cbaa33e (diff)
Remove confusing behavior of Rect::intersect() and rename
bug:24670525 Removes silly 'do nothing if rects do not intersect' behavior, and changes the name to clarify the difference (contrasting against SkRect::intersect()) bug:24670525 Change-Id: Id2ca1cfea1a9d720d4dc70b251f426d9916f8b53
Diffstat (limited to 'libs/hwui/RenderProperties.h')
-rw-r--r--libs/hwui/RenderProperties.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/RenderProperties.h b/libs/hwui/RenderProperties.h
index 71589c802749..f824cc020196 100644
--- a/libs/hwui/RenderProperties.h
+++ b/libs/hwui/RenderProperties.h
@@ -549,7 +549,7 @@ public:
if (flags & CLIP_TO_BOUNDS) {
outRect->set(0, 0, getWidth(), getHeight());
if (flags & CLIP_TO_CLIP_BOUNDS) {
- outRect->intersect(mPrimitiveFields.mClipBounds);
+ outRect->doIntersect(mPrimitiveFields.mClipBounds);
}
} else {
outRect->set(mPrimitiveFields.mClipBounds);