Commit 568a44dc authored by Ryan VanderMeulen's avatar Ryan VanderMeulen
Browse files

Merge inbound to m-c

parents d61997cf 681e85d1

content/base/src/nsXMLHttpRequest.cpp

+50 −46
Original line number Diff line number Diff line
@@ -788,9 +788,11 @@ static void LogMessage(const char* aWarning, nsPIDOMWindow* aWindow) 
NS_IMETHODIMP

nsXMLHttpRequest::GetResponseXML(nsIDOMDocument **aResponseXML)

{

  nsresult rv = NS_OK;

  ErrorResult rv;

  nsIDocument* responseXML = GetResponseXML(rv);

  NS_ENSURE_SUCCESS(rv, rv);

  if (rv.Failed()) {

    return rv.ErrorCode();

  }



  if (!responseXML) {

    *aResponseXML = nsnull;
@@ -801,11 +803,11 @@ nsXMLHttpRequest::GetResponseXML(nsIDOMDocument **aResponseXML) 
}



nsIDocument*

nsXMLHttpRequest::GetResponseXML(nsresult& aRv)

nsXMLHttpRequest::GetResponseXML(ErrorResult& aRv)

{

  if (mResponseType != XML_HTTP_RESPONSE_TYPE_DEFAULT &&

      mResponseType != XML_HTTP_RESPONSE_TYPE_DOCUMENT) {

    aRv = NS_ERROR_DOM_INVALID_STATE_ERR;

    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);

    return nsnull;

  }

  if (mWarnAboutMultipartHtml) {
@@ -929,22 +931,22 @@ nsXMLHttpRequest::AppendToResponseText(const char * aSrcBuffer, 
NS_IMETHODIMP

nsXMLHttpRequest::GetResponseText(nsAString& aResponseText)

{

  nsresult rv = NS_OK;

  ErrorResult rv;

  nsString responseText;

  GetResponseText(responseText, rv);

  aResponseText = responseText;

  return rv;

  return rv.ErrorCode();

}



void

nsXMLHttpRequest::GetResponseText(nsString& aResponseText, nsresult& aRv)

nsXMLHttpRequest::GetResponseText(nsString& aResponseText, ErrorResult& aRv)

{

  aResponseText.Truncate();



  if (mResponseType != XML_HTTP_RESPONSE_TYPE_DEFAULT &&

      mResponseType != XML_HTTP_RESPONSE_TYPE_TEXT &&

      mResponseType != XML_HTTP_RESPONSE_TYPE_CHUNKED_TEXT) {

    aRv = NS_ERROR_DOM_INVALID_STATE_ERR;

    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);

    return;

  }
@@ -972,15 +974,17 @@ nsXMLHttpRequest::GetResponseText(nsString& aResponseText, nsresult& aRv) 
    mResponseText.Truncate();

    mResponseBodyDecodedPos = 0;



    nsresult rv;

    nsCOMPtr<nsICharsetConverterManager> ccm =

      do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &aRv);

    if (NS_FAILED(aRv)) {

      do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv);

    if (NS_FAILED(rv)) {

      aRv.Throw(rv);

      return;

    }



    aRv = ccm->GetUnicodeDecoderRaw(mResponseCharset.get(),

                                    getter_AddRefs(mDecoder));

    if (NS_FAILED(aRv)) {

    if (aRv.Failed()) {

      return;

    }

  }
@@ -989,7 +993,7 @@ nsXMLHttpRequest::GetResponseText(nsString& aResponseText, nsresult& aRv) 
               "Unexpected mResponseBodyDecodedPos");

  aRv = AppendToResponseText(mResponseBody.get() + mResponseBodyDecodedPos,

                             mResponseBody.Length() - mResponseBodyDecodedPos);

  if (NS_FAILED(aRv)) {

  if (aRv.Failed()) {

    return;

  }
@@ -1134,27 +1138,27 @@ NS_IMETHODIMP nsXMLHttpRequest::SetResponseType(const nsAString& aResponseType) 
    return NS_OK;

  }



  nsresult rv = NS_OK;

  ErrorResult rv;

  SetResponseType(responseType, rv);

  return rv;

  return rv.ErrorCode();

}



void

nsXMLHttpRequest::SetResponseType(XMLHttpRequestResponseType aType,

                                  nsresult& aRv)

                                  ErrorResult& aRv)

