Djam/firefox-esr91
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/firefox-esr91.git synced 2025-02-25 01:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update kde patches

Browse source
This commit is contained in:
Tigro 2015-01-20 08:52:20 +03:00
parent f41d67a8b0
commit 4a07a29698
3 changed files with 110 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
firefox-34-kde.patch → firefox-35-kde.patch
View file

@ -1,8 +1,11 @@
# HG changeset patch
# Parent 6697591ddc0a1b18171c31a7bf18d99be9825aab
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/browser/base/content/browser-kde.xul +++ b/browser/base/content/browser-kde.xul
@@ -0,0 +1,1224 @@ @@ -0,0 +1,1272 @@
+#filter substitution +#filter substitution
+<?xml version="1.0"?> +<?xml version="1.0"?>
+# -*- Mode: HTML -*- +# -*- Mode: HTML -*-
@ -145,6 +148,9 @@ new file mode 100644
+ <!-- for search and content formfill/pw manager --> + <!-- for search and content formfill/pw manager -->
+ <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/> + <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
+ +
+ <!-- for search with one-off buttons -->
+ <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/>
+
+ <!-- for url bar autocomplete --> + <!-- for url bar autocomplete -->
+ <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
+ +
@ -242,6 +248,48 @@ new file mode 100644
+ mousethrough="always"> + mousethrough="always">
+ <box id="UITourHighlight"></box> + <box id="UITourHighlight"></box>
+ </panel> + </panel>
+ <!-- Used to highlight the new search experience -->
+ <panel id="SearchHighlight1"
+ class="SearchHighlight"
+ type="arrow"
+ hidden="true"
+ noautofocus="true"
+ noautohide="true"
+ orient="vertical"
+ align="stretch">
+ <label class="SearchHighlightTitle">One-Click Searches</label>
+ <description class="SearchHighlightText" flex="1">Search any of these sites instantly, without changing your default.</description>
+ <hbox class="SearchHighlightFooter" align="center">
+ <spacer class="dot filled"/>
+ <spacer class="dot"/>
+ <spacer flex="1"/>
+ <button label="Next"/>
+ </hbox>
+ </panel>
+ <panel id="SearchHighlight2"
+ class="SearchHighlight"
+ type="arrow"
+ hidden="true"
+ noautofocus="true"
+ noautohide="true"
+ orient="vertical"
+ align="stretch">
+ <label class="SearchHighlightTitle">Smart Suggestions</label>
+ <description class="SearchHighlightText" flex="1">Suggestions from your default search engine appear as you type.</description>
+ <hbox class="SearchHighlightFooter" align="center">
+ <spacer class="dot"/>
+ <spacer class="dot filled"/>
+ <spacer flex="1"/>
+ <button label="Thanks!"/>
+ </hbox>
+ </panel>
+
+ <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true">
+ <hbox id="abouthome-search-panel-manage"
+ onclick="openPreferences('paneSearch')">
+ <label>&cmd_engineManager.label;</label>
+ </hbox>
+ </panel>
+ +
+ <panel id="social-share-panel" + <panel id="social-share-panel"
+ class="social-panel" + class="social-panel"
@ -251,7 +299,11 @@ new file mode 100644
+ onpopuphidden="SocialShare.onHidden()" + onpopuphidden="SocialShare.onHidden()"
+ hidden="true"> + hidden="true">
+ <vbox class="social-share-toolbar"> + <vbox class="social-share-toolbar">
+ <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"/> + <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1">
+ <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio"
+ group="share-providers" tooltiptext="&findShareServices.label;"
+ oncommand="SocialShare.showDirectory()"/>
+ </arrowscrollbox>
+ </vbox> + </vbox>
+ </panel> + </panel>
+ +
@ -501,6 +553,11 @@ new file mode 100644
+#endif +#endif
+ </tooltip> + </tooltip>
+ +
+ <tooltip id="share-button-tooltip" onpopupshowing="SocialShare.createTooltip(event);">
+ <label class="tooltip-label"/>
+ <label class="tooltip-label"/>
+ </tooltip>
+
+#include popup-notifications.inc +#include popup-notifications.inc
+ +
+#include ../../components/customizableui/content/panelUI.inc.xul +#include ../../components/customizableui/content/panelUI.inc.xul
@ -674,7 +731,11 @@ new file mode 100644
+ aria-label="&navbarCmd.label;" + aria-label="&navbarCmd.label;"
+ fullscreentoolbar="true" mode="icons" customizable="true" + fullscreentoolbar="true" mode="icons" customizable="true"
+ iconsize="small" + iconsize="small"
+ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item" +#ifdef MOZ_DEV_EDITION
+ defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button"
+#else
+ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button"
+#endif
+ customizationtarget="nav-bar-customization-target" + customizationtarget="nav-bar-customization-target"
+ overflowable="true" + overflowable="true"
+ overflowbutton="nav-bar-overflow-button" + overflowbutton="nav-bar-overflow-button"
@ -728,7 +789,6 @@ new file mode 100644
+ <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="bad-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="bad-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="bad-content-unblocked-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="bad-content-unblocked-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
@ -761,7 +821,7 @@ new file mode 100644
+ </hbox> + </hbox>
+ </box> + </box>
+ <box id="urlbar-display-box" align="center"> + <box id="urlbar-display-box" align="center">
+ <label id="urlbar-display" value="&urlbar.switchToTab.label;"/> + <label class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/>
+ </box> + </box>
+ <hbox id="urlbar-icons"> + <hbox id="urlbar-icons">
+ <image id="page-report-button" + <image id="page-report-button"
@ -922,15 +982,6 @@ new file mode 100644
+ onclick="BrowserGoHome(event);" + onclick="BrowserGoHome(event);"
+ cui-areatype="toolbar" + cui-areatype="toolbar"
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
+
+ <toolbarbutton id="social-share-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&sharePageCmd.label;"
+ tooltiptext="&sharePageCmd.label;"
+ cui-areatype="toolbar"
+ removable="true"
+ hidden="true"
+ command="Social:SharePage"/>
+ </hbox> + </hbox>
+ +
+ <toolbarbutton id="nav-bar-overflow-button" + <toolbarbutton id="nav-bar-overflow-button"
@ -1075,7 +1126,7 @@ new file mode 100644
+ </toolbarpalette> + </toolbarpalette>
+ </toolbox> + </toolbox>
+ +
+ <hbox id="fullscr-toggler" collapsed="true"/> + <hbox id="fullscr-toggler" hidden="true"/>
+ +
+ <deck id="content-deck" flex="1"> + <deck id="content-deck" flex="1">
+ <hbox flex="1" id="browser"> + <hbox flex="1" id="browser">
@ -1230,7 +1281,7 @@ new file mode 100644
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
--- a/browser/base/content/browser.xul --- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul
@@ -171,17 +171,17 @@ @@ -174,17 +174,17 @@
class="editBookmarkPanelHeaderButton" class="editBookmarkPanelHeaderButton"
oncommand="StarUI.removeBookmarkButtonCommand();" oncommand="StarUI.removeBookmarkButtonCommand();"
accesskey="&editBookmark.removeBookmark.accessKey;"/> accesskey="&editBookmark.removeBookmark.accessKey;"/>
@ -1249,7 +1300,7 @@ diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
<button id="editBookmarkPanelDeleteButton" <button id="editBookmarkPanelDeleteButton"
class="editBookmarkPanelBottomButton" class="editBookmarkPanelBottomButton"
label="&editBookmark.cancel.label;" label="&editBookmark.cancel.label;"
@@ -1150,17 +1150,17 @@ @@ -1198,17 +1198,17 @@
<hbox id="full-screen-warning-container" hidden="true" fadeout="true"> <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
<hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@ -1271,10 +1322,10 @@ diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
diff --git a/browser/base/jar.mn b/browser/base/jar.mn diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn --- a/browser/base/jar.mn
+++ b/browser/base/jar.mn +++ b/browser/base/jar.mn
@@ -70,16 +70,18 @@ browser.jar: @@ -69,16 +69,18 @@ browser.jar:
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml)
content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml)
content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js)
content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml)
* content/browser/browser.css (content/browser.css) * content/browser/browser.css (content/browser.css)
@ -1376,7 +1427,7 @@ diff --git a/browser/components/preferences/main.js b/browser/components/prefere
// when the user will select the default. We refresh here periodically // when the user will select the default. We refresh here periodically
// in case the default changes. On other Windows OS's defaults can also // in case the default changes. On other Windows OS's defaults can also
// be set while the prefs are open. // be set while the prefs are open.
@@ -497,16 +503,27 @@ var gMainPane = { @@ -572,16 +578,27 @@ var gMainPane = {
*/ */
setDefaultBrowser: function() setDefaultBrowser: function()
{ {
@ -1393,7 +1444,7 @@ diff --git a/browser/components/preferences/main.js b/browser/components/prefere
+ .createInstance(Components.interfaces.nsIProcess); + .createInstance(Components.interfaces.nsIProcess);
+ process.init(shellObj); + process.init(shellObj);
+ var args = ["--file", "kdeglobals", "--group", "General", "--key", + var args = ["--file", "kdeglobals", "--group", "General", "--key",
+ "BrowserApplication", "MozillaFirefox"]; + "BrowserApplication", "firefox"];
+ process.run(false, args, args.length); + process.run(false, args, args.length);
+ } + }
} catch (ex) { } catch (ex) {
@ -1844,7 +1895,7 @@ new file mode 100644
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in
@@ -685,19 +685,21 @@ @@ -698,19 +698,21 @@
@BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/browser/defaults/profile/prefs.js @BINPATH@/browser/defaults/profile/prefs.js

4
firefox.spec
View file

@ -52,8 +52,8 @@ Patch2: firefox-vendor.patch
Patch8: firefox-25.0-disable-check-default-browser.patch Patch8: firefox-25.0-disable-check-default-browser.patch
Patch10: firefox-3.5.3-default-mail-handler.patch Patch10: firefox-3.5.3-default-mail-handler.patch
# Patches for kde integration of FF # Patches for kde integration of FF
Patch11: firefox-34-kde.patch Patch11: firefox-35-kde.patch
Patch12: mozilla-34-kde.patch Patch12: mozilla-35-kde.patch
#Patch13: mozilla-kde-background.patch #Patch13: mozilla-kde-background.patch
Patch34: xulrunner_nojit.patch Patch34: xulrunner_nojit.patch

70
mozilla-34-kde.patch → mozilla-35-kde.patch
View file

@ -44,7 +44,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
#include "prefread.h" #include "prefread.h"
#include "prefapi_private_data.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) static nsresult pref_LoadPrefsInDirList(const char *listId)
{ {
@ -79,7 +79,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
return NS_OK; return NS_OK;
bool hasMore; bool hasMore;
@@ -1192,17 +1211,17 @@ static nsresult pref_LoadPrefsInDirList( @@ -1197,17 +1216,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf; nsAutoCString leaf;
path->GetNativeLeafName(leaf); path->GetNativeLeafName(leaf);
@ -98,7 +98,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
{ {
nsZipItemPtr<char> manifest(jarReader, name, true); nsZipItemPtr<char> manifest(jarReader, name, true);
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); 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 */ /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
static const char* specialFiles[] = { static const char* specialFiles[] = {
#if defined(XP_MACOSX) #if defined(XP_MACOSX)
@ -140,8 +140,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
--- a/python/mozbuild/mozpack/chrome/flags.py --- a/python/mozbuild/mozpack/chrome/flags.py
+++ b/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, 'contentaccessible': Flag,
'os': StringFlag, 'os': StringFlag,
'osversion': VersionFlag, 'osversion': VersionFlag,
@ -149,7 +148,8 @@ diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/c
'platform': Flag, 'platform': Flag,
'xpcnativewrappers': Flag, 'xpcnativewrappers': Flag,
'tablet': Flag, 'tablet': Flag,
+ 'desktop': StringFlag, 'process': StringFlag,
+ 'desktop': StringFlag,
} }
RE = re.compile(r'([!<>=]+)') RE = re.compile(r'([!<>=]+)')
@ -161,8 +161,7 @@ diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/c
diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py
--- a/python/mozbuild/mozpack/chrome/manifest.py --- a/python/mozbuild/mozpack/chrome/manifest.py
+++ b/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', 'application',
'platformversion', 'platformversion',
'os', 'os',
@ -170,7 +169,8 @@ diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpac
'abi', 'abi',
'xpcnativewrappers', 'xpcnativewrappers',
'tablet', 'tablet',
+ 'desktop', 'process',
+ 'desktop',
] ]
def __init__(self, base, *flags): def __init__(self, base, *flags):
@ -202,7 +202,7 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloa
diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
--- a/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp
@@ -43,16 +43,20 @@ @@ -44,16 +44,20 @@
#ifdef XP_WIN #ifdef XP_WIN
#include <shlobj.h> #include <shlobj.h>
#include "nsWindowsHelpers.h" #include "nsWindowsHelpers.h"
@ -223,7 +223,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
#include "AndroidBridge.h" #include "AndroidBridge.h"
using namespace mozilla::widget::android; using namespace mozilla::widget::android;
#endif #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)); nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function. // Master pref to control this function.
@ -249,7 +249,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
int64_t goat = PR_Now() - mStartTime; int64_t goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec; 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, NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
message, !removeWhenDone, message, !removeWhenDone,
mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
@ -2630,9 +2630,9 @@ new file mode 100644
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
--- a/uriloader/exthandler/moz.build --- a/uriloader/exthandler/moz.build
+++ b/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: 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 += [ SOURCES += [
osdir + '/nsOSHelperAppService.cpp', osdir + '/nsOSHelperAppService.cpp',
] ]
@ -2650,7 +2650,7 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
'android/nsExternalSharingAppService.cpp', 'android/nsExternalSharingAppService.cpp',
'android/nsExternalURLHandlerService.cpp', 'android/nsExternalURLHandlerService.cpp',
'android/nsMIMEInfoAndroid.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' FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
@ -3104,7 +3104,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
--- a/widget/gtk/moz.build --- a/widget/gtk/moz.build
+++ b/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' FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
@ -3160,7 +3160,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr; nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
void void
@@ -226,17 +228,19 @@ nsFilePicker::AppendFilters(int32_t aFil @@ -224,17 +226,19 @@ nsFilePicker::AppendFilters(int32_t aFil
return nsBaseFilePicker::AppendFilters(aFilterMask); return nsBaseFilePicker::AppendFilters(aFilterMask);
} }
@ -3181,7 +3181,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
mFilters.AppendElement(filter); mFilters.AppendElement(filter);
mFilterNames.AppendElement(name); mFilterNames.AppendElement(name);
@@ -351,16 +355,32 @@ nsFilePicker::Show(int16_t *aReturn) @@ -349,16 +353,32 @@ nsFilePicker::Show(int16_t *aReturn)
NS_IMETHODIMP NS_IMETHODIMP
nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@ -3214,7 +3214,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
GtkFileChooserAction action = GetGtkFileChooserAction(mMode); GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE) 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) { if (mCallback) {
mCallback->Done(result); mCallback->Done(result);
mCallback = nullptr; mCallback = nullptr;
@ -3502,15 +3502,15 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
NS_NAMED_LITERAL_STRING(kOsVersion, "osversion"); NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
NS_NAMED_LITERAL_STRING(kABI, "abi"); NS_NAMED_LITERAL_STRING(kABI, "abi");
+ NS_NAMED_LITERAL_STRING(kDesktop, "desktop"); + NS_NAMED_LITERAL_STRING(kDesktop, "desktop");
NS_NAMED_LITERAL_STRING(kProcess, "process");
#if defined(MOZ_WIDGET_ANDROID) #if defined(MOZ_WIDGET_ANDROID)
NS_NAMED_LITERAL_STRING(kTablet, "tablet"); NS_NAMED_LITERAL_STRING(kTablet, "tablet");
#endif #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); CopyUTF8toUTF16(s, abi);
abi.Insert(char16_t('_'), 0); abi.Insert(char16_t('_'), 0);
abi.Insert(osTarget, 0); abi.Insert(osTarget, 0);
@ -3554,16 +3554,16 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
+ desktop = NS_LITERAL_STRING("android"); + desktop = NS_LITERAL_STRING("android");
#endif #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; @@ -681,25 +688,27 @@ ParseManifest(NSLocationType aType, File
char* newline = aBuf;
@@ -669,25 +676,27 @@ ParseManifest(NSLocationType aType, File
TriState stOsVersion = eUnspecified;
TriState stOs = eUnspecified; TriState stOs = eUnspecified;
TriState stABI = eUnspecified; TriState stABI = eUnspecified;
TriState stProcess = eUnspecified;
#if defined(MOZ_WIDGET_ANDROID) #if defined(MOZ_WIDGET_ANDROID)
TriState stTablet = eUnspecified; TriState stTablet = eUnspecified;
#endif #endif
@ -3580,6 +3580,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
CheckStringFlag(kOs, wtoken, osTarget, stOs) || CheckStringFlag(kOs, wtoken, osTarget, stOs) ||
CheckStringFlag(kABI, wtoken, abi, stABI) || CheckStringFlag(kABI, wtoken, abi, stABI) ||
+ CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) || + CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) ||
CheckStringFlag(kProcess, wtoken, process, stProcess) ||
CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) || CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) || CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) ||
CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) { CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) {
@ -3587,8 +3588,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
} }
#if defined(MOZ_WIDGET_ANDROID) #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 || if (!ok ||
@ -3601,15 +3601,15 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
#ifdef MOZ_WIDGET_ANDROID #ifdef MOZ_WIDGET_ANDROID
stTablet == eBad || stTablet == eBad ||
#endif #endif
stABI == eBad) { stABI == eBad ||
stProcess == eBad) {
continue; continue;
} }
#ifdef MOZ_B2G_LOADER
diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
--- a/xpcom/components/moz.build --- a/xpcom/components/moz.build
+++ b/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 += ['..'] GENERATED_INCLUDES += ['..']
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
'../base', '../base',