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

Sanitizing source files in Housekeeper-Nightly

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@14793 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2014-05-20 03:05:34 +00:00
parent dc20432ce0
commit 3b9e8be760
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debugger/SkDebugger.cpp
View File

@ -155,4 +155,3 @@ void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes,
void SkDebugger::getClipStackText(SkString* clipStack) {
clipStack->set(fDebugCanvas->clipStackData());
}

14
src/gpu/effects/GrDashingEffect.cpp
View File

@ -140,7 +140,7 @@ bool GrDashingEffect::DrawDashLine(const SkPoint pts[2], const SkPaint& paint, G
SkPaint2GrPaintShader(context, paint, true, &grPaint);
bool useAA = paint.isAntiAlias();
// Scale corrections of intervals and stroke from view matrix
SkScalar parallelScale;
SkScalar perpScale;
@ -174,7 +174,7 @@ bool GrDashingEffect::DrawDashLine(const SkPoint pts[2], const SkPaint& paint, G
context->drawRect(grPaint, startRect, NULL, &srcRotInv);
ptsRot[0].fX += info.fIntervals[0] + info.fIntervals[1] - info.fPhase;
info.fPhase = 0;
info.fPhase = 0;
}
}
@ -195,17 +195,17 @@ bool GrDashingEffect::DrawDashLine(const SkPoint pts[2], const SkPaint& paint, G
// If we didn't adjust the end point then we just need to make sure the ending
// dash isn't a full dash
if (0 == endAdj && endingInterval != info.fIntervals[0]) {
SkPoint endPts[2];
endPts[1] = ptsRot[1];
endPts[0].fY = endPts[1].fY;
endPts[0].fX = endPts[1].fX - endingInterval;
endPts[0].fX = endPts[1].fX - endingInterval;
SkRect endRect;
endRect.set(endPts, 2);
endRect.outset(xStroke, halfStroke);
context->drawRect(grPaint, endRect, NULL, &srcRotInv);
ptsRot[1].fX -= endingInterval + info.fIntervals[1];
if (ptsRot[0].fX >= ptsRot[1].fX) {
// Nothing left to draw so just return
@ -346,7 +346,7 @@ private:
typedef GrGLEffect INHERITED;
};
GLDashingLineEffect::GLDashingLineEffect(const GrBackendEffectFactory& factory,
GLDashingLineEffect::GLDashingLineEffect(const GrBackendEffectFactory& factory,
const GrDrawEffect& drawEffect)
: INHERITED (factory) {
fPrevRect.fLeft = SK_ScalarNaN;
@ -420,7 +420,7 @@ GrGLEffect::EffectKey GLDashingLineEffect::GenKey(const GrDrawEffect& drawEffect
}
//////////////////////////////////////////////////////////////////////////////
GrEffectRef* DashingLineEffect::Create(GrEffectEdgeType edgeType, const DashInfo& info,
const SkMatrix& matrix, SkScalar strokeWidth) {
if (info.fCount != 2) {

2
src/utils/debugger/SkDebugCanvas.h
View File

@ -329,7 +329,7 @@ private:
void outputPoints(const SkPoint* pts, int count);
void outputPointsCommon(const SkPoint* pts, int count);
void outputScalar(SkScalar num);
typedef SkCanvas INHERITED;
};