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

Bug 920377 part.26 Get rid of nsInputEvent r=roc

Browse Source
This commit is contained in:
Masayuki Nakano 2013-10-01 16:23:02 +09:00
parent e98333c284
commit 84078f9904
53 changed files with 146 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -761,7 +761,7 @@ public:
* will be respected.
*/
static nsresult DispatchClickEvent(nsPresContext* aPresContext,
nsInputEvent* aSourceEvent,
WidgetInputEvent* aSourceEvent,
nsIContent* aTarget,
bool aFullDispatch,
const EventFlags* aFlags,

5
content/base/src/Element.cpp
View File

@ -1405,7 +1405,7 @@ Element::DispatchEvent(nsPresContext* aPresContext,
/* static */
nsresult
Element::DispatchClickEvent(nsPresContext* aPresContext,
nsInputEvent* aSourceEvent,
WidgetInputEvent* aSourceEvent,
nsIContent* aTarget,
bool aFullDispatch,
const EventFlags* aExtraEventFlags,
@ -2217,7 +2217,8 @@ Element::PostHandleEventForLinks(nsEventChainPostVisitor& aVisitor)
case NS_MOUSE_CLICK:
if (aVisitor.mEvent->IsLeftClickEvent()) {
nsInputEvent* inputEvent = static_cast<nsInputEvent*>(aVisitor.mEvent);
WidgetInputEvent* inputEvent =
static_cast<WidgetInputEvent*>(aVisitor.mEvent);
if (inputEvent->IsControl() || inputEvent->IsMeta() ||
inputEvent->IsAlt() ||inputEvent->IsShift()) {
break;

4
content/events/src/nsDOMDragEvent.cpp
View File

@ -9,9 +9,11 @@
#include "prtime.h"
#include "mozilla/MouseEvents.h"
using namespace mozilla;
nsDOMDragEvent::nsDOMDragEvent(mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext,
nsInputEvent* aEvent)
WidgetInputEvent* aEvent)
: nsDOMMouseEvent(aOwner, aPresContext, aEvent ? aEvent :
new nsDragEvent(false, 0, nullptr))
{

3
content/events/src/nsDOMDragEvent.h
View File

@ -16,7 +16,8 @@ class nsDOMDragEvent : public nsDOMMouseEvent,
{
public:
nsDOMDragEvent(mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext, nsInputEvent* aEvent);
nsPresContext* aPresContext,
mozilla::WidgetInputEvent* aEvent);
virtual ~nsDOMDragEvent();
NS_DECL_ISUPPORTS_INHERITED

4
content/events/src/nsDOMEvent.cpp
View File

@ -530,8 +530,8 @@ nsDOMEvent::DuplicatePrivateData()
}
case NS_INPUT_EVENT:
{
nsInputEvent* oldInputEvent = static_cast<nsInputEvent*>(mEvent);
nsInputEvent* inputEvent = new nsInputEvent(false, msg, nullptr);
WidgetInputEvent* oldInputEvent = static_cast<WidgetInputEvent*>(mEvent);
WidgetInputEvent* inputEvent = new WidgetInputEvent(false, msg, nullptr);
inputEvent->AssignInputEventData(*oldInputEvent, true);
newEvent = inputEvent;
break;

8
content/events/src/nsDOMKeyboardEvent.h
View File

@ -37,22 +37,22 @@ public:
bool AltKey()
{
return static_cast<nsInputEvent*>(mEvent)->IsAlt();
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsAlt();
}
bool CtrlKey()
{
return static_cast<nsInputEvent*>(mEvent)->IsControl();
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsControl();
}
bool ShiftKey()
{
return static_cast<nsInputEvent*>(mEvent)->IsShift();
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsShift();
}
bool MetaKey()
{
return static_cast<nsInputEvent*>(mEvent)->IsMeta();
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsMeta();
}
bool GetModifierState(const nsAString& aKey)

8
content/events/src/nsDOMMouseEvent.cpp
View File

@ -13,7 +13,7 @@ using namespace mozilla;
nsDOMMouseEvent::nsDOMMouseEvent(mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext,
nsInputEvent* aEvent)
WidgetInputEvent* aEvent)
: nsDOMUIEvent(aOwner, aPresContext, aEvent ? aEvent :
new nsMouseEvent(false, 0, nullptr,
nsMouseEvent::eReal))
@ -88,7 +88,7 @@ nsDOMMouseEvent::InitMouseEvent(const nsAString & aType, bool aCanBubble, bool a
{
static_cast<nsMouseEvent_base*>(mEvent)->relatedTarget = aRelatedTarget;
static_cast<nsMouseEvent_base*>(mEvent)->button = aButton;
nsInputEvent* inputEvent = static_cast<nsInputEvent*>(mEvent);
WidgetInputEvent* inputEvent = static_cast<WidgetInputEvent*>(mEvent);
inputEvent->InitBasicModifiers(aCtrlKey, aAltKey, aShiftKey, aMetaKey);
mClientPoint.x = aClientX;
mClientPoint.y = aClientY;
@ -139,7 +139,7 @@ nsDOMMouseEvent::InitMouseEvent(const nsAString& aType,
case NS_WHEEL_EVENT:
case NS_DRAG_EVENT:
case NS_SIMPLE_GESTURE_EVENT:
static_cast<nsInputEvent*>(mEvent)->modifiers = modifiers;
static_cast<WidgetInputEvent*>(mEvent)->modifiers = modifiers;
return NS_OK;
default:
MOZ_CRASH("There is no space to store the modifiers");
@ -430,7 +430,7 @@ nsDOMMouseEvent::GetMozInputSource(uint16_t* aInputSource)
nsresult NS_NewDOMMouseEvent(nsIDOMEvent** aInstancePtrResult,
mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext,
nsInputEvent *aEvent)
WidgetInputEvent* aEvent)
{
nsDOMMouseEvent* it = new nsDOMMouseEvent(aOwner, aPresContext, aEvent);
return CallQueryInterface(it, aInstancePtrResult);

11
content/events/src/nsDOMMouseEvent.h
View File

@ -16,7 +16,8 @@ class nsDOMMouseEvent : public nsDOMUIEvent,
{
public:
nsDOMMouseEvent(mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext, nsInputEvent* aEvent);
nsPresContext* aPresContext,
mozilla::WidgetInputEvent* aEvent);
virtual ~nsDOMMouseEvent();
NS_DECL_ISUPPORTS_INHERITED
@ -45,19 +46,19 @@ public:
int32_t ClientY();
bool CtrlKey()
{
return static_cast<nsInputEvent*>(mEvent)->IsControl();
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsControl();
}
bool ShiftKey()
{
return static_cast<nsInputEvent*>(mEvent)->IsShift();
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsShift();
}
bool AltKey()
{
return static_cast<nsInputEvent*>(mEvent)->IsAlt();
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsAlt();
}
bool MetaKey()
{
return static_cast<nsInputEvent*>(mEvent)->IsMeta();
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsMeta();
}
uint16_t Button();
uint16_t Buttons();

6
content/events/src/nsDOMMouseScrollEvent.cpp
View File

@ -7,9 +7,11 @@
#include "prtime.h"
#include "mozilla/MouseEvents.h"
using namespace mozilla;
nsDOMMouseScrollEvent::nsDOMMouseScrollEvent(mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext,
nsInputEvent* aEvent)
WidgetInputEvent* aEvent)
: nsDOMMouseEvent(aOwner, aPresContext,
aEvent ? aEvent : new nsMouseScrollEvent(false, 0, nullptr))
{
@ -94,7 +96,7 @@ nsDOMMouseScrollEvent::Axis()
nsresult NS_NewDOMMouseScrollEvent(nsIDOMEvent** aInstancePtrResult,
mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext,
nsInputEvent *aEvent)
WidgetInputEvent* aEvent)
{
nsDOMMouseScrollEvent* it =
new nsDOMMouseScrollEvent(aOwner, aPresContext, aEvent);

3
content/events/src/nsDOMMouseScrollEvent.h
View File

@ -15,7 +15,8 @@ class nsDOMMouseScrollEvent : public nsDOMMouseEvent,
{
public:
nsDOMMouseScrollEvent(mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext, nsInputEvent* aEvent);
nsPresContext* aPresContext,
mozilla::WidgetInputEvent* aEvent);
virtual ~nsDOMMouseScrollEvent();
NS_DECL_ISUPPORTS_INHERITED

4
content/events/src/nsDOMTouchEvent.cpp
View File

@ -115,8 +115,8 @@ nsDOMTouchEvent::InitTouchEvent(const nsAString& aType,
return;
}
static_cast<nsInputEvent*>(mEvent)->InitBasicModifiers(aCtrlKey, aAltKey,
aShiftKey, aMetaKey);
static_cast<WidgetInputEvent*>(mEvent)->
InitBasicModifiers(aCtrlKey, aAltKey, aShiftKey, aMetaKey);
mTouches = aTouches;
mTargetTouches = aTargetTouches;
mChangedTouches = aChangedTouches;

8
content/events/src/nsDOMTouchEvent.h
View File

@ -101,22 +101,22 @@ public:
bool AltKey()
{
return static_cast<nsInputEvent*>(mEvent)->IsAlt();
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsAlt();
}
bool MetaKey()
{
return static_cast<nsInputEvent*>(mEvent)->IsMeta();
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsMeta();
}
bool CtrlKey()
{
return static_cast<nsInputEvent*>(mEvent)->IsControl();
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsControl();
}
bool ShiftKey()
{
return static_cast<nsInputEvent*>(mEvent)->IsShift();
return static_cast<mozilla::WidgetInputEvent*>(mEvent)->IsShift();
}
void InitTouchEvent(const nsAString& aType,

4
content/events/src/nsDOMUIEvent.cpp
View File

@ -463,9 +463,9 @@ bool
nsDOMUIEvent::GetModifierStateInternal(const nsAString& aKey)
{
if (!mEvent->IsInputDerivedEvent()) {
MOZ_CRASH("mEvent must be nsInputEvent or derived class");
MOZ_CRASH("mEvent must be WidgetInputEvent or derived class");
}
nsInputEvent* inputEvent = static_cast<nsInputEvent*>(mEvent);
WidgetInputEvent* inputEvent = static_cast<WidgetInputEvent*>(mEvent);
if (aKey.EqualsLiteral(NS_DOM_KEYNAME_SHIFT)) {
return inputEvent->IsShift();
}

8
content/events/src/nsDOMXULCommandEvent.cpp
View File

@ -7,11 +7,13 @@
#include "nsDOMXULCommandEvent.h"
#include "prtime.h"
using namespace mozilla;
nsDOMXULCommandEvent::nsDOMXULCommandEvent(mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext,
nsInputEvent* aEvent)
WidgetInputEvent* aEvent)
: nsDOMUIEvent(aOwner, aPresContext,
aEvent ? aEvent : new nsInputEvent(false, 0, nullptr))
aEvent ? aEvent : new WidgetInputEvent(false, 0, nullptr))
{
if (aEvent) {
mEventIsInternal = false;
@ -95,7 +97,7 @@ nsDOMXULCommandEvent::InitCommandEvent(const nsAString& aType,
nsresult NS_NewDOMXULCommandEvent(nsIDOMEvent** aInstancePtrResult,
mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext,
nsInputEvent *aEvent)
WidgetInputEvent* aEvent)
{
nsDOMXULCommandEvent* it =
new nsDOMXULCommandEvent(aOwner, aPresContext, aEvent);

7
content/events/src/nsDOMXULCommandEvent.h
View File

@ -18,7 +18,8 @@ class nsDOMXULCommandEvent : public nsDOMUIEvent,
{
public:
nsDOMXULCommandEvent(mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext, nsInputEvent* aEvent);
nsPresContext* aPresContext,
mozilla::WidgetInputEvent* aEvent);
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMXULCommandEvent, nsDOMUIEvent)
@ -76,8 +77,8 @@ public:
protected:
// Convenience accessor for the event
nsInputEvent* Event() {
return static_cast<nsInputEvent*>(mEvent);
mozilla::WidgetInputEvent* Event() {
return static_cast<mozilla::WidgetInputEvent*>(mEvent);
}
nsCOMPtr<nsIDOMEvent> mSourceEvent;

4
content/events/src/nsEventDispatcher.cpp
View File

@ -710,13 +710,13 @@ nsEventDispatcher::CreateEvent(mozilla::dom::EventTarget* aOwner,
aPresContext, static_cast<WidgetCompositionEvent*>(aEvent));
case NS_MOUSE_EVENT:
return NS_NewDOMMouseEvent(aDOMEvent, aOwner, aPresContext,
static_cast<nsInputEvent*>(aEvent));
static_cast<WidgetInputEvent*>(aEvent));
case NS_FOCUS_EVENT:
return NS_NewDOMFocusEvent(aDOMEvent, aOwner, aPresContext,
static_cast<InternalFocusEvent*>(aEvent));
case NS_MOUSE_SCROLL_EVENT:
return NS_NewDOMMouseScrollEvent(aDOMEvent, aOwner, aPresContext,
static_cast<nsInputEvent*>(aEvent));
static_cast<WidgetInputEvent*>(aEvent));
case NS_WHEEL_EVENT:
return NS_NewDOMWheelEvent(aDOMEvent, aOwner, aPresContext,
static_cast<WheelEvent*>(aEvent));

7
content/events/src/nsEventStateManager.cpp
View File

@ -3400,10 +3400,9 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
nsIFocusManager* fm = nsFocusManager::GetFocusManager();
if (fm && mDocument) {
// Shift focus forward or back depending on shift key
bool isDocMove = ((nsInputEvent*)aEvent)->IsControl() ||
(keyEvent->keyCode == NS_VK_F6);
uint32_t dir =
static_cast<nsInputEvent*>(aEvent)->IsShift() ?
bool isDocMove =
keyEvent->IsControl() || keyEvent->keyCode == NS_VK_F6;
uint32_t dir = keyEvent->IsShift() ?
(isDocMove ? static_cast<uint32_t>(nsIFocusManager::MOVEFOCUS_BACKWARDDOC) :
static_cast<uint32_t>(nsIFocusManager::MOVEFOCUS_BACKWARD)) :
(isDocMove ? static_cast<uint32_t>(nsIFocusManager::MOVEFOCUS_FORWARDDOC) :

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

@ -3696,7 +3696,8 @@ HTMLInputElement::PostHandleEventForRangeThumb(nsEventChainPostVisitor& aVisitor
if (nsIPresShell::GetCapturingContent()) {
break; // don't start drag if someone else is already capturing
}
nsInputEvent* inputEvent = static_cast<nsInputEvent*>(aVisitor.mEvent);
WidgetInputEvent* inputEvent =
static_cast<WidgetInputEvent*>(aVisitor.mEvent);
if (inputEvent->IsShift() || inputEvent->IsControl() ||
inputEvent->IsAlt() || inputEvent->IsMeta() ||
inputEvent->IsAltGraph() || inputEvent->IsFn() ||
@ -3732,8 +3733,9 @@ HTMLInputElement::PostHandleEventForRangeThumb(nsEventChainPostVisitor& aVisitor
CancelRangeThumbDrag();
break;
}
SetValueOfRangeForUserEvent(rangeFrame->GetValueAtEventPoint(
static_cast<nsInputEvent*>(aVisitor.mEvent)));
SetValueOfRangeForUserEvent(
rangeFrame->GetValueAtEventPoint(
static_cast<WidgetInputEvent*>(aVisitor.mEvent)));
aVisitor.mEvent->mFlags.mMultipleActionsPrevented = true;
break;
@ -3746,7 +3748,7 @@ HTMLInputElement::PostHandleEventForRangeThumb(nsEventChainPostVisitor& aVisitor
// call CancelRangeThumbDrag() if that is the case. We just finish off
// the drag and set our final value (unless someone has called
// preventDefault() and prevents us getting here).
FinishRangeThumbDrag(static_cast<nsInputEvent*>(aVisitor.mEvent));
FinishRangeThumbDrag(static_cast<WidgetInputEvent*>(aVisitor.mEvent));
aVisitor.mEvent->mFlags.mMultipleActionsPrevented = true;
break;

2
content/html/content/src/HTMLLabelElement.cpp
View File

@ -197,7 +197,7 @@ HTMLLabelElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
EventFlags eventFlags;
eventFlags.mMultipleActionsPrevented = true;
DispatchClickEvent(aVisitor.mPresContext,
static_cast<nsInputEvent*>(aVisitor.mEvent),
static_cast<WidgetInputEvent*>(aVisitor.mEvent),
content, false, &eventFlags, &status);
// Do we care about the status this returned? I don't think we do...
// Don't run another <label> off of this click

2
content/xbl/src/nsXBLPrototypeHandler.cpp
View File

@ -912,7 +912,7 @@ nsXBLPrototypeHandler::ModifiersMatchMask(nsIDOMUIEvent* aEvent,
{
nsEvent* event = aEvent->GetInternalNSEvent();
NS_ENSURE_TRUE(event && event->IsInputDerivedEvent(), false);
nsInputEvent* inputEvent = static_cast<nsInputEvent*>(event);
WidgetInputEvent* inputEvent = static_cast<WidgetInputEvent*>(event);
if (mKeyMask & cMetaMask) {
if (inputEvent->IsMeta() != ((mKeyMask & cMeta) != 0)) {

4
content/xul/content/src/nsXULElement.cpp
View File

@ -1190,8 +1190,8 @@ nsXULElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
}
}
nsInputEvent* orig =
static_cast<nsInputEvent*>(aVisitor.mEvent);
WidgetInputEvent* orig =
static_cast<WidgetInputEvent*>(aVisitor.mEvent);
nsContentUtils::DispatchXULCommand(
commandContent,
aVisitor.mEvent->mFlags.mIsTrusted,

6
dom/interfaces/events/nsIDOMEvent.idl
View File

@ -242,7 +242,7 @@ nsresult
NS_NewDOMMouseEvent(nsIDOMEvent** aInstancePtrResult,
mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext,
nsInputEvent* aEvent);
mozilla::WidgetInputEvent* aEvent);
nsresult
NS_NewDOMFocusEvent(nsIDOMEvent** aInstancePtrResult,
mozilla::dom::EventTarget* aOwner,
@ -252,7 +252,7 @@ nsresult
NS_NewDOMMouseScrollEvent(nsIDOMEvent** aInstancePtrResult,
mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext,
nsInputEvent* aEvent);
mozilla::WidgetInputEvent* aEvent);
nsresult
NS_NewDOMWheelEvent(nsIDOMEvent** aInstancePtrResult,
mozilla::dom::EventTarget* aOwner,
@ -318,7 +318,7 @@ nsresult
NS_NewDOMXULCommandEvent(nsIDOMEvent** aResult,
mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext,
nsInputEvent* aEvent);
mozilla::WidgetInputEvent* aEvent);
nsresult
NS_NewDOMCommandEvent(nsIDOMEvent** aInstancePtrResult,
mozilla::dom::EventTarget* aOwner,

4
dom/ipc/TabParent.cpp
View File

@ -1532,8 +1532,8 @@ TabParent::UseAsyncPanZoom()
}
void
TabParent::MaybeForwardEventToRenderFrame(const nsInputEvent& aEvent,
nsInputEvent* aOutEvent)
TabParent::MaybeForwardEventToRenderFrame(const WidgetInputEvent& aEvent,
WidgetInputEvent* aOutEvent)
{
if (RenderFrameParent* rfp = GetRenderFrame()) {
rfp->NotifyInputEvent(aEvent, aOutEvent);

4
dom/ipc/TabParent.h
View File

@ -324,8 +324,8 @@ private:
// to dispatch |aEvent| to our child. If there's a relevant
// transform in place, |aOutEvent| is the transformed |aEvent| to
// dispatch to content.
void MaybeForwardEventToRenderFrame(const nsInputEvent& aEvent,
nsInputEvent* aOutEvent);
void MaybeForwardEventToRenderFrame(const WidgetInputEvent& aEvent,
WidgetInputEvent* aOutEvent);
// The offset for the child process which is sampled at touch start. This
// means that the touch events are relative to where the frame was at the
// start of the touch. We need to look for a better solution to this

2
dom/plugins/base/nsPluginInstanceOwner.cpp
View File

@ -1963,7 +1963,7 @@ nsPluginInstanceOwner::HandleEvent(nsIDOMEvent* aEvent)
}
#ifdef MOZ_X11
static unsigned int XInputEventState(const nsInputEvent& anEvent)
static unsigned int XInputEventState(const WidgetInputEvent& anEvent)
{
unsigned int state = 0;
if (anEvent.IsShift()) state |= ShiftMask;

10
gfx/layers/composite/APZCTreeManager.cpp
View File

@ -378,8 +378,8 @@ APZCTreeManager::ProcessMouseEvent(const nsMouseEvent& aEvent,
}
nsEventStatus
APZCTreeManager::ProcessEvent(const nsInputEvent& aEvent,
nsInputEvent* aOutEvent)
APZCTreeManager::ProcessEvent(const WidgetInputEvent& aEvent,
WidgetInputEvent* aOutEvent)
{
// Transform the refPoint
nsRefPtr<AsyncPanZoomController> apzc = GetTargetAPZC(ScreenPoint(aEvent.refPoint.x, aEvent.refPoint.y));
@ -396,8 +396,8 @@ APZCTreeManager::ProcessEvent(const nsInputEvent& aEvent,
}
nsEventStatus
APZCTreeManager::ReceiveInputEvent(const nsInputEvent& aEvent,
nsInputEvent* aOutEvent)
APZCTreeManager::ReceiveInputEvent(const WidgetInputEvent& aEvent,
WidgetInputEvent* aOutEvent)
{
MOZ_ASSERT(NS_IsMainThread());
@ -431,7 +431,7 @@ APZCTreeManager::ReceiveInputEvent(const nsInputEvent& aEvent,
}
nsEventStatus
APZCTreeManager::ReceiveInputEvent(nsInputEvent& aEvent)
APZCTreeManager::ReceiveInputEvent(WidgetInputEvent& aEvent)
{
MOZ_ASSERT(NS_IsMainThread());

22
gfx/layers/composite/APZCTreeManager.h
View File

@ -12,7 +12,7 @@
#include "gfxPoint.h" // for gfxPoint
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "mozilla/Assertions.h" // for MOZ_ASSERT_HELPER2
#include "mozilla/EventForwards.h" // for nsInputEvent, nsEventStatus
#include "mozilla/EventForwards.h" // for WidgetInputEvent, nsEventStatus
#include "mozilla/Monitor.h" // for Monitor
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsCOMPtr.h" // for already_AddRefed
@ -146,30 +146,30 @@ public:
nsEventStatus ReceiveInputEvent(const InputData& aEvent);
/**
* nsInputEvent handler. Sets |aOutEvent| (which is assumed to be an
* already-existing instance of an nsInputEvent which may be an
* WidgetInputEvent handler. Sets |aOutEvent| (which is assumed to be an
* already-existing instance of an WidgetInputEvent which may be an
* WidgetTouchEvent) to have its coordinates in DOM space. This is so that the
* event can be passed through the DOM and content can handle them.
*
* NOTE: Be careful of invoking the nsInputEvent variant. This can only be
* NOTE: Be careful of invoking the WidgetInputEvent variant. This can only be
* called on the main thread. See widget/InputData.h for more information on
* why we have InputData and nsInputEvent separated.
* why we have InputData and WidgetInputEvent separated.
* NOTE: On unix, mouse events are treated as touch and are forwarded
* to the appropriate apz as such.
*
* @param aEvent input event object, will not be modified
* @param aOutEvent event object transformed to DOM coordinate space.
*/
nsEventStatus ReceiveInputEvent(const nsInputEvent& aEvent,
nsInputEvent* aOutEvent);
nsEventStatus ReceiveInputEvent(const WidgetInputEvent& aEvent,
WidgetInputEvent* aOutEvent);
/**
* nsInputEvent handler with inline dom transform of the passed in
* nsInputEvent. Must be called on the main thread.
* WidgetInputEvent handler with inline dom transform of the passed in
* WidgetInputEvent. Must be called on the main thread.
*
* @param aEvent input event object
*/
nsEventStatus ReceiveInputEvent(nsInputEvent& aEvent);
nsEventStatus ReceiveInputEvent(WidgetInputEvent& aEvent);
/**
* Updates the composition bounds, i.e. the dimensions of the final size of
@ -303,7 +303,7 @@ private:
AsyncPanZoomController* GetTouchInputBlockAPZC(const WidgetTouchEvent& aEvent, ScreenPoint aPoint);
nsEventStatus ProcessTouchEvent(const WidgetTouchEvent& touchEvent, WidgetTouchEvent* aOutEvent);
nsEventStatus ProcessMouseEvent(const nsMouseEvent& mouseEvent, nsMouseEvent* aOutEvent);
nsEventStatus ProcessEvent(const nsInputEvent& inputEvent, nsInputEvent* aOutEvent);
nsEventStatus ProcessEvent(const WidgetInputEvent& inputEvent, WidgetInputEvent* aOutEvent);
/**
* Recursive helper function to build the APZC tree. The tree of APZC instances has

2
layout/base/nsPresShell.h
View File

@ -563,7 +563,7 @@ protected:
nsDelayedInputEvent()
: nsDelayedEvent(), mEvent(nullptr) {}
nsInputEvent* mEvent;
mozilla::WidgetInputEvent* mEvent;
};
class nsDelayedMouseEvent : public nsDelayedInputEvent

3
layout/generic/nsFrame.cpp
View File

@ -2586,9 +2586,8 @@ nsFrame::HandlePress(nsPresContext* aPresContext,
//weaaak. only the editor can display frame selection not just text and images
isEditor = isEditor == nsISelectionDisplay::DISPLAY_ALL;
nsInputEvent* keyEvent = (nsInputEvent*)aEvent;
WidgetInputEvent* keyEvent = static_cast<WidgetInputEvent*>(aEvent);
if (!keyEvent->IsAlt()) {
for (nsIContent* content = mContent; content;
content = content->GetParent()) {
if (nsContentUtils::ContentIsDraggable(content) &&

4
layout/ipc/RenderFrameParent.cpp
View File

@ -826,8 +826,8 @@ RenderFrameParent::OwnerContentChanged(nsIContent* aContent)
}
void
RenderFrameParent::NotifyInputEvent(const nsInputEvent& aEvent,
nsInputEvent* aOutEvent)
RenderFrameParent::NotifyInputEvent(const WidgetInputEvent& aEvent,
WidgetInputEvent* aOutEvent)
{
if (GetApzcTreeManager()) {
GetApzcTreeManager()->ReceiveInputEvent(aEvent, aOutEvent);

4
layout/ipc/RenderFrameParent.h
View File

@ -93,8 +93,8 @@ public:
void SetBackgroundColor(nscolor aColor) { mBackgroundColor = gfxRGBA(aColor); };
void NotifyInputEvent(const nsInputEvent& aEvent,
nsInputEvent* aOutEvent);
void NotifyInputEvent(const WidgetInputEvent& aEvent,
WidgetInputEvent* aOutEvent);
void NotifyDimensionsChanged(ScreenIntSize size);

8
layout/xul/base/src/nsButtonBoxFrame.cpp
View File

@ -129,10 +129,10 @@ nsButtonBoxFrame::DoMouseClick(nsGUIEvent* aEvent, bool aTrustEvent)
bool isAlt = false;
bool isMeta = false;
if(aEvent) {
isShift = ((nsInputEvent*)(aEvent))->IsShift();
isControl = ((nsInputEvent*)(aEvent))->IsControl();
isAlt = ((nsInputEvent*)(aEvent))->IsAlt();
isMeta = ((nsInputEvent*)(aEvent))->IsMeta();
isShift = static_cast<WidgetInputEvent*>(aEvent)->IsShift();
isControl = static_cast<WidgetInputEvent*>(aEvent)->IsControl();
isAlt = static_cast<WidgetInputEvent*>(aEvent)->IsAlt();
isMeta = static_cast<WidgetInputEvent*>(aEvent)->IsMeta();
}
// Have the content handle the event, propagating it according to normal DOM rules.

4
layout/xul/base/src/nsMenuBarListener.cpp
View File

@ -270,8 +270,8 @@ uint32_t
nsMenuBarListener::GetModifiers(nsIDOMKeyEvent* aKeyEvent)
{
uint32_t modifiers = 0;
nsInputEvent* inputEvent =
static_cast<nsInputEvent*>(aKeyEvent->GetInternalNSEvent());
WidgetInputEvent* inputEvent =
static_cast<WidgetInputEvent*>(aKeyEvent->GetInternalNSEvent());
MOZ_ASSERT(inputEvent);
if (inputEvent->IsShift()) {

8
layout/xul/base/src/nsMenuFrame.cpp
View File

@ -1248,10 +1248,10 @@ nsMenuFrame::CreateMenuCommandEvent(nsGUIEvent *aEvent, bool aFlipChecked)
bool shift = false, control = false, alt = false, meta = false;
if (aEvent && (aEvent->eventStructType == NS_MOUSE_EVENT ||
aEvent->eventStructType == NS_KEY_EVENT)) {
shift = static_cast<nsInputEvent *>(aEvent)->IsShift();
control = static_cast<nsInputEvent *>(aEvent)->IsControl();
alt = static_cast<nsInputEvent *>(aEvent)->IsAlt();
meta = static_cast<nsInputEvent *>(aEvent)->IsMeta();
shift = static_cast<WidgetInputEvent*>(aEvent)->IsShift();
control = static_cast<WidgetInputEvent*>(aEvent)->IsControl();
alt = static_cast<WidgetInputEvent*>(aEvent)->IsAlt();
meta = static_cast<WidgetInputEvent*>(aEvent)->IsMeta();
}
// Because the command event is firing asynchronously, a flag is needed to

2
layout/xul/base/src/nsXULPopupManager.cpp
View File

@ -482,7 +482,7 @@ nsXULPopupManager::InitTriggerEvent(nsIDOMEvent* aEvent, nsIContent* aPopup,
if (event) {
if (event->eventStructType == NS_MOUSE_EVENT ||
event->eventStructType == NS_KEY_EVENT) {
mCachedModifiers = static_cast<nsInputEvent*>(event)->modifiers;
mCachedModifiers = static_cast<WidgetInputEvent*>(event)->modifiers;
}
nsIDocument* doc = aPopup->GetCurrentDoc();
if (doc) {

1
widget/BasicEvents.h
View File

@ -1025,6 +1025,5 @@ public:
// TODO: Remove following typedefs
typedef mozilla::WidgetEvent nsEvent;
typedef mozilla::WidgetGUIEvent nsGUIEvent;
typedef mozilla::WidgetInputEvent nsInputEvent;
#endif // mozilla_BasicEvents_h__

1
widget/EventForwards.h
View File

@ -105,7 +105,6 @@ class InternalMutationEvent;
// TODO: Remove following typedefs
typedef mozilla::WidgetEvent nsEvent;
typedef mozilla::WidgetGUIEvent nsGUIEvent;
typedef mozilla::WidgetInputEvent nsInputEvent;
typedef mozilla::WidgetMouseEventBase nsMouseEvent_base;
typedef mozilla::WidgetMouseEvent nsMouseEvent;
typedef mozilla::WidgetDragEvent nsDragEvent;

5
widget/InputData.h
View File

@ -44,8 +44,9 @@ public:
InputType mInputType;
// Time in milliseconds that this data is relevant to. This only really
// matters when this data is used as an event. We use uint32_t instead of
// TimeStamp because it is easier to convert from nsInputEvent. The time is
// platform-specific but it in the case of B2G and Fennec it is since startup.
// TimeStamp because it is easier to convert from WidgetInputEvent. The time
// is platform-specific but it in the case of B2G and Fennec it is since
// startup.
uint32_t mTime;
INPUTDATA_AS_CHILD_TYPE(MultiTouchInput, MULTITOUCH_INPUT)

2
widget/android/nsWindow.cpp
View File

@ -1314,7 +1314,7 @@ nsWindow::DispatchGestureEvent(uint32_t msg, uint32_t direction, double delta,
void
nsWindow::DispatchMotionEvent(nsInputEvent &event, AndroidGeckoEvent *ae,
nsWindow::DispatchMotionEvent(WidgetInputEvent &event, AndroidGeckoEvent *ae,
const nsIntPoint &refPoint)
{
nsIntPoint offset = WidgetToScreenOffset();

2
widget/android/nsWindow.h
View File

@ -224,7 +224,7 @@ private:
void InitKeyEvent(mozilla::WidgetKeyboardEvent& event,
mozilla::AndroidGeckoEvent& key,
ANPEvent* pluginEvent);
void DispatchMotionEvent(nsInputEvent &event,
void DispatchMotionEvent(mozilla::WidgetInputEvent &event,
mozilla::AndroidGeckoEvent *ae,
const nsIntPoint &refPoint);
void DispatchGestureEvent(uint32_t msg, uint32_t direction, double delta,

2
widget/cocoa/TextInputHandler.mm
View File

@ -4178,7 +4178,7 @@ bool
TextInputHandlerBase::DispatchEvent(nsGUIEvent& aEvent)
{
if (aEvent.message == NS_KEY_PRESS) {
nsInputEvent& inputEvent = static_cast<nsInputEvent&>(aEvent);
WidgetInputEvent& inputEvent = static_cast<WidgetInputEvent&>(aEvent);
if (!inputEvent.IsMeta()) {
PR_LOG(gLog, PR_LOG_ALWAYS,
("%p TextInputHandlerBase::DispatchEvent, hiding mouse cursor", this));

6
widget/cocoa/nsChildView.mm
View File

@ -140,7 +140,8 @@ uint32_t nsChildView::sLastInputEventCount = 0;
- (void)forceRefreshOpenGL;
// set up a gecko mouse event based on a cocoa mouse event
- (void) convertCocoaMouseEvent:(NSEvent*)aMouseEvent toGeckoEvent:(nsInputEvent*)outGeckoEvent;
- (void) convertCocoaMouseEvent:(NSEvent*)aMouseEvent
toGeckoEvent:(WidgetInputEvent*)outGeckoEvent;
- (NSMenu*)contextMenu;
@ -4833,7 +4834,8 @@ static int32_t RoundUp(double aDouble)
NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
}
- (void) convertCocoaMouseEvent:(NSEvent*)aMouseEvent toGeckoEvent:(nsInputEvent*)outGeckoEvent
- (void) convertCocoaMouseEvent:(NSEvent*)aMouseEvent
toGeckoEvent:(WidgetInputEvent*)outGeckoEvent
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;

6
widget/cocoa/nsCocoaUtils.h
View File

@ -289,11 +289,11 @@ class nsCocoaUtils
static void InitPluginEvent(mozilla::WidgetPluginEvent &aPluginEvent,
NPCocoaEvent &aCocoaEvent);
/**
* Initializes nsInputEvent for aNativeEvent or aModifiers.
* Initializes WidgetInputEvent for aNativeEvent or aModifiers.
*/
static void InitInputEvent(nsInputEvent &aInputEvent,
static void InitInputEvent(mozilla::WidgetInputEvent &aInputEvent,
NSEvent* aNativeEvent);
static void InitInputEvent(nsInputEvent &aInputEvent,
static void InitInputEvent(mozilla::WidgetInputEvent &aInputEvent,
NSUInteger aModifiers);
/**

4
widget/cocoa/nsCocoaUtils.mm
View File

@ -430,7 +430,7 @@ nsCocoaUtils::InitPluginEvent(WidgetPluginEvent &aPluginEvent,
// static
void
nsCocoaUtils::InitInputEvent(nsInputEvent &aInputEvent,
nsCocoaUtils::InitInputEvent(WidgetInputEvent& aInputEvent,
NSEvent* aNativeEvent)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
@ -446,7 +446,7 @@ nsCocoaUtils::InitInputEvent(nsInputEvent &aInputEvent,
// static
void
nsCocoaUtils::InitInputEvent(nsInputEvent &aInputEvent,
nsCocoaUtils::InitInputEvent(WidgetInputEvent& aInputEvent,
NSUInteger aModifiers)
{
aInputEvent.modifiers = 0;

2
widget/gtk/nsGtkKeyUtils.cpp
View File

@ -495,7 +495,7 @@ KeymapWrapper::AreModifiersActive(Modifiers aModifiers,
}
/* static */ void
KeymapWrapper::InitInputEvent(nsInputEvent& aInputEvent,
KeymapWrapper::InitInputEvent(WidgetInputEvent& aInputEvent,
guint aModifierState)
{
KeymapWrapper* keymapWrapper = GetInstance();

2
widget/gtk/nsGtkKeyUtils.h
View File

@ -102,7 +102,7 @@ public:
/**
* InitInputEvent() initializes the aInputEvent with aModifierState.
*/
static void InitInputEvent(nsInputEvent& aInputEvent,
static void InitInputEvent(WidgetInputEvent& aInputEvent,
guint aModifierState);
/**

19
widget/nsGUIEventIPC.h
View File

@ -82,9 +82,9 @@ struct ParamTraits<nsGUIEvent>
};
template<>
struct ParamTraits<nsInputEvent>
struct ParamTraits<mozilla::WidgetInputEvent>
{
typedef nsInputEvent paramType;
typedef mozilla::WidgetInputEvent paramType;
static void Write(Message* aMsg, const paramType& aParam)
{
@ -106,7 +106,7 @@ struct ParamTraits<nsMouseEvent_base>
static void Write(Message* aMsg, const paramType& aParam)
{
WriteParam(aMsg, static_cast<nsInputEvent>(aParam));
WriteParam(aMsg, static_cast<mozilla::WidgetInputEvent>(aParam));
WriteParam(aMsg, aParam.button);
WriteParam(aMsg, aParam.buttons);
WriteParam(aMsg, aParam.pressure);
@ -115,7 +115,8 @@ struct ParamTraits<nsMouseEvent_base>
static bool Read(const Message* aMsg, void** aIter, paramType* aResult)
{
return ReadParam(aMsg, aIter, static_cast<nsInputEvent*>(aResult)) &&
return ReadParam(aMsg, aIter,
static_cast<mozilla::WidgetInputEvent*>(aResult)) &&
ReadParam(aMsg, aIter, &aResult->button) &&
ReadParam(aMsg, aIter, &aResult->buttons) &&
ReadParam(aMsg, aIter, &aResult->pressure) &&
@ -207,7 +208,7 @@ struct ParamTraits<mozilla::WidgetTouchEvent>
static void Write(Message* aMsg, const paramType& aParam)
{
WriteParam(aMsg, static_cast<const nsInputEvent&>(aParam));
WriteParam(aMsg, static_cast<const mozilla::WidgetInputEvent&>(aParam));
// Sigh, Touch bites us again! We want to be able to do
// WriteParam(aMsg, aParam.touches);
const nsTArray< nsRefPtr<mozilla::dom::Touch> >& touches = aParam.touches;
@ -225,7 +226,8 @@ struct ParamTraits<mozilla::WidgetTouchEvent>
static bool Read(const Message* aMsg, void** aIter, paramType* aResult)
{
uint32_t numTouches;
if (!ReadParam(aMsg, aIter, static_cast<nsInputEvent*>(aResult)) ||
if (!ReadParam(aMsg, aIter,
static_cast<mozilla::WidgetInputEvent*>(aResult)) ||
!ReadParam(aMsg, aIter, &numTouches)) {
return false;
}
@ -258,7 +260,7 @@ struct ParamTraits<mozilla::WidgetKeyboardEvent>
static void Write(Message* aMsg, const paramType& aParam)
{
WriteParam(aMsg, static_cast<nsInputEvent>(aParam));
WriteParam(aMsg, static_cast<mozilla::WidgetInputEvent>(aParam));
WriteParam(aMsg, static_cast<uint32_t>(aParam.mKeyNameIndex));
WriteParam(aMsg, aParam.keyCode);
WriteParam(aMsg, aParam.charCode);
@ -272,7 +274,8 @@ struct ParamTraits<mozilla::WidgetKeyboardEvent>
static bool Read(const Message* aMsg, void** aIter, paramType* aResult)
{
uint32_t keyNameIndex = 0;
if (ReadParam(aMsg, aIter, static_cast<nsInputEvent*>(aResult)) &&
if (ReadParam(aMsg, aIter,
static_cast<mozilla::WidgetInputEvent*>(aResult)) &&
ReadParam(aMsg, aIter, &keyNameIndex) &&
ReadParam(aMsg, aIter, &aResult->keyCode) &&
ReadParam(aMsg, aIter, &aResult->charCode) &&

4
widget/windows/KeyboardLayout.cpp
View File

@ -125,7 +125,7 @@ ModifierKeyState::Update()
}
void
ModifierKeyState::InitInputEvent(nsInputEvent& aInputEvent) const
ModifierKeyState::InitInputEvent(WidgetInputEvent& aInputEvent) const
{
aInputEvent.modifiers = mModifiers;
@ -143,7 +143,7 @@ ModifierKeyState::InitInputEvent(nsInputEvent& aInputEvent) const
}
void
ModifierKeyState::InitMouseEvent(nsInputEvent& aMouseEvent) const
ModifierKeyState::InitMouseEvent(WidgetInputEvent& aMouseEvent) const
{
NS_ASSERTION(aMouseEvent.eventStructType == NS_MOUSE_EVENT ||
aMouseEvent.eventStructType == NS_WHEEL_EVENT ||

4
widget/windows/KeyboardLayout.h
View File

@ -102,7 +102,7 @@ public:
EnsureAltGr();
}
void InitInputEvent(nsInputEvent& aInputEvent) const;
void InitInputEvent(WidgetInputEvent& aInputEvent) const;
bool IsShift() const { return (mModifiers & MODIFIER_SHIFT) != 0; }
bool IsControl() const { return (mModifiers & MODIFIER_CONTROL) != 0; }
@ -133,7 +133,7 @@ private:
}
}
void InitMouseEvent(nsInputEvent& aMouseEvent) const;
void InitMouseEvent(WidgetInputEvent& aMouseEvent) const;
};
struct UniCharsAndModifiers

2
widget/windows/winrt/MetroInput.cpp
View File

@ -1127,7 +1127,7 @@ MetroInput::HandleLongTap(const Foundation::Point& aPoint)
nsEventStatus MetroInput::sThrowawayStatus;
void
MetroInput::DispatchAsyncEventIgnoreStatus(nsInputEvent* aEvent)
MetroInput::DispatchAsyncEventIgnoreStatus(WidgetInputEvent* aEvent)
{
aEvent->time = ::GetMessageTime();
mModifierKeyState.Update();

2
widget/windows/winrt/MetroInput.h
View File

@ -263,7 +263,7 @@ private:
// that originates from another thread is safe to send sync.
// Async event dispatching
void DispatchAsyncEventIgnoreStatus(nsInputEvent* aEvent);
void DispatchAsyncEventIgnoreStatus(WidgetInputEvent* aEvent);
void DispatchAsyncTouchEventIgnoreStatus(WidgetTouchEvent* aEvent);
void DispatchAsyncTouchEventWithCallback(WidgetTouchEvent* aEvent,
void (MetroInput::*Callback)());

9
widget/windows/winrt/MetroWidget.cpp
View File

@ -1013,19 +1013,20 @@ MetroWidget::HitTestAPZC(ScreenPoint& pt)
}
nsEventStatus
MetroWidget::ApzReceiveInputEvent(nsInputEvent* aEvent)
MetroWidget::ApzReceiveInputEvent(WidgetInputEvent* aEvent)
{
MOZ_ASSERT(aEvent);
if (!MetroWidget::sAPZC) {
return nsEventStatus_eIgnore;
}
nsInputEvent& event = static_cast<nsInputEvent&>(*aEvent);
WidgetInputEvent& event = static_cast<WidgetInputEvent&>(*aEvent);
return MetroWidget::sAPZC->ReceiveInputEvent(event);
}
nsEventStatus
MetroWidget::ApzReceiveInputEvent(nsInputEvent* aInEvent, nsInputEvent* aOutEvent)
MetroWidget::ApzReceiveInputEvent(WidgetInputEvent* aInEvent,
WidgetInputEvent* aOutEvent)
{
MOZ_ASSERT(aInEvent);
MOZ_ASSERT(aOutEvent);
@ -1033,7 +1034,7 @@ MetroWidget::ApzReceiveInputEvent(nsInputEvent* aInEvent, nsInputEvent* aOutEven
if (!MetroWidget::sAPZC) {
return nsEventStatus_eIgnore;
}
nsInputEvent& event = static_cast<nsInputEvent&>(*aInEvent);
WidgetInputEvent& event = static_cast<WidgetInputEvent&>(*aInEvent);
return MetroWidget::sAPZC->ReceiveInputEvent(event, aOutEvent);
}

5
widget/windows/winrt/MetroWidget.h
View File

@ -198,8 +198,9 @@ public:
// APZ related apis
void ApzContentConsumingTouch();
void ApzContentIgnoringTouch();
nsEventStatus ApzReceiveInputEvent(nsInputEvent* aEvent);
nsEventStatus ApzReceiveInputEvent(nsInputEvent* aInEvent, nsInputEvent* aOutEvent);
nsEventStatus ApzReceiveInputEvent(mozilla::WidgetInputEvent* aEvent);
nsEventStatus ApzReceiveInputEvent(mozilla::WidgetInputEvent* aInEvent,
mozilla::WidgetInputEvent* aOutEvent);
bool HitTestAPZC(mozilla::ScreenPoint& pt);
nsresult RequestContentScroll();
void RequestContentRepaintImplMainThread();