From d22cfa08fe5ee73acfc0e84b9f2b7c3cc0df4ee3 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 9 Feb 2018 11:17:08 -0500 Subject: [PATCH] Bug 1436508 part 3. Remove nsIDOMCommandEvent. r=masayuki We never use initCommandEvent anywhere on a CommandEvent, only on XULCommandEvents. MozReview-Commit-ID: 8QHYnlPdDvx --- dom/events/CommandEvent.cpp | 18 +----------------- dom/events/CommandEvent.h | 18 ++---------------- dom/interfaces/events/moz.build | 1 - dom/interfaces/events/nsIDOMCommandEvent.idl | 17 ----------------- dom/webidl/CommandEvent.webidl | 5 ----- xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp | 3 --- 6 files changed, 3 insertions(+), 59 deletions(-) delete mode 100644 dom/interfaces/events/nsIDOMCommandEvent.idl diff --git a/dom/events/CommandEvent.cpp b/dom/events/CommandEvent.cpp index d6e2b25b8fb5..47b45c733df4 100644 --- a/dom/events/CommandEvent.cpp +++ b/dom/events/CommandEvent.cpp @@ -27,13 +27,12 @@ CommandEvent::CommandEvent(EventTarget* aOwner, } NS_INTERFACE_MAP_BEGIN(CommandEvent) - NS_INTERFACE_MAP_ENTRY(nsIDOMCommandEvent) NS_INTERFACE_MAP_END_INHERITING(Event) NS_IMPL_ADDREF_INHERITED(CommandEvent, Event) NS_IMPL_RELEASE_INHERITED(CommandEvent, Event) -NS_IMETHODIMP +void CommandEvent::GetCommand(nsAString& aCommand) { nsAtom* command = mEvent->AsCommandEvent()->mCommand; @@ -42,21 +41,6 @@ CommandEvent::GetCommand(nsAString& aCommand) } else { aCommand.Truncate(); } - return NS_OK; -} - -NS_IMETHODIMP -CommandEvent::InitCommandEvent(const nsAString& aTypeArg, - bool aCanBubbleArg, - bool aCancelableArg, - const nsAString& aCommand) -{ - NS_ENSURE_TRUE(!mEvent->mFlags.mIsBeingDispatched, NS_OK); - - Event::InitEvent(aTypeArg, aCanBubbleArg, aCancelableArg); - - mEvent->AsCommandEvent()->mCommand = NS_Atomize(aCommand); - return NS_OK; } } // namespace dom diff --git a/dom/events/CommandEvent.h b/dom/events/CommandEvent.h index cb21c1d491d5..6c655c32687b 100644 --- a/dom/events/CommandEvent.h +++ b/dom/events/CommandEvent.h @@ -10,13 +10,11 @@ #include "mozilla/EventForwards.h" #include "mozilla/dom/CommandEventBinding.h" #include "mozilla/dom/Event.h" -#include "nsIDOMCommandEvent.h" namespace mozilla { namespace dom { -class CommandEvent : public Event, - public nsIDOMCommandEvent +class CommandEvent : public Event { public: CommandEvent(EventTarget* aOwner, @@ -25,24 +23,12 @@ public: NS_DECL_ISUPPORTS_INHERITED - NS_DECL_NSIDOMCOMMANDEVENT - - // Forward to base class - NS_FORWARD_TO_EVENT - virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { return CommandEventBinding::Wrap(aCx, this, aGivenProto); } - void InitCommandEvent(const nsAString& aType, - bool aCanBubble, - bool aCancelable, - const nsAString& aCommand, - ErrorResult& aRv) - { - aRv = InitCommandEvent(aType, aCanBubble, aCancelable, aCommand); - } + void GetCommand(nsAString& aCommand); protected: ~CommandEvent() {} diff --git a/dom/interfaces/events/moz.build b/dom/interfaces/events/moz.build index 2f01a849fea0..a42525871eaa 100644 --- a/dom/interfaces/events/moz.build +++ b/dom/interfaces/events/moz.build @@ -9,7 +9,6 @@ with Files("**"): XPIDL_SOURCES += [ 'nsIDOMClipboardEvent.idl', - 'nsIDOMCommandEvent.idl', 'nsIDOMCustomEvent.idl', 'nsIDOMDataTransfer.idl', 'nsIDOMDragEvent.idl', diff --git a/dom/interfaces/events/nsIDOMCommandEvent.idl b/dom/interfaces/events/nsIDOMCommandEvent.idl deleted file mode 100644 index 3d1b8adc7f57..000000000000 --- a/dom/interfaces/events/nsIDOMCommandEvent.idl +++ /dev/null @@ -1,17 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "nsISupports.idl" - -[builtinclass, uuid(73a50e55-3eaa-4a38-a588-9b68a6d65032)] -interface nsIDOMCommandEvent : nsISupports -{ - readonly attribute DOMString command; - - void initCommandEvent(in DOMString typeArg, - in boolean canBubbleArg, - in boolean canCancelArg, - in DOMString command); -}; diff --git a/dom/webidl/CommandEvent.webidl b/dom/webidl/CommandEvent.webidl index f201bfafd81f..0ce0a4e0f094 100644 --- a/dom/webidl/CommandEvent.webidl +++ b/dom/webidl/CommandEvent.webidl @@ -7,9 +7,4 @@ [Func="IsChromeOrXBL"] interface CommandEvent : Event { readonly attribute DOMString? command; - - void initCommandEvent(DOMString type, - optional boolean canBubble = false, - optional boolean cancelable = false, - optional DOMString? command = null); }; diff --git a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp index 537742467342..1c6b98be9b2d 100644 --- a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp +++ b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp @@ -13,7 +13,6 @@ #include "nsIDOMClientRect.h" #include "nsIDOMClientRectList.h" #include "nsIDOMClipboardEvent.h" -#include "nsIDOMCommandEvent.h" #include "nsIDOMComment.h" #include "nsIDOMCustomEvent.h" #ifdef MOZ_WEBRTC @@ -79,7 +78,6 @@ #include "mozilla/dom/DOMRectBinding.h" #include "mozilla/dom/DOMRectListBinding.h" #include "mozilla/dom/ClipboardEventBinding.h" -#include "mozilla/dom/CommandEventBinding.h" #include "mozilla/dom/CommentBinding.h" #include "mozilla/dom/ContainerBoxObjectBinding.h" #include "mozilla/dom/CSSPrimitiveValueBinding.h" @@ -220,7 +218,6 @@ const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] = DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMClientRect, DOMRectReadOnly), DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMClientRectList, DOMRectList), DEFINE_SHIM(ClipboardEvent), - DEFINE_SHIM(CommandEvent), DEFINE_SHIM(Comment), DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIContainerBoxObject, ContainerBoxObject), DEFINE_SHIM(CustomEvent),