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/WebGLBuffer.h" | 28 #include "modules/webgl/WebGLBuffer.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<WebGLBuffer> WebGLBuffer::create(WebGLRenderingContextBas e* ctx) | 34 WebGLBuffer* WebGLBuffer::create(WebGLRenderingContextBase* ctx) |
| 35 { | 35 { |
| 36 return adoptRefWillBeNoop(new WebGLBuffer(ctx)); | 36 return new WebGLBuffer(ctx); |
| 37 } | 37 } |
| 38 | 38 |
| 39 WebGLBuffer::WebGLBuffer(WebGLRenderingContextBase* ctx) | 39 WebGLBuffer::WebGLBuffer(WebGLRenderingContextBase* ctx) |
| 40 : WebGLSharedPlatform3DObject(ctx) | 40 : WebGLSharedPlatform3DObject(ctx) |
| 41 , m_initialTarget(0) | 41 , m_initialTarget(0) |
| 42 { | 42 { |
| 43 setObject(ctx->webContext()->createBuffer()); | 43 setObject(ctx->webContext()->createBuffer()); |
| 44 } | 44 } |
| 45 | 45 |
| 46 WebGLBuffer::~WebGLBuffer() | 46 WebGLBuffer::~WebGLBuffer() |
| 47 { | 47 { |
| 48 // Delete the buffer's platform object. This object will have been | 48 // Delete the buffer's platform object. |
| 49 // detached from the WebGLContextGroup if the group object was | 49 // This object will have been detached from the WebGLContextGroup |
| 50 // finalized first. With Oilpan not enabled, it always will be, | 50 // if the group object was finalized first, but the WebGLBuffer |
| 51 // but with Oilpan enabled, the WebGLBuffer might end up being | 51 // might end up being finalized first. |
| 52 // finalized first. In which case detachment is needed to ensure | 52 // In which case detachment is needed to ensure that the platform |
| 53 // that the platform object is indeed deleted. | 53 // object is indeed deleted. |
|
haraken
2015/08/05 04:12:19
Slightly clearer:
There is no guarantee about the
peria
2015/08/06 05:46:59
Done.
| |
| 54 // | |
| 55 // To keep the code regular, the trivial detach()ment is always | |
| 56 // performed. | |
| 57 detachAndDeleteObject(); | 54 detachAndDeleteObject(); |
| 58 } | 55 } |
| 59 | 56 |
| 60 void WebGLBuffer::deleteObjectImpl(WebGraphicsContext3D* context3d) | 57 void WebGLBuffer::deleteObjectImpl(WebGraphicsContext3D* context3d) |
| 61 { | 58 { |
| 62 context3d->deleteBuffer(m_object); | 59 context3d->deleteBuffer(m_object); |
| 63 m_object = 0; | 60 m_object = 0; |
| 64 } | 61 } |
| 65 | 62 |
| 66 void WebGLBuffer::setInitialTarget(GLenum target) | 63 void WebGLBuffer::setInitialTarget(GLenum target) |
| 67 { | 64 { |
| 68 // WebGL restricts the ability to bind buffers to multiple targets based on | 65 // WebGL restricts the ability to bind buffers to multiple targets based on |
| 69 // it's initial bind point. | 66 // it's initial bind point. |
| 70 ASSERT(!m_initialTarget); | 67 ASSERT(!m_initialTarget); |
| 71 m_initialTarget = target; | 68 m_initialTarget = target; |
| 72 } | 69 } |
| 73 | 70 |
| 74 } // namespace blink | 71 } // namespace blink |
| OLD | NEW |