mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 849567 - Automatically handle raw and already_AddRefed return values in Paris bindings and remove resultNotAddRefed, remove instances of non-refcounted sequence return type. r=bz. 

--HG--
extra : rebase_source : 1388e0d6f971d52debb745a448a9a5524ceee25d
This commit is contained in:
Peter Van der Beken 2014-08-28 00:43:55 +02:00
Родитель 73d234512e
Коммит 14fafa0ab2
4 изменённых файлов: 11 добавлений и 25 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

24
dom/bindings/Bindings.conf
Просмотреть файл

@ -1543,16 +1543,14 @@ DOMInterfaces = {
'WebGLRenderingContext': {
'nativeType': 'mozilla::WebGLContext',
'headerFile': 'WebGLContext.h',
'resultNotAddRefed': [ 'canvas', 'getContextAttributes', 'getExtension',
'getAttachedShaders' ],
'resultNotAddRefed': [ 'canvas', 'getContextAttributes', 'getExtension' ],
'implicitJSContext': [ 'getSupportedExtensions' ],
},
'WebGL2RenderingContext': {
'nativeType': 'mozilla::WebGLContext',
'headerFile': 'WebGLContext.h',
'resultNotAddRefed': [ 'canvas', 'getContextAttributes', 'getExtension',
'getAttachedShaders' ],
'resultNotAddRefed': [ 'canvas', 'getContextAttributes', 'getExtension' ],
'implicitJSContext': [ 'getSupportedExtensions' ],
},
@ -1719,11 +1717,7 @@ DOMInterfaces = {
'receiveWeakOther', 'receiveWeakNullableOther',
'receiveWeakExternal', 'receiveWeakNullableExternal',
'ReceiveWeakCallbackInterface',
'ReceiveWeakNullableCallbackInterface',
'receiveWeakCastableObjectSequence',
'receiveWeakNullableCastableObjectSequence',
'receiveWeakCastableObjectNullableSequence',
'receiveWeakNullableCastableObjectNullableSequence' ],
'ReceiveWeakNullableCallbackInterface' ],
'binaryNames': { 'methodRenamedFrom': 'methodRenamedTo',
'attributeGetterRenamedFrom': 'attributeGetterRenamedTo',
'attributeRenamedFrom': 'attributeRenamedTo' }
@ -1757,11 +1751,7 @@ DOMInterfaces = {
'receiveWeakOther', 'receiveWeakNullableOther',
'receiveWeakExternal', 'receiveWeakNullableExternal',
'ReceiveWeakCallbackInterface',
'ReceiveWeakNullableCallbackInterface',
'receiveWeakCastableObjectSequence',
'receiveWeakNullableCastableObjectSequence',
'receiveWeakCastableObjectNullableSequence',
'receiveWeakNullableCastableObjectNullableSequence' ],
'ReceiveWeakNullableCallbackInterface' ],
'binaryNames': { 'methodRenamedFrom': 'methodRenamedTo',
'attributeGetterRenamedFrom': 'attributeGetterRenamedTo',
'attributeRenamedFrom': 'attributeRenamedTo' }
@ -1952,11 +1942,7 @@ DOMInterfaces = {
'receiveWeakOther', 'receiveWeakNullableOther',
'receiveWeakExternal', 'receiveWeakNullableExternal',
'ReceiveWeakCallbackInterface',
'ReceiveWeakNullableCallbackInterface',
'receiveWeakCastableObjectSequence',
'receiveWeakNullableCastableObjectSequence',
'receiveWeakCastableObjectNullableSequence',
'receiveWeakNullableCastableObjectNullableSequence' ],
'ReceiveWeakNullableCallbackInterface' ],
'binaryNames': { 'methodRenamedFrom': 'methodRenamedTo',
'attributeGetterRenamedFrom': 'attributeGetterRenamedTo',
'attributeRenamedFrom': 'attributeRenamedTo' }

8
dom/bindings/test/TestBindingHeader.h
Просмотреть файл

@ -379,10 +379,10 @@ public:
void ReceiveNullableCallbackObjectSequence(nsTArray< nsRefPtr<TestCallbackInterface> > &);
void ReceiveCastableObjectNullableSequence(Nullable< nsTArray< nsRefPtr<TestInterface> > >&);
void ReceiveNullableCastableObjectNullableSequence(Nullable< nsTArray< nsRefPtr<TestInterface> > >&);
void ReceiveWeakCastableObjectSequence(nsTArray<TestInterface*> &);
void ReceiveWeakNullableCastableObjectSequence(nsTArray<TestInterface*> &);
void ReceiveWeakCastableObjectNullableSequence(Nullable< nsTArray<TestInterface*> >&);
void ReceiveWeakNullableCastableObjectNullableSequence(Nullable< nsTArray<TestInterface*> >&);
void ReceiveWeakCastableObjectSequence(nsTArray<nsRefPtr<TestInterface>> &);
void ReceiveWeakNullableCastableObjectSequence(nsTArray<nsRefPtr<TestInterface>> &);
void ReceiveWeakCastableObjectNullableSequence(Nullable< nsTArray<nsRefPtr<TestInterface>> >&);
void ReceiveWeakNullableCastableObjectNullableSequence(Nullable< nsTArray<nsRefPtr<TestInterface>> >&);
void PassCastableObjectSequence(const Sequence< OwningNonNull<TestInterface> >&);
void PassNullableCastableObjectSequence(const Sequence< nsRefPtr<TestInterface> > &);
void PassCastableObjectNullableSequence(const Nullable< Sequence< OwningNonNull<TestInterface> > >&);

2
dom/canvas/WebGLContext.h
Просмотреть файл

@ -362,7 +362,7 @@ public:
already_AddRefed<WebGLActiveInfo> GetActiveUniform(WebGLProgram *prog,
GLuint index);
void GetAttachedShaders(WebGLProgram* prog,
dom::Nullable< nsTArray<WebGLShader*> > &retval);
dom::Nullable<nsTArray<nsRefPtr<WebGLShader>>>& retval);
GLint GetAttribLocation(WebGLProgram* prog, const nsAString& name);
JS::Value GetBufferParameter(GLenum target, GLenum pname);
void GetBufferParameter(JSContext* /* unused */, GLenum target,

2
dom/canvas/WebGLContextGL.cpp
Просмотреть файл

@ -966,7 +966,7 @@ WebGLContext::GetActiveUniform(WebGLProgram *prog, uint32_t index)
void
WebGLContext::GetAttachedShaders(WebGLProgram *prog,
Nullable< nsTArray<WebGLShader*> > &retval)
Nullable<nsTArray<nsRefPtr<WebGLShader>>>& retval)
{
retval.SetNull();
if (IsContextLost())