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

Merge m-c to s-c.

Browse Source
This commit is contained in:
Nick Alexander 2013-09-05 09:07:12 -07:00
commit 1579cd537d
1310 changed files with 3670 additions and 10242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CLOBBER
View File

@ -18,4 +18,4 @@
# Modifying this file will now automatically clobber the buildbot machines \o/
#
Bug 627487 - random test failures caused by bookmark JSON changes
Bug 908977 - Generate XPIDL headers directly into dist/include

10
Makefile.in
View File

@ -3,11 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
ifndef .PYMAKE
ifeq (,$(MAKE_VERSION))
$(error GNU Make is required)
@ -19,8 +14,6 @@ endif
export TOPLEVEL_BUILD := 1
include $(DEPTH)/config/autoconf.mk
default::
ifdef COMPILE_ENVIRONMENT
@ -35,7 +28,7 @@ DIST_GARBAGE = config.cache config.log config.status* config-defs.h \
config/autoconf.mk \
mozilla-config.h \
netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
$(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
.mozconfig.mk
ifndef MOZ_PROFILE_USE
# One of the first things we do in the build is purge "unknown" files
@ -99,6 +92,7 @@ TIER_precompile_CUSTOM := 1
include $(topsrcdir)/config/rules.mk
default all alldep::
$(call py_action,process_install_manifest,$(DIST)/include _build_manifests/install/dist_include js/src/_build_manifests/install/dist_include)
$(call BUILDSTATUS,TIERS $(TIERS))
$(foreach tier,$(TIERS),$(call SUBMAKE,tier_$(tier)))

8
accessible/public/ia2/Makefile.in
View File

@ -2,17 +2,10 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
DEFFILE = $(win_srcdir)/IA2Marshal.def
IA2DIR = $(topsrcdir)/other-licenses/ia2
include $(DEPTH)/config/autoconf.mk
DEFINES += -DREGISTER_PROXY_DLL
GARBAGE += $(MIDL_GENERATED_FILES)
@ -97,4 +90,3 @@ midl_done : $(addprefix $(IA2DIR)/,$(MIDL_INTERFACES) $(MIDL_ENUMS))
# This marshall dll is also registered in the installer
register::
regsvr32 -s $(DIST)/bin/$(SHARED_LIBRARY)

10
accessible/public/msaa/Makefile.in
View File

@ -2,15 +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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
DEFFILE = $(win_srcdir)/AccessibleMarshal.def
include $(DEPTH)/config/autoconf.mk
DEFINES += -DREGISTER_PROXY_DLL
GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c
@ -73,6 +66,3 @@ INSTALL_TARGETS += midl_exports
midl_exports_FILES := $(midl_exports)
midl_exports_DEST = $(DIST)/include
midl_exports_TARGET := export
include $(topsrcdir)/config/rules.mk

9
accessible/src/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
A11Y_LOG = 0
ifdef MOZ_DEBUG
A11Y_LOG = 1
@ -17,5 +10,3 @@ ifeq (,$(filter aurora beta release esr,$(MOZ_UPDATE_CHANNEL)))
A11Y_LOG = 1
endif
export A11Y_LOG
include $(topsrcdir)/config/rules.mk

7
accessible/src/atk/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = ..
include $(topsrcdir)/config/rules.mk

7
accessible/src/base/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += \

7
accessible/src/generic/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES = \

7
accessible/src/html/Makefile.in
View File

@ -3,13 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES = \

10
accessible/src/jsat/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
INSTALL_TARGETS += ACCESSFU
ACCESSFU_FILES := \
@ -24,6 +17,3 @@ ACCESSFU_FILES := \
$(NULL)
ACCESSFU_DEST = $(FINAL_TARGET)/modules/accessibility
include $(topsrcdir)/config/rules.mk

7
accessible/src/mac/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = ..
include $(topsrcdir)/config/rules.mk

7
accessible/src/other/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = ..
include $(topsrcdir)/config/rules.mk

7
accessible/src/windows/Makefile.in
View File

@ -3,13 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
ifneq ($(A11Y_LOG),0)

7
accessible/src/windows/ia2/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
# The midl generated code include Windows headers which defines min and max

7
accessible/src/windows/msaa/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

7
accessible/src/windows/sdn/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
# The midl generated code include Windows headers which defines min and max

7
accessible/src/windows/uia/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = ..
# The midl generated code include Windows headers which defines min and max

7
accessible/src/xpcom/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXTRA_MDDEPEND_FILES = xpcAccEvents.pp
INSTALL_TARGETS += xpcaccevents

7
accessible/src/xul/Makefile.in
View File

@ -3,13 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES = \

10
accessible/tests/mochitest/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
dumbfile.xpi \
formimage.png \
@ -47,5 +39,3 @@ MOCHITEST_A11Y_FILES =\
treeview.css \
treeview.js \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/actions/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
test_anchors.html \
test_aria.html \
@ -25,5 +17,3 @@ MOCHITEST_A11Y_FILES =\
test_tree.xul \
test_treegrid.xul \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/attributes/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
test_obj.html \
test_obj_css.html \
@ -21,5 +13,3 @@ MOCHITEST_A11Y_FILES =\
test_tag.html \
test_xml-roles.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/bounds/Makefile.in
View File

@ -3,19 +3,9 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
test_list.html \
test_select.html \
test_zoom_text.html \
test_zoom.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

31
accessible/tests/mochitest/common.js
View File

@ -754,6 +754,21 @@ function getMainChromeWindow(aWindow)
.getInterface(Components.interfaces.nsIDOMWindow);
}
/** Sets the test plugin(s) initially expected enabled state.
* It will automatically be reset to it's previous value after the test
* ends.
* @param aNewEnabledState [in] the enabled state, e.g. SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED
* @param aPluginName [in, optional] The name of the plugin, defaults to "Test Plug-in"
*/
function setTestPluginEnabledState(aNewEnabledState, aPluginName)
{
var plugin = getTestPluginTag(aPluginName);
var oldEnabledState = plugin.enabledState;
plugin.enabledState = aNewEnabledState;
SimpleTest.registerCleanupFunction(function() {
getTestPluginTag(aPluginName).enabledState = oldEnabledState;
});
}
////////////////////////////////////////////////////////////////////////////////
// Private
@ -789,3 +804,19 @@ function getObjAddress(aObj)
return aObj.toString();
}
function getTestPluginTag(aPluginName)
{
var ph = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
.getService(SpecialPowers.Ci.nsIPluginHost);
var tags = ph.getPluginTags();
var name = aPluginName || "Test Plug-in";
for (var tag of tags) {
if (tag.name == name) {
return tag;
}
}
ok(false, "Could not find plugin tag with plugin name '" + name + "'");
return null;
}

