Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge m-c to fx-team. a=merge

Browse Source
This commit is contained in:
Ryan VanderMeulen 2016-01-01 19:36:51 -05:00
commit 7995665048
366 changed files with 6050 additions and 1318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -218,7 +218,6 @@ MAKE_SYM_STORE_ARGS += --install-manifest=$(DEPTH)/_build_manifests/install/dist
SYM_STORE_SOURCE_DIRS := $(topsrcdir)
ifndef JS_STANDALONE
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
ifdef MOZ_SYMBOLS_EXTRA_BUILDID
@ -261,7 +260,6 @@ ifdef SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE
else
$(SHELL) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.sh $(SYMBOL_INDEX_NAME) '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
endif
endif
# MOZ_SOURCE_STAMP is defined in package-name.mk with a deferred assignment.
# exporting it makes make run its $(shell) command for each invoked submake,

2
b2g/config/aries/sources.xml
View File

@ -21,7 +21,7 @@
<!--
B2G repositories for all targets
-->
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ce8365a8d3867bc0661a1627aaa2cda51d1f7c05"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

2
b2g/config/dolphin/sources.xml
View File

@ -21,7 +21,7 @@
<!--
B2G repositories for all targets
-->
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ce8365a8d3867bc0661a1627aaa2cda51d1f7c05"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

2
b2g/config/emulator-ics/sources.xml
View File

@ -21,7 +21,7 @@
<!--
B2G repositories for all targets
-->
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ce8365a8d3867bc0661a1627aaa2cda51d1f7c05"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

2
b2g/config/emulator-jb/sources.xml
View File

@ -21,7 +21,7 @@
<!--
B2G repositories for all targets
-->
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ce8365a8d3867bc0661a1627aaa2cda51d1f7c05"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

2
b2g/config/emulator-kk/sources.xml
View File

@ -21,7 +21,7 @@
<!--
B2G repositories for all targets
-->
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ce8365a8d3867bc0661a1627aaa2cda51d1f7c05"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

2
b2g/config/emulator-l/sources.xml
View File

@ -21,7 +21,7 @@
<!--
B2G repositories for all targets
-->
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ce8365a8d3867bc0661a1627aaa2cda51d1f7c05"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

2
b2g/config/emulator/sources.xml
View File

@ -21,7 +21,7 @@
<!--
B2G repositories for all targets
-->
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ce8365a8d3867bc0661a1627aaa2cda51d1f7c05"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

2
b2g/config/flame-kk/sources.xml
View File

@ -21,7 +21,7 @@
<!--
B2G repositories for all targets
-->
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ce8365a8d3867bc0661a1627aaa2cda51d1f7c05"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

4
b2g/config/gaia.json
View File

@ -1,9 +1,9 @@
{
"git": {
"git_revision": "9f665863ea9c3dd9585905ef002e8fa06713d820",
"git_revision": "ce8365a8d3867bc0661a1627aaa2cda51d1f7c05",
"remote": "https://git.mozilla.org/releases/gaia.git",
"branch": ""
},
"revision": "9f635ea7f4ca6be790a3912220fbcd5da25cbefa",
"revision": "3bdee71faf41c858d77aeb084e5ca6cccaef349b",
"repo_path": "integration/gaia-central"
}

2
b2g/config/nexus-4-kk/sources.xml
View File

@ -21,7 +21,7 @@
<!--
B2G repositories for all targets
-->
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ce8365a8d3867bc0661a1627aaa2cda51d1f7c05"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

2
b2g/config/nexus-4/sources.xml
View File

@ -21,7 +21,7 @@
<!--
B2G repositories for all targets
-->
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ce8365a8d3867bc0661a1627aaa2cda51d1f7c05"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

2
b2g/config/nexus-5-l/sources.xml
View File

@ -21,7 +21,7 @@
<!--
B2G repositories for all targets
-->
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ce8365a8d3867bc0661a1627aaa2cda51d1f7c05"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

2
b2g/gaia/Makefile.in
View File

@ -19,4 +19,4 @@ include $(topsrcdir)/config/rules.mk
libs::
+$(MAKE) -j1 -C $(GAIADIR) clean
+$(GAIA_OPTIONS) $(MAKE) -j1 -C $(GAIADIR) profile
(cd $(GAIADIR)/profile && tar $(TAR_CREATE_FLAGS) - .) | (cd $(abspath $(DIST))/bin/$(GAIA_PATH) && tar -xf -)
(cd $(GAIADIR)/profile && tar $(TAR_CREATE_FLAGS) - .) | (cd $(ABS_DIST)/bin/$(GAIA_PATH) && tar -xf -)

18
b2g/locales/Makefile.in
View File

@ -19,8 +19,8 @@ PWD := $(CURDIR)
# pulls. You may override them if you provide your own files. You _must_
# override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not
# work in that case.
ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE)
WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
WIN32_INSTALLER_IN ?= $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
RETRIEVE_WINDOWS_INSTALLER = 1
MOZ_LANGPACK_EID=langpack-$(AB_CD)@b2g.mozilla.org
@ -31,9 +31,9 @@ L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warning
PP_TARGETS += L10N_PREF_JS_EXPORTS
ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
MOZ_PKG_MAC_DSSTORE=$(ABS_DIST)/branding/dsstore
MOZ_PKG_MAC_BACKGROUND=$(ABS_DIST)/branding/background.png
MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns
MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
endif
@ -41,8 +41,8 @@ ifeq (WINNT,$(OS_ARCH))
UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \
$(NSINSTALL) -D $(STAGEDIST)/uninstall; \
cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \
$(RM) $(_ABS_DIST)/l10n-stage/setup.exe; \
cp ../installer/windows/l10ngen/setup.exe $(_ABS_DIST)/l10n-stage; \
$(RM) $(ABS_DIST)/l10n-stage/setup.exe; \
cp ../installer/windows/l10ngen/setup.exe $(ABS_DIST)/l10n-stage; \
$(NULL)
endif
@ -57,7 +57,7 @@ $(DIST)/branding:
libs::
@if test -f '$(LOCALE_SRCDIR)/existing-profile-defaults.js'; then \
$(PYTHON) -m mozbuild.action.preprocessor $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(MOZ_DEBUG_DEFINES) \
$(PYTHON) -m mozbuild.action.preprocessor $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) \
$(LOCALE_SRCDIR)/existing-profile-defaults.js -o $(FINAL_TARGET)/defaults/existing-profile-defaults.js; \
fi
@ -75,7 +75,7 @@ chrome-%:
@$(MAKE) chrome AB_CD=$*
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
repackage-win32-installer: WIN32_INSTALLER_OUT=$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD)
@echo 'Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT).'
$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export

54
browser/base/content/test/general/browser_audioTabIcon.js
View File

