mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:c08299311cbc
+:f54c68340963
 #include "prefapi.h"
 #include "prefread.h"
 #include "prefapi_private_data.h"
-@@ -1167,16 +1168,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -1172,16 +1173,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
 static nsresult pref_LoadPrefsInDirList(const char *listId)
 {
 nsresult rv;
 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
 getter_AddRefs(list));
 if (!list)
 return NS_OK;
 bool hasMore;
-@@ -1192,17 +1211,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1197,17 +1216,17 @@ static nsresult pref_LoadPrefsInDirList(
 nsAutoCString leaf;
 path->GetNativeLeafName(leaf);
 // Do we care if a file provided by this process fails to load?
 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
 {
 nsZipItemPtr<char> manifest(jarReader, name, true);
 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1296,26 +1315,38 @@ static nsresult pref_InitInitialObjects(
+@@ -1301,26 +1320,38 @@ static nsresult pref_InitInitialObjects(
 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
 static const char* specialFiles[] = {
 #if defined(XP_MACOSX)
 "macprefs.js"
 #elif defined(XP_WIN)
 nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
 // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which
 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
 --- a/python/mozbuild/mozpack/chrome/flags.py
 +++ b/python/mozbuild/mozpack/chrome/flags.py
-@@ -208,16 +208,17 @@ class Flags(OrderedDict):
+@@ -209,16 +209,17 @@ class Flags(OrderedDict):
-'platformversion': VersionFlag,
 'contentaccessible': Flag,
 'os': StringFlag,
 'osversion': VersionFlag,
 'abi': StringFlag,
 'platform': Flag,
 'xpcnativewrappers': Flag,
 'tablet': Flag,
-+	'desktop': StringFlag,
+'process': StringFlag,
++        'desktop': StringFlag,
 }
 RE = re.compile(r'([!<>=]+)')
 def __init__(self, *flags):
 '''
 flags = Flags('contentaccessible=yes', 'appversion>=3.5')
 '''
 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py
 --- a/python/mozbuild/mozpack/chrome/manifest.py
 +++ b/python/mozbuild/mozpack/chrome/manifest.py
-@@ -30,16 +30,17 @@ class ManifestEntry(object):
+@@ -31,16 +31,17 @@ class ManifestEntry(object):
-allowed_flags = [
 'application',
 'platformversion',
 'os',
 'osversion',
 'abi',
 'xpcnativewrappers',
 'tablet',
-+	'desktop',
+'process',
++        'desktop',
 ]
 def __init__(self, base, *flags):
 '''
 Initialize a manifest entry with the given base path and flags.
 CXXFLAGS += CONFIG['TK_CFLAGS']
 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
 --- a/toolkit/components/downloads/nsDownloadManager.cpp
 +++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -43,16 +43,20 @@
+@@ -44,16 +44,20 @@
 #ifdef XP_WIN
 #include <shlobj.h>
 #include "nsWindowsHelpers.h"
 #ifdef DOWNLOAD_SCANNER
 #include "nsDownloadScanner.h"
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidBridge.h"
 using namespace mozilla::widget::android;
 #endif
-@@ -2711,16 +2715,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2712,16 +2716,25 @@ nsDownload::SetState(DownloadState aStat
 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
 // Master pref to control this function.
 bool showTaskbarAlert = true;
 if (pref)
 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC;
 int64_t goat = PR_Now() - mStartTime;
 showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2751,16 +2764,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2752,16 +2765,17 @@ nsDownload::SetState(DownloadState aStat
 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
 message, !removeWhenDone,
 mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
 mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"),
 EmptyString(), EmptyString(), nullptr);
 +
 +#endif // nsKDEUtils
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -75,17 +75,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
+@@ -68,17 +68,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
 else:
-# These files can't be built in unified mode because they force NSPR logging.
+# These files can't be built in unified mode because they redefine LOG.
 SOURCES += [
 osdir + '/nsOSHelperAppService.cpp',
 ]
 if CONFIG['MOZ_ENABLE_GTK']:
 UNIFIED_SOURCES += [
 'android/nsAndroidHandlerApp.cpp',
 'android/nsExternalSharingAppService.cpp',
 'android/nsExternalURLHandlerService.cpp',
 'android/nsMIMEInfoAndroid.cpp',
-@@ -129,16 +131,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -121,16 +123,17 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
 '/content/base/src',
 '/dom/base',
 // Now look up our extensions
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -88,16 +88,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -81,16 +81,17 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
 '../shared',
 '../xpwidgets',
 #define MAX_PREVIEW_SIZE 180
 nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
 void
-@@ -226,17 +228,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+@@ -224,17 +226,19 @@ nsFilePicker::AppendFilters(int32_t aFil
 return nsBaseFilePicker::AppendFilters(aFilterMask);
 }
 NS_IMETHODIMP
 nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter)
 CopyUTF16toUTF8(aFilter, filter);
 CopyUTF16toUTF8(aTitle, name);
 mFilters.AppendElement(filter);
 mFilterNames.AppendElement(name);
-@@ -351,16 +355,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -349,16 +353,32 @@ nsFilePicker::Show(int16_t *aReturn)
 NS_IMETHODIMP
 nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
 {
 // Can't show two dialogs concurrently with the same filepicker
 GtkWindow *parent_widget =
 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET));
 GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
 const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -539,8 +559,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -537,8 +557,235 @@ nsFilePicker::Done(GtkWidget* file_choos
 if (mCallback) {
 mCallback->Done(result);
 mCallback = nullptr;
 } else {
 mResult = result;
 NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion");
 NS_NAMED_LITERAL_STRING(kOs, "os");
 NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
 NS_NAMED_LITERAL_STRING(kABI, "abi");
 +  NS_NAMED_LITERAL_STRING(kDesktop, "desktop");
+NS_NAMED_LITERAL_STRING(kProcess, "process");
 #if defined(MOZ_WIDGET_ANDROID)
 NS_NAMED_LITERAL_STRING(kTablet, "tablet");
 #endif
-// Obsolete
+NS_NAMED_LITERAL_STRING(kMain, "main");
-NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers");
+NS_NAMED_LITERAL_STRING(kContent, "content");
-nsAutoString appID;
+@@ -548,44 +550,49 @@ ParseManifest(NSLocationType aType, File
-@@ -543,44 +545,49 @@ ParseManifest(NSLocationType aType, File
 CopyUTF8toUTF16(s, abi);
 abi.Insert(char16_t('_'), 0);
 abi.Insert(osTarget, 0);
 }
 }
 isTablet = mozilla::widget::android::GeckoAppShell::IsTablet();
 }
 +  desktop = NS_LITERAL_STRING("android");
 #endif
-// Because contracts must be registered after CIDs, we save and process them
+if (XRE_GetProcessType() == GeckoProcessType_Content) {
-// at the end.
+process = kContent;
-nsTArray<CachedDirective> contracts;
+} else {
+process = kMain;
-char* token;
+}
-char* newline = aBuf;
-@@ -669,25 +676,27 @@ ParseManifest(NSLocationType aType, File
+@@ -681,25 +688,27 @@ ParseManifest(NSLocationType aType, File
-TriState stOsVersion = eUnspecified;
 TriState stOs = eUnspecified;
 TriState stABI = eUnspecified;
+TriState stProcess = eUnspecified;
 #if defined(MOZ_WIDGET_ANDROID)
 TriState stTablet = eUnspecified;
 #endif
 bool platform = false;
 bool contentAccessible = false;
 if (CheckStringFlag(kApplication, wtoken, appID, stApp) ||
 CheckStringFlag(kOs, wtoken, osTarget, stOs) ||
 CheckStringFlag(kABI, wtoken, abi, stABI) ||
 +          CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) ||
+CheckStringFlag(kProcess, wtoken, process, stProcess) ||
 CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
 CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) ||
 CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) {
 continue;
 }
 #if defined(MOZ_WIDGET_ANDROID)
-bool tablet = false;
+@@ -731,16 +740,17 @@ ParseManifest(NSLocationType aType, File
-@@ -718,16 +727,17 @@ ParseManifest(NSLocationType aType, File
 }
 if (!ok ||
 stApp == eBad ||
 stAppVersion == eBad ||
 stOsVersion == eBad ||
 +        stDesktop == eBad ||
 #ifdef MOZ_WIDGET_ANDROID
 stTablet == eBad ||
 #endif
-stABI == eBad) {
+stABI == eBad ||
+stProcess == eBad) {
 continue;
 }
-#ifdef MOZ_B2G_LOADER
 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 --- a/xpcom/components/moz.build
 +++ b/xpcom/components/moz.build
-@@ -47,12 +47,13 @@ FINAL_LIBRARY = 'xul'
+@@ -48,12 +48,13 @@ FINAL_LIBRARY = 'xul'
 GENERATED_INCLUDES += ['..']
 LOCAL_INCLUDES += [
 '../base',
 '../build',
 '../ds',

changeset 807	f54c68340963
parent 779	354c672efefa
child 828	59013b3a51f5