aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Litt <joshualitt@google.com>2014-12-15 17:25:50 -0500
committerJoshua Litt <joshualitt@google.com>2014-12-15 17:25:50 -0500
commitcc7b849301932388919e3c0e87765718645a2adf (patch)
tree317b50bb9f5da0106794a754015ac0b14fb3a743
parentf4153260844a88d208c30bac5cc6902e716289c9 (diff)
downloadskia-cc7b849301932388919e3c0e87765718645a2adf.tar.gz
fix for 440671
-rwxr-xr-xsrc/gpu/GrContext.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index a456a799c..e3b590a93 100755
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1574,9 +1574,10 @@ void GrContext::copySurface(GrSurface* dst, GrSurface* src, const SkIRect& srcRe
}
target->copySurface(dst, src, srcRect, dstPoint);
- if (kFlushWrites_PixelOp & pixelOpsFlags) {
- this->flush();
- }
+ // always flush, this is not the behavior of TOT Skia but some uses of GrContext copySurface
+ // in chrome rely on this behavior
+ // see crbug:440671
+ this->flush();
}
void GrContext::flushSurfaceWrites(GrSurface* surface) {