diff options
author | Ben Wagner <bungeman@google.com> | 2017-10-09 15:45:33 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-09 21:20:34 +0000 |
commit | 63fd760a37905c45d26fc3d49cac261fad1b4808 (patch) | |
tree | 279aa7293ea1773ac60230790868fe0e1fc725b0 /include | |
parent | a49909aa24a370d6dff98d300d0c42ff8cd2c623 (diff) |
Remove trailing whitespace.
Also adds a presubmit to prevent adding trailing whitespace to source
code in the future.
Change-Id: I41a4df81487f6f00aa19b188f0cac6a3377efde6
Reviewed-on: https://skia-review.googlesource.com/57380
Reviewed-by: Ravi Mistry <rmistry@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkCanvas.h | 4 | ||||
-rw-r--r-- | include/core/SkColorPriv.h | 2 | ||||
-rw-r--r-- | include/core/SkDrawable.h | 2 | ||||
-rw-r--r-- | include/core/SkImageFilter.h | 4 | ||||
-rw-r--r-- | include/core/SkImageInfo.h | 6 | ||||
-rw-r--r-- | include/core/SkMatrix.h | 10 | ||||
-rw-r--r-- | include/core/SkPoint.h | 8 | ||||
-rw-r--r-- | include/core/SkPoint3.h | 2 | ||||
-rw-r--r-- | include/core/SkRSXform.h | 2 | ||||
-rw-r--r-- | include/core/SkRWBuffer.h | 4 | ||||
-rw-r--r-- | include/effects/SkLayerRasterizer.h | 2 | ||||
-rw-r--r-- | include/effects/SkRRectsGaussianEdgeMaskFilter.h | 2 | ||||
-rw-r--r-- | include/gpu/GrColor.h | 2 | ||||
-rw-r--r-- | include/gpu/vk/GrVkBackendContext.h | 4 | ||||
-rw-r--r-- | include/pathops/SkPathOps.h | 4 | ||||
-rw-r--r-- | include/private/GrAuditTrail.h | 4 | ||||
-rw-r--r-- | include/utils/SkDumpCanvas.h | 2 | ||||
-rw-r--r-- | include/utils/SkTextBox.h | 2 | ||||
-rw-r--r-- | include/views/SkEventSink.h | 2 |
19 files changed, 34 insertions, 34 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index f2a271c5ef..69e22dcbda 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -1542,7 +1542,7 @@ public: @param constraint filter strictly within image or draw faster */ void drawImageRect(const sk_sp<SkImage>& image, const SkIRect& isrc, const SkRect& dst, - const SkPaint* paint, + const SkPaint* paint, SrcRectConstraint constraint = kStrict_SrcRectConstraint) { this->drawImageRect(image.get(), isrc, dst, paint, constraint); } @@ -1696,7 +1696,7 @@ public: @param constraint sample strictly within isrc, or draw faster */ void drawBitmapRect(const SkBitmap& bitmap, const SkIRect& isrc, const SkRect& dst, - const SkPaint* paint, + const SkPaint* paint, SrcRectConstraint constraint = kStrict_SrcRectConstraint); /** Draw SkBitmap bitmap, scaled and translated to fill SkRect dst. diff --git a/include/core/SkColorPriv.h b/include/core/SkColorPriv.h index 980a47e4e1..0cd02e8034 100644 --- a/include/core/SkColorPriv.h +++ b/include/core/SkColorPriv.h @@ -67,7 +67,7 @@ static inline U8CPU SkUnitScalarClampToByte(SkScalar x) { #define SK_RGBA_A32_SHIFT 24 #endif -#define SkGetPackedA32(packed) ((uint32_t)((packed) << (24 - SK_A32_SHIFT)) >> 24) +#define SkGetPackedA32(packed) ((uint32_t)((packed) << (24 - SK_A32_SHIFT)) >> 24) #define SkGetPackedR32(packed) ((uint32_t)((packed) << (24 - SK_R32_SHIFT)) >> 24) #define SkGetPackedG32(packed) ((uint32_t)((packed) << (24 - SK_G32_SHIFT)) >> 24) #define SkGetPackedB32(packed) ((uint32_t)((packed) << (24 - SK_B32_SHIFT)) >> 24) diff --git a/include/core/SkDrawable.h b/include/core/SkDrawable.h index 6b9bf7ee34..b6beca910e 100644 --- a/include/core/SkDrawable.h +++ b/include/core/SkDrawable.h @@ -66,7 +66,7 @@ public: protected: virtual SkRect onGetBounds() = 0; virtual void onDraw(SkCanvas*) = 0; - + /** * Default implementation calls onDraw() with a canvas that records into a picture. Subclasses * may override if they have a more efficient way to return a picture for the current state diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h index 60000798e4..0991bea63f 100644 --- a/include/core/SkImageFilter.h +++ b/include/core/SkImageFilter.h @@ -95,7 +95,7 @@ public: * Apply this cropRect to the imageBounds. If a given edge of the cropRect is not * set, then the corresponding edge from imageBounds will be used. If "embiggen" * is true, the crop rect is allowed to enlarge the size of the rect, otherwise - * it may only reduce the rect. Filters that can affect transparent black should + * it may only reduce the rect. Filters that can affect transparent black should * pass "true", while all other filters should pass "false". * * Note: imageBounds is in "device" space, as the output cropped rectangle will be, @@ -342,7 +342,7 @@ protected: // calls filterImage() on that input, and returns the result. sk_sp<SkSpecialImage> filterInput(int index, SkSpecialImage* src, - const Context&, + const Context&, SkIPoint* offset) const; /** diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h index fa3797bbb5..5e9e80fcdc 100644 --- a/include/core/SkImageInfo.h +++ b/include/core/SkImageInfo.h @@ -117,7 +117,7 @@ static int SkColorTypeShiftPerPixel(SkColorType ct) { }; static_assert(SK_ARRAY_COUNT(gShift) == (size_t)(kLastEnum_SkColorType + 1), "size_mismatch_with_SkColorType_enum"); - + SkASSERT((size_t)ct < SK_ARRAY_COUNT(gShift)); return gShift[ct]; } @@ -225,7 +225,7 @@ public: static SkImageInfo MakeUnknown() { return MakeUnknown(0, 0); } - + int width() const { return fWidth; } int height() const { return fHeight; } SkColorType colorType() const { return fColorType; } @@ -257,7 +257,7 @@ public: SkImageInfo makeAlphaType(SkAlphaType newAlphaType) const { return Make(fWidth, fHeight, fColorType, newAlphaType, fColorSpace); } - + SkImageInfo makeColorType(SkColorType newColorType) const { return Make(fWidth, fHeight, newColorType, fAlphaType, fColorSpace); } diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h index 2e09f4d37c..6e9f421264 100644 --- a/include/core/SkMatrix.h +++ b/include/core/SkMatrix.h @@ -569,7 +569,7 @@ public: * scale and translate elements. If it contains other elements, the results are undefined. */ void mapRectScaleTranslate(SkRect* dst, const SkRect& src) const; - + /** Return the mean radius of a circle after it has been mapped by this matrix. NOTE: in perspective this value assumes the circle has its center at the origin. @@ -721,15 +721,15 @@ public: fMat[kMScaleX] = sx; fMat[kMSkewX] = 0; fMat[kMTransX] = tx; - + fMat[kMSkewY] = 0; fMat[kMScaleY] = sy; fMat[kMTransY] = ty; - + fMat[kMPersp0] = 0; fMat[kMPersp1] = 0; fMat[kMPersp2] = 1; - + unsigned mask = 0; if (sx != 1 || sy != 1) { mask |= kScale_Mask; @@ -739,7 +739,7 @@ public: } this->setTypeMask(mask | kRectStaysRect_Mask); } - + /** * Are all elements of the matrix finite? */ diff --git a/include/core/SkPoint.h b/include/core/SkPoint.h index 2cc57126f2..4aceff7a49 100644 --- a/include/core/SkPoint.h +++ b/include/core/SkPoint.h @@ -215,13 +215,13 @@ struct SK_API SkPoint { void setRectFan(SkScalar l, SkScalar t, SkScalar r, SkScalar b, size_t stride) { SkASSERT(stride >= sizeof(SkPoint)); - + ((SkPoint*)((intptr_t)this + 0 * stride))->set(l, t); ((SkPoint*)((intptr_t)this + 1 * stride))->set(l, b); ((SkPoint*)((intptr_t)this + 2 * stride))->set(r, b); ((SkPoint*)((intptr_t)this + 3 * stride))->set(r, t); } - + static void Offset(SkPoint points[], int count, const SkPoint& offset) { Offset(points, count, offset.fX, offset.fY); @@ -351,13 +351,13 @@ struct SK_API SkPoint { SkPoint operator*(SkScalar scale) const { return Make(fX * scale, fY * scale); } - + SkPoint& operator*=(SkScalar scale) { fX *= scale; fY *= scale; return *this; } - + /** * Returns true if both X and Y are finite (not infinity or NaN) */ diff --git a/include/core/SkPoint3.h b/include/core/SkPoint3.h index af24a8df58..6f69f1c4ea 100644 --- a/include/core/SkPoint3.h +++ b/include/core/SkPoint3.h @@ -57,7 +57,7 @@ struct SK_API SkPoint3 { /** Scale the point's coordinates by scale. */ - void scale(SkScalar value) { + void scale(SkScalar value) { fX *= value; fY *= value; fZ *= value; diff --git a/include/core/SkRSXform.h b/include/core/SkRSXform.h index dffbc59d39..706617e313 100644 --- a/include/core/SkRSXform.h +++ b/include/core/SkRSXform.h @@ -45,7 +45,7 @@ struct SkRSXform { bool rectStaysRect() const { return 0 == fSCos || 0 == fSSin; } - + void setIdentity() { fSCos = 1; fSSin = fTx = fTy = 0; diff --git a/include/core/SkRWBuffer.h b/include/core/SkRWBuffer.h index a938db20b0..e59a56bda0 100644 --- a/include/core/SkRWBuffer.h +++ b/include/core/SkRWBuffer.h @@ -50,7 +50,7 @@ public: * block, or false if the iterator is exhausted. */ bool next(); - + private: const SkBufferBlock* fBlock; size_t fRemaining; @@ -101,7 +101,7 @@ public: #else void validate() const {} #endif - + private: SkBufferHead* fHead; SkBufferBlock* fTail; diff --git a/include/effects/SkLayerRasterizer.h b/include/effects/SkLayerRasterizer.h index 7fcfd6b2f0..cd48602357 100644 --- a/include/effects/SkLayerRasterizer.h +++ b/include/effects/SkLayerRasterizer.h @@ -57,7 +57,7 @@ public: * The caller is responsible for calling unref() on the returned object, if non NULL. */ sk_sp<SkLayerRasterizer> snapshot() const; - + private: SkDeque* fLayers; }; diff --git a/include/effects/SkRRectsGaussianEdgeMaskFilter.h b/include/effects/SkRRectsGaussianEdgeMaskFilter.h index 14e17b3deb..d9e30248e2 100644 --- a/include/effects/SkRRectsGaussianEdgeMaskFilter.h +++ b/include/effects/SkRRectsGaussianEdgeMaskFilter.h @@ -18,7 +18,7 @@ public: * of the intersection of two round rects. * Currently this is only useable with round rects that have the same radii at * all the corners and for which the x & y radii are equal. - * + * * In order to minimize fill the coverage geometry that should be drawn should be no larger * than the intersection of the bounding boxes of the two round rects. Ambitious users can * omit the center area of the coverage geometry if it is known to be occluded. diff --git a/include/gpu/GrColor.h b/include/gpu/GrColor.h index ad66523bcb..b4a461d738 100644 --- a/include/gpu/GrColor.h +++ b/include/gpu/GrColor.h @@ -155,7 +155,7 @@ static inline GrColor GrPremulColor(GrColor color) { static inline GrColor GrUnpremulColor(GrColor color) { GrColorIsPMAssert(color); unsigned r = GrColorUnpackR(color); - unsigned g = GrColorUnpackG(color); + unsigned g = GrColorUnpackG(color); unsigned b = GrColorUnpackB(color); unsigned a = GrColorUnpackA(color); SkPMColor colorPM = SkPackARGB32(a, r, g, b); diff --git a/include/gpu/vk/GrVkBackendContext.h b/include/gpu/vk/GrVkBackendContext.h index 429319c31c..68791ba945 100644 --- a/include/gpu/vk/GrVkBackendContext.h +++ b/include/gpu/vk/GrVkBackendContext.h @@ -31,8 +31,8 @@ enum GrVkFeatureFlags { // The BackendContext contains all of the base Vulkan objects needed by the GrVkGpu. The assumption // is that the client will set these up and pass them to the GrVkGpu constructor. The VkDevice -// created must support at least one graphics queue, which is passed in as well. -// The QueueFamilyIndex must match the family of the given queue. It is needed for CommandPool +// created must support at least one graphics queue, which is passed in as well. +// The QueueFamilyIndex must match the family of the given queue. It is needed for CommandPool // creation, and any GrBackendObjects handed to us (e.g., for wrapped textures) need to be created // in or transitioned to that family. struct GrVkBackendContext : public SkRefCnt { diff --git a/include/pathops/SkPathOps.h b/include/pathops/SkPathOps.h index 1e8093f2a8..c672290570 100644 --- a/include/pathops/SkPathOps.h +++ b/include/pathops/SkPathOps.h @@ -76,12 +76,12 @@ public: @param path The second operand. @param _operator The operator to apply to the existing and supplied paths. - */ + */ void add(const SkPath& path, SkPathOp _operator); /** Computes the sum of all paths and operands, and resets the builder to its initial state. - + @param result The product of the operands. @return True if the operation succeeded. */ diff --git a/include/private/GrAuditTrail.h b/include/private/GrAuditTrail.h index 05f6fc5aca..c6175501e1 100644 --- a/include/private/GrAuditTrail.h +++ b/include/private/GrAuditTrail.h @@ -23,13 +23,13 @@ class GrOp; * to json. * * Capturing this information is expensive and consumes a lot of memory, therefore it is important - * to enable auditing only when required and disable it promptly. The AutoEnable class helps to + * to enable auditing only when required and disable it promptly. The AutoEnable class helps to * ensure that the audit trail is disabled in a timely fashion. Once the information has been dealt * with, be sure to call reset(), or the log will simply keep growing. */ class GrAuditTrail { public: - GrAuditTrail() + GrAuditTrail() : fClientID(kGrAuditTrailInvalidID) , fEnabled(false) {} diff --git a/include/utils/SkDumpCanvas.h b/include/utils/SkDumpCanvas.h index 2988aaaeb2..8a28c61412 100644 --- a/include/utils/SkDumpCanvas.h +++ b/include/utils/SkDumpCanvas.h @@ -59,7 +59,7 @@ public: */ class Dumper : public SkRefCnt { public: - + virtual void dump(SkDumpCanvas*, SkDumpCanvas::Verb, const char str[], const SkPaint*) = 0; diff --git a/include/utils/SkTextBox.h b/include/utils/SkTextBox.h index 90903b558d..885800ce6a 100644 --- a/include/utils/SkTextBox.h +++ b/include/utils/SkTextBox.h @@ -67,7 +67,7 @@ public: virtual ~Visitor() {} virtual void operator()(const char*, size_t, SkScalar x, SkScalar y, const SkPaint&) = 0; }; - + private: SkRect fBox; SkScalar fSpacingMul, fSpacingAdd; diff --git a/include/views/SkEventSink.h b/include/views/SkEventSink.h index 9714532f97..bf974f6e5c 100644 --- a/include/views/SkEventSink.h +++ b/include/views/SkEventSink.h @@ -21,7 +21,7 @@ struct SkTagList; */ class SkEventSink : public SkRefCnt { public: - + SkEventSink(); virtual ~SkEventSink(); |