| Index: Source/core/html/canvas/OESVertexArrayObject.cpp
|
| diff --git a/Source/core/html/canvas/OESVertexArrayObject.cpp b/Source/core/html/canvas/OESVertexArrayObject.cpp
|
| index 4123a5f92b497e6e2170e43deb54775ac4140b87..7065c3bb3f0e5ecfe3d2eceef3ddccb11b4a360b 100644
|
| --- a/Source/core/html/canvas/OESVertexArrayObject.cpp
|
| +++ b/Source/core/html/canvas/OESVertexArrayObject.cpp
|
| @@ -20,7 +20,7 @@
|
| * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
| * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| #include "config.h"
|
| @@ -58,7 +58,7 @@ PassRefPtr<WebGLVertexArrayObjectOES> OESVertexArrayObject::createVertexArrayOES
|
| {
|
| if (isLost())
|
| return 0;
|
| -
|
| +
|
| RefPtr<WebGLVertexArrayObjectOES> o = WebGLVertexArrayObjectOES::create(m_context, WebGLVertexArrayObjectOES::VaoTypeUser);
|
| m_context->addContextObject(o.get());
|
| return o.release();
|
| @@ -68,7 +68,7 @@ void OESVertexArrayObject::deleteVertexArrayOES(WebGLVertexArrayObjectOES* array
|
| {
|
| if (!arrayObject || isLost())
|
| return;
|
| -
|
| +
|
| if (!arrayObject->isDefaultObject() && arrayObject == m_context->m_boundVertexArrayObject)
|
| m_context->setBoundVertexArrayObject(0);
|
|
|
| @@ -79,10 +79,10 @@ GC3Dboolean OESVertexArrayObject::isVertexArrayOES(WebGLVertexArrayObjectOES* ar
|
| {
|
| if (!arrayObject || isLost())
|
| return 0;
|
| -
|
| +
|
| if (!arrayObject->hasEverBeenBound())
|
| return 0;
|
| -
|
| +
|
| Extensions3D* extensions = m_context->graphicsContext3D()->getExtensions();
|
| return extensions->isVertexArrayOES(arrayObject->object());
|
| }
|
| @@ -92,16 +92,16 @@ void OESVertexArrayObject::bindVertexArrayOES(WebGLVertexArrayObjectOES* arrayOb
|
| UNUSED_PARAM(ec);
|
| if (isLost())
|
| return;
|
| -
|
| +
|
| if (arrayObject && (arrayObject->isDeleted() || !arrayObject->validate(0, context()))) {
|
| m_context->graphicsContext3D()->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION);
|
| return;
|
| }
|
| -
|
| +
|
| Extensions3D* extensions = m_context->graphicsContext3D()->getExtensions();
|
| if (arrayObject && !arrayObject->isDefaultObject() && arrayObject->object()) {
|
| extensions->bindVertexArrayOES(arrayObject->object());
|
| -
|
| +
|
| arrayObject->setHasEverBeenBound();
|
| m_context->setBoundVertexArrayObject(arrayObject);
|
| } else {
|
|
|