Merge backouts related to bug 535564 and bug 542337
authorBenjamin Smedberg <benjamin@smedbergs.us>
Wed, 27 Jan 2010 13:22:25 -0500
changeset 46626 15fc08aacb4e7f5339447fb672f18f6740de0907
parent 46622 c465745b33b116334e84ff04bb0a438ea70a7a58 (current diff)
parent 46625 c04a2911a953c72a2a925d65554da9c5c7a32439 (diff)
child 46627 b4bd87233c78f019fab5adef916313f8b61a1781
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs535564, 542337
milestone1.9.3a1pre
Merge backouts related to bug 535564 and bug 542337
build/automation.py.in
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -732,15 +732,15 @@ user_pref("camino.use_system_proxy_setti
 
     status = self.waitForFinish(proc, utilityPath, timeout, maxTime, startTime)
     self.log.info("INFO | automation.py | Application ran for: %s", str(datetime.now() - startTime))
 
     # Do a final check for zombie child processes.
     self.checkForZombies(processLog)
     self.automationutils.checkForCrashes(os.path.join(profileDir, "minidumps"), symbolsPath)
 
+    if os.path.exists(processLog):
+      os.unlink(processLog)
+
     if self.IS_TEST_BUILD and runSSLTunnel:
       ssltunnelProcess.kill()
 
-    if os.path.exists(processLog):
-      os.unlink(processLog)
-
     return status
--- a/layout/generic/test/plugin_clipping_helper2.xhtml
+++ b/layout/generic/test/plugin_clipping_helper2.xhtml
@@ -10,20 +10,20 @@
 
 <!-- Use a XUL element here so we can get its boxObject.screenX/Y -->
 <hbox style="height:10px; position:absolute; left:0; top:0; z-index:-100;" id="h1"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <hbox style="width:100px;"></hbox><hbox id="h2"/>
 </hbox>
 
 <div id="d1" style="width:200px; overflow:hidden; position:absolute; top:0; left:0;">
-  <embed id="p1" type="application/x-test" wmode="window" style="position:relative" drawmode="solid"></embed>
+  <embed id="p1" type="application/x-test" wmode="window" style="position:relative"></embed>
 </div>
 <div id="d2" style="width:200px; height:200px; overflow:hidden; position:absolute; top:100px; left:0;">
-  <embed id="p2" type="application/x-test" wmode="window" drawmode="solid"></embed>
+  <embed id="p2" type="application/x-test" wmode="window"></embed>
   <div id="zbox" style="position:absolute; left:50px; top:50px; width:100px; height:100px; background:yellow;">
   </div>
 </div>
 
 <div id="scroll"
      style="position:absolute; top:0; left:0; width:300px; height:400px; overflow:scroll;">
   <div id="sbox"
        style="margin-top:350px; margin-left:50px; margin-bottom:1000px; width:100px; height:100px; background:blue;"></div>