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 1229567 - Back out bug 1194856 data: URL hack. r=dholbert

Browse Source
This commit is contained in:
Cameron McCormack 2016-01-04 09:26:58 +11:00
parent fb3ce76d6e
commit fff292702a
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/style/noframes.css
View File

@ -4,9 +4,6 @@
/* This sheet is added to the style set for documents with frames disabled */
/* Until bug 1194856 is fixed, if you update this file you should also update
the data: URL in nsLayoutStylesheetCache::NoFramesSheet(). */
noframes {
display: block;
}

3
layout/style/noscript.css
View File

@ -4,9 +4,6 @@
/* This sheet is added to the style set for documents with script disabled */
/* Until bug 1194856 is fixed, if you update this file you should also update
the data: URL in nsLayoutStylesheetCache::NoScriptSheet(). */
noscript {
display: none !important;
}

17
layout/style/nsLayoutStylesheetCache.cpp
View File

@ -193,13 +193,7 @@ nsLayoutStylesheetCache::NoScriptSheet()
EnsureGlobal();
if (!gStyleCache->mNoScriptSheet) {
// If you update the data: URL, also update noscript.css (See bug 1194856.)
LoadSheetURL(
#ifdef RELEASE_BUILD
"data:text/css,noscript { display%3A none !important%3B }",
#else
"resource://gre-resources/noscript.css",
#endif
LoadSheetURL("resource://gre-resources/noscript.css",
gStyleCache->mNoScriptSheet, eAgentSheetFeatures);
}
@ -212,14 +206,7 @@ nsLayoutStylesheetCache::NoFramesSheet()
EnsureGlobal();
if (!gStyleCache->mNoFramesSheet) {
// If you update the data: URL, also update noframes.css (See bug 1194856.)
LoadSheetURL(
#ifdef RELEASE_BUILD
"data:text/css,noframes { display%3A block%3B } "
"frame%2C frameset%2C iframe { display%3A none !important%3B }",
#else
"resource://gre-resources/noframes.css",
#endif
LoadSheetURL("resource://gre-resources/noframes.css",
gStyleCache->mNoFramesSheet, eAgentSheetFeatures);
}