{

  SetResponseType(ResponseType(aType), aRv);

}



void

nsXMLHttpRequest::SetResponseType(nsXMLHttpRequest::ResponseType aResponseType,

                                  nsresult& aRv)

                                  ErrorResult& aRv)

{

  // If the state is not OPENED or HEADERS_RECEIVED raise an

  // INVALID_STATE_ERR exception and terminate these steps.

  if (!(mState & (XML_HTTP_REQUEST_OPENED | XML_HTTP_REQUEST_SENT |

                  XML_HTTP_REQUEST_HEADERS_RECEIVED))) {

    aRv = NS_ERROR_DOM_INVALID_STATE_ERR;

    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);

    return;

  }
@@ -1162,14 +1166,14 @@ nsXMLHttpRequest::SetResponseType(nsXMLHttpRequest::ResponseType aResponseType, 
  if (HasOrHasHadOwner() &&

      !(mState & (XML_HTTP_REQUEST_UNSENT | XML_HTTP_REQUEST_ASYNC))) {

    LogMessage("ResponseTypeSyncXHRWarning", GetOwner());

    aRv = NS_ERROR_DOM_INVALID_ACCESS_ERR;

    aRv.Throw(NS_ERROR_DOM_INVALID_ACCESS_ERR);

    return;

  }



  if (!(mState & XML_HTTP_REQUEST_ASYNC) &&

      (aResponseType == XML_HTTP_RESPONSE_TYPE_CHUNKED_TEXT ||

       aResponseType == XML_HTTP_RESPONSE_TYPE_CHUNKED_ARRAYBUFFER)) {

    aRv = NS_ERROR_DOM_INVALID_STATE_ERR;

    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);

    return;

  }
@@ -1188,20 +1192,19 @@ nsXMLHttpRequest::SetResponseType(nsXMLHttpRequest::ResponseType aResponseType, 
                         mResponseType == XML_HTTP_RESPONSE_TYPE_MOZ_BLOB);

    }

  }

  aRv = NS_OK;

}



/* readonly attribute jsval response; */

NS_IMETHODIMP

nsXMLHttpRequest::GetResponse(JSContext *aCx, jsval *aResult)

{

  nsresult rv = NS_OK;

  ErrorResult rv;

  *aResult = GetResponse(aCx, rv);

  return rv;

  return rv.ErrorCode();

}



JS::Value

nsXMLHttpRequest::GetResponse(JSContext* aCx, nsresult& aRv)

nsXMLHttpRequest::GetResponse(JSContext* aCx, ErrorResult& aRv)