10
accessible/tests/mochitest/editabletext/Makefile.in
View File

@ -3,18 +3,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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
editabletext.js \
test_1.html \
test_2.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/elm/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
test_figure.html \
test_HTMLSpec.html \
@ -18,5 +10,3 @@ MOCHITEST_A11Y_FILES =\
test_nsApplicationAcc.html \
test_plugin.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
accessible/tests/mochitest/elm/test_HTMLSpec.html
View File

@ -1239,8 +1239,8 @@
SimpleTest.waitForExplicitFinish();
addA11yLoadEvent(doTest);
setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
</script>
</head>
<body>

1
accessible/tests/mochitest/elm/test_plugin.html
View File

@ -38,6 +38,7 @@
SimpleTest.waitForExplicitFinish();
addA11yLoadEvent(doTest);
setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
</script>
</head>
<body>

10
accessible/tests/mochitest/events/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
docload_wnd.html \
focus.html \
@ -67,5 +59,3 @@ MOCHITEST_A11Y_FILES += \
test_focus_autocomplete.xul \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/focus/Makefile.in
View File

@ -3,18 +3,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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
test_focusedChild.html \
test_takeFocus.html \
test_takeFocus.xul \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/hittest/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES = \
test_browser.html \
test_general.html \
@ -20,5 +12,3 @@ MOCHITEST_A11Y_FILES = \
test_zoom.html \
zoom_tree.xul \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/hyperlink/Makefile.in
View File

