Commit 2be42eea authored by criss's avatar criss
Browse files

Backed out changeset ab805f2926d5 (bug 1716290) for causing failures on...

Backed out changeset ab805f2926d5 (bug 1716290) for causing failures on link-header-preload.html. CLOSED TREE
parent e0a129f4
Loading
Loading
Loading
Loading
+0 −8
Original line number Original line Diff line number Diff line
@@ -67,10 +67,6 @@ support-files =
  file_bug1648464-1-child.html
  file_bug1648464-1-child.html
  file_bug1688368-1.sjs
  file_bug1688368-1.sjs
  file_bug1691153.html
  file_bug1691153.html
  file_bug1716290-1.sjs
  file_bug1716290-2.sjs
  file_bug1716290-3.sjs
  file_bug1716290-4.sjs


[browser_TopLevelNavigationDelegate.js]
[browser_TopLevelNavigationDelegate.js]
support-files =
support-files =
@@ -220,7 +216,3 @@ https_first_disabled = true
[browser_bug1705872.js]
[browser_bug1705872.js]
[browser_isInitialDocument.js]
[browser_isInitialDocument.js]
https_first_disabled = true
https_first_disabled = true
[browser_bug1716290-1.js]
[browser_bug1716290-2.js]
[browser_bug1716290-3.js]
[browser_bug1716290-4.js]
+0 −24
Original line number Original line Diff line number Diff line
function test() {
  var rootDir = "http://mochi.test:8888/browser/docshell/test/browser/";
  runCharsetTest(
    rootDir + "file_bug1716290-1.sjs",
    afterOpen,
    afterChangeCharset
  );
}

function afterOpen() {
  is(
    content.document.characterSet,
    "Shift_JIS",
    "Doc should report Shift_JIS initially"
  );
}

function afterChangeCharset() {
  is(
    content.document.characterSet,
    "windows-1252",
    "Doc should report windows-1252 subsequently (detector should override header)"
  );
}
+0 −24
Original line number Original line Diff line number Diff line
function test() {
  var rootDir = "http://mochi.test:8888/browser/docshell/test/browser/";
  runCharsetTest(
    rootDir + "file_bug1716290-2.sjs",
    afterOpen,
    afterChangeCharset
  );
}

function afterOpen() {
  is(
    content.document.characterSet,
    "Shift_JIS",
    "Doc should report Shift_JIS initially"
  );
}

function afterChangeCharset() {
  is(
    content.document.characterSet,
    "windows-1252",
    "Doc should report windows-1252 subsequently (detector should override meta resolving to the replacement encoding)"
  );
}
+0 −24
Original line number Original line Diff line number Diff line
function test() {
  var rootDir = "http://mochi.test:8888/browser/docshell/test/browser/";
  runCharsetTest(
    rootDir + "file_bug1716290-3.sjs",
    afterOpen,
    afterChangeCharset
  );
}

function afterOpen() {
  is(
    content.document.characterSet,
    "Shift_JIS",
    "Doc should report Shift_JIS initially"
  );
}

function afterChangeCharset() {
  is(
    content.document.characterSet,
    "replacement",
    "Doc should report replacement subsequently (non-ASCII-compatible HTTP header should override detector)"
  );
}
+0 −24
Original line number Original line Diff line number Diff line
function test() {
  var rootDir = "http://mochi.test:8888/browser/docshell/test/browser/";
  runCharsetTest(
    rootDir + "file_bug1716290-4.sjs",
    afterOpen,
    afterChangeCharset
  );
}

function afterOpen() {
  is(
    content.document.characterSet,
    "Shift_JIS",
    "Doc should report Shift_JIS initially"
  );
}

function afterChangeCharset() {
  is(
    content.document.characterSet,
    "UTF-16BE",
    "Doc should report UTF-16BE subsequently (BOM should override detector)"
  );
}
Loading