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 940235 - Build uriloader in unified mode. r=ehsan

Browse Source
This commit is contained in:
Chris Peterson 2013-11-18 23:50:59 -08:00
parent 13c6cf2cf5
commit 6c90c8b9d1
11 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
uriloader/base/moz.build
View File

@ -23,7 +23,7 @@ EXPORTS += [
'nsURILoader.h',
]
SOURCES += [
UNIFIED_SOURCES += [
'nsDocLoader.cpp',
'nsURILoader.cpp',
]

4
uriloader/exthandler/ExternalHelperAppChild.h
View File

@ -4,6 +4,8 @@
* 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/. */
#ifndef mozilla_dom_ExternalHelperAppChild_h
#define mozilla_dom_ExternalHelperAppChild_h
#include "mozilla/dom/PExternalHelperAppChild.h"
#include "nsIStreamListener.h"
@ -34,3 +36,5 @@ private:
} // namespace dom
} // namespace mozilla
#endif // mozilla_dom_ExternalHelperAppChild_h

30
uriloader/exthandler/moz.build
View File

@ -56,64 +56,74 @@ EXPORTS.mozilla.dom += [
'ExternalHelperAppParent.h',
]
SOURCES += [
UNIFIED_SOURCES += [
'ExternalHelperAppChild.cpp',
'ExternalHelperAppParent.cpp',
'nsExternalHelperAppService.cpp',
'nsExternalProtocolHandler.cpp',
'nsLocalHandlerApp.cpp',
'nsMIMEInfoImpl.cpp',
]
# These files can't be built in unified mode because they force NSPR logging.
SOURCES += [
'nsExternalHelperAppService.cpp',
'nsExternalProtocolHandler.cpp',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [
UNIFIED_SOURCES += [
'mac/nsLocalHandlerAppMac.mm',
'mac/nsMIMEInfoMac.mm',
]
# These files can't be built in unified mode because they force NSPR logging.
SOURCES += [
'mac/nsOSHelperAppService.mm',
]
else:
# These files can't be built in unified mode because they force NSPR logging.
SOURCES += [
osdir + '/nsOSHelperAppService.cpp',
]
if CONFIG['MOZ_ENABLE_GTK']:
SOURCES += [
UNIFIED_SOURCES += [
'unix/nsGNOMERegistry.cpp',
'unix/nsMIMEInfoUnix.cpp',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
SOURCES += [
UNIFIED_SOURCES += [
'android/nsAndroidHandlerApp.cpp',
'android/nsExternalSharingAppService.cpp',
'android/nsExternalURLHandlerService.cpp',
'android/nsMIMEInfoAndroid.cpp',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
SOURCES += [
UNIFIED_SOURCES += [
'unix/nsGNOMERegistry.cpp',
'unix/nsMIMEInfoUnix.cpp',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
# These files can't be built in unified mode because they force NSPR logging.
SOURCES += [
'win/nsMIMEInfoWin.cpp',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
# These files can't be built in unified mode because they force NSPR logging.
SOURCES += [
'os2/nsMIMEInfoOS2.cpp',
]
if CONFIG['MOZ_ENABLE_DBUS']:
SOURCES += [
UNIFIED_SOURCES += [
'nsDBusHandlerApp.cpp',
]
if CONFIG['MOZ_ENABLE_MEEGOTOUCHSHARE']:
SOURCES += [
UNIFIED_SOURCES += [
'unix/nsMeegoExternalSharingAppService.cpp',
]
if CONFIG['MOZ_ENABLE_CONTENTACTION']:
SOURCES += [
UNIFIED_SOURCES += [
'nsContentHandlerApp.cpp',
]

5
uriloader/exthandler/unix/nsGNOMERegistry.h
View File

@ -2,6 +2,9 @@
* 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/. */
#ifndef nsGNOMERegistry_h
#define nsGNOMERegistry_h
#include "nsIURI.h"
#include "nsCOMPtr.h"
@ -21,3 +24,5 @@ class nsGNOMERegistry
static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType);
};
#endif // nsGNOMERegistry_h

3
uriloader/prefetch/OfflineCacheUpdateChild.cpp
View File

@ -47,8 +47,11 @@ using mozilla::dom::TabChild;
//
extern PRLogModuleInfo *gOfflineCacheUpdateLog;
#endif
#undef LOG
#define LOG(args) PR_LOG(gOfflineCacheUpdateLog, 4, args)
#undef LOG_ENABLED
#define LOG_ENABLED() PR_LOG_TEST(gOfflineCacheUpdateLog, 4)
namespace mozilla {

4
uriloader/prefetch/OfflineCacheUpdateGlue.cpp
View File

@ -26,7 +26,11 @@
//
extern PRLogModuleInfo *gOfflineCacheUpdateLog;
#endif
#undef LOG
#define LOG(args) PR_LOG(gOfflineCacheUpdateLog, 4, args)
#undef LOG_ENABLED
#define LOG_ENABLED() PR_LOG_TEST(gOfflineCacheUpdateLog, 4)
namespace mozilla {

3
uriloader/prefetch/OfflineCacheUpdateParent.cpp
View File

@ -27,8 +27,11 @@ using mozilla::dom::TabParent;
//
extern PRLogModuleInfo *gOfflineCacheUpdateLog;
#endif
#undef LOG
#define LOG(args) PR_LOG(gOfflineCacheUpdateLog, 4, args)
#undef LOG_ENABLED
#define LOG_ENABLED() PR_LOG_TEST(gOfflineCacheUpdateLog, 4)
namespace mozilla {

10
uriloader/prefetch/moz.build
View File

@ -20,15 +20,19 @@ EXPORTS.mozilla.docshell += [
'OfflineCacheUpdateParent.h',
]
SOURCES += [
'nsOfflineCacheUpdate.cpp',
'nsOfflineCacheUpdateService.cpp',
UNIFIED_SOURCES += [
'nsPrefetchService.cpp',
'OfflineCacheUpdateChild.cpp',
'OfflineCacheUpdateGlue.cpp',
'OfflineCacheUpdateParent.cpp',
]
# These files can't be built in unified mode because they force NSPR logging.
SOURCES += [
'nsOfflineCacheUpdate.cpp',
'nsOfflineCacheUpdateService.cpp',
]
IPDL_SOURCES += [
'POfflineCacheUpdate.ipdl',
]

4
uriloader/prefetch/nsOfflineCacheUpdate.cpp
View File

@ -69,7 +69,11 @@ static const int32_t kCustomProfileQuota = 512000;
//
extern PRLogModuleInfo *gOfflineCacheUpdateLog;
#endif
#undef LOG
#define LOG(args) PR_LOG(gOfflineCacheUpdateLog, 4, args)
#undef LOG_ENABLED
#define LOG_ENABLED() PR_LOG_TEST(gOfflineCacheUpdateLog, 4)
class AutoFreeArray {

13
uriloader/prefetch/nsOfflineCacheUpdateService.cpp
View File

@ -69,19 +69,12 @@ typedef mozilla::docshell::OfflineCacheUpdateGlue OfflineCacheUpdateGlue;
//
PRLogModuleInfo *gOfflineCacheUpdateLog;
#endif
#undef LOG
#define LOG(args) PR_LOG(gOfflineCacheUpdateLog, 4, args)
#define LOG_ENABLED() PR_LOG_TEST(gOfflineCacheUpdateLog, 4)
class AutoFreeArray {
public:
AutoFreeArray(uint32_t count, char **values)
: mCount(count), mValues(values) {};
~AutoFreeArray() { NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(mCount, mValues); }
private:
uint32_t mCount;
char **mValues;
};
#undef LOG_ENABLED
#define LOG_ENABLED() PR_LOG_TEST(gOfflineCacheUpdateLog, 4)
namespace { // anon

4
uriloader/prefetch/nsPrefetchService.cpp
View File

@ -44,7 +44,11 @@ using namespace mozilla;
//
static PRLogModuleInfo *gPrefetchLog;
#endif
#undef LOG
#define LOG(args) PR_LOG(gPrefetchLog, 4, args)
#undef LOG_ENABLED
#define LOG_ENABLED() PR_LOG_TEST(gPrefetchLog, 4)
#define PREFETCH_PREF "network.prefetch-next"