diff options
author | 2016-01-26 09:10:48 -0800 | |
---|---|---|
committer | 2016-01-26 09:10:48 -0800 | |
commit | 6121405df5689875c7309c20632a82897fce4127 (patch) | |
tree | e45588db0b85f3e5204adbb9c100bc5404653769 | |
parent | eae84c2e0e2126374cd488a1c8a3e18169145635 (diff) |
Cleaning up trailing spaces and typos.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1631993002
Review URL: https://codereview.chromium.org/1631993002
-rw-r--r-- | include/gpu/GrSurface.h | 4 | ||||
-rw-r--r-- | include/gpu/SkGr.h | 1 | ||||
-rw-r--r-- | src/core/SkMipMap.cpp | 2 | ||||
-rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 1 | ||||
-rw-r--r-- | src/gpu/GrContext.cpp | 1 | ||||
-rw-r--r-- | src/gpu/GrGpu.cpp | 3 | ||||
-rw-r--r-- | src/gpu/GrGpu.h | 2 | ||||
-rw-r--r-- | src/gpu/GrTest.cpp | 3 | ||||
-rw-r--r-- | src/gpu/GrTexture.cpp | 2 | ||||
-rw-r--r-- | src/gpu/GrTexturePriv.h | 2 | ||||
-rw-r--r-- | src/gpu/GrTextureProvider.cpp | 1 | ||||
-rw-r--r-- | src/gpu/effects/GrTextureStripAtlas.cpp | 3 | ||||
-rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 12 | ||||
-rw-r--r-- | src/image/SkImage_Gpu.cpp | 2 |
14 files changed, 16 insertions, 23 deletions
diff --git a/include/gpu/GrSurface.h b/include/gpu/GrSurface.h index 28935009ce..b59d802f32 100644 --- a/include/gpu/GrSurface.h +++ b/include/gpu/GrSurface.h @@ -100,8 +100,8 @@ public: * packed. * @param pixelOpsFlags See the GrContext::PixelOpsFlags enum. * - * @return true if the read succeeded, false if not. The read can fail because of an unsupported - * pixel config. + * @return true if the read succeeded, false if not. The read can fail because of an + * unsupported pixel config. */ bool writePixels(int left, int top, int width, int height, GrPixelConfig config, diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h index 17625c4e4e..aacc5d25db 100644 --- a/include/gpu/SkGr.h +++ b/include/gpu/SkGr.h @@ -1,4 +1,3 @@ - /* * Copyright 2010 Google Inc. * diff --git a/src/core/SkMipMap.cpp b/src/core/SkMipMap.cpp index 39d42a255e..e105493262 100644 --- a/src/core/SkMipMap.cpp +++ b/src/core/SkMipMap.cpp @@ -352,7 +352,7 @@ bool SkMipMap::extractLevel(SkScalar scale, Level* levelPtr) const { return true; } -// Helper which extacts a pixmap from the src bitmap +// Helper which extracts a pixmap from the src bitmap // SkMipMap* SkMipMap::Build(const SkBitmap& src, SkDiscardableFactoryProc fact) { SkAutoPixmapUnlock srcUnlocker; diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index edd2fa4f69..be0c8166e2 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2006 The Android Open Source Project * diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 4d3045a96e..e0ee801ecb 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2011 Google Inc. * diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp index 2815f612d6..43a75ae567 100644 --- a/src/gpu/GrGpu.cpp +++ b/src/gpu/GrGpu.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2010 Google Inc. * @@ -353,7 +352,7 @@ bool GrGpu::transferPixels(GrSurface* surface, SkASSERT(buffer); this->handleDirtyContext(); - if (this->onTransferPixels(surface, left, top, width, height, config, + if (this->onTransferPixels(surface, left, top, width, height, config, buffer, offset, rowBytes)) { fStats.incTransfersToTexture(); return true; diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h index 1566872ac4..bfcaeae889 100644 --- a/src/gpu/GrGpu.h +++ b/src/gpu/GrGpu.h @@ -197,7 +197,7 @@ public: bool getReadPixelsInfo(GrSurface* srcSurface, int readWidth, int readHeight, size_t rowBytes, GrPixelConfig readConfig, DrawPreference*, ReadPixelTempDrawInfo*); - /** Info struct returned by getWritePixelsInfo about performing an intermediate draw in order + /** Info struct returned by getWritePixelsInfo about performing an intermediate draw in order to write pixels to a GrSurface for either performance or correctness reasons. */ struct WritePixelTempDrawInfo { /** If the GrGpu is requesting that the caller upload to an intermediate surface and draw diff --git a/src/gpu/GrTest.cpp b/src/gpu/GrTest.cpp index 8174d76779..88e154c946 100644 --- a/src/gpu/GrTest.cpp +++ b/src/gpu/GrTest.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2013 Google Inc. * @@ -386,7 +385,7 @@ private: GrBackendObject createTestingOnlyBackendTexture(void* pixels, int w, int h, GrPixelConfig config) const override { - return 0; + return 0; } bool isTestingOnlyBackendTexture(GrBackendObject ) const override { return false; } void deleteTestingOnlyBackendTexture(GrBackendObject, bool abandonTexture) const override {} diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp index 905455a9ec..249fe98c20 100644 --- a/src/gpu/GrTexture.cpp +++ b/src/gpu/GrTexture.cpp @@ -18,7 +18,7 @@ void GrTexture::dirtyMipMaps(bool mipMapsDirty) { if (mipMapsDirty) { if (kValid_MipMapsStatus == fMipMapsStatus) { - fMipMapsStatus = kAllocated_MipMapsStatus; + fMipMapsStatus = kAllocated_MipMapsStatus; } } else { const bool sizeChanged = kNotAllocated_MipMapsStatus == fMipMapsStatus; diff --git a/src/gpu/GrTexturePriv.h b/src/gpu/GrTexturePriv.h index 8add4e1c49..da0558e574 100644 --- a/src/gpu/GrTexturePriv.h +++ b/src/gpu/GrTexturePriv.h @@ -62,7 +62,7 @@ private: GrTexturePriv* operator&(); GrTexture* fTexture; - + friend class GrTexture; // to construct/copy this type. }; diff --git a/src/gpu/GrTextureProvider.cpp b/src/gpu/GrTextureProvider.cpp index 1c2f36535a..105cce2fb7 100644 --- a/src/gpu/GrTextureProvider.cpp +++ b/src/gpu/GrTextureProvider.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2015 Google Inc. * diff --git a/src/gpu/effects/GrTextureStripAtlas.cpp b/src/gpu/effects/GrTextureStripAtlas.cpp index f2133d12f2..39bc3899b3 100644 --- a/src/gpu/effects/GrTextureStripAtlas.cpp +++ b/src/gpu/effects/GrTextureStripAtlas.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2012 Google Inc. * @@ -19,7 +18,7 @@ #define VALIDATE #endif -class GrTextureStripAtlas::Hash : public SkTDynamicHash<GrTextureStripAtlas::AtlasEntry, +class GrTextureStripAtlas::Hash : public SkTDynamicHash<GrTextureStripAtlas::AtlasEntry, GrTextureStripAtlas::Desc> {}; int32_t GrTextureStripAtlas::gCacheCount = 0; diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 94307a67a4..acaf8caca0 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -525,7 +525,7 @@ GrRenderTarget* GrGLGpu::onWrapBackendRenderTarget(const GrBackendRenderTargetDe case kBorrow_GrWrapOwnership: idDesc.fLifeCycle = GrGpuResource::kBorrowed_LifeCycle; break; - } + } idDesc.fSampleConfig = GrRenderTarget::kUnified_SampleConfig; GrSurfaceDesc desc; @@ -2856,7 +2856,7 @@ static inline bool can_copy_texsubimage(const GrSurface* dst, } const GrGLTexture* srcTex = static_cast<const GrGLTexture*>(src->asTexture()); - + // Check that we could wrap the source in an FBO, that the dst is TEXTURE_2D, that no mirroring // is required. if (gpu->glCaps().isConfigRenderable(src->config(), src->desc().fSampleCnt > 0) && @@ -2905,7 +2905,7 @@ void GrGLGpu::bindSurfaceFBOForCopy(GrSurface* surface, GrGLenum fboTarget, GrGL } void GrGLGpu::unbindTextureFBOForCopy(GrGLenum fboTarget, GrSurface* surface) { - // bindSurfaceFBOForCopy temporarily binds textures that are not render targets to + // bindSurfaceFBOForCopy temporarily binds textures that are not render targets to if (!surface->asRenderTarget()) { SkASSERT(surface->asTexture()); GrGLenum textureTarget = static_cast<GrGLTexture*>(surface->asTexture())->target(); @@ -2989,7 +2989,7 @@ bool GrGLGpu::onCopySurface(GrSurface* dst, this->copySurfaceAsDraw(dst, src, srcRect, dstPoint); return true; } - + if (can_copy_texsubimage(dst, src, this)) { this->copySurfaceAsCopyTexSubImage(dst, src, srcRect, dstPoint); return true; @@ -3040,7 +3040,7 @@ void GrGLGpu::createCopyPrograms() { vshaderTxt.append(";"); vTexCoord.appendDecl(this->glCaps().glslCaps(), &vshaderTxt); vshaderTxt.append(";"); - + vshaderTxt.append( "// Copy Program VS\n" "void main() {" @@ -3079,7 +3079,7 @@ void GrGLGpu::createCopyPrograms() { fsOutName, GrGLSLTexture2DFunctionName(kVec2f_GrSLType, kSamplerTypes[i], this->glslGeneration()) ); - + GL_CALL_RET(fCopyPrograms[i].fProgram, CreateProgram()); const char* str; GrGLint length; diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index 1d25635e87..a758efed5c 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -292,7 +292,7 @@ GrTexture* GrDeepCopyTexture(GrTexture* src, bool budgeted) { if (!dst) { return nullptr; } - + const SkIRect srcR = SkIRect::MakeWH(desc.fWidth, desc.fHeight); const SkIPoint dstP = SkIPoint::Make(0, 0); ctx->copySurface(dst, src, srcR, dstP, GrContext::kFlushWrites_PixelOp); |