wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge backouts related to bug 535564 and bug 542337

Browse Source
This commit is contained in:
Benjamin Smedberg 2010-01-27 13:22:25 -05:00
commit 93d6ce34da
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/automation.py.in
View File

@ -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

4
layout/generic/test/plugin_clipping_helper2.xhtml
View File

@ -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>