From 14c6ab452d7a61e190921ddd572ba61b28d55aef Mon Sep 17 00:00:00 2001 From: Michael Wu Date: Thu, 6 Jun 2013 20:49:31 -0400 Subject: [PATCH] Backed out changeset a0faa1e1837e (bug 869903) for orange on Linux mochitests --- dom/browser-element/BrowserElementChildPreload.js | 4 +--- dom/browser-element/mochitest/Makefile.in | 1 - .../mochitest/browserElement_FirstPaint.js | 12 +----------- .../mochitest/file_browserElement_FirstPaint.html | 4 ---- 4 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 dom/browser-element/mochitest/file_browserElement_FirstPaint.html diff --git a/dom/browser-element/BrowserElementChildPreload.js b/dom/browser-element/BrowserElementChildPreload.js index c4108f63ff6..f8bcd2cf315 100644 --- a/dom/browser-element/BrowserElementChildPreload.js +++ b/dom/browser-element/BrowserElementChildPreload.js @@ -187,9 +187,7 @@ BrowserElementChild.prototype = { // 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; diff --git a/dom/browser-element/mochitest/Makefile.in b/dom/browser-element/mochitest/Makefile.in index c6041a12356..8a9fc3944e8 100644 --- a/dom/browser-element/mochitest/Makefile.in +++ b/dom/browser-element/mochitest/Makefile.in @@ -69,7 +69,6 @@ MOCHITEST_FILES = \ file_browserElement_XFrameOptionsAllowFrom.html \ file_browserElement_XFrameOptionsAllowFrom.sjs \ browserElement_FirstPaint.js \ - file_browserElement_FirstPaint.html \ test_browserElement_inproc_FirstPaint.html \ browserElement_NextPaint.js \ test_browserElement_inproc_NextPaint.html \ diff --git a/dom/browser-element/mochitest/browserElement_FirstPaint.js b/dom/browser-element/mochitest/browserElement_FirstPaint.js index 9a1a3ca0240..37176e34505 100644 --- a/dom/browser-element/mochitest/browserElement_FirstPaint.js +++ b/dom/browser-element/mochitest/browserElement_FirstPaint.js @@ -10,9 +10,7 @@ browserElementTestHelpers.addPermission(); function runTest() { var iframe = document.createElement('iframe'); - var iframe2 = document.createElement('iframe'); SpecialPowers.wrap(iframe).mozbrowser = true; - SpecialPowers.wrap(iframe2).mozbrowser = true; var gotFirstPaint = false; var gotFirstLocationChange = false; @@ -20,8 +18,6 @@ function runTest() { ok(!gotFirstPaint, "Got only one first paint."); gotFirstPaint = true; - is(e.detail.backgroundColor, "transparent", "Got the expected background color."); - if (gotFirstLocationChange) { iframe.src = browserElementTestHelpers.emptyPage1 + '?2'; } @@ -35,16 +31,10 @@ function runTest() { } } else if (e.detail.endsWith('?2')) { - document.body.appendChild(iframe2); + SimpleTest.finish(); } }); - iframe2.addEventListener('mozbrowserfirstpaint', function(e) { - is(e.detail.backgroundColor, "rgb(0, 128, 0)", "Got the expected background color."); - SimpleTest.finish(); - }); - iframe2.src = 'http://example.com/tests/dom/browser-element/mochitest/file_browserElement_FirstPaint.html'; - document.body.appendChild(iframe); iframe.src = browserElementTestHelpers.emptyPage1; diff --git a/dom/browser-element/mochitest/file_browserElement_FirstPaint.html b/dom/browser-element/mochitest/file_browserElement_FirstPaint.html deleted file mode 100644 index 55f82ed1ed8..00000000000 --- a/dom/browser-element/mochitest/file_browserElement_FirstPaint.html +++ /dev/null @@ -1,4 +0,0 @@ - - - -