From f1c6cd7603bd8c3f55b5070c8faa666652e98cc2 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Thu, 18 Aug 2016 07:11:13 -0700 Subject: [PATCH] Rename WorseCaseSize to WorstCasSize GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2259863002 Review-Url: https://codereview.chromium.org/2259863002 --- include/gpu/GrSurface.h | 2 +- src/gpu/GrSurface.cpp | 2 +- src/gpu/GrTexture.cpp | 2 +- src/gpu/GrTextureProvider.cpp | 2 +- src/gpu/gl/GrGLRenderTarget.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/gpu/GrSurface.h b/include/gpu/GrSurface.h index e002765..24e2dfc 100644 --- a/include/gpu/GrSurface.h +++ b/include/gpu/GrSurface.h @@ -126,7 +126,7 @@ public: fReleaseCtx = ctx; } - static size_t WorseCaseSize(const GrSurfaceDesc& desc); + static size_t WorstCaseSize(const GrSurfaceDesc& desc); protected: // Methods made available via GrSurfacePriv diff --git a/src/gpu/GrSurface.cpp b/src/gpu/GrSurface.cpp index 2da1f25..3c9368e 100644 --- a/src/gpu/GrSurface.cpp +++ b/src/gpu/GrSurface.cpp @@ -14,7 +14,7 @@ #include "SkImageEncoder.h" #include -size_t GrSurface::WorseCaseSize(const GrSurfaceDesc& desc) { +size_t GrSurface::WorstCaseSize(const GrSurfaceDesc& desc) { size_t size; bool isRenderTarget = SkToBool(desc.fFlags & kRenderTarget_GrSurfaceFlag); diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp index 6834581..bb1a6bb 100644 --- a/src/gpu/GrTexture.cpp +++ b/src/gpu/GrTexture.cpp @@ -51,7 +51,7 @@ size_t GrTexture::onGpuMemorySize() const { } SkASSERT(!SkToBool(fDesc.fFlags & kRenderTarget_GrSurfaceFlag)); - SkASSERT(textureSize <= WorseCaseSize(fDesc)); + SkASSERT(textureSize <= WorstCaseSize(fDesc)); return textureSize; } diff --git a/src/gpu/GrTextureProvider.cpp b/src/gpu/GrTextureProvider.cpp index 00494da..68a5540 100644 --- a/src/gpu/GrTextureProvider.cpp +++ b/src/gpu/GrTextureProvider.cpp @@ -139,7 +139,7 @@ GrTexture* GrTextureProvider::refScratchTexture(const GrSurfaceDesc& inDesc, scratchFlags = GrResourceCache::kPreferNoPendingIO_ScratchFlag; } GrGpuResource* resource = fCache->findAndRefScratchResource(key, - GrSurface::WorseCaseSize(*desc), + GrSurface::WorstCaseSize(*desc), scratchFlags); if (resource) { GrSurface* surface = static_cast(resource); diff --git a/src/gpu/gl/GrGLRenderTarget.cpp b/src/gpu/gl/GrGLRenderTarget.cpp index 8dacf48..d9bbb73 100644 --- a/src/gpu/gl/GrGLRenderTarget.cpp +++ b/src/gpu/gl/GrGLRenderTarget.cpp @@ -61,7 +61,7 @@ void GrGLRenderTarget::init(const GrSurfaceDesc& desc, const IDDesc& idDesc) { fGpuMemorySize = this->totalSamples() * this->totalBytesPerSample(); - SkASSERT(fGpuMemorySize <= WorseCaseSize(desc)); + SkASSERT(fGpuMemorySize <= WorstCaseSize(desc)); } GrGLRenderTarget* GrGLRenderTarget::CreateWrapped(GrGLGpu* gpu, -- 2.7.4