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/WebGLSync.h" | 7 #include "core/html/canvas/WebGLSync.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 WebGLSync::~WebGLSync() | 13 WebGLSync::~WebGLSync() |
14 { | 14 { |
15 deleteObject(0); | 15 // Always call detach here to ensure that platform object deletion |
| 16 // happens with Oilpan enabled. It keeps the code regular to do it |
| 17 // with or without Oilpan enabled. |
| 18 // |
| 19 // See comment in WebGLBuffer's destructor for additional |
| 20 // information on why this is done for WebGLSharedObject-derived |
| 21 // objects. |
| 22 detachAndDeleteObject(); |
16 } | 23 } |
17 | 24 |
18 WebGLSync::WebGLSync(WebGL2RenderingContextBase* ctx, GLenum objectType) | 25 WebGLSync::WebGLSync(WebGL2RenderingContextBase* ctx, GLenum objectType) |
19 : WebGLSharedObject(ctx) | 26 : WebGLSharedObject(ctx) |
20 , m_objectType(objectType) | 27 , m_objectType(objectType) |
21 { | 28 { |
22 } | 29 } |
23 | 30 |
24 void WebGLSync::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Platfor
m3DObject object) | 31 void WebGLSync::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Platfor
m3DObject object) |
25 { | 32 { |
26 context3d->deleteSync(object); | 33 context3d->deleteSync(object); |
27 } | 34 } |
28 | 35 |
29 } // namespace blink | 36 } // namespace blink |
OLD | NEW |