bug 472813 - Remove SeaMonkey workaround for test_bug465448.xul, r=roc a=tests-only
authorRobert Kaiser <kairo@kairo.at>
Wed, 14 Jan 2009 17:22:35 +0100
changeset 22821 45a7d92da7c7
parent 22820 61ff64286176
child 22822 57ef91f49aa0
push id435
push userkairo@kairo.at
push dateWed, 14 Jan 2009 16:23:51 +0000
reviewersroc, tests-only
bugs472813, 465448
milestone1.9.1b3pre
bug 472813 - Remove SeaMonkey workaround for test_bug465448.xul, r=roc a=tests-only
layout/base/tests/test_bug465448.xul
--- a/layout/base/tests/test_bug465448.xul
+++ b/layout/base/tests/test_bug465448.xul
@@ -10,30 +10,25 @@
   <script type="application/javascript" src="/MochiKit/packed.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>      
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>      
 
 <script><![CDATA[
 SimpleTest.waitForExplicitFinish();
 var win = window.open("data:text/html,<div style='height:200px; width:100px;'>", "_blank", "width=600,height=600");
 
-// doesn't succeed on SeaMonkey currently, see bug 469331
-// mark it todo there instead
-var testfunc_h = (navigator.userAgent.match(/ SeaMonkey\//)) ? todo : ok;
-var testfunc_w = (navigator.userAgent.match(/Windows/)) ? ok : testfunc_h;
-
 function loaded() {
   win.sizeToContent();
   win.sizeToContent();
   win.sizeToContent();
   win.sizeToContent();
   win.sizeToContent();
   win.sizeToContent();
-  testfunc_w(win.innerWidth >= 100, "innerWidth");
-  testfunc_h(win.innerHeight >= 200, "innerHeight");
+  ok(win.innerWidth >= 100, "innerWidth");
+  ok(win.innerHeight >= 200, "innerHeight");
   win.close();
   SimpleTest.finish();
 }
 ]]></script>
 
 <body xmlns="http://www.w3.org/1999/xhtml">
 <p id="display">
 </p>