@ -181,22 +181,56 @@ function* test_playing_icon_on_tab(tab, browser, isPinned) {
yield test_muting_using_menu(tab, true);
}
function* test_swapped_browser(oldTab, newBrowser, isPlaying) {
function* test_swapped_browser_while_playing(oldTab, newBrowser) {
ok(oldTab.hasAttribute("muted"), "Expected the correct muted attribute on the old tab");
is(oldTab.hasAttribute("soundplaying"), isPlaying, "Expected the correct soundplaying attribute on the old tab");
ok(oldTab.hasAttribute("soundplaying"), "Expected the correct soundplaying attribute on the old tab");
let newTab = gBrowser.getTabForBrowser(newBrowser);
let AttrChangePromise = BrowserTestUtils.waitForEvent(newTab, "TabAttrModified", false, event => {
return (event.detail.changed.indexOf("soundplaying") >= 0 || !isPlaying) &&
return event.detail.changed.indexOf("soundplaying") >= 0 &&
event.detail.changed.indexOf("muted") >= 0;
});
gBrowser.swapBrowsersAndCloseOther(newTab, oldTab);
yield AttrChangePromise;
ok(newTab.hasAttribute("muted"), "Expected the correct muted attribute on the new tab");
ok(newTab.hasAttribute("soundplaying"), "Expected the correct soundplaying attribute on the new tab");
let receivedSoundPlaying = 0;
// We need to receive two TabAttrModified events with 'soundplaying'
// because swapBrowsersAndCloseOther involves nsDocument::OnPageHide and
// nsDocument::OnPageShow. Each methods lead to TabAttrModified event.
yield BrowserTestUtils.waitForEvent(newTab, "TabAttrModified", false, event => {
if (event.detail.changed.indexOf("soundplaying") >= 0) {
return (++receivedSoundPlaying == 2);
}
});
ok(newTab.hasAttribute("muted"), "Expected the correct muted attribute on the new tab");
ok(newTab.hasAttribute("soundplaying"), "Expected the correct soundplaying attribute on the new tab");
let icon = document.getAnonymousElementByAttribute(newTab, "anonid",
"soundplaying-icon");
yield test_tooltip(icon, "Unmute tab", true);
}
function* test_swapped_browser_while_not_playing(oldTab, newBrowser) {
ok(oldTab.hasAttribute("muted"), "Expected the correct muted attribute on the old tab");
ok(!oldTab.hasAttribute("soundplaying"), "Expected the correct soundplaying attribute on the old tab");
let newTab = gBrowser.getTabForBrowser(newBrowser);
let AttrChangePromise = BrowserTestUtils.waitForEvent(newTab, "TabAttrModified", false, event => {
return event.detail.changed.indexOf("muted") >= 0;
});
let AudioPlaybackPromise = new Promise(resolve => {
let observer = (subject, topic, data) => {
ok(true, "Should see an audio-playback notification");
ok(false, "Should not see an audio-playback notification");
};
Services.obs.addObserver(observer, "audio-playback", false);
Services.obs.addObserver(observer, "audiochannel-activity-normal", false);
setTimeout(() => {
Services.obs.removeObserver(observer, "audio-playback");
Services.obs.removeObserver(observer, "audiochannel-activity-normal");
resolve();
}, 100);
});
@ -205,13 +239,13 @@ function* test_swapped_browser(oldTab, newBrowser, isPlaying) {
yield AttrChangePromise;
ok(newTab.hasAttribute("muted"), "Expected the correct muted attribute on the new tab");
is(newTab.hasAttribute("soundplaying"), isPlaying, "Expected the correct soundplaying attribute on the new tab");
ok(!newTab.hasAttribute("soundplaying"), "Expected the correct soundplaying attribute on the new tab");
// Wait to see if an audio-playback event is dispatched.
yield AudioPlaybackPromise;
ok(newTab.hasAttribute("muted"), "Expected the correct muted attribute on the new tab");
is(newTab.hasAttribute("soundplaying"), isPlaying, "Expected the correct soundplaying attribute on the new tab");
ok(!newTab.hasAttribute("soundplaying"), "Expected the correct soundplaying attribute on the new tab");
let icon = document.getAnonymousElementByAttribute(newTab, "anonid",
"soundplaying-icon");
@ -230,7 +264,7 @@ function* test_browser_swapping(tab, browser) {
gBrowser,
url: "about:blank",
}, function*(newBrowser) {
yield test_swapped_browser(tab, newBrowser, true)
yield test_swapped_browser_while_playing(tab, newBrowser)
// Now, test swapping with a muted but not playing tab.
// Note that the tab remains muted, so we only need to pause playback.
@ -240,7 +274,7 @@ function* test_browser_swapping(tab, browser) {
yield BrowserTestUtils.withNewTab({
gBrowser,
url: "about:blank",
}, newBrowser => test_swapped_browser(tab, newBrowser, false));
}, newBrowser => test_swapped_browser_while_not_playing(tab, newBrowser));
});
}

2
browser/base/content/test/general/browser_bug575561.js
View File

