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 "core/html/canvas/WebGLSampler.h" | 7 #include "core/html/canvas/WebGLSampler.h" |
8 | 8 |
9 #include "core/html/canvas/WebGL2RenderingContextBase.h" | 9 #include "core/html/canvas/WebGL2RenderingContextBase.h" |
10 | 10 |
11 namespace blink { | 11 namespace blink { |
12 | 12 |
13 PassRefPtrWillBeRawPtr<WebGLSampler> WebGLSampler::create(WebGL2RenderingContext
Base* ctx) | 13 PassRefPtrWillBeRawPtr<WebGLSampler> WebGLSampler::create(WebGL2RenderingContext
Base* ctx) |
14 { | 14 { |
15 return adoptRefWillBeNoop(new WebGLSampler(ctx)); | 15 return adoptRefWillBeNoop(new WebGLSampler(ctx)); |
16 } | 16 } |
17 | 17 |
18 WebGLSampler::~WebGLSampler() | 18 WebGLSampler::~WebGLSampler() |
19 { | 19 { |
20 deleteObject(0); | 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. |
| 27 detachAndDeleteObject(); |
21 } | 28 } |
22 | 29 |
23 WebGLSampler::WebGLSampler(WebGL2RenderingContextBase* ctx) | 30 WebGLSampler::WebGLSampler(WebGL2RenderingContextBase* ctx) |
24 : WebGLSharedObject(ctx) | 31 : WebGLSharedObject(ctx) |
25 { | 32 { |
26 setObject(ctx->webContext()->createSampler()); | 33 setObject(ctx->webContext()->createSampler()); |
27 } | 34 } |
28 | 35 |
29 void WebGLSampler::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Plat
form3DObject object) | 36 void WebGLSampler::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Plat
form3DObject object) |
30 { | 37 { |
31 context3d->deleteSampler(object); | 38 context3d->deleteSampler(object); |
32 } | 39 } |
33 | 40 |
34 } // namespace blink | 41 } // namespace blink |
OLD | NEW |