mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge m-i to m-c, a=merge

This commit is contained in:
Phil Ringnalda 2015-03-28 11:44:16 -07:00
Родитель 822d11adb7 6613491227
Коммит e44926f4c1
627 изменённых файлов: 4451 добавлений и 2380 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
accessible/base/NotificationController.h
Просмотреть файл

@ -86,7 +86,7 @@ private:
* Used to process notifications from core for the document accessible.
*/
class NotificationController final : public EventQueue,
public nsARefreshObserver
public nsARefreshObserver
{
public:
NotificationController(DocAccessible* aDocument, nsIPresShell* aPresShell);

8
accessible/base/nsAccessibilityService.h
Просмотреть файл

@ -64,10 +64,10 @@ struct MarkupMapInfo {
} // namespace mozilla
class nsAccessibilityService final : public mozilla::a11y::DocManager,
public mozilla::a11y::FocusManager,
public mozilla::a11y::SelectionManager,
public nsIAccessibilityService,
public nsIObserver
public mozilla::a11y::FocusManager,
public mozilla::a11y::SelectionManager,
public nsIAccessibilityService,
public nsIObserver
{
public:
typedef mozilla::a11y::Accessible Accessible;

10
accessible/generic/DocAccessible.cpp
Просмотреть файл

@ -1289,10 +1289,12 @@ DocAccessible::ContentInserted(nsIContent* aContainerNode,
// null (document element is inserted or removed).
Accessible* container = aContainerNode ?
GetAccessibleOrContainer(aContainerNode) : this;
mNotificationController->ScheduleContentInsertion(container,
aStartChildNode,
aEndChildNode);
if (container) {
// Ignore notification if the container node is no longer in the DOM tree.
mNotificationController->ScheduleContentInsertion(container,
aStartChildNode,
aEndChildNode);
}
}
}

4
accessible/windows/msaa/IUnknownImpl.h
Просмотреть файл

@ -51,13 +51,13 @@ private:
#define DECL_IUNKNOWN \
public: \
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, void**); \
virtual ULONG STDMETHODCALLTYPE AddRef() final \
virtual ULONG STDMETHODCALLTYPE AddRef() final \
{ \
MOZ_ASSERT(int32_t(mRefCnt) >= 0, "illegal refcnt"); \
++mRefCnt; \
return mRefCnt; \
} \
virtual ULONG STDMETHODCALLTYPE Release() final \
virtual ULONG STDMETHODCALLTYPE Release() final \
{ \
MOZ_ASSERT(int32_t(mRefCnt) > 0, "dup release"); \
--mRefCnt; \

2
accessible/windows/uia/uiaRawElmProvider.h
Просмотреть файл

@ -21,7 +21,7 @@ class AccessibleWrap;
* IRawElementProviderSimple implementation (maintains IAccessibleEx approach).
*/
class uiaRawElmProvider final : public IAccessibleEx,
public IRawElementProviderSimple
public IRawElementProviderSimple
{
public:
uiaRawElmProvider(AccessibleWrap* aAcc) : mAcc(aAcc) { }

2
browser/components/feeds/nsFeedSniffer.h
Просмотреть файл

@ -10,7 +10,7 @@
#include "mozilla/Attributes.h"
class nsFeedSniffer final : public nsIContentSniffer,
nsIStreamListener
nsIStreamListener
{
public:
NS_DECL_ISUPPORTS

2
browser/devtools/scratchpad/test/browser_scratchpad_wrong_window_focus.js
Просмотреть файл

@ -51,7 +51,7 @@ function testFocus(sw, hud) {
var loc = node.querySelector(".message-location");
ok(loc, "location element exists");
is(loc.textContent.trim(), sw.Scratchpad.uniqueName + ":1:0",
is(loc.textContent.trim(), sw.Scratchpad.uniqueName + ":1:1",
"location value is correct");
sw.addEventListener("focus", function onFocus() {

8
browser/devtools/webconsole/test/browser_webconsole_bug_585956_console_trace.js
Просмотреть файл

@ -35,10 +35,10 @@ function test() {
// The expected stack trace object.
let stacktrace = [
{ columnNumber: 2, filename: TEST_URI, functionName: "window.foobar585956c", language: 2, lineNumber: 9 },
{ columnNumber: 9, filename: TEST_URI, functionName: "foobar585956b", language: 2, lineNumber: 14 },
{ columnNumber: 9, filename: TEST_URI, functionName: "foobar585956a", language: 2, lineNumber: 18 },
{ columnNumber: 0, filename: TEST_URI, functionName: "", language: 2, lineNumber: 21 }
{ columnNumber: 3, filename: TEST_URI, functionName: "window.foobar585956c", language: 2, lineNumber: 9 },
{ columnNumber: 10, filename: TEST_URI, functionName: "foobar585956b", language: 2, lineNumber: 14 },
{ columnNumber: 10, filename: TEST_URI, functionName: "foobar585956a", language: 2, lineNumber: 18 },
{ columnNumber: 1, filename: TEST_URI, functionName: "", language: 2, lineNumber: 21 }
];
ok(obj._stacktrace, "found stacktrace object");

2
browser/devtools/webconsole/test/browser_webconsole_column_numbers.js
Просмотреть файл

@ -30,7 +30,7 @@ function consoleOpened(aHud) {
function testLocationColumn() {
let messages = hud.outputNode.children;
let expected = ['10:6', '10:38', '11:8', '12:10', '13:8', '14:6'];
let expected = ['10:7', '10:39', '11:9', '12:11', '13:9', '14:7'];
for(let i = 0, len = messages.length; i < len; i++) {
let msg = messages[i].textContent;

4
caps/nsNullPrincipalURI.h
Просмотреть файл

@ -25,8 +25,8 @@
{0xb9, 0x1b, 0x6b, 0x54, 0x10, 0x22, 0x36, 0xe6} }
class nsNullPrincipalURI final : public nsIURI
, public nsISizeOf
, public nsIIPCSerializableURI
, public nsISizeOf
, public nsIIPCSerializableURI
{
public:
NS_DECL_THREADSAFE_ISUPPORTS

4
caps/nsScriptSecurityManager.h
Просмотреть файл

@ -33,8 +33,8 @@ class ClassInfoData;
{ 0xba, 0x18, 0x00, 0x60, 0xb0, 0xf1, 0x99, 0xa2 }}
class nsScriptSecurityManager final : public nsIScriptSecurityManager,
public nsIChannelEventSink,
public nsIObserver
public nsIChannelEventSink,
public nsIObserver
{
public:
static void Shutdown();

2
chrome/nsChromeProtocolHandler.h
Просмотреть файл

@ -19,7 +19,7 @@
}
class nsChromeProtocolHandler final : public nsIProtocolHandler,
public nsSupportsWeakReference
public nsSupportsWeakReference
{
public:
NS_DECL_THREADSAFE_ISUPPORTS

7
configure.in
Просмотреть файл

@ -5704,12 +5704,18 @@ MOZ_ARG_DISABLE_BOOL(permissions,
MOZ_PERMISSIONS=1
)
AC_SUBST(MOZ_PERMISSIONS)
if test -n "$MOZ_PERMISSIONS"; then
AC_DEFINE(MOZ_PERMISSIONS)
fi
dnl ========================================================
dnl Child permissions, currently only used for b2g
dnl ========================================================
if test -n "$MOZ_B2G"; then
if test -n "$MOZ_PERMISSIONS"; then
MOZ_CHILD_PERMISSIONS=1
AC_DEFINE(MOZ_CHILD_PERMISSIONS)
else
AC_MSG_ERROR([You need to enable MOZ_PERMISSIONS for MOZ_CHILD_PERMISSIONS])
fi
@ -8429,7 +8435,6 @@ AC_SUBST(BIN_FLAGS)
AC_SUBST(MOZ_WIDGET_TOOLKIT)
AC_SUBST(MOZ_UPDATE_XTERM)
AC_SUBST(MOZ_AUTH_EXTENSION)
AC_SUBST(MOZ_PERMISSIONS)
AC_SUBST(MOZ_PREF_EXTENSIONS)
AC_SUBST(MOZ_DEBUG)
AC_SUBST(MOZ_DEBUG_SYMBOLS)

4
docshell/shistory/src/nsSHEntry.h
Просмотреть файл

@ -23,8 +23,8 @@ class nsIInputStream;
class nsIURI;
class nsSHEntry final : public nsISHEntry,
public nsISHContainer,
public nsISHEntryInternal
public nsISHContainer,
public nsISHEntryInternal
{
public:
nsSHEntry();

2
docshell/shistory/src/nsSHEntryShared.h
Просмотреть файл

@ -31,7 +31,7 @@ class nsISupportsArray;
//
// nsSHEntryShared is the vehicle for this sharing.
class nsSHEntryShared final : public nsIBFCacheEntry,
public nsIMutationObserver
public nsIMutationObserver
{
public:
static void EnsureHistoryTracker();

6
docshell/shistory/src/nsSHistory.h
Просмотреть файл

@ -28,9 +28,9 @@ class nsISHEntry;
class nsISHTransaction;
class nsSHistory final : public PRCList,
public nsISHistory,
public nsISHistoryInternal,
public nsIWebNavigation
public nsISHistory,
public nsISHistoryInternal,
public nsIWebNavigation
{
public:
nsSHistory();

2
dom/archivereader/ArchiveReader.h
Просмотреть файл

@ -33,7 +33,7 @@ class ArchiveRequest;
* This is the ArchiveReader object
*/
class ArchiveReader final : public nsISupports,
public nsWrapperCache
public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS

2
dom/archivereader/ArchiveZipFile.cpp
Просмотреть файл

@ -21,7 +21,7 @@ USING_ARCHIVEREADER_NAMESPACE
* Input stream object for zip files
*/
class ArchiveInputStream final : public nsIInputStream,
public nsISeekableStream
public nsISeekableStream
{
public:
ArchiveInputStream(uint64_t aParentSize,

6
dom/asmjscache/AsmJSCache.cpp
Просмотреть файл

@ -1108,7 +1108,7 @@ FindHashMatch(const Metadata& aMetadata, const ReadParams& aReadParams,
// A runnable that executes for a cache access originating in the main process.
class SingleProcessRunnable final : public File,
private MainProcessRunnable
private MainProcessRunnable
{
public:
// In the single-process case, the calling JS compilation thread holds the
@ -1186,7 +1186,7 @@ private:
// in the content process. This runnable gets registered as an IPDL subprotocol
// actor so that it can communicate with the corresponding ChildProcessRunnable.
class ParentProcessRunnable final : public PAsmJSCacheEntryParent,
public MainProcessRunnable
public MainProcessRunnable
{
public:
// The given principal comes from an IPC::Principal which will be dec-refed
@ -1357,7 +1357,7 @@ DeallocEntryParent(PAsmJSCacheEntryParent* aActor)
namespace {
class ChildProcessRunnable final : public File,
public PAsmJSCacheEntryChild
public PAsmJSCacheEntryChild
{
public:
NS_DECL_NSIRUNNABLE

2
dom/base/Attr.h
Просмотреть файл

@ -29,7 +29,7 @@ namespace dom {
// Attribute helper class used to wrap up an attribute with a dom
// object that implements nsIDOMAttr and nsIDOMNode
class Attr final : public nsIAttribute,
public nsIDOMAttr
public nsIDOMAttr
{
virtual ~Attr() {}

2
dom/base/Comment.h
Просмотреть файл

@ -14,7 +14,7 @@ namespace mozilla {
namespace dom {
class Comment final : public nsGenericDOMDataNode,
public nsIDOMComment
public nsIDOMComment
{
private:
void Init()

2
dom/base/Console.h
Просмотреть файл

@ -26,7 +26,7 @@ class ConsoleCallData;
struct ConsoleStackEntry;
class Console final : public nsIObserver
, public nsWrapperCache
, public nsWrapperCache
{
~Console();

2
dom/base/DOMImplementation.h
Просмотреть файл

@ -25,7 +25,7 @@ namespace dom {
class DocumentType;
class DOMImplementation final : public nsIDOMDOMImplementation
, public nsWrapperCache
, public nsWrapperCache
{
~DOMImplementation()
{

4
dom/base/DOMParser.h
Просмотреть файл

@ -21,8 +21,8 @@ namespace mozilla {
namespace dom {
class DOMParser final : public nsIDOMParser,
public nsSupportsWeakReference,
public nsWrapperCache
public nsSupportsWeakReference,
public nsWrapperCache
{
typedef mozilla::dom::GlobalObject GlobalObject;

4
dom/base/DOMRect.h
Просмотреть файл

@ -76,7 +76,7 @@ protected:
};
class DOMRect final : public DOMRectReadOnly
, public nsIDOMClientRect
, public nsIDOMClientRect
{
public:
explicit DOMRect(nsISupports* aParent, double aX = 0, double aY = 0,
@ -147,7 +147,7 @@ private:
};
class DOMRectList final : public nsIDOMClientRectList,
public nsWrapperCache
public nsWrapperCache
{
~DOMRectList() {}

122
dom/base/Element.h
Просмотреть файл

@ -1467,45 +1467,44 @@ _elementName::Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const
#define NS_FORWARD_NSIDOMELEMENT_TO_GENERIC \
typedef mozilla::dom::Element Element; \
NS_IMETHOD GetTagName(nsAString& aTagName) final override \
NS_IMETHOD GetTagName(nsAString& aTagName) final override \
{ \
Element::GetTagName(aTagName); \
return NS_OK; \
} \
NS_IMETHOD GetId(nsAString& aId) final override \
NS_IMETHOD GetId(nsAString& aId) final override \
{ \
Element::GetId(aId); \
return NS_OK; \
} \
NS_IMETHOD SetId(const nsAString& aId) final override \
NS_IMETHOD SetId(const nsAString& aId) final override \
{ \
Element::SetId(aId); \
return NS_OK; \
} \
NS_IMETHOD GetClassName(nsAString& aClassName) final override \
NS_IMETHOD GetClassName(nsAString& aClassName) final override \
{ \
Element::GetClassName(aClassName); \
return NS_OK; \
} \
NS_IMETHOD SetClassName(const nsAString& aClassName) final override \
NS_IMETHOD SetClassName(const nsAString& aClassName) final override \
{ \
Element::SetClassName(aClassName); \
return NS_OK; \
} \
NS_IMETHOD GetClassList(nsISupports** aClassList) final override \
NS_IMETHOD GetClassList(nsISupports** aClassList) final override \
{ \
Element::GetClassList(aClassList); \
return NS_OK; \
} \
NS_IMETHOD GetAttributes(nsIDOMMozNamedAttrMap** aAttributes) final \
override \
NS_IMETHOD GetAttributes(nsIDOMMozNamedAttrMap** aAttributes) final override \
{ \
NS_ADDREF(*aAttributes = Attributes()); \
return NS_OK; \
} \
using Element::GetAttribute; \
NS_IMETHOD GetAttribute(const nsAString& name, nsAString& _retval) final \
override \
NS_IMETHOD GetAttribute(const nsAString& name, nsAString& _retval) final \
override \
{ \
nsString attr; \
GetAttribute(name, attr); \
@ -1514,13 +1513,13 @@ NS_IMETHOD GetAttribute(const nsAString& name, nsAString& _retval) final \
} \
NS_IMETHOD GetAttributeNS(const nsAString& namespaceURI, \
const nsAString& localName, \
nsAString& _retval) final override \
nsAString& _retval) final override \
{ \
Element::GetAttributeNS(namespaceURI, localName, _retval); \
return NS_OK; \
} \
NS_IMETHOD SetAttribute(const nsAString& name, \
const nsAString& value) override \
const nsAString& value) override \
{ \
mozilla::ErrorResult rv; \
Element::SetAttribute(name, value, rv); \
@ -1528,22 +1527,21 @@ NS_IMETHOD SetAttribute(const nsAString& name, \
} \
NS_IMETHOD SetAttributeNS(const nsAString& namespaceURI, \
const nsAString& qualifiedName, \
const nsAString& value) final override \
const nsAString& value) final override \
{ \
mozilla::ErrorResult rv; \
Element::SetAttributeNS(namespaceURI, qualifiedName, value, rv); \
return rv.ErrorCode(); \
} \
using Element::RemoveAttribute; \
NS_IMETHOD RemoveAttribute(const nsAString& name) final override \
NS_IMETHOD RemoveAttribute(const nsAString& name) final override \
{ \
mozilla::ErrorResult rv; \
RemoveAttribute(name, rv); \
return rv.ErrorCode(); \
} \
NS_IMETHOD RemoveAttributeNS(const nsAString& namespaceURI, \
const nsAString& localName) final \
override \
const nsAString& localName) final override \
{ \
mozilla::ErrorResult rv; \
Element::RemoveAttributeNS(namespaceURI, localName, rv); \
@ -1551,31 +1549,31 @@ NS_IMETHOD RemoveAttributeNS(const nsAString& namespaceURI, \
} \
using Element::HasAttribute; \
NS_IMETHOD HasAttribute(const nsAString& name, \
bool* _retval) final override \
bool* _retval) final override \
{ \
*_retval = HasAttribute(name); \
return NS_OK; \
} \
NS_IMETHOD HasAttributeNS(const nsAString& namespaceURI, \
const nsAString& localName, \
bool* _retval) final override \
bool* _retval) final override \
{ \
*_retval = Element::HasAttributeNS(namespaceURI, localName); \
return NS_OK; \
} \
NS_IMETHOD HasAttributes(bool* _retval) final override \
NS_IMETHOD HasAttributes(bool* _retval) final override \
{ \
*_retval = Element::HasAttributes(); \
return NS_OK; \
} \
NS_IMETHOD GetAttributeNode(const nsAString& name, \
nsIDOMAttr** _retval) final override \
nsIDOMAttr** _retval) final override \
{ \
NS_IF_ADDREF(*_retval = Element::GetAttributeNode(name)); \
return NS_OK; \
} \
NS_IMETHOD SetAttributeNode(nsIDOMAttr* newAttr, \
nsIDOMAttr** _retval) final override \
nsIDOMAttr** _retval) final override \
{ \
if (!newAttr) { \
return NS_ERROR_INVALID_POINTER; \
@ -1586,7 +1584,7 @@ NS_IMETHOD SetAttributeNode(nsIDOMAttr* newAttr, \
return rv.ErrorCode(); \
} \
NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* oldAttr, \
nsIDOMAttr** _retval) final override \
nsIDOMAttr** _retval) final override \
{ \
if (!oldAttr) { \
return NS_ERROR_INVALID_POINTER; \
@ -1598,14 +1596,14 @@ NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* oldAttr, \
} \
NS_IMETHOD GetAttributeNodeNS(const nsAString& namespaceURI, \
const nsAString& localName, \
nsIDOMAttr** _retval) final override \
nsIDOMAttr** _retval) final override \
{ \
NS_IF_ADDREF(*_retval = Element::GetAttributeNodeNS(namespaceURI, \
localName)); \
return NS_OK; \
} \
NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* newAttr, \
nsIDOMAttr** _retval) final override \
nsIDOMAttr** _retval) final override \
{ \
mozilla::ErrorResult rv; \
mozilla::dom::Attr* attr = static_cast<mozilla::dom::Attr*>(newAttr); \
@ -1613,34 +1611,33 @@ NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* newAttr, \
return rv.ErrorCode(); \
} \
NS_IMETHOD GetElementsByTagName(const nsAString& name, \
nsIDOMHTMLCollection** _retval) final \
override \
nsIDOMHTMLCollection** _retval) final \
override \
{ \
Element::GetElementsByTagName(name, _retval); \
return NS_OK; \
} \
NS_IMETHOD GetElementsByTagNameNS(const nsAString& namespaceURI, \
const nsAString& localName, \
nsIDOMHTMLCollection** _retval) final \
override\
nsIDOMHTMLCollection** _retval) final \
override \
{ \
return Element::GetElementsByTagNameNS(namespaceURI, localName, \
_retval); \
} \
NS_IMETHOD GetElementsByClassName(const nsAString& classes, \
nsIDOMHTMLCollection** _retval) final \
override\
nsIDOMHTMLCollection** _retval) final \
override \
{ \
return Element::GetElementsByClassName(classes, _retval); \
} \
NS_IMETHOD GetChildElements(nsIDOMNodeList** aChildElements) final \
override \
NS_IMETHOD GetChildElements(nsIDOMNodeList** aChildElements) final override \
{ \
nsIHTMLCollection* list = FragmentOrElement::Children(); \
return CallQueryInterface(list, aChildElements); \
} \
NS_IMETHOD GetFirstElementChild(nsIDOMElement** aFirstElementChild) final \
override \
NS_IMETHOD GetFirstElementChild(nsIDOMElement** aFirstElementChild) final \
override \
{ \
Element* element = Element::GetFirstElementChild(); \
if (!element) { \
@ -1649,8 +1646,8 @@ NS_IMETHOD GetFirstElementChild(nsIDOMElement** aFirstElementChild) final \
} \
return CallQueryInterface(element, aFirstElementChild); \
} \
NS_IMETHOD GetLastElementChild(nsIDOMElement** aLastElementChild) final \
override \
NS_IMETHOD GetLastElementChild(nsIDOMElement** aLastElementChild) final \
override \
{ \
Element* element = Element::GetLastElementChild(); \
if (!element) { \
@ -1660,7 +1657,7 @@ NS_IMETHOD GetLastElementChild(nsIDOMElement** aLastElementChild) final \
return CallQueryInterface(element, aLastElementChild); \
} \
NS_IMETHOD GetPreviousElementSibling(nsIDOMElement** aPreviousElementSibling) \
final override \
final override \
{ \
Element* element = Element::GetPreviousElementSibling(); \
if (!element) { \
@ -1670,7 +1667,7 @@ NS_IMETHOD GetPreviousElementSibling(nsIDOMElement** aPreviousElementSibling) \
return CallQueryInterface(element, aPreviousElementSibling); \
} \
NS_IMETHOD GetNextElementSibling(nsIDOMElement** aNextElementSibling) \
final override \
final override \
{ \
Element* element = Element::GetNextElementSibling(); \
if (!element) { \
@ -1679,126 +1676,123 @@ NS_IMETHOD GetNextElementSibling(nsIDOMElement** aNextElementSibling) \
} \
return CallQueryInterface(element, aNextElementSibling); \
} \
NS_IMETHOD GetChildElementCount(uint32_t* aChildElementCount) final \
override \
NS_IMETHOD GetChildElementCount(uint32_t* aChildElementCount) final override \
{ \
*aChildElementCount = Element::ChildElementCount(); \
return NS_OK; \
} \
NS_IMETHOD MozRemove() final override \
NS_IMETHOD MozRemove() final override \
{ \
nsINode::Remove(); \
return NS_OK; \
} \
NS_IMETHOD GetClientRects(nsIDOMClientRectList** _retval) final \
override \
NS_IMETHOD GetClientRects(nsIDOMClientRectList** _retval) final override \
{ \
*_retval = Element::GetClientRects().take(); \
return NS_OK; \
} \
NS_IMETHOD GetBoundingClientRect(nsIDOMClientRect** _retval) final \
override \
NS_IMETHOD GetBoundingClientRect(nsIDOMClientRect** _retval) final override \
{ \
*_retval = Element::GetBoundingClientRect().take(); \
return NS_OK; \
} \
NS_IMETHOD GetScrollTop(int32_t* aScrollTop) final override \
NS_IMETHOD GetScrollTop(int32_t* aScrollTop) final override \
{ \
*aScrollTop = Element::ScrollTop(); \
return NS_OK; \
} \
NS_IMETHOD SetScrollTop(int32_t aScrollTop) final override \
NS_IMETHOD SetScrollTop(int32_t aScrollTop) final override \
{ \
Element::SetScrollTop(aScrollTop); \
return NS_OK; \
} \
NS_IMETHOD GetScrollLeft(int32_t* aScrollLeft) final override \
NS_IMETHOD GetScrollLeft(int32_t* aScrollLeft) final override \
{ \
*aScrollLeft = Element::ScrollLeft(); \
return NS_OK; \
} \
NS_IMETHOD SetScrollLeft(int32_t aScrollLeft) final override \
NS_IMETHOD SetScrollLeft(int32_t aScrollLeft) final override \
{ \
Element::SetScrollLeft(aScrollLeft); \
return NS_OK; \
} \
NS_IMETHOD GetScrollWidth(int32_t* aScrollWidth) final override \
NS_IMETHOD GetScrollWidth(int32_t* aScrollWidth) final override \
{ \
*aScrollWidth = Element::ScrollWidth(); \
return NS_OK; \
} \
NS_IMETHOD GetScrollHeight(int32_t* aScrollHeight) final override \
NS_IMETHOD GetScrollHeight(int32_t* aScrollHeight) final override \
{ \
*aScrollHeight = Element::ScrollHeight(); \
return NS_OK; \
} \
NS_IMETHOD GetClientTop(int32_t* aClientTop) final override \
NS_IMETHOD GetClientTop(int32_t* aClientTop) final override \
{ \
*aClientTop = Element::ClientTop(); \
return NS_OK; \
} \
NS_IMETHOD GetClientLeft(int32_t* aClientLeft) final override \
NS_IMETHOD GetClientLeft(int32_t* aClientLeft) final override \
{ \
*aClientLeft = Element::ClientLeft(); \
return NS_OK; \
} \
NS_IMETHOD GetClientWidth(int32_t* aClientWidth) final override \
NS_IMETHOD GetClientWidth(int32_t* aClientWidth) final override \
{ \
*aClientWidth = Element::ClientWidth(); \
return NS_OK; \
} \
NS_IMETHOD GetClientHeight(int32_t* aClientHeight) final override \
NS_IMETHOD GetClientHeight(int32_t* aClientHeight) final override \
{ \
*aClientHeight = Element::ClientHeight(); \
return NS_OK; \
} \
NS_IMETHOD GetScrollLeftMax(int32_t* aScrollLeftMax) final override \
NS_IMETHOD GetScrollLeftMax(int32_t* aScrollLeftMax) final override \
{ \
*aScrollLeftMax = Element::ScrollLeftMax(); \
return NS_OK; \
} \
NS_IMETHOD GetScrollTopMax(int32_t* aScrollTopMax) final override \
NS_IMETHOD GetScrollTopMax(int32_t* aScrollTopMax) final override \
{ \
*aScrollTopMax = Element::ScrollTopMax(); \
return NS_OK; \
} \
NS_IMETHOD MozMatchesSelector(const nsAString& selector, \
bool* _retval) final override \
bool* _retval) final override \
{ \
mozilla::ErrorResult rv; \
*_retval = Element::MozMatchesSelector(selector, rv); \
return rv.ErrorCode(); \
} \
NS_IMETHOD SetCapture(bool retargetToElement) final override \
NS_IMETHOD SetCapture(bool retargetToElement) final override \
{ \
Element::SetCapture(retargetToElement); \
return NS_OK; \
} \
NS_IMETHOD ReleaseCapture(void) final override \
NS_IMETHOD ReleaseCapture(void) final override \
{ \
Element::ReleaseCapture(); \
return NS_OK; \
} \
NS_IMETHOD MozRequestFullScreen(void) final override \
NS_IMETHOD MozRequestFullScreen(void) final override \
{ \
mozilla::ErrorResult rv; \
Element::MozRequestFullScreen(nullptr, JS::UndefinedHandleValue, rv); \
return rv.ErrorCode(); \
} \
NS_IMETHOD MozRequestPointerLock(void) final override \
NS_IMETHOD MozRequestPointerLock(void) final override \
{ \
Element::MozRequestPointerLock(); \
return NS_OK; \
} \
using nsINode::QuerySelector; \
NS_IMETHOD QuerySelector(const nsAString& aSelector, \
nsIDOMElement **aReturn) final override \
nsIDOMElement **aReturn) final override \
{ \
return nsINode::QuerySelector(aSelector, aReturn); \
} \
using nsINode::QuerySelectorAll; \
NS_IMETHOD QuerySelectorAll(const nsAString& aSelector, \
nsIDOMNodeList **aReturn) final override \
nsIDOMNodeList **aReturn) final override \
{ \
return nsINode::QuerySelectorAll(aSelector, aReturn); \
}

10
dom/base/EventSource.h
Просмотреть файл

@ -37,11 +37,11 @@ class AsyncVerifyRedirectCallbackFwr;
struct EventSourceInit;
class EventSource final : public DOMEventTargetHelper
, public nsIObserver
, public nsIStreamListener
, public nsIChannelEventSink
, public nsIInterfaceRequestor
, public nsSupportsWeakReference
, public nsIObserver
, public nsIStreamListener
, public nsIChannelEventSink
, public nsIInterfaceRequestor
, public nsSupportsWeakReference
{
friend class AsyncVerifyRedirectCallbackFwr;

4
dom/base/File.cpp
Просмотреть файл

@ -52,8 +52,8 @@ namespace dom {
// from NS_NewByteInputStream is held alive as long as the
// stream is. We do that by passing back this class instead.
class DataOwnerAdapter final : public nsIInputStream,
public nsISeekableStream,
public nsIIPCSerializableInputStream
public nsISeekableStream,
public nsIIPCSerializableInputStream
{
typedef FileImplMemory::DataOwner DataOwner;
public:

13
dom/base/File.h
Просмотреть файл

@ -52,10 +52,10 @@ class FileImpl;
class OwningArrayBufferOrArrayBufferViewOrBlobOrString;
class File final : public nsIDOMFile
, public nsIXHRSendable
, public nsIMutable
, public nsSupportsWeakReference
, public nsWrapperCache
, public nsIXHRSendable
, public nsIMutable
, public nsSupportsWeakReference
, public nsWrapperCache
{
public:
NS_DECL_NSIDOMBLOB
@ -524,7 +524,8 @@ public:
return true;
}
class DataOwner final : public mozilla::LinkedListElement<DataOwner> {
class DataOwner final : public mozilla::LinkedListElement<DataOwner>
{
public:
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(DataOwner)
DataOwner(void* aMemoryBuffer, uint64_t aLength)
@ -814,7 +815,7 @@ private:
};
class FileList final : public nsIDOMFileList,
public nsWrapperCache
public nsWrapperCache
{
~FileList() {}

2
dom/base/ImportManager.h
Просмотреть файл

@ -62,7 +62,7 @@ class ImportManager;
typedef nsTHashtable<nsPtrHashKey<nsINode>> NodeTable;
class ImportLoader final : public nsIStreamListener
, public nsIDOMEventListener
, public nsIDOMEventListener
{
// A helper inner class to decouple the logic of updating the import graph

2
dom/base/MessageChannel.h
Просмотреть файл

@ -22,7 +22,7 @@ namespace dom {
class MessagePort;
class MessageChannel final : public nsISupports
, public nsWrapperCache
, public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS

2
dom/base/MessagePortList.h
Просмотреть файл

@ -19,7 +19,7 @@ namespace mozilla {
namespace dom {
class MessagePortList final : public nsISupports
, public nsWrapperCache
, public nsWrapperCache
{
~MessagePortList() {}

4
dom/base/Navigator.h
Просмотреть файл

@ -105,8 +105,8 @@ class AudioChannelManager;
} // namespace system
class Navigator final : public nsIDOMNavigator
, public nsIMozNavigatorNetwork
, public nsWrapperCache
, public nsIMozNavigatorNetwork
, public nsWrapperCache
{
public:
explicit Navigator(nsPIDOMWindow* aInnerWindow);

4
dom/base/NodeIterator.h
Просмотреть файл

@ -23,8 +23,8 @@ namespace mozilla {
namespace dom {
class NodeIterator final : public nsIDOMNodeIterator,
public nsTraversal,
public nsStubMutationObserver
public nsTraversal,
public nsStubMutationObserver
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS

12
dom/base/ResponsiveImageSelector.cpp
Просмотреть файл

@ -103,20 +103,18 @@ ResponsiveImageSelector::SetCandidatesFromSourceSet(const nsAString & aSrcSet)
// Find end of url
for (;iter != end && !nsContentUtils::IsHTMLWhitespace(*iter); ++iter);
urlEnd = iter;
// Omit trailing commas from URL.
// Multiple commas are a non-fatal error.
while (urlEnd != url) {
if (*(--urlEnd) != char16_t(',')) {
urlEnd++;
while (iter != url) {
if (*(--iter) != char16_t(',')) {
iter++;
break;
}
}
const nsDependentSubstring &urlStr = Substring(url, urlEnd);
const nsDependentSubstring &urlStr = Substring(url, iter);
MOZ_ASSERT(url != urlEnd, "Shouldn't have empty URL at this point");
MOZ_ASSERT(url != iter, "Shouldn't have empty URL at this point");
ResponsiveImageCandidate candidate;
if (candidate.ConsumeDescriptors(iter, end)) {

2
dom/base/SubtleCrypto.h
Просмотреть файл

@ -22,7 +22,7 @@ class Promise;
typedef ArrayBufferViewOrArrayBuffer CryptoOperationData;
class SubtleCrypto final : public nsISupports,
public nsWrapperCache
public nsWrapperCache
{
~SubtleCrypto() {}

2
dom/base/TextInputProcessor.h
Просмотреть файл

@ -21,7 +21,7 @@ class TextEventDispatcher;
} // namespace widget
class TextInputProcessor final : public nsITextInputProcessor
, public widget::TextEventDispatcherListener
, public widget::TextEventDispatcherListener
{
typedef mozilla::widget::IMENotification IMENotification;
typedef mozilla::widget::TextEventDispatcher TextEventDispatcher;

2
dom/base/URLSearchParams.h
Просмотреть файл

@ -27,7 +27,7 @@ public:
};
class URLSearchParams final : public nsISupports,
public nsWrapperCache
public nsWrapperCache
{
~URLSearchParams();

10
dom/base/WebSocket.cpp
Просмотреть файл

@ -62,11 +62,11 @@ namespace mozilla {
namespace dom {
class WebSocketImpl final : public nsIInterfaceRequestor
, public nsIWebSocketListener
, public nsIObserver
, public nsSupportsWeakReference
, public nsIRequest
, public nsIEventTarget
, public nsIWebSocketListener
, public nsIObserver
, public nsSupportsWeakReference
, public nsIRequest
, public nsIEventTarget
{
public:
NS_DECL_NSIINTERFACEREQUESTOR

2
dom/base/nsContentPermissionHelper.h
Просмотреть файл

@ -107,7 +107,7 @@ class nsContentPermissionRequestProxy : public nsIContentPermissionRequest
* RemotePermissionRequest will send a prompt ipdl request to b2g process.
*/
class RemotePermissionRequest final : public nsISupports
, public mozilla::dom::PContentPermissionRequestChild
, public mozilla::dom::PContentPermissionRequestChild
{
public:
NS_DECL_ISUPPORTS

2
dom/base/nsContentUtils.cpp
Просмотреть файл

@ -399,7 +399,7 @@ EventListenerManagerHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
}
class SameOriginCheckerImpl final : public nsIChannelEventSink,
public nsIInterfaceRequestor
public nsIInterfaceRequestor
{
~SameOriginCheckerImpl() {}

4
dom/base/nsDOMMutationObserver.h
Просмотреть файл

@ -31,7 +31,7 @@ class nsDOMMutationObserver;
using mozilla::dom::MutationObservingInfo;
class nsDOMMutationRecord final : public nsISupports,
public nsWrapperCache
public nsWrapperCache
{
virtual ~nsDOMMutationRecord() {}
@ -443,7 +443,7 @@ private:
{ 0x9e, 0xab, 0x07, 0x47, 0xa9, 0xe4, 0x65, 0xb4 } }
class nsDOMMutationObserver final : public nsISupports,
public nsWrapperCache
public nsWrapperCache
{
public:
nsDOMMutationObserver(already_AddRefed<nsPIDOMWindow>&& aOwner,

2
dom/base/nsDOMScriptObjectFactory.h
Просмотреть файл

@ -23,7 +23,7 @@
#include "mozilla/Attributes.h"
class nsDOMScriptObjectFactory final : public nsIDOMScriptObjectFactory,
public nsIObserver
public nsIObserver
{
~nsDOMScriptObjectFactory() {}

2
dom/base/nsDOMSerializer.h
Просмотреть файл

@ -15,7 +15,7 @@
class nsINode;
class nsDOMSerializer final : public nsIDOMSerializer,
public nsWrapperCache
public nsWrapperCache
{
public:
nsDOMSerializer();

2
dom/base/nsDOMWindowUtils.h
Просмотреть файл

@ -55,7 +55,7 @@ private:
};
class nsDOMWindowUtils final : public nsIDOMWindowUtils,
public nsSupportsWeakReference
public nsSupportsWeakReference
{
typedef mozilla::widget::TextEventDispatcher
TextEventDispatcher;

4
dom/base/nsDocument.h
Просмотреть файл

@ -597,8 +597,8 @@ protected:
// XXXbz I wish we could just derive the _allcaps thing from _i
#define DECL_SHIM(_i, _allcaps) \
class _i##Shim final : public nsIInterfaceRequestor, \
public _i \
class _i##Shim final : public nsIInterfaceRequestor, \
public _i \
{ \
~_i##Shim() {} \
public: \

4
dom/base/nsFocusManager.h
Просмотреть файл

@ -32,8 +32,8 @@ struct nsDelayedBlurOrFocusEvent;
*/
class nsFocusManager final : public nsIFocusManager,
public nsIObserver,
public nsSupportsWeakReference
public nsIObserver,
public nsSupportsWeakReference
{
typedef mozilla::widget::InputContextAction InputContextAction;

6
dom/base/nsFormData.h
Просмотреть файл

@ -26,9 +26,9 @@ class GlobalObject;
} // namespace mozilla
class nsFormData final : public nsIDOMFormData,
public nsIXHRSendable,
public nsFormSubmission,
public nsWrapperCache
public nsIXHRSendable,
public nsFormSubmission,
public nsWrapperCache
{
private:
~nsFormData() {}

4
dom/base/nsFrameLoader.h
Просмотреть файл

@ -55,8 +55,8 @@ class QX11EmbedContainer;
#endif
class nsFrameLoader final : public nsIFrameLoader,
public nsStubMutationObserver,
public mozilla::dom::ipc::MessageManagerCallback
public nsStubMutationObserver,
public mozilla::dom::ipc::MessageManagerCallback
{
friend class AutoResetInShow;
typedef mozilla::dom::PBrowserParent PBrowserParent;

8
dom/base/nsFrameMessageManager.h
Просмотреть файл

@ -153,10 +153,10 @@ private:
};
class nsFrameMessageManager final : public nsIContentFrameMessageManager,
public nsIMessageBroadcaster,
public nsIFrameScriptLoader,
public nsIProcessScriptLoader,
public nsIProcessChecker
public nsIMessageBroadcaster,
public nsIFrameScriptLoader,
public nsIProcessScriptLoader,
public nsIProcessChecker
{
friend class mozilla::dom::MessageManagerReporter;
typedef mozilla::dom::StructuredCloneData StructuredCloneData;

2
dom/base/nsGenConImageContent.cpp
Просмотреть файл

@ -21,7 +21,7 @@
using namespace mozilla;
class nsGenConImageContent final : public nsXMLElement,
public nsImageLoadingContent
public nsImageLoadingContent
{
public:
explicit nsGenConImageContent(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)

2
dom/base/nsGlobalWindow.cpp
Просмотреть файл

@ -477,7 +477,7 @@ static const char sPopStatePrefStr[] = "browser.history.allowPopState";
* on nsGlobalWindow, where any script could see it.
*/
class nsGlobalWindowObserver final : public nsIObserver,
public nsIInterfaceRequestor
public nsIInterfaceRequestor
{
public:
explicit nsGlobalWindowObserver(nsGlobalWindow* aWindow) : mWindow(aWindow) {}

4
dom/base/nsLocation.h
Просмотреть файл

@ -26,8 +26,8 @@ class nsIDocShellLoadInfo;
//*****************************************************************************
class nsLocation final : public nsIDOMLocation
, public nsWrapperCache
, public mozilla::dom::URLSearchParamsObserver
, public nsWrapperCache
, public mozilla::dom::URLSearchParamsObserver
{
typedef mozilla::ErrorResult ErrorResult;

2
dom/base/nsMimeTypeArray.h
Просмотреть файл

@ -17,7 +17,7 @@ class nsMimeType;
class nsPluginElement;
class nsMimeTypeArray final : public nsISupports,
public nsWrapperCache
public nsWrapperCache
{
public:
explicit nsMimeTypeArray(nsPIDOMWindow* aWindow);

4
dom/base/nsObjectLoadingContent.cpp
Просмотреть файл

@ -1293,8 +1293,8 @@ nsObjectLoadingContent::GetBaseURI(nsIURI **aResult)
// see an interface requestor even though WebIDL bindings don't expose
// that stuff.
class ObjectInterfaceRequestorShim final : public nsIInterfaceRequestor,
public nsIChannelEventSink,
public nsIStreamListener
public nsIChannelEventSink,
public nsIStreamListener
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS

6
dom/base/nsPluginArray.h
Просмотреть файл

@ -18,8 +18,8 @@ class nsPluginElement;
class nsMimeType;
class nsPluginArray final : public nsIObserver,
public nsSupportsWeakReference,
public nsWrapperCache
public nsSupportsWeakReference,
public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@ -76,7 +76,7 @@ private:
};
class nsPluginElement final : public nsISupports,
public nsWrapperCache
public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS

4
dom/base/nsRange.h
Просмотреть файл

@ -31,8 +31,8 @@ class DOMRectList;
}
class nsRange final : public nsIDOMRange,
public nsStubMutationObserver,
public nsWrapperCache
public nsStubMutationObserver,
public nsWrapperCache
{
typedef mozilla::ErrorResult ErrorResult;
typedef mozilla::dom::DOMRect DOMRect;

2
dom/base/nsTextNode.cpp
Просмотреть файл

@ -28,7 +28,7 @@ using namespace mozilla::dom;
* class used to implement attr() generated content
*/
class nsAttributeTextNode final : public nsTextNode,
public nsStubMutationObserver
public nsStubMutationObserver
{
public:
NS_DECL_ISUPPORTS_INHERITED

4
dom/base/nsWindowMemoryReporter.h
Просмотреть файл

@ -140,8 +140,8 @@ public:
*
*/
class nsWindowMemoryReporter final : public nsIMemoryReporter,
public nsIObserver,
public nsSupportsWeakReference
public nsIObserver,
public nsSupportsWeakReference
{
public:
NS_DECL_ISUPPORTS

31
dom/base/nsXMLHttpRequest.h
Просмотреть файл

@ -147,7 +147,7 @@ public:
};
class nsXMLHttpRequestUpload final : public nsXHREventTarget,
public nsIXMLHttpRequestUpload
public nsIXMLHttpRequestUpload
{
public:
explicit nsXMLHttpRequestUpload(mozilla::DOMEventTargetHelper* aOwner)
@ -180,15 +180,15 @@ class nsXMLHttpRequestXPCOMifier;
// Make sure that any non-DOM interfaces added here are also added to
// nsXMLHttpRequestXPCOMifier.
class nsXMLHttpRequest final : public nsXHREventTarget,
public nsIXMLHttpRequest,
public nsIJSXMLHttpRequest,
public nsIStreamListener,
public nsIChannelEventSink,
public nsIProgressEventSink,
public nsIInterfaceRequestor,
public nsSupportsWeakReference,
public nsITimerCallback,
public nsISizeOfEventTarget
public nsIXMLHttpRequest,
public nsIJSXMLHttpRequest,
public nsIStreamListener,
public nsIChannelEventSink,
public nsIProgressEventSink,
public nsIInterfaceRequestor,
public nsSupportsWeakReference,
public nsITimerCallback,
public nsISizeOfEventTarget
{
friend class nsXHRParseEndListener;
friend class nsXMLHttpRequestXPCOMifier;
@ -634,7 +634,8 @@ protected:
nsCOMPtr<nsIStreamListener> mXMLParserStreamListener;
// used to implement getAllResponseHeaders()
class nsHeaderVisitor : public nsIHttpHeaderVisitor {
class nsHeaderVisitor : public nsIHttpHeaderVisitor
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIHTTPHEADERVISITOR
@ -820,10 +821,10 @@ private:
// A shim class designed to expose the non-DOM interfaces of
// XMLHttpRequest via XPCOM stuff.
class nsXMLHttpRequestXPCOMifier final : public nsIStreamListener,
public nsIChannelEventSink,
public nsIProgressEventSink,
public nsIInterfaceRequestor,
public nsITimerCallback
public nsIChannelEventSink,
public nsIProgressEventSink,
public nsIInterfaceRequestor,
public nsITimerCallback
{
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsXMLHttpRequestXPCOMifier,

6
dom/base/test/chrome/cpows_parent.xul
Просмотреть файл

@ -232,6 +232,12 @@
todo_is(savedElement.toString, savedElement.toString, "toString identity works");
todo_is(savedElement.QueryInterface, savedElement.QueryInterface, "toString identity works");
is(Object.prototype.toString.call(savedElement), "[object HTMLDivElement]",
"prove that this works (and doesn't leak)");
is(Object.prototype.toString.call(savedElement), "[object HTMLDivElement]",
"prove that this works twice (since we cache it and doesn't leak)");
// This does work because we create a CPOW for isEqualNode that stays
// alive as long as we have a reference to the first CPOW (so as long
// as it's detectable).

2
dom/bindings/Exceptions.cpp
Просмотреть файл

@ -758,7 +758,7 @@ NS_IMETHODIMP JSStackFrame::GetFormattedStack(nsAString& aStack)
JS::Rooted<JSObject*> stack(cx, mStack);
JS::Rooted<JSString*> formattedStack(cx);
if (!JS::StringifySavedFrameStack(cx, stack, &formattedStack)) {
if (!JS::BuildStackString(cx, stack, &formattedStack)) {
JS_ClearPendingException(cx);
aStack.Truncate();
return NS_OK;

4
dom/bindings/test/test_exception_options_from_jsimplemented.html
Просмотреть файл

@ -45,13 +45,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1107592
ise(e.code, DOMException.NOT_SUPPORTED_ERR,
"Should have the right 'code'");
ise(e.stack,
"doTest@http://mochi.test:8888/tests/dom/bindings/test/test_exception_options_from_jsimplemented.html:38:6\n",
"doTest@http://mochi.test:8888/tests/dom/bindings/test/test_exception_options_from_jsimplemented.html:38:7\n",
"Exception stack should still only show our code");
ise(e.filename,
"http://mochi.test:8888/tests/dom/bindings/test/test_exception_options_from_jsimplemented.html",
"Should still have the right file name");
ise(e.lineNumber, 38, "Should still have the right line number");
todo_is(e.columnNumber, 6,
todo_is(e.columnNumber, 7,
"No column number support for DOMException yet");
}
SimpleTest.finish();

8
dom/bindings/test/test_promise_rejections_from_jsimplemented.html
Просмотреть файл

@ -45,7 +45,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1107592
ensurePromiseFail.bind(null, 1),
checkExn.bind(null, 44, "NS_ERROR_UNEXPECTED", "", undefined,
ourFile, 1,
"doTest@http://mochi.test:8888/tests/dom/bindings/test/test_promise_rejections_from_jsimplemented.html:44:6\n")),
"doTest@http://mochi.test:8888/tests/dom/bindings/test/test_promise_rejections_from_jsimplemented.html:44:7\n")),
t.testPromiseWithThrowingContentPromiseInit(function() {
thereIsNoSuchContentFunction1();
}).then(
@ -64,7 +64,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1107592
checkExn.bind(null, 61, "ReferenceError",
"thereIsNoSuchContentFunction2 is not defined",
undefined, ourFile, 4,
"doTest/<@http://mochi.test:8888/tests/dom/bindings/test/test_promise_rejections_from_jsimplemented.html:61:11\n")),
"doTest/<@http://mochi.test:8888/tests/dom/bindings/test/test_promise_rejections_from_jsimplemented.html:61:11\nAsync*doTest@http://mochi.test:8888/tests/dom/bindings/test/test_promise_rejections_from_jsimplemented.html:60:7\n")),
t.testPromiseWithThrowingChromeThenable().then(
ensurePromiseFail.bind(null, 5),
checkExn.bind(null, 0, "NS_ERROR_UNEXPECTED", "", undefined, "", 5, "")),
@ -81,13 +81,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1107592
checkExn.bind(null, 79, "NotFoundError",
"We are a second DOMException",
DOMException.NOT_FOUND_ERR, ourFile, 7,
"doTest@http://mochi.test:8888/tests/dom/bindings/test/test_promise_rejections_from_jsimplemented.html:79:6\n")),
"doTest@http://mochi.test:8888/tests/dom/bindings/test/test_promise_rejections_from_jsimplemented.html:79:7\n")),
t.testPromiseWithDOMExceptionThrowingThenFunction().then(
ensurePromiseFail.bind(null, 8),
checkExn.bind(null, 85, "NetworkError",
"We are a third DOMException",
DOMException.NETWORK_ERR, ourFile, 8,
"Async*doTest@http://mochi.test:8888/tests/dom/bindings/test/test_promise_rejections_from_jsimplemented.html:85:6\n")),
"Async*doTest@http://mochi.test:8888/tests/dom/bindings/test/test_promise_rejections_from_jsimplemented.html:85:7\n")),
t.testPromiseWithDOMExceptionThrowingThenable().then(
ensurePromiseFail.bind(null, 9),
checkExn.bind(null, 0, "TypeMismatchError",

14
dom/bluetooth/BluetoothProfileManagerBase.h
Просмотреть файл

@ -89,17 +89,17 @@ public:
virtual void GetName(nsACString& aName) = 0;
};
#define BT_DECL_PROFILE_MGR_BASE \
public: \
NS_DECL_ISUPPORTS \
NS_DECL_NSIOBSERVER \
virtual void OnGetServiceChannel(const nsAString& aDeviceAddress, \
const nsAString& aServiceUuid, \
#define BT_DECL_PROFILE_MGR_BASE \
public: \
NS_DECL_ISUPPORTS \
NS_DECL_NSIOBSERVER \
virtual void OnGetServiceChannel(const nsAString& aDeviceAddress, \
const nsAString& aServiceUuid, \
int aChannel) override; \
virtual void OnUpdateSdpRecords(const nsAString& aDeviceAddress) override; \
virtual void GetAddress(nsAString& aDeviceAddress) override; \
virtual bool IsConnected() override; \
virtual void Connect(const nsAString& aDeviceAddress, \
virtual void Connect(const nsAString& aDeviceAddress, \
BluetoothProfileController* aController) override; \
virtual void Disconnect(BluetoothProfileController* aController) override; \
virtual void OnConnect(const nsAString& aErrorStr) override; \

14
dom/bluetooth2/BluetoothProfileManagerBase.h
Просмотреть файл

@ -88,17 +88,17 @@ public:
virtual void GetName(nsACString& aName) = 0;
};
#define BT_DECL_PROFILE_MGR_BASE \
public: \
NS_DECL_ISUPPORTS \
NS_DECL_NSIOBSERVER \
virtual void OnGetServiceChannel(const nsAString& aDeviceAddress, \
const nsAString& aServiceUuid, \
#define BT_DECL_PROFILE_MGR_BASE \
public: \
NS_DECL_ISUPPORTS \
NS_DECL_NSIOBSERVER \
virtual void OnGetServiceChannel(const nsAString& aDeviceAddress, \
const nsAString& aServiceUuid, \
int aChannel) override; \
virtual void OnUpdateSdpRecords(const nsAString& aDeviceAddress) override; \
virtual void GetAddress(nsAString& aDeviceAddress) override; \
virtual bool IsConnected() override; \
virtual void Connect(const nsAString& aDeviceAddress, \
virtual void Connect(const nsAString& aDeviceAddress, \
BluetoothProfileController* aController) override; \
virtual void Disconnect(BluetoothProfileController* aController) override; \
virtual void OnConnect(const nsAString& aErrorStr) override; \

10
dom/camera/DOMCameraCapabilities.h
Просмотреть файл

@ -30,7 +30,7 @@ namespace dom {
* CameraRecorderVideoProfile
*/
class CameraRecorderVideoProfile final : public nsISupports
, public nsWrapperCache
, public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@ -69,7 +69,7 @@ private:
* CameraRecorderAudioProfile
*/
class CameraRecorderAudioProfile final : public nsISupports
, public nsWrapperCache
, public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@ -103,7 +103,7 @@ private:
* CameraRecorderProfile
*/
class CameraRecorderProfile final : public nsISupports
, public nsWrapperCache
, public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@ -149,7 +149,7 @@ private:
template<class T> class CameraClosedListenerProxy;
class CameraRecorderProfiles final : public nsISupports
, public nsWrapperCache
, public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@ -182,7 +182,7 @@ private:
* CameraCapabilities
*/
class CameraCapabilities final : public nsISupports
, public nsWrapperCache
, public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS

2
dom/camera/DOMCameraControl.h
Просмотреть файл

@ -46,7 +46,7 @@ class StartRecordingHelper;
// Main camera control.
class nsDOMCameraControl final : public DOMMediaStream
, public nsSupportsWeakReference
, public nsSupportsWeakReference
{
public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_DOM_CAMERA_CONTROL_CID)

2
dom/camera/DOMCameraDetectedFace.h
Просмотреть файл

@ -17,7 +17,7 @@ namespace mozilla {
namespace dom {
class DOMCameraDetectedFace final : public nsISupports
, public nsWrapperCache
, public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS

4
dom/cellbroadcast/CellBroadcastMessage.h
Просмотреть файл

@ -20,7 +20,7 @@ namespace dom {
class CellBroadcastEtwsInfo;
class CellBroadcastMessage final : public nsISupports
, public nsWrapperCache
, public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@ -92,7 +92,7 @@ private:
};
class CellBroadcastEtwsInfo final : public nsISupports
, public nsWrapperCache
, public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS

4
dom/cellbroadcast/ipc/CellBroadcastIPCService.h
Просмотреть файл

@ -16,7 +16,7 @@ namespace dom {
namespace cellbroadcast {
class CellBroadcastIPCService final : public PCellBroadcastChild
, public nsICellBroadcastService
, public nsICellBroadcastService
{
public:
@ -55,4 +55,4 @@ private:
} // namespace dom
} // namespace mozilla
#endif // mozilla_dom_cellbroadcast_CellBroadcastIPCService_h
#endif // mozilla_dom_cellbroadcast_CellBroadcastIPCService_h

2
dom/cellbroadcast/ipc/CellBroadcastParent.h
Просмотреть файл

@ -16,7 +16,7 @@ namespace dom {
namespace cellbroadcast {
class CellBroadcastParent final : public PCellBroadcastParent
, public nsICellBroadcastListener
, public nsICellBroadcastListener
{
public:
NS_DECL_ISUPPORTS

4
dom/crypto/CryptoKey.h
Просмотреть файл

@ -59,8 +59,8 @@ Thus, internally, a key has the following fields:
struct JsonWebKey;
class CryptoKey final : public nsISupports,
public nsWrapperCache,
public nsNSSShutDownObject
public nsWrapperCache,
public nsNSSShutDownObject
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS

2
dom/datastore/DataStoreService.h
Просмотреть файл

@ -28,7 +28,7 @@ class RetrieveRevisionsCounter;
class RevisionAddedEnableStoreCallback;
class DataStoreService final : public nsIDataStoreService
, public nsIObserver
, public nsIObserver
{
friend class ContentChild;
friend class FirstRevisionIdCallback;

2
dom/events/CustomEvent.h
Просмотреть файл

@ -14,7 +14,7 @@ namespace dom {
struct CustomEventInit;
class CustomEvent final : public Event,
public nsIDOMCustomEvent
public nsIDOMCustomEvent
{
private:
virtual ~CustomEvent();

4
dom/events/DOMEventTargetHelper.h
Просмотреть файл

@ -281,11 +281,11 @@ NS_DEFINE_STATIC_IID_ACCESSOR(DOMEventTargetHelper,
using _class::RemoveEventListener; \
NS_FORWARD_NSIDOMEVENTTARGET(_class::) \
virtual mozilla::EventListenerManager* \
GetOrCreateListenerManager() override { \
GetOrCreateListenerManager() override { \
return _class::GetOrCreateListenerManager(); \
} \
virtual mozilla::EventListenerManager* \
GetExistingListenerManager() const override { \
GetExistingListenerManager() const override { \
return _class::GetExistingListenerManager(); \
}

2
dom/events/DataTransfer.h
Просмотреть файл

@ -52,7 +52,7 @@ struct TransferItem {
{ 0x9b, 0xd0, 0xf1, 0x79, 0x09, 0x69, 0xf2, 0xfb } }
class DataTransfer final : public nsIDOMDataTransfer,
public nsWrapperCache
public nsWrapperCache
{
public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_DATATRANSFER_IID)

10
dom/events/IMEContentObserver.h
Просмотреть файл

@ -32,11 +32,11 @@ class EventStateManager;
// IMEContentObserver notifies widget of any text and selection changes
// in the currently focused editor
class IMEContentObserver final : public nsISelectionListener
, public nsStubMutationObserver
, public nsIReflowObserver
, public nsIScrollObserver
, public nsSupportsWeakReference
, public nsIEditorObserver
, public nsStubMutationObserver
, public nsIReflowObserver
, public nsIScrollObserver
, public nsSupportsWeakReference
, public nsIEditorObserver
{
friend class AsyncMergeableNotificationsFlusher;

2
dom/events/ImageCaptureError.h
Просмотреть файл

@ -21,7 +21,7 @@ namespace dom {
* This object should be generated by ImageCapture object only.
*/
class ImageCaptureError final : public nsISupports,
public nsWrapperCache
public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS

2
dom/events/MessageEvent.h
Просмотреть файл

@ -34,7 +34,7 @@ class ServiceWorkerClient;
* further details.
*/
class MessageEvent final : public Event,
public nsIDOMMessageEvent
public nsIDOMMessageEvent
{
public:
MessageEvent(EventTarget* aOwner,

4
dom/events/PaintRequest.h
Просмотреть файл

@ -18,7 +18,7 @@ namespace dom {
class DOMRect;
class PaintRequest final : public nsIDOMPaintRequest
, public nsWrapperCache
, public nsWrapperCache
{
public:
explicit PaintRequest(nsIDOMEvent* aParent)
@ -55,7 +55,7 @@ private:
};
class PaintRequestList final : public nsISupports,
public nsWrapperCache
public nsWrapperCache
{
public:
explicit PaintRequestList(nsIDOMEvent *aParent) : mParent(aParent)

4
dom/events/Touch.h
Просмотреть файл

@ -21,8 +21,8 @@ namespace dom {
class EventTarget;
class Touch final : public nsISupports
, public nsWrapperCache
, public WidgetPointerHelper
, public nsWrapperCache
, public WidgetPointerHelper
{
public:
static bool PrefEnabled(JSContext* aCx, JSObject* aGlobal);

2
dom/events/TouchEvent.h
Просмотреть файл

@ -20,7 +20,7 @@ namespace mozilla {
namespace dom {
class TouchList final : public nsISupports
, public nsWrapperCache
, public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS

6
dom/events/UIEvent.h
Просмотреть файл

@ -176,18 +176,18 @@ protected:
#define NS_FORWARD_TO_UIEVENT \
NS_FORWARD_NSIDOMUIEVENT(UIEvent::) \
NS_FORWARD_TO_EVENT_NO_SERIALIZATION_NO_DUPLICATION \
NS_IMETHOD DuplicatePrivateData() override \
NS_IMETHOD DuplicatePrivateData() override \
{ \
return UIEvent::DuplicatePrivateData(); \
} \
NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, \
bool aSerializeInterfaceType) \
override \
override \
{ \
UIEvent::Serialize(aMsg, aSerializeInterfaceType); \
} \
NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, \
void** aIter) override \
void** aIter) override \
{ \
return UIEvent::Deserialize(aMsg, aIter); \
}

2
dom/fetch/Fetch.cpp
Просмотреть файл

@ -45,7 +45,7 @@ namespace dom {
using namespace workers;
class WorkerFetchResolver final : public FetchDriverObserver,
public WorkerFeature
public WorkerFeature
{
friend class MainThreadFetchRunnable;
friend class WorkerFetchResponseEndRunnable;

6
dom/fetch/FetchDriver.h
Просмотреть файл

@ -42,9 +42,9 @@ protected:
};
class FetchDriver final : public nsIStreamListener,
public nsIChannelEventSink,
public nsIInterfaceRequestor,
public nsIAsyncVerifyRedirectCallback
public nsIChannelEventSink,
public nsIInterfaceRequestor,
public nsIAsyncVerifyRedirectCallback
{
public:
NS_DECL_ISUPPORTS

2
dom/fetch/Headers.h
Просмотреть файл

@ -34,7 +34,7 @@ class OwningHeadersOrByteStringSequenceSequenceOrByteStringMozMap;
* InternalHeaders object.
*/
class Headers final : public nsISupports
, public nsWrapperCache
, public nsWrapperCache
{
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Headers)

4
dom/fetch/Request.h
Просмотреть файл

@ -27,8 +27,8 @@ class Promise;
class RequestOrUSVString;
class Request final : public nsISupports
, public FetchBody<Request>
, public nsWrapperCache
, public FetchBody<Request>
, public nsWrapperCache
{
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Request)

4
dom/fetch/Response.h
Просмотреть файл

@ -25,8 +25,8 @@ class InternalHeaders;
class Promise;
class Response final : public nsISupports
, public FetchBody<Response>
, public nsWrapperCache
, public FetchBody<Response>
, public nsWrapperCache
{
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Response)

2
dom/fmradio/FMRadio.cpp
Просмотреть файл

@ -33,7 +33,7 @@ using mozilla::Preferences;
BEGIN_FMRADIO_NAMESPACE
class FMRadioRequest final : public FMRadioReplyRunnable
, public DOMRequest
, public DOMRequest
{
public:
NS_DECL_ISUPPORTS_INHERITED

10
dom/fmradio/FMRadio.h
Просмотреть файл

@ -21,11 +21,11 @@ BEGIN_FMRADIO_NAMESPACE
class DOMRequest;
class FMRadio final : public DOMEventTargetHelper
, public hal::SwitchObserver
, public FMRadioEventObserver
, public nsSupportsWeakReference
, public nsIAudioChannelAgentCallback
, public nsIDOMEventListener
, public hal::SwitchObserver
, public FMRadioEventObserver
, public nsSupportsWeakReference
, public nsIAudioChannelAgentCallback
, public nsIDOMEventListener
{
friend class FMRadioRequest;

6
dom/fmradio/FMRadioService.h
Просмотреть файл

@ -148,9 +148,9 @@ enum FMRadioState
};
class FMRadioService final : public IFMRadioService
, public hal::FMRadioObserver
, public hal::FMRadioRDSObserver
, public nsIObserver
, public hal::FMRadioObserver
, public hal::FMRadioRDSObserver
, public nsIObserver
{
friend class ReadAirplaneModeSettingTask;
friend class EnableRunnable;

2
dom/fmradio/ipc/FMRadioChild.h
Просмотреть файл

@ -23,7 +23,7 @@ BEGIN_FMRADIO_NAMESPACE
* IPC channel to transfer the requests.
*/
class FMRadioChild final : public IFMRadioService
, public PFMRadioChild
, public PFMRadioChild
{
public:
static FMRadioChild* Singleton();

2
dom/fmradio/ipc/FMRadioParent.h
Просмотреть файл

@ -16,7 +16,7 @@ BEGIN_FMRADIO_NAMESPACE
class PFMRadioRequestParent;
class FMRadioParent final : public PFMRadioParent
, public FMRadioEventObserver
, public FMRadioEventObserver
{
public:
FMRadioParent();

2
dom/fmradio/ipc/FMRadioRequestParent.h
Просмотреть файл

@ -14,7 +14,7 @@
BEGIN_FMRADIO_NAMESPACE
class FMRadioRequestParent final : public PFMRadioRequestParent
, public FMRadioReplyRunnable
, public FMRadioReplyRunnable
{
public:
FMRadioRequestParent();

2
dom/gamepad/Gamepad.h
Просмотреть файл

@ -32,7 +32,7 @@ const int kRightStickXAxis = 2;
const int kRightStickYAxis = 3;
class Gamepad final : public nsISupports,
public nsWrapperCache
public nsWrapperCache
{
public:
Gamepad(nsISupports* aParent,

4
dom/geolocation/nsGeoPosition.h
Просмотреть файл

@ -77,7 +77,7 @@ namespace dom {
class Coordinates;
class Position final : public nsISupports,
public nsWrapperCache
public nsWrapperCache
{
~Position();
@ -105,7 +105,7 @@ private:
};
class Coordinates final : public nsISupports,
public nsWrapperCache
public nsWrapperCache
{
~Coordinates();

9
dom/geolocation/nsGeolocation.h
Просмотреть файл

@ -53,7 +53,8 @@ struct CachedPositionAndAccuracy {
/**
* Singleton that manages the geolocation provider
*/
class nsGeolocationService final : public nsIGeolocationUpdate, public nsIObserver
class nsGeolocationService final : public nsIGeolocationUpdate,
public nsIObserver
{
public:
@ -124,8 +125,8 @@ namespace dom {
* Can return a geolocation info
*/
class Geolocation final : public nsIDOMGeoGeolocation,
public nsIGeolocationUpdate,
public nsWrapperCache
public nsIGeolocationUpdate,
public nsWrapperCache
{
public:
@ -221,7 +222,7 @@ private:
};
class PositionError final : public nsIDOMGeoPositionError,
public nsWrapperCache
public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS

2
dom/html/HTMLAllCollection.h
Просмотреть файл

@ -30,7 +30,7 @@ class OwningNodeOrHTMLCollection;
template<typename> struct Nullable;
class HTMLAllCollection final : public nsISupports
, public nsWrapperCache
, public nsWrapperCache
{
~HTMLAllCollection();

4
dom/html/HTMLAnchorElement.h
Просмотреть файл

@ -19,8 +19,8 @@ class EventChainPreVisitor;
namespace dom {
class HTMLAnchorElement final : public nsGenericHTMLElement,
public nsIDOMHTMLAnchorElement,
public Link
public nsIDOMHTMLAnchorElement,
public Link
{
public:
using Element::GetText;

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше