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 21 matching lines...) Expand all Loading... |
32 namespace blink { | 32 namespace blink { |
33 | 33 |
34 WebGLContextObject::WebGLContextObject(WebGLRenderingContextBase* context) | 34 WebGLContextObject::WebGLContextObject(WebGLRenderingContextBase* context) |
35 : WebGLObject(context) | 35 : WebGLObject(context) |
36 , m_context(context) | 36 , m_context(context) |
37 { | 37 { |
38 } | 38 } |
39 | 39 |
40 WebGLContextObject::~WebGLContextObject() | 40 WebGLContextObject::~WebGLContextObject() |
41 { | 41 { |
42 #if !ENABLE(OILPAN) | |
43 if (m_context) | |
44 m_context->removeContextObject(this); | |
45 #endif | |
46 } | 42 } |
47 | 43 |
48 void WebGLContextObject::detachContext() | 44 void WebGLContextObject::detachContext() |
49 { | 45 { |
50 detach(); | 46 detach(); |
51 if (m_context) { | 47 if (m_context) { |
52 deleteObject(m_context->webContext()); | 48 deleteObject(m_context->webContext()); |
53 m_context->removeContextObject(this); | 49 m_context->removeContextObject(this); |
54 m_context = nullptr; | 50 m_context = nullptr; |
55 } | 51 } |
56 } | 52 } |
57 | 53 |
58 WebGraphicsContext3D* WebGLContextObject::getAWebGraphicsContext3D() const | 54 WebGraphicsContext3D* WebGLContextObject::getAWebGraphicsContext3D() const |
59 { | 55 { |
60 return m_context ? m_context->webContext() : 0; | 56 return m_context ? m_context->webContext() : nullptr; |
61 } | 57 } |
62 | 58 |
63 DEFINE_TRACE(WebGLContextObject) | 59 DEFINE_TRACE(WebGLContextObject) |
64 { | 60 { |
65 visitor->trace(m_context); | 61 visitor->trace(m_context); |
66 WebGLObject::trace(visitor); | 62 WebGLObject::trace(visitor); |
67 } | 63 } |
68 | 64 |
69 } // namespace blink | 65 } // namespace blink |
OLD | NEW |