Bug 773429 - Remove dom.disable_image_src_set. r=khuey

This commit is contained in:
Bobby Holley 2015-11-10 12:13:45 -08:00
Родитель 9193f2d1f2
Коммит b83cc03bd2
9 изменённых файлов: 0 добавлений и 41 удалений

Просмотреть файл

@ -2116,14 +2116,6 @@ nsContentUtils::IsCallerContentXBL()
return xpc::IsContentXBLScope(c); return xpc::IsContentXBLScope(c);
} }
bool
nsContentUtils::IsImageSrcSetDisabled()
{
return Preferences::GetBool("dom.disable_image_src_set") &&
!IsCallerChrome();
}
// static // static
bool bool
nsContentUtils::LookupBindingMember(JSContext* aCx, nsIContent *aContent, nsContentUtils::LookupBindingMember(JSContext* aCx, nsIContent *aContent,

Просмотреть файл

@ -236,8 +236,6 @@ public:
return SubjectPrincipal(); return SubjectPrincipal();
} }
static bool IsImageSrcSetDisabled();
static bool LookupBindingMember(JSContext* aCx, nsIContent *aContent, static bool LookupBindingMember(JSContext* aCx, nsIContent *aContent,
JS::Handle<jsid> aId, JS::Handle<jsid> aId,
JS::MutableHandle<JSPropertyDescriptor> aDesc); JS::MutableHandle<JSPropertyDescriptor> aDesc);

Просмотреть файл

@ -535,12 +535,6 @@ HTMLImageElement::SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
if (aNameSpaceID == kNameSpaceID_None && if (aNameSpaceID == kNameSpaceID_None &&
aName == nsGkAtoms::src) { aName == nsGkAtoms::src) {
// This is for dom.disable_image_src_set, which predates "srcset"
// as an attribute. See Bug 773429
if (nsContentUtils::IsImageSrcSetDisabled()) {
return NS_OK;
}
if (InResponsiveMode()) { if (InResponsiveMode()) {
if (mResponsiveSelector && if (mResponsiveSelector &&
mResponsiveSelector->Content() == this) { mResponsiveSelector->Content() == this) {

Просмотреть файл

@ -114,11 +114,6 @@ SVGFEImageElement::AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
// If there is a frame then it should deal with loading as the image // If there is a frame then it should deal with loading as the image
// url may be animated. // url may be animated.
if (!GetPrimaryFrame()) { if (!GetPrimaryFrame()) {
// Prevent setting image.src by exiting early
if (nsContentUtils::IsImageSrcSetDisabled()) {
return NS_OK;
}
if (aValue) { if (aValue) {
LoadSVGImage(true, aNotify); LoadSVGImage(true, aNotify);
} else { } else {

Просмотреть файл

@ -143,12 +143,6 @@ SVGImageElement::AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
// If there is a frame then it should deal with loading as the image // If there is a frame then it should deal with loading as the image
// url may be animated // url may be animated
if (!GetPrimaryFrame()) { if (!GetPrimaryFrame()) {
// Prevent setting image.src by exiting early
if (nsContentUtils::IsImageSrcSetDisabled()) {
return NS_OK;
}
if (aValue) { if (aValue) {
LoadSVGImage(true, aNotify); LoadSVGImage(true, aNotify);
} else { } else {

Просмотреть файл

@ -68,8 +68,6 @@ public:
void MaybeLoadSVGImage(); void MaybeLoadSVGImage();
bool IsImageSrcSetDisabled() const;
// WebIDL // WebIDL
already_AddRefed<SVGAnimatedLength> X(); already_AddRefed<SVGAnimatedLength> X();
already_AddRefed<SVGAnimatedLength> Y(); already_AddRefed<SVGAnimatedLength> Y();

Просмотреть файл

@ -130,12 +130,6 @@ SVGFEImageFrame::AttributeChanged(int32_t aNameSpaceID,
} }
if (aNameSpaceID == kNameSpaceID_XLink && if (aNameSpaceID == kNameSpaceID_XLink &&
aAttribute == nsGkAtoms::href) { aAttribute == nsGkAtoms::href) {
// Prevent setting image.src by exiting early
if (nsContentUtils::IsImageSrcSetDisabled()) {
return NS_OK;
}
if (element->mStringAttributes[SVGFEImageElement::HREF].IsExplicitlySet()) { if (element->mStringAttributes[SVGFEImageElement::HREF].IsExplicitlySet()) {
element->LoadSVGImage(true, true); element->LoadSVGImage(true, true);
} else { } else {

Просмотреть файл

@ -208,11 +208,6 @@ nsSVGImageFrame::AttributeChanged(int32_t aNameSpaceID,
} }
if (aNameSpaceID == kNameSpaceID_XLink && if (aNameSpaceID == kNameSpaceID_XLink &&
aAttribute == nsGkAtoms::href) { aAttribute == nsGkAtoms::href) {
// Prevent setting image.src by exiting early
if (nsContentUtils::IsImageSrcSetDisabled()) {
return NS_OK;
}
SVGImageElement *element = static_cast<SVGImageElement*>(mContent); SVGImageElement *element = static_cast<SVGImageElement*>(mContent);
if (element->mStringAttributes[SVGImageElement::HREF].IsExplicitlySet()) { if (element->mStringAttributes[SVGImageElement::HREF].IsExplicitlySet()) {

Просмотреть файл

@ -1036,7 +1036,6 @@ pref("editor.positioning.offset", 0);
// Scripts & Windows prefs // Scripts & Windows prefs
pref("dom.disable_beforeunload", false); pref("dom.disable_beforeunload", false);
pref("dom.disable_image_src_set", false);
pref("dom.disable_window_flip", false); pref("dom.disable_window_flip", false);
pref("dom.disable_window_move_resize", false); pref("dom.disable_window_move_resize", false);
pref("dom.disable_window_status_change", false); pref("dom.disable_window_status_change", false);