Chromium Code Reviews| 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 "modules/webgl/WebGLRenderbuffer.h" | 28 #include "modules/webgl/WebGLRenderbuffer.h" |
| 29 | 29 |
| 30 #include "modules/webgl/WebGLRenderingContextBase.h" | 30 #include "modules/webgl/WebGLRenderingContextBase.h" |
| 31 | 31 |
| 32 namespace blink { | 32 namespace blink { |
| 33 | 33 |
| 34 PassRefPtrWillBeRawPtr<WebGLRenderbuffer> WebGLRenderbuffer::create(WebGLRenderi ngContextBase* ctx) | 34 WebGLRenderbuffer* WebGLRenderbuffer::create(WebGLRenderingContextBase* ctx) |
| 35 { | 35 { |
| 36 return adoptRefWillBeNoop(new WebGLRenderbuffer(ctx)); | 36 return new WebGLRenderbuffer(ctx); |
| 37 } | 37 } |
| 38 | 38 |
| 39 WebGLRenderbuffer::~WebGLRenderbuffer() | 39 WebGLRenderbuffer::~WebGLRenderbuffer() |
| 40 { | 40 { |
| 41 #if ENABLE(OILPAN) | |
| 42 // This render buffer (heap) object must finalize itself. | 41 // This render buffer (heap) object must finalize itself. |
| 43 m_emulatedStencilBuffer.clear(); | 42 m_emulatedStencilBuffer.clear(); |
| 44 #endif | 43 |
| 45 // Always call detach here to ensure that platform object deletion | 44 // Call detach here to ensure that platform object deletion happens. |
| 46 // happens with Oilpan enabled. It keeps the code regular to do it | |
| 47 // with or without Oilpan enabled. | |
| 48 // | 45 // |
| 49 // See comment in WebGLBuffer's destructor for additional | 46 // See comment in WebGLBuffer's destructor for additional |
| 50 // information on why this is done for WebGLSharedObject-derived | 47 // information on why this is done for WebGLSharedObject-derived |
| 51 // objects. | 48 // objects. |
|
haraken
2015/08/05 04:12:19
Let's update the comment to "see the comment in We
peria
2015/08/06 05:47:00
Done.
| |
| 52 detachAndDeleteObject(); | 49 detachAndDeleteObject(); |
| 53 } | 50 } |
| 54 | 51 |
| 55 WebGLRenderbuffer::WebGLRenderbuffer(WebGLRenderingContextBase* ctx) | 52 WebGLRenderbuffer::WebGLRenderbuffer(WebGLRenderingContextBase* ctx) |
| 56 : WebGLSharedPlatform3DObject(ctx) | 53 : WebGLSharedPlatform3DObject(ctx) |
| 57 , m_internalFormat(GL_RGBA4) | 54 , m_internalFormat(GL_RGBA4) |
| 58 , m_width(0) | 55 , m_width(0) |
| 59 , m_height(0) | 56 , m_height(0) |
| 60 , m_hasEverBeenBound(false) | 57 , m_hasEverBeenBound(false) |
| 61 { | 58 { |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 77 m_emulatedStencilBuffer.clear(); | 74 m_emulatedStencilBuffer.clear(); |
| 78 } | 75 } |
| 79 | 76 |
| 80 DEFINE_TRACE(WebGLRenderbuffer) | 77 DEFINE_TRACE(WebGLRenderbuffer) |
| 81 { | 78 { |
| 82 visitor->trace(m_emulatedStencilBuffer); | 79 visitor->trace(m_emulatedStencilBuffer); |
| 83 WebGLSharedPlatform3DObject::trace(visitor); | 80 WebGLSharedPlatform3DObject::trace(visitor); |
| 84 } | 81 } |
| 85 | 82 |
| 86 } // namespace blink | 83 } // namespace blink |
| OLD | NEW |