OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "modules/webgl/WebGLSampler.h" | 7 #include "modules/webgl/WebGLSampler.h" |
8 | 8 |
9 #include "modules/webgl/WebGL2RenderingContextBase.h" | 9 #include "modules/webgl/WebGL2RenderingContextBase.h" |
10 | 10 |
11 namespace blink { | 11 namespace blink { |
12 | 12 |
13 WebGLSampler* WebGLSampler::create(WebGL2RenderingContextBase* ctx) | 13 PassRefPtrWillBeRawPtr<WebGLSampler> WebGLSampler::create(WebGL2RenderingContext
Base* ctx) |
14 { | 14 { |
15 return new WebGLSampler(ctx); | 15 return adoptRefWillBeNoop(new WebGLSampler(ctx)); |
16 } | 16 } |
17 | 17 |
18 WebGLSampler::~WebGLSampler() | 18 WebGLSampler::~WebGLSampler() |
19 { | 19 { |
20 // See the comment in WebGLObject::detachAndDeleteObject(). | 20 // Always call detach here to ensure that platform object deletion |
| 21 // happens with Oilpan enabled. It keeps the code regular to do it |
| 22 // with or without Oilpan enabled. |
| 23 // |
| 24 // See comment in WebGLBuffer's destructor for additional |
| 25 // information on why this is done for WebGLSharedObject-derived |
| 26 // objects. |
21 detachAndDeleteObject(); | 27 detachAndDeleteObject(); |
22 } | 28 } |
23 | 29 |
24 WebGLSampler::WebGLSampler(WebGL2RenderingContextBase* ctx) | 30 WebGLSampler::WebGLSampler(WebGL2RenderingContextBase* ctx) |
25 : WebGLSharedPlatform3DObject(ctx) | 31 : WebGLSharedPlatform3DObject(ctx) |
26 { | 32 { |
27 setObject(ctx->webContext()->createSampler()); | 33 setObject(ctx->webContext()->createSampler()); |
28 } | 34 } |
29 | 35 |
30 void WebGLSampler::deleteObjectImpl(WebGraphicsContext3D* context3d) | 36 void WebGLSampler::deleteObjectImpl(WebGraphicsContext3D* context3d) |
31 { | 37 { |
32 context3d->deleteSampler(m_object); | 38 context3d->deleteSampler(m_object); |
33 m_object = 0; | 39 m_object = 0; |
34 } | 40 } |
35 | 41 |
36 } // namespace blink | 42 } // namespace blink |
OLD | NEW |