Bug 920425 part.12 Use mozilla::WidgetEvent::AsMutationEvent() r=smaug

This commit is contained in:
Masayuki Nakano 2013-10-18 15:10:22 +09:00
parent d4d94ab0d7
commit 6050d7c183
3 changed files with 12 additions and 15 deletions

View File

@ -155,8 +155,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDOMEvent)
tmp->mEvent->AsClipboardEvent()->clipboardData = nullptr;
break;
case NS_MUTATION_EVENT:
static_cast<InternalMutationEvent*>(tmp->mEvent)->mRelatedNode =
nullptr;
tmp->mEvent->AsMutationEvent()->mRelatedNode = nullptr;
break;
case NS_FOCUS_EVENT:
tmp->mEvent->AsFocusEvent()->relatedTarget = nullptr;
@ -199,8 +198,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDOMEvent)
break;
case NS_MUTATION_EVENT:
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->mRelatedNode");
cb.NoteXPCOMChild(
static_cast<InternalMutationEvent*>(tmp->mEvent)->mRelatedNode);
cb.NoteXPCOMChild(tmp->mEvent->AsMutationEvent()->mRelatedNode);
break;
case NS_FOCUS_EVENT:
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->relatedTarget");
@ -639,8 +637,7 @@ nsDOMEvent::DuplicatePrivateData()
{
InternalMutationEvent* mutationEvent =
new InternalMutationEvent(false, msg);
InternalMutationEvent* oldMutationEvent =
static_cast<InternalMutationEvent*>(mEvent);
InternalMutationEvent* oldMutationEvent = mEvent->AsMutationEvent();
mutationEvent->AssignMutationEventData(*oldMutationEvent, true);
newEvent = mutationEvent;
break;

View File

@ -30,8 +30,8 @@ NS_IMPL_RELEASE_INHERITED(nsDOMMutationEvent, nsDOMEvent)
already_AddRefed<nsINode>
nsDOMMutationEvent::GetRelatedNode()
{
nsCOMPtr<nsINode> n = do_QueryInterface(
static_cast<InternalMutationEvent*>(mEvent)->mRelatedNode);
nsCOMPtr<nsINode> n =
do_QueryInterface(mEvent->AsMutationEvent()->mRelatedNode);
return n.forget();
}
@ -47,7 +47,7 @@ nsDOMMutationEvent::GetRelatedNode(nsIDOMNode** aRelatedNode)
NS_IMETHODIMP
nsDOMMutationEvent::GetPrevValue(nsAString& aPrevValue)
{
InternalMutationEvent* mutation = static_cast<InternalMutationEvent*>(mEvent);
InternalMutationEvent* mutation = mEvent->AsMutationEvent();
if (mutation->mPrevAttrValue)
mutation->mPrevAttrValue->ToString(aPrevValue);
return NS_OK;
@ -56,7 +56,7 @@ nsDOMMutationEvent::GetPrevValue(nsAString& aPrevValue)
NS_IMETHODIMP
nsDOMMutationEvent::GetNewValue(nsAString& aNewValue)
{
InternalMutationEvent* mutation = static_cast<InternalMutationEvent*>(mEvent);
InternalMutationEvent* mutation = mEvent->AsMutationEvent();
if (mutation->mNewAttrValue)
mutation->mNewAttrValue->ToString(aNewValue);
return NS_OK;
@ -65,7 +65,7 @@ nsDOMMutationEvent::GetNewValue(nsAString& aNewValue)
NS_IMETHODIMP
nsDOMMutationEvent::GetAttrName(nsAString& aAttrName)
{
InternalMutationEvent* mutation = static_cast<InternalMutationEvent*>(mEvent);
InternalMutationEvent* mutation = mEvent->AsMutationEvent();
if (mutation->mAttrName)
mutation->mAttrName->ToString(aAttrName);
return NS_OK;
@ -74,7 +74,7 @@ nsDOMMutationEvent::GetAttrName(nsAString& aAttrName)
uint16_t
nsDOMMutationEvent::AttrChange()
{
return static_cast<InternalMutationEvent*>(mEvent)->mAttrChange;
return mEvent->AsMutationEvent()->mAttrChange;
}
NS_IMETHODIMP
@ -89,8 +89,8 @@ nsDOMMutationEvent::InitMutationEvent(const nsAString& aTypeArg, bool aCanBubble
{
nsresult rv = nsDOMEvent::InitEvent(aTypeArg, aCanBubbleArg, aCancelableArg);
NS_ENSURE_SUCCESS(rv, rv);
InternalMutationEvent* mutation = static_cast<InternalMutationEvent*>(mEvent);
InternalMutationEvent* mutation = mEvent->AsMutationEvent();
mutation->mRelatedNode = aRelatedNodeArg;
if (!aPrevValueArg.IsEmpty())
mutation->mPrevAttrValue = do_GetAtom(aPrevValueArg);

View File

@ -692,7 +692,7 @@ nsEventDispatcher::CreateEvent(mozilla::dom::EventTarget* aOwner,
switch(aEvent->eventStructType) {
case NS_MUTATION_EVENT:
return NS_NewDOMMutationEvent(aDOMEvent, aOwner, aPresContext,
static_cast<InternalMutationEvent*>(aEvent));
aEvent->AsMutationEvent());
case NS_GUI_EVENT:
case NS_SCROLLPORT_EVENT:
case NS_UI_EVENT: