Merge.
authorRobert Sayre <sayrer@gmail.com>
Sun, 06 Jun 2010 14:56:31 -0400
changeset 43296 5b3604a3cfbeb48c7c6ae5e1cb17ae9c6e7fa01d
parent 43295 b8fb5dfc389a476a22845babc58da3e9547cc57f (current diff)
parent 43181 38ee63fd5e3441e08e3b896f69362b669b1be089 (diff)
child 43297 b80d5c5faccfdccd6d368bb3883ca6f3ab461cb4
child 46893 a9d29c4a712b2ec4827f77b3e6a8867cf6b97db6
push id13641
push userrsayre@mozilla.com
push dateSun, 06 Jun 2010 19:08:23 +0000
treeherderautoland@5b3604a3cfbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.3a5pre
first release with
nightly linux32
5b3604a3cfbe / 3.7a5pre / 20100607030013 / files
nightly linux64
5b3604a3cfbe / 3.7a5pre / 20100607030714 / files
nightly mac
5b3604a3cfbe / 3.7a5pre / 20100607030806 / files
nightly win32
5b3604a3cfbe / 3.7a5pre / 20100607035940 / files
nightly win64
5b3604a3cfbe / 3.7a5pre / 20100606172408 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge.
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -806,16 +806,19 @@ customMethodCalls = {
         'canFail': False
         },
     'nsIDOMNSDocument_': {
         'thisType': 'nsDocument'
         },
     'nsIDOM3Document_': {
         'thisType': 'nsDocument'
         },
+    'nsIDOMElement_': {
+        'thisType': 'nsGenericElement'
+        },
     # WebGL
     'nsICanvasRenderingContextWebGL_BufferData': CUSTOM_QS,
     'nsICanvasRenderingContextWebGL_BufferSubData': CUSTOM_QS,
     'nsICanvasRenderingContextWebGL_TexImage2D': CUSTOM_QS,
     'nsICanvasRenderingContextWebGL_TexSubImage2D': CUSTOM_QS,
     'nsICanvasRenderingContextWebGL_Uniform1iv': CUSTOM_QS_TN,
     'nsICanvasRenderingContextWebGL_Uniform2iv': CUSTOM_QS_TN,
     'nsICanvasRenderingContextWebGL_Uniform3iv': CUSTOM_QS_TN,