mozilla: comparison firefox-kde.patch

equal deleted inserted replaced

-:fbfe323c62cd
+:526f445635f3
 # HG changeset patch
-# Parent  1b44c077e473c5a7d02fab26e2a220ebf219e0ab
+# Parent  a01c6385626ce90528d02e5127de5c1444c07efc
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1280 @@
+@@ -0,0 +1,1293 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
 +#
 +# This Source Code Form is subject to the terms of the Mozilla Public
 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css"?>
++<?xml-stylesheet href="chrome://browser/skin/places/places.css"?>
++<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css"?>
 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/content/tabbrowser.css" type="text/css"?>
-+
++<?xml-stylesheet href="chrome://browser/skin/compacttheme.css" type="text/css" alternate="yes" title="Light/Dark"?>
-+<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?>
 +
 +# All DTD information is stored in a separate file so that it can be shared by
 +# hiddenWindow.xul.
++<!DOCTYPE window [
 +#include browser-doctype.inc
++]>
 +
 +<window id="main-window"
 +        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 +        xmlns:svg="http://www.w3.org/2000/svg"
 +        xmlns:html="http://www.w3.org/1999/xhtml"
 +        title_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
 +        titlemodifier="&mainWindow.titlemodifier;"
 +        titlemodifier_normal="&mainWindow.titlemodifier;"
 +        titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
 +#endif
-+#ifdef CAN_DRAW_IN_TITLEBAR
 +#ifdef XP_WIN
 +        chromemargin="0,2,2,2"
 +#else
 +        chromemargin="0,-1,-1,-1"
 +#endif
 +        tabsintitlebar="true"
-+#endif
 +        titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
 +        windowtype="navigator:browser"
 +        macanimationtype="document"
 +        screenX="4" screenY="4"
 +        fullscreenbutton="true"
 +        sizemode="normal"
 +        retargetdocumentfocus="urlbar"
 +        persist="screenX screenY width height sizemode">
 +
-+# All JS files which are not content (only) dependent that browser.xul
++# All JS files which are needed by browser.xul and other top level windows to
-+# wishes to include *must* go into the global-scripts.inc file
++# support MacOS specific features *must* go into the global-scripts.inc file so
-+# so that they can be shared by macBrowserOverlay.xul.
++# that they can be shared with macWindow.inc.xul.
 +#include global-scripts.inc
 +
 +<script type="application/javascript">
 +  Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
 +  Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this);
++
++  ChromeUtils.defineModuleGetter(window,
++    "PlacesUtils", "resource://gre/modules/PlacesUtils.jsm");
++  ChromeUtils.defineModuleGetter(window,
++    "PlacesUIUtils", "resource:///modules/PlacesUIUtils.jsm");
++  ChromeUtils.defineModuleGetter(window,
++    "PlacesTransactions", "resource://gre/modules/PlacesTransactions.jsm");
++
++  ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
++  XPCOMUtils.defineLazyScriptGetter(window, "PlacesTreeView",
++    "chrome://browser/content/places/treeView.js");
++  XPCOMUtils.defineLazyScriptGetter(window,
++    ["PlacesInsertionPoint", "PlacesController", "PlacesControllerDragHelper"],
++     "chrome://browser/content/places/controller.js");
 +</script>
 +
-+# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
++# All sets except for popupsets (commands, keys, stringbundles and broadcasters)
-+# browser-sets.inc file for sharing with hiddenWindow.xul.
++# *must* go into the browser-sets.inc file so that they can be shared with other
++# top level windows in macWindow.inc.xul.
 +#define FULL_BROWSER_WINDOW
 +#include browser-sets.inc
 +#undef FULL_BROWSER_WINDOW
 +
 +  <popupset id="mainPopupSet">
 +        <vbox>
 +          <label id="editBookmarkPanelTitle"/>
 +          <description id="editBookmarkPanelDescription"/>
 +        </vbox>
 +      </row>
-+      <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
++#include ../../components/places/content/editBookmarkPanel.inc.xul
 +      <hbox id="editBookmarkPanelBottomButtons" pack="end">
 +#ifdef XP_UNIX
 +        <button id="editBookmarkPanelDoneButton"
 +                class="editBookmarkPanelBottomButton"
 +                label="&editBookmark.done.label;"
 +                              gContextMenu = null;
 +                              updateEditUIVisibility();">
 +#include browser-context.inc
 +    </menupopup>
 +
