Backout revisions 4287533203fb and 96a3ebfe09d8 (bug 1159401) for bustage.

CLOSED TREE
This commit is contained in:
Ryan VanderMeulen
2015-05-11 11:43:59 -04:00
parent 33aa4f3b20
commit 95df0286b8
97 changed files with 750 additions and 939 deletions

View File

@@ -555,9 +555,9 @@ HTMLCanvasElement::ToBlob(JSContext* aCx,
, mFileCallback(aCallback) {}
// This is called on main thread.
nsresult ReceiveBlob(already_AddRefed<Blob> aBlob)
nsresult ReceiveBlob(already_AddRefed<File> aBlob)
{
nsRefPtr<Blob> blob = aBlob;
nsRefPtr<File> blob = aBlob;
uint64_t size;
nsresult rv = blob->GetSize(&size);
if (NS_SUCCEEDED(rv)) {
@@ -567,7 +567,7 @@ HTMLCanvasElement::ToBlob(JSContext* aCx,
}
}
nsRefPtr<Blob> newBlob = Blob::Create(mGlobal, blob->Impl());
nsRefPtr<File> newBlob = new File(mGlobal, blob->Impl());
mozilla::ErrorResult error;
mFileCallback->Call(*newBlob, error);