wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 620991 - test_windowed_invalidate.html runs after mochitest shutdown, trips assertion / JS_Assert; r=ehsan a=NPOTB

Browse Source
This commit is contained in:
Robert O'Callahan 2011-01-24 17:16:39 -05:00
parent 7571185aaf
commit b4d3c9dfc6
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/plugin/test/mochitest/Makefile.in
View File

@ -120,11 +120,11 @@ _MOCHICHROME_FILES = \
$(NULL)
ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
ifneq ($(OS_ARCH),WINNT)
_MOCHITEST_FILES += \
test_visibility.html \
$(NULL)
ifneq ($(OS_ARCH),WINNT)
_MOCHICHROME_FILES += \
test_xulbrowser_plugin_visibility.xul \
xulbrowser_plugin_visibility.xul \

21
modules/plugin/test/mochitest/test_visibility.html
View File

@ -17,7 +17,7 @@
<script type="application/javascript">
SimpleTest.waitForExplicitFinish();
var didpaint = function() {};
var didPaint = function() {};
function startTest() {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
@ -29,14 +29,14 @@
}
}
didpaint = function() {
didPaint = function() {
ok(false, "Plugin should not paint until it is visible!");
};
ok(!p.isVisible(), "Plugin should not be visible.");
paintCountIs(p, 0, "Plugin should not have painted.");
didpaint = part2;
didPaint = part2;
p.style.visibility = 'visible';
}
@ -45,7 +45,7 @@
ok(p.isVisible(), "Plugin should now be visible.");
paintCountIs(p, 1, "Plugin should have painted once.");
didpaint = part3;
didPaint = part3;
p.setColor('FF0000FF'); // this causes an invalidate/repaint
}
@ -58,7 +58,7 @@
ok(p.isVisible(), "Plugin should still be visible.");
paintCountIs(p, 2, "Plugin should have painted twice.");
didpaint = function() {
didPaint = function() {
ok(false, "Plugin should not paint when it is invisible.");
};
@ -85,9 +85,18 @@
setTimeout(SimpleTest.finish, 500);
// wait to make sure we don't actually paint
}
function inPaint() {
// We're actually in the middle of painting the plugin so don't do anything
// complex here, for the sake of cases where async plugin painting isn't
// enabled yet
setTimeout(didPaint, 0);
// Don't run that didPaint callback again
didPaint = function() {};
}
</script>
<embed id="theplugin" class="hidden" type="application/x-test" drawmode="solid" color="FFFF0000" paintscript="setTimeout(didpaint, 0)"></embed>
<embed id="theplugin" class="hidden" type="application/x-test" drawmode="solid" color="FFFF0000" paintscript="inPaint()"></embed>
<script type="application/javascript">
var p = document.getElementById('theplugin');