roll more changes from r2830 back in
authorbsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Fri, 9 Dec 2011 16:10:24 +0000 (16:10 +0000)
committerbsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Fri, 9 Dec 2011 16:10:24 +0000 (16:10 +0000)
commit6b67e21b6549598254c1ffa4243bf32615d90fb6
treea8fbac0a84569727856e84d77fa4319050eb5e26
parent8f9cbd62ec108d410b91155dcf6a4789c641246f
roll more changes from r2830 back in

git-svn-id: http://skia.googlecode.com/svn/trunk@2842 2bbb7eff-a529-9590-31e7-b0007b416f81
src/gpu/GrContext.cpp
src/gpu/GrDrawTarget.h
src/gpu/GrTextContext.cpp