Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1013457 - remove browser.frames.enabled pref, r=bz

Browse Source
This commit is contained in:
Gijs Kruitbosch 2014-05-23 10:54:58 +01:00
parent 7c865568d2
commit db892a8095
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
content/base/src/nsPlainTextSerializer.cpp
View File

@ -182,13 +182,8 @@ nsPlainTextSerializer::Init(uint32_t aFlags, uint32_t aWrapColumn,
}
}
// XXX We should let the caller pass this in.
if (Preferences::GetBool("browser.frames.enabled")) {
mFlags &= ~nsIDocumentEncoder::OutputNoFramesContent;
}
else {
mFlags |= nsIDocumentEncoder::OutputNoFramesContent;
}
// XXX We should let the caller decide whether to do this or not
mFlags &= ~nsIDocumentEncoder::OutputNoFramesContent;
return NS_OK;
}

3
content/base/test/chrome/test_bug650784.html
View File

@ -31,8 +31,7 @@ is(s.convertToPlainText("<body><noscript>b<span>a</span>r</noscript>foo", c.Outp
is(s.convertToPlainText("foo\u00A0bar", c.OutputPersistNBSP | c.OutputLFLineBreak, 0), "foo\u00A0bar", "Wrong conversion result 5");
is(s.convertToPlainText("foo\u00A0bar", c.OutputLFLineBreak, 0), "foo bar", "Wrong conversion result 6");
is(s.convertToPlainText("<body><noframes>bar</noframes>foo", c.OutputLFLineBreak, 0), "foo", "Wrong conversion result 7");
// OutputNoFramesContent doesn't actually work, because the flag gets overridden by
// the browser.frames.enabled pref in all cases.
// OutputNoFramesContent doesn't actually work, because the flag gets overridden in all cases.
is(s.convertToPlainText("<body><noframes>bar</noframes>foo", c.OutputNoFramesContent | c.OutputLFLineBreak, 0), "foo", "Wrong conversion result 8");
is(s.convertToPlainText("<i>foo</i> <b>bar</b>", c.OutputFormatted | c.OutputLFLineBreak, 0), "/foo/ *bar*\n", "Wrong conversion result 9");
is(s.convertToPlainText("<p>foo</p> <p>bar</p>", c.OutputLFLineBreak, 0), "foo\n\nbar", "Wrong conversion result 10");

3
docshell/base/nsDocShell.cpp
View File

@ -5193,9 +5193,6 @@ nsDocShell::Create()
NS_ENSURE_TRUE(Preferences::GetRootBranch(), NS_ERROR_FAILURE);
mCreated = true;
mAllowSubframes =
Preferences::GetBool("browser.frames.enabled", mAllowSubframes);
if (gValidateOrigin == 0xffffffff) {
// Check pref to see if we should prevent frameset spoofing
gValidateOrigin =

3
modules/libpref/src/init/all.js
View File

@ -549,9 +549,6 @@ pref("accessibility.typeaheadfind.matchesCountLimit", 100);
// use Mac OS X Appearance panel text smoothing setting when rendering text, disabled by default
pref("gfx.use_text_smoothing_setting", false);
// loading and rendering of framesets and iframes
pref("browser.frames.enabled", true);
// Number of characters to consider emphasizing for rich autocomplete results
pref("toolkit.autocomplete.richBoundaryCutoff", 200);