@ -3,18 +3,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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
hyperlink.js \
test_general.html \
test_general.xul \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/hypertext/Makefile.in
View File

@ -3,17 +3,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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES = \
test_general.html \
test_update.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/jsat/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
jsatcommon.js \
output.js \
@ -22,5 +14,3 @@ test_live_regions.html \
test_tables.html \
test_utterance_order.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/name/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
general.css \
general.xbl \
@ -29,5 +21,3 @@ MOCHITEST_A11Y_FILES =\
ifneq ($(OS_ARCH), Darwin)
MOCHITEST_A11Y_FILES += test_tree.xul
endif
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/pivot/Makefile.in
View File

@ -3,19 +3,9 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES = \
doc_virtualcursor.html \
doc_virtualcursor_text.html \
test_virtualcursor.html \
test_virtualcursor_text.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/relations/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
test_bindings.xhtml \
test_embeds.xul \
@ -21,5 +13,3 @@ MOCHITEST_A11Y_FILES =\
test_ui_modalprompt.html \
test_update.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/role/Makefile.in
View File

@ -2,14 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
test_aria.html \
test_aria.xul \
@ -17,5 +9,3 @@ MOCHITEST_A11Y_FILES =\
test_general.xul \
test_svg.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/scroll/Makefile.in
View File

@ -3,17 +3,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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
test_zoom_text.html \
test_zoom.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/selectable/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
test_aria.html \
test_listbox.xul \
@ -19,5 +11,3 @@ MOCHITEST_A11Y_FILES =\
test_select.html \
test_tree.xul \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/states/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
test_aria.html \
test_aria_imgmap.html \
@ -44,5 +36,3 @@ MOCHITEST_A11Y_FILES =\
ifneq ($(OS_ARCH), Darwin)
MOCHITEST_A11Y_FILES += test_tree.xul
endif
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/table/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES = \
test_headers_ariagrid.html \
test_headers_listbox.xul \
@ -33,5 +25,3 @@ MOCHITEST_A11Y_FILES = \
test_table_1.html \
test_table_2.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/text/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES = \
doc.html \
test_atcaretoffset.html \
@ -25,5 +17,3 @@ MOCHITEST_A11Y_FILES = \
test_wordboundary.html \
test_words.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/textattrs/Makefile.in
View File

@ -3,17 +3,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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
test_general.html \
test_invalid.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/textcaret/Makefile.in
View File

@ -3,17 +3,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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES = \
test_browserui.xul \
test_general.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/textselection/Makefile.in
View File

@ -3,17 +3,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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES = \
test_general.html \
test_userinput.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/tree/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
dockids.html \
$(filter disabled-temporarily--bug-561508, test_applicationacc.xul) \
@ -49,5 +41,3 @@ MOCHITEST_A11Y_FILES =\
test_txtctrl.xul \
wnd.xul \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/treeupdate/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
test_ariadialog.html \
test_canvas.html \
@ -35,5 +27,3 @@ MOCHITEST_A11Y_FILES =\
test_visibility.html \
test_whitespace.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
accessible/tests/mochitest/value/Makefile.in
View File

@ -3,19 +3,9 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_A11Y_FILES =\
test_general.html \
test_progress.html \
test_progress.xul \
test_range.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

5
addon-sdk/Makefile.in
View File

@ -2,11 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(topsrcdir)/config/config.mk
export PYMAKE = $(.PYMAKE)

12
addon-sdk/source/lib/sdk/addon/window.js
View File

