mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
import change from rmottola/Arctic-Fox:
- Bug 1142761 - Move CallSetter into ScriptedIndirectProxyHandler so it will eventually be deleted along with its only remaining caller. (a5a0b3f6b) - Bug 1143810 - Remove some XPConnect JSClass::setProperty hooks that are not needed anymore. (4eda6a60b) - Bug 1142195 - Remove some unused class declarations in the DOM Cache code (afd802623) - Bug 1145345 - Account for a greater variety of rounding errors when comparing coordinates (6a41f34f3) - Bug 1145787 - Put a misplaced assertion into its proper place. (7f760a66d) - Bug 1146059 - Remove Response.finalURL. (230d9fa50) - Bug 1134324 - Set CORS mode and credentials on Fetch event Request. r=michal (772fcac8f) - Bug 1136200 - Verify request type is not no-cors if response is opaque (396c9bfb4) - Bug 1144249 - fix fetch no-cors mode. r=bkelly (af9656291) - Bug 1144876 - Stop spamming stderr with a warning every time that we encounter a document that is not controlled by a service worker; (0a5c5fbfd) - Bug 1117172 part 1. Allow passing an optional aGivenProto to binding Wrap methods. (8aea85046) - Bug 1117172 part 2. Change the non-wrappercached WrapObject methods to allow passing in aGivenProto. r=peterv (13146be83) - Bug 1117172 part 3. Change the wrappercached WrapObject methods to al low passing in aGivenProto. r=peterv (1621ef48d) - Bug 1146293 - Fix coding style break (intent and line length) caused by Bug 1117172 and Bug 1145631. (0822709f1) - Bug 1121298 - Part 1: refactor MozNDEFRecord cstor. (6e57a37ec) - Bug 1121298 - Part 2: Add Constructor(uri) for MozNDEFRecord. (46f921bcf) - Bug 1121298 - Part 3. add getAsURI. (e67cad94b) - Bug 1138886 - Structured Clone for MozNDEFRecord. (With adaptations of Bug 1117172 part 3) (b83b7f684) - Bug 1143504 - Disconnect the Cache object from its actor when it gets cycle collected. (dae58dcdd)
This commit is contained in:
+5
-5
@@ -559,10 +559,10 @@ File::IsMemoryFile()
|
||||
}
|
||||
|
||||
JSObject*
|
||||
File::WrapObject(JSContext* aCx)
|
||||
File::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return IsFile() ? FileBinding::Wrap(aCx, this)
|
||||
: BlobBinding::Wrap(aCx, this);
|
||||
return IsFile() ? FileBinding::Wrap(aCx, this, aGivenProto)
|
||||
: BlobBinding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
/* static */ already_AddRefed<File>
|
||||
@@ -1235,9 +1235,9 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(FileList)
|
||||
NS_IMPL_CYCLE_COLLECTING_RELEASE(FileList)
|
||||
|
||||
JSObject*
|
||||
FileList::WrapObject(JSContext *cx)
|
||||
FileList::WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto)
|
||||
{
|
||||
return mozilla::dom::FileListBinding::Wrap(cx, this);
|
||||
return mozilla::dom::FileListBinding::Wrap(cx, this, aGivenProto);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
||||
Reference in New Issue
Block a user