Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14453 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
parent
f4e67e3e5e
commit
eeaeafebde
@ -262,13 +262,13 @@ void SkPicture::clone(SkPicture* pictures, int count) const {
|
|||||||
|
|
||||||
/* The alternative to doing this is to have a clone method on the paint and have it
|
/* The alternative to doing this is to have a clone method on the paint and have it
|
||||||
* make the deep copy of its internal structures as needed. The holdup to doing
|
* make the deep copy of its internal structures as needed. The holdup to doing
|
||||||
* that is at this point we would need to pass the SkBitmapHeap so that we don't
|
* that is at this point we would need to pass the SkBitmapHeap so that we don't
|
||||||
* unnecessarily flatten the pixels in a bitmap shader.
|
* unnecessarily flatten the pixels in a bitmap shader.
|
||||||
*/
|
*/
|
||||||
copyInfo.paintData.setCount(paintCount);
|
copyInfo.paintData.setCount(paintCount);
|
||||||
|
|
||||||
/* Use an SkBitmapHeap to avoid flattening bitmaps in shaders. If there already is
|
/* Use an SkBitmapHeap to avoid flattening bitmaps in shaders. If there already is
|
||||||
* one, use it. If this SkPicturePlayback was created from a stream, fBitmapHeap
|
* one, use it. If this SkPicturePlayback was created from a stream, fBitmapHeap
|
||||||
* will be NULL, so create a new one.
|
* will be NULL, so create a new one.
|
||||||
*/
|
*/
|
||||||
if (fPlayback->fBitmapHeap.get() == NULL) {
|
if (fPlayback->fBitmapHeap.get() == NULL) {
|
||||||
|
@ -36,16 +36,16 @@ void SkBlurDrawLooper::initEffects() {
|
|||||||
uint32_t flags = fBlurFlags & kIgnoreTransform_BlurFlag ?
|
uint32_t flags = fBlurFlags & kIgnoreTransform_BlurFlag ?
|
||||||
SkBlurMaskFilter::kIgnoreTransform_BlurFlag :
|
SkBlurMaskFilter::kIgnoreTransform_BlurFlag :
|
||||||
SkBlurMaskFilter::kNone_BlurFlag;
|
SkBlurMaskFilter::kNone_BlurFlag;
|
||||||
|
|
||||||
flags |= fBlurFlags & kHighQuality_BlurFlag ?
|
flags |= fBlurFlags & kHighQuality_BlurFlag ?
|
||||||
SkBlurMaskFilter::kHighQuality_BlurFlag :
|
SkBlurMaskFilter::kHighQuality_BlurFlag :
|
||||||
SkBlurMaskFilter::kNone_BlurFlag;
|
SkBlurMaskFilter::kNone_BlurFlag;
|
||||||
|
|
||||||
fBlur = SkBlurMaskFilter::Create(kNormal_SkBlurStyle, fSigma, flags);
|
fBlur = SkBlurMaskFilter::Create(kNormal_SkBlurStyle, fSigma, flags);
|
||||||
} else {
|
} else {
|
||||||
fBlur = NULL;
|
fBlur = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fBlurFlags & kOverrideColor_BlurFlag) {
|
if (fBlurFlags & kOverrideColor_BlurFlag) {
|
||||||
// Set alpha to 1 for the override since transparency will already
|
// Set alpha to 1 for the override since transparency will already
|
||||||
// be baked into the blurred mask.
|
// be baked into the blurred mask.
|
||||||
|
@ -16,4 +16,3 @@ typedef GrGLFuncPtr (*GrGLGetProc)(void* ctx, const char name[]);
|
|||||||
* get() to get each function address. ctx is a generic ptr passed to and interpreted by get().
|
* get() to get each function address. ctx is a generic ptr passed to and interpreted by get().
|
||||||
*/
|
*/
|
||||||
const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get);
|
const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get);
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ private:
|
|||||||
class GLProcGetter {
|
class GLProcGetter {
|
||||||
public:
|
public:
|
||||||
GLProcGetter() {}
|
GLProcGetter() {}
|
||||||
|
|
||||||
GrGLFuncPtr getProc(const char name[]) const {
|
GrGLFuncPtr getProc(const char name[]) const {
|
||||||
return (GrGLFuncPtr) dlsym(fLoader.handle(), name);
|
return (GrGLFuncPtr) dlsym(fLoader.handle(), name);
|
||||||
}
|
}
|
||||||
|
@ -20,6 +20,6 @@ static GrGLFuncPtr osmesa_get(void* ctx, const char name[]) {
|
|||||||
const GrGLInterface* GrGLCreateMesaInterface() {
|
const GrGLInterface* GrGLCreateMesaInterface() {
|
||||||
if (NULL == OSMesaGetCurrentContext()) {
|
if (NULL == OSMesaGetCurrentContext()) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
return GrGLAssembleGLInterface(NULL, osmesa_get);
|
return GrGLAssembleGLInterface(NULL, osmesa_get);
|
||||||
}
|
}
|
||||||
|
@ -23,4 +23,3 @@ const GrGLInterface* GrGLCreateNativeInterface() {
|
|||||||
}
|
}
|
||||||
return GrGLAssembleGLInterface(NULL, glx_get);
|
return GrGLAssembleGLInterface(NULL, glx_get);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user