Commit 73aa7c69 authored by Butkovits Atila's avatar Butkovits Atila
Browse files

Backed out changeset fef0d9458939 (bug 1834892) as requested by dev. CLOSED TREE

parent d1ed4015

dom/smil/SMILParserUtils.cpp

+2 −3
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ bool ParseClockValue(RangedPtr<const char16_t>& aIter, 


  iter = aIter;



  int32_t hours = 0, timecount = 0;

  int32_t hours = 0, timecount;

  double fraction = 0.0;

  uint32_t minutes, seconds, multiplier;
@@ -192,8 +192,7 @@ bool ParseClockValue(RangedPtr<const char16_t>& aIter, 
      aIter = iter;

      return true;

    case TIMECOUNT_VALUE:

      if (*iter != '.' &&

          !SVGContentUtils::ParseInteger(iter, aEnd, timecount)) {

      if (!SVGContentUtils::ParseInteger(iter, aEnd, timecount)) {

        return false;

      }

      if (iter != aEnd && *iter == '.' &&

dom/smil/test/test_smilGetSimpleDuration.xhtml

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ function main() { 
  /* Check basic operation */

  anim.setAttribute("dur", "1s");

  is(anim.getSimpleDuration(), 1);

  anim.setAttribute("dur", ".15s");

  isfuzzy(anim.getSimpleDuration(), 0.15, 0.001);

  anim.setAttribute("dur", "1.5s");

  is(anim.getSimpleDuration(), 1.5);

dom/smil/test/test_smilInvalidValues.html

+1 −5
Original line number Diff line number Diff line
@@ -60,14 +60,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=941315 
    a.setAttribute("dur", "50s");

    is(b.safeGetStartTime(), 50, "valid simple duration");



    // Check invalid values also cause the model to be updated

    // Check an invalid value also causes the model to be updated

    a.setAttribute("dur", "abc"); // -> indefinite

    is(b.safeGetStartTime(), "none", "invalid simple duration");



    a.setAttribute("dur", "50s");

    a.setAttribute("dur", "-.1s"); // -> indefinite

    is(b.safeGetStartTime(), "none", "invalid simple duration");



    // Restore state

    a.setAttribute("dur", "100s");

  }