Backed out 4 changesets (bug 1139560) for update-the-source-set.html w-p-t failures.

Backed out changeset ffcb5e699ef5 (bug 1139560)
Backed out changeset a0ef86da9b15 (bug 1139560)
Backed out changeset dc2cd9c336c9 (bug 1139560)
Backed out changeset 1e8b305f26b0 (bug 1139560)

CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2015-03-27 15:56:55 -04:00
parent 09b8bced54
commit 3b75ea9aff
4 changed files with 5 additions and 8 deletions

View File

@ -39,8 +39,7 @@ ParseInteger(const nsAString& aString, int32_t& aInt)
return !(parseResult &
( nsContentUtils::eParseHTMLInteger_Error |
nsContentUtils::eParseHTMLInteger_DidNotConsumeAllInput |
nsContentUtils::eParseHTMLInteger_IsPercent |
nsContentUtils::eParseHTMLInteger_NonStandard ));
nsContentUtils::eParseHTMLInteger_IsPercent ));
}
ResponsiveImageSelector::ResponsiveImageSelector(nsIContent *aContent)
@ -621,13 +620,11 @@ ResponsiveImageCandidate::ConsumeDescriptors(nsAString::const_iterator& aIter,
// End of current descriptor, consume it, skip spaces
// ("After descriptor" state in spec) before continuing
descriptors.AddDescriptor(Substring(currentDescriptor, iter));
for (; iter != end && nsContentUtils::IsHTMLWhitespace(*iter); ++iter);
for (; iter != end && *iter == char16_t(' '); ++iter);
if (iter == end) {
break;
}
currentDescriptor = iter;
// Leave one whitespace so the loop advances to this position next iteration
iter--;
} else if (*iter == char16_t('(')) {
inParens = true;
}

View File

@ -69,7 +69,7 @@
ok(img.currentSrc.endsWith("non_existent_image.404"), "Should have synchronously selected source");
img.removeAttribute("src");
is(img.currentSrc, '', "Should have dropped currentSrc");
is(img.currentSrc, null, "Should have dropped currentSrc");
// Load another image while previous load is still pending
img.src = testPNG200;

View File

@ -65,7 +65,7 @@
info("test 1");
img.srcset = testPNG100;
img.src = testPNG50;
is(img.currentSrc, '', "Should not have synchronously selected source");
is(img.currentSrc, null, "Should not have synchronously selected source");
// No events should have fired synchronously, now we should get just one load (and no 404 error)
expectEvents(1, 0, nextTest);

View File

@ -62,7 +62,7 @@ partial interface HTMLImageElement {
[SetterThrows, Pref="dom.image.picture.enabled"]
attribute DOMString sizes;
[Pref="dom.image.srcset.enabled"]
readonly attribute DOMString currentSrc;
readonly attribute DOMString? currentSrc;
};
// Mozilla extensions.