Chromium Code Reviews| 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 23 matching lines...) Expand all Loading... | |
| 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) | 42 #if !ENABLE(OILPAN) |
| 43 if (m_context) | 43 if (m_context) |
| 44 m_context->removeContextObject(this); | 44 m_context->removeContextObject(this); |
|
haraken
2015/08/05 04:12:19
You need to remove this because the removal is now
peria
2015/08/06 05:47:00
Done.
| |
| 45 #endif | 45 #endif |
| 46 } | 46 } |
| 47 | 47 |
| 48 void WebGLContextObject::detachContext() | 48 void WebGLContextObject::detachContext() |
| 49 { | 49 { |
| 50 detach(); | 50 detach(); |
| 51 if (m_context) { | 51 if (m_context) { |
| 52 deleteObject(m_context->webContext()); | 52 deleteObject(m_context->webContext()); |
| 53 m_context->removeContextObject(this); | 53 m_context->removeContextObject(this); |
| 54 m_context = nullptr; | 54 m_context = nullptr; |
| 55 } | 55 } |
| 56 } | 56 } |
| 57 | 57 |
| 58 WebGraphicsContext3D* WebGLContextObject::getAWebGraphicsContext3D() const | 58 WebGraphicsContext3D* WebGLContextObject::getAWebGraphicsContext3D() const |
| 59 { | 59 { |
| 60 return m_context ? m_context->webContext() : 0; | 60 return m_context ? m_context->webContext() : nullptr; |
| 61 } | 61 } |
| 62 | 62 |
| 63 DEFINE_TRACE(WebGLContextObject) | 63 DEFINE_TRACE(WebGLContextObject) |
| 64 { | 64 { |
| 65 visitor->trace(m_context); | 65 visitor->trace(m_context); |
| 66 WebGLObject::trace(visitor); | 66 WebGLObject::trace(visitor); |
| 67 } | 67 } |
| 68 | 68 |
| 69 } // namespace blink | 69 } // namespace blink |
| OLD | NEW |