aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-20 03:05:34 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-20 03:05:34 +0000
commit3b9e8be760ad0e576d5145e0aecf0dc73efcd640 (patch)
treecc227c7f33ae0628c7ef2ba768443df1d03872a3
parentdc20432ce0e7e8f2666958a37500f68a88abfd46 (diff)
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14793 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--debugger/SkDebugger.cpp1
-rw-r--r--src/gpu/effects/GrDashingEffect.cpp14
-rw-r--r--src/utils/debugger/SkDebugCanvas.h2
3 files changed, 8 insertions, 9 deletions
diff --git a/debugger/SkDebugger.cpp b/debugger/SkDebugger.cpp
index 394c0ad7c8..af6900c3f4 100644
--- a/debugger/SkDebugger.cpp
+++ b/debugger/SkDebugger.cpp
@@ -155,4 +155,3 @@ void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes,
void SkDebugger::getClipStackText(SkString* clipStack) {
clipStack->set(fDebugCanvas->clipStackData());
}
-
diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp
index 584d5096b9..3b06c3a523 100644
--- a/src/gpu/effects/GrDashingEffect.cpp
+++ b/src/gpu/effects/GrDashingEffect.cpp
@@ -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) {
diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h
index be1b8608be..e94f30f335 100644
--- a/src/utils/debugger/SkDebugCanvas.h
+++ b/src/utils/debugger/SkDebugCanvas.h
@@ -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;
};