-+    <menupopup id="placesContext"/>
++#include ../../components/places/content/placesContextMenu.inc.xul
 +
 +    <panel id="ctrlTab-panel" hidden="true" norestorefocus="true" level="top">
 +      <hbox>
 +        <button class="ctrlTab-preview" flex="1"/>
 +        <button class="ctrlTab-preview" flex="1"/>
 +           tabspecific="true"
 +           noautofocus="true"
 +           copyURL-title="&pageAction.copyLink.label;"
 +           emailLink-title="&emailPageCmd.label;"
 +           sendToDevice-title="&pageAction.sendTabToDevice.label;"
-+           sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;">
++           sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;"
++           shareURL-title="&pageAction.shareUrl.label;">
 +      <panelmultiview id="pageActionPanelMultiView"
 +                      mainViewId="pageActionPanelMainView"
 +                      viewCacheId="appMenu-viewCache">
 +        <panelview id="pageActionPanelMainView"
 +                   context="pageActionContextMenu"
 +      <menuitem class="pageActionContextMenuItem extensionPinned extensionUnpinned"
 +                label="&pageAction.manageExtension.label;"
 +                oncommand="BrowserPageActions.openAboutAddonsForContextAction();"/>
 +    </menupopup>
 +
-+    <!-- Bookmarks and history tooltip -->
++#include ../../components/places/content/bookmarksHistoryTooltip.inc.xul
-+    <tooltip id="bhTooltip"/>
 +
 +    <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
 +
 +    <tooltip id="back-button-tooltip">
 +      <label class="tooltip-label" value="&backButton.tooltip;"/>
 +#include ../../components/downloads/content/downloadsPanel.inc.xul
 +
 +    <hbox id="downloads-animation-container" mousethrough="always">
 +      <vbox id="downloads-notification-anchor" hidden="true">
 +        <vbox id="downloads-indicator-notification"/>
-+      </vbox>
-+    </hbox>
-+
-+    <hbox id="bookmarked-notification-container" mousethrough="always">
-+      <vbox id="bookmarked-notification-anchor">
-+        <vbox id="bookmarked-notification"/>
-+      </vbox>
-+      <vbox id="bookmarked-notification-dropmarker-anchor">
-+        <image id="bookmarked-notification-dropmarker-icon"/>
 +      </vbox>
 +    </hbox>
 +
 +    <tooltip id="dynamic-shortcut-tooltip"
 +             onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
 +                id="syncedTabsRefreshFilter"/>
 +    </menupopup>
 +  </popupset>
 +  <box id="appMenu-viewCache" hidden="true"/>
 +
-+#ifdef CAN_DRAW_IN_TITLEBAR
 +<vbox id="titlebar">
 +  <hbox id="titlebar-content">
 +    <spacer id="titlebar-spacer" flex="1"/>
 +    <hbox id="titlebar-buttonbox-container">
 +      <hbox id="titlebar-buttonbox" class="titlebar-color">
 +      <hbox id="titlebar-fullscreen-button"/>
 +    </hbox>
 +#endif
 +  </hbox>
 +</vbox>
-+#endif
 +
 +  <toolbox id="navigator-toolbox">
 +    <!-- Menu -->
 +    <toolbar type="menubar" id="toolbar-menubar"
 +             class="chromeclass-menubar titlebar-color"
 +             accesskey="&menubarCmd.accesskey;"
 +             autohide="true"
 +#endif
 +             context="toolbar-context-menu">
 +      <toolbaritem id="menubar-items" align="center">
-+# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
++# The entire main menubar is placed into browser-menubar.inc, so that it can be
-+# hiddenWindow.xul.
++# shared with other top level windows in macWindow.inc.xul.
 +#include browser-menubar.inc
 +      </toolbaritem>
 +
-+#ifdef CAN_DRAW_IN_TITLEBAR
 +#ifndef XP_MACOSX
 +      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"
 +            skipintoolbarset="true"/>
-+#endif
 +#endif
 +    </toolbar>
 +
 +    <toolbar id="TabsToolbar"
 +             class="titlebar-color"
 +             fullscreentoolbar="true"
 +             customizable="true"
 +             mode="icons"
 +             aria-label="&tabsToolbar.label;"
-+             context="toolbar-context-menu"
++             context="toolbar-context-menu">
-+             collapsed="true">
-+
-+#ifdef CAN_DRAW_IN_TITLEBAR
 +      <hbox class="titlebar-placeholder" type="pre-tabs"
 +            skipintoolbarset="true"/>
