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 "core/html/canvas/WebGLBuffer.h" | 28 #include "core/html/canvas/WebGLBuffer.h" |
| 29 | 29 |
| 30 #include "core/html/canvas/WebGLRenderingContextBase.h" | 30 #include "core/html/canvas/WebGLRenderingContextBase.h" |
| 31 | 31 |
| 32 namespace WebCore { | 32 namespace WebCore { |
| 33 | 33 |
| 34 PassRefPtr<WebGLBuffer> WebGLBuffer::create(WebGLRenderingContextBase* ctx) | 34 PassRefPtrWillBeRawPtr<WebGLBuffer> WebGLBuffer::create(WebGLRenderingContextBas e* ctx) |
| 35 { | 35 { |
| 36 return adoptRef(new WebGLBuffer(ctx)); | 36 return adoptRefWillBeNoop(new WebGLBuffer(ctx)); |
| 37 } | 37 } |
| 38 | 38 |
| 39 WebGLBuffer::WebGLBuffer(WebGLRenderingContextBase* ctx) | 39 WebGLBuffer::WebGLBuffer(WebGLRenderingContextBase* ctx) |
| 40 : WebGLSharedObject(ctx) | 40 : WebGLSharedObject(ctx) |
| 41 , m_target(0) | 41 , m_target(0) |
| 42 { | 42 { |
| 43 ScriptWrappable::init(this); | 43 ScriptWrappable::init(this); |
| 44 setObject(ctx->webContext()->createBuffer()); | 44 setObject(ctx->webContext()->createBuffer()); |
| 45 } | 45 } |
| 46 | 46 |
| 47 WebGLBuffer::~WebGLBuffer() | 47 WebGLBuffer::~WebGLBuffer() |
| 48 { | 48 { |
| 49 detach(); | |
|
Mads Ager (chromium)
2014/07/11 09:15:01
Since the call to detach is not needed in the non-
| |
| 49 deleteObject(0); | 50 deleteObject(0); |
| 50 } | 51 } |
| 51 | 52 |
| 52 void WebGLBuffer::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Platf orm3DObject object) | 53 void WebGLBuffer::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Platf orm3DObject object) |
| 53 { | 54 { |
| 54 context3d->deleteBuffer(object); | 55 context3d->deleteBuffer(object); |
| 55 } | 56 } |
| 56 | 57 |
| 57 void WebGLBuffer::setTarget(GLenum target) | 58 void WebGLBuffer::setTarget(GLenum target) |
| 58 { | 59 { |
| 59 // In WebGL, a buffer is bound to one target in its lifetime | 60 // In WebGL, a buffer is bound to one target in its lifetime |
| 60 if (m_target) | 61 if (m_target) |
| 61 return; | 62 return; |
| 62 if (target == GL_ARRAY_BUFFER || target == GL_ELEMENT_ARRAY_BUFFER) | 63 if (target == GL_ARRAY_BUFFER || target == GL_ELEMENT_ARRAY_BUFFER) |
| 63 m_target = target; | 64 m_target = target; |
| 64 } | 65 } |
| 65 | 66 |
| 66 } | 67 } |
| OLD | NEW |