Backed out 4 changesets (bug 1139560) for update-the-source-set.html w-p-t failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 27 Mar 2015 15:56:55 -0400
changeset 265133 dcc49f2ed01607ec3e9b9955c9abb55005d52679
parent 265132 48b5fffff1ec30277cab3755cf07601fcb7c1f39
child 265134 d56c2eb468f65272e20b3e9562ef05c47be75e57
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1139560
milestone39.0a1
backs outffcb5e699ef5cfcc7ed12bd252c323af00d7b02d
a0ef86da9b150b8d523a9ea9acd24e701b499bdd
dc2cd9c336c9a37111037fb69870db7afff9095a
1e8b305f26b01608beee5b9002ac0748fec705e1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
dom/base/ResponsiveImageSelector.cpp
dom/tests/mochitest/general/test_img_mutations.html
dom/tests/mochitest/general/test_picture_mutations.html
dom/webidl/HTMLImageElement.webidl
--- a/dom/base/ResponsiveImageSelector.cpp
+++ b/dom/base/ResponsiveImageSelector.cpp
@@ -34,18 +34,17 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(R
 static bool
 ParseInteger(const nsAString& aString, int32_t& aInt)
 {
   nsContentUtils::ParseHTMLIntegerResultFlags parseResult;
   aInt = nsContentUtils::ParseHTMLInteger(aString, &parseResult);
   return !(parseResult &
            ( nsContentUtils::eParseHTMLInteger_Error |
              nsContentUtils::eParseHTMLInteger_DidNotConsumeAllInput |
-             nsContentUtils::eParseHTMLInteger_IsPercent |
-             nsContentUtils::eParseHTMLInteger_NonStandard ));
+             nsContentUtils::eParseHTMLInteger_IsPercent ));
 }
 
 ResponsiveImageSelector::ResponsiveImageSelector(nsIContent *aContent)
   : mOwnerNode(aContent),
     mSelectedCandidateIndex(-1)
 {
 }
 
@@ -616,23 +615,21 @@ ResponsiveImageCandidate::ConsumeDescrip
         // before breaking
         descriptors.AddDescriptor(Substring(currentDescriptor, iter));
         iter++;
         break;
       } else if (nsContentUtils::IsHTMLWhitespace(*iter)) {
         // 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;
       }
     }
   }
 
   descriptors.FillCandidate(*this);
 
--- a/dom/tests/mochitest/general/test_img_mutations.html
+++ b/dom/tests/mochitest/general/test_img_mutations.html
@@ -64,17 +64,17 @@
       info("test 1");
       img.src = testPNG50;
       is(img.currentSrc, testPNG50, "Should have synchronously selected source");
 
       img.src = "non_existent_image.404";
       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;
       is(img.currentSrc, testPNG200, "Should 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);
     });
--- a/dom/tests/mochitest/general/test_picture_mutations.html
+++ b/dom/tests/mochitest/general/test_picture_mutations.html
@@ -60,17 +60,17 @@
       }
     }
 
     // Setup image outside the tree dom, make sure it loads
     tests.push(function() {
       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);
     });
 
     // Binding to an empty picture should trigger an event, even if source doesn't change
     tests.push(function() {
       info("test 2");
--- a/dom/webidl/HTMLImageElement.webidl
+++ b/dom/webidl/HTMLImageElement.webidl
@@ -57,17 +57,17 @@ partial interface HTMLImageElement {
 };
 
 // [Update me: not in whatwg spec yet]
 // http://picture.responsiveimages.org/#the-img-element
 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.
 partial interface HTMLImageElement {
            attribute DOMString lowsrc;
 
   // These attributes are offsets from the closest view (to mimic
   // NS4's "offset-from-layer" behavior).