-+#endif
 +
 +      <tabs id="tabbrowser-tabs"
 +            flex="1"
 +            setfocus="false"
 +            tooltip="tabbrowser-tab-tooltip"
 +                     ondragexit="newTabButtonObserver.onDragExit(event)"
 +                     cui-areatype="toolbar"
 +                     removable="true"/>
 +
 +      <toolbarbutton id="alltabs-button"
-+                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button"
++                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button badged-button"
 +                     type="menu"
 +                     label="&listAllTabs.label;"
 +                     tooltiptext="&listAllTabs.label;"
 +                     removable="false">
 +        <menupopup id="alltabs-popup"
 +          <menu id="alltabs_containersTab"
 +                label="&newUserContext.label;">
 +            <menupopup id="alltabs_containersMenuTab" />
 +          </menu>
 +          <menuseparator id="alltabs-popup-separator-2"/>
++          <menu id="alltabs_hiddenTabs"
++                label="&hiddenTabs.label;">
++            <menupopup id="alltabs_hiddenTabsMenu"/>
++          </menu>
++          <menuseparator id="alltabs-popup-separator-3"/>
 +        </menupopup>
 +      </toolbarbutton>
 +
-+#ifdef CAN_DRAW_IN_TITLEBAR
 +      <hbox class="titlebar-placeholder" type="post-tabs"
 +            ordinal="1000"
 +            skipintoolbarset="true"/>
-+#endif
 +
 +      <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;"
 +              ordinal="1000"
 +              aria-live="polite" skipintoolbarset="true"/>
 +      <hbox class="private-browsing-indicator" skipintoolbarset="true"
 +            ordinal="1000"/>
-+#ifdef CAN_DRAW_IN_TITLEBAR
 +      <hbox class="titlebar-placeholder" type="caption-buttons"
 +#ifndef XP_MACOSX
 +            ordinal="1000"
 +#endif
 +            skipintoolbarset="true"/>
 +
 +#ifdef XP_MACOSX
 +      <hbox class="titlebar-placeholder" type="fullscreen-button"
 +            skipintoolbarset="true"/>
-+#endif
 +#endif
 +    </toolbar>
 +
 +    <toolbar id="nav-bar"
 +             aria-label="&navbarCmd.label;"
 +                  <image id="persistent-storage-notification-icon" class="notification-anchor-icon persistent-storage-icon" role="button"
 +                         tooltiptext="&urlbar.persistentStorageNotificationAnchor.tooltip;"/>
 +                  <image id="midi-notification-icon" class="notification-anchor-icon midi-icon" role="button"
 +                         tooltiptext="&urlbar.midiNotificationAnchor.tooltip;"/>
 +                  <image id="webauthn-notification-icon" class="notification-anchor-icon" role="button"
-+                         tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/>
++                         tooltiptext="&urlbar.webAuthnAnchor.tooltip;"/>
 +                </box>
 +                <image id="connection-icon"/>
 +                <image id="extension-icon"/>
 +                <image id="remote-control-icon"
 +                       tooltiptext="&urlbar.remoteControlNotificationAnchor.tooltip;"/>
 +        <tabbox id="tabbrowser-tabbox"
 +                    flex="1" eventnode="document" tabcontainer="tabbrowser-tabs"
 +                    onselect="if (event.target.localName == 'tabpanels') gBrowser.updateCurrentBrowser();">
 +          <tabpanels flex="1" class="plain" selectedIndex="0" id="tabbrowser-tabpanels">
 +            <notificationbox flex="1" notificationside="top">
-+              <hbox flex="1" class="browserSidebarContainer">
++              <!-- Set large flex to allow the devtools toolbox to set a flex attribute.
-+                <vbox flex="1" class="browserContainer">
++                   We don't want the toolbox to actually take up free space, but we do want it to collapse when the window shrinks, and with flex=0 it can't.
++                   When the toolbox is on the bottom it's a sibling of browserSidebarContainer,
++                   and when it's on the side it's a sibling of browserContainer.  -->
++              <hbox flex="10000" class="browserSidebarContainer">
++                <vbox flex="10000" class="browserContainer">
 +                  <stack flex="1" class="browserStack">
 +                    <browser id="tabbrowser-initialBrowser" type="content"
 +                             message="true" messagemanagergroup="browsers"
 +                             primary="true" blank="true"
 +                             tooltip="aHTMLTooltip"
 +                             contextmenu="contentAreaContextMenu"
 +                             autocompletepopup="PopupAutoComplete"
 +                             selectmenulist="ContentSelectDropdown"
 +                             datetimepicker="DateTimePickerPanel"/>
 +                  </stack>
++                  <hbox id="statuspanel" inactive="true" layer="true">
++                    <hbox id="statuspanel-inner">
++                      <label id="statuspanel-label"
++                             role="status"
++                             aria-live="off"
++                             flex="1"
++                             crop="end"/>
++                    </hbox>
++                  </hbox>
 +                </vbox>
 +              </hbox>
 +            </notificationbox>
 +          </tabpanels>
 +        </tabbox>
 +
 +</window>
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -42,16 +42,18 @@ browser.jar:
+@@ -44,16 +44,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/aboutTabCrashed.css           (content/aboutTabCrashed.css)
 content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)
 content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
 #include "nsIEHistoryEnumerator.h"
 #endif
 #include "rdf.h"
 #include "nsFeedSniffer.h"
-@@ -32,18 +32,16 @@ using namespace mozilla::browser;
+@@ -31,18 +31,16 @@ using namespace mozilla::browser;
 /////////////////////////////////////////////////////////////////////////////
 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider)
 #if defined(XP_WIN)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
 #endif
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
-@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID)
+@@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsSessionStoreUtils)
+NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_SESSIONSTOREUTILS_CID);
+#endif
 static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor },
 #if defined(XP_WIN)
 { &kNS_SHELLSERVICE_CID, false, nullptr, nsWindowsShellServiceConstructor },
 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor },
 #endif
 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
 --- a/browser/components/preferences/in-content/main.js
 +++ b/browser/components/preferences/in-content/main.js
-@@ -333,16 +333,23 @@ var gMainPane = {
+@@ -327,16 +327,23 @@ var gMainPane = {
 this._backoffIndex++ : backoffTimes.length - 1]);
 };
 window.setTimeout(() => {
 window.requestIdleCallback(pollForDefaultBrowser);
 let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore");
 let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance";
 performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
 this.updateDefaultPerformanceSettingsPref();
-@@ -1060,16 +1067,27 @@ var gMainPane = {
+@@ -868,16 +875,27 @@ var gMainPane = {
 // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
 this._backoffIndex = 0;
 let shellSvc = getShellService();
 if (!shellSvc)
 document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
 }
 diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
 --- a/browser/components/shell/moz.build
 +++ b/browser/components/shell/moz.build
-@@ -39,16 +39,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
+@@ -21,16 +21,18 @@ XPIDL_SOURCES += [
-]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-SOURCES += [
+XPIDL_SOURCES += [
-'nsMacShellService.cpp',
+'nsIMacShellService.idl',
 ]
 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-SOURCES += [
+XPIDL_SOURCES += [
-'nsGNOMEShellService.cpp',
+'nsIGNOMEShellService.idl',
 +        'nsKDEShellService.cpp',
 +        'nsUnixShellService.cpp',
 ]
-if SOURCES:
+XPIDL_MODULE = 'shellservice'
-FINAL_LIBRARY = 'browsercomps'
+if CONFIG['OS_ARCH'] == 'WINNT':
-EXTRA_COMPONENTS += [
+SOURCES += [
-'nsSetDefaultBrowser.js',
+'nsWindowsShellService.cpp',
-'nsSetDefaultBrowser.manifest',
+]
 diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp
 new file mode 100644
 --- /dev/null
 +++ b/browser/components/shell/nsKDEShellService.cpp
 @@ -0,0 +1,204 @@
 +
 +#endif // nsunixshellservice_h____
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -646,16 +646,18 @@
+@@ -452,16 +452,18 @@
 @RESPATH@/browser/defaults/blocklists
 @RESPATH@/browser/defaults/pinning
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 ; Technically this is an app pref file, but we are keeping it in the original
 ; gre location for now.
 @RESPATH@/defaults/pref/channel-prefs.js
-+@BINPATH@/defaults/pref/kde.js
++@RESPATH@/defaults/pref/kde.js
 +
-; Remote control protocol prefs
-; defined in ../../testing/marionette/prefs/marionette.js
-@RESPATH@/defaults/pref/marionette.js
 ; Services (gre) prefs
 @RESPATH@/defaults/pref/services-sync.js
 ; [Layout Engine Resources]
+; Style Sheets, Graphics and other Resources used by the layout engine.
+@RESPATH@/res/EditorOverride.css
+@RESPATH@/res/contenteditable.css
+@RESPATH@/res/designmode.css

changeset 1055	526f445635f3
parent 1046	75893a3d8fbe
child 1057	b70ce330958c