Bug 793528. Worker bindings should default to looking for headers in mozilla/dom/workers/bindings/. r=khuey

This commit is contained in:
Boris Zbarsky 2012-10-01 08:45:11 -04:00
parent 97e03cfba0
commit 6c9f57284b
2 changed files with 5 additions and 7 deletions

View File

@ -197,7 +197,6 @@ DOMInterfaces = {
},
{
'workers': True,
'headerFile': 'mozilla/dom/workers/bindings/EventTarget.h',
'concrete': False
}],
@ -212,7 +211,6 @@ DOMInterfaces = {
'FileReaderSync': [
{
'workers': True,
'headerFile': 'mozilla/dom/workers/bindings/FileReaderSync.h'
}],
'FormData': [
@ -382,7 +380,6 @@ DOMInterfaces = {
},
{
'workers': True,
'headerFile': 'mozilla/dom/workers/bindings/XMLHttpRequest.h',
}],
'XMLHttpRequestEventTarget': [
@ -395,7 +392,6 @@ DOMInterfaces = {
{
'workers': True,
'concrete': False,
'headerFile': 'mozilla/dom/workers/bindings/XMLHttpRequestEventTarget.h'
}],
'XMLHttpRequestUpload': [
@ -406,7 +402,6 @@ DOMInterfaces = {
},
{
'workers': True,
'headerFile': 'mozilla/dom/workers/bindings/XMLHttpRequestUpload.h'
}],
'WebSocket': [

View File

@ -146,8 +146,11 @@ class Descriptor(DescriptorProvider):
if self.nativeType == "JSObject":
headerDefault = "jsapi.h"
else:
headerDefault = self.nativeType
headerDefault = headerDefault.replace("::", "/") + ".h"
if self.workers:
headerDefault = "mozilla/dom/workers/bindings/%s.h" % ifaceName
else:
headerDefault = self.nativeType
headerDefault = headerDefault.replace("::", "/") + ".h"
self.headerFile = desc.get('headerFile', headerDefault)
if self.interface.isCallback() or self.interface.isExternal():