@ -12,14 +12,24 @@ const { make: makeWindow, getHiddenWindow } = require("../window/utils");
const { create: makeFrame, getDocShell } = require("../frame/utils");
const { defer } = require("../core/promise");
const { when: unload } = require("../system/unload");
const cfxArgs = require("@test/options");
let addonPrincipal = Cc["@mozilla.org/systemprincipal;1"].
createInstance(Ci.nsIPrincipal);
let hiddenWindow = getHiddenWindow();
if (cfxArgs.parseable) {
console.info("hiddenWindow document.documentURI:" +
hiddenWindow.document.documentURI);
console.info("hiddenWindow document.readyState:" +
hiddenWindow.document.readyState);
}
// Once Bug 565388 is fixed and shipped we'll be able to make invisible,
// permanent docShells. Meanwhile we create hidden top level window and
// use it's docShell.
let frame = makeFrame(getHiddenWindow().document, {
let frame = makeFrame(hiddenWindow.document, {
nodeName: "iframe",
namespaceURI: "http://www.w3.org/1999/xhtml",
allowJavascript: true,

2
addon-sdk/source/lib/sdk/page-mod/match-pattern.js
View File

@ -2,4 +2,4 @@ let { deprecateUsage } = require("../util/deprecate");
deprecateUsage("Module 'sdk/page-mod/match-pattern' is deprecated use 'sdk/util/match-pattern' instead");
module.exports = require("../page-mod/match-pattern");
module.exports = require("../util/match-pattern");

8
addon-sdk/source/lib/toolkit/loader.js
View File

@ -260,6 +260,7 @@ const load = iced(function load(loader, module) {
let stack = error.stack || Error().stack;
let frames = parseStack(stack).filter(isntLoaderFrame);
let toString = String(error);
let file = sourceURI(fileName);
// Note that `String(error)` where error is from subscript loader does
// not puts `:` after `"Error"` unlike regular errors thrown by JS code.
@ -272,6 +273,13 @@ const load = iced(function load(loader, module) {
message = "Module `" + module.id + "` is not found at " + module.uri;
toString = message;
}
// Workaround for a Bug 910653. Errors thrown by subscript loader
// do not include `stack` field and above created error won't have
// fileName or lineNumber of the module being loaded, so we ensure
// it does.
else if (frames[frames.length - 1].fileName !== file) {
frames.push({ fileName: file, lineNumber: lineNumber, name: "" });
}
let prototype = typeof(error) === "object" ? error.constructor.prototype :
Error.prototype;

4
addon-sdk/source/test/fixtures/loader/syntax-error/error.js vendored
View File

@ -4,4 +4,8 @@
'use strict';
module.metadata = {
"status": "experimental"
};
exports.b = @ require('b');

9
addon-sdk/source/test/test-loader.js
View File

@ -31,12 +31,15 @@ exports['test syntax errors'] = function(assert) {
assert.equal(error.name, "SyntaxError", "throws syntax error");
assert.equal(error.fileName.split("/").pop(), "error.js",
"Error contains filename");
assert.equal(error.lineNumber, 7, "error is on line 7")
assert.equal(error.lineNumber, 11, "error is on line 11")
let stack = parseStack(error.stack);
assert.equal(stack.pop().fileName, uri + "error.js",
"last frame file containing syntax error");
assert.equal(stack.pop().fileName, uri + "main.js",
"loader stack is omitted");
"previous frame is a requirer module");
assert.equal(stack.pop().fileName, module.uri,
"previous in the stack is test module");
"previous to it is a test module");
} finally {
unload(loader);

8
addon-sdk/source/test/test-panel.js
View File

@ -203,7 +203,13 @@ exports["test Parent Resize Hack"] = function(assert, done) {
timer.setTimeout(function () {
assert.equal(previousWidth,browserWindow.outerWidth,"Size doesn't change by calling resizeTo/By/...");
assert.equal(previousHeight,browserWindow.outerHeight,"Size doesn't change by calling resizeTo/By/...");
panel.destroy();
try {
panel.destroy();
}
catch (e) {
console.exception(e);
throw e;
}
done();
},0);
}

74
addon-sdk/source/test/test-require.js
View File

@ -2,28 +2,62 @@
* 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/. */
const traceback = require("sdk/console/traceback");
'use strict';
exports.test_no_args = function(test) {
var passed = false;
const traceback = require('sdk/console/traceback');
const REQUIRE_LINE_NO = 30;
exports.test_no_args = function(assert) {
let passed = tryRequireModule(assert);
assert.ok(passed, 'require() with no args should raise helpful error');
};
exports.test_invalid_sdk_module = function (assert) {
let passed = tryRequireModule(assert, 'sdk/does-not-exist');
assert.ok(passed, 'require() with an invalid sdk module should raise');
};
exports.test_invalid_relative_module = function (assert) {
let passed = tryRequireModule(assert, './does-not-exist');
assert.ok(passed, 'require() with an invalid relative module should raise');
};
function tryRequireModule(assert, module) {
let passed = false;
try {
var oops = require(); // leave this on line 6!
// This line number is important, referenced in REQUIRE_LINE_NO
let doesNotExist = require(module);
} catch(e) {
let msg = e.toString();
test.assertEqual(msg.indexOf("Error: you must provide a module name when calling require() from "), 0);
test.assertNotEqual(msg.indexOf("test-require"), -1, msg);
// we'd also like to assert that the right filename and linenumber is in
// the stack trace, but this currently doesn't work (see bugs 679591 and
// 551604)
if (0) {
let tb = traceback.fromException(e);
let lastFrame = tb[tb.length-1];
test.assertNotEqual(lastFrame.filename.indexOf("test-require.js"), -1,
lastFrame.filename);
test.assertEqual(lastFrame.lineNo, 6);
test.assertEqual(lastFrame.funcName, "??");
}
checkError(assert, module, e);
passed = true;
}
test.assert(passed, 'require() with no args should raise helpful error');
};
return passed;
}
function checkError (assert, name, e) {
let msg = e.toString();
if (name) {
assert.ok(/is not found at/.test(msg),
'Error message indicates module not found');
assert.ok(msg.indexOf(name.replace(/\./g,'')) > -1,
'Error message has the invalid module name in the message');
}
else {
assert.equal(msg.indexOf('Error: you must provide a module name when calling require() from '), 0);
assert.ok(msg.indexOf("test-require") !== -1, msg);
}
// we'd also like to assert that the right filename
// and linenumber is in the stacktrace
let tb = traceback.fromException(e);
// Get the second to last frame, as the last frame is inside
// toolkit/loader
let lastFrame = tb[tb.length-2];
assert.ok(lastFrame.fileName.indexOf("test-require.js") !== -1,
'Filename found in stacktrace');
assert.equal(lastFrame.lineNumber, REQUIRE_LINE_NO,
'stacktrace has correct line number');
}
require('test').run(exports);

6
addon-sdk/source/test/test-ui-button.js
View File

@ -20,8 +20,8 @@ function getWidget(buttonId, window = getMostRecentBrowserWindow()) {
const { CustomizableUI } = Cu.import('resource:///modules/CustomizableUI.jsm', {});
const { AREA_NAVBAR } = CustomizableUI;
let widgets = CustomizableUI.getWidgetsInArea(AREA_NAVBAR).
filter(({id}) => id.startsWith('button--') && id.endsWith(buttonId));
let widgets = CustomizableUI.getWidgetIdsInArea(AREA_NAVBAR).
filter((id) => id.startsWith('button--') && id.endsWith(buttonId));
if (widgets.length === 0)
throw new Error('Widget with id `' + id +'` not found.');
@ -29,7 +29,7 @@ function getWidget(buttonId, window = getMostRecentBrowserWindow()) {
if (widgets.length > 1)
throw new Error('Unexpected number of widgets: ' + widgets.length)
return widgets[0].forWindow(window);
return CustomizableUI.getWidget(widgets[0]).forWindow(window);
};
exports['test basic constructor validation'] = function(assert) {

7
b2g/Makefile.in
View File

@ -2,12 +2,5 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/testing/testsuite-targets.mk

6
b2g/app/Makefile.in
View File

@ -2,12 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
USE_RCS_MK := 1
include $(topsrcdir)/config/makefiles/rcs.mk

10
b2g/branding/official/locales/Makefile.in
View File

@ -2,14 +2,4 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
DEFINES += -DAB_CD=$(AB_CD)
include $(topsrcdir)/config/rules.mk

10
b2g/branding/unofficial/locales/Makefile.in
View File

@ -2,14 +2,4 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
DEFINES += -DAB_CD=$(AB_CD)
include $(topsrcdir)/config/rules.mk

9
b2g/chrome/Makefile.in
View File

@ -2,16 +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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DEFINES += -DAB_CD=$(MOZ_UI_LOCALE) \
-DPACKAGE=browser \
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
b2g/config/gaia.json
View File

@ -1,4 +1,4 @@
{
"revision": "4296bbf526e4ed8d0ae443f20947bd2d7189aa0e",
"revision": "57210698c630b30a91de70b7f333f55207f31104",
"repo_path": "/integration/gaia-central"
}

8
b2g/gaia/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
GAIA_PATH := gaia/profile
ifeq ($(OS_ARCH),WINNT)
@ -37,4 +30,3 @@ libs::
$(GAIA_MAKE) -j1 -C $(GAIADIR) clean
$(GAIA_MAKE) -j1 -C $(GAIADIR) profile
(cd $(GAIADIR)/profile && tar $(TAR_CREATE_FLAGS) - .) | (cd $(abspath $(DIST))/bin/$(GAIA_PATH) && tar -xf -)

7
b2g/installer/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
STANDALONE_MAKEFILE := 1
include $(topsrcdir)/config/rules.mk

8
b2g/locales/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
SUBMAKEFILES += \

5
browser/Makefile.in
View File

@ -2,11 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(topsrcdir)/config/rules.mk
ifdef MAKENSISU

7
browser/app/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
dist_dest = $(DIST)/$(MOZ_MACBUNDLE_NAME)
ifdef ENABLE_MARIONETTE

6
browser/app/profile/extensions/Makefile.in
View File

@ -3,14 +3,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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
DISTROEXT = $(call core_abspath,$(FINAL_TARGET))/distribution/extensions
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
ifneq (,$(filter beta,$(MOZ_UPDATE_CHANNEL)))

9
browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
View File

@ -3,17 +3,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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
FILES := \
install.rdf.in \
$(NULL)
FILES_PATH = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
PP_TARGETS := FILES
include $(topsrcdir)/config/rules.mk

4
browser/app/profile/firefox.js
View File

@ -641,6 +641,10 @@ pref("plugins.update.notifyUser", false);
pref("plugins.click_to_play", true);
// let all plugins except Flash default to click-to-play
pref("plugin.default.state", 1);
pref("plugin.state.flash", 2);
// display door hanger if flash not installed
pref("plugins.notifyMissingFlash", true);

7
browser/base/Makefile.in
View File

@ -3,13 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
abs_srcdir = $(call core_abspath,$(srcdir))

15
browser/base/content/browser-plugins.js
View File

@ -623,6 +623,8 @@ var gPluginHandler = {
_clickToPlayNotificationEventCallback: function PH_ctpEventCallback(event) {
if (event == "showing") {
gPluginHandler._makeCenterActions(this);
Services.telemetry.getHistogramById("PLUGINS_NOTIFICATION_SHOWN")
.add(!this.options.primaryPlugin);
}
else if (event == "dismissed") {
// Once the popup is dismissed, clicking the icon should show the full
@ -703,6 +705,14 @@ var gPluginHandler = {
});
notification.options.centerActions = centerActions;
// Histograms always start at 0, even though our data starts at 1
let histogramCount = centerActions.length - 1;
if (histogramCount > 4) {
histogramCount = 4;
}
Services.telemetry.getHistogramById("PLUGINS_NOTIFICATION_PLUGIN_COUNT")
.add(histogramCount);
},
/**
@ -714,12 +724,15 @@ var gPluginHandler = {
let permission;
let expireType;
let expireTime;
let histogram =
Services.telemetry.getHistogramById("PLUGINS_NOTIFICATION_USER_ACTION");
switch (aNewState) {
case "allownow":
permission = Ci.nsIPermissionManager.ALLOW_ACTION;
expireType = Ci.nsIPermissionManager.EXPIRE_SESSION;
expireTime = Date.now() + Services.prefs.getIntPref(this.PREF_SESSION_PERSIST_MINUTES) * 60 * 1000;
histogram.add(0);
break;
case "allowalways":
@ -727,12 +740,14 @@ var gPluginHandler = {
expireType = Ci.nsIPermissionManager.EXPIRE_TIME;
expireTime = Date.now() +
Services.prefs.getIntPref(this.PREF_PERSISTENT_DAYS) * 24 * 60 * 60 * 1000;
histogram.add(1);
break;
case "block":
permission = Ci.nsIPermissionManager.PROMPT_ACTION;
expireType = Ci.nsIPermissionManager.EXPIRE_NEVER;
expireTime = 0;
histogram.add(2);
break;
// In case a plugin has already been allowed in another tab, the "continue allowing" button

10
browser/base/content/test/Makefile.in
View File

@ -2,14 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_FILES = \
head_plain.js \
bug364677-data.xml \
@ -381,5 +373,3 @@ MOCHITEST_BROWSER_FILES += \
browser_CTP_context_menu.js \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk

10
browser/base/content/test/newtab/Makefile.in
View File

@ -2,14 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_BROWSER_FILES = \
browser_newtab_block.js \
browser_newtab_disable.js \
@ -34,5 +26,3 @@ MOCHITEST_BROWSER_FILES = \
browser_newtab_perwindow_private_browsing.js \
head.js \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
browser/base/content/test/social/Makefile.in
View File

@ -2,14 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_BROWSER_FILES = \
head.js \
blocklist.xml \
@ -45,5 +37,3 @@ MOCHITEST_BROWSER_FILES = \
social_worker.js \
share.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
browser/base/content/test/social/opengraph/Makefile.in
View File

@ -2,14 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_BROWSER_FILES := \
opengraph.html \
og_invalid_url.html \
@ -17,5 +9,3 @@ MOCHITEST_BROWSER_FILES := \
shorturl_link.html \
shorturl_linkrel.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

8
browser/branding/aurora/Makefile.in
View File

@ -2,12 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
@ -70,5 +64,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA
VISUALMANIFEST_PATH := $(DIST)/bin
PP_TARGETS += VISUALMANIFEST
endif
include $(topsrcdir)/config/rules.mk

9
browser/branding/aurora/content/Makefile.in
View File

@ -5,18 +5,9 @@
# Branding Makefile
# - jars chrome artwork
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# resources needed for the metro tile interface
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
TILE_DEST := $(DIST)/bin/tileresources
INSTALL_TARGETS += TILE
endif
include $(topsrcdir)/config/rules.mk

10
browser/branding/aurora/locales/Makefile.in
View File

@ -2,14 +2,4 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
include $(topsrcdir)/config/rules.mk

8
browser/branding/nightly/Makefile.in
View File

@ -2,12 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
@ -70,5 +64,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA
VISUALMANIFEST_PATH := $(DIST)/bin
PP_TARGETS += VISUALMANIFEST
endif
include $(topsrcdir)/config/rules.mk

9
browser/branding/nightly/content/Makefile.in
View File

@ -5,18 +5,9 @@
# Branding Makefile
# - jars chrome artwork
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# resources needed for the metro tile interface
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
TILE_DEST := $(DIST)/bin/tileresources
INSTALL_TARGETS += TILE
endif
include $(topsrcdir)/config/rules.mk

10
browser/branding/nightly/locales/Makefile.in
View File

@ -2,14 +2,4 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
include $(topsrcdir)/config/rules.mk

8
browser/branding/official/Makefile.in
View File

@ -2,12 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
@ -70,5 +64,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA
VISUALMANIFEST_PATH := $(DIST)/bin
PP_TARGETS += VISUALMANIFEST
endif
include $(topsrcdir)/config/rules.mk

9
browser/branding/official/content/Makefile.in
View File

@ -5,18 +5,9 @@
# Branding Makefile
# - jars chrome artwork
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# resources needed for the metro tile interface
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
TILE_DEST := $(DIST)/bin/tileresources
INSTALL_TARGETS += TILE
endif
include $(topsrcdir)/config/rules.mk

10
browser/branding/official/locales/Makefile.in
View File

@ -2,14 +2,4 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
DEFINES += -DAB_CD=$(AB_CD)
include $(topsrcdir)/config/rules.mk

8
browser/branding/unofficial/Makefile.in
View File

@ -2,12 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
@ -70,5 +64,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA
VISUALMANIFEST_PATH := $(DIST)/bin
PP_TARGETS += VISUALMANIFEST
endif
include $(topsrcdir)/config/rules.mk

9
browser/branding/unofficial/content/Makefile.in
View File

@ -5,18 +5,9 @@
# Branding Makefile
# - jars chrome artwork
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# resources needed for the metro tile interface
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
TILE_DEST := $(DIST)/bin/tileresources
INSTALL_TARGETS += TILE
endif
include $(topsrcdir)/config/rules.mk

10
browser/branding/unofficial/locales/Makefile.in
View File

@ -2,14 +2,4 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
include $(topsrcdir)/config/rules.mk

9
browser/components/about/Makefile.in
View File

@ -2,16 +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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
FORCE_STATIC_LIB = 1
USE_STATIC_LIBS = 1
LOCAL_INCLUDES = -I$(srcdir)/../build
include $(topsrcdir)/config/rules.mk

7
browser/components/build/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH=@DEPTH@
topsrcdir=@top_srcdir@
srcdir=@srcdir@
VPATH=@srcdir@
include $(DEPTH)/config/autoconf.mk
SHORT_LIBNAME = brwsrcmp
IS_COMPONENT = 1
MODULE_NAME = nsBrowserCompsModule

10
browser/components/certerror/test/Makefile.in
View File

@ -3,17 +3,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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_BROWSER_FILES := \
browser_bug431826.js \
browser_bug633691.js \
$(NULL)
include $(topsrcdir)/config/rules.mk

9
browser/components/dirprovider/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
FORCE_STATIC_LIB = 1
USE_STATIC_LIBS = 1
@ -18,5 +11,3 @@ EXTRA_DSO_LDOPTS = \
$(XPCOM_GLUE_LDOPTS) \
$(NSPR_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

11
browser/components/downloads/test/browser/Makefile.in
View File

@ -1,19 +1,8 @@
# Any copyright is dedicated to the Public Domain.
# http://creativecommons.org/publicdomain/zero/1.0/
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_BROWSER_FILES = \
browser_basic_functionality.js \
browser_first_download_panel.js \
head.js \
$(NULL)
include $(topsrcdir)/config/rules.mk

9
browser/components/feeds/src/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
FORCE_STATIC_LIB = 1
USE_STATIC_LIBS = 1
@ -19,5 +12,3 @@ DEFINES += \
LOCAL_INCLUDES = -I$(srcdir)/../../build
include $(topsrcdir)/config/rules.mk

10
browser/components/feeds/test/Makefile.in
View File

@ -2,14 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_FILES = \
bug408328-data.xml \
bug368464-data.xml \
@ -23,5 +15,3 @@ MOCHITEST_FILES = \
valid-feed.xml \
valid-unsniffable-feed.xml \
$(NULL)
include $(topsrcdir)/config/rules.mk

11
browser/components/feeds/test/chrome/Makefile.in
View File

@ -3,14 +3,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
# sample_feed.atom was copied from toolkit/components/places/tests/chrome
MOCHITEST_FILES = \
sample_feed.atom \
@ -22,6 +14,3 @@ MOCHITEST_CHROME_FILES = \
test_bug408328.html \
test_maxSniffing.html \
$(NULL)
include $(topsrcdir)/config/rules.mk

10
browser/components/migration/src/Makefile.in
View File

@ -2,13 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
FORCE_STATIC_LIB = 1
USE_STATIC_LIBS = 1
@ -21,6 +14,3 @@ endif
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
DEFINES += -DHAS_SAFARI_MIGRATOR
endif
include $(topsrcdir)/config/rules.mk

10
browser/components/places/tests/browser/Makefile.in
View File

@ -2,14 +2,6 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_BROWSER_FILES = \
head.js \
browser_0_library_left_pane_migration.js \
@ -44,5 +36,3 @@ MOCHITEST_BROWSER_FILES = \
browser_library_downloads.js \
browser_library_left_pane_select_hierarchy.js \
$(NULL)
include $(topsrcdir)/config/rules.mk

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