#512: M1469348 M1478575 M1461706
This commit is contained in:
parent
4c83f3281f
commit
c27f5bf599
|
@ -308,6 +308,7 @@ BackgroundChildImpl::DeallocPCamerasChild(camera::PCamerasChild *aActor)
|
||||||
RefPtr<camera::CamerasChild> child =
|
RefPtr<camera::CamerasChild> child =
|
||||||
dont_AddRef(static_cast<camera::CamerasChild*>(aActor));
|
dont_AddRef(static_cast<camera::CamerasChild*>(aActor));
|
||||||
MOZ_ASSERT(aActor);
|
MOZ_ASSERT(aActor);
|
||||||
|
camera::Shutdown();
|
||||||
#endif
|
#endif
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -428,6 +428,8 @@ nsNumberControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
|
||||||
nsContentUtils::AddScriptRunner(focusJob);
|
nsContentUtils::AddScriptRunner(focusJob);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SyncDisabledState(); // Sync disabled state of 'mTextField'.
|
||||||
|
|
||||||
if (StyleDisplay()->mAppearance == NS_THEME_TEXTFIELD) {
|
if (StyleDisplay()->mAppearance == NS_THEME_TEXTFIELD) {
|
||||||
// The author has elected to hide the spinner by setting this
|
// The author has elected to hide the spinner by setting this
|
||||||
// -moz-appearance. We will reframe if it changes.
|
// -moz-appearance. We will reframe if it changes.
|
||||||
|
@ -459,8 +461,6 @@ nsNumberControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
|
||||||
nsCSSPseudoElements::ePseudo_mozNumberSpinDown,
|
nsCSSPseudoElements::ePseudo_mozNumberSpinDown,
|
||||||
spinBoxCI.mStyleContext);
|
spinBoxCI.mStyleContext);
|
||||||
|
|
||||||
SyncDisabledState();
|
|
||||||
|
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -509,10 +509,16 @@ BackgroundFileSaver::ProcessStateChange()
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Now we can update the actual target file name.
|
// We should not only update the mActualTarget with renameTarget when
|
||||||
mActualTarget = renamedTarget;
|
// they point to the different files.
|
||||||
mActualTargetKeepPartial = renamedTargetKeepPartial;
|
// 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.
|
// Notify if the target file name actually changed.
|
||||||
|
|
Loading…
Reference in New Issue