bug 472813 - Remove SeaMonkey workaround for test_bug465448.xul, r=roc
authorRobert Kaiser <kairo@kairo.at>
Wed, 14 Jan 2009 14:48:22 +0100
changeset 23654 264eca4c6c5b
parent 23653 32165e24519a
child 23655 ffdf8f75910c
push id4664
push userkairo@kairo.at
push dateWed, 14 Jan 2009 13:49:00 +0000
treeherdermozilla-central@ffdf8f75910c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs472813, 465448
milestone1.9.2a1pre
bug 472813 - Remove SeaMonkey workaround for test_bug465448.xul, r=roc
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>