wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge the last PGO-green inbound changeset to m-c.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-04-16 21:07:27 -04:00
commit 8a4d9677e7
640 changed files with 5940 additions and 5786 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accessible/public/Makefile.in
View File

@ -11,9 +11,5 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORTS = \
nsIAccessibilityService.h \
$(NULL)
include $(topsrcdir)/config/rules.mk

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

@ -22,6 +22,8 @@ FORCE_SHARED_LIB = 1
SRCS_IN_OBJDIR = 1
# Please keep this list in sync with the moz.build file until the rest of this
# Makefile is ported over.
MIDL_INTERFACES = \
Accessible2.idl \
AccessibleAction.idl \
@ -39,6 +41,8 @@ MIDL_INTERFACES = \
AccessibleValue.idl \
$(NULL)
# Please keep this list in sync with the moz.build file until the rest of this
# Makefile is ported over.
MIDL_ENUMS = \
AccessibleEventId.idl \
AccessibleRole.idl \
@ -46,12 +50,6 @@ MIDL_ENUMS = \
IA2CommonTypes.idl \
$(NULL)
EXPORTS = \
$(MIDL_INTERFACES:%.idl=%.h) \
$(MIDL_INTERFACES:%.idl=%_i.c) \
$(MIDL_ENUMS:%.idl=%.h) \
$(NULL)
CSRCS = \
dlldata.c \
$(MIDL_INTERFACES:%.idl=%_p.c) \

31
accessible/public/ia2/moz.build
View File

@ -6,3 +6,34 @@
MODULE = 'accessibility'
# Please keep this list in sync with the Makefile.in until the rest of that file
# is ported over.
midl_interfaces = [
'Accessible2',
'AccessibleAction',
'AccessibleApplication',
'AccessibleComponent',
'AccessibleEditableText',
'AccessibleHyperlink',
'AccessibleHypertext',
'AccessibleImage',
'AccessibleRelation',
'AccessibleTable',
'AccessibleTable2',
'AccessibleTableCell',
'AccessibleText',
'AccessibleValue',
]
# Please keep this list in sync with the Makefile.in until the rest of that file
# is ported over.
midl_enums = [
'AccessibleEventId',
'AccessibleRole',
'AccessibleStates',
'IA2CommonTypes',
]
EXPORTS += [x + '.h' for x in midl_enums]
EXPORTS += [x + '.h' for x in midl_interfaces]
EXPORTS += [x + '_i.c' for x in midl_interfaces]

4
accessible/public/moz.build
View File

@ -39,3 +39,7 @@ XPIDL_SOURCES += [
MODULE = 'accessibility'
EXPORTS += [
'nsIAccessibilityService.h',
]

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

@ -57,15 +57,6 @@ done_gen: ISimpleDOMNode.idl \
$(MIDL) $(MIDL_FLAGS) -Oicf $(srcdir)/ISimpleDOMText.idl
touch $@
EXPORTS = \
ISimpleDOMNode.h \
ISimpleDOMNode_i.c \
ISimpleDOMDocument.h \
ISimpleDOMDocument_i.c \
ISimpleDOMText.h \
ISimpleDOMText_i.c \
$(NULL)
export:: done_gen
# This marshall dll is also registered in the installer

9
accessible/public/msaa/moz.build
View File

@ -6,3 +6,12 @@
MODULE = 'accessibility'
EXPORTS += [
'ISimpleDOMDocument.h',
'ISimpleDOMDocument_i.c',
'ISimpleDOMNode.h',
'ISimpleDOMNode_i.c',
'ISimpleDOMText.h',
'ISimpleDOMText_i.c',
]

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

@ -36,17 +36,6 @@ CPPSRCS = \
UtilInterface.cpp \
$(NULL)
EXPORTS = \
nsAccessNodeWrap.h \
$(NULL)
EXPORTS_NAMESPACES = mozilla/a11y
EXPORTS_mozilla/a11y = \
AccessibleWrap.h \
HyperTextAccessibleWrap.h \
$(null)
# we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1

9
accessible/src/atk/moz.build
View File

@ -6,3 +6,12 @@
MODULE = 'accessibility'
EXPORTS += [
'nsAccessNodeWrap.h',
]
EXPORTS.mozilla.a11y += [
'AccessibleWrap.h',
'HyperTextAccessibleWrap.h',
]

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

@ -46,30 +46,6 @@ CPPSRCS += \
$(NULL)
endif
EXPORTS = \
AccEvent.h \
nsAccessibilityService.h \
nsAccessNode.h \
$(NULL)
EXPORTS_NAMESPACES = mozilla/a11y
EXPORTS_mozilla/a11y = \
DocManager.h \
FocusManager.h \
AccTypes.h \
Platform.h \
States.h \
SelectionManager.h \
Role.h \
$(NULL)
ifdef MOZ_DEBUG
EXPORTS_mozilla/a11y += \
Logging.h \
$(NULL)
endif
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1

20
accessible/src/base/moz.build
View File

@ -6,3 +6,23 @@
MODULE = 'accessibility'
EXPORTS += [
'AccEvent.h',
'nsAccessNode.h',
'nsAccessibilityService.h',
]
EXPORTS.mozilla.a11y += [
'AccTypes.h',
'DocManager.h',
'FocusManager.h',
'Platform.h',
'Role.h',
'SelectionManager.h',
'States.h',
]
if CONFIG['MOZ_DEBUG']:
EXPORTS.mozilla.a11y += [
'Logging.h',
]

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

@ -28,14 +28,6 @@ CPPSRCS = \
TextLeafAccessible.cpp \
$(NULL)
EXPORTS_NAMESPACES = mozilla/a11y
EXPORTS_mozilla/a11y = \
Accessible.h \
DocAccessible.h \
HyperTextAccessible.h \
$(null)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1

6
accessible/src/generic/moz.build
View File

@ -6,3 +6,9 @@
MODULE = 'accessibility'
EXPORTS.mozilla.a11y += [
'Accessible.h',
'DocAccessible.h',
'HyperTextAccessible.h',
]

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

@ -26,18 +26,6 @@ CMMSRCS = \
RootAccessibleWrap.mm \
$(NULL)
EXPORTS = \
nsAccessNodeWrap.h \
mozAccessibleProtocol.h \
$(NULL)
EXPORTS_NAMESPACES = mozilla/a11y
EXPORTS_mozilla/a11y = \
AccessibleWrap.h \
HyperTextAccessibleWrap.h \
$(null)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1

10
accessible/src/mac/moz.build
View File

@ -6,3 +6,13 @@
MODULE = 'accessibility'
EXPORTS += [
'mozAccessibleProtocol.h',
'nsAccessNodeWrap.h',
]
EXPORTS.mozilla.a11y += [
'AccessibleWrap.h',
'HyperTextAccessibleWrap.h',
]

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

@ -19,17 +19,6 @@ CPPSRCS = \
Platform.cpp \
$(NULL)
EXPORTS = \
nsAccessNodeWrap.h \
$(null)
EXPORTS_NAMESPACES = mozilla/a11y
EXPORTS_mozilla/a11y = \
AccessibleWrap.h \
HyperTextAccessibleWrap.h \
$(null)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1

9
accessible/src/other/moz.build
View File

@ -6,3 +6,12 @@
MODULE = 'accessibility'
EXPORTS += [
'nsAccessNodeWrap.h',
]
EXPORTS.mozilla.a11y += [
'AccessibleWrap.h',
'HyperTextAccessibleWrap.h',
]

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

@ -28,16 +28,6 @@ CPPSRCS += \
ia2AccessibleValue.cpp \
$(NULL)
EXPORTS = \
ia2AccessibleValue.h \
ia2AccessibleAction.h \
ia2AccessibleComponent.h \
ia2AccessibleEditableText.h \
ia2AccessibleHyperlink.h \
ia2AccessibleHypertext.h \
ia2AccessibleText.h \
$(NULL)
# The midl generated code include Windows headers which defines min and max
# macros which conflicts with std::min/max. Suppress the macros:
OS_CXXFLAGS += -DNOMINMAX

10
accessible/src/windows/ia2/moz.build
View File

@ -6,3 +6,13 @@
MODULE = 'accessibility'
EXPORTS += [
'ia2AccessibleAction.h',
'ia2AccessibleComponent.h',
'ia2AccessibleEditableText.h',
'ia2AccessibleHyperlink.h',
'ia2AccessibleHypertext.h',
'ia2AccessibleText.h',
'ia2AccessibleValue.h',
]

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

@ -41,18 +41,6 @@ CPPSRCS += \
$(NULL)
endif
EXPORTS = \
nsAccessNodeWrap.h \
$(NULL)
EXPORTS_NAMESPACES = mozilla/a11y \
EXPORTS_mozilla/a11y = \
AccessibleWrap.h \
Compatibility.h \
HyperTextAccessibleWrap.h \
$(null)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1

10
accessible/src/windows/msaa/moz.build
View File

@ -6,3 +6,13 @@
MODULE = 'accessibility'
EXPORTS += [
'nsAccessNodeWrap.h',
]
EXPORTS.mozilla.a11y += [
'AccessibleWrap.h',
'Compatibility.h',
'HyperTextAccessibleWrap.h',
]

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

@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = accessibility_xpcom_s
LIBXUL_LIBRARY = 1
EXPORTS := xpcAccEvents.h
CPPSRCS = \
xpcAccEvents.cpp \
nsAccessibleRelation.cpp \

4
accessible/src/xpcom/moz.build
View File

@ -6,3 +6,7 @@
MODULE = 'accessibility'
EXPORTS += [
'xpcAccEvents.h',
]

1
browser/base/content/test/browser_aboutHome.js
View File

@ -250,6 +250,7 @@ let gTests = [
function test()
{
waitForExplicitFinish();
requestLongerTimeout(2);
Task.spawn(function () {
for (let test of gTests) {

7
browser/base/content/test/browser_drag.js
View File

@ -2,6 +2,11 @@ function test()
{
waitForExplicitFinish();
let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
getService(Ci.mozIJSSubScriptLoader);
let ChromeUtils = {};
scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
// ---- Test dragging the proxy icon ---
var value = content.location.href;
var urlString = value + "\n" + content.document.title;
@ -36,5 +41,5 @@ function test()
finish();
}, true);
EventUtils.synthesizeDrop(tab, tab, [[{type: "text/uri-list", data: "http://mochi.test:8888/"}]], "copy", window);
ChromeUtils.synthesizeDrop(tab, tab, [[{type: "text/uri-list", data: "http://mochi.test:8888/"}]], "copy", window);
}

8
browser/base/content/test/browser_homeDrop.js
View File

@ -13,8 +13,8 @@ function test() {
let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
getService(Ci.mozIJSSubScriptLoader);
let chromeUtils = {};
scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", chromeUtils);
let ChromeUtils = {};
scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
let homeButton = document.getElementById("home-button");
ok(homeButton, "home button present");
@ -44,14 +44,14 @@ function test() {
// The drop handler throws an exception when dragging URIs that inherit
// principal, e.g. javascript:
expectUncaughtException();
chromeUtils.synthesizeDrop(homeButton, homeButton, [[{type: "text/plain", data: "javascript:8888"}]], "copy", window, EventUtils);
ChromeUtils.synthesizeDrop(homeButton, homeButton, [[{type: "text/plain", data: "javascript:8888"}]], "copy", window);
});
})
});
Services.wm.addListener(dialogListener);
chromeUtils.synthesizeDrop(homeButton, homeButton, [[{type: "text/plain", data: "http://mochi.test:8888/"}]], "copy", window, EventUtils);
ChromeUtils.synthesizeDrop(homeButton, homeButton, [[{type: "text/plain", data: "http://mochi.test:8888/"}]], "copy", window);
}
function WindowListener(aURL, aCallback) {

6
browser/base/content/test/browser_tabDrop.js
View File

@ -11,8 +11,8 @@ function test() {
let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
getService(Ci.mozIJSSubScriptLoader);
let chromeUtils = {};
scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", chromeUtils);
let ChromeUtils = {};
scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
let tabContainer = gBrowser.tabContainer;
var receivedDropCount = 0;
@ -55,7 +55,7 @@ function test() {
// instead). The events created by synthesizeDrop have all of their
// coordinates set to 0 (screenX/screenY), so they're treated as drops
// on the outer edge of the tab, thus they open new tabs.
chromeUtils.synthesizeDrop(newTab, newTab, [[{type: "text/plain", data: text}]], "link", window, EventUtils);
ChromeUtils.synthesizeDrop(newTab, newTab, [[{type: "text/plain", data: text}]], "link", window);
});
}