@ -1,3 +1,5 @@
requestLongerTimeout(2);
const TEST_URL = "http://example.com/browser/browser/base/content/test/general/app_bug575561.html";
add_task(function*() {

2
browser/base/content/test/general/browser_bug676619.js
View File

@ -1,5 +1,5 @@
function test () {
requestLongerTimeout(2);
requestLongerTimeout(3);
waitForExplicitFinish();
var isHTTPS = false;

2
browser/base/content/test/general/browser_devices_get_user_media.js
View File

@ -2,6 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
requestLongerTimeout(2);
const kObservedTopics = [
"getUserMedia:response:allow",
"getUserMedia:revoke",

2
browser/base/content/test/general/browser_e10s_switchbrowser.js
View File

@ -1,3 +1,5 @@
requestLongerTimeout(2);
const DUMMY_PATH = "browser/browser/base/content/test/general/dummy_page.html";
const gExpectedHistory = {

2
browser/base/content/test/general/browser_sanitize-timespans.js
View File

@ -1,6 +1,8 @@
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
requestLongerTimeout(2);
// Bug 453440 - Test the timespan-based logic of the sanitizer code
var now_mSec = Date.now();
var now_uSec = now_mSec * 1000;

2
browser/base/content/test/general/browser_tab_drag_drop_perwindow.js
View File

@ -2,6 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
requestLongerTimeout(2);
const CHROMEUTILS_URL = "chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js";
var ChromeUtils = {};

2
browser/base/content/test/newtab/browser_newtab_block.js
View File

@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
requestLongerTimeout(2);
/*
* These tests make sure that blocking/removing sites from the grid works
* as expected. Pinned tabs should not be moved. Gaps will be re-filled

2
browser/base/content/test/newtab/browser_newtab_drag_drop_ext.js
View File

@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
requestLongerTimeout(2);
const PREF_NEWTAB_COLUMNS = "browser.newtabpage.columns";
/*

2
browser/base/content/test/newtab/browser_newtab_enhanced.js
View File

@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
requestLongerTimeout(2);
const PRELOAD_PREF = "browser.newtab.preload";
var suggestedLink = {

2
browser/components/customizableui/test/browser_880164_customization_context_menus.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
const isOSX = (Services.appinfo.OS === "Darwin");
// Right-click on the home button should

2
browser/components/customizableui/test/browser_938980_navbar_collapsed.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
var bookmarksToolbar = document.getElementById("PersonalToolbar");
var navbar = document.getElementById("nav-bar");
var tabsToolbar = document.getElementById("TabsToolbar");

2
browser/components/customizableui/test/browser_970511_undo_restore_default.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Restoring default should show an "undo" option which undoes the restoring operation.
add_task(function() {
let homeButtonId = "home-button";

2
browser/components/customizableui/test/browser_975719_customtoolbars_behaviour.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
const kXULWidgetId = "a-test-button"; // we'll create a button with this ID.
add_task(function setup() {

2
browser/components/customizableui/test/browser_bootstrapped_custom_toolbar.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
const kTestBarID = "testBar";
const kWidgetID = "characterencoding-button";

2
browser/components/extensions/test/browser/browser_ext_tabs_executeScript_good.js
View File

@ -2,6 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
requestLongerTimeout(2);
function* testHasPermission(params) {
let contentSetup = params.contentSetup || (() => Promise.resolve());

2
browser/components/extensions/test/browser/browser_ext_tabs_onUpdated.js
View File

@ -2,6 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
requestLongerTimeout(2);
add_task(function* () {
let win1 = yield BrowserTestUtils.openNewBrowserWindow();

2
browser/components/extensions/test/browser/browser_ext_tabs_query.js
View File

@ -2,6 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
requestLongerTimeout(2);
add_task(function* () {
let tab1 = yield BrowserTestUtils.openNewForegroundTab(gBrowser, "about:robots");
let tab2 = yield BrowserTestUtils.openNewForegroundTab(gBrowser, "about:config");

4
browser/components/preferences/in-content/tests/browser_cookies_exceptions.js
View File

@ -1,9 +1,11 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
requestLongerTimeout(2);
function test() {
waitForExplicitFinish();
requestLongerTimeout(2);
requestLongerTimeout(3);
testRunner.runTests();
}

2
browser/components/preferences/in-content/tests/browser_privacypane_4.js
View File

@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
requestLongerTimeout(2);
function test() {
let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
getService(Ci.mozIJSSubScriptLoader);

2
browser/components/sessionstore/test/browser_522545.js
View File

@ -6,7 +6,7 @@ function test() {
/** Test for Bug 522545 **/
waitForExplicitFinish();
requestLongerTimeout(3);
requestLongerTimeout(4);
// This tests the following use case:
// User opens a new tab which gets focus. The user types something into the

2
browser/components/sessionstore/test/browser_586068-apptabs.js
View File

@ -2,6 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
requestLongerTimeout(2);
const PREF_RESTORE_ON_DEMAND = "browser.sessionstore.restore_on_demand";
add_task(function* test() {

2
browser/components/sessionstore/test/browser_600545.js
View File

@ -2,6 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
requestLongerTimeout(2);
var stateBackup = JSON.parse(ss.getBrowserState());
function test() {

2
browser/components/sessionstore/test/browser_crashedTabs.js
View File

@ -3,6 +3,8 @@
"use strict";
requestLongerTimeout(2);
const PAGE_1 = "data:text/html,<html><body>A%20regular,%20everyday,%20normal%20page.";
const PAGE_2 = "data:text/html,<html><body>Another%20regular,%20everyday,%20normal%20page.";

2
browser/components/sessionstore/test/browser_formdata_cc.js
View File

@ -3,7 +3,7 @@
const URL = "http://mochi.test:8888/browser/browser/components/" +
"sessionstore/test/browser_formdata_sample.html";
requestLongerTimeout(2);
requestLongerTimeout(3);
/**
* This test ensures that credit card numbers in form data will not be

2
browser/components/sessionstore/test/browser_sessionHistory.js
View File

@ -3,6 +3,8 @@
"use strict";
requestLongerTimeout(2);
/**
* Ensure that starting a load invalidates shistory.
*/

2
browser/experiments/Makefile.in
View File

@ -6,7 +6,7 @@ include $(topsrcdir)/config/rules.mk
# This is so hacky. Waiting on bug 988938.
addondir = $(srcdir)/test/addons
testdir = $(abspath $(DEPTH)/_tests/xpcshell/browser/experiments/test/xpcshell)
testdir = $(topobjdir)/_tests/xpcshell/browser/experiments/test/xpcshell
misc:: $(call mkdir_deps,$(testdir))
$(EXIT_ON_ERROR) \

2
browser/extensions/loop/jar.mn
View File

@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
[.] chrome.jar:
[features/loop@mozilla.org] chrome.jar:
% content loop %content/ contentaccessible=yes
% skin loop classic/1.0 %skin/linux/ os=Linux
% skin loop classic/1.0 %skin/osx/ os=Darwin

6
browser/extensions/loop/moz.build
View File

@ -4,13 +4,11 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
FINAL_TARGET = 'dist/bin/browser/features/loop@mozilla.org'
FINAL_TARGET_FILES += [
FINAL_TARGET_FILES.features['loop@mozilla.org'] += [
'bootstrap.js'
]
FINAL_TARGET_PP_FILES += [
FINAL_TARGET_PP_FILES.features['loop@mozilla.org'] += [
'install.rdf.in'
]

2
browser/extensions/pdfjs/test/browser_pdfjs_navigation.js
View File

@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
requestLongerTimeout(2);
Components.utils.import("resource://gre/modules/Promise.jsm", this);
const RELATIVE_DIR = "browser/extensions/pdfjs/test/";

2
browser/extensions/pdfjs/test/browser_pdfjs_zoom.js
View File

@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
requestLongerTimeout(2);
Components.utils.import("resource://gre/modules/Promise.jsm", this);
const RELATIVE_DIR = "browser/extensions/pdfjs/test/";

24
browser/locales/Makefile.in
View File

@ -35,8 +35,8 @@ PWD := $(CURDIR)
# pulls. You may override them if you provide your own files. You _must_
# override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not
# work in that case.
ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE)
WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
WIN32_INSTALLER_IN ?= $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
RETRIEVE_WINDOWS_INSTALLER = 1
MOZ_LANGPACK_EID=langpack-$(AB_CD)@firefox.mozilla.org
@ -47,9 +47,9 @@ L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warning
PP_TARGETS += L10N_PREF_JS_EXPORTS
ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
MOZ_PKG_MAC_DSSTORE=$(ABS_DIST)/branding/dsstore
MOZ_PKG_MAC_BACKGROUND=$(ABS_DIST)/branding/background.png
MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns
MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
endif
@ -57,14 +57,14 @@ ifeq (WINNT,$(OS_ARCH))
UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \
$(NSINSTALL) -D $(STAGEDIST)/uninstall; \
cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \
$(RM) $(_ABS_DIST)/l10n-stage/setup.exe; \
cp ../installer/windows/l10ngen/setup.exe $(_ABS_DIST)/l10n-stage; \
$(RM) $(ABS_DIST)/l10n-stage/setup.exe; \
cp ../installer/windows/l10ngen/setup.exe $(ABS_DIST)/l10n-stage; \
$(NULL)
STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST)/$(PKG_INST_PATH)'; \
$(RM) '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
cp ../installer/windows/l10ngen/stub.exe '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
chmod 0755 '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
STUB_HOOK = $(NSINSTALL) -D '$(ABS_DIST)/$(PKG_INST_PATH)'; \
$(RM) '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
cp ../installer/windows/l10ngen/stub.exe '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
chmod 0755 '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
$(NULL)
endif
@ -140,7 +140,7 @@ endif
@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
repackage-win32-installer: WIN32_INSTALLER_OUT=$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD)
@echo 'Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT).'
$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export

30
browser/locales/generic/install.rdf
View File

@ -1,30 +0,0 @@
<?xml version="1.0"?>
<!--
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#filter substitution
-->
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest"
em:id="@MOZ_LANGPACK_EID@"
em:name="@MOZ_LANG_TITLE@ Language Pack"
em:version="@MOZ_APP_VERSION@"
em:type="8"
em:creator="@MOZ_LANGPACK_CREATOR@">
#ifdef MOZ_LANGPACK_CONTRIBUTORS
@MOZ_LANGPACK_CONTRIBUTORS@
#endif
<em:targetApplication>
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>@MOZ_APP_VERSION@</em:minVersion>
<em:maxVersion>@MOZ_APP_MAXVERSION@</em:maxVersion>
</Description>
</em:targetApplication>
</Description>
</RDF>

4
build/Makefile.in
View File

@ -33,7 +33,7 @@ endif
# NOTE: Keep .gdbinit in the topsrcdir for people who run gdb from the topsrcdir.
# needs to be absolute to be distinct from $(topsrcdir)/.gdbinit
GDBINIT_OBJDIR_FILES = $(topsrcdir)/.gdbinit
GDBINIT_OBJDIR_DEST = $(abspath $(DEPTH))
GDBINIT_OBJDIR_DEST = $(topobjdir)
INSTALL_TARGETS += GDBINIT_OBJDIR
# Put a .lldbinit in the bin directory and the objdir, to be picked up
@ -52,7 +52,7 @@ INSTALL_TARGETS += LLDBINIT_FINAL_TARGET
# Put the .ycm_extra_conf.py file at the root of the objdir. It is used by
# the vim plugin YouCompleteMe.
YCM_FILES := $(topsrcdir)/.ycm_extra_conf.py
YCM_DEST := $(abspath $(DEPTH))
YCM_DEST := $(topobjdir)
YCM_TARGET := export
INSTALL_TARGETS += YCM

8
build/autoconf/compiler-opts.m4
View File

@ -128,13 +128,13 @@ fi
AC_SUBST(MOZ_NO_DEBUG_RTL)
MOZ_DEBUG_ENABLE_DEFS="-DDEBUG -DTRACING"
MOZ_DEBUG_ENABLE_DEFS="DEBUG TRACING"
MOZ_ARG_WITH_STRING(debug-label,
[ --with-debug-label=LABELS
Define DEBUG_<value> for each comma-separated
value given.],
[ for option in `echo $withval | sed 's/,/ /g'`; do
MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS -DDEBUG_${option}"
MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS DEBUG_${option}"
done])
if test -n "$MOZ_DEBUG"; then
@ -153,10 +153,10 @@ if test -n "$MOZ_DEBUG"; then
MOZ_DEBUG_DEFINES="$MOZ_DEBUG_ENABLE_DEFS"
else
MOZ_DEBUG_DEFINES="-DNDEBUG -DTRIMMED"
MOZ_DEBUG_DEFINES="NDEBUG TRIMMED"
fi
AC_SUBST(MOZ_DEBUG_DEFINES)
AC_SUBST_LIST(MOZ_DEBUG_DEFINES)
dnl ========================================================
dnl = Enable generation of debug symbols

8
build/pgo/profileserver.py
View File

@ -63,6 +63,14 @@ if __name__ == '__main__':
if os.path.exists(vc12dir):
env["PATH"] = vc12dir + ";" + env["PATH"]
# Run Firefox a first time to initialize its profile
runner = FirefoxRunner(profile=profile,
binary=build.get_binary_path(where="staged-package"),
cmdargs=['javascript:Quitter.quit()'],
env=env)
runner.start()
runner.wait()
jarlog = os.getenv("JARLOG_FILE")
if jarlog:
env["MOZ_JAR_LOG_FILE"] = os.path.abspath(jarlog)

1
config/baseconfig.mk
View File

@ -11,6 +11,7 @@ DIST = dist
else
DIST = $(DEPTH)/dist
endif
ABS_DIST = $(topobjdir)/dist
# We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
# manually use it before config.mk inclusion

12
config/config.mk
View File

@ -159,8 +159,6 @@ _DEBUG_ASFLAGS :=
_DEBUG_CFLAGS :=
_DEBUG_LDFLAGS :=
_DEBUG_CFLAGS += $(MOZ_DEBUG_DEFINES)
ifneq (,$(MOZ_DEBUG)$(MOZ_DEBUG_SYMBOLS))
ifeq ($(AS),yasm)
ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
@ -289,9 +287,9 @@ CCC = $(CXX)
INCLUDES = \
-I$(srcdir) \
-I. \
-I$(CURDIR) \
$(LOCAL_INCLUDES) \
-I$(DIST)/include \
-I$(ABS_DIST)/include \
$(NULL)
ifndef IS_GYP_DIR
@ -329,6 +327,8 @@ LDFLAGS += $(MOZ_OPTIMIZE_LDFLAGS)
RUSTFLAGS += $(MOZ_OPTIMIZE_RUSTFLAGS)
endif # MOZ_OPTIMIZE
HOST_CFLAGS += $(_DEPEND_CFLAGS)
HOST_CXXFLAGS += $(_DEPEND_CFLAGS)
ifdef CROSS_COMPILE
HOST_CFLAGS += $(HOST_OPTIMIZE_FLAGS)
else
@ -409,8 +409,8 @@ OS_COMPILE_CMMFLAGS += -fobjc-abi-version=2 -fobjc-legacy-dispatch
endif
endif
COMPILE_CFLAGS = $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(OS_INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CFLAGS) $(CFLAGS) $(MOZBUILD_CFLAGS)
COMPILE_CXXFLAGS = $(if $(DISABLE_STL_WRAPPING),,$(STL_FLAGS)) $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(OS_INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CXXFLAGS) $(CXXFLAGS) $(MOZBUILD_CXXFLAGS)
COMPILE_CFLAGS = $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(OS_INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CFLAGS) $(_DEPEND_CFLAGS) $(CFLAGS) $(MOZBUILD_CFLAGS)
COMPILE_CXXFLAGS = $(if $(DISABLE_STL_WRAPPING),,$(STL_FLAGS)) $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(OS_INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CXXFLAGS) $(_DEPEND_CFLAGS) $(CXXFLAGS) $(MOZBUILD_CXXFLAGS)
COMPILE_CMFLAGS = $(OS_COMPILE_CMFLAGS) $(MOZBUILD_CMFLAGS)
COMPILE_CMMFLAGS = $(OS_COMPILE_CMMFLAGS) $(MOZBUILD_CMMFLAGS)
ASFLAGS += $(MOZBUILD_ASFLAGS)

1
config/external/nspr/Makefile.in vendored
View File

@ -8,7 +8,6 @@ include $(topsrcdir)/config/rules.mk
ifdef MOZ_BUILD_NSPR
# Copy NSPR to the SDK
ABS_DIST = $(abspath $(DIST))
ifdef MOZ_FOLD_LIBS
# Trick the nspr build system into not building shared libraries.

34
config/external/nss/Makefile.in vendored
View File

@ -85,15 +85,6 @@ NSS_EXTRA_DLLS += freebl_64int_3
NSS_EXTRA_DLLS += freebl_64fpu_3
endif
ABS_DIST := $(abspath $(DIST))
ifeq ($(HOST_OS_ARCH),WINNT)
ifdef CYGDRIVE_MOUNT
ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\|/|g')
endif
ifneq (,$(filter mingw%,$(host_os)))
ABS_DIST := $(shell cd $(DIST) && pwd -W)
endif
endif
# For all variables such as DLLFLAGS, that may contain $(DIST)
DIST := $(ABS_DIST)
NSPR_INCLUDE_DIR = $(firstword $(filter -I%,$(NSPR_CFLAGS)))
@ -344,31 +335,6 @@ ifdef MOZ_FOLD_LIBS
# Add all static libraries for nss, smime, ssl and nssutil
STATIC_LIBS += $(addprefix $(DEPTH)/security/,$(NSS_STATIC_LIBS))
nss_def_file := $(srcdir)/nss.def
ifeq (WINNT,$(OS_TARGET))
# Create a .def file based on the various .def files for nss, smime, ssl and
# nssutil.
nss3.def: $(nss_def_file) $(DEPTH)/db/sqlite3/src/sqlite-processed.def $(NSS_EXTRA_SYMBOLS_FILE)
echo LIBRARY nss3$(DLL_SUFFIX) > $@.tmp
echo EXPORTS >> $@.tmp
grep -v -h -e ^LIBRARY -e ^EXPORTS -e ^\; $^ >> $@.tmp
mv $@.tmp $@
else
ifdef GCC_USE_GNU_LD
sqlite_def_file := $(topsrcdir)/db/sqlite3/src/sqlite.def
nspr_def_file := $(srcdir)/nspr-dummy.def
nss3.def: $(nss_def_file) $(sqlite_def_file) $(nspr_def_file) $(NSS_EXTRA_SYMBOLS_FILE)
@$(call py_action,convert_def_file, \
$(DEFINES) $(ACDEFINES) $(MOZ_DEBUG_DEFINES) -o $@ $^)
GARBAGE += \
nss3.def \
$(NULL)
endif # GCC_USE_GNU_LD
endif # WINNT
IMPORT_LIB_FILES = $(IMPORT_LIBRARY)
IMPORT_LIB_DEST ?= $(DIST)/lib
IMPORT_LIB_TARGET = target

6
config/external/nss/moz.build vendored
View File

@ -31,11 +31,7 @@ elif CONFIG['MOZ_FOLD_LIBS']:
OS_LIBS += CONFIG['REALTIME_LIBS']
if CONFIG['OS_TARGET'] == 'WINNT':
DEFFILE = 'nss3.def'
if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['GCC_USE_GNU_LD']:
LD_VERSION_SCRIPT = 'nss3.def'
SYMBOLS_FILE = 'nss.symbols'
else:
Library('nss')
USE_LIBS += [

15
config/external/nss/nspr-dummy.def vendored
View File

@ -1,15 +0,0 @@
; This Source Code Form is subject to the terms of the Mozilla Public
; License, v. 2.0. If a copy of the MPL was not distributed with this
; file, You can obtain one at http://mozilla.org/MPL/2.0/.
;
; This is a fake .def file, to be used for generating linker scripts
; for our folded libnss when MOZ_FOLD_LIBS. NSPR, unlike NSS, exports
; symbols with symbol visibility (Unix) or __declspec (Windows). When
; using a linker script, however, we need to explicitly specify that
; NSPR's symbols should be globally visible. Otherwise, NSPR's exported
; symbols would match the |local: *| rule and be hidden.
LIBRARY libnsprdummy
EXPORTS
PR_* ; Actual .def files don't allow wildcards, of course.
_PR_*
PL_*

89
config/external/nss/nss.def → config/external/nss/nss.symbols vendored
View File

@ -1,11 +1,19 @@
; This Source Code Form is subject to the terms of the Mozilla Public
; License, v. 2.0. If a copy of the MPL was not distributed with this
; file, You can obtain one at http://mozilla.org/MPL/2.0/.
;
; This is a fake .def file, to be used for generating linker scripts
; for our folded libnss when MOZ_FOLD_LIBS.
LIBRARY nss3
EXPORTS
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#ifndef XP_WIN
# NSPR, unlike NSS, exports symbols with symbol visibility (Unix) or __declspec
# (Windows). When using a linker script, however, we need to explicitly
# specify that NSPR's symbols should be globally visible. Otherwise, NSPR's
# exported symbols would be hidden.
# .def files on Windows don't allow wildcards, of course, which is why this is
# excluded on Windows, but it doesn't matter because the symbols are already
# exported in NSPR (Windows peculiarity).
PR_*
PL_*
#endif
#include ../../../db/sqlite3/src/sqlite.symbols
ATOB_AsciiToData
ATOB_AsciiToData_Util
ATOB_ConvertAsciiToItem
@ -21,8 +29,8 @@ __CERT_AddTempCertToPerm
CERT_AsciiToName
CERT_CacheOCSPResponseFromSideChannel
CERT_CertChainFromCert
CERT_CertificateRequestTemplate DATA
CERT_CertificateTemplate DATA
CERT_CertificateRequestTemplate @DATA@
CERT_CertificateTemplate @DATA@
CERT_CertListFromCert
CERT_ChangeCertTrust
CERT_CheckCertUsage
@ -38,7 +46,7 @@ CERT_CreateCertificate
CERT_CreateCertificateRequest
CERT_CreateSubjectCertList
CERT_CreateValidity
CERT_CrlTemplate DATA
CERT_CrlTemplate @DATA@
CERT_DecodeAltNameExtension
CERT_DecodeAuthInfoAccessExtension
CERT_DecodeAuthKeyID
@ -128,7 +136,7 @@ CERT_IsCACert
CERT_IsUserCert
CERT_MakeCANickname
CERT_MergeExtensions
CERT_NameTemplate DATA
CERT_NameTemplate @DATA@
CERT_NameToAscii
CERT_NewCertList
CERT_NewTempCertificate
@ -138,15 +146,15 @@ CERT_PKIXVerifyCert
CERT_RemoveCertListNode
CERT_RFC1485_EscapeAndQuote
CERT_SaveSMimeProfile
CERT_SequenceOfCertExtensionTemplate DATA
CERT_SequenceOfCertExtensionTemplate @DATA@
CERT_SetOCSPFailureMode
CERT_SetOCSPTimeout
CERT_SignedCrlTemplate DATA
CERT_SignedDataTemplate DATA
CERT_SignedCrlTemplate @DATA@
CERT_SignedDataTemplate @DATA@
CERT_StartCertExtensions
CERT_StartCertificateRequestAttributes
CERT_SubjectPublicKeyInfoTemplate DATA
CERT_TimeChoiceTemplate DATA
CERT_SubjectPublicKeyInfoTemplate @DATA@
CERT_TimeChoiceTemplate @DATA@
CERT_VerifyCertificate
CERT_VerifySignedDataWithPublicKeyInfo
DER_AsciiToTime_Util
@ -462,7 +470,7 @@ PORT_UCS2_UTF8Conversion_Util
PORT_ZAlloc
PORT_ZAlloc_Util
PORT_ZFree_Util
SEC_AnyTemplate_Util DATA
SEC_AnyTemplate_Util @DATA@
SEC_ASN1Decode
SEC_ASN1DecodeInteger
SEC_ASN1DecodeItem
@ -473,20 +481,20 @@ SEC_ASN1EncodeItem
SEC_ASN1EncodeItem_Util
SEC_ASN1EncodeUnsignedInteger_Util
SEC_ASN1Encode_Util
SEC_BitStringTemplate DATA
SEC_BitStringTemplate_Util DATA
SEC_BMPStringTemplate DATA
SEC_BooleanTemplate_Util DATA
SEC_BitStringTemplate @DATA@
SEC_BitStringTemplate_Util @DATA@
SEC_BMPStringTemplate @DATA@
SEC_BooleanTemplate_Util @DATA@
SEC_CertNicknameConflict
SEC_DeletePermCertificate
SEC_DerSignData
SEC_DestroyCrl
SEC_GeneralizedTimeTemplate_Util DATA
SEC_GeneralizedTimeTemplate_Util @DATA@
SEC_GetSignatureAlgorithmOidTag
SEC_IA5StringTemplate DATA
SEC_IA5StringTemplate_Util DATA
SEC_IntegerTemplate DATA
SEC_IntegerTemplate_Util DATA
SEC_IA5StringTemplate @DATA@
SEC_IA5StringTemplate_Util @DATA@
SEC_IntegerTemplate @DATA@
SEC_IntegerTemplate_Util @DATA@
SECITEM_AllocArray
SECITEM_AllocItem
SECITEM_AllocItem_Util
@ -524,7 +532,7 @@ SECKEY_ExtractPublicKey
SECKEY_GetPublicKeyType
SECKEY_ImportDERPublicKey
SECKEY_PublicKeyStrength
SECKEY_RSAPSSParamsTemplate DATA
SECKEY_RSAPSSParamsTemplate @DATA@
SECKEY_SignatureLen
SECMIME_DecryptionAllowed
SECMOD_AddNewModule
@ -555,14 +563,14 @@ SECMOD_ReleaseReadLock
SECMOD_UnloadUserModule
SECMOD_UpdateModule
SECMOD_WaitForAnyTokenEvent
SEC_NullTemplate_Util DATA
SEC_ObjectIDTemplate_Util DATA
SEC_OctetStringTemplate DATA
SEC_OctetStringTemplate_Util DATA
SEC_NullTemplate_Util @DATA@
SEC_ObjectIDTemplate_Util @DATA@
SEC_OctetStringTemplate @DATA@
SEC_OctetStringTemplate_Util @DATA@
SECOID_AddEntry
SECOID_AddEntry_Util
SECOID_AlgorithmIDTemplate DATA
SECOID_AlgorithmIDTemplate_Util DATA
SECOID_AlgorithmIDTemplate @DATA@
SECOID_AlgorithmIDTemplate_Util @DATA@
SECOID_CopyAlgorithmID_Util
SECOID_DestroyAlgorithmID
SECOID_DestroyAlgorithmID_Util
@ -618,10 +626,10 @@ SEC_QuickDERDecodeItem
SEC_QuickDERDecodeItem_Util
SEC_RegisterDefaultHttpClient
SEC_SignData
SEC_SignedCertificateTemplate DATA
SEC_SignedCertificateTemplate @DATA@
SEC_StringToOID
SEC_UTF8StringTemplate DATA
SEC_UTF8StringTemplate_Util DATA
SEC_UTF8StringTemplate @DATA@
SEC_UTF8StringTemplate_Util @DATA@
SGN_Begin
SGN_CreateDigestInfo_Util
SGN_DecodeDigestInfo
@ -650,9 +658,9 @@ SSL_GetNumImplementedCiphers
SSL_GetSRTPCipher
SSL_HandshakeCallback
SSL_HandshakeNegotiatedExtension
SSL_ImplementedCiphers DATA
SSL_ImplementedCiphers @DATA@
SSL_ImportFD
SSL_NumImplementedCiphers DATA
SSL_NumImplementedCiphers @DATA@
SSL_OptionSet
SSL_OptionSetDefault
SSL_PeerCertificate
@ -684,3 +692,6 @@ VFY_VerifyDataWithAlgorithmID
VFY_VerifyDigestDirect
_SGN_VerifyPKCS1DigestInfo
__PK11_SetCertificateNickname
#ifdef NSS_EXTRA_SYMBOLS_FILE
#include @NSS_EXTRA_SYMBOLS_FILE@
#endif

23
config/external/sqlite/Makefile.in vendored
View File

@ -3,26 +3,3 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
LIB_IS_C_ONLY = 1
include $(topsrcdir)/config/config.mk
ifeq ($(OS_ARCH),WINNT)
# This needs to stay there for now
DEFFILE = $(DEPTH)/db/sqlite3/src/sqlite-processed.def
else
ifndef MOZ_FOLD_LIBS
ifdef GCC_USE_GNU_LD
GARBAGE += \
$(LD_VERSION_SCRIPT) \
$(NULL)
# Convert to the format we need for ld.
$(LD_VERSION_SCRIPT): $(topsrcdir)/db/sqlite3/src/sqlite.def
@$(call py_action,convert_def_file, \
$(DEFINES) $(ACDEFINES) $(MOZ_DEBUG_DEFINES) -o $@ $^)
endif
endif
endif

3
config/external/sqlite/moz.build vendored
View File

@ -19,5 +19,4 @@ else:
SharedLibrary('sqlite')
SHARED_LIBRARY_NAME = 'mozsqlite3'
if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['GCC_USE_GNU_LD']:
LD_VERSION_SCRIPT = 'sqlite-processed.def'
SYMBOLS_FILE = '/db/sqlite3/src/sqlite.symbols'

1
config/faster/rules.mk
View File

@ -107,7 +107,6 @@ $(addprefix install-,$(INSTALL_MANIFESTS)): install-%: $(TOPOBJDIR)/config/build
-DAB_CD=en-US \
-DMOZ_APP_BUILDID=$(shell cat $(TOPOBJDIR)/config/buildid) \
$(ACDEFINES) \
$(MOZ_DEBUG_DEFINES) \
install_$(subst /,_,$*)
# ============================================================================

1
config/makefiles/debugmake.mk
View File

@ -57,6 +57,7 @@ ifneq (,$(filter $(PROGRAM) $(HOST_PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $
endif
$(LOOP_OVER_DIRS)
showbuild showhost: _DEPEND_CFLAGS=
showbuild:
$(call print_vars,\
MOZ_BUILD_ROOT \

21
config/rules.mk
View File

@ -60,7 +60,7 @@ ifdef COMPILE_ENVIRONMENT
# through TestHarness.h, by modifying the list of includes and the libs against
# which stuff links.
SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS)
INCLUDES += -I$(DIST)/include/testing
INCLUDES += -I$(ABS_DIST)/include/testing
ifndef MOZ_PROFILE_GENERATE
CPP_UNIT_TESTS_FILES = $(CPP_UNIT_TESTS)
@ -462,6 +462,19 @@ EXTRA_DEPS += $(LD_VERSION_SCRIPT)
endif
endif
ifdef SYMBOLS_FILE
ifdef GCC_USE_GNU_LD
EXTRA_DSO_LDOPTS += -Wl,--version-script,$(SYMBOLS_FILE)
else
ifeq ($(OS_TARGET),Darwin)
EXTRA_DSO_LDOPTS += -Wl,-exported_symbols_list,$(SYMBOLS_FILE)
endif
ifeq ($(OS_TARGET),WINNT)
EXTRA_DSO_LDOPTS += -DEF:$(call normalizepath,$(SYMBOLS_FILE))
endif
endif
EXTRA_DEPS += $(SYMBOLS_FILE)
endif
#
# GNU doesn't have path length limitation
#
@ -1204,7 +1217,7 @@ endif
libs realchrome:: $(FINAL_TARGET)/chrome
$(call py_action,jar_maker,\
$(QUIET) -d $(FINAL_TARGET) \
$(MAKE_JARS_FLAGS) $(DEFINES) $(ACDEFINES) $(MOZ_DEBUG_DEFINES) \
$(MAKE_JARS_FLAGS) $(DEFINES) $(ACDEFINES) \
$(JAR_MANIFEST))
endif
@ -1446,7 +1459,9 @@ PP_TARGETS_ALL_RESULTS := $(sort $(foreach tier,$(PP_TARGETS_TIERS),$(PP_TARGETS
$(PP_TARGETS_ALL_RESULTS):
$(if $(filter-out $(notdir $@),$(notdir $(<:.in=))),$(error Looks like $@ has an unexpected dependency on $< which breaks PP_TARGETS))
$(RM) '$@'
$(call py_action,preprocessor,--depend $(MDDEPDIR)/$(@F).pp $(PP_TARGET_FLAGS) $(DEFINES) $(ACDEFINES) $(MOZ_DEBUG_DEFINES) '$<' -o '$@')
$(call py_action,preprocessor,--depend $(MDDEPDIR)/$(@F).pp $(PP_TARGET_FLAGS) $(DEFINES) $(ACDEFINES) '$<' -o '$@')
$(filter %.css,$(PP_TARGETS_ALL_RESULTS)): PP_TARGET_FLAGS+=--marker %
# The depfile is based on the filename, and we don't want conflicts. So check
# there's only one occurrence of any given filename in PP_TARGETS_ALL_RESULTS.

17
configure.in
View File

@ -1515,7 +1515,7 @@ if test "$GNU_CC"; then
esac
fi
_DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT'
_DEFINES_CFLAGS='-include $(topobjdir)/mozilla-config.h -DMOZILLA_CLIENT'
_USE_CPP_INCLUDE_FLAG=1
ASFLAGS="$ASFLAGS $_DEFINES_CFLAGS"
@ -1619,7 +1619,7 @@ if test "$GNU_CXX"; then
esac
fi
_DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(DEPTH)/mozilla-config.h'
_DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(topobjdir)/mozilla-config.h'
_USE_CPP_INCLUDE_FLAG=1
# Recent clang and gcc support C++11 deleted functions without warnings if
@ -2227,8 +2227,8 @@ ia64*-hpux*)
WIN32_GUI_EXE_LDFLAGS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
DSO_LDOPTS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
_USE_CPP_INCLUDE_FLAG=1
_DEFINES_CFLAGS='-FI $(DEPTH)/dist/include/mozilla-config.h -DMOZILLA_CLIENT'
_DEFINES_CXXFLAGS='-FI $(DEPTH)/dist/include/mozilla-config.h -DMOZILLA_CLIENT'
_DEFINES_CFLAGS='-FI $(topobjdir)/mozilla-config.h -DMOZILLA_CLIENT'
_DEFINES_CXXFLAGS='-FI $(topobjdir)/mozilla-config.h -DMOZILLA_CLIENT'
CFLAGS="$CFLAGS -W3 -Gy"
CXXFLAGS="$CXXFLAGS -W3 -Gy"
if test "$CPU_ARCH" = "x86" -a -z "$CLANG_CL"; then
@ -8785,22 +8785,19 @@ CXXFLAGS=`echo \
COMPILE_CFLAGS=`echo \
$_DEFINES_CFLAGS \
$_DEPEND_CFLAGS \
$COMPILE_CFLAGS`
COMPILE_CXXFLAGS=`echo \
$_DEFINES_CXXFLAGS \
$_DEPEND_CFLAGS \
$COMPILE_CXXFLAGS`
HOST_CFLAGS=`echo \
$HOST_CFLAGS \
$_DEPEND_CFLAGS`
$HOST_CFLAGS`
HOST_CXXFLAGS=`echo \
$HOST_CXXFLAGS \
$_DEPEND_CFLAGS`
$HOST_CXXFLAGS`
AC_SUBST(_DEPEND_CFLAGS)
AC_SUBST(MOZ_NATIVE_JPEG)
AC_SUBST(MOZ_NATIVE_PNG)
AC_SUBST(MOZ_NATIVE_BZ2)

20
db/sqlite3/src/Makefile.in
View File

@ -1,20 +0,0 @@
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/config/config.mk
ifeq ($(OS_ARCH),WINNT)
DEFFILE = $(CURDIR)/sqlite-processed.def
GARBAGE += \
$(DEFFILE) \
$(NULL)
# We have to preprocess our def file because we need different symbols in debug
# builds exposed that are not built in non-debug builds.
$(DEFFILE): sqlite.def
@$(call py_action,preprocessor,$(DEFINES) $(MOZ_DEBUG_DEFINES) \
$(srcdir)/sqlite.def -o $(DEFFILE))
endif

162
db/sqlite3/src/sqlite.def
View File

@ -1,162 +0,0 @@
; This Source Code Form is subject to the terms of the Mozilla Public
; License, v. 2.0. If a copy of the MPL was not distributed with this
; file, You can obtain one at http://mozilla.org/MPL/2.0/.
LIBRARY mozsqlite3.dll
EXPORTS
sqlite3_aggregate_context
sqlite3_aggregate_count
sqlite3_auto_extension
sqlite3_bind_blob
sqlite3_bind_double
sqlite3_bind_int
sqlite3_bind_int64
sqlite3_bind_null
sqlite3_bind_parameter_count
sqlite3_bind_parameter_index
sqlite3_bind_parameter_name
sqlite3_bind_text
sqlite3_bind_text16
sqlite3_bind_value
sqlite3_busy_handler
sqlite3_busy_timeout
sqlite3_changes
sqlite3_clear_bindings
sqlite3_close
sqlite3_collation_needed
sqlite3_collation_needed16
sqlite3_column_blob
sqlite3_column_bytes
sqlite3_column_bytes16
sqlite3_column_count
sqlite3_column_decltype
sqlite3_column_decltype16
sqlite3_column_double
sqlite3_column_int
sqlite3_column_int64
sqlite3_column_name
sqlite3_column_name16
sqlite3_column_text
sqlite3_column_text16
sqlite3_column_type
sqlite3_column_value
sqlite3_commit_hook
sqlite3_complete
sqlite3_complete16
sqlite3_config
sqlite3_create_collation
sqlite3_create_collation16
sqlite3_create_function
sqlite3_create_function16
sqlite3_create_module
sqlite3_data_count
sqlite3_db_filename
sqlite3_db_handle
sqlite3_db_mutex
sqlite3_db_status
sqlite3_declare_vtab
sqlite3_enable_load_extension
sqlite3_enable_shared_cache
sqlite3_errcode
sqlite3_errmsg
sqlite3_errmsg16
sqlite3_exec
sqlite3_expired
sqlite3_extended_result_codes
sqlite3_file_control
sqlite3_finalize
sqlite3_free
sqlite3_free_table
sqlite3_get_autocommit
sqlite3_get_auxdata
sqlite3_get_table
sqlite3_global_recover
sqlite3_initialize
sqlite3_interrupt
sqlite3_last_insert_rowid
sqlite3_libversion
sqlite3_libversion_number
sqlite3_load_extension
sqlite3_malloc
sqlite3_memory_alarm
sqlite3_memory_highwater
sqlite3_memory_used
sqlite3_mutex_alloc
sqlite3_mutex_enter
sqlite3_mutex_free
sqlite3_mutex_leave
sqlite3_mutex_try
sqlite3_mprintf
sqlite3_next_stmt
sqlite3_open
sqlite3_open_v2
sqlite3_open16
sqlite3_overload_function
sqlite3_prepare
sqlite3_prepare16
sqlite3_prepare16_v2
sqlite3_prepare_v2
sqlite3_profile
sqlite3_progress_handler
sqlite3_realloc
sqlite3_release_memory
sqlite3_reset
sqlite3_reset_auto_extension
sqlite3_result_blob
sqlite3_result_double
sqlite3_result_error
sqlite3_result_error16
sqlite3_result_error_code
sqlite3_result_error_nomem
sqlite3_result_int
sqlite3_result_int64
sqlite3_result_null
sqlite3_result_text
sqlite3_result_text16
sqlite3_result_text16be
sqlite3_result_text16le
sqlite3_result_value
sqlite3_rollback_hook
sqlite3_set_authorizer
sqlite3_set_auxdata
sqlite3_shutdown
sqlite3_sleep
sqlite3_snprintf
sqlite3_sql
sqlite3_status
sqlite3_step
sqlite3_stmt_readonly
sqlite3_stmt_status
#ifdef XP_UNIX
sqlite3_temp_directory
#endif
sqlite3_thread_cleanup
sqlite3_total_changes
sqlite3_trace
sqlite3_transfer_bindings
sqlite3_unlock_notify
sqlite3_update_hook
sqlite3_uri_parameter
sqlite3_user_data
sqlite3_value_blob
sqlite3_value_bytes
sqlite3_value_bytes16
sqlite3_value_double
sqlite3_value_int
sqlite3_value_int64
sqlite3_value_numeric_type
sqlite3_value_text
sqlite3_value_text16
sqlite3_value_text16be
sqlite3_value_text16le
sqlite3_value_type
sqlite3_version
sqlite3_vfs_find
sqlite3_vfs_unregister
sqlite3_vfs_register
sqlite3_vmprintf
#ifdef DEBUG
sqlite3_mutex_held
sqlite3_mutex_notheld
#endif

159
db/sqlite3/src/sqlite.symbols Normal file
View File

@ -0,0 +1,159 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
sqlite3_aggregate_context
sqlite3_aggregate_count
sqlite3_auto_extension
sqlite3_bind_blob
sqlite3_bind_double
sqlite3_bind_int
sqlite3_bind_int64
sqlite3_bind_null
sqlite3_bind_parameter_count
sqlite3_bind_parameter_index
sqlite3_bind_parameter_name
sqlite3_bind_text
sqlite3_bind_text16
sqlite3_bind_value
sqlite3_busy_handler
sqlite3_busy_timeout
sqlite3_changes
sqlite3_clear_bindings
sqlite3_close
sqlite3_collation_needed
sqlite3_collation_needed16
sqlite3_column_blob
sqlite3_column_bytes
sqlite3_column_bytes16
sqlite3_column_count
sqlite3_column_decltype
sqlite3_column_decltype16
sqlite3_column_double
sqlite3_column_int
sqlite3_column_int64
sqlite3_column_name
sqlite3_column_name16
sqlite3_column_text
sqlite3_column_text16
sqlite3_column_type
sqlite3_column_value
sqlite3_commit_hook
sqlite3_complete
sqlite3_complete16
sqlite3_config
sqlite3_create_collation
sqlite3_create_collation16
sqlite3_create_function
sqlite3_create_function16
sqlite3_create_module
sqlite3_data_count
sqlite3_db_filename
sqlite3_db_handle
sqlite3_db_mutex
sqlite3_db_status
sqlite3_declare_vtab
sqlite3_enable_load_extension
sqlite3_enable_shared_cache
sqlite3_errcode
sqlite3_errmsg
sqlite3_errmsg16
sqlite3_exec
sqlite3_expired
sqlite3_extended_result_codes
sqlite3_file_control
sqlite3_finalize
sqlite3_free
sqlite3_free_table
sqlite3_get_autocommit
sqlite3_get_auxdata
sqlite3_get_table
sqlite3_global_recover
sqlite3_initialize
sqlite3_interrupt
sqlite3_last_insert_rowid
sqlite3_libversion
sqlite3_libversion_number
sqlite3_load_extension
sqlite3_malloc
sqlite3_memory_alarm
sqlite3_memory_highwater
sqlite3_memory_used
sqlite3_mutex_alloc
sqlite3_mutex_enter
sqlite3_mutex_free
sqlite3_mutex_leave
sqlite3_mutex_try
sqlite3_mprintf
sqlite3_next_stmt
sqlite3_open
sqlite3_open_v2
sqlite3_open16
sqlite3_overload_function
sqlite3_prepare
sqlite3_prepare16
sqlite3_prepare16_v2
sqlite3_prepare_v2
sqlite3_profile
sqlite3_progress_handler
sqlite3_realloc
sqlite3_release_memory
sqlite3_reset
sqlite3_reset_auto_extension
sqlite3_result_blob
sqlite3_result_double
sqlite3_result_error
sqlite3_result_error16
sqlite3_result_error_code
sqlite3_result_error_nomem
sqlite3_result_int
sqlite3_result_int64
sqlite3_result_null
sqlite3_result_text
sqlite3_result_text16
sqlite3_result_text16be
sqlite3_result_text16le
sqlite3_result_value
sqlite3_rollback_hook
sqlite3_set_authorizer
sqlite3_set_auxdata
sqlite3_shutdown
sqlite3_sleep
sqlite3_snprintf
sqlite3_sql
sqlite3_status
sqlite3_step
sqlite3_stmt_readonly
sqlite3_stmt_status
#ifdef XP_UNIX
sqlite3_temp_directory
#endif
sqlite3_thread_cleanup
sqlite3_total_changes
sqlite3_trace
sqlite3_transfer_bindings
sqlite3_unlock_notify
sqlite3_update_hook
sqlite3_uri_parameter
sqlite3_user_data
sqlite3_value_blob
sqlite3_value_bytes
sqlite3_value_bytes16
sqlite3_value_double
sqlite3_value_int
sqlite3_value_int64
sqlite3_value_numeric_type
sqlite3_value_text
sqlite3_value_text16
sqlite3_value_text16be
sqlite3_value_text16le
sqlite3_value_type
sqlite3_version
sqlite3_vfs_find
sqlite3_vfs_unregister
sqlite3_vfs_register
sqlite3_vmprintf
#ifdef DEBUG
sqlite3_mutex_held
sqlite3_mutex_notheld
#endif

2
devtools/client/animationinspector/test/browser_animation_empty_on_invalid_nodes.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Test that the panel shows no animation data for invalid or not animated nodes
add_task(function*() {

2
devtools/client/animationinspector/test/browser_animation_participate_in_inspector_update.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Test that the update of the animation panel participate in the
// inspector-updated event. This means that the test verifies that the
// inspector-updated event is emitted *after* the animation panel is ready.

2
devtools/client/animationinspector/test/browser_animation_playerFronts_are_refreshed.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Check that the AnimationPlayerFront objects lifecycle is managed by the
// AnimationController.

2
devtools/client/animationinspector/test/browser_animation_playerWidgets_target_nodes.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Test that player widgets display information about target nodes
add_task(function*() {

4
devtools/client/animationinspector/test/browser_animation_refresh_on_added_animation.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Test that the panel content refreshes when new animations are added.
add_task(function*() {
@ -42,4 +44,4 @@ function* changeElementAndWait(options, panel, inspector) {
yield promise.all([
onInspectorUpdated, onPanelUpdated, waitForAllAnimationTargets(panel)]);
}
}

2
devtools/client/animationinspector/test/browser_animation_refresh_on_removed_animation.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Test that the panel content refreshes when animations are removed.
add_task(function*() {

2
devtools/client/animationinspector/test/browser_animation_refresh_when_active.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Test that the panel only refreshes when it is visible in the sidebar.
add_task(function*() {

2
devtools/client/animationinspector/test/browser_animation_running_on_compositor.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Test that when animations displayed in the timeline are running on the
// compositor, they get a special icon and information in the tooltip.

2
devtools/client/animationinspector/test/browser_animation_same_nb_of_playerWidgets_and_playerFronts.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Check that when playerFronts are updated, the same number of playerWidgets
// are created in the panel.

2
devtools/client/animationinspector/test/browser_animation_shows_player_on_valid_node.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Test that the panel shows an animation player when an animated node is
// selected.

2
devtools/client/animationinspector/test/browser_animation_target_highlight_select.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Test that the DOM element targets displayed in animation player widgets can
// be used to highlight elements in the DOM and select them in the inspector.

2
devtools/client/animationinspector/test/browser_animation_target_highlighter_lock.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Test that the DOM element targets displayed in animation player widgets can
// be used to highlight elements in the DOM and select them in the inspector.

2
devtools/client/animationinspector/test/browser_animation_timeline_currentTime.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Check that the timeline toolbar displays the current time, and that it
// changes when animations are playing, gets back to 0 when animations are
// rewound, and stops when animations are paused.

2
devtools/client/animationinspector/test/browser_animation_timeline_header.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Check that the timeline shows correct time graduations in the header.
const {findOptimalTimeInterval} = require("devtools/client/animationinspector/utils");

2
devtools/client/animationinspector/test/browser_animation_timeline_pause_button.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Check that the timeline toolbar contains a pause button and that this pause
// button can be clicked. Check that when it is, the current animations
// displayed in the timeline get their playstates changed accordingly, and check

2
devtools/client/animationinspector/test/browser_animation_timeline_rate_selector.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Check that the timeline toolbar contains a playback rate selector UI and that
// it can be used to change the playback rate of animations in the timeline.
// Also check that it displays the rate of the current animations in case they

2
devtools/client/animationinspector/test/browser_animation_timeline_rewind_button.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Check that the timeline toolbar contains a rewind button and that it can be
// clicked. Check that when it is, the current animations displayed in the
// timeline get their playstates changed to paused, and their currentTimes

2
devtools/client/animationinspector/test/browser_animation_timeline_scrubber_exists.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Check that the timeline does have a scrubber element.
add_task(function*() {

2
devtools/client/animationinspector/test/browser_animation_timeline_scrubber_movable.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Check that the scrubber in the timeline can be moved by clicking & dragging
// in the header area.
// Also check that doing so changes the timeline's play/pause button to paused

2
devtools/client/animationinspector/test/browser_animation_timeline_scrubber_moves.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Check that the scrubber in the timeline moves when animations are playing.
// The animations in the test page last for a very long time, so the test just
// measures the position of the scrubber once, then waits for some time to pass

2
devtools/client/animationinspector/test/browser_animation_timeline_shows_delay.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Check that animation delay is visualized in the timeline when the animation
// is delayed.
// Also check that negative delays do not overflow the UI, and are shown like

2
devtools/client/animationinspector/test/browser_animation_timeline_shows_iterations.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Check that the timeline is displays as many iteration elements as there are
// iterations in an animation.

2
devtools/client/animationinspector/test/browser_animation_timeline_shows_time_info.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Check that the timeline displays animations' duration, delay and iteration
// counts in tooltips.

2
devtools/client/animationinspector/test/browser_animation_timeline_ui.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Check that the timeline contains the right elements.
add_task(function*() {

2
devtools/client/animationinspector/test/browser_animation_toggle_button_resets_on_navigate.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Test that a page navigation resets the state of the global toggle button.
add_task(function*() {

2
devtools/client/animationinspector/test/browser_animation_toggle_button_toggles_animations.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Test that the main toggle button actually toggles animations.
// This test doesn't need to be extra careful about checking that *all*
// animations have been paused (including inside iframes) because there's an

2
devtools/client/animationinspector/test/browser_animation_toolbar_exists.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Test that the animation panel has a top toolbar that contains the play/pause
// button and that is displayed at all times.
// Also test that this toolbar gets replaced by the timeline toolbar when there

2
devtools/client/animationinspector/test/browser_animation_ui_updates_when_animation_data_changes.js
View File

@ -4,6 +4,8 @@
"use strict";
requestLongerTimeout(2);
// Verify that if the animation's duration, iterations or delay change in
// content, then the widget reflects the changes.

2
devtools/client/debugger/test/mochitest/browser_dbg_host-layout.js
View File

@ -12,7 +12,7 @@ var gDefaultHostType = Services.prefs.getCharPref("devtools.toolbox.host");
function test() {
// test is too slow on some platforms due to the number of test cases
requestLongerTimeout(2);
requestLongerTimeout(3);
Task.spawn(function*() {
yield testHosts(["bottom", "side", "window:big"], ["horizontal", "vertical", "horizontal"]);

2
devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-16.js
View File

@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
requestLongerTimeout(2);
/**
* Tests if opening the variables inspection popup preserves the highlighting
* associated with the currently debugged line.

2
devtools/client/fontinspector/test/browser_fontinspector.js
View File

@ -3,6 +3,8 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
requestLongerTimeout(2);
const TEST_URI = BASE_URI + "browser_fontinspector.html";
const FONTS = [
{name: "Ostrich Sans Medium", remote: true, url: BASE_URI + "ostrich-regular.ttf",

2
devtools/client/fontinspector/test/browser_fontinspector_theme-change.js
View File

@ -3,6 +3,8 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
requestLongerTimeout(2);
// Test that the preview images are updated when the theme changes.
const { getTheme, setTheme } = require("devtools/client/shared/theme");

2
devtools/client/framework/test/browser_toolbox_options_disable_cache-01.js
View File

@ -3,6 +3,8 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
requestLongerTimeout(2);
// Tests that disabling the cache for a tab works as it should when toolboxes
// are not toggled.
loadHelperScript("helper_disable_cache.js");

Some files were not shown because too many files have changed in this diff Show More