Index: Source/core/html/canvas/WebGLTexture.cpp |
diff --git a/Source/core/html/canvas/WebGLTexture.cpp b/Source/core/html/canvas/WebGLTexture.cpp |
index 292974230ea6f5744821e6c55e2dc18bb7dd5691..081665c9e2e9a438e03dec683cf22ea9bcdaf0f5 100644 |
--- a/Source/core/html/canvas/WebGLTexture.cpp |
+++ b/Source/core/html/canvas/WebGLTexture.cpp |
@@ -31,9 +31,9 @@ |
namespace WebCore { |
-PassRefPtr<WebGLTexture> WebGLTexture::create(WebGLRenderingContextBase* ctx) |
+PassRefPtrWillBeRawPtr<WebGLTexture> WebGLTexture::create(WebGLRenderingContextBase* ctx) |
{ |
- return adoptRef(new WebGLTexture(ctx)); |
+ return adoptRefWillBeNoop(new WebGLTexture(ctx)); |
} |
WebGLTexture::WebGLTexture(WebGLRenderingContextBase* ctx) |
@@ -56,7 +56,9 @@ WebGLTexture::WebGLTexture(WebGLRenderingContextBase* ctx) |
WebGLTexture::~WebGLTexture() |
{ |
+#if !ENABLE(OILPAN) |
haraken
2014/07/02 07:47:39
I wonder why you remove only this deleteObject().
sof
2014/07/02 11:43:53
Re-instated; we have to reliably let go of the und
|
deleteObject(0); |
+#endif |
} |
void WebGLTexture::setTarget(GLenum target, GLint maxLevel) |