Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1117337 - Make icon URIs constructable via XPCOM. r=seth

Browse Source 
--HG--
rename : image/decoders/icon/nsIIconURI.idl => image/public/nsIIconURI.idl
This commit is contained in:
Blake Kaplan 2015-02-12 15:41:21 -08:00
parent 436b43b3ce
commit a50bed555a
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
b2g/installer/package-manifest.in
View File

@ -237,7 +237,6 @@
@BINPATH@/components/htmlparser.xpt
@BINPATH@/components/identity.xpt
@BINPATH@/components/imglib2.xpt
@BINPATH@/components/imgicon.xpt
@BINPATH@/components/inspector.xpt
@BINPATH@/components/intl.xpt
@BINPATH@/components/jar.xpt

1
browser/installer/package-manifest.in
View File

@ -263,7 +263,6 @@
@RESPATH@/components/htmlparser.xpt
@RESPATH@/components/identity.xpt
@RESPATH@/components/imglib2.xpt
@RESPATH@/components/imgicon.xpt
@RESPATH@/components/inspector.xpt
@RESPATH@/components/intl.xpt
@RESPATH@/components/jar.xpt

6
image/decoders/icon/moz.build
View File

@ -4,12 +4,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
XPIDL_SOURCES += [
'nsIIconURI.idl',
]
XPIDL_MODULE = 'imgicon'
UNIFIED_SOURCES += [
'nsIconModule.cpp',
'nsIconProtocolHandler.cpp',

3
image/decoders/icon/nsIconModule.cpp
View File

@ -19,11 +19,14 @@
{ 0x99, 0x5, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b } }
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconProtocolHandler)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMozIconURI)
NS_DEFINE_NAMED_CID(NS_ICONPROTOCOL_CID);
NS_DEFINE_NAMED_CID(NS_MOZICONURI_CID);
static const mozilla::Module::CIDEntry kIconCIDs[] = {
{ &kNS_ICONPROTOCOL_CID, false, nullptr, nsIconProtocolHandlerConstructor },
{ &kNS_MOZICONURI_CID, false, nullptr, nsMozIconURIConstructor },
{ nullptr }
};

8
image/decoders/icon/nsIconURI.h
View File

@ -11,14 +11,6 @@
#include "nsCOMPtr.h"
#include "nsString.h"
#define NS_MOZICONURI_CID \
{ \
0x43a88e0e, \
0x2d37, \
0x11d5, \
{ 0x99, 0x7, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b } \
}
class nsMozIconURI MOZ_FINAL : public nsIMozIconURI
{
public:

1
image/public/moz.build
View File

@ -15,6 +15,7 @@ XPIDL_SOURCES += [
'imgIRequest.idl',
'imgIScriptedNotificationObserver.idl',
'imgITools.idl',
'nsIIconURI.idl',
]
XPIDL_MODULE = 'imglib2'

13
image/decoders/icon/nsIIconURI.idl → image/public/nsIIconURI.idl
View File

@ -69,3 +69,16 @@ interface nsIMozIconURI : nsIURI
/// fileExtension: The file extension of the file which we are looking up.
readonly attribute ACString fileExtension;
};
%{C++
// CID for nsMozIconURI, if implemented on this platform.
#define NS_MOZICONURI_CID \
{ \
0x43a88e0e, \
0x2d37, \
0x11d5, \
{ 0x99, 0x7, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b } \
}
%}

1
mobile/android/installer/package-manifest.in
View File

@ -191,7 +191,6 @@
@BINPATH@/components/html5.xpt
@BINPATH@/components/htmlparser.xpt
@BINPATH@/components/imglib2.xpt
@BINPATH@/components/imgicon.xpt
@BINPATH@/components/inspector.xpt
@BINPATH@/components/intl.xpt
@BINPATH@/components/jar.xpt