OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 10 matching lines...) Expand all Loading... |
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 | 27 |
28 #include "core/html/canvas/WebGLContextObject.h" | 28 #include "core/html/canvas/WebGLContextObject.h" |
29 | 29 |
30 #include "core/html/canvas/WebGLRenderingContextBase.h" | 30 #include "core/html/canvas/WebGLRenderingContextBase.h" |
| 31 #include "core/html/canvas/WebGLSharedWebGraphicsContext3D.h" |
31 | 32 |
32 namespace blink { | 33 namespace blink { |
33 | 34 |
34 WebGLContextObject::WebGLContextObject(WebGLRenderingContextBase* context) | 35 WebGLContextObject::WebGLContextObject(WebGLRenderingContextBase* context) |
35 : WebGLObject(context) | 36 : WebGLObject(context) |
36 , m_context(context) | 37 , m_context(context) |
| 38 #if ENABLE(OILPAN) |
| 39 , m_sharedWebGraphicsContext3D(context->sharedWebGraphicsContext3D()) |
| 40 #endif |
37 { | 41 { |
38 } | 42 } |
39 | 43 |
40 WebGLContextObject::~WebGLContextObject() | 44 WebGLContextObject::~WebGLContextObject() |
41 { | 45 { |
| 46 #if !ENABLE(OILPAN) |
42 if (m_context) | 47 if (m_context) |
43 m_context->removeContextObject(this); | 48 m_context->removeContextObject(this); |
| 49 #endif |
44 } | 50 } |
45 | 51 |
46 void WebGLContextObject::detachContext() | 52 void WebGLContextObject::detachContext() |
47 { | 53 { |
48 detach(); | 54 detach(); |
49 if (m_context) { | 55 if (m_context) { |
50 deleteObject(m_context->webContext()); | 56 deleteObject(m_context->webContext()); |
51 m_context->removeContextObject(this); | 57 m_context->removeContextObject(this); |
52 m_context = 0; | 58 m_context = nullptr; |
| 59 #if ENABLE(OILPAN) |
| 60 m_sharedWebGraphicsContext3D.clear(); |
| 61 #endif |
53 } | 62 } |
54 } | 63 } |
55 | 64 |
56 blink::WebGraphicsContext3D* WebGLContextObject::getAWebGraphicsContext3D() cons
t | 65 blink::WebGraphicsContext3D* WebGLContextObject::getAWebGraphicsContext3D() cons
t |
57 { | 66 { |
| 67 #if ENABLE(OILPAN) |
| 68 return m_sharedWebGraphicsContext3D ? m_sharedWebGraphicsContext3D->webConte
xt() : 0; |
| 69 #else |
58 return m_context ? m_context->webContext() : 0; | 70 return m_context ? m_context->webContext() : 0; |
| 71 #endif |
| 72 } |
| 73 |
| 74 void WebGLContextObject::trace(Visitor* visitor) |
| 75 { |
| 76 visitor->trace(m_context); |
| 77 WebGLObject::trace(visitor); |
59 } | 78 } |
60 | 79 |
61 } | 80 } |
OLD | NEW |