wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-06 15:58:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Roy Tam 2019-11-29 11:37:55 +08:00
commit 33f029715a
12 changed files with 38 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
application/basilisk/build.mk
View file

@ -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

6
application/basilisk/installer/Makefile.in
View file

@ -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

5
application/palemoon/build.mk
View file

@ -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

11
application/palemoon/installer/Makefile.in
View file

@ -156,9 +156,16 @@ endif
endif
endif
libs::
# Builds using the hybrid FasterMake/RecursiveMake backend will
# 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 =

2
dom/interfaces/css/nsIDOMCSSGroupingRule.idl
View file

@ -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);

2
dom/interfaces/css/nsIDOMCSSStyleSheet.idl
View file

@ -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);

2
dom/webidl/CSSStyleSheet.webidl
View file

@ -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);
};

6
layout/generic/nsInlineFrame.cpp
View file

@ -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);
DrainSelfOverflowListInternal(eForDestroy, lineContainer);
overflowFrames->ApplySetParent(this);
}
nsContainerFrame::DestroyFrom(aDestructRoot);
}
@ -508,8 +507,7 @@ nsInlineFrame::DrainSelfOverflowListInternal(DrainFlags aFlags,
if (aLineContainer && aLineContainer->GetPrevContinuation()) {
ReparentFloatsForInlineChild(aLineContainer, firstChild, true);
}
const bool doReparentSC =
(aFlags & eInFirstLine) && !(aFlags & eForDestroy);
const bool doReparentSC = (aFlags & eInFirstLine);
RestyleManagerHandle restyleManager = PresContext()->RestyleManager();
for (nsIFrame* f = firstChild; f; f = f->GetNextSibling()) {
f->SetParent(this);

3
layout/generic/nsInlineFrame.h
View file

@ -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.

8
mailnews/base/src/nsMessengerOSXIntegration.mm
View file

@ -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;
}

9
python/mozbuild/mozbuild/mach_commands.py
View file

@ -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."""

4
toolkit/mozapps/installer/packager-uxp.mk
View file

@ -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