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

Bug 855730 - Add more logging and change the order back to the original order. Reordering should reduce the number of timeouts that spiked when we first changed the order. r=smaug

Browse Source
This commit is contained in:
Tanvi Vyas 2013-04-24 14:43:14 -07:00
parent fcf7078a8e
commit b06f8be2dc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/test/file_mixed_content_frameNavigation_secure_grandchild.html
View File

@ -20,10 +20,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
var child = document.getElementById("child");
function navigationStatus(child)
{
var loc;
// When the page is navigating, it goes through about:blank and we will get a permission denied for loc.
// Catch that specific exception and return
try {
var loc = child.contentDocument.location;
loc = document.getElementById("child").contentDocument.location;
} catch(e) {
if (e.message && e.message.indexOf("Permission denied to access property") == -1) {
// We received an exception we didn't expect.
@ -42,6 +43,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
}
else {
// After we have called setTimeout the maximum number of times, assume navigating the iframe is blocked
dump("\nThe current location of the grandchild iframe is: "+loc+".\n");
dump("\nWe have past the maximum timeout. Navigating a grandchild iframe from an https location to an http location on a secure page failed. We are about to post message to the top level page\n");
parent.parent.postMessage({"test": "securePage_navigate_grandchild", "msg": "navigating to insecure grandchild iframe blocked on secure page"}, "http://mochi.test:8888");
dump("\nAttempted postMessage\n");

4
content/base/test/test_mixed_content_blocker_frameNavigation.html
View File

@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
var counter = 0;
var origBlockActive = SpecialPowers.getBoolPref("security.mixed_content.block_active_content");
SpecialPowers.setBoolPref("security.mixed_content.block_active_content", false);
SpecialPowers.setBoolPref("security.mixed_content.block_active_content", true);
var blockActive = SpecialPowers.getBoolPref("security.mixed_content.block_active_content");
@ -61,7 +61,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
}
//call to change the preferences
counter++;
SpecialPowers.setBoolPref("security.mixed_content.block_active_content", true);
SpecialPowers.setBoolPref("security.mixed_content.block_active_content", false);
blockActive = SpecialPowers.getBoolPref("security.mixed_content.block_active_content");
log("blockActive set to "+blockActive+".");
secureTestsStarted = false;