Backed out changeset 3b3acc25c034 (bug 869903) for mochitest failures
authorMichael Wu <mwu@mozilla.com>
Tue, 04 Jun 2013 21:58:53 -0400
changeset 134074 b46cf645c8420e7f395d1b9ccb714704680f899d
parent 134071 3b3acc25c034f3c4bff9d779fca23703ca90ebf9
child 134075 ace064f09f7947613f614512e6e91fec3c4c3685
push id29035
push useremorley@mozilla.com
push dateWed, 05 Jun 2013 11:20:37 +0000
treeherdermozilla-inbound@627af04199a5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs869903
milestone24.0a1
backs out3b3acc25c034f3c4bff9d779fca23703ca90ebf9
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 changeset 3b3acc25c034 (bug 869903) for mochitest failures
dom/browser-element/BrowserElementChildPreload.js
dom/browser-element/mochitest/browserElement_FirstPaint.js
dom/browser-element/mochitest/file_browserElement_FirstPaint.html
--- a/dom/browser-element/BrowserElementChildPreload.js
+++ b/dom/browser-element/BrowserElementChildPreload.js
@@ -182,19 +182,17 @@ BrowserElementChild.prototype = {
     // is not what we want!
     addEventListener('unload',
                      this._unloadHandler.bind(this),
                      /* useCapture = */ false,
                      /* wantsUntrusted = */ false);
 
     // Registers a MozAfterPaint handler for the very first paint.
     this._addMozAfterPaintHandler(function () {
-      let bgColor = content.getComputedStyle(content.document.body)
-                           .getPropertyValue('background-color');
-      sendAsyncMsg('firstpaint', {backgroundColor: bgColor});
+      sendAsyncMsg('firstpaint');
     });
 
     let self = this;
 
     let mmCalls = {
       "purge-history": this._recvPurgeHistory,
       "get-screenshot": this._recvGetScreenshot,
       "set-visible": this._recvSetVisible,
--- a/dom/browser-element/mochitest/browserElement_FirstPaint.js
+++ b/dom/browser-element/mochitest/browserElement_FirstPaint.js
@@ -9,37 +9,33 @@ browserElementTestHelpers.setEnabledPref
 browserElementTestHelpers.addPermission();
 
 function runTest() {
   var iframe = document.createElement('iframe');
   SpecialPowers.wrap(iframe).mozbrowser = true;
 
   var gotFirstPaint = false;
   var gotFirstLocationChange = false;
-  var secondTestPage = 'file_browserElement_FirstPaint.html';
   iframe.addEventListener('mozbrowserfirstpaint', function(e) {
     ok(!gotFirstPaint, "Got only one first paint.");
     gotFirstPaint = true;
 
-    is(e.detail.backgroundColor, "transparent", "Got the expected background color.");
-
     if (gotFirstLocationChange) {
-      iframe.src = secondTestPage;
+      iframe.src = browserElementTestHelpers.emptyPage1 + '?2';
     }
   });
 
   iframe.addEventListener('mozbrowserlocationchange', function(e) {
     if (e.detail == browserElementTestHelpers.emptyPage1) {
       gotFirstLocationChange = true;
       if (gotFirstPaint) {
-        iframe.src = secondTestPage;
+        iframe.src = browserElementTestHelpers.emptyPage1 + '?2';
       }
     }
-    else if (e.detail == secondTestPage) {
-      is(e.detail.backgroundColor, "rgb(0,255,0)", "Got the expected background color.");
+    else if (e.detail.endsWith('?2')) {
       SimpleTest.finish();
     }
   });
 
   document.body.appendChild(iframe);
 
   iframe.src = browserElementTestHelpers.emptyPage1;
 }
deleted file mode 100644
--- a/dom/browser-element/mochitest/file_browserElement_FirstPaint.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html>
-<body style="background-color:green;">
-</body>
-</html>