mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-28 04:35:33 +00:00
Merge backouts related to bug 535564 and bug 542337
This commit is contained in:
commit
fa67893a27
@ -737,10 +737,10 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
|
||||
self.checkForZombies(processLog)
|
||||
self.automationutils.checkForCrashes(os.path.join(profileDir, "minidumps"), symbolsPath)
|
||||
|
||||
if self.IS_TEST_BUILD and runSSLTunnel:
|
||||
ssltunnelProcess.kill()
|
||||
|
||||
if os.path.exists(processLog):
|
||||
os.unlink(processLog)
|
||||
|
||||
if self.IS_TEST_BUILD and runSSLTunnel:
|
||||
ssltunnelProcess.kill()
|
||||
|
||||
return status
|
||||
|
@ -15,10 +15,10 @@
|
||||
</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>
|
||||
|
Loading…
Reference in New Issue
Block a user