nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 780562 - Remove support for the chrome "platform" flag. r=bsmedberg

Browse source 
Now that the sole use of the flag was removed, remove support for it.

--HG--
extra : rebase_source : 009290ef2938c91b14a2eabe74be6f69ce1dbdf3
This commit is contained in:
Mike Hommey 2017-04-14 20:48:53 +09:00
parent a8b3b97bc4
commit a48a121ef2
3 changed files with 1 additions and 21 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

10
chrome/nsChromeRegistry.cpp
View file

@ -293,16 +293,6 @@ nsChromeRegistry::ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult)
if (NS_FAILED(rv))
return rv;
if (flags & PLATFORM_PACKAGE) {
#if defined(XP_WIN)
path.Insert("win/", 0);
#elif defined(XP_MACOSX)
path.Insert("mac/", 0);
#else
path.Insert("unix/", 0);
#endif
}
if (!baseURI) {
LogMessage("No chrome package registered for chrome://%s/%s/%s",
package.get(), provider.get(), path.get());

4
chrome/nsChromeRegistry.h
View file

@ -136,10 +136,6 @@ public:
// Available flags
enum {
// This is a "platform" package (e.g. chrome://global-platform/).
// Appends one of win/ unix/ mac/ to the base URI.
PLATFORM_PACKAGE = 1 << 0,
// This package should use the new XPCNativeWrappers to separate
// content from chrome. This flag is currently unused (because we call
// into xpconnect at registration time).

8
xpcom/components/ManifestParser.cpp
View file

@ -56,7 +56,7 @@ struct ManifestDirective
bool allowbootstrap;
// The platform/contentaccessible flags only apply to content directives.
// The contentaccessible flags only apply to content directives.
bool contentflags;
// Function to handle this directive. This isn't a union because C++ still
@ -449,7 +449,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
nsChromeRegistry::ManifestProcessingContext chromecx(aType, aFile);
nsresult rv;
NS_NAMED_LITERAL_STRING(kPlatform, "platform");
NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible");
NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
@ -685,11 +684,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
if (directive->contentflags) {
bool flag;
if (CheckFlag(kPlatform, wtoken, flag)) {
if (flag)
flags |= nsChromeRegistry::PLATFORM_PACKAGE;
continue;
}
if (CheckFlag(kContentAccessible, wtoken, flag)) {
if (flag)
flags |= nsChromeRegistry::CONTENT_ACCESSIBLE;