The Tor Browser: content/canvas/src/WebGLContextVertexArray.cpp@deefc01c0e14

Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)

     1 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

     2 /* This Source Code Form is subject to the terms of the Mozilla Public

     3  * License, v. 2.0. If a copy of the MPL was not distributed with this

     4  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

     6 #include "WebGLContext.h"

     7 #include "WebGLBuffer.h"

     8 #include "WebGLVertexAttribData.h"

     9 #include "WebGLVertexArray.h"

    10 #include "GLContext.h"

    12 using namespace mozilla;

    14 void

    15 WebGLContext::BindVertexArray(WebGLVertexArray *array)

    16 {

    17     if (IsContextLost())

    18         return;

    20     if (!ValidateObjectAllowDeletedOrNull("bindVertexArrayObject", array))

    21         return;

    23     if (array && array->IsDeleted()) {

    24         /* http://www.khronos.org/registry/gles/extensions/OES/OES_vertex_array_object.txt

    25          * BindVertexArrayOES fails and an INVALID_OPERATION error is

    26          * generated if array is not a name returned from a previous call to

    27          * GenVertexArraysOES, or if such a name has since been deleted with

    28          * DeleteVertexArraysOES

    29          */

    30         ErrorInvalidOperation("bindVertexArray: can't bind a deleted array!");

    31         return;

    32     }

    34     InvalidateBufferFetching();

    36     MakeContextCurrent();

    38     if (array) {

    39         gl->fBindVertexArray(array->GLName());

    40         array->SetHasEverBeenBound(true);

    41         mBoundVertexArray = array;

    42     }

    43     else {

    44         gl->fBindVertexArray(0);

    45         mBoundVertexArray = mDefaultVertexArray;

    46     }

    47 }

    49 already_AddRefed<WebGLVertexArray>

    50 WebGLContext::CreateVertexArray()

    51 {

    52     if (IsContextLost())

    53         return nullptr;

    55     nsRefPtr<WebGLVertexArray> globj = new WebGLVertexArray(this);

    57     MakeContextCurrent();

    58     gl->fGenVertexArrays(1, &globj->mGLName);

    60     mVertexArrays.insertBack(globj);

    62     return globj.forget();

    63 }

    65 void

    66 WebGLContext::DeleteVertexArray(WebGLVertexArray *array)

    67 {

    68     if (IsContextLost())

    69         return;

    71     if (array == nullptr)

    72         return;

    74     if (array->IsDeleted())

    75         return;

    77     if (mBoundVertexArray == array)

    78         BindVertexArray(static_cast<WebGLVertexArray*>(nullptr));

    80     array->RequestDelete();

    81 }

    83 bool

    84 WebGLContext::IsVertexArray(WebGLVertexArray *array)

    85 {

    86     if (IsContextLost())

    87         return false;

    89     if (!array)

    90         return false;

    92     return ValidateObjectAllowDeleted("isVertexArray", array) &&

    93            !array->IsDeleted() &&

    94            array->HasEverBeenBound();

    95 }

The Tor Browser / file revision

content/canvas/src/WebGLContextVertexArray.cpp@deefc01c0e14

content/canvas/src/WebGLContextVertexArray.cpp