Landing requested on , by dmeehan@mozilla.com.
Revisions:
D248338 diff 1029289
While applying revision D248338 to , the following files had conflicts:
(Hint: try rebasing your changes on the latest commits from and re-submitting.)
- dom/smil/SMILAnimationController.h @ 8b87e03e18174df09b44c3ce1f18688b52df6c25
diff a/dom/smil/SMILAnimationController.h b/dom/smil/SMILAnimationController.h (rejected hunks)
@@ -43,12 +43,10 @@
...
diff a/dom/smil/SMILAnimationController.h b/dom/smil/SMILAnimationController.h (rejected hunks)
@@ -43,12 +43,10 @@
public:
explicit SMILAnimationController(mozilla::dom::Document* aDoc);
NS_INLINE_DECL_REFCOUNTING(SMILAnimationController)
- using DiscardArray = nsTObserverArray<RefPtr<dom::Element>>;
-
// Clears mDocument pointer. (Called by our mozilla::dom::Document when it's
// going away)
void Disconnect();
// SMILContainer
Raw error output:
Problem while applying patch in revision 248338:
Checking patch dom/base/nsTreeSanitizer.cpp...
Checking patch dom/smil/SMILAnimationController.cpp...
Hunk #1 succeeded at 248 (offset 34 lines).
Hunk #2 succeeded at 320 (offset 34 lines).
Hunk #3 succeeded at 467 (offset 34 lines).
Hunk #4 succeeded at 484 (offset 34 lines).
Hunk #5 succeeded at 513 (offset 34 lines).
Checking patch dom/smil/SMILAnimationController.h...
error: while searching for:
public:
explicit SMILAnimationController(mozilla::dom::Document* aDoc);
NS_INLINE_DECL_REFCOUNTING(SMILAnimationController)
using DiscardArray = nsTObserverArray<RefPtr<dom::Element>>;
// Clears mDocument pointer. (Called by our mozilla::dom::Document when it's
// going away)
void Disconnect();
// SMILContainer
error: patch failed: dom/smil/SMILAnimationController.h:43
Hunk #2 succeeded at 139 (offset 16 lines).
Checking patch dom/smil/SMILDiscardAnimationFunction.h...
Checking patch dom/smil/SMILTimedElement.cpp...
Checking patch dom/smil/SMILTimedElement.h...
Checking patch dom/smil/moz.build...
Checking patch dom/svg/SVGAnimationElement.cpp...
Checking patch dom/svg/SVGAnimationElement.h...
Checking patch dom/svg/SVGDiscardElement.cpp...
Checking patch dom/svg/SVGDiscardElement.h...
Checking patch dom/svg/SVGTagList.h...
Checking patch dom/svg/crashtests/1953645.html...
Checking patch dom/svg/crashtests/crashtests.list...
Checking patch dom/svg/crashtests/discard-no-target.svg...
Checking patch dom/svg/moz.build...
Hunk #2 succeeded at 160 (offset -1 lines).
Checking patch dom/tests/mochitest/general/test_interfaces.js...
Checking patch dom/webidl/SVGDiscardElement.webidl...
Checking patch dom/webidl/moz.build...
Hunk #1 succeeded at 903 (offset -1 lines).
Checking patch modules/libpref/init/StaticPrefList.yaml...
Hunk #1 succeeded at 17078 (offset -27 lines).
Checking patch parser/html/javasrc/ElementName.java...
Checking patch parser/html/nsHtml5ElementName.cpp...
Checking patch parser/html/nsHtml5ElementName.h...
Checking patch testing/web-platform/meta/svg/animations/__dir__.ini...
Checking patch testing/web-platform/meta/svg/animations/historical.html.ini...
Checking patch testing/web-platform/meta/svg/idlharness.window.js.ini...
Checking patch testing/web-platform/meta/svg/styling/presentation-attributes-special-cases.html.ini...
Checking patch testing/web-platform/tests/svg/animations/discard-check-removal-order.html...
Checking patch testing/web-platform/tests/svg/animations/reftests/reference/green-100x100.svg...
Checking patch testing/web-platform/tests/svg/idlharness.window.js...
Checking patch tools/lint/eslint/eslint-plugin-mozilla/lib/environments/privileged.js...
Checking patch xpcom/ds/StaticAtoms.py...
Hunk #1 succeeded at 1404 (offset -2 lines).
Applied patch dom/base/nsTreeSanitizer.cpp cleanly.
Applied patch dom/smil/SMILAnimationController.cpp cleanly.
Applying patch dom/smil/SMILAnimationController.h with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Applied patch dom/smil/SMILDiscardAnimationFunction.h cleanly.
Applied patch dom/smil/SMILTimedElement.cpp cleanly.
Applied patch dom/smil/SMILTimedElement.h cleanly.
Applied patch dom/smil/moz.build cleanly.
Applied patch dom/svg/SVGAnimationElement.cpp cleanly.
Applied patch dom/svg/SVGAnimationElement.h cleanly.
Applied patch dom/svg/SVGDiscardElement.cpp cleanly.
Applied patch dom/svg/SVGDiscardElement.h cleanly.
Applied patch dom/svg/SVGTagList.h cleanly.
Applied patch dom/svg/crashtests/1953645.html cleanly.
Applied patch dom/svg/crashtests/crashtests.list cleanly.
Applied patch dom/svg/crashtests/discard-no-target.svg cleanly.
Applied patch dom/svg/moz.build cleanly.
Applied patch dom/tests/mochitest/general/test_interfaces.js cleanly.
Applied patch dom/webidl/SVGDiscardElement.webidl cleanly.
Applied patch dom/webidl/moz.build cleanly.
Applied patch modules/libpref/init/StaticPrefList.yaml cleanly.
Applied patch parser/html/javasrc/ElementName.java cleanly.
Applied patch parser/html/nsHtml5ElementName.cpp cleanly.
Applied patch parser/html/nsHtml5ElementName.h cleanly.
Applied patch testing/web-platform/meta/svg/animations/__dir__.ini cleanly.
Applied patch testing/web-platform/meta/svg/animations/historical.html.ini cleanly.
Applied patch testing/web-platform/meta/svg/idlharness.window.js.ini cleanly.
Applied patch testing/web-platform/meta/svg/styling/presentation-attributes-special-cases.html.ini cleanly.
Applied patch testing/web-platform/tests/svg/animations/discard-check-removal-order.html cleanly.
Applied patch testing/web-platform/tests/svg/animations/reftests/reference/green-100x100.svg cleanly.
Applied patch testing/web-platform/tests/svg/idlharness.window.js cleanly.
Applied patch tools/lint/eslint/eslint-plugin-mozilla/lib/environments/privileged.js cleanly.
Applied patch xpcom/ds/StaticAtoms.py cleanly.