AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Skia_Periodic_House_Keeping

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@8350 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-03-23 07:01:28 +00:00
parent 72657e00ca
commit 7e32851d54
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debugger/SkDrawCommand.cpp
View File

@ -184,8 +184,8 @@ const SkBitmap* DrawBitmap::getBitmap() const {
}
DrawBitmapMatrix::DrawBitmapMatrix(const SkBitmap& bitmap,
const SkMatrix& matrix,
const SkPaint* paint,
const SkMatrix& matrix,
const SkPaint* paint,
SkBitmap& resizedBitmap) {
fBitmap = bitmap;
fMatrix = matrix;
@ -214,7 +214,7 @@ const SkBitmap* DrawBitmapMatrix::getBitmap() const {
}
DrawBitmapNine::DrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
const SkRect& dst, const SkPaint* paint,
const SkRect& dst, const SkPaint* paint,
SkBitmap& resizedBitmap) {
fBitmap = bitmap;
fCenter = center;
@ -591,7 +591,7 @@ SaveLayer::SaveLayer(const SkRect* bounds, const SkPaint* paint,
}
void SaveLayer::execute(SkCanvas* canvas) {
canvas->saveLayer(fBounds.isEmpty() ? NULL : &fBounds,
canvas->saveLayer(fBounds.isEmpty() ? NULL : &fBounds,
fPaintPtr,
fFlags);
}

2
debugger/SkDrawCommand.h
View File

@ -177,7 +177,7 @@ private:
class DrawBitmapNine : public SkDrawCommand {
public:
DrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
const SkRect& dst, const SkPaint* paint,
const SkRect& dst, const SkPaint* paint,
SkBitmap& resizedBitmap);
virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual const SkBitmap* getBitmap() const SK_OVERRIDE;

2
include/gpu/GrContext.h
View File

@ -891,7 +891,7 @@ private:
/// draw state is left unmodified.
GrDrawTarget* prepareToDraw(const GrPaint*, BufferedDraw);
void internalDrawPath(GrDrawTarget* target, const GrPaint& paint, const SkPath& path,
void internalDrawPath(GrDrawTarget* target, const GrPaint& paint, const SkPath& path,
const SkStrokeRec& stroke);
GrTexture* createResizedTexture(const GrTextureDesc& desc,

2
include/gpu/GrOvalRenderer.h
View File

@ -30,7 +30,7 @@ public:
~GrOvalRenderer() {}
bool drawOval(GrDrawTarget* target, const GrContext* context, const GrPaint& paint,
bool drawOval(GrDrawTarget* target, const GrContext* context, const GrPaint& paint,
const GrRect& oval, const SkStrokeRec& stroke);
private:
void drawEllipse(GrDrawTarget* target, const GrPaint& paint,

2
src/gpu/GrContext.cpp
View File

@ -1026,7 +1026,7 @@ void GrContext::drawPath(const GrPaint& paint, const SkPath& path, const SkStrok
SkRect ovalRect;
bool isOval = path.isOval(&ovalRect);
if (!isOval || path.isInverseFillType()
if (!isOval || path.isInverseFillType()
|| !fOvalRenderer->drawOval(target, this, paint, ovalRect, stroke)) {
this->internalDrawPath(target, paint, path, stroke);
}

13
src/gpu/GrOvalRenderer.cpp
View File

@ -40,7 +40,7 @@ inline bool circle_stays_circle(const SkMatrix& m) {
}
bool GrOvalRenderer::drawOval(GrDrawTarget* target, const GrContext* context, const GrPaint& paint,
bool GrOvalRenderer::drawOval(GrDrawTarget* target, const GrContext* context, const GrPaint& paint,
const GrRect& oval, const SkStrokeRec& stroke)
{
if (!paint.isAntiAlias()) {
@ -49,8 +49,8 @@ bool GrOvalRenderer::drawOval(GrDrawTarget* target, const GrContext* context, co
const SkMatrix& vm = context->getMatrix();
// we can draw circles
if (SkScalarNearlyEqual(oval.width(), oval.height())
// we can draw circles
if (SkScalarNearlyEqual(oval.width(), oval.height())
&& circle_stays_circle(vm)) {
drawCircle(target, paint, oval, stroke);
@ -65,7 +65,7 @@ bool GrOvalRenderer::drawOval(GrDrawTarget* target, const GrContext* context, co
return true;
}
void GrOvalRenderer::drawCircle(GrDrawTarget* target,
void GrOvalRenderer::drawCircle(GrDrawTarget* target,
const GrPaint& paint,
const GrRect& circle,
const SkStrokeRec& stroke)
@ -109,7 +109,7 @@ void GrOvalRenderer::drawCircle(GrDrawTarget* target,
kEdgeEffectStage = GrPaint::kTotalStages,
};
drawState->setAttribBindings(GrDrawState::kDefault_AttribBindings);
GrEffectRef* effect = GrCircleEdgeEffect::Create(isStroked);
static const int kCircleEdgeAttrIndex = 1;
drawState->setEffect(kEdgeEffectStage, effect, kCircleEdgeAttrIndex)->unref();
@ -156,7 +156,7 @@ void GrOvalRenderer::drawCircle(GrDrawTarget* target,
target->drawNonIndexed(kTriangleStrip_GrPrimitiveType, 0, 4);
}
void GrOvalRenderer::drawEllipse(GrDrawTarget* target,
void GrOvalRenderer::drawEllipse(GrDrawTarget* target,
const GrPaint& paint,
const GrRect& ellipse,
const SkStrokeRec& stroke)
@ -275,4 +275,3 @@ void GrOvalRenderer::drawEllipse(GrDrawTarget* target,
target->drawNonIndexed(kTriangleStrip_GrPrimitiveType, 0, 4);
}