Merge remote-tracking branch 'origin/master' into custom

application/basilisk/build.mk

@@ -8,8 +8,11 @@ installer:
 package:
 	@$(MAKE) -C application/basilisk/installer make-archive
 
+l10n-package:
+	@$(MAKE) -C application/basilisk/installer make-langpack
+
 mozpackage:
-	@$(MAKE) -C application/basilisk/installer make-package
+	@$(MAKE) -C application/basilisk/installer
 
 package-compare:
 	@$(MAKE) -C application/basilisk/installer package-compare

application/basilisk/installer/Makefile.in

@@ -150,11 +150,15 @@ endif
 
 # Builds using the hybrid FasterMake/RecursiveMake backend will
 # fail to produce a langpack. See bug 1255096.
-libs::
+make-langpack:
 ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
 	$(MAKE) -C $(DEPTH)/application/basilisk/locales langpack
+else
+	@echo WARNING: "Language Pack was not generated due to using the hybrid FasterMake/RecursiveMake backend." >&2
 endif
 
+libs:: make-langpack
+
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS =
 else

application/palemoon/build.mk

@@ -8,8 +8,11 @@ installer:
 package:
 	@$(MAKE) -C application/palemoon/installer make-archive
 
+l10n-package:
+	@$(MAKE) -C application/palemoon/installer make-langpack
+
 mozpackage:
-	@$(MAKE) -C application/palemoon/installer make-package
+	@$(MAKE) -C application/palemoon/installer
 
 package-compare:
 	@$(MAKE) -C application/palemoon/installer package-compare

application/palemoon/installer/Makefile.in

@@ -156,9 +156,16 @@ endif
 endif
 endif
 
-
+# Builds using the hybrid FasterMake/RecursiveMake backend will
-libs::
+# fail to produce a langpack. See bug 1255096.
+make-langpack:
+ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
 	$(MAKE) -C $(DEPTH)/application/palemoon/locales langpack
+else
+	@echo WARNING: "Language Pack was not generated due to using the hybrid FasterMake/RecursiveMake backend." >&2
+endif
+
+libs:: make-langpack
 
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS =

dom/interfaces/css/nsIDOMCSSGroupingRule.idl

@@ -14,7 +14,7 @@ interface nsIDOMCSSGroupingRule : nsIDOMCSSRule
   readonly attribute nsIDOMCSSRuleList cssRules;
 
   unsigned long      insertRule(in DOMString rule,
-                                in unsigned long index)
+                                [optional] in unsigned long index)
                                         raises(DOMException);
   void               deleteRule(in unsigned long index)
                                         raises(DOMException);

dom/interfaces/css/nsIDOMCSSStyleSheet.idl

@@ -20,7 +20,7 @@ interface nsIDOMCSSStyleSheet : nsIDOMStyleSheet
   readonly attribute nsIDOMCSSRuleList cssRules;
 
   unsigned long      insertRule(in DOMString rule, 
-                                in unsigned long index)
+                                [optional] in unsigned long index)
                                         raises(DOMException);
   void               deleteRule(in unsigned long index)
                                         raises(DOMException);

dom/webidl/CSSStyleSheet.webidl

@@ -23,7 +23,7 @@ interface CSSStyleSheet : StyleSheet {
   [ChromeOnly, BinaryName="parsingModeDOM"]
   readonly attribute CSSStyleSheetParsingMode parsingMode;
   [Throws, NeedsSubjectPrincipal]
-  unsigned long insertRule(DOMString rule, unsigned long index);
+  unsigned long insertRule(DOMString rule, optional unsigned long index = 0);
   [Throws, NeedsSubjectPrincipal]
   void deleteRule(unsigned long index);
 };

layout/generic/nsInlineFrame.cpp

@@ -199,8 +199,7 @@ nsInlineFrame::DestroyFrom(nsIFrame* aDestructRoot)
     // Fixup the parent pointers for any child frames on the OverflowList.
     // nsIFrame::DestroyFrom depends on that to find the sticky scroll
     // container (an ancestor).
-    nsIFrame* lineContainer = nsLayoutUtils::FindNearestBlockAncestor(this);
+    overflowFrames->ApplySetParent(this);
-    DrainSelfOverflowListInternal(eForDestroy, lineContainer);
   }
   nsContainerFrame::DestroyFrom(aDestructRoot);
 }
@@ -508,8 +507,7 @@ nsInlineFrame::DrainSelfOverflowListInternal(DrainFlags aFlags,
       if (aLineContainer && aLineContainer->GetPrevContinuation()) {
         ReparentFloatsForInlineChild(aLineContainer, firstChild, true);
       }
-      const bool doReparentSC =
+      const bool doReparentSC = (aFlags & eInFirstLine);
-        (aFlags & eInFirstLine) && !(aFlags & eForDestroy);
       RestyleManagerHandle restyleManager = PresContext()->RestyleManager();
       for (nsIFrame* f = firstChild; f; f = f->GetNextSibling()) {
         f->SetParent(this);

layout/generic/nsInlineFrame.h

@@ -175,9 +175,6 @@ private:
   enum DrainFlags {
     eDontReparentFrames = 1, // skip reparenting the overflow list frames
     eInFirstLine = 2, // the request is for an inline descendant of a nsFirstLineFrame
-    eForDestroy = 4, // the request is from DestroyFrom; in this case we do the
-                     // minimal work required since the frame is about to be
-                     // destroyed (just fixup parent pointers)
   };
   /**
    * Move any frames on our overflow list to the end of our principal list.

mailnews/base/src/nsMessengerOSXIntegration.mm

@@ -249,14 +249,6 @@ nsMessengerOSXIntegration::Observe(nsISupports* aSubject, const char* aTopic, co
     return mailSession->AddFolderListener(this, nsIFolderListener::boolPropertyChanged | nsIFolderListener::intPropertyChanged);
   }
 
-  if (!strcmp(aTopic, kUnreadImCountChangedTopic)) {
-    nsresult rv;
-    nsCOMPtr<nsISupportsPRInt32> unreadCount = do_QueryInterface(aSubject, &rv);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return BadgeDockIcon();
-  }
-
   return NS_OK;
 }
 

python/mozbuild/mozbuild/mach_commands.py

@@ -1079,6 +1079,15 @@ class Stage_Package(MachCommandBase):
     def stage_package(self):
         return self._run_make(directory=".", target='stage-package', ensure_exit_code=False)
 
+@CommandProvider
+class L10n_Package(MachCommandBase):
+    """Build and package l10n as a language pack xpi."""
+
+    @Command('langpack', category='post-build',
+        description='Build and package l10n as a language pack.')
+    def l10n_package(self):
+        return self._run_make(directory=".", target='l10n-package', ensure_exit_code=False)
+
 @CommandProvider
 class Package(MachCommandBase):
     """Package the built product for distribution."""

toolkit/mozapps/installer/packager-uxp.mk

@@ -6,11 +6,11 @@
 # very much still dependent on them
 include $(MOZILLA_DIR)/toolkit/mozapps/installer/packager.mk
 
-# This is currently only used on Windows and Linux
+# This is currently only used on Windows, Linux, and Solaris
 # on other platforms such as Mac will fall back to the orginal
 # mozilla packaging
 make-archive:
-ifeq (,$(filter Linux WINNT,$(OS_ARCH)))
+ifeq (,$(filter SunOS Linux WINNT,$(OS_ARCH)))
 	$(MAKE) make-package
 else
 	$(MAKE) stage-package make-buildinfo-file