Merge backout

This commit is contained in:
Mounir Lamouri 2011-05-17 11:44:32 +02:00
commit 53f16e074a
2 changed files with 9 additions and 6 deletions

View File

@ -61,8 +61,9 @@ static void
TouchBadMemory() TouchBadMemory()
{ {
// XXX this should use the frame poisoning code // XXX this should use the frame poisoning code
gDummyCounter += *((int *) 0); // TODO annotation saying we know volatile int *p = 0;
// this is crazy gDummyCounter += *p; // TODO annotation saying we know
// this is crazy
} }
void void

View File

@ -17,6 +17,12 @@
var p = document.getElementById('theplugin'); var p = document.getElementById('theplugin');
function startTest() { function startTest() {
if (!p.hasWidget()) {
todo(false, "This test is only relevant for windowed plugins");
SimpleTest.finish();
return;
}
// Wait for the plugin to have painted once. // Wait for the plugin to have painted once.
var interval = setInterval(function() { var interval = setInterval(function() {
if (!p.getPaintCount()) if (!p.getPaintCount())
@ -29,10 +35,6 @@
} }
function doTest() { function doTest() {
if (!p.hasWidget()) {
todo(false, "This test is only relevant for windowed plugins");
return;
}
is(p.getClipRegionRectCount(), 1, "getClipRegionRectCount should be a single rect"); is(p.getClipRegionRectCount(), 1, "getClipRegionRectCount should be a single rect");
is(p.getClipRegionRectEdge(0,2) - p.getClipRegionRectEdge(0,0), 100, "width of clip region rect"); is(p.getClipRegionRectEdge(0,2) - p.getClipRegionRectEdge(0,0), 100, "width of clip region rect");
is(p.getClipRegionRectEdge(0,3) - p.getClipRegionRectEdge(0,1), 50, "height of clip region rect"); is(p.getClipRegionRectEdge(0,3) - p.getClipRegionRectEdge(0,1), 50, "height of clip region rect");