diff --git a/ipc/glue/BackgroundChildImpl.cpp b/ipc/glue/BackgroundChildImpl.cpp index 90095a716..02138162b 100644 --- a/ipc/glue/BackgroundChildImpl.cpp +++ b/ipc/glue/BackgroundChildImpl.cpp @@ -308,6 +308,7 @@ BackgroundChildImpl::DeallocPCamerasChild(camera::PCamerasChild *aActor) RefPtr child = dont_AddRef(static_cast(aActor)); MOZ_ASSERT(aActor); + camera::Shutdown(); #endif return true; } diff --git a/layout/forms/nsNumberControlFrame.cpp b/layout/forms/nsNumberControlFrame.cpp index 21c05ba50..a14ff5347 100644 --- a/layout/forms/nsNumberControlFrame.cpp +++ b/layout/forms/nsNumberControlFrame.cpp @@ -428,6 +428,8 @@ nsNumberControlFrame::CreateAnonymousContent(nsTArray& aElements) nsContentUtils::AddScriptRunner(focusJob); } + SyncDisabledState(); // Sync disabled state of 'mTextField'. + if (StyleDisplay()->mAppearance == NS_THEME_TEXTFIELD) { // The author has elected to hide the spinner by setting this // -moz-appearance. We will reframe if it changes. @@ -459,8 +461,6 @@ nsNumberControlFrame::CreateAnonymousContent(nsTArray& aElements) nsCSSPseudoElements::ePseudo_mozNumberSpinDown, spinBoxCI.mStyleContext); - SyncDisabledState(); - return rv; } diff --git a/netwerk/base/BackgroundFileSaver.cpp b/netwerk/base/BackgroundFileSaver.cpp index 1ebbf70c2..f3cdccdff 100644 --- a/netwerk/base/BackgroundFileSaver.cpp +++ b/netwerk/base/BackgroundFileSaver.cpp @@ -509,10 +509,16 @@ BackgroundFileSaver::ProcessStateChange() NS_ENSURE_SUCCESS(rv, rv); } - // Now we can update the actual target file name. - mActualTarget = renamedTarget; - mActualTargetKeepPartial = renamedTargetKeepPartial; + // We should not only update the mActualTarget with renameTarget when + // they point to the different files. + // In this way, if mActualTarget and renamedTarget point to the same file + // with different addresses, "CheckCompletion()" will return false forever. } + + // Update mActualTarget with renameTarget, + // even if they point to the same file. + mActualTarget = renamedTarget; + mActualTargetKeepPartial = renamedTargetKeepPartial; } // Notify if the target file name actually changed.