Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 870219 part 1. Fix the chrome-scope checking for workers to work even if we incorrectly set up worker interface objects on the main thread. r=bent

Browse Source
This commit is contained in:
Boris Zbarsky 2013-05-09 22:23:28 -04:00
parent 636d9dcde6
commit e6c988eefa
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom/bindings/Codegen.py
View File

@ -2046,10 +2046,12 @@ def GetAccessCheck(descriptor, object):
returns a string
"""
accessCheck = "xpc::AccessCheck::isChrome(%s)" % object
if descriptor.workers:
accessCheck = "mozilla::dom::workers::GetWorkerPrivateFromContext(aCx)->IsChromeWorker()"
else:
accessCheck = "xpc::AccessCheck::isChrome(%s)" % object
# We sometimes set up worker things on the main thread, in which case we
# want to use the main-thread accessCheck above. Otherwise, we want to
# check for a ChromeWorker.
accessCheck = "(NS_IsMainThread() ? %s : mozilla::dom::workers::GetWorkerPrivateFromContext(aCx)->IsChromeWorker())" % accessCheck
return accessCheck
def InitUnforgeablePropertiesOnObject(descriptor, obj, properties, failureReturnValue=""):
@ -7972,7 +7974,8 @@ class CGBindingRoot(CGThing):
# Have to include nsDOMQS.h to get fast arg unwrapping
# for old-binding things with castability.
'nsDOMQS.h'
] + (['WorkerPrivate.h'] if hasWorkerStuff else []),
] + (['WorkerPrivate.h',
'nsThreadUtils.h'] if hasWorkerStuff else []),
curr,
config,
jsImplemented)