| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 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 13 matching lines...) Expand all Loading... |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 | 27 |
| 28 #include "core/html/canvas/WebGLRenderbuffer.h" | 28 #include "core/html/canvas/WebGLRenderbuffer.h" |
| 29 | 29 |
| 30 #include "core/html/canvas/WebGLRenderingContextBase.h" | 30 #include "core/html/canvas/WebGLRenderingContextBase.h" |
| 31 | 31 |
| 32 namespace blink { | 32 namespace blink { |
| 33 | 33 |
| 34 PassRefPtr<WebGLRenderbuffer> WebGLRenderbuffer::create(WebGLRenderingContextBas
e* ctx) | 34 PassRefPtrWillBeRawPtr<WebGLRenderbuffer> WebGLRenderbuffer::create(WebGLRenderi
ngContextBase* ctx) |
| 35 { | 35 { |
| 36 return adoptRef(new WebGLRenderbuffer(ctx)); | 36 return adoptRefWillBeNoop(new WebGLRenderbuffer(ctx)); |
| 37 } | 37 } |
| 38 | 38 |
| 39 WebGLRenderbuffer::~WebGLRenderbuffer() | 39 WebGLRenderbuffer::~WebGLRenderbuffer() |
| 40 { | 40 { |
| 41 deleteObject(0); | 41 #if ENABLE(OILPAN) |
| 42 // This render buffer (heap) object must finalize itself. |
| 43 m_emulatedStencilBuffer.clear(); |
| 44 #endif |
| 45 // Always call detach here to ensure that platform object deletion |
| 46 // happens with Oilpan enabled. It keeps the code regular to do it |
| 47 // with or without Oilpan enabled. |
| 48 // |
| 49 // See comment in WebGLBuffer's destructor for additional |
| 50 // information on why this is done for WebGLSharedObject-derived |
| 51 // objects. |
| 52 detachAndDeleteObject(); |
| 42 } | 53 } |
| 43 | 54 |
| 44 WebGLRenderbuffer::WebGLRenderbuffer(WebGLRenderingContextBase* ctx) | 55 WebGLRenderbuffer::WebGLRenderbuffer(WebGLRenderingContextBase* ctx) |
| 45 : WebGLSharedObject(ctx) | 56 : WebGLSharedObject(ctx) |
| 46 , m_internalFormat(GL_RGBA4) | 57 , m_internalFormat(GL_RGBA4) |
| 47 , m_width(0) | 58 , m_width(0) |
| 48 , m_height(0) | 59 , m_height(0) |
| 49 , m_hasEverBeenBound(false) | 60 , m_hasEverBeenBound(false) |
| 50 { | 61 { |
| 51 ScriptWrappable::init(this); | 62 ScriptWrappable::init(this); |
| 52 setObject(ctx->webContext()->createRenderbuffer()); | 63 setObject(ctx->webContext()->createRenderbuffer()); |
| 53 } | 64 } |
| 54 | 65 |
| 55 void WebGLRenderbuffer::deleteObjectImpl(blink::WebGraphicsContext3D* context3d,
Platform3DObject object) | 66 void WebGLRenderbuffer::deleteObjectImpl(blink::WebGraphicsContext3D* context3d,
Platform3DObject object) |
| 56 { | 67 { |
| 57 context3d->deleteRenderbuffer(object); | 68 context3d->deleteRenderbuffer(object); |
| 58 deleteEmulatedStencilBuffer(context3d); | 69 deleteEmulatedStencilBuffer(context3d); |
| 59 } | 70 } |
| 60 | 71 |
| 61 void WebGLRenderbuffer::deleteEmulatedStencilBuffer(blink::WebGraphicsContext3D*
context3d) | 72 void WebGLRenderbuffer::deleteEmulatedStencilBuffer(blink::WebGraphicsContext3D*
context3d) |
| 62 { | 73 { |
| 63 if (!m_emulatedStencilBuffer) | 74 if (!m_emulatedStencilBuffer) |
| 64 return; | 75 return; |
| 65 m_emulatedStencilBuffer->deleteObject(context3d); | 76 m_emulatedStencilBuffer->deleteObject(context3d); |
| 66 m_emulatedStencilBuffer.clear(); | 77 m_emulatedStencilBuffer.clear(); |
| 67 } | 78 } |
| 68 | 79 |
| 80 void WebGLRenderbuffer::trace(Visitor* visitor) |
| 81 { |
| 82 visitor->trace(m_emulatedStencilBuffer); |
| 83 WebGLSharedObject::trace(visitor); |
| 69 } | 84 } |
| 85 |
| 86 } |
| OLD | NEW |