12
browser/base/content/test/browser_tab_drag_drop_perwindow.js
View File

@ -8,8 +8,8 @@ function test() {
let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
getService(Ci.mozIJSSubScriptLoader);
let chromeUtils = {};
scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", chromeUtils);
let ChromeUtils = {};
scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
function testOnWindow(aIsPrivate, aCallback) {
whenNewWindowLoaded({private: aIsPrivate}, function(win) {
@ -23,14 +23,14 @@ function test() {
let normalTab = aNormalWindow.gBrowser.addTab("about:blank", {skipAnimation: true});
let privateTab = aPrivateWindow.gBrowser.addTab("about:blank", {skipAnimation: true});
let effect = chromeUtils.synthesizeDrop(normalTab, privateTab,
let effect = ChromeUtils.synthesizeDrop(normalTab, privateTab,
[[{type: TAB_DROP_TYPE, data: normalTab}]],
null, aNormalWindow, EventUtils, aPrivateWindow);
null, aNormalWindow, aPrivateWindow);
is(effect, "none", "Should not be able to drag a normal tab to a private window");
effect = chromeUtils.synthesizeDrop(privateTab, normalTab,
effect = ChromeUtils.synthesizeDrop(privateTab, normalTab,
[[{type: TAB_DROP_TYPE, data: privateTab}]],
null, aPrivateWindow, EventUtils, aNormalWindow);
null, aPrivateWindow, aNormalWindow);
is(effect, "none", "Should not be able to drag a private tab to a normal window");
aNormalWindow.gBrowser.swapBrowsersAndCloseOther(normalTab, privateTab);

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

@ -14,10 +14,6 @@ LIBRARY_NAME = browserabout_s
FORCE_STATIC_LIB = 1
USE_STATIC_LIBS = 1
EXPORTS_NAMESPACES = mozilla/browser
EXPORTS_mozilla/browser = AboutRedirector.h
CPPSRCS = AboutRedirector.cpp
LOCAL_INCLUDES = -I$(srcdir)/../build

4
browser/components/about/moz.build
View File

@ -6,3 +6,7 @@
MODULE = 'browserabout'
EXPORTS.mozilla.browser += [
'AboutRedirector.h',
]

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

@ -17,8 +17,6 @@ FORCE_SHARED_LIB = 1
USE_STATIC_LIBS = 1
EXPORTS = nsBrowserCompsCID.h
CPPSRCS = nsModule.cpp \
$(NULL)

4
browser/components/build/moz.build
View File

@ -6,3 +6,7 @@
MODULE = 'browsercomps'
EXPORTS += [
'nsBrowserCompsCID.h',
]

10
browser/components/dirprovider/DirectoryProvider.cpp
View File

@ -12,7 +12,6 @@
#include "nsArrayEnumerator.h"
#include "nsEnumeratorUtils.h"
#include "nsBrowserDirectoryServiceDefs.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsDirectoryServiceDefs.h"
#include "nsCategoryManagerUtils.h"
@ -58,15 +57,6 @@ DirectoryProvider::GetFile(const char *aKey, bool *aPersist, nsIFile* *aResult)
}
}
}
else if (!strcmp(aKey, NS_APP_EXISTING_PREF_OVERRIDE)) {
rv = NS_GetSpecialDirectory(NS_APP_DEFAULTS_50_DIR,
getter_AddRefs(file));
NS_ENSURE_SUCCESS(rv, rv);
file->AppendNative(NS_LITERAL_CSTRING("existing-profile-defaults.js"));
file.swap(*aResult);
return NS_OK;
}
else {
return NS_ERROR_FAILURE;
}

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

@ -14,9 +14,6 @@ LIBRARY_NAME = browserdir_s
FORCE_STATIC_LIB = 1
USE_STATIC_LIBS = 1
EXPORTS_NAMESPACES = mozilla/browser
EXPORTS_mozilla/browser = DirectoryProvider.h
CPPSRCS = DirectoryProvider.cpp
LOCAL_INCLUDES = -I$(srcdir)/../build

4
browser/components/dirprovider/moz.build
View File

@ -8,3 +8,7 @@ TEST_DIRS += ['tests']
MODULE = 'browserdir'
EXPORTS.mozilla.browser += [
'DirectoryProvider.h',
]

24
browser/components/dirprovider/nsBrowserDirectoryServiceDefs.h
View File

@ -1,24 +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/. */
#ifndef nsBrowserDirectoryServiceDefs_h___
#define nsBrowserDirectoryServiceDefs_h___
//=============================================================================
//
// Defines property names for directories available from the browser-specific
// nsBrowserDirectoryProvider.
//
// System and XPCOM properties are defined in nsDirectoryServiceDefs.h.
// General application properties are defined in nsAppDirectoryServiceDefs.h.
//
//=============================================================================
// ----------------------------------------------------------------------------
// Files and directories that exist on a per-browser basis.
// ----------------------------------------------------------------------------
#define NS_APP_EXISTING_PREF_OVERRIDE "ExistingPrefOverride"
#endif

11
browser/components/dirprovider/tests/unit/test_keys.js
View File

@ -10,17 +10,8 @@ function test_bookmarkhtml() {
do_check_true(bmarks.equals(tbmarks));
}
function test_prefoverride() {
let dir = gDirSvc.get("DefRt", Ci.nsIFile);
dir.append("existing-profile-defaults.js");
let tdir = gDirSvc.get("ExistingPrefOverride", Ci.nsIFile);
do_check_true(dir.equals(tdir));
}
function run_test() {
[test_bookmarkhtml,
test_prefoverride
[test_bookmarkhtml
].forEach(function(f) {
do_test_pending();
print("Running test: " + f.name);

37
browser/components/nsBrowserContentHandler.js
View File

@ -172,40 +172,6 @@ function getPostUpdateOverridePage(defaultOverridePage) {
return update.getProperty("openURL") || defaultOverridePage;
}
// Copies a pref override file into the user's profile pref-override folder,
// and then tells the pref service to reload its default prefs.
function copyPrefOverride() {
try {
var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"]
.getService(Components.interfaces.nsIProperties);
const NS_APP_EXISTING_PREF_OVERRIDE = "ExistingPrefOverride";
var prefOverride = fileLocator.get(NS_APP_EXISTING_PREF_OVERRIDE,
Components.interfaces.nsIFile);
if (!prefOverride.exists())
return; // nothing to do
const NS_APP_PREFS_OVERRIDE_DIR = "PrefDOverride";
var prefOverridesDir = fileLocator.get(NS_APP_PREFS_OVERRIDE_DIR,
Components.interfaces.nsIFile);
// Check for any existing pref overrides, and remove them if present
var existingPrefOverridesFile = prefOverridesDir.clone();
existingPrefOverridesFile.append(prefOverride.leafName);
if (existingPrefOverridesFile.exists())
existingPrefOverridesFile.remove(false);
prefOverride.copyTo(prefOverridesDir, null);
// Now that we've installed the new-profile pref override file,
// re-read the default prefs.
var prefSvcObs = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIObserver);
prefSvcObs.observe(null, "reload-default-prefs", null);
} catch (ex) {
Components.utils.reportError(ex);
}
}
// Flag used to indicate that the arguments to openWindow can be passed directly.
const NO_EXTERNAL_URIS = 1;
@ -600,9 +566,6 @@ nsBrowserContentHandler.prototype = {
overridePage = Services.urlFormatter.formatURLPref("startup.homepage_welcome_url");
break;
case OVERRIDE_NEW_MSTONE:
// Existing profile, new milestone build.
copyPrefOverride();
// Check whether we have a session to restore. If we do, we assume
// that this is an "update" session.
var ss = Components.classes["@mozilla.org/browser/sessionstartup;1"]

8
browser/components/places/tests/browser/browser_475045.js
View File

@ -2,10 +2,10 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
// Instead of loading ChromeUtils.js into the test scope in browser-test.js for all tests,
// we only need ChromeUtils.js for a few files which is why we are using loadSubScript.
var chromeUtils = {};
var ChromeUtils = {};
this._scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
getService(Ci.mozIJSSubScriptLoader);
this._scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", chromeUtils);
this._scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
function test() {
// Make sure the bookmarks bar is visible and restore its state on cleanup.
@ -37,11 +37,11 @@ function test() {
let simulateDragDrop = function(aEffect, aMimeType) {
const uriSpec = "http://www.mozilla.org/D1995729-A152-4e30-8329-469B01F30AA7";
let uri = makeURI(uriSpec);
chromeUtils.synthesizeDrop(placesItems.childNodes[0],
ChromeUtils.synthesizeDrop(placesItems.childNodes[0],
placesItems,
[[{type: aMimeType,
data: uriSpec}]],
aEffect, window, EventUtils);
aEffect, window);
// Verify that the drop produces exactly one bookmark.
let bookmarkIds = PlacesUtils.bookmarks

10
browser/components/search/test/browser_426329.js
View File

@ -1,9 +1,9 @@
// Instead of loading ChromeUtils.js into the test scope in browser-test.js for all tests,
// we only need ChromeUtils.js for a few files which is why we are using loadSubScript.
var chromeUtils = {};
var ChromeUtils = {};
this._scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
getService(Ci.mozIJSSubScriptLoader);
this._scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", chromeUtils);
this._scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
function test() {
waitForExplicitFinish();
@ -153,7 +153,7 @@ function test() {
searchBar.addEventListener("popupshowing", stopPopup, true);
// drop on the search button so that we don't need to worry about the
// default handlers for textboxes.
chromeUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/plain", data: "Some Text" } ]], "copy", window, EventUtils);
ChromeUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/plain", data: "Some Text" } ]], "copy", window);
doOnloadOnce(function(event) {
is(searchBar.value, "Some Text", "drop text/plain on searchbar");
testDropInternalText();
@ -162,7 +162,7 @@ function test() {
function testDropInternalText() {
init();
chromeUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/x-moz-text-internal", data: "More Text" } ]], "copy", window, EventUtils);
ChromeUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/x-moz-text-internal", data: "More Text" } ]], "copy", window);
doOnloadOnce(function(event) {
is(searchBar.value, "More Text", "drop text/x-moz-text-internal on searchbar");
testDropLink();
@ -171,7 +171,7 @@ function test() {
function testDropLink() {
init();
chromeUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/uri-list", data: "http://www.mozilla.org" } ]], "copy", window, EventUtils);
ChromeUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/uri-list", data: "http://www.mozilla.org" } ]], "copy", window);
is(searchBar.value, "More Text", "drop text/uri-list on searchbar");
SimpleTest.executeSoon(testRightClick);
}

3
browser/devtools/debugger/DebuggerUI.jsm
View File

@ -21,9 +21,6 @@ XPCOMUtils.defineLazyModuleGetter(this,
XPCOMUtils.defineLazyModuleGetter(this,
"Services", "resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyModuleGetter(this,
"FileUtils", "resource://gre/modules/FileUtils.jsm");
this.EXPORTED_SYMBOLS = ["DebuggerUI"];
/**

2
browser/extensions/pdfjs/README.mozilla
View File

@ -1,4 +1,4 @@
This is the pdf.js project output, https://github.com/mozilla/pdf.js
Current extension version is: 0.7.423
Current extension version is: 0.8.47

34
browser/extensions/pdfjs/components/PdfStreamConverter.js
View File

@ -101,23 +101,6 @@ function getDOMWindow(aChannel) {
return win;
}
function isEnabled() {
if (MOZ_CENTRAL) {
var disabled = getBoolPref(PREF_PREFIX + '.disabled', false);
if (disabled)
return false;
// To also be considered enabled the "Preview in Firefox" option must be
// selected in the Application preferences.
var handlerInfo = Svc.mime
.getFromTypeAndExtension('application/pdf', 'pdf');
return !handlerInfo.alwaysAskBeforeHandling &&
handlerInfo.preferredAction == Ci.nsIHandlerInfo.handleInternally;
}
// Always returns true for the extension since enabling/disabling is handled
// by the add-on manager.
return true;
}
function getLocalizedStrings(path) {
var stringBundle = Cc['@mozilla.org/intl/stringbundle;1'].
getService(Ci.nsIStringBundleService).
@ -268,10 +251,13 @@ ChromeActions.prototype = {
var channel = Cc['@mozilla.org/network/input-stream-channel;1'].
createInstance(Ci.nsIInputStreamChannel);
channel.QueryInterface(Ci.nsIChannel);
channel.contentDisposition = Ci.nsIChannel.DISPOSITION_ATTACHMENT;
if (self.contentDispositionFilename) {
channel.contentDispositionFilename = self.contentDispositionFilename;
}
try {
// contentDisposition/contentDispositionFilename is readonly before FF18
channel.contentDisposition = Ci.nsIChannel.DISPOSITION_ATTACHMENT;
if (self.contentDispositionFilename) {
channel.contentDispositionFilename = self.contentDispositionFilename;
}
} catch (e) {}
channel.setURI(originalUri);
channel.contentStream = aInputStream;
if ('nsIPrivateBrowsingChannel' in Ci &&
@ -380,6 +366,9 @@ ChromeActions.prototype = {
var prefGfx = getBoolPref('gfx.downloadable_fonts.enabled', true);
return (!!prefBrowser && prefGfx);
},
supportsDocumentColors: function() {
return getBoolPref('browser.display.use_document_colors', true);
},
fallback: function(url, sendResponse) {
var self = this;
var domWindow = this.domWindow;
@ -577,9 +566,6 @@ PdfStreamConverter.prototype = {
// nsIStreamConverter::asyncConvertData
asyncConvertData: function(aFromType, aToType, aListener, aCtxt) {
if (!isEnabled())
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
// Store the listener passed to us
this.listener = aListener;
},

46
browser/extensions/pdfjs/content/PdfJs.jsm
View File

@ -28,6 +28,8 @@ const PREF_PREVIOUS_ACTION = PREF_PREFIX + '.previousHandler.preferredAction';
const PREF_PREVIOUS_ASK = PREF_PREFIX + '.previousHandler.alwaysAskBeforeHandling';
const PREF_DISABLED_PLUGIN_TYPES = 'plugin.disable_full_page_plugin_for_types';
const TOPIC_PDFJS_HANDLER_CHANGED = 'pdfjs:handlerChanged';
const TOPIC_PLUGINS_LIST_UPDATED = "plugins-list-updated";
const TOPIC_PLUGIN_INFO_UPDATED = "plugin-info-updated";
const PDF_CONTENT_TYPE = 'application/pdf';
Cu.import('resource://gre/modules/XPCOMUtils.jsm');
@ -112,7 +114,10 @@ let PdfJs = {
// Listen for when pdf.js is completely disabled or a different pdf handler
// is chosen.
Services.prefs.addObserver(PREF_DISABLED, this, false);
Services.prefs.addObserver(PREF_DISABLED_PLUGIN_TYPES, this, false);
Services.obs.addObserver(this, TOPIC_PDFJS_HANDLER_CHANGED, false);
Services.obs.addObserver(this, TOPIC_PLUGINS_LIST_UPDATED, false);
Services.obs.addObserver(this, TOPIC_PLUGIN_INFO_UPDATED, false);
},
_migrate: function migrate() {
@ -186,14 +191,39 @@ let PdfJs = {
*/
get enabled() {
var disabled = getBoolPref(PREF_DISABLED, true);
if (disabled)
if (disabled) {
return false;
}
var handlerInfo = Svc.mime.
getFromTypeAndExtension('application/pdf', 'pdf');
return handlerInfo.alwaysAskBeforeHandling == false &&
handlerInfo.plugin == null &&
handlerInfo.preferredAction == Ci.nsIHandlerInfo.handleInternally;
// the 'application/pdf' handler is selected as internal?
var handlerInfo = Svc.mime
.getFromTypeAndExtension(PDF_CONTENT_TYPE, 'pdf');
if (handlerInfo.alwaysAskBeforeHandling ||
handlerInfo.preferredAction !== Ci.nsIHandlerInfo.handleInternally) {
return false;
}
// we also need to check if pdf plugin is not present or disabled...
let tags = Cc["@mozilla.org/plugin/host;1"].
getService(Ci.nsIPluginHost).
getPluginTags();
let enabledPluginFound = tags.some(function(tag) {
if (tag.disabled) {
return false;
}
let mimeTypes = tag.getMimeTypes();
return mimeTypes.some(function(mimeType) {
return mimeType.type === PDF_CONTENT_TYPE;
});
});
if (!enabledPluginFound) {
return true; // no plugins for this type, it's good
}
// ... and full page plugins list must have 'application/pdf' type,
// in case when enabled pdf plugin exists.
return Services.prefs.prefHasUserValue(PREF_DISABLED_PLUGIN_TYPES) ?
(Services.prefs.getCharPref(PREF_DISABLED_PLUGIN_TYPES).split(',').
indexOf(PDF_CONTENT_TYPE) >= 0) : false;
},
_ensureRegistered: function _ensureRegistered() {
@ -205,7 +235,7 @@ let PdfJs = {
this._pdfRedirectorFactory = new Factory();
this._pdfRedirectorFactory.register(PdfRedirector);
Svc.pluginHost.registerPlayPreviewMimeType('application/pdf', true,
Svc.pluginHost.registerPlayPreviewMimeType(PDF_CONTENT_TYPE, true,
'data:application/x-moz-playpreview-pdfjs;,');
this._registered = true;
@ -220,7 +250,7 @@ let PdfJs = {
this._pdfRedirectorFactory.unregister;
delete this._pdfRedirectorFactory;
Svc.pluginHost.unregisterPlayPreviewMimeType('application/pdf');
Svc.pluginHost.unregisterPlayPreviewMimeType(PDF_CONTENT_TYPE);
this._registered = false;
}

1805
browser/extensions/pdfjs/content/build/pdf.js
View File

File diff suppressed because it is too large Load Diff

2
browser/extensions/pdfjs/content/web/debugger.js
View File

@ -46,7 +46,7 @@ var FontInspector = (function FontInspectorClosure() {
}
}
function textLayerClick(e) {
if (!e.target.dataset.fontName || e.target.tagName != 'DIV')
if (!e.target.dataset.fontName || e.target.tagName.toUpperCase() !== 'DIV')
return;
var fontName = e.target.dataset.fontName;
var selects = document.getElementsByTagName('input');

24
browser/extensions/pdfjs/content/web/viewer.css
View File

@ -88,6 +88,18 @@ select {
margin-bottom: 100%;
}
:-webkit-full-screen a:not(.internalLink) {
display: none;
}
:-moz-full-screen a:not(.internalLink) {
display: none;
}
:fullscreen a:not(.internalLink) {
display: none;
}
#viewerContainer.presentationControls {
cursor: default;
}
@ -391,12 +403,14 @@ html[dir='ltr'] #toolbarViewerLeft > *,
html[dir='ltr'] #toolbarViewerMiddle > *,
html[dir='ltr'] #toolbarViewerRight > *,
html[dir='ltr'] .findbar > * {
position: relative;
float: left;
}
html[dir='rtl'] #toolbarViewerLeft > *,
html[dir='rtl'] #toolbarViewerMiddle > *,
html[dir='rtl'] #toolbarViewerRight > *,
html[dir='rtl'] .findbar > * {
position: relative;
float: right;
}
@ -747,6 +761,14 @@ html[dir='rtl'] #findPrevious {
html[dir='rtl'] #findNext {
margin-left: 3px;
}
.toolbarButton::before {
/* All matching images have a size of 16x16
* (except for the print button: 18x16)
* All relevant containers have a size of 32x25 */
position: absolute;
top: 4px;
left: 7px;
}
html[dir='ltr'] .toolbarButton.findPrevious::before {
display: inline-block;
@ -806,6 +828,7 @@ html[dir='rtl'] .toolbarButton.pageDown::before {
.toolbarButton.print::before {
display: inline-block;
content: url(images/toolbarButton-print.png);
left: 6px;
}
.toolbarButton.openFile::before {
@ -1038,7 +1061,6 @@ html[dir='rtl'] .outlineItem > a {
color: hsla(0,0%,100%,1);
}
.noOutline,
.noResults {
font-size: 12px;
color: hsla(0,0%,100%,.8);

44
browser/extensions/pdfjs/content/web/viewer.js
View File

@ -922,7 +922,7 @@ var PDFView = {
doc.webkitRequestFullScreen;
// Disable fullscreen button if we're in an iframe
if (!!window.frameElement)
if (window.parent !== window)
support = false;
Object.defineProperty(this, 'supportsFullScreen', { value: support,
@ -952,6 +952,16 @@ var PDFView = {
return support;
},
get supportsDocumentColors() {
var support = true;
support = FirefoxCom.requestSync('supportsDocumentColors');
Object.defineProperty(this, 'supportsDocumentColors', { value: support,
enumerable: true,
configurable: true,
writable: false });
return support;
},
get isHorizontalScrollbarEnabled() {
var div = document.getElementById('viewerContainer');
return div.scrollWidth > div.clientWidth;
@ -1370,6 +1380,7 @@ var PDFView = {
PDFJS.Promise.all(promises).then(function() {
pdfDocument.getOutline().then(function(outline) {
self.outline = new DocumentOutlineView(outline);
document.getElementById('viewOutline').disabled = !outline;
});
// Make all navigation keys work on document load,
@ -1979,6 +1990,7 @@ var PageView = function pageView(container, id, scale,
PDFView.navigateTo(dest);
return false;
};
link.className = 'internalLink';
}
function createElementWithStyle(tagName, item, rect) {
if (!rect) {
@ -2233,6 +2245,13 @@ var PageView = function pageView(container, id, scale,
'Web fonts are disabled: unable to use embedded PDF fonts.'));
PDFView.fallback();
}
if (self.textLayer && self.textLayer.textDivs &&
self.textLayer.textDivs.length > 0 &&
!PDFView.supportsDocumentColors) {
console.error(mozL10n.get('web_colors_disabled', null,
'Web colors are disabled.'));
PDFView.fallback();
}
if (error) {
PDFView.error(mozL10n.get('rendering_error', null,
'An error occurred while rendering the page.'), error);
@ -2536,9 +2555,17 @@ var ThumbnailView = function thumbnailView(container, id, defaultViewport) {
var DocumentOutlineView = function documentOutlineView(outline) {
var outlineView = document.getElementById('outlineView');
var outlineButton = document.getElementById('viewOutline');
while (outlineView.firstChild)
outlineView.removeChild(outlineView.firstChild);
if (!outline) {
if (!outlineView.classList.contains('hidden'))
PDFView.switchSidebarView('thumbs');
return;
}
function bindItemLink(domObj, item) {
domObj.href = PDFView.getDestinationHash(item.dest);
domObj.onclick = function documentOutlineViewOnclick(e) {
@ -2547,14 +2574,6 @@ var DocumentOutlineView = function documentOutlineView(outline) {
};
}
if (!outline) {
var noOutline = document.createElement('div');
noOutline.classList.add('noOutline');
noOutline.textContent = mozL10n.get('no_outline', null,
'No Outline Available');
outlineView.appendChild(noOutline);
return;
}
var queue = [{parent: outlineView, items: outline}];
while (queue.length > 0) {
@ -2643,7 +2662,6 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv, pageIdx) {
this.beginLayout = function textLayerBuilderBeginLayout() {
this.textDivs = [];
this.textLayerQueue = [];
this.renderingDone = false;
};
@ -3418,9 +3436,9 @@ window.addEventListener('keydown', function keydown(evt) {
// Some shortcuts should not get handled if a control/input element
// is selected.
var curElement = document.activeElement;
if (curElement && (curElement.tagName == 'INPUT' ||
curElement.tagName == 'SELECT')) {
var curElement = document.activeElement || document.querySelector(':focus');
if (curElement && (curElement.tagName.toUpperCase() === 'INPUT' ||
curElement.tagName.toUpperCase() === 'SELECT')) {
return;
}
var controlsElement = document.getElementById('toolbar');

11
browser/locales/Makefile.in
View File

@ -99,17 +99,6 @@ $(STAGEDIST): $(DIST)/branding
$(DIST)/branding:
$(NSINSTALL) -D $@
libs::
@if test -f "$(LOCALE_SRCDIR)/existing-profile-defaults.js"; then \
$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
$(LOCALE_SRCDIR)/existing-profile-defaults.js > $(FINAL_TARGET)/defaults/existing-profile-defaults.js; \
fi
install::
@if test -f "$(LOCALE_SRCDIR)/existing-profile-defaults.js"; then \
$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
$(LOCALE_SRCDIR)/existing-profile-defaults.js > $(DESTDIR)$(mozappdir)/defaults/existing-profile-defaults.js; \
fi
PROFILE_FILES = \
localstore.rdf \
mimeTypes.rdf \

4
browser/locales/en-US/pdfviewer/viewer.properties
View File

@ -53,9 +53,6 @@ thumbs_label=Thumbnails
findbar.title=Find in Document
findbar_label=Find
# Document outline messages
no_outline=No Outline Available
# Thumbnails panel item (tooltip and alt text for images)
# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
# number.
@ -123,3 +120,4 @@ request_password=PDF is protected by a password:
printing_not_supported=Warning: Printing is not fully supported by this browser.
printing_not_ready=Warning: The PDF is not fully loaded for printing.
web_fonts_disabled=Web fonts are disabled: unable to use embedded PDF fonts.
web_colors_disabled=Web colors are disabled.

4
browser/metro/base/content/bindings/toggleswitch.xml
View File

@ -20,8 +20,8 @@
<xul:description anonid="onlabel" class="onlabel" value="&checkbox.on.label;" xbl:inherits="value=onlabel"/>
<xul:description anonid="offlabel" class="offlabel" value="&checkbox.off.label;" xbl:inherits="value=offlabel"/>
<xul:radiogroup anonid="group" xbl:inherits="disabled">
<xul:radio anonid="on" class="checkbox-radio-on"/>
<xul:radio anonid="off" class="checkbox-radio-off"/>
<xul:radio type="toggle" anonid="on" class="checkbox-radio-on"/>
<xul:radio type="toggle" anonid="off" class="checkbox-radio-off"/>
</xul:radiogroup>
</xul:hbox>
</content>

6
browser/metro/base/content/browser.css
View File

@ -118,10 +118,14 @@ placelabel {
-moz-binding: url("chrome://browser/content/bindings/bindings.xml#place-label");
}
radio {
radio[type="toggle"] {
-moz-binding: url("chrome://global/content/bindings/radio.xml#radio");
}
radiogroup {
-moz-binding: url("chrome://global/content/bindings/radio.xml#radiogroup");
}
checkbox.toggleswitch {
-moz-binding: url("chrome://browser/content/bindings/toggleswitch.xml#checkbox-toggleswitch");
}

11
browser/metro/base/content/browser.xul
View File

@ -461,8 +461,15 @@
</hbox>
</settings>
<setting pref="signon.rememberSignons" title="&optionsHeader.privacy.passwords.label;" type="bool"/>
<settings id="prefs-donottrack" label="&optionsHeader.privacy.doNotTrack.title;">
<setting pref="privacy.donottrackheader.enabled" title="&optionsHeader.privacy.doNotTrack.label;" type="bool"/>
<settings id="prefs-dnt" label="&doNotTrack.title;">
<description>&doNotTrack.desc;</description>
<setting id="prefs-dnt-value" pref="privacy.donottrackheader.value" onpreferencechanged="PreferencesPanelView.onDNTPreferenceChanged()" type="radio" >
<radiogroup id="prefs-dnt-options">
<radio id="prefs-dnt-notrack" label="&doNotTrack.options.trackingNotOkay;" value="1"/>
<radio id="prefs-dnt-nopref" label="&doNotTrack.options.noPreference;" value="-1"/>
<radio id="prefs-dnt-oktrack" label="&doNotTrack.options.trackingOkay;" value="0"/>
</radiogroup>
</setting>
</settings>
</flyoutpanel>

6
browser/metro/base/content/preferences.js
View File

@ -12,5 +12,11 @@ var PreferencesPanelView = {
SanitizeUI.init();
}
}, false);
},
onDNTPreferenceChanged: function onDNTPreferenceChanged() {
let dntNoPref = document.getElementById("prefs-dnt-nopref");
// When "tell sites nothing about my preferences" is selected, disable do not track.
Services.prefs.setBoolPref("privacy.donottrackheader.enabled", !dntNoPref.selected);
}
};

2
browser/metro/base/tests/mochitest/Makefile.in
View File

@ -29,7 +29,7 @@ BROWSER_TESTS = \
browser_context_menu_tests_02.html \
browser_context_menu_tests_03.html \
text-block.html \
browser_sanitize_ui.js \
browser_prefs_ui.js \
browser_topsites.js \
browser_tabs.js \
$(NULL)

54
browser/metro/base/tests/mochitest/browser_sanitize_ui.js → browser/metro/base/tests/mochitest/browser_prefs_ui.js
View File

@ -39,11 +39,8 @@ gTests.push({
// Show options flyout
let promise = waitForEvent(Elements.prefsFlyout, "PopupChanged", 2000);
Elements.prefsFlyout.show();
yield promise;
ok(promise && !(promise instanceof Error), "Wait for PopupChanged");
// Make sure it's opened
yield waitForEvent(Elements.prefsFlyout, "transitionend", 1000);
@ -93,12 +90,59 @@ gTests.push({
});
// hide options flyout
promise = waitForEvent(Elements.prefsFlyout, "PopupChanged", 2000);
let promise = waitForEvent(Elements.prefsFlyout, "PopupChanged", 2000);
Elements.prefsFlyout.hide();
yield promise;
}
});
function checkDNTPrefs(aExpectedEnabled, aExpectedValue) {
let currentEnabled = Services.prefs.getBoolPref("privacy.donottrackheader.enabled");
let currentValue = Services.prefs.getIntPref("privacy.donottrackheader.value");
let enabledTestMsg = "testing privacy.donottrackheader.enabled, expected "
+ aExpectedEnabled + " got " + currentEnabled;
ok(aExpectedEnabled === currentEnabled, enabledTestMsg);
let valueTestMsg = "testing privacy.donottrackheader.value, expected "
+ aExpectedValue + " got " + currentValue;
ok(aExpectedValue === currentValue, valueTestMsg);
}
gTests.push({
desc: "Test do not track settings",
run: function testDNT() {
let noTrack = document.getElementById("prefs-dnt-notrack");
let noPref = document.getElementById("prefs-dnt-nopref");
let okTrack = document.getElementById("prefs-dnt-oktrack");
// Show options flyout
let promise = waitForEvent(Elements.prefsFlyout, "PopupChanged", 2000);
Elements.prefsFlyout.show();
yield promise;
ok(promise && !(promise instanceof Error), "Wait for PopupChanged");
noPref.click();
// See https://mxr.mozilla.org/mozilla-central/source/modules/libpref/src/init/all.js?rev=0aab2bb76b45#755
// -1 - tell sites nothing about preferences
yield waitForCondition(() => Services.prefs.getIntPref("privacy.donottrackheader.value") === -1);
checkDNTPrefs(false, -1);
noTrack.click();
// 1 - tell sites tracking is unacceptable
yield waitForCondition(() => Services.prefs.getIntPref("privacy.donottrackheader.value") === 1);
checkDNTPrefs(true, 1);
okTrack.click();
// 0 - tell sites tracking is acceptable
yield waitForCondition(() => Services.prefs.getIntPref("privacy.donottrackheader.value") === 0);
checkDNTPrefs(true, 0);
// hide options flyout
let promise = waitForEvent(Elements.prefsFlyout, "PopupChanged", 2000);
Elements.prefsFlyout.hide();
yield promise;
}
});

10
browser/metro/locales/en-US/chrome/preferences.dtd
View File

@ -35,8 +35,12 @@
<!ENTITY clearPrivateData.logins "Active logins">
<!ENTITY optionsHeader.privacy.passwords.label "Remember Passwords">
<!ENTITY optionsHeader.privacy.doNotTrack.title "Tracking">
<!ENTITY optionsHeader.privacy.doNotTrack.label "Tell websites not to track me">
<!ENTITY doNotTrack.title "Do Not Track">
<!ENTITY doNotTrack.desc "Tell sites:">
<!ENTITY doNotTrack.options.trackingNotOkay "I do not want to be tracked">
<!ENTITY doNotTrack.options.noPreference "Nothing about my tracking preferences">
<!ENTITY doNotTrack.options.trackingOkay "I want to be tracked">
<!-- ## Sync Flyout Panel ## -->
<!-- ## Sync Flyout Panel ## -->
<!-- see sync.dtd -->

5
browser/metro/theme/browser.css
View File

@ -790,6 +790,11 @@ setting[type="directory"] > .preferences-alignment {
-moz-box-align: center;
}
/* Removes the left side title vbox on radio setting */
setting[type="radio"] > vbox {
display: none;
}
#prefs-homepage-options, #prefs-homepage-popup {
min-width: 200px;
}

1
build/macosx/universal/flight.mk
View File

@ -16,6 +16,7 @@ OBJDIR = $(OBJDIR_ARCH_1)
endif
topsrcdir = $(TOPSRCDIR)
DEPTH = $(OBJDIR)
include $(OBJDIR)/config/autoconf.mk
core_abspath = $(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1))

4
caps/include/Makefile.in
View File

@ -10,9 +10,5 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORTS = \
nsJSPrincipals.h \
$(NULL)
include $(topsrcdir)/config/rules.mk

4
caps/include/moz.build
View File

@ -6,3 +6,7 @@
MODULE = 'caps'
EXPORTS += [
'nsJSPrincipals.h',
]

6
chrome/src/Makefile.in
View File

@ -14,12 +14,6 @@ LIBRARY_NAME = chrome_s
LIBXUL_LIBRARY = 1
FORCE_STATIC_LIB = 1
EXPORTS_NAMESPACES = mozilla/chrome
EXPORTS_mozilla/chrome = \
RegistryMessageUtils.h \
$(NULL)
CPPSRCS = \
nsChromeRegistry.cpp \
nsChromeRegistryChrome.cpp \

4
chrome/src/moz.build
View File

@ -6,3 +6,7 @@
MODULE = 'chrome'
EXPORTS.mozilla.chrome += [
'RegistryMessageUtils.h',
]

1
config/autoconf.mk.in
View File

@ -1,2 +1,3 @@
include $(DEPTH)/config/emptyvars.mk
@ALLSUBSTS@
include $(topsrcdir)/config/baseconfig.mk

1
config/emptyvars.mk.in Normal file
View File

@ -0,0 +1 @@
@ALLEMPTYSUBSTS@

1
config/moz.build
View File

@ -6,6 +6,7 @@
CONFIGURE_SUBST_FILES += [
'autoconf.mk',
'emptyvars.mk',
'doxygen.cfg',
'makefiles/test/Makefile',
'tests/makefiles/autodeps/Makefile',

25
configure.in
View File

@ -5255,15 +5255,7 @@ dnl --enable-webrtc to override. Can disable for everything in
dnl the master list above.
if test -n "$MOZ_WEBRTC"; then
case "$target" in
*-android*|*-linuxandroid*)
if test -n "$MOZ_B2G"; then
MOZ_WEBRTC=1
else
dnl Make sure doesn't get matched by *-linux*
MOZ_WEBRTC=
fi
;;
*-linux*|*-mingw*|*-darwin*)
*-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*)
dnl Leave enabled
;;
*)
@ -5316,21 +5308,6 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_VP8_ENCODER=1
MOZ_VP8_ERROR_CONCEALMENT=1
if test "$MOZ_WIDGET_TOOLKIT" != "gonk"; then
dnl OpenSLES is only available in Android 2.3 and later; we'll change this
dnl hard dependency to a dynamic load with graceful runtime failure before
dnl we make --enable-webrtc on by default in Android (bug 815905)
dnl
if test "$OS_TARGET" = "Android"; then
LDFLAGS="$LDFLAGS -lOpenSLES"
fi
case "$target" in
*-android*|*-linuxandroid*)
LDFLAGS="$LDFLAGS -lOpenSLES"
;;
esac
fi
dnl enable once Signaling lands
MOZ_WEBRTC_SIGNALING=1
AC_DEFINE(MOZ_WEBRTC_SIGNALING)

47
content/base/public/Makefile.in
View File

@ -10,52 +10,5 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORTS = \
mozFlushType.h \
nsIContent.h \
nsIAttribute.h \
nsIContentIterator.h \
nsContentPolicyUtils.h \
nsContentUtils.h \
nsDocElementCreatedNotificationRunner.h \
nsIDocument.h \
nsIDocumentInlines.h \
nsDeprecatedOperationList.h \
nsIDocumentObserver.h \
nsIMutationObserver.h \
nsINameSpaceManager.h \
nsINode.h \
nsINodeInfo.h \
nsINodeList.h \
nsIScriptElement.h \
nsIStyleSheetLinkingElement.h \
nsIContentSerializer.h \
nsIXPathEvaluatorInternal.h \
nsCaseTreatment.h \
nsContentCID.h \
nsCopySupport.h \
nsContentCreatorFunctions.h \
nsDOMFile.h \
nsLineBreaker.h \
nsReferencedElement.h \
nsTreeSanitizer.h \
nsViewportInfo.h \
nsXMLNameSpaceMap.h \
nsHostObjectProtocolHandler.h \
$(NULL)
EXPORTS_NAMESPACES = mozilla/dom mozilla
EXPORTS_mozilla/dom = \
DirectionalityUtils.h \
Element.h \
FragmentOrElement.h \
FromParser.h \
$(NULL)
EXPORTS_mozilla = \
CORSMode.h \
$(NULL)
include $(topsrcdir)/config/rules.mk

45
content/base/public/moz.build
View File

@ -33,3 +33,48 @@ XPIDL_MODULE = 'content_base'
MODULE = 'content'
EXPORTS += [
'mozFlushType.h',
'nsCaseTreatment.h',
'nsContentCID.h',
'nsContentCreatorFunctions.h',
'nsContentPolicyUtils.h',
'nsContentUtils.h',
'nsCopySupport.h',
'nsDOMFile.h',
'nsDeprecatedOperationList.h',
'nsDocElementCreatedNotificationRunner.h',
'nsHostObjectProtocolHandler.h',
'nsIAttribute.h',
'nsIContent.h',
'nsIContentIterator.h',
'nsIContentSerializer.h',
'nsIDocument.h',
'nsIDocumentInlines.h',
'nsIDocumentObserver.h',
'nsIMutationObserver.h',
'nsINameSpaceManager.h',
'nsINode.h',
'nsINodeInfo.h',
'nsINodeList.h',
'nsIScriptElement.h',
'nsIStyleSheetLinkingElement.h',
'nsIXPathEvaluatorInternal.h',
'nsLineBreaker.h',
'nsReferencedElement.h',
'nsTreeSanitizer.h',
'nsViewportInfo.h',
'nsXMLNameSpaceMap.h',
]
EXPORTS.mozilla.dom += [
'DirectionalityUtils.h',
'Element.h',
'FragmentOrElement.h',
'FromParser.h',
]
EXPORTS.mozilla += [
'CORSMode.h',
]

2
content/base/public/nsContentUtils.h
View File

@ -510,7 +510,7 @@ public:
* @return boolean indicating whether a BOM was detected.
*/
static bool CheckForBOM(const unsigned char* aBuffer, uint32_t aLength,
nsACString& aCharset, bool *bigEndian = nullptr);
nsACString& aCharset);
static nsresult GuessCharset(const char *aData, uint32_t aDataLen,
nsACString &aCharset);

45
content/base/src/Makefile.in
View File

@ -13,50 +13,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = gkconbase_s
LIBXUL_LIBRARY = 1
EXPORTS = \
nsAtomListUtils.h \
nsAttrName.h \
nsContentList.h \
nsContentListDeclarations.h \
nsContentSink.h \
nsGkAtomList.h \
nsGkAtoms.h \
nsNodeInfoManager.h \
nsNodeUtils.h \
nsPropertyTable.h \
nsRange.h \
nsScriptLoader.h \
nsStubDocumentObserver.h \
nsStubMutationObserver.h \
nsTextFragment.h \
mozAutoDocUpdate.h \
nsFrameMessageManager.h \
nsAttrAndChildArray.h \
nsAttrValue.h \
nsAttrValueInlines.h \
nsCrossSiteListenerProxy.h \
nsDOMAttributeMap.h \
nsMappedAttributeElement.h \
nsStyledElement.h \
nsSandboxFlags.h \
$(NULL)
EXPORTS_NAMESPACES = mozilla/dom
EXPORTS_mozilla/dom = \
Attr.h \
Comment.h \
DocumentFragment.h \
DocumentType.h \
DOMImplementation.h \
EventSource.h \
Link.h \
NodeIterator.h \
Text.h \
TreeWalker.h \
$(NULL)
CPPSRCS = \
Comment.cpp \
DirectionalityUtils.cpp \
@ -148,7 +104,6 @@ CPPSRCS = \
$(NULL)
ifdef MOZ_WEBRTC
EXPORTS += nsDOMDataChannel.h
CPPSRCS += nsDOMDataChannel.cpp
LOCAL_INCLUDES += \
-I$(topsrcdir)/netwerk/sctp/datachannel \

44
content/base/src/moz.build
View File

@ -6,3 +6,47 @@
MODULE = 'content'
EXPORTS += [
'nsAtomListUtils.h',
'nsAttrName.h',
'nsContentList.h',
'nsContentListDeclarations.h',
'nsContentSink.h',
'nsGkAtomList.h',
'nsGkAtoms.h',
'nsNodeInfoManager.h',
'nsNodeUtils.h',
'nsPropertyTable.h',
'nsRange.h',
'nsScriptLoader.h',
'nsStubDocumentObserver.h',
'nsStubMutationObserver.h',
'nsTextFragment.h',
'mozAutoDocUpdate.h',
'nsFrameMessageManager.h',
'nsAttrAndChildArray.h',
'nsAttrValue.h',
'nsAttrValueInlines.h',
'nsCrossSiteListenerProxy.h',
'nsDOMAttributeMap.h',
'nsMappedAttributeElement.h',
'nsStyledElement.h',
'nsSandboxFlags.h',
]
if CONFIG['MOZ_WEBRTC']:
EXPORTS += ['nsDOMDataChannel.h']
EXPORTS.mozilla.dom += [
'Attr.h',
'Comment.h',
'DocumentFragment.h',
'DocumentType.h',
'DOMImplementation.h',
'EventSource.h',
'Link.h',
'NodeIterator.h',
'Text.h',
'TreeWalker.h',
]

21
content/base/src/nsContentUtils.cpp
View File

@ -3713,7 +3713,7 @@ nsContentUtils::ConvertStringFromCharset(const nsACString& aCharset,
/* static */
bool
nsContentUtils::CheckForBOM(const unsigned char* aBuffer, uint32_t aLength,
nsACString& aCharset, bool *bigEndian)
nsACString& aCharset)
{
bool found = true;
aCharset.Truncate();
@ -3725,15 +3725,11 @@ nsContentUtils::CheckForBOM(const unsigned char* aBuffer, uint32_t aLength,
}
else if (aLength >= 2 &&
aBuffer[0] == 0xFE && aBuffer[1] == 0xFF) {
aCharset = "UTF-16";
if (bigEndian)
*bigEndian = true;
aCharset = "UTF-16BE";
}
else if (aLength >= 2 &&
aBuffer[0] == 0xFF && aBuffer[1] == 0xFE) {
aCharset = "UTF-16";
if (bigEndian)
*bigEndian = false;
aCharset = "UTF-16LE";
} else {
found = false;
}
@ -3791,16 +3787,7 @@ nsContentUtils::GuessCharset(const char *aData, uint32_t aDataLen,
(aDataLen >= sizeof(sniffBuf) ? sizeof(sniffBuf) : aDataLen);
memcpy(sniffBuf, aData, numRead);
bool bigEndian;
if (CheckForBOM(sniffBuf, numRead, aCharset, &bigEndian) &&
aCharset.EqualsLiteral("UTF-16")) {
if (bigEndian) {
aCharset.AppendLiteral("BE");
}
else {
aCharset.AppendLiteral("LE");
}
}
CheckForBOM(sniffBuf, numRead, aCharset);
}
if (aCharset.IsEmpty()) {

2
content/base/src/nsNodeUtils.cpp
View File

@ -400,7 +400,7 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, bool aClone, bool aDeep,
AutoJSContext cx;
nsresult rv;
JSObject *wrapper;
JS::RootedObject wrapper(cx);
bool isDOMBinding;
if (aReparentScope && (wrapper = aNode->GetWrapper()) &&
!(isDOMBinding = IsDOMObject(wrapper))) {

4
content/base/src/nsScriptLoader.cpp
View File

@ -981,14 +981,14 @@ DetectByteOrderMark(const unsigned char* aBytes, int32_t aLen, nsCString& oChars
if (0xFF == aBytes[1]) {
// FE FF
// UTF-16, big-endian
oCharset.Assign("UTF-16");
oCharset.Assign("UTF-16BE");
}
break;
case 0xFF:
if (0xFE == aBytes[1]) {
// FF FE
// UTF-16, little-endian
oCharset.Assign("UTF-16");
oCharset.Assign("UTF-16LE");
}
break;
}

16
content/canvas/public/Makefile.in
View File

@ -10,20 +10,4 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORTS_NAMESPACES = mozilla/ipc
EXPORTS = \
nsICanvasRenderingContextInternal.h \
nsICanvasElementExternal.h \
$(NULL)
EXPORTS_mozilla/ipc = \
DocumentRendererChild.h \
DocumentRendererParent.h \
DocumentRendererShmemChild.h \
DocumentRendererShmemParent.h \
DocumentRendererNativeIDChild.h \
DocumentRendererNativeIDParent.h \
$(NULL)
include $(topsrcdir)/config/rules.mk

14
content/canvas/public/moz.build
View File

@ -12,3 +12,17 @@ XPIDL_MODULE = 'content_canvas'
MODULE = 'content'
EXPORTS += [
'nsICanvasElementExternal.h',
'nsICanvasRenderingContextInternal.h',
]
EXPORTS.mozilla.ipc += [
'DocumentRendererChild.h',
'DocumentRendererNativeIDChild.h',
'DocumentRendererNativeIDParent.h',
'DocumentRendererParent.h',
'DocumentRendererShmemChild.h',
'DocumentRendererShmemParent.h',
]

8
content/canvas/src/Makefile.in
View File

@ -16,14 +16,6 @@ ifndef _MSC_VER
FAIL_ON_WARNINGS = 1
endif # !_MSC_VER
EXPORTS_NAMESPACES = mozilla/dom
EXPORTS_mozilla/dom = \
CanvasUtils.h \
CanvasRenderingContext2D.h \
ImageData.h \
$(NULL)
CPPSRCS = \
CanvasImageCache.cpp \
CanvasRenderingContext2D.cpp \

6
content/canvas/src/moz.build
View File

@ -6,3 +6,9 @@
MODULE = 'content'
EXPORTS.mozilla.dom += [
'CanvasRenderingContext2D.h',
'CanvasUtils.h',
'ImageData.h',
]

17
content/events/public/Makefile.in
View File

@ -10,22 +10,5 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORTS = \
nsMutationEvent.h \
nsIPrivateTextEvent.h \
nsIPrivateTextRange.h \
nsAsyncDOMEvent.h \
nsEventDispatcher.h \
nsEventStates.h \
nsEventNameList.h \
nsVKList.h \
$(NULL)
EXPORTS_NAMESPACES = mozilla/dom
EXPORTS_mozilla/dom = \
EventTarget.h \
$(NULL)
include $(topsrcdir)/config/rules.mk

15
content/events/public/moz.build
View File

@ -12,3 +12,18 @@ XPIDL_MODULE = 'content_events'
MODULE = 'content'
EXPORTS += [
'nsAsyncDOMEvent.h',
'nsEventDispatcher.h',
'nsEventNameList.h',
'nsEventStates.h',
'nsIPrivateTextEvent.h',
'nsIPrivateTextRange.h',
'nsMutationEvent.h',
'nsVKList.h',
]
EXPORTS.mozilla.dom += [
'EventTarget.h',
]

16
content/events/src/Makefile.in
View File

@ -14,22 +14,6 @@ LIBRARY_NAME = gkconevents_s
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1
EXPORTS_NAMESPACES = mozilla/dom
EXPORTS_mozilla/dom = \
Touch.h \
$(NULL)
EXPORTS = \
nsEventStateManager.h \
nsEventListenerManager.h \
nsDOMEventTargetHelper.h \
nsDOMEvent.h \
nsDOMGamepad.h \
nsDOMTouchEvent.h \
nsDOMUIEvent.h \
$(NULL)
CPPSRCS = \
nsEventListenerManager.cpp \
nsEventStateManager.cpp \

14
content/events/src/moz.build
View File

@ -6,3 +6,17 @@
MODULE = 'content'
EXPORTS += [
'nsDOMEvent.h',
'nsDOMEventTargetHelper.h',
'nsDOMGamepad.h',
'nsDOMTouchEvent.h',
'nsDOMUIEvent.h',
'nsEventListenerManager.h',
'nsEventStateManager.h',
]
EXPORTS.mozilla.dom += [
'Touch.h',
]

31
content/events/src/nsDOMDeviceMotionEvent.cpp
View File

@ -5,6 +5,9 @@
#include "nsDOMClassInfoID.h"
#include "nsDOMDeviceMotionEvent.h"
using namespace mozilla;
using namespace mozilla::dom;
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsDOMDeviceMotionEvent, nsDOMEvent)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mAcceleration)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mAccelerationIncludingGravity)
@ -46,12 +49,31 @@ nsDOMDeviceMotionEvent::InitDeviceMotionEvent(const nsAString & aEventTypeArg,
return NS_OK;
}
void
nsDOMDeviceMotionEvent::InitDeviceMotionEvent(const nsAString& aType,
bool aCanBubble,
bool aCancelable,
nsIDOMDeviceAcceleration* aAcceleration,
nsIDOMDeviceAcceleration* aAccelerationIncludingGravity,
nsIDOMDeviceRotationRate* aRotationRate,
double aInterval,
ErrorResult& aRv)
{
aRv = InitDeviceMotionEvent(aType,
aCanBubble,
aCancelable,
aAcceleration,
aAccelerationIncludingGravity,
aRotationRate,
aInterval);
}
NS_IMETHODIMP
nsDOMDeviceMotionEvent::GetAcceleration(nsIDOMDeviceAcceleration **aAcceleration)
{
NS_ENSURE_ARG_POINTER(aAcceleration);
NS_IF_ADDREF(*aAcceleration = mAcceleration);
NS_IF_ADDREF(*aAcceleration = GetAcceleration());
return NS_OK;
}
@ -60,7 +82,8 @@ nsDOMDeviceMotionEvent::GetAccelerationIncludingGravity(nsIDOMDeviceAcceleration
{
NS_ENSURE_ARG_POINTER(aAccelerationIncludingGravity);
NS_IF_ADDREF(*aAccelerationIncludingGravity = mAccelerationIncludingGravity);
NS_IF_ADDREF(*aAccelerationIncludingGravity =
GetAccelerationIncludingGravity());
return NS_OK;
}
@ -69,7 +92,7 @@ nsDOMDeviceMotionEvent::GetRotationRate(nsIDOMDeviceRotationRate **aRotationRate
{
NS_ENSURE_ARG_POINTER(aRotationRate);
NS_IF_ADDREF(*aRotationRate = mRotationRate);
NS_IF_ADDREF(*aRotationRate = GetRotationRate());
return NS_OK;
}
@ -78,7 +101,7 @@ nsDOMDeviceMotionEvent::GetInterval(double *aInterval)
{
NS_ENSURE_ARG_POINTER(aInterval);
*aInterval = mInterval;
*aInterval = Interval();
return NS_OK;
}

39
content/events/src/nsDOMDeviceMotionEvent.h
View File

@ -8,6 +8,7 @@
#include "nsIDOMDeviceMotionEvent.h"
#include "nsDOMEvent.h"
#include "mozilla/Attributes.h"
#include "mozilla/dom/DeviceMotionEventBinding.h"
class nsDOMDeviceRotationRate MOZ_FINAL : public nsIDOMDeviceRotationRate
{
@ -47,7 +48,9 @@ public:
nsDOMDeviceMotionEvent(mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext, nsEvent* aEvent)
: nsDOMEvent(aOwner, aPresContext, aEvent)
{}
{
SetIsDOMBinding();
}
NS_DECL_ISUPPORTS_INHERITED
@ -59,6 +62,40 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMDeviceMotionEvent, nsDOMEvent)
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope)
{
return mozilla::dom::DeviceMotionEventBinding::Wrap(aCx, aScope, this);
}
nsIDOMDeviceAcceleration* GetAcceleration()
{
return mAcceleration;
}
nsIDOMDeviceAcceleration* GetAccelerationIncludingGravity()
{
return mAccelerationIncludingGravity;
}
nsIDOMDeviceRotationRate* GetRotationRate()
{
return mRotationRate;
}
double Interval() const
{
return mInterval;
}
void InitDeviceMotionEvent(const nsAString& aType,
bool aCanBubble,
bool aCancelable,
nsIDOMDeviceAcceleration* aAcceleration,
nsIDOMDeviceAcceleration* aAccelerationIncludingGravity,
nsIDOMDeviceRotationRate* aRotationRate,
double aInterval,
mozilla::ErrorResult& aRv);
nsCOMPtr<nsIDOMDeviceAcceleration> mAcceleration;
nsCOMPtr<nsIDOMDeviceAcceleration> mAccelerationIncludingGravity;
nsCOMPtr<nsIDOMDeviceRotationRate> mRotationRate;

45
content/events/test/test_bug662678.html
View File

@ -24,16 +24,39 @@ var checkMotion = function(event) {
window.removeEventListener("devicemotion", checkMotion, true);
is(event.acceleration.x, 1.5);
is(event.acceleration.y, 1.5);
is(event.acceleration.z, 1.5);
is(event.acceleration.y, 2.5);
is(event.acceleration.z, 3.5);
is(event.accelerationIncludingGravity.x, 1.5);
is(event.accelerationIncludingGravity.y, 1.5);
is(event.accelerationIncludingGravity.z, 1.5);
is(event.accelerationIncludingGravity.x, 4.5);
is(event.accelerationIncludingGravity.y, 5.5);
is(event.accelerationIncludingGravity.z, 6.5);
is(event.rotationRate.alpha, 7.5);
is(event.rotationRate.beta, 8.5);
is(event.rotationRate.gamma, 9.5);
var e = document.createEvent("DeviceMotionEvent");
e.initDeviceMotionEvent('devicemotion', true, true,
null, null, null, 0);
is(e.acceleration, null);
is(e.accelerationIncludingGravity, null);
is(e.rotationRate, null);
e.initDeviceMotionEvent('devicemotion', true, true,
{}, {}, {}, 0);
ok(isNaN(e.acceleration.x));
ok(isNaN(e.acceleration.y));
ok(isNaN(e.acceleration.z));
ok(isNaN(e.accelerationIncludingGravity.x));
ok(isNaN(e.accelerationIncludingGravity.y));
ok(isNaN(e.accelerationIncludingGravity.z));
ok(isNaN(e.rotationRate.alpha));
ok(isNaN(e.rotationRate.beta));
ok(isNaN(e.rotationRate.gamma));
is(event.rotationRate.alpha, 1.5);
is(event.rotationRate.beta, 1.5);
is(event.rotationRate.gamma, 1.5);
SimpleTest.finish();
};
@ -44,9 +67,9 @@ ok(!!event, "Should have seen DeviceMotionEvent!");
event = document.createEvent("DeviceMotionEvent");
event.initDeviceMotionEvent('devicemotion', true, true,
{x:1.5,y:1.5,z:1.5},
{x:1.5,y:1.5,z:1.5},
{alpha:1.5,beta:1.5,gamma:1.5},
{x:1.5,y:2.5,z:3.5},
{x:4.5,y:5.5,z:6.5},
{alpha:7.5,beta:8.5,gamma:9.5},
0);
window.dispatchEvent(event);

22
content/html/content/public/Makefile.in
View File

@ -10,26 +10,4 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORTS = \
nsIConstraintValidation.h \
nsIFormControl.h \
nsIForm.h \
nsIFormProcessor.h \
nsILink.h \
nsIRadioVisitor.h \
nsIRadioGroupContainer.h \
nsITextControlElement.h \
nsFormSubmission.h \
nsIHTMLCollection.h \
$(NULL)
EXPORTS_NAMESPACES = mozilla/dom
EXPORTS_mozilla/dom = \
HTMLCanvasElement.h \
HTMLMediaElement.h \
HTMLAudioElement.h \
HTMLVideoElement.h \
$(NULL)
include $(topsrcdir)/config/rules.mk

20
content/html/content/public/moz.build
View File

@ -15,3 +15,23 @@ XPIDL_MODULE = 'content_html'
MODULE = 'content'
EXPORTS += [
'nsFormSubmission.h',
'nsIConstraintValidation.h',
'nsIForm.h',
'nsIFormControl.h',
'nsIFormProcessor.h',
'nsIHTMLCollection.h',
'nsILink.h',
'nsIRadioGroupContainer.h',
'nsIRadioVisitor.h',
'nsITextControlElement.h',
]
EXPORTS.mozilla.dom += [
'HTMLAudioElement.h',
'HTMLCanvasElement.h',
'HTMLMediaElement.h',
'HTMLVideoElement.h',
]

6
content/html/content/src/HTMLInputElement.cpp
View File

@ -7,6 +7,7 @@
#include "mozilla/dom/HTMLInputElement.h"
#include "mozilla/dom/HTMLInputElementBinding.h"
#include "nsAsyncDOMEvent.h"
#include "nsAttrValueInlines.h"
#include "nsIDOMHTMLInputElement.h"
@ -2715,6 +2716,7 @@ HTMLInputElement::CancelRangeThumbDrag(bool aIsForUserEvent)
{
MOZ_ASSERT(mIsDraggingRange);
mIsDraggingRange = false;
if (nsIPresShell::GetCapturingContent() == this) {
nsIPresShell::SetCapturingContent(nullptr, 0); // cancel capture
}
@ -2731,8 +2733,10 @@ HTMLInputElement::CancelRangeThumbDrag(bool aIsForUserEvent)
if (frame) {
frame->UpdateForValueChange();
}
nsRefPtr<nsAsyncDOMEvent> event =
new nsAsyncDOMEvent(this, NS_LITERAL_STRING("input"), true, false);
event->RunDOMEventWhenSafe();
}
mIsDraggingRange = false;
}
void

70
content/html/content/src/Makefile.in
View File

@ -13,76 +13,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = gkconhtmlcon_s
LIBXUL_LIBRARY = 1
EXPORTS = \
HTMLPropertiesCollection.h \
nsGenericHTMLElement.h \
nsClientRect.h \
nsHTMLDNSPrefetch.h \
$(NULL)
EXPORTS_NAMESPACES = mozilla/dom
EXPORTS_mozilla/dom = \
HTMLAnchorElement.h \
HTMLAreaElement.h \
HTMLBodyElement.h \
HTMLBRElement.h \
HTMLButtonElement.h \
HTMLDataElement.h \
HTMLDataListElement.h \
HTMLDivElement.h \
HTMLFieldSetElement.h \
HTMLFontElement.h \
HTMLFrameElement.h \
HTMLFrameSetElement.h \
HTMLHeadingElement.h \
HTMLHRElement.h \
HTMLIFrameElement.h \
HTMLImageElement.h \
HTMLInputElement.h \
HTMLLabelElement.h \
HTMLLegendElement.h \
HTMLLIElement.h \
HTMLLinkElement.h \
HTMLMapElement.h \
HTMLMenuElement.h \
HTMLMenuItemElement.h \
HTMLMetaElement.h \
HTMLMeterElement.h \
HTMLModElement.h \
HTMLObjectElement.h \
HTMLOptionElement.h \
HTMLOptionsCollection.h \
HTMLOptGroupElement.h \
HTMLOutputElement.h \
HTMLParagraphElement.h \
HTMLPreElement.h \
HTMLProgressElement.h \
HTMLScriptElement.h \
HTMLSelectElement.h \
HTMLSharedElement.h \
HTMLSharedListElement.h \
HTMLSharedObjectElement.h \
HTMLSourceElement.h \
HTMLSpanElement.h \
HTMLStyleElement.h \
HTMLTableCaptionElement.h \
HTMLTableCellElement.h \
HTMLTableColElement.h \
HTMLTableElement.h \
HTMLTableRowElement.h \
HTMLTableSectionElement.h \
HTMLTemplateElement.h \
HTMLTextAreaElement.h \
HTMLTimeElement.h \
HTMLTitleElement.h \
HTMLUnknownElement.h \
MediaError.h \
TimeRanges.h \
UndoManager.h \
ValidityState.h \
$(NULL)
CPPSRCS = \
HTMLPropertiesCollection.cpp \
nsClientRect.cpp \

68
content/html/content/src/moz.build
View File

@ -6,3 +6,71 @@
MODULE = 'content'
EXPORTS += [
'HTMLPropertiesCollection.h',
'nsGenericHTMLElement.h',
'nsClientRect.h',
'nsHTMLDNSPrefetch.h',
]
EXPORTS.mozilla.dom += [
'HTMLAnchorElement.h',
'HTMLAreaElement.h',
'HTMLBodyElement.h',
'HTMLBRElement.h',
'HTMLButtonElement.h',
'HTMLDataElement.h',
'HTMLDataListElement.h',
'HTMLDivElement.h',
'HTMLFieldSetElement.h',
'HTMLFontElement.h',
'HTMLFrameElement.h',
'HTMLFrameSetElement.h',
'HTMLHeadingElement.h',
'HTMLHRElement.h',
'HTMLIFrameElement.h',
'HTMLImageElement.h',
'HTMLInputElement.h',
'HTMLLabelElement.h',
'HTMLLegendElement.h',
'HTMLLIElement.h',
'HTMLLinkElement.h',
'HTMLMapElement.h',
'HTMLMenuElement.h',
'HTMLMenuItemElement.h',
'HTMLMetaElement.h',
'HTMLMeterElement.h',
'HTMLModElement.h',
'HTMLObjectElement.h',
'HTMLOptionElement.h',
'HTMLOptionsCollection.h',
'HTMLOptGroupElement.h',
'HTMLOutputElement.h',
'HTMLParagraphElement.h',
'HTMLPreElement.h',
'HTMLProgressElement.h',
'HTMLScriptElement.h',
'HTMLSelectElement.h',
'HTMLSharedElement.h',
'HTMLSharedListElement.h',
'HTMLSharedObjectElement.h',
'HTMLSourceElement.h',
'HTMLSpanElement.h',
'HTMLStyleElement.h',
'HTMLTableCaptionElement.h',
'HTMLTableCellElement.h',
'HTMLTableColElement.h',
'HTMLTableElement.h',
'HTMLTableRowElement.h',
'HTMLTableSectionElement.h',
'HTMLTemplateElement.h',
'HTMLTextAreaElement.h',
'HTMLTimeElement.h',
'HTMLTitleElement.h',
'HTMLUnknownElement.h',
'MediaError.h',
'TimeRanges.h',
'UndoManager.h',
'ValidityState.h',
]

10
content/html/content/src/nsHTMLFormElement.cpp
View File

@ -2199,16 +2199,6 @@ nsFormControlList::FlushPendingNotifications()
}
}
static PLDHashOperator
ControlTraverser(const nsAString& key, nsISupports* control, void* userArg)
{
nsCycleCollectionTraversalCallback *cb =
static_cast<nsCycleCollectionTraversalCallback*>(userArg);
cb->NoteXPCOMChild(control);
return PL_DHASH_NEXT;
}
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsFormControlList)
tmp->Clear();
NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER

4
content/html/document/src/Makefile.in
View File

@ -23,10 +23,6 @@ CPPSRCS = \
VideoDocument.cpp \
$(NULL)
EXPORTS = \
nsIHTMLDocument.h \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1

4
content/html/document/src/moz.build
View File

@ -6,3 +6,7 @@
MODULE = 'content'
EXPORTS += [
'nsIHTMLDocument.h',
]

32
content/media/Makefile.in
View File

@ -15,38 +15,6 @@ ifndef _MSC_VER
FAIL_ON_WARNINGS := 1
endif # !_MSC_VER
EXPORTS = \
AbstractMediaDecoder.h \
AudioChannelFormat.h \
AudioEventTimeline.h \
AudioNodeEngine.h \
AudioNodeStream.h \
AudioSampleFormat.h \
AudioSegment.h \
AudioStream.h \
BufferMediaResource.h \
DecoderTraits.h \
DOMMediaStream.h \
FileBlockCache.h \
MediaDecoderOwner.h \
MediaResource.h \
MediaSegment.h \
MediaStreamGraph.h \
AudioAvailableEventManager.h \
MediaDecoder.h \
MediaDecoderStateMachine.h \
MediaDecoderReader.h \
MediaCache.h \
SharedBuffer.h \
StreamBuffer.h \
TimeVarying.h \
VideoFrameContainer.h \
VideoUtils.h \
VideoSegment.h \
VorbisUtils.h \
MediaMetadataManager.h \
$(NULL)
CPPSRCS = \
AudioChannelFormat.cpp \
AudioNodeEngine.cpp \

7
content/media/dash/Makefile.in
View File

@ -18,13 +18,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME := gkcondash_s
LIBXUL_LIBRARY := 1
EXPORTS := \
DASHDecoder.h \
DASHRepDecoder.h \
DASHReader.h \
DASHRepReader.h \
$(NULL)
CPPSRCS := \
DASHDecoder.cpp \
DASHRepDecoder.cpp \

7
content/media/dash/moz.build
View File

@ -6,3 +6,10 @@
MODULE = 'content'
EXPORTS += [
'DASHDecoder.h',
'DASHReader.h',
'DASHRepDecoder.h',
'DASHRepReader.h',
]

6
content/media/gstreamer/Makefile.in
View File

@ -14,12 +14,6 @@ LIBRARY_NAME = gkcongstreamer_s
LIBXUL_LIBRARY = 1
EXPORTS += \
GStreamerDecoder.h \
GStreamerReader.h \
GStreamerFormatHelper.h \
$(NULL)
CPPSRCS = \
GStreamerReader.cpp \
GStreamerDecoder.cpp \

6
content/media/gstreamer/moz.build
View File

@ -6,3 +6,9 @@
MODULE = 'content'
EXPORTS += [
'GStreamerDecoder.h',
'GStreamerFormatHelper.h',
'GStreamerReader.h',
]

32
content/media/moz.build
View File

@ -42,3 +42,35 @@ TEST_DIRS += ['test']
MODULE = 'content'
EXPORTS += [
'AbstractMediaDecoder.h',
'AudioAvailableEventManager.h',
'AudioChannelFormat.h',
'AudioEventTimeline.h',
'AudioNodeEngine.h',
'AudioNodeStream.h',
'AudioSampleFormat.h',
'AudioSegment.h',
'AudioStream.h',
'BufferMediaResource.h',
'DOMMediaStream.h',
'DecoderTraits.h',
'FileBlockCache.h',
'MediaCache.h',
'MediaDecoder.h',
'MediaDecoderOwner.h',
'MediaDecoderReader.h',
'MediaDecoderStateMachine.h',
'MediaMetadataManager.h',
'MediaResource.h',
'MediaSegment.h',
'MediaStreamGraph.h',
'SharedBuffer.h',
'StreamBuffer.h',
'TimeVarying.h',
'VideoFrameContainer.h',
'VideoSegment.h',
'VideoUtils.h',
'VorbisUtils.h',
]

6
content/media/ogg/Makefile.in
View File

@ -14,12 +14,6 @@ LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS := 1
EXPORTS += \
OggDecoder.h \
OggCodecState.h \
OggReader.h \
$(NULL)
CPPSRCS = \
OggDecoder.cpp \
OggCodecState.cpp \

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