diff options
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/GrClipMaskManager.cpp | 2 | ||||
-rwxr-xr-x | src/gpu/GrContextFactory.cpp | 2 | ||||
-rw-r--r-- | src/gpu/GrGpu.cpp | 2 | ||||
-rw-r--r-- | src/gpu/GrTextureParamsAdjuster.cpp | 2 | ||||
-rw-r--r-- | src/gpu/GrYUVProvider.cpp | 2 | ||||
-rw-r--r-- | src/gpu/SkGpuDevice.cpp | 2 | ||||
-rw-r--r-- | src/gpu/batches/GrDrawPathBatch.cpp | 2 | ||||
-rw-r--r-- | src/gpu/batches/GrStencilAndCoverPathRenderer.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/GrGLExtensions.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/SkGLContext.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/angle/SkANGLEGLContext.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/command_buffer/SkCommandBufferGLContext.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm | 2 | ||||
-rw-r--r-- | src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/mesa/SkMesaGLContext.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp | 2 |
18 files changed, 18 insertions, 18 deletions
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp index f56a4e44bd..e04adee90d 100644 --- a/src/gpu/GrClipMaskManager.cpp +++ b/src/gpu/GrClipMaskManager.cpp @@ -713,7 +713,7 @@ GrTexture* GrClipMaskManager::CreateAlphaClipMask(GrContext* context, } } - return texture.detach(); + return texture.release(); } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/GrContextFactory.cpp b/src/gpu/GrContextFactory.cpp index b7e48254c8..bcf0c32cf5 100755 --- a/src/gpu/GrContextFactory.cpp +++ b/src/gpu/GrContextFactory.cpp @@ -143,7 +143,7 @@ GrContextFactory::ContextInfo GrContextFactory::getContextInfo(GLContextType typ } Context& context = fContexts.push_back(); - context.fGLContext = glCtx.detach(); + context.fGLContext = glCtx.release(); context.fGrContext = SkRef(grCtx.get()); context.fType = type; context.fOptions = options; diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp index afeeda7ae6..512ce9b687 100644 --- a/src/gpu/GrGpu.cpp +++ b/src/gpu/GrGpu.cpp @@ -477,7 +477,7 @@ const GrGpu::MultisampleSpecs& GrGpu::getMultisampleSpecs(GrRenderTarget* rt, return specs; } const MultisampleSpecs& specs = *new (&fMultisampleSpecsAllocator) - MultisampleSpecs{effectiveKey, effectiveSampleCnt, locations.detach()}; + MultisampleSpecs{effectiveKey, effectiveSampleCnt, locations.release()}; if (fMultisampleSpecsMap.count() <= effectiveKey) { int n = 1 + effectiveKey - fMultisampleSpecsMap.count(); fMultisampleSpecsMap.push_back_n(n, (const MultisampleSpecs*) nullptr); diff --git a/src/gpu/GrTextureParamsAdjuster.cpp b/src/gpu/GrTextureParamsAdjuster.cpp index 7affae6561..429a63affa 100644 --- a/src/gpu/GrTextureParamsAdjuster.cpp +++ b/src/gpu/GrTextureParamsAdjuster.cpp @@ -119,7 +119,7 @@ static GrTexture* copy_on_gpu(GrTexture* inputTexture, const SkIRect* subset, SkRect dstRect = SkRect::MakeWH(SkIntToScalar(rtDesc.fWidth), SkIntToScalar(rtDesc.fHeight)); drawContext->fillRectToRect(GrClip::WideOpen(), paint, SkMatrix::I(), dstRect, localRect); - return copy.detach(); + return copy.release(); } GrTextureAdjuster::GrTextureAdjuster(GrTexture* original, diff --git a/src/gpu/GrYUVProvider.cpp b/src/gpu/GrYUVProvider.cpp index 708cbecb11..f35c6dfe9b 100644 --- a/src/gpu/GrYUVProvider.cpp +++ b/src/gpu/GrYUVProvider.cpp @@ -141,6 +141,6 @@ GrTexture* GrYUVProvider::refAsTexture(GrContext* ctx, const GrSurfaceDesc& desc drawContext->drawRect(GrClip::WideOpen(), paint, SkMatrix::I(), r); - return result.detach(); + return result.release(); } diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 7a6d967538..173fe30e43 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -335,7 +335,7 @@ void SkGpuDevice::replaceRenderTarget(bool shouldRetainContent) { SkASSERT(fRenderTarget != newRT); - fRenderTarget.reset(newRT.detach()); + fRenderTarget.reset(newRT.release()); #ifdef SK_DEBUG SkImageInfo info = fRenderTarget->surfacePriv().info(fOpaque ? kOpaque_SkAlphaType : diff --git a/src/gpu/batches/GrDrawPathBatch.cpp b/src/gpu/batches/GrDrawPathBatch.cpp index a99f4ebf43..b11585861c 100644 --- a/src/gpu/batches/GrDrawPathBatch.cpp +++ b/src/gpu/batches/GrDrawPathBatch.cpp @@ -99,7 +99,7 @@ bool GrDrawPathRangeBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) { fTotalPathCount += that->fTotalPathCount; while (Draw* head = that->fDraws.head()) { Draw* draw = fDraws.addToTail(); - draw->fInstanceData.reset(head->fInstanceData.detach()); + draw->fInstanceData.reset(head->fInstanceData.release()); draw->fX = head->fX; draw->fY = head->fY; that->fDraws.popHead(); diff --git a/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp b/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp index ada6dbf963..cf431732fd 100644 --- a/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp +++ b/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp @@ -60,7 +60,7 @@ static GrPath* get_gr_path(GrResourceProvider* resourceProvider, const SkPath& s } else { SkASSERT(path->isEqualTo(skPath, stroke)); } - return path.detach(); + return path.release(); } void GrStencilAndCoverPathRenderer::onStencilPath(const StencilPathArgs& args) { diff --git a/src/gpu/gl/GrGLExtensions.cpp b/src/gpu/gl/GrGLExtensions.cpp index 1ddc101cfc..43a147d763 100644 --- a/src/gpu/gl/GrGLExtensions.cpp +++ b/src/gpu/gl/GrGLExtensions.cpp @@ -125,7 +125,7 @@ bool GrGLExtensions::remove(const char ext[]) { if (idx >= 0) { // This is not terribly effecient but we really only expect this function to be called at // most a handful of times when our test programs start. - SkAutoTDelete< SkTArray<SkString> > oldStrings(fStrings.detach()); + SkAutoTDelete< SkTArray<SkString> > oldStrings(fStrings.release()); fStrings.reset(new SkTArray<SkString>(oldStrings->count() - 1)); fStrings->push_back_n(idx, &oldStrings->front()); fStrings->push_back_n(oldStrings->count() - idx - 1, &(*oldStrings)[idx] + 1); diff --git a/src/gpu/gl/SkGLContext.cpp b/src/gpu/gl/SkGLContext.cpp index 01f827c8fa..ebe5032827 100644 --- a/src/gpu/gl/SkGLContext.cpp +++ b/src/gpu/gl/SkGLContext.cpp @@ -140,7 +140,7 @@ SkGLContext::GLFenceSync* SkGLContext::GLFenceSync::CreateIfSupported(const SkGL return nullptr; } - return ret.detach(); + return ret.release(); } SkPlatformGpuFence SkGLContext::GLFenceSync::insertFence() const { diff --git a/src/gpu/gl/angle/SkANGLEGLContext.cpp b/src/gpu/gl/angle/SkANGLEGLContext.cpp index 2c9f38e1d9..0e37a7e1f6 100644 --- a/src/gpu/gl/angle/SkANGLEGLContext.cpp +++ b/src/gpu/gl/angle/SkANGLEGLContext.cpp @@ -123,7 +123,7 @@ SkANGLEGLContext::SkANGLEGLContext(bool useGLBackend) return; } - this->init(gl.detach()); + this->init(gl.release()); } SkANGLEGLContext::~SkANGLEGLContext() { diff --git a/src/gpu/gl/command_buffer/SkCommandBufferGLContext.cpp b/src/gpu/gl/command_buffer/SkCommandBufferGLContext.cpp index cf9da9365b..b14debda57 100644 --- a/src/gpu/gl/command_buffer/SkCommandBufferGLContext.cpp +++ b/src/gpu/gl/command_buffer/SkCommandBufferGLContext.cpp @@ -259,7 +259,7 @@ void SkCommandBufferGLContext::initializeGLContext(void* nativeWindow, const int return; } - this->init(gl.detach()); + this->init(gl.release()); } SkCommandBufferGLContext::~SkCommandBufferGLContext() { diff --git a/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp b/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp index bf939730ca..09b7323877 100644 --- a/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp +++ b/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp @@ -179,7 +179,7 @@ EGLGLContext::EGLGLContext(GrGLStandard forcedGpuAPI) continue; } - this->init(gl.detach(), SkEGLFenceSync::CreateIfSupported(fDisplay)); + this->init(gl.release(), SkEGLFenceSync::CreateIfSupported(fDisplay)); break; } } diff --git a/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp b/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp index 51b8ce9e60..b91262f4ef 100644 --- a/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp +++ b/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp @@ -284,7 +284,7 @@ GLXGLContext::GLXGLContext(GrGLStandard forcedGpuAPI, GLXGLContext* shareContext return; } - this->init(gl.detach()); + this->init(gl.release()); } diff --git a/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm b/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm index 5be351f52e..54dc59af03 100644 --- a/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm +++ b/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm @@ -53,7 +53,7 @@ IOSGLContext::IOSGLContext() "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib", RTLD_LAZY); - this->init(gl.detach()); + this->init(gl.release()); } IOSGLContext::~IOSGLContext() { diff --git a/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp b/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp index d1826a49e3..c6eb34b8df 100644 --- a/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp +++ b/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp @@ -77,7 +77,7 @@ MacGLContext::MacGLContext() "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib", RTLD_LAZY); - this->init(gl.detach()); + this->init(gl.release()); } MacGLContext::~MacGLContext() { diff --git a/src/gpu/gl/mesa/SkMesaGLContext.cpp b/src/gpu/gl/mesa/SkMesaGLContext.cpp index 541b247fa8..8b3666c497 100644 --- a/src/gpu/gl/mesa/SkMesaGLContext.cpp +++ b/src/gpu/gl/mesa/SkMesaGLContext.cpp @@ -63,7 +63,7 @@ SkMesaGLContext::SkMesaGLContext() return; } - this->init(gl.detach()); + this->init(gl.release()); } SkMesaGLContext::~SkMesaGLContext() { diff --git a/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp b/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp index 6cc11439bf..da13ee739e 100644 --- a/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp +++ b/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp @@ -127,7 +127,7 @@ WinGLContext::WinGLContext(GrGLStandard forcedGpuAPI) return; } - this->init(gl.detach()); + this->init(gl.release()); } WinGLContext::~WinGLContext() { |