{

  switch (mResponseType) {

  case XML_HTTP_RESPONSE_TYPE_DEFAULT:
@@ -1210,12 +1213,12 @@ nsXMLHttpRequest::GetResponse(JSContext* aCx, nsresult& aRv) 
  {

    nsString str;

    aRv = GetResponseText(str);

    if (NS_FAILED(aRv)) {

    if (aRv.Failed()) {

      return JSVAL_NULL;

    }

    JS::Value result;

    if (!xpc::StringToJsval(aCx, str, &result)) {

      aRv = NS_ERROR_OUT_OF_MEMORY;

      aRv.Throw(NS_ERROR_OUT_OF_MEMORY);

      return JSVAL_NULL;

    }

    return result;
@@ -1235,7 +1238,7 @@ nsXMLHttpRequest::GetResponse(JSContext* aCx, nsresult& aRv) 
      RootResultArrayBuffer();

      aRv = nsContentUtils::CreateArrayBuffer(aCx, mResponseBody,

                                              &mResultArrayBuffer);

      if (NS_FAILED(aRv)) {

      if (aRv.Failed()) {

        return JSVAL_NULL;

      }

    }
@@ -1251,7 +1254,7 @@ nsXMLHttpRequest::GetResponse(JSContext* aCx, nsresult& aRv) 


      if (!mResponseBlob) {

        aRv = CreatePartialBlob();

        if (NS_FAILED(aRv)) {

        if (aRv.Failed()) {

          return JSVAL_NULL;

        }

      }
@@ -1288,7 +1291,7 @@ nsXMLHttpRequest::GetResponse(JSContext* aCx, nsresult& aRv) 
    if (mResultJSON == JSVAL_VOID) {

      aRv = CreateResponseParsedJSON(aCx);

      mResponseText.Truncate();

      if (NS_FAILED(aRv)) {

      if (aRv.Failed()) {

        // Per spec, errors aren't propagated. null is returned instead.

        aRv = NS_OK;

        // It would be nice to log the error to the console. That's hard to
@@ -1499,14 +1502,14 @@ NS_IMETHODIMP 
nsXMLHttpRequest::GetResponseHeader(const nsACString& aHeader,

                                    nsACString& aResult)

{

  nsresult rv = NS_OK;

  ErrorResult rv;

  GetResponseHeader(aHeader, aResult, rv);

  return rv;

  return rv.ErrorCode();

}



void

nsXMLHttpRequest::GetResponseHeader(const nsACString& header,

                                    nsACString& _retval, nsresult& aRv)

                                    nsACString& _retval, ErrorResult& aRv)

{

  _retval.SetIsVoid(true);
@@ -1610,7 +1613,7 @@ nsXMLHttpRequest::GetResponseHeader(const nsACString& header, 
  }



  aRv = httpChannel->GetResponseHeader(header, _retval);

  if (aRv == NS_ERROR_NOT_AVAILABLE) {

  if (aRv.ErrorCode() == NS_ERROR_NOT_AVAILABLE) {

    // Means no header

    _retval.SetIsVoid(true);

    aRv = NS_OK;
@@ -2518,17 +2521,18 @@ nsXMLHttpRequest::ChangeStateToDone() 
NS_IMETHODIMP

nsXMLHttpRequest::SendAsBinary(const nsAString &aBody, JSContext *aCx)

{

  nsresult rv = NS_OK;

  ErrorResult rv;

  SendAsBinary(aCx, aBody, rv);

  return rv;

  return rv.ErrorCode();

}



void

nsXMLHttpRequest::SendAsBinary(JSContext *aCx, const nsAString &aBody, nsresult& aRv)

nsXMLHttpRequest::SendAsBinary(JSContext *aCx, const nsAString &aBody,

                               ErrorResult& aRv)

{

  char *data = static_cast<char*>(NS_Alloc(aBody.Length() + 1));

  if (!data) {

    aRv = NS_ERROR_OUT_OF_MEMORY;

    aRv.Throw(NS_ERROR_OUT_OF_MEMORY);

    return;

  }
@@ -2539,7 +2543,7 @@ nsXMLHttpRequest::SendAsBinary(JSContext *aCx, const nsAString &aBody, nsresult& 
  while (iter != end) {

    if (*iter & 0xFF00) {

      NS_Free(data);

      aRv = NS_ERROR_DOM_INVALID_CHARACTER_ERR;

      aRv.Throw(NS_ERROR_DOM_INVALID_CHARACTER_ERR);

      return;

    }

    *p++ = static_cast<char>(*iter++);
@@ -2549,7 +2553,7 @@ nsXMLHttpRequest::SendAsBinary(JSContext *aCx, const nsAString &aBody, nsresult& 
  nsCOMPtr<nsIInputStream> stream;

  aRv = NS_NewByteInputStream(getter_AddRefs(stream), data, aBody.Length(),

                              NS_ASSIGNMENT_ADOPT);

  if (NS_FAILED(aRv)){

  if (aRv.Failed()) {

    NS_Free(data);

    return;

  }
@@ -2557,7 +2561,7 @@ nsXMLHttpRequest::SendAsBinary(JSContext *aCx, const nsAString &aBody, nsresult& 
  nsCOMPtr<nsIWritableVariant> variant = new nsVariant();



  aRv = variant->SetAsISupports(stream);

  if (NS_FAILED(aRv)) {

  if (aRv.Failed()) {

    return;

  }
@@ -3298,20 +3302,20 @@ nsXMLHttpRequest::GetTimeout(PRUint32 *aTimeout) 
NS_IMETHODIMP

nsXMLHttpRequest::SetTimeout(PRUint32 aTimeout)

{

  nsresult rv = NS_OK;

  ErrorResult rv;

  SetTimeout(aTimeout, rv);

  return rv;

  return rv.ErrorCode();

}



void

nsXMLHttpRequest::SetTimeout(uint32_t aTimeout, nsresult& aRv)

nsXMLHttpRequest::SetTimeout(uint32_t aTimeout, ErrorResult& aRv)

{

  if (!(mState & (XML_HTTP_REQUEST_ASYNC | XML_HTTP_REQUEST_UNSENT)) &&

      HasOrHasHadOwner()) {

    /* Timeout is not supported for synchronous requests with an owning window,

       per XHR2 spec. */

    LogMessage("TimeoutSyncXHRWarning", GetOwner());

    aRv = NS_ERROR_DOM_INVALID_ACCESS_ERR;

    aRv.Throw(NS_ERROR_DOM_INVALID_ACCESS_ERR);

    return;

  }
@@ -3871,17 +3875,17 @@ nsXMLHttpRequest::GetInterface(const nsIID & aIID, void **aResult) 
}



JS::Value

nsXMLHttpRequest::GetInterface(JSContext* aCx, nsIJSIID* aIID, nsresult& aRv)

nsXMLHttpRequest::GetInterface(JSContext* aCx, nsIJSIID* aIID, ErrorResult& aRv)

{

  const nsID* iid = aIID->GetID();

  nsCOMPtr<nsISupports> result;

  JS::Value v = JSVAL_NULL;

  aRv = GetInterface(*iid, getter_AddRefs(result));

  NS_ENSURE_SUCCESS(aRv, JSVAL_NULL);

  NS_ENSURE_FALSE(aRv.Failed(), JSVAL_NULL);



  JSObject* global = JS_GetGlobalForObject(aCx, GetWrapper());

  aRv = nsContentUtils::WrapNative(aCx, global, result, iid, &v);

  return NS_SUCCEEDED(aRv) ? v : JSVAL_NULL;

  return aRv.Failed() ? JSVAL_NULL : v;

}



nsXMLHttpRequestUpload*

content/base/src/nsXMLHttpRequest.h

+22 −22
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ class nsIDOMFormData; 
  {                                                                     \

    return GetListenerAsJSObject(mOn##_capitalized##Listener);          \

  }                                                                     \

  void SetOn##_lowercase(JSContext* aCx, JSObject* aCallback, nsresult& aRv) \

  void SetOn##_lowercase(JSContext* aCx, JSObject* aCallback, ErrorResult& aRv) \

  {                                                                     \

    aRv = SetJSObjectListener(aCx, NS_LITERAL_STRING(#_lowercase),      \

                              mOn##_capitalized##Listener,              \
@@ -211,12 +211,12 @@ public: 


  // The WebIDL parser converts constructors into methods called _Constructor.

  static already_AddRefed<nsXMLHttpRequest>

  _Constructor(nsISupports* aGlobal, nsresult& aRv)

  _Constructor(nsISupports* aGlobal, ErrorResult& aRv)

  {

    nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aGlobal);

    nsCOMPtr<nsIScriptObjectPrincipal> principal = do_QueryInterface(aGlobal);

    if (!window || ! principal) {

      aRv = NS_ERROR_FAILURE;

      aRv.Throw(NS_ERROR_FAILURE);

      return NULL;

    }
@@ -283,13 +283,13 @@ public: 


  // request

  void Open(const nsAString& aMethod, const nsAString& aUrl, bool aAsync,

            const nsAString& aUser, const nsAString& aPassword, nsresult& aRv)

            const nsAString& aUser, const nsAString& aPassword, ErrorResult& aRv)

  {

    aRv = Open(NS_ConvertUTF16toUTF8(aMethod), NS_ConvertUTF16toUTF8(aUrl),

               aAsync, aUser, aPassword);

  }

  void SetRequestHeader(const nsAString& aHeader, const nsAString& aValue,

                        nsresult& aRv)

                        ErrorResult& aRv)

  {

    aRv = SetRequestHeader(NS_ConvertUTF16toUTF8(aHeader),

                           NS_ConvertUTF16toUTF8(aValue));
@@ -298,7 +298,7 @@ public: 
  {

    return mTimeoutMilliseconds;

  }

  void SetTimeout(uint32_t aTimeout, nsresult& aRv);

  void SetTimeout(uint32_t aTimeout, ErrorResult& aRv);

  bool GetWithCredentials();

  void SetWithCredentials(bool aWithCredentials, nsresult& aRv);

  nsXMLHttpRequestUpload* GetUpload();
@@ -387,26 +387,26 @@ private: 
  }



public:

  void Send(JSContext *aCx, nsresult& aRv)

  void Send(JSContext *aCx, ErrorResult& aRv)

  {

    aRv = Send(aCx, Nullable<RequestBody>());

  }

  void Send(JSContext *aCx, JSObject* aArrayBuffer, nsresult& aRv)

  void Send(JSContext *aCx, JSObject* aArrayBuffer, ErrorResult& aRv)

  {

    NS_ASSERTION(aArrayBuffer, "Null should go to string version");

    aRv = Send(aCx, RequestBody(aArrayBuffer));

  }

  void Send(JSContext *aCx, nsIDOMBlob* aBlob, nsresult& aRv)

  void Send(JSContext *aCx, nsIDOMBlob* aBlob, ErrorResult& aRv)

  {

    NS_ASSERTION(aBlob, "Null should go to string version");

    aRv = Send(aCx, RequestBody(aBlob));

  }

  void Send(JSContext *aCx, nsIDocument* aDoc, nsresult& aRv)

  void Send(JSContext *aCx, nsIDocument* aDoc, ErrorResult& aRv)

  {

    NS_ASSERTION(aDoc, "Null should go to string version");

    aRv = Send(aCx, RequestBody(aDoc));

  }

  void Send(JSContext *aCx, const nsAString& aString, nsresult& aRv)

  void Send(JSContext *aCx, const nsAString& aString, ErrorResult& aRv)

  {

    if (DOMStringIsNull(aString)) {

      Send(aCx, aRv);
@@ -415,17 +415,17 @@ public: 
      aRv = Send(aCx, RequestBody(aString));

    }

  }

  void Send(JSContext *aCx, nsIDOMFormData* aFormData, nsresult& aRv)

  void Send(JSContext *aCx, nsIDOMFormData* aFormData, ErrorResult& aRv)

  {

    NS_ASSERTION(aFormData, "Null should go to string version");

    aRv = Send(aCx, RequestBody(aFormData));

  }

  void Send(JSContext *aCx, nsIInputStream* aStream, nsresult& aRv)

  void Send(JSContext *aCx, nsIInputStream* aStream, ErrorResult& aRv)

  {

    NS_ASSERTION(aStream, "Null should go to string version");

    aRv = Send(aCx, RequestBody(aStream));

  }

  void SendAsBinary(JSContext *aCx, const nsAString& aBody, nsresult& aRv);

  void SendAsBinary(JSContext *aCx, const nsAString& aBody, ErrorResult& aRv);



  void Abort();
@@ -433,9 +433,9 @@ public: 
  uint32_t GetStatus();

  void GetStatusText(nsString& aStatusText);

  void GetResponseHeader(const nsACString& aHeader, nsACString& aResult,

                         nsresult& aRv);

                         ErrorResult& aRv);

  void GetResponseHeader(const nsAString& aHeader, nsString& aResult,

                         nsresult& aRv)

                         ErrorResult& aRv)

  {

    nsCString result;

    GetResponseHeader(NS_ConvertUTF16toUTF8(aHeader), result, aRv);
@@ -460,10 +460,10 @@ public: 
  {

    return XMLHttpRequestResponseType(mResponseType);

  }

  void SetResponseType(XMLHttpRequestResponseType aType, nsresult& aRv);

  JS::Value GetResponse(JSContext* aCx, nsresult& aRv);

  void GetResponseText(nsString& aResponseText, nsresult& aRv);

  nsIDocument* GetResponseXML(nsresult& aRv);

  void SetResponseType(XMLHttpRequestResponseType aType, ErrorResult& aRv);

  JS::Value GetResponse(JSContext* aCx, ErrorResult& aRv);

  void GetResponseText(nsString& aResponseText, ErrorResult& aRv);

  nsIDocument* GetResponseXML(ErrorResult& aRv);



  bool GetMozBackgroundRequest();

  void SetMozBackgroundRequest(bool aMozBackgroundRequest, nsresult& aRv);
@@ -476,7 +476,7 @@ public: 
  }



  // We need a GetInterface callable from JS for chrome JS

  JS::Value GetInterface(JSContext* aCx, nsIJSIID* aIID, nsresult& aRv);

  JS::Value GetInterface(JSContext* aCx, nsIJSIID* aIID, ErrorResult& aRv);



  // This creates a trusted readystatechange event, which is not cancelable and

  // doesn't bubble.
@@ -633,7 +633,7 @@ protected: 
    XML_HTTP_RESPONSE_TYPE_MOZ_BLOB

  };



  void SetResponseType(nsXMLHttpRequest::ResponseType aType, nsresult& aRv);

  void SetResponseType(nsXMLHttpRequest::ResponseType aType, ErrorResult& aRv);



  ResponseType mResponseType;

content/canvas/src/WebGLContext.cpp

+7 −6
Original line number Diff line number Diff line
@@ -785,16 +785,17 @@ WebGLContext::GetCanvasLayer(nsDisplayListBuilder* aBuilder, 
NS_IMETHODIMP

WebGLContext::GetContextAttributes(jsval *aResult)

{

    nsresult rv = NS_OK;

    ErrorResult rv;

    JSObject* obj = GetContextAttributes(rv);

    NS_ENSURE_SUCCESS(rv, rv);

    if (rv.Failed())

        return rv.ErrorCode();



    *aResult = JS::ObjectOrNullValue(obj);

    return NS_OK;

}



JSObject*

WebGLContext::GetContextAttributes(nsresult &rv)

WebGLContext::GetContextAttributes(ErrorResult &rv)

{

    if (!IsContextStable())

    {
@@ -803,13 +804,13 @@ WebGLContext::GetContextAttributes(nsresult &rv) 


    JSContext *cx = nsContentUtils::GetCurrentJSContext();

    if (!cx) {

        rv = NS_ERROR_FAILURE;

        rv.Throw(NS_ERROR_FAILURE);

        return NULL;

    }



    JSObject *obj = JS_NewObject(cx, NULL, NULL, NULL);

    if (!obj) {

        rv = NS_ERROR_FAILURE;

        rv.Throw(NS_ERROR_FAILURE);

        return NULL;

    }
@@ -830,7 +831,7 @@ WebGLContext::GetContextAttributes(nsresult &rv) 
                           mOptions.preserveDrawingBuffer ? JSVAL_TRUE : JSVAL_FALSE,

                           NULL, NULL, JSPROP_ENUMERATE))

    {

        rv = NS_ERROR_FAILURE;

        rv.Throw(NS_ERROR_FAILURE);

        return NULL;

    }

content/canvas/src/WebGLContext.h

+17 −15
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 


#include "mozilla/dom/TypedArray.h"

#include "mozilla/dom/Nullable.h"

#include "mozilla/ErrorResult.h"



/* 

 * Minimum value constants defined in 6.2 State Tables of OpenGL ES - 2.0.25
@@ -694,7 +695,7 @@ public: 
        return mHeight;

    }

        

    JSObject *GetContextAttributes(nsresult &rv);

    JSObject *GetContextAttributes(ErrorResult &rv);

    bool IsContextLost() const { return !IsContextStable(); }

    void GetSupportedExtensions(dom::Nullable< nsTArray<nsString> > &retval);

    nsIWebGLExtension* GetExtension(const nsAString& aName);
@@ -797,28 +798,28 @@ public: 
                            dom::Nullable< nsTArray<WebGLShader*> > &retval);

    WebGLint GetAttribLocation(WebGLProgram* prog, const nsAString& name);

    JS::Value GetBufferParameter(WebGLenum target, WebGLenum pname);

    JS::Value GetParameter(JSContext* cx, WebGLenum pname, nsresult& rv);

    JS::Value GetParameter(JSContext* cx, WebGLenum pname, ErrorResult& rv);

    WebGLenum GetError();

    JS::Value GetFramebufferAttachmentParameter(JSContext* cx,

                                                WebGLenum target,

                                                WebGLenum attachment,

                                                WebGLenum pname,

                                                nsresult& rv);

                                                ErrorResult& rv);

    JS::Value GetProgramParameter(WebGLProgram *prog, WebGLenum pname);

    void GetProgramInfoLog(WebGLProgram *prog, nsAString& retval, nsresult& rv);

    void GetProgramInfoLog(WebGLProgram *prog, nsAString& retval, ErrorResult& rv);

    JS::Value GetRenderbufferParameter(WebGLenum target, WebGLenum pname);

    JS::Value GetShaderParameter(WebGLShader *shader, WebGLenum pname);

    already_AddRefed<WebGLShaderPrecisionFormat>

      GetShaderPrecisionFormat(WebGLenum shadertype, WebGLenum precisiontype);

    void GetShaderInfoLog(WebGLShader *shader, nsAString& retval, nsresult& rv);

    void GetShaderInfoLog(WebGLShader *shader, nsAString& retval, ErrorResult& rv);

    void GetShaderSource(WebGLShader *shader, nsAString& retval);

    JS::Value GetTexParameter(WebGLenum target, WebGLenum pname);

    JS::Value GetUniform(JSContext* cx, WebGLProgram *prog,

                         WebGLUniformLocation *location, nsresult& rv);

                         WebGLUniformLocation *location, ErrorResult& rv);

    already_AddRefed<WebGLUniformLocation>

      GetUniformLocation(WebGLProgram *prog, const nsAString& name);

    JS::Value GetVertexAttrib(JSContext* cx, WebGLuint index, WebGLenum pname,

                              nsresult& rv);

                              ErrorResult& rv);

    WebGLsizeiptr GetVertexAttribOffset(WebGLuint index, WebGLenum pname);

    void Hint(WebGLenum target, WebGLenum mode);

    bool IsBuffer(WebGLBuffer *buffer);
@@ -834,7 +835,7 @@ public: 
        MakeContextCurrent();

        gl->fLineWidth(width);

    }

    void LinkProgram(WebGLProgram *program, nsresult& rv);

    void LinkProgram(WebGLProgram *program, ErrorResult& rv);

    void PixelStorei(WebGLenum pname, WebGLint param);

    void PolygonOffset(WebGLfloat factor, WebGLfloat units) {

        if (!IsContextStable())
@@ -844,7 +845,7 @@ public: 
    }

    void ReadPixels(WebGLint x, WebGLint y, WebGLsizei width, WebGLsizei height,

                    WebGLenum format, WebGLenum type,

                    dom::ArrayBufferView* pixels, nsresult& rv);

                    dom::ArrayBufferView* pixels, ErrorResult& rv);

    void RenderbufferStorage(WebGLenum target, WebGLenum internalformat,

                             WebGLsizei width, WebGLsizei height);

    void SampleCoverage(WebGLclampf value, WebGLboolean invert) {
@@ -866,13 +867,14 @@ public: 
    void TexImage2D(JSContext* cx, WebGLenum target, WebGLint level,

                    WebGLenum internalformat, WebGLsizei width,

                    WebGLsizei height, WebGLint border, WebGLenum format,

                    WebGLenum type, dom::ArrayBufferView *pixels, nsresult& rv);

                    WebGLenum type, dom::ArrayBufferView *pixels,

                    ErrorResult& rv);

    void TexImage2D(JSContext* cx, WebGLenum target, WebGLint level,

                    WebGLenum internalformat, WebGLenum format, WebGLenum type,

                    dom::ImageData* pixels, nsresult& rv);

                    dom::ImageData* pixels, ErrorResult& rv);

    void TexImage2D(JSContext* /* unused */, WebGLenum target, WebGLint level,

                    WebGLenum internalformat, WebGLenum format, WebGLenum type,

                    dom::Element* elt, nsresult& rv);

                    dom::Element* elt, ErrorResult& rv);

    void TexParameterf(WebGLenum target, WebGLenum pname, WebGLfloat param) {

        TexParameter_base(target, pname, nsnull, &param);

    }
@@ -884,13 +886,13 @@ public: 
                       WebGLint xoffset, WebGLint yoffset,

                       WebGLsizei width, WebGLsizei height, WebGLenum format,

                       WebGLenum type, dom::ArrayBufferView* pixels,

                       nsresult& rv);

                       ErrorResult& rv);

    void TexSubImage2D(JSContext* cx, WebGLenum target, WebGLint level,

                       WebGLint xoffset, WebGLint yoffset, WebGLenum format,

                       WebGLenum type, dom::ImageData* pixels, nsresult& rv);

                       WebGLenum type, dom::ImageData* pixels, ErrorResult& rv);

    void TexSubImage2D(JSContext* /* unused */, WebGLenum target, WebGLint level,

                       WebGLint xoffset, WebGLint yoffset, WebGLenum format,

                       WebGLenum type, dom::Element* elt, nsresult& rv);

                       WebGLenum type, dom::Element* elt, ErrorResult& rv);



    void Uniform1i(WebGLUniformLocation* location, WebGLint x);

    void Uniform2i(WebGLUniformLocation* location, WebGLint x, WebGLint y);

content/canvas/src/WebGLContextGL.cpp

+60 −59

File changed.

Preview size limit exceeded, changes collapsed.