From f9662f1a060ba6de702fdcfb01f105b763dfea04 Mon Sep 17 00:00:00 2001 From: Drew Willcoxon Date: Fri, 4 Mar 2016 16:57:04 -0800 Subject: [PATCH] Bug 1253713 - [e10s] Make widget/tests/test_plugin_scroll_invalidation.html work under e10s. r=mccr8 MozReview-Commit-ID: AZ7MZWHoWhr --HG-- rename : widget/tests/plugin_scroll_invalidation.html => dom/plugins/test/mochitest/plugin_scroll_invalidation.html rename : widget/tests/test_plugin_scroll_invalidation.html => dom/plugins/test/mochitest/test_plugin_scroll_invalidation.html --- dom/plugins/test/mochitest/mochitest.ini | 3 +++ .../plugins/test/mochitest}/plugin_scroll_invalidation.html | 0 .../test/mochitest}/test_plugin_scroll_invalidation.html | 5 +++-- widget/tests/mochitest.ini | 3 --- 4 files changed, 6 insertions(+), 5 deletions(-) rename {widget/tests => dom/plugins/test/mochitest}/plugin_scroll_invalidation.html (100%) rename {widget/tests => dom/plugins/test/mochitest}/test_plugin_scroll_invalidation.html (95%) diff --git a/dom/plugins/test/mochitest/mochitest.ini b/dom/plugins/test/mochitest/mochitest.ini index 1e72c6efdddb..0080246fa230 100644 --- a/dom/plugins/test/mochitest/mochitest.ini +++ b/dom/plugins/test/mochitest/mochitest.ini @@ -91,6 +91,9 @@ skip-if = release_build # Bug 1172627 skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' # b2g(needs plugin support) b2g-debug(needs plugin support) b2g-desktop(needs plugin support) [test_painting.html] skip-if = (toolkit == "cocoa" && e10s) # bug 1252230 +[test_plugin_scroll_invalidation.html] +skip-if = toolkit != "gtk2" +support-files = plugin_scroll_invalidation.html [test_plugin_scroll_painting.html] skip-if = true # Bug 596491 [test_pluginstream_asfile.html] diff --git a/widget/tests/plugin_scroll_invalidation.html b/dom/plugins/test/mochitest/plugin_scroll_invalidation.html similarity index 100% rename from widget/tests/plugin_scroll_invalidation.html rename to dom/plugins/test/mochitest/plugin_scroll_invalidation.html diff --git a/widget/tests/test_plugin_scroll_invalidation.html b/dom/plugins/test/mochitest/test_plugin_scroll_invalidation.html similarity index 95% rename from widget/tests/test_plugin_scroll_invalidation.html rename to dom/plugins/test/mochitest/test_plugin_scroll_invalidation.html index 75737fc2ad01..65ea3498acd6 100644 --- a/widget/tests/test_plugin_scroll_invalidation.html +++ b/dom/plugins/test/mochitest/test_plugin_scroll_invalidation.html @@ -3,12 +3,13 @@ Test for plugin child widgets not being invalidated by scrolling - +

diff --git a/widget/tests/mochitest.ini b/widget/tests/mochitest.ini index 64496c97e2ad..e2f721111597 100644 --- a/widget/tests/mochitest.ini +++ b/widget/tests/mochitest.ini @@ -9,6 +9,3 @@ skip-if = toolkit != "windows" || (e10s && os == 'win') [test_picker_no_crash.html] skip-if = toolkit != "windows" || (e10s && os == 'win') support-files = window_picker_no_crash_child.html -[test_plugin_scroll_invalidation.html] -skip-if = toolkit != "gtk2" || e10s -support-files = plugin_scroll_invalidation.html