980275 - Merge DOMFileRequest and FileRequest

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, defect)

Comment 1

[Jan Varga [:janv]]

Attachment: patch

another cleanup before we switch to PBackground

Comment 2

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Comment on attachment 8386734 [details] [diff] [review]
patch

Review of attachment 8386734 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/filehandle/FileHandle.cpp
@@ +164,5 @@
>      return nullptr;
>    }
>  
> +  nsRefPtr<FileRequest> request =
> +    FileRequest::Create(GetOwner(), lockedFile, true);

Nit: s/true//* aWrapAsDOMRequest */ true/

::: dom/filehandle/FileRequest.cpp
@@ +115,5 @@
> +
> +nsIDOMLockedFile*
> +FileRequest::GetLockedFile() const
> +{
> +  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");

Nit: MOZ_ASSERT for new stuff

::: dom/filehandle/LockedFile.cpp
@@ +424,4 @@
>  LockedFile::GenerateFileRequest()
>  {
>    NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
> +  return FileRequest::Create(GetOwner(), this, false);

Nit: s/false//* aWrapAsDOMRequest */ false/

::: dom/filehandle/LockedFile.h
@@ +102,1 @@
>    GenerateFileRequest();

Nit: Remove 'inline'

Comment 3

[Jan Varga [:janv]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/db46457d0731

Comment 4

[Jan Varga [:janv]]

Had to fix a bustage:
https://hg.mozilla.org/integration/mozilla-inbound/rev/a83ecf923dec

Comment 5

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/db46457d0731
https://hg.mozilla.org/mozilla-central/rev/a83ecf923dec