aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2014-10-01 09:24:12 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-10-01 09:24:12 -0700
commit10d0327c16bb748d6f73eb37dd2341c61e47ca8c (patch)
treeec15cd6630c1af4b7f4d6c3013b3945e64afa247 /src
parent68cd2aa797f707a9847f8eba0758787cafd43e43 (diff)
add SkRect::joinNonEmptyArg for faster unioning
Diffstat (limited to 'src')
-rwxr-xr-xsrc/gpu/GrBitmapTextContext.cpp2
-rwxr-xr-xsrc/gpu/GrDistanceFieldTextContext.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrBitmapTextContext.cpp b/src/gpu/GrBitmapTextContext.cpp
index 422a7e0179..c9cdf2c23f 100755
--- a/src/gpu/GrBitmapTextContext.cpp
+++ b/src/gpu/GrBitmapTextContext.cpp
@@ -575,7 +575,7 @@ HAS_ATLAS:
r.fRight = SkFixedToFloat(vx + width);
r.fBottom = SkFixedToFloat(vy + height);
- fVertexBounds.growToInclude(r);
+ fVertexBounds.joinNonEmptyArg(r);
size_t vertSize = useColorVerts ? (2 * sizeof(SkPoint) + sizeof(GrColor)) :
(2 * sizeof(SkPoint));
diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp
index 07e9a2e21d..b565dd63f8 100755
--- a/src/gpu/GrDistanceFieldTextContext.cpp
+++ b/src/gpu/GrDistanceFieldTextContext.cpp
@@ -411,7 +411,7 @@ HAS_ATLAS:
r.fRight = sx + width;
r.fBottom = sy + height;
- fVertexBounds.growToInclude(r);
+ fVertexBounds.joinNonEmptyArg(r);
size_t vertSize = fUseLCDText ? (2 * sizeof(SkPoint))
: (2 * sizeof(SkPoint) + sizeof(GrColor));