mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

bug 521191: backed out e22bef491d84

This commit is contained in:
Taras Glek 2009-10-08 16:44:44 -07:00
Родитель 28daeffe12 387de8cf2e
Коммит d33c6f1c4a
19 изменённых файлов: 48 добавлений и 37 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
browser/base/content/pageinfo/pageInfo.xul
Просмотреть файл

@ -289,7 +289,7 @@
<image id="thepreviewimage"/>
</hbox>
<hbox id="brokenimagecontainer" pack="center" collapsed="true">
<image id="brokenimage" src="resource://gre-resources/broken-image.png"/>
<image id="brokenimage" src="resource:///res/broken-image.png"/>
</hbox>
</vbox>
</vbox>

9
browser/installer/package-manifest.in
Просмотреть файл

@ -364,6 +364,11 @@
; [Layout Engine Resources]
; Style Sheets, Graphics and other Resources used by the layout engine.
@BINPATH@/res/hiddenWindow.html
@BINPATH@/res/ua.css
@BINPATH@/res/html.css
@BINPATH@/res/quirk.css
@BINPATH@/res/forms.css
@BINPATH@/res/EditorOverride.css
@BINPATH@/res/contenteditable.css
@BINPATH@/res/designmode.css
@ -387,7 +392,11 @@
@BINPATH@/res/table-remove-row.gif
@BINPATH@/res/arrowd.gif
@BINPATH@/res/grabber.gif
@BINPATH@/res/viewsource.css
@BINPATH@/res/mathml.css
@BINPATH@/res/arrow.gif
@BINPATH@/res/loading-image.png
@BINPATH@/res/broken-image.png
#ifdef XP_MACOSX
@BINPATH@/res/cursors/*
#endif

9
browser/installer/removed-files.in
Просмотреть файл

@ -574,15 +574,6 @@ res/wincharset.properties
res/maccharset.properties
res/unixcharset.properties
res/cmessage.txt
res/hiddenWindow.html
res/ua.css
res/html.css
res/quirk.css
res/forms.css
res/viewsource.css
res/mathml.css
res/loading-image.png
res/broken-image.png
res/html/gopher-audio.gif
res/html/gopher-binary.gif
res/html/gopher-find.gif

2
caps/tests/mochitest/test_bug423375.html
Просмотреть файл

@ -36,7 +36,7 @@ function tryLoad(url)
is(tryLoad("chrome://global/content/mozilla.xhtml"), "denied",
"content should have been prevented from loading chrome: URL");
is(tryLoad("resource://gre-resources/html.css"), "denied",
is(tryLoad("resource://gre/res/html.css"), "denied",
"content should have been prevented from loading resource: URL");
</script>
</pre>

10
dom/src/Makefile.in
Просмотреть файл

@ -45,3 +45,13 @@ include $(DEPTH)/config/autoconf.mk
DIRS = jsurl events storage offline json geolocation threads
include $(topsrcdir)/config/rules.mk
_FILES = \
$(srcdir)/res/hiddenWindow.html \
$(NULL)
libs::
$(INSTALL) $(_FILES) $(DIST)/bin/res
install::
$(SYSINSTALL) $(IFLAGS1) $(_FILES) $(DESTDIR)$(mozappdir)/res

2
dom/src/jar.mn
Просмотреть файл

@ -1,2 +0,0 @@
toolkit.jar:
res/hiddenWindow.html (res/hiddenWindow.html)

7
layout/generic/Makefile.in
Просмотреть файл

@ -143,6 +143,11 @@ RESOURCES_HTML = \
$(srcdir)/folder.png \
$(NULL)
RESOURCES = \
$(srcdir)/broken-image.png \
$(srcdir)/loading-image.png \
$(NULL)
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
@ -170,8 +175,10 @@ endif
libs::
$(INSTALL) $(RESOURCES_HTML) $(DIST)/bin/res/html
$(INSTALL) $(RESOURCES) $(DIST)/bin/res
install::
$(SYSINSTALL) $(IFLAGS1) $(RESOURCES_HTML) $(DESTDIR)$(mozappdir)/res/html
$(SYSINSTALL) $(IFLAGS1) $(RESOURCES) $(DESTDIR)$(mozappdir)/res
DEFINES += -D_IMPL_NS_LAYOUT

3
layout/generic/jar.mn
Просмотреть файл

@ -1,3 +0,0 @@
toolkit.jar:
res/broken-image.png (broken-image.png)
res/loading-image.png (loading-image.png)

4
layout/generic/nsImageFrame.cpp
Просмотреть файл

@ -1713,8 +1713,8 @@ nsresult nsImageFrame::LoadIcons(nsPresContext *aPresContext)
{
NS_ASSERTION(!gIconLoad, "called LoadIcons twice");
NS_NAMED_LITERAL_STRING(loadingSrc,"resource://gre-resources/loading-image.png");
NS_NAMED_LITERAL_STRING(brokenSrc,"resource://gre-resources/broken-image.png");
NS_NAMED_LITERAL_STRING(loadingSrc,"resource://gre/res/loading-image.png");
NS_NAMED_LITERAL_STRING(brokenSrc,"resource://gre/res/broken-image.png");
gIconLoad = new IconLoad();
if (!gIconLoad)

3
layout/mathml/Makefile.in
Просмотреть файл

@ -96,6 +96,9 @@ FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
libs::
$(INSTALL) $(srcdir)/mathml.css $(DIST)/bin/res
font_properties = \
mathfontUnicode.properties \
mathfontSTIXNonUnicode.properties \

2
layout/mathml/jar.mn
Просмотреть файл

@ -1,2 +0,0 @@
toolkit.jar:
res/mathml.css (mathml.css)

2
layout/mathml/mathml-css.pl
Просмотреть файл

@ -12,7 +12,7 @@ if (!($css =~ m|\@import.*mathml\.css|))
{
# since bad end of lines cause troubles on some platforms
# do a little perl magic for dos2{unix or mac} here
$css =~ s#(\@import[^\@]+\;)(\cM?)(\n\cM?\n)#$1$2\n\@import url\(resource://gre-resources/mathml\.css\);$2$3#;
$css =~ s#(\@import[^\@]+\;)(\cM?)(\n\cM?\n)#$1$2\n\@import url\(resource://gre/res/mathml\.css\);$2$3#;
open(UA, ">$ua");
print UA $css;
close(UA);

4
layout/style/Makefile.in
Просмотреть файл

@ -156,6 +156,10 @@ LOCAL_INCLUDES = \
$(NULL)
_FILES = \
ua.css \
html.css \
quirk.css \
viewsource.css \
arrow.gif \
arrowd.gif \
contenteditable.css \

6
layout/style/jar.mn
Просмотреть файл

@ -1,6 +0,0 @@
toolkit.jar:
res/ua.css (ua.css)
res/html.css (html.css)
res/quirk.css (quirk.css)
res/viewsource.css (viewsource.css)
res/forms.css (forms.css)

6
layout/style/nsLayoutStylesheetCache.cpp
Просмотреть файл

@ -102,7 +102,7 @@ nsLayoutStylesheetCache::FormsSheet()
if (!gStyleCache->mFormsSheet) {
nsCOMPtr<nsIURI> sheetURI;
NS_NewURI(getter_AddRefs(sheetURI),
NS_LITERAL_CSTRING("resource://gre-resources/forms.css"));
NS_LITERAL_CSTRING("resource://gre/res/forms.css"));
// forms.css needs access to unsafe rules
if (sheetURI)
@ -179,13 +179,13 @@ nsLayoutStylesheetCache::nsLayoutStylesheetCache()
// And make sure that we load our UA sheets. No need to do this
// per-profile, since they're profile-invariant.
nsCOMPtr<nsIURI> uri;
NS_NewURI(getter_AddRefs(uri), "resource://gre-resources/ua.css");
NS_NewURI(getter_AddRefs(uri), "resource://gre/res/ua.css");
if (uri) {
LoadSheet(uri, mUASheet, PR_TRUE);
}
NS_ASSERTION(mUASheet, "Could not load ua.css");
NS_NewURI(getter_AddRefs(uri), "resource://gre-resources/quirk.css");
NS_NewURI(getter_AddRefs(uri), "resource://gre/res/quirk.css");
if (uri) {
LoadSheet(uri, mQuirkSheet, PR_TRUE);
}

2
layout/style/ua.css
Просмотреть файл

@ -34,7 +34,7 @@
*
* ***** END LICENSE BLOCK ***** */
@import url(resource://gre-resources/html.css);
@import url(resource://gre/res/html.css);
@import url(chrome://global/content/xul.css);
@namespace parsererror url(http://www.mozilla.org/newlayout/xml/parsererror.xml);

6
parser/htmlparser/src/nsExpatDriver.cpp
Просмотреть файл

@ -290,9 +290,9 @@ static const nsCatalogData kCatalogTable[] = {
{ "-//W3C//DTD XHTML 1.0 Strict//EN", "xhtml11.dtd", nsnull },
{ "-//W3C//DTD XHTML 1.0 Frameset//EN", "xhtml11.dtd", nsnull },
{ "-//W3C//DTD XHTML Basic 1.0//EN", "xhtml11.dtd", nsnull },
{ "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN", "mathml.dtd", "resource://gre-resources/res/mathml.css" },
{ "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN", "mathml.dtd", "resource://gre-resources/mathml.css" },
{ "-//W3C//DTD MathML 2.0//EN", "mathml.dtd", "resource://gre-resources/mathml.css" },
{ "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN", "mathml.dtd", "resource://gre/res/mathml.css" },
{ "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN", "mathml.dtd", "resource://gre/res/mathml.css" },
{ "-//W3C//DTD MathML 2.0//EN", "mathml.dtd", "resource://gre/res/mathml.css" },
{ "-//WAPFORUM//DTD XHTML Mobile 1.0//EN", "xhtml11.dtd", nsnull },
{ nsnull, nsnull, nsnull }
};

4
parser/htmlparser/src/nsViewSourceHTML.cpp
Просмотреть файл

@ -281,7 +281,7 @@ CViewSourceHTML::WillBuildModel(const CParserContext& aParserContext,
fprintf(gDumpFile, "Source of: ");
fputs(NS_ConvertUTF16toUTF8(mFilename).get(), gDumpFile);
fprintf(gDumpFile, "</title>\n");
fprintf(gDumpFile, "<link rel=\"stylesheet\" type=\"text/css\" href=\"resource://gre-resources/viewsource.css\">\n");
fprintf(gDumpFile, "<link rel=\"stylesheet\" type=\"text/css\" href=\"resource://gre/res/viewsource.css\">\n");
fprintf(gDumpFile, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n");
fprintf(gDumpFile, "</head>\n");
fprintf(gDumpFile, "<body id=\"viewsource\">\n");
@ -371,7 +371,7 @@ NS_IMETHODIMP CViewSourceHTML::BuildModel(nsITokenizer* aTokenizer,
AddAttrToNode(theNode, theAllocator,
NS_LITERAL_STRING("href"),
NS_LITERAL_STRING("resource://gre-resources/viewsource.css"));
NS_LITERAL_STRING("resource://gre/res/viewsource.css"));
mSink->AddLeaf(theNode);
}

2
xpfe/appshell/src/nsAppShellService.cpp
Просмотреть файл

@ -77,7 +77,7 @@
#include "nsIUnicodeDecoder.h"
// Default URL for the hidden window, can be overridden by a pref on Mac
#define DEFAULT_HIDDENWINDOW_URL "resource://gre-resources/hiddenWindow.html"
#define DEFAULT_HIDDENWINDOW_URL "resource://gre/res/hiddenWindow.html"
class nsIAppShell;