Backed out 2 changesets (bug 1230118, bug 1230110) for windows debug assertions in browser_perf-categories-js-calltree.js
authorWes Kocher <wkocher@mozilla.com>
Thu, 03 Dec 2015 15:38:04 -0800
changeset 275510 00a1550117478befe5df1ef2ce1bc0e146b28bfd
parent 275509 462a51797af1901934d422606a6a090cdb96bab0
child 275511 5cd26800514465d5a346d35b7b64847bc9d46c34
push id68869
push userkwierso@gmail.com
push dateThu, 03 Dec 2015 23:38:08 +0000
treeherdermozilla-inbound@00a155011747 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1230118, 1230110
milestone45.0a1
backs outa9ce85f77af9188fcb7500b3e156df1ad17a49e5
b9d8d05aa4ee1cca71192d4d6c00900e8d1169b6
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 2 changesets (bug 1230118, bug 1230110) for windows debug assertions in browser_perf-categories-js-calltree.js Backed out changeset a9ce85f77af9 (bug 1230118) Backed out changeset b9d8d05aa4ee (bug 1230110)
accessible/generic/DocAccessible.cpp
dom/html/HTMLImageElement.cpp
dom/html/crashtests/1230110.html
dom/html/crashtests/crashtests.list
--- a/accessible/generic/DocAccessible.cpp
+++ b/accessible/generic/DocAccessible.cpp
@@ -2017,19 +2017,16 @@ DocAccessible::ValidateARIAOwned()
   }
 }
 
 void
 DocAccessible::DoARIAOwnsRelocation(Accessible* aOwner)
 {
   nsTArray<RefPtr<Accessible> >* children = mARIAOwnsHash.LookupOrAdd(aOwner);
 
-  MOZ_ASSERT(aOwner, "aOwner must be a valid pointer");
-  MOZ_ASSERT(aOwner->Elm(), "aOwner->Elm() must be a valid pointer");
-
   IDRefsIterator iter(this, aOwner->Elm(), nsGkAtoms::aria_owns);
   Accessible* child = nullptr;
 
   uint32_t arrayIdx = 0, insertIdx = aOwner->ChildCount() - children->Length();
   while ((child = iter.Next())) {
     // Same child on same position, no change.
     if (child->Parent() == aOwner &&
         child->IndexInParent() == static_cast<int32_t>(insertIdx)) {
--- a/dom/html/HTMLImageElement.cpp
+++ b/dom/html/HTMLImageElement.cpp
@@ -1304,18 +1304,16 @@ HTMLImageElement::SelectSourceForTagWith
   // <source> tags with no match would leave source yet-undetermined.
   return false;
 }
 
 void
 HTMLImageElement::DestroyContent()
 {
   mResponsiveSelector = nullptr;
-
-  nsGenericHTMLElement::DestroyContent();
 }
 
 void
 HTMLImageElement::MediaFeatureValuesChanged()
 {
   QueueImageLoadTask(false);
 }
 
deleted file mode 100644
--- a/dom/html/crashtests/1230110.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<script>
-// This test case should not leak.
-function leak()
-{
-    var img = document.createElement("img");
-    var iframe = document.createElement("iframe");
-    img.appendChild(iframe);
-    document.body.appendChild(img);
-
-    document.addEventListener('Foo', function(){}, false);
-}
-</script>
-</head>
-<body onload="leak();"></body>
-</html>
--- a/dom/html/crashtests/crashtests.list
+++ b/dom/html/crashtests/crashtests.list
@@ -70,10 +70,8 @@ load 862084.html
 load 865147.html
 load 877910.html
 load 903106.html
 load 916322-1.html
 load 916322-2.html
 load 1032654.html
 pref(dom.image.srcset.enabled,true) load 1141260.html
 load 1228876.html
-load 1230110.html
-