c6f411e72b1fea6608f540f64a57bcacbe3378cd - platform/external/skia

commit	c6f411e72b1fea6608f540f64a57bcacbe3378cd	[log] [tgz]
author	csmartdalton <csmartdalton@google.com>	Fri Aug 05 22:32:12 2016 -0700
committer	Commit bot <commit-bot@chromium.org>	Fri Aug 05 22:32:12 2016 -0700
tree	73771d2a0b8b11fbc632879daaaf01cabfde288d
parent	4c1abdcd21d65bb34a6b4aea969ef4485e117e67 [diff]

Merge GrClipMaskManager into GrClipStackClip

TBR=bsalomon@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2196393007

Review-Url: https://codereview.chromium.org/2196393007

gyp/gpu.gypi[diff]
include/gpu/GrClip.h[diff]
include/gpu/GrContext.h[diff]
include/gpu/GrDrawContext.h[diff]
src/gpu/GrBlurUtils.cpp[diff]
src/gpu/GrClip.cpp[diff]
src/gpu/GrClipStackClip.cpp[Renamed from src/gpu/GrClipMaskManager.cpp - diff]
src/gpu/GrClipStackClip.h[Renamed from src/gpu/GrClipMaskManager.h - diff]
src/gpu/GrDrawTarget.cpp[diff]
src/gpu/GrDrawTarget.h[diff]
src/gpu/GrSWMaskHelper.h[diff]
src/gpu/GrStencilAttachment.h[diff]
src/gpu/SkGpuDevice.h[diff]
tests/ClipBoundsTest.cpp[diff]

14 files changed