Mercurial Mercurial > hg > mozilla / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mozilla-kde.patch
changeset 942 66115255ad6f
parent 935 9ae2b79d3bb1
child 944 ce8a98f8d8d7 
--- a/mozilla-kde.patch	Sun Feb 12 08:57:22 2017 +0100
+++ b/mozilla-kde.patch	Sun Feb 12 20:15:21 2017 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  f3e80d26a430dfa1c58421fb66144a3c23ffc166
+# Parent  0e88a32ef7263e76f6970bab17458130d1f3677f
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -255,12 +255,12 @@
          int64_t goat = PR_Now() - mStartTime;
          showTaskbarAlert = goat > alertIntervalUSec;
  
-@@ -2763,16 +2776,17 @@ nsDownload::SetState(DownloadState aStat
-                   NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
+@@ -2764,16 +2777,17 @@ nsDownload::SetState(DownloadState aStat
                    message, !removeWhenDone,
                    mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
                    mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"),
-                   EmptyString(), EmptyString(), nullptr, mPrivate);
+                   EmptyString(), EmptyString(), nullptr, mPrivate,
+                   false /* requireInteraction */);
              }
          }
        }
@@ -276,14 +276,14 @@
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -67,29 +67,33 @@ toolkit.jar:
-    content/global/viewZoomOverlay.js
-    content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)
-    content/global/bindings/browser.xml         (widgets/browser.xml)
+@@ -71,29 +71,33 @@ toolkit.jar:
     content/global/bindings/button.xml          (widgets/button.xml)
     content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
     content/global/bindings/colorpicker.xml     (widgets/colorpicker.xml)
     content/global/bindings/datetimepicker.xml  (widgets/datetimepicker.xml)
+    content/global/bindings/datetimepopup.xml   (widgets/datetimepopup.xml)
+    content/global/bindings/datetimebox.xml     (widgets/datetimebox.xml)
+    content/global/bindings/datetimebox.css     (widgets/datetimebox.css)
  *  content/global/bindings/dialog.xml          (widgets/dialog.xml)
 +*  content/global/bindings/dialog-kde.xml      (widgets/dialog-kde.xml)
 +% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde
@@ -310,6 +310,18 @@
     content/global/bindings/scale.xml           (widgets/scale.xml)
     content/global/bindings/scrollbar.xml       (widgets/scrollbar.xml)
     content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)
+@@ -113,9 +117,9 @@ toolkit.jar:
+    content/global/bindings/videocontrols.css   (widgets/videocontrols.css)
+ *  content/global/bindings/wizard.xml          (widgets/wizard.xml)
+ #ifdef XP_MACOSX
+    content/global/macWindowMenu.js
+ #endif
+    content/global/svg/svgBindings.xml          (/layout/svg/resources/content/svgBindings.xml)
+    content/global/gmp-sources/eme-adobe.json   (gmp-sources/eme-adobe.json)
+    content/global/gmp-sources/openh264.json    (gmp-sources/openh264.json)
+-   content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
+\ No newline at end of file
++   content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
 diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
 new file mode 100644
 --- /dev/null
@@ -460,7 +472,7 @@
 +        <body>
 +        <![CDATA[
 +          var xOffset = screen.availWidth/2 - window.outerWidth/2;
-+          var yOffset = screen.availHeight/2 - window.outerHeight/2; //(opener.outerHeight *2)/10;
++          var yOffset = screen.availHeight/2 - window.outerHeight/2;
 +
 +          xOffset = xOffset > 0 ? xOffset : 0;
 +          yOffset = yOffset > 0 ? yOffset : 0;
@@ -776,7 +788,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1403 @@
+@@ -0,0 +1,1411 @@
 +<?xml version="1.0"?>
 +
 +<!DOCTYPE bindings [
@@ -2042,11 +2054,19 @@
 +        </body>
 +      </method>
 +
-+      <field name="DeferredTask" readonly="true">
-+        let targetObj = {};
-+        Components.utils.import("resource://gre/modules/DeferredTask.jsm", targetObj);
-+        targetObj.DeferredTask;
-+      </field>
++      <property name="DeferredTask" readonly="true">
++        <getter><![CDATA[
++          let module = {};
++          Components.utils.import("resource://gre/modules/DeferredTask.jsm", module);
++          Object.defineProperty(this, "DeferredTask", {
++            configurable: true,
++            enumerable: true,
++            writable: true,
++            value: module.DeferredTask
++          });
++          return module.DeferredTask;
++        ]]></getter>
++      </property>
 +      <method name="_deferredValueUpdate">
 +        <parameter name="aElement"/>
 +        <body>
@@ -3676,7 +3696,7 @@
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -44,16 +44,17 @@
+@@ -45,16 +45,17 @@
  #include "prproces.h"
  #include "nsIDirectoryEnumerator.h"
  #include "nsISimpleEnumerator.h"
@@ -3694,7 +3714,7 @@
  #include "prmem.h"
  #include "plbase64.h"
  
-@@ -1948,42 +1949,52 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1947,42 +1948,52 @@ nsLocalFile::SetPersistentDescriptor(con
    return InitWithNativePath(aPersistentDescriptor);
  #endif
  }
@@ -3753,7 +3773,7 @@
      return rv;
    }
    return NS_ERROR_FAILURE;
-@@ -1991,16 +2002,22 @@ nsLocalFile::Reveal()
+@@ -1990,16 +2001,22 @@ nsLocalFile::Reveal()
    return NS_ERROR_FAILURE;
  #endif
  }
mozilla