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

Bug 912956 part.1 Rename all event stuff in mozilla::widget to mozilla::* r=roc

This commit is contained in:
Masayuki Nakano 2013-09-14 11:39:41 +09:00
Родитель 21df65f091
Коммит 776acd167e
36 изменённых файлов: 188 добавлений и 199 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
content/base/public/Element.h
Просмотреть файл

@ -764,7 +764,7 @@ public:
nsInputEvent* aSourceEvent, nsInputEvent* aSourceEvent,
nsIContent* aTarget, nsIContent* aTarget,
bool aFullDispatch, bool aFullDispatch,
const widget::EventFlags* aFlags, const EventFlags* aFlags,
nsEventStatus* aStatus); nsEventStatus* aStatus);
/** /**

2
content/base/src/Element.cpp
Просмотреть файл

@ -1405,7 +1405,7 @@ Element::DispatchClickEvent(nsPresContext* aPresContext,
nsInputEvent* aSourceEvent, nsInputEvent* aSourceEvent,
nsIContent* aTarget, nsIContent* aTarget,
bool aFullDispatch, bool aFullDispatch,
const widget::EventFlags* aExtraEventFlags, const EventFlags* aExtraEventFlags,
nsEventStatus* aStatus) nsEventStatus* aStatus)
{ {
NS_PRECONDITION(aTarget, "Must have target"); NS_PRECONDITION(aTarget, "Must have target");

14
content/events/src/DOMWheelEvent.cpp
Просмотреть файл

@ -13,10 +13,10 @@ namespace dom {
DOMWheelEvent::DOMWheelEvent(EventTarget* aOwner, DOMWheelEvent::DOMWheelEvent(EventTarget* aOwner,
nsPresContext* aPresContext, nsPresContext* aPresContext,
widget::WheelEvent* aWheelEvent) WheelEvent* aWheelEvent)
: nsDOMMouseEvent(aOwner, aPresContext, : nsDOMMouseEvent(aOwner, aPresContext,
aWheelEvent ? aWheelEvent : aWheelEvent ? aWheelEvent :
new widget::WheelEvent(false, 0, nullptr)) new WheelEvent(false, 0, nullptr))
{ {
if (aWheelEvent) { if (aWheelEvent) {
mEventIsInternal = false; mEventIsInternal = false;
@ -24,7 +24,7 @@ DOMWheelEvent::DOMWheelEvent(EventTarget* aOwner,
mEventIsInternal = true; mEventIsInternal = true;
mEvent->time = PR_Now(); mEvent->time = PR_Now();
mEvent->refPoint.x = mEvent->refPoint.y = 0; mEvent->refPoint.x = mEvent->refPoint.y = 0;
static_cast<widget::WheelEvent*>(mEvent)->inputSource = static_cast<WheelEvent*>(mEvent)->inputSource =
nsIDOMMouseEvent::MOZ_SOURCE_UNKNOWN; nsIDOMMouseEvent::MOZ_SOURCE_UNKNOWN;
} }
} }
@ -34,7 +34,7 @@ DOMWheelEvent::~DOMWheelEvent()
if (mEventIsInternal && mEvent) { if (mEventIsInternal && mEvent) {
MOZ_ASSERT(mEvent->eventStructType == NS_WHEEL_EVENT, MOZ_ASSERT(mEvent->eventStructType == NS_WHEEL_EVENT,
"The mEvent must be WheelEvent"); "The mEvent must be WheelEvent");
delete static_cast<widget::WheelEvent*>(mEvent); delete static_cast<WheelEvent*>(mEvent);
mEvent = nullptr; mEvent = nullptr;
} }
} }
@ -71,7 +71,7 @@ DOMWheelEvent::InitWheelEvent(const nsAString & aType,
aRelatedTarget, aModifiersList); aRelatedTarget, aModifiersList);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
widget::WheelEvent* wheelEvent = static_cast<widget::WheelEvent*>(mEvent); WheelEvent* wheelEvent = static_cast<WheelEvent*>(mEvent);
wheelEvent->deltaX = aDeltaX; wheelEvent->deltaX = aDeltaX;
wheelEvent->deltaY = aDeltaY; wheelEvent->deltaY = aDeltaY;
wheelEvent->deltaZ = aDeltaZ; wheelEvent->deltaZ = aDeltaZ;
@ -163,7 +163,7 @@ DOMWheelEvent::Constructor(const GlobalObject& aGlobal,
aParam.mButton, aParam.mRelatedTarget, aParam.mButton, aParam.mRelatedTarget,
modifierList, aParam.mDeltaX, modifierList, aParam.mDeltaX,
aParam.mDeltaY, aParam.mDeltaZ, aParam.mDeltaMode); aParam.mDeltaY, aParam.mDeltaZ, aParam.mDeltaMode);
static_cast<widget::WheelEvent*>(e->mEvent)->buttons = aParam.mButtons; static_cast<WheelEvent*>(e->mEvent)->buttons = aParam.mButtons;
e->SetTrusted(trusted); e->SetTrusted(trusted);
return e.forget(); return e.forget();
} }
@ -176,7 +176,7 @@ using namespace mozilla;
nsresult NS_NewDOMWheelEvent(nsIDOMEvent** aInstancePtrResult, nsresult NS_NewDOMWheelEvent(nsIDOMEvent** aInstancePtrResult,
mozilla::dom::EventTarget* aOwner, mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext, nsPresContext* aPresContext,
widget::WheelEvent *aEvent) WheelEvent *aEvent)
{ {
dom::DOMWheelEvent* it = new dom::DOMWheelEvent(aOwner, aPresContext, aEvent); dom::DOMWheelEvent* it = new dom::DOMWheelEvent(aOwner, aPresContext, aEvent);
return CallQueryInterface(it, aInstancePtrResult); return CallQueryInterface(it, aInstancePtrResult);

10
content/events/src/DOMWheelEvent.h
Просмотреть файл

@ -20,7 +20,7 @@ class DOMWheelEvent : public nsDOMMouseEvent,
public: public:
DOMWheelEvent(mozilla::dom::EventTarget* aOwner, DOMWheelEvent(mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext, nsPresContext* aPresContext,
widget::WheelEvent* aWheelEvent); WheelEvent* aWheelEvent);
virtual ~DOMWheelEvent(); virtual ~DOMWheelEvent();
NS_DECL_ISUPPORTS_INHERITED NS_DECL_ISUPPORTS_INHERITED
@ -45,22 +45,22 @@ public:
double DeltaX() double DeltaX()
{ {
return static_cast<widget::WheelEvent*>(mEvent)->deltaX; return static_cast<WheelEvent*>(mEvent)->deltaX;
} }
double DeltaY() double DeltaY()
{ {
return static_cast<widget::WheelEvent*>(mEvent)->deltaY; return static_cast<WheelEvent*>(mEvent)->deltaY;
} }
double DeltaZ() double DeltaZ()
{ {
return static_cast<widget::WheelEvent*>(mEvent)->deltaZ; return static_cast<WheelEvent*>(mEvent)->deltaZ;
} }
uint32_t DeltaMode() uint32_t DeltaMode()
{ {
return static_cast<widget::WheelEvent*>(mEvent)->deltaMode; return static_cast<WheelEvent*>(mEvent)->deltaMode;
} }
}; };

1
content/events/src/TextComposition.cpp
Просмотреть файл

@ -12,7 +12,6 @@
#include "nsIContent.h" #include "nsIContent.h"
#include "nsIMEStateManager.h" #include "nsIMEStateManager.h"
#include "nsIPresShell.h" #include "nsIPresShell.h"
#include "nsIWidget.h"
#include "nsPresContext.h" #include "nsPresContext.h"
namespace mozilla { namespace mozilla {

1
content/events/src/TextComposition.h
Просмотреть файл

@ -10,6 +10,7 @@
#include "nsCOMPtr.h" #include "nsCOMPtr.h"
#include "nsEvent.h" #include "nsEvent.h"
#include "nsINode.h" #include "nsINode.h"
#include "nsIWidget.h"
#include "nsTArray.h" #include "nsTArray.h"
#include "nsThreadUtils.h" #include "nsThreadUtils.h"
#include "mozilla/Attributes.h" #include "mozilla/Attributes.h"

6
content/events/src/nsDOMEvent.cpp
Просмотреть файл

@ -601,10 +601,8 @@ nsDOMEvent::DuplicatePrivateData()
} }
case NS_WHEEL_EVENT: case NS_WHEEL_EVENT:
{ {
widget::WheelEvent* oldWheelEvent = WheelEvent* oldWheelEvent = static_cast<WheelEvent*>(mEvent);
static_cast<widget::WheelEvent*>(mEvent); WheelEvent* wheelEvent = new WheelEvent(false, msg, nullptr);
widget::WheelEvent* wheelEvent =
new widget::WheelEvent(false, msg, nullptr);
wheelEvent->AssignWheelEventData(*oldWheelEvent, true); wheelEvent->AssignWheelEventData(*oldWheelEvent, true);
newEvent = wheelEvent; newEvent = wheelEvent;
break; break;

8
content/events/src/nsDOMMouseEvent.cpp
Просмотреть файл

@ -126,10 +126,10 @@ nsDOMMouseEvent::InitMouseEvent(const nsAString& aType,
nsresult rv = InitMouseEvent(aType, aCanBubble, aCancelable, aView, nsresult rv = InitMouseEvent(aType, aCanBubble, aCancelable, aView,
aDetail, aScreenX, aScreenY, aClientX, aClientY, aDetail, aScreenX, aScreenY, aClientX, aClientY,
(modifiers & widget::MODIFIER_CONTROL) != 0, (modifiers & MODIFIER_CONTROL) != 0,
(modifiers & widget::MODIFIER_ALT) != 0, (modifiers & MODIFIER_ALT) != 0,
(modifiers & widget::MODIFIER_SHIFT) != 0, (modifiers & MODIFIER_SHIFT) != 0,
(modifiers & widget::MODIFIER_META) != 0, (modifiers & MODIFIER_META) != 0,
aButton, aRelatedTarget); aButton, aRelatedTarget);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);

26
content/events/src/nsDOMUIEvent.cpp
Просмотреть файл

@ -406,25 +406,25 @@ nsDOMUIEvent::Deserialize(const IPC::Message* aMsg, void** aIter)
// we fail to build on Mac at calling mozilla::ArrayLength(). // we fail to build on Mac at calling mozilla::ArrayLength().
struct nsModifierPair struct nsModifierPair
{ {
mozilla::widget::Modifier modifier; mozilla::Modifier modifier;
const char* name; const char* name;
}; };
static const nsModifierPair kPairs[] = { static const nsModifierPair kPairs[] = {
{ widget::MODIFIER_ALT, NS_DOM_KEYNAME_ALT }, { MODIFIER_ALT, NS_DOM_KEYNAME_ALT },
{ widget::MODIFIER_ALTGRAPH, NS_DOM_KEYNAME_ALTGRAPH }, { MODIFIER_ALTGRAPH, NS_DOM_KEYNAME_ALTGRAPH },
{ widget::MODIFIER_CAPSLOCK, NS_DOM_KEYNAME_CAPSLOCK }, { MODIFIER_CAPSLOCK, NS_DOM_KEYNAME_CAPSLOCK },
{ widget::MODIFIER_CONTROL, NS_DOM_KEYNAME_CONTROL }, { MODIFIER_CONTROL, NS_DOM_KEYNAME_CONTROL },
{ widget::MODIFIER_FN, NS_DOM_KEYNAME_FN }, { MODIFIER_FN, NS_DOM_KEYNAME_FN },
{ widget::MODIFIER_META, NS_DOM_KEYNAME_META }, { MODIFIER_META, NS_DOM_KEYNAME_META },
{ widget::MODIFIER_NUMLOCK, NS_DOM_KEYNAME_NUMLOCK }, { MODIFIER_NUMLOCK, NS_DOM_KEYNAME_NUMLOCK },
{ widget::MODIFIER_SCROLLLOCK, NS_DOM_KEYNAME_SCROLLLOCK }, { MODIFIER_SCROLLLOCK, NS_DOM_KEYNAME_SCROLLLOCK },
{ widget::MODIFIER_SHIFT, NS_DOM_KEYNAME_SHIFT }, { MODIFIER_SHIFT, NS_DOM_KEYNAME_SHIFT },
{ widget::MODIFIER_SYMBOLLOCK, NS_DOM_KEYNAME_SYMBOLLOCK }, { MODIFIER_SYMBOLLOCK, NS_DOM_KEYNAME_SYMBOLLOCK },
{ widget::MODIFIER_OS, NS_DOM_KEYNAME_OS } { MODIFIER_OS, NS_DOM_KEYNAME_OS }
}; };
/* static */ /* static */
mozilla::widget::Modifiers mozilla::Modifiers
nsDOMUIEvent::ComputeModifierState(const nsAString& aModifiersList) nsDOMUIEvent::ComputeModifierState(const nsAString& aModifiersList)
{ {
if (aModifiersList.IsEmpty()) { if (aModifiersList.IsEmpty()) {

2
content/events/src/nsDOMUIEvent.h
Просмотреть файл

@ -158,7 +158,7 @@ protected:
bool mIsPointerLocked; bool mIsPointerLocked;
CSSIntPoint mLastClientPoint; CSSIntPoint mLastClientPoint;
typedef mozilla::widget::Modifiers Modifiers; typedef mozilla::Modifiers Modifiers;
static Modifiers ComputeModifierState(const nsAString& aModifiersList); static Modifiers ComputeModifierState(const nsAString& aModifiersList);
bool GetModifierStateInternal(const nsAString& aKey); bool GetModifierStateInternal(const nsAString& aKey);
}; };

2
content/events/src/nsEventDispatcher.cpp
Просмотреть файл

@ -712,7 +712,7 @@ nsEventDispatcher::CreateEvent(mozilla::dom::EventTarget* aOwner,
static_cast<nsInputEvent*>(aEvent)); static_cast<nsInputEvent*>(aEvent));
case NS_WHEEL_EVENT: case NS_WHEEL_EVENT:
return NS_NewDOMWheelEvent(aDOMEvent, aOwner, aPresContext, return NS_NewDOMWheelEvent(aDOMEvent, aOwner, aPresContext,
static_cast<widget::WheelEvent*>(aEvent)); static_cast<WheelEvent*>(aEvent));
case NS_DRAG_EVENT: case NS_DRAG_EVENT:
return NS_NewDOMDragEvent(aDOMEvent, aOwner, aPresContext, return NS_NewDOMDragEvent(aDOMEvent, aOwner, aPresContext,
static_cast<nsDragEvent*>(aEvent)); static_cast<nsDragEvent*>(aEvent));

87
content/events/src/nsEventStateManager.cpp
Просмотреть файл

@ -255,7 +255,7 @@ struct DeltaValues
{ {
} }
explicit DeltaValues(widget::WheelEvent* aEvent) : explicit DeltaValues(WheelEvent* aEvent) :
deltaX(aEvent->deltaX), deltaY(aEvent->deltaY) deltaX(aEvent->deltaX), deltaY(aEvent->deltaY)
{ {
} }
@ -268,17 +268,17 @@ class nsMouseWheelTransaction {
public: public:
static nsIFrame* GetTargetFrame() { return sTargetFrame; } static nsIFrame* GetTargetFrame() { return sTargetFrame; }
static void BeginTransaction(nsIFrame* aTargetFrame, static void BeginTransaction(nsIFrame* aTargetFrame,
widget::WheelEvent* aEvent); WheelEvent* aEvent);
// Be careful, UpdateTransaction may fire a DOM event, therefore, the target // Be careful, UpdateTransaction may fire a DOM event, therefore, the target
// frame might be destroyed in the event handler. // frame might be destroyed in the event handler.
static bool UpdateTransaction(widget::WheelEvent* aEvent); static bool UpdateTransaction(WheelEvent* aEvent);
static void EndTransaction(); static void EndTransaction();
static void OnEvent(nsEvent* aEvent); static void OnEvent(nsEvent* aEvent);
static void Shutdown(); static void Shutdown();
static uint32_t GetTimeoutTime(); static uint32_t GetTimeoutTime();
static DeltaValues AccelerateWheelDelta(widget::WheelEvent* aEvent, static DeltaValues AccelerateWheelDelta(WheelEvent* aEvent,
bool aAllowScrollSpeedOverride); bool aAllowScrollSpeedOverride);
enum { enum {
@ -292,7 +292,7 @@ protected:
static uint32_t GetIgnoreMoveDelayTime(); static uint32_t GetIgnoreMoveDelayTime();
static int32_t GetAccelerationStart(); static int32_t GetAccelerationStart();
static int32_t GetAccelerationFactor(); static int32_t GetAccelerationFactor();
static DeltaValues OverrideSystemScrollSpeed(widget::WheelEvent* aEvent); static DeltaValues OverrideSystemScrollSpeed(WheelEvent* aEvent);
static double ComputeAcceleratedWheelDelta(double aDelta, int32_t aFactor); static double ComputeAcceleratedWheelDelta(double aDelta, int32_t aFactor);
static nsWeakFrame sTargetFrame; static nsWeakFrame sTargetFrame;
@ -341,7 +341,7 @@ CanScrollOn(nsIScrollableFrame* aScrollFrame, double aDeltaX, double aDeltaY)
void void
nsMouseWheelTransaction::BeginTransaction(nsIFrame* aTargetFrame, nsMouseWheelTransaction::BeginTransaction(nsIFrame* aTargetFrame,
widget::WheelEvent* aEvent) WheelEvent* aEvent)
{ {
NS_ASSERTION(!sTargetFrame, "previous transaction is not finished!"); NS_ASSERTION(!sTargetFrame, "previous transaction is not finished!");
sTargetFrame = aTargetFrame; sTargetFrame = aTargetFrame;
@ -353,7 +353,7 @@ nsMouseWheelTransaction::BeginTransaction(nsIFrame* aTargetFrame,
} }
bool bool
nsMouseWheelTransaction::UpdateTransaction(widget::WheelEvent* aEvent) nsMouseWheelTransaction::UpdateTransaction(WheelEvent* aEvent)
{ {
nsIScrollableFrame* sf = GetTargetFrame()->GetScrollTargetFrame(); nsIScrollableFrame* sf = GetTargetFrame()->GetScrollTargetFrame();
NS_ENSURE_TRUE(sf, false); NS_ENSURE_TRUE(sf, false);
@ -538,7 +538,7 @@ nsMouseWheelTransaction::GetIgnoreMoveDelayTime()
} }
DeltaValues DeltaValues
nsMouseWheelTransaction::AccelerateWheelDelta(widget::WheelEvent* aEvent, nsMouseWheelTransaction::AccelerateWheelDelta(WheelEvent* aEvent,
bool aAllowScrollSpeedOverride) bool aAllowScrollSpeedOverride)
{ {
DeltaValues result(aEvent); DeltaValues result(aEvent);
@ -589,7 +589,7 @@ nsMouseWheelTransaction::GetAccelerationFactor()
} }
DeltaValues DeltaValues
nsMouseWheelTransaction::OverrideSystemScrollSpeed(widget::WheelEvent* aEvent) nsMouseWheelTransaction::OverrideSystemScrollSpeed(WheelEvent* aEvent)
{ {
MOZ_ASSERT(sTargetFrame, "We don't have mouse scrolling transaction"); MOZ_ASSERT(sTargetFrame, "We don't have mouse scrolling transaction");
MOZ_ASSERT(aEvent->deltaMode == nsIDOMWheelEvent::DOM_DELTA_LINE); MOZ_ASSERT(aEvent->deltaMode == nsIDOMWheelEvent::DOM_DELTA_LINE);
@ -972,7 +972,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
if (content) if (content)
mCurrentTargetContent = content; mCurrentTargetContent = content;
widget::WheelEvent* wheelEvent = static_cast<widget::WheelEvent*>(aEvent); WheelEvent* wheelEvent = static_cast<WheelEvent*>(aEvent);
WheelPrefs::GetInstance()->ApplyUserPrefsToDelta(wheelEvent); WheelPrefs::GetInstance()->ApplyUserPrefsToDelta(wheelEvent);
// If we won't dispatch a DOM event for this event, nothing to do anymore. // If we won't dispatch a DOM event for this event, nothing to do anymore.
@ -1388,7 +1388,7 @@ nsEventStateManager::DispatchCrossProcessEvent(nsEvent* aEvent,
return remote->SendRealKeyEvent(*keyEvent); return remote->SendRealKeyEvent(*keyEvent);
} }
case NS_WHEEL_EVENT: { case NS_WHEEL_EVENT: {
widget::WheelEvent* wheelEvent = static_cast<widget::WheelEvent*>(aEvent); WheelEvent* wheelEvent = static_cast<WheelEvent*>(aEvent);
return remote->SendMouseWheelEvent(*wheelEvent); return remote->SendMouseWheelEvent(*wheelEvent);
} }
case NS_TOUCH_EVENT: { case NS_TOUCH_EVENT: {
@ -2011,7 +2011,7 @@ nsEventStateManager::DetermineDragTarget(nsPresContext* aPresContext,
// occurred, and aSelectionTarget is the node to use when a selection is used // occurred, and aSelectionTarget is the node to use when a selection is used
bool canDrag; bool canDrag;
nsCOMPtr<nsIContent> dragDataNode; nsCOMPtr<nsIContent> dragDataNode;
bool wasAlt = (mGestureModifiers & widget::MODIFIER_ALT) != 0; bool wasAlt = (mGestureModifiers & MODIFIER_ALT) != 0;
nsresult rv = nsContentAreaDragDrop::GetDragData(window, mGestureDownContent, nsresult rv = nsContentAreaDragDrop::GetDragData(window, mGestureDownContent,
aSelectionTarget, wasAlt, aSelectionTarget, wasAlt,
aDataTransfer, &canDrag, aSelection, aDataTransfer, &canDrag, aSelection,
@ -2331,7 +2331,7 @@ GetParentFrameToScroll(nsIFrame* aFrame)
void void
nsEventStateManager::DispatchLegacyMouseScrollEvents(nsIFrame* aTargetFrame, nsEventStateManager::DispatchLegacyMouseScrollEvents(nsIFrame* aTargetFrame,
widget::WheelEvent* aEvent, WheelEvent* aEvent,
nsEventStatus* aStatus) nsEventStatus* aStatus)
{ {
MOZ_ASSERT(aEvent); MOZ_ASSERT(aEvent);
@ -2456,7 +2456,7 @@ nsEventStateManager::DispatchLegacyMouseScrollEvents(nsIFrame* aTargetFrame,
void void
nsEventStateManager::SendLineScrollEvent(nsIFrame* aTargetFrame, nsEventStateManager::SendLineScrollEvent(nsIFrame* aTargetFrame,
widget::WheelEvent* aEvent, WheelEvent* aEvent,
nsEventStatus* aStatus, nsEventStatus* aStatus,
int32_t aDelta, int32_t aDelta,
DeltaDirection aDeltaDirection) DeltaDirection aDeltaDirection)
@ -2491,7 +2491,7 @@ nsEventStateManager::SendLineScrollEvent(nsIFrame* aTargetFrame,
void void
nsEventStateManager::SendPixelScrollEvent(nsIFrame* aTargetFrame, nsEventStateManager::SendPixelScrollEvent(nsIFrame* aTargetFrame,
widget::WheelEvent* aEvent, WheelEvent* aEvent,
nsEventStatus* aStatus, nsEventStatus* aStatus,
int32_t aPixelDelta, int32_t aPixelDelta,
DeltaDirection aDeltaDirection) DeltaDirection aDeltaDirection)
@ -2527,7 +2527,7 @@ nsEventStateManager::SendPixelScrollEvent(nsIFrame* aTargetFrame,
nsIScrollableFrame* nsIScrollableFrame*
nsEventStateManager::ComputeScrollTarget(nsIFrame* aTargetFrame, nsEventStateManager::ComputeScrollTarget(nsIFrame* aTargetFrame,
widget::WheelEvent* aEvent, WheelEvent* aEvent,
ComputeScrollTargetOptions aOptions) ComputeScrollTargetOptions aOptions)
{ {
if (aOptions & PREFER_MOUSE_WHEEL_TRANSACTION) { if (aOptions & PREFER_MOUSE_WHEEL_TRANSACTION) {
@ -2615,7 +2615,7 @@ nsEventStateManager::ComputeScrollTarget(nsIFrame* aTargetFrame,
nsSize nsSize
nsEventStateManager::GetScrollAmount(nsPresContext* aPresContext, nsEventStateManager::GetScrollAmount(nsPresContext* aPresContext,
widget::WheelEvent* aEvent, WheelEvent* aEvent,
nsIScrollableFrame* aScrollableFrame) nsIScrollableFrame* aScrollableFrame)
{ {
MOZ_ASSERT(aPresContext); MOZ_ASSERT(aPresContext);
@ -2646,7 +2646,7 @@ nsEventStateManager::GetScrollAmount(nsPresContext* aPresContext,
void void
nsEventStateManager::DoScrollText(nsIScrollableFrame* aScrollableFrame, nsEventStateManager::DoScrollText(nsIScrollableFrame* aScrollableFrame,
widget::WheelEvent* aEvent) WheelEvent* aEvent)
{ {
MOZ_ASSERT(aScrollableFrame); MOZ_ASSERT(aScrollableFrame);
MOZ_ASSERT(aEvent); MOZ_ASSERT(aEvent);
@ -2733,20 +2733,20 @@ nsEventStateManager::DoScrollText(nsIScrollableFrame* aScrollableFrame,
nsIScrollableFrame::ScrollMode mode; nsIScrollableFrame::ScrollMode mode;
switch (aEvent->scrollType) { switch (aEvent->scrollType) {
case widget::WheelEvent::SCROLL_DEFAULT: case WheelEvent::SCROLL_DEFAULT:
if (isDeltaModePixel) { if (isDeltaModePixel) {
mode = nsIScrollableFrame::NORMAL; mode = nsIScrollableFrame::NORMAL;
} else { } else {
mode = nsIScrollableFrame::SMOOTH; mode = nsIScrollableFrame::SMOOTH;
} }
break; break;
case widget::WheelEvent::SCROLL_SYNCHRONOUSLY: case WheelEvent::SCROLL_SYNCHRONOUSLY:
mode = nsIScrollableFrame::INSTANT; mode = nsIScrollableFrame::INSTANT;
break; break;
case widget::WheelEvent::SCROLL_ASYNCHRONOUSELY: case WheelEvent::SCROLL_ASYNCHRONOUSELY:
mode = nsIScrollableFrame::NORMAL; mode = nsIScrollableFrame::NORMAL;
break; break;
case widget::WheelEvent::SCROLL_SMOOTHLY: case WheelEvent::SCROLL_SMOOTHLY:
mode = nsIScrollableFrame::SMOOTH; mode = nsIScrollableFrame::SMOOTH;
break; break;
default: default:
@ -3159,7 +3159,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
break; break;
} }
widget::WheelEvent* wheelEvent = static_cast<widget::WheelEvent*>(aEvent); WheelEvent* wheelEvent = static_cast<WheelEvent*>(aEvent);
switch (WheelPrefs::GetInstance()->ComputeActionFor(wheelEvent)) { switch (WheelPrefs::GetInstance()->ComputeActionFor(wheelEvent)) {
case WheelPrefs::ACTION_SCROLL: { case WheelPrefs::ACTION_SCROLL: {
if (!wheelEvent->deltaX && !wheelEvent->deltaY) { if (!wheelEvent->deltaX && !wheelEvent->deltaY) {
@ -5086,7 +5086,7 @@ void
nsEventStateManager::DeltaAccumulator::InitLineOrPageDelta( nsEventStateManager::DeltaAccumulator::InitLineOrPageDelta(
nsIFrame* aTargetFrame, nsIFrame* aTargetFrame,
nsEventStateManager* aESM, nsEventStateManager* aESM,
widget::WheelEvent* aEvent) WheelEvent* aEvent)
{ {
MOZ_ASSERT(aESM); MOZ_ASSERT(aESM);
MOZ_ASSERT(aEvent); MOZ_ASSERT(aEvent);
@ -5189,7 +5189,7 @@ nsEventStateManager::DeltaAccumulator::Reset()
nsIntPoint nsIntPoint
nsEventStateManager::DeltaAccumulator::ComputeScrollAmountForDefaultAction( nsEventStateManager::DeltaAccumulator::ComputeScrollAmountForDefaultAction(
widget::WheelEvent* aEvent, WheelEvent* aEvent,
const nsIntSize& aScrollAmountInDevPixels) const nsIntSize& aScrollAmountInDevPixels)
{ {
MOZ_ASSERT(aEvent); MOZ_ASSERT(aEvent);
@ -5273,29 +5273,29 @@ nsEventStateManager::WheelPrefs::Reset()
} }
nsEventStateManager::WheelPrefs::Index nsEventStateManager::WheelPrefs::Index
nsEventStateManager::WheelPrefs::GetIndexFor(widget::WheelEvent* aEvent) nsEventStateManager::WheelPrefs::GetIndexFor(WheelEvent* aEvent)
{ {
if (!aEvent) { if (!aEvent) {
return INDEX_DEFAULT; return INDEX_DEFAULT;
} }
widget::Modifiers modifiers = Modifiers modifiers =
(aEvent->modifiers & (widget::MODIFIER_ALT | (aEvent->modifiers & (MODIFIER_ALT |
widget::MODIFIER_CONTROL | MODIFIER_CONTROL |
widget::MODIFIER_META | MODIFIER_META |
widget::MODIFIER_SHIFT | MODIFIER_SHIFT |
widget::MODIFIER_OS)); MODIFIER_OS));
switch (modifiers) { switch (modifiers) {
case widget::MODIFIER_ALT: case MODIFIER_ALT:
return INDEX_ALT; return INDEX_ALT;
case widget::MODIFIER_CONTROL: case MODIFIER_CONTROL:
return INDEX_CONTROL; return INDEX_CONTROL;
case widget::MODIFIER_META: case MODIFIER_META:
return INDEX_META; return INDEX_META;
case widget::MODIFIER_SHIFT: case MODIFIER_SHIFT:
return INDEX_SHIFT; return INDEX_SHIFT;
case widget::MODIFIER_OS: case MODIFIER_OS:
return INDEX_OS; return INDEX_OS;
default: default:
// If two or more modifier keys are pressed, we should use default // If two or more modifier keys are pressed, we should use default
@ -5384,8 +5384,7 @@ nsEventStateManager::WheelPrefs::Init(
} }
void void
nsEventStateManager::WheelPrefs::ApplyUserPrefsToDelta( nsEventStateManager::WheelPrefs::ApplyUserPrefsToDelta(WheelEvent* aEvent)
widget::WheelEvent* aEvent)
{ {
Index index = GetIndexFor(aEvent); Index index = GetIndexFor(aEvent);
Init(index); Init(index);
@ -5412,7 +5411,7 @@ nsEventStateManager::WheelPrefs::ApplyUserPrefsToDelta(
void void
nsEventStateManager::WheelPrefs::CancelApplyingUserPrefsFromOverflowDelta( nsEventStateManager::WheelPrefs::CancelApplyingUserPrefsFromOverflowDelta(
widget::WheelEvent* aEvent) WheelEvent* aEvent)
{ {
Index index = GetIndexFor(aEvent); Index index = GetIndexFor(aEvent);
Init(index); Init(index);
@ -5432,7 +5431,7 @@ nsEventStateManager::WheelPrefs::CancelApplyingUserPrefsFromOverflowDelta(
} }
nsEventStateManager::WheelPrefs::Action nsEventStateManager::WheelPrefs::Action
nsEventStateManager::WheelPrefs::ComputeActionFor(widget::WheelEvent* aEvent) nsEventStateManager::WheelPrefs::ComputeActionFor(WheelEvent* aEvent)
{ {
Index index = GetIndexFor(aEvent); Index index = GetIndexFor(aEvent);
Init(index); Init(index);
@ -5458,7 +5457,7 @@ nsEventStateManager::WheelPrefs::ComputeActionFor(widget::WheelEvent* aEvent)
bool bool
nsEventStateManager::WheelPrefs::NeedToComputeLineOrPageDelta( nsEventStateManager::WheelPrefs::NeedToComputeLineOrPageDelta(
widget::WheelEvent* aEvent) WheelEvent* aEvent)
{ {
Index index = GetIndexFor(aEvent); Index index = GetIndexFor(aEvent);
Init(index); Init(index);
@ -5469,7 +5468,7 @@ nsEventStateManager::WheelPrefs::NeedToComputeLineOrPageDelta(
bool bool
nsEventStateManager::WheelPrefs::IsOverOnePageScrollAllowedX( nsEventStateManager::WheelPrefs::IsOverOnePageScrollAllowedX(
widget::WheelEvent* aEvent) WheelEvent* aEvent)
{ {
Index index = GetIndexFor(aEvent); Index index = GetIndexFor(aEvent);
Init(index); Init(index);
@ -5479,7 +5478,7 @@ nsEventStateManager::WheelPrefs::IsOverOnePageScrollAllowedX(
bool bool
nsEventStateManager::WheelPrefs::IsOverOnePageScrollAllowedY( nsEventStateManager::WheelPrefs::IsOverOnePageScrollAllowedY(
widget::WheelEvent* aEvent) WheelEvent* aEvent)
{ {
Index index = GetIndexFor(aEvent); Index index = GetIndexFor(aEvent);
Init(index); Init(index);

36
content/events/src/nsEventStateManager.h
Просмотреть файл

@ -89,7 +89,7 @@ public:
* NS_MOUSE_PIXEL_SCROLL event for compatiblity with old Gecko. * NS_MOUSE_PIXEL_SCROLL event for compatiblity with old Gecko.
*/ */
void DispatchLegacyMouseScrollEvents(nsIFrame* aTargetFrame, void DispatchLegacyMouseScrollEvents(nsIFrame* aTargetFrame,
mozilla::widget::WheelEvent* aEvent, mozilla::WheelEvent* aEvent,
nsEventStatus* aStatus); nsEventStatus* aStatus);
void NotifyDestroyPresContext(nsPresContext* aPresContext); void NotifyDestroyPresContext(nsPresContext* aPresContext);
@ -357,7 +357,7 @@ protected:
* ApplyUserPrefsToDelta() overrides the wheel event's delta values with * ApplyUserPrefsToDelta() overrides the wheel event's delta values with
* user prefs. * user prefs.
*/ */
void ApplyUserPrefsToDelta(mozilla::widget::WheelEvent* aEvent); void ApplyUserPrefsToDelta(mozilla::WheelEvent* aEvent);
/** /**
* If ApplyUserPrefsToDelta() changed the delta values with customized * If ApplyUserPrefsToDelta() changed the delta values with customized
@ -365,7 +365,7 @@ protected:
* CancelApplyingUserPrefsFromOverflowDelta() cancels the inflation. * CancelApplyingUserPrefsFromOverflowDelta() cancels the inflation.
*/ */
void CancelApplyingUserPrefsFromOverflowDelta( void CancelApplyingUserPrefsFromOverflowDelta(
mozilla::widget::WheelEvent* aEvent); mozilla::WheelEvent* aEvent);
/** /**
* Computes the default action for the aEvent with the prefs. * Computes the default action for the aEvent with the prefs.
@ -378,20 +378,20 @@ protected:
ACTION_ZOOM, ACTION_ZOOM,
ACTION_LAST = ACTION_ZOOM ACTION_LAST = ACTION_ZOOM
}; };
Action ComputeActionFor(mozilla::widget::WheelEvent* aEvent); Action ComputeActionFor(mozilla::WheelEvent* aEvent);
/** /**
* NeedToComputeLineOrPageDelta() returns if the aEvent needs to be * NeedToComputeLineOrPageDelta() returns if the aEvent needs to be
* computed the lineOrPageDelta values. * computed the lineOrPageDelta values.
*/ */
bool NeedToComputeLineOrPageDelta(mozilla::widget::WheelEvent* aEvent); bool NeedToComputeLineOrPageDelta(mozilla::WheelEvent* aEvent);
/** /**
* IsOverOnePageScrollAllowed*() checks whether wheel scroll amount should * IsOverOnePageScrollAllowed*() checks whether wheel scroll amount should
* be rounded down to the page width/height (false) or not (true). * be rounded down to the page width/height (false) or not (true).
*/ */
bool IsOverOnePageScrollAllowedX(mozilla::widget::WheelEvent* aEvent); bool IsOverOnePageScrollAllowedX(mozilla::WheelEvent* aEvent);
bool IsOverOnePageScrollAllowedY(mozilla::widget::WheelEvent* aEvent); bool IsOverOnePageScrollAllowedY(mozilla::WheelEvent* aEvent);
private: private:
WheelPrefs(); WheelPrefs();
@ -418,7 +418,7 @@ protected:
* default index which is used at either no modifier key is pressed or * default index which is used at either no modifier key is pressed or
* two or modifier keys are pressed. * two or modifier keys are pressed.
*/ */
Index GetIndexFor(mozilla::widget::WheelEvent* aEvent); Index GetIndexFor(mozilla::WheelEvent* aEvent);
/** /**
* GetPrefNameBase() returns the base pref name for aEvent. * GetPrefNameBase() returns the base pref name for aEvent.
@ -471,7 +471,7 @@ protected:
/** /**
* SendLineScrollEvent() dispatches a DOMMouseScroll event for the * SendLineScrollEvent() dispatches a DOMMouseScroll event for the
* widget::WheelEvent. This method shouldn't be called for non-trusted * WheelEvent. This method shouldn't be called for non-trusted
* wheel event because it's not necessary for compatiblity. * wheel event because it's not necessary for compatiblity.
* *
* @param aTargetFrame The event target of wheel event. * @param aTargetFrame The event target of wheel event.
@ -482,14 +482,14 @@ protected:
* @param aDeltaDirection The X/Y direction of dispatching event. * @param aDeltaDirection The X/Y direction of dispatching event.
*/ */
void SendLineScrollEvent(nsIFrame* aTargetFrame, void SendLineScrollEvent(nsIFrame* aTargetFrame,
mozilla::widget::WheelEvent* aEvent, mozilla::WheelEvent* aEvent,
nsEventStatus* aStatus, nsEventStatus* aStatus,
int32_t aDelta, int32_t aDelta,
DeltaDirection aDeltaDirection); DeltaDirection aDeltaDirection);
/** /**
* SendPixelScrollEvent() dispatches a MozMousePixelScroll event for the * SendPixelScrollEvent() dispatches a MozMousePixelScroll event for the
* widget::WheelEvent. This method shouldn't be called for non-trusted * WheelEvent. This method shouldn't be called for non-trusted
* wheel event because it's not necessary for compatiblity. * wheel event because it's not necessary for compatiblity.
* *
* @param aTargetFrame The event target of wheel event. * @param aTargetFrame The event target of wheel event.
@ -500,7 +500,7 @@ protected:
* @param aDeltaDirection The X/Y direction of dispatching event. * @param aDeltaDirection The X/Y direction of dispatching event.
*/ */
void SendPixelScrollEvent(nsIFrame* aTargetFrame, void SendPixelScrollEvent(nsIFrame* aTargetFrame,
mozilla::widget::WheelEvent* aEvent, mozilla::WheelEvent* aEvent,
nsEventStatus* aStatus, nsEventStatus* aStatus,
int32_t aPixelDelta, int32_t aPixelDelta,
DeltaDirection aDeltaDirection); DeltaDirection aDeltaDirection);
@ -544,7 +544,7 @@ protected:
(PREFER_ACTUAL_SCROLLABLE_TARGET_ALONG_Y_AXIS | START_FROM_PARENT) (PREFER_ACTUAL_SCROLLABLE_TARGET_ALONG_Y_AXIS | START_FROM_PARENT)
}; };
nsIScrollableFrame* ComputeScrollTarget(nsIFrame* aTargetFrame, nsIScrollableFrame* ComputeScrollTarget(nsIFrame* aTargetFrame,
mozilla::widget::WheelEvent* aEvent, mozilla::WheelEvent* aEvent,
ComputeScrollTargetOptions aOptions); ComputeScrollTargetOptions aOptions);
/** /**
@ -560,14 +560,14 @@ protected:
* line height or visible area's width and height. * line height or visible area's width and height.
*/ */
nsSize GetScrollAmount(nsPresContext* aPresContext, nsSize GetScrollAmount(nsPresContext* aPresContext,
mozilla::widget::WheelEvent* aEvent, mozilla::WheelEvent* aEvent,
nsIScrollableFrame* aScrollableFrame); nsIScrollableFrame* aScrollableFrame);
/** /**
* DoScrollText() scrolls the scrollable frame for aEvent. * DoScrollText() scrolls the scrollable frame for aEvent.
*/ */
void DoScrollText(nsIScrollableFrame* aScrollableFrame, void DoScrollText(nsIScrollableFrame* aScrollableFrame,
mozilla::widget::WheelEvent* aEvent); mozilla::WheelEvent* aEvent);
void DoScrollHistory(int32_t direction); void DoScrollHistory(int32_t direction);
void DoScrollZoom(nsIFrame *aTargetFrame, int32_t adjustment); void DoScrollZoom(nsIFrame *aTargetFrame, int32_t adjustment);
@ -607,7 +607,7 @@ protected:
*/ */
void InitLineOrPageDelta(nsIFrame* aTargetFrame, void InitLineOrPageDelta(nsIFrame* aTargetFrame,
nsEventStateManager* aESM, nsEventStateManager* aESM,
mozilla::widget::WheelEvent* aEvent); mozilla::WheelEvent* aEvent);
/** /**
* Reset() resets all members. * Reset() resets all members.
@ -619,7 +619,7 @@ protected:
* scroll amount in device pixels with mPendingScrollAmount*. * scroll amount in device pixels with mPendingScrollAmount*.
*/ */
nsIntPoint ComputeScrollAmountForDefaultAction( nsIntPoint ComputeScrollAmountForDefaultAction(
mozilla::widget::WheelEvent* aEvent, mozilla::WheelEvent* aEvent,
const nsIntSize& aScrollAmountInDevPixels); const nsIntSize& aScrollAmountInDevPixels);
private: private:
@ -763,7 +763,7 @@ private:
// an <area> of an image map this is the image. (bug 289667) // an <area> of an image map this is the image. (bug 289667)
nsCOMPtr<nsIContent> mGestureDownFrameOwner; nsCOMPtr<nsIContent> mGestureDownFrameOwner;
// State of keys when the original gesture-down happened // State of keys when the original gesture-down happened
mozilla::widget::Modifiers mGestureModifiers; mozilla::Modifiers mGestureModifiers;
uint16_t mGestureDownButtons; uint16_t mGestureDownButtons;
nsCOMPtr<nsIContent> mLastLeftMouseDownContent; nsCOMPtr<nsIContent> mLastLeftMouseDownContent;

2
content/html/content/src/HTMLLabelElement.cpp
Просмотреть файл

@ -194,7 +194,7 @@ HTMLLabelElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
nsEventStatus status = aVisitor.mEventStatus; nsEventStatus status = aVisitor.mEventStatus;
// Ok to use aVisitor.mEvent as parameter because DispatchClickEvent // Ok to use aVisitor.mEvent as parameter because DispatchClickEvent
// will actually create a new event. // will actually create a new event.
widget::EventFlags eventFlags; EventFlags eventFlags;
eventFlags.mMultipleActionsPrevented = true; eventFlags.mMultipleActionsPrevented = true;
DispatchClickEvent(aVisitor.mPresContext, DispatchClickEvent(aVisitor.mPresContext,
static_cast<nsInputEvent*>(aVisitor.mEvent), static_cast<nsInputEvent*>(aVisitor.mEvent),

2
content/xbl/src/nsXBLPrototypeHandler.cpp
Просмотреть файл

@ -550,7 +550,7 @@ nsXBLPrototypeHandler::DispatchXULKeyCommand(nsIDOMEvent* aEvent)
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
// XXX We should use widget::Modifiers for supporting all modifiers. // XXX We should use mozilla::Modifiers for supporting all modifiers.
bool isAlt = false; bool isAlt = false;
bool isControl = false; bool isControl = false;

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

@ -548,42 +548,42 @@ nsDOMWindowUtils::GetPresShellId(uint32_t *aPresShellId)
} }
/* static */ /* static */
mozilla::widget::Modifiers mozilla::Modifiers
nsDOMWindowUtils::GetWidgetModifiers(int32_t aModifiers) nsDOMWindowUtils::GetWidgetModifiers(int32_t aModifiers)
{ {
widget::Modifiers result = 0; Modifiers result = 0;
if (aModifiers & nsIDOMWindowUtils::MODIFIER_SHIFT) { if (aModifiers & nsIDOMWindowUtils::MODIFIER_SHIFT) {
result |= widget::MODIFIER_SHIFT; result |= mozilla::MODIFIER_SHIFT;
} }
if (aModifiers & nsIDOMWindowUtils::MODIFIER_CONTROL) { if (aModifiers & nsIDOMWindowUtils::MODIFIER_CONTROL) {
result |= widget::MODIFIER_CONTROL; result |= mozilla::MODIFIER_CONTROL;
} }
if (aModifiers & nsIDOMWindowUtils::MODIFIER_ALT) { if (aModifiers & nsIDOMWindowUtils::MODIFIER_ALT) {
result |= widget::MODIFIER_ALT; result |= mozilla::MODIFIER_ALT;
} }
if (aModifiers & nsIDOMWindowUtils::MODIFIER_META) { if (aModifiers & nsIDOMWindowUtils::MODIFIER_META) {
result |= widget::MODIFIER_META; result |= mozilla::MODIFIER_META;
} }
if (aModifiers & nsIDOMWindowUtils::MODIFIER_ALTGRAPH) { if (aModifiers & nsIDOMWindowUtils::MODIFIER_ALTGRAPH) {
result |= widget::MODIFIER_ALTGRAPH; result |= mozilla::MODIFIER_ALTGRAPH;
} }
if (aModifiers & nsIDOMWindowUtils::MODIFIER_CAPSLOCK) { if (aModifiers & nsIDOMWindowUtils::MODIFIER_CAPSLOCK) {
result |= widget::MODIFIER_CAPSLOCK; result |= mozilla::MODIFIER_CAPSLOCK;
} }
if (aModifiers & nsIDOMWindowUtils::MODIFIER_FN) { if (aModifiers & nsIDOMWindowUtils::MODIFIER_FN) {
result |= widget::MODIFIER_FN; result |= mozilla::MODIFIER_FN;
} }
if (aModifiers & nsIDOMWindowUtils::MODIFIER_NUMLOCK) { if (aModifiers & nsIDOMWindowUtils::MODIFIER_NUMLOCK) {
result |= widget::MODIFIER_NUMLOCK; result |= mozilla::MODIFIER_NUMLOCK;
} }
if (aModifiers & nsIDOMWindowUtils::MODIFIER_SCROLLLOCK) { if (aModifiers & nsIDOMWindowUtils::MODIFIER_SCROLLLOCK) {
result |= widget::MODIFIER_SCROLLLOCK; result |= mozilla::MODIFIER_SCROLLLOCK;
} }
if (aModifiers & nsIDOMWindowUtils::MODIFIER_SYMBOLLOCK) { if (aModifiers & nsIDOMWindowUtils::MODIFIER_SYMBOLLOCK) {
result |= widget::MODIFIER_SYMBOLLOCK; result |= mozilla::MODIFIER_SYMBOLLOCK;
} }
if (aModifiers & nsIDOMWindowUtils::MODIFIER_OS) { if (aModifiers & nsIDOMWindowUtils::MODIFIER_OS) {
result |= widget::MODIFIER_OS; result |= mozilla::MODIFIER_OS;
} }
return result; return result;
} }
@ -762,7 +762,7 @@ nsDOMWindowUtils::SendWheelEvent(float aX,
return NS_ERROR_NULL_POINTER; return NS_ERROR_NULL_POINTER;
} }
widget::WheelEvent wheelEvent(true, NS_WHEEL_WHEEL, widget); WheelEvent wheelEvent(true, NS_WHEEL_WHEEL, widget);
wheelEvent.modifiers = GetWidgetModifiers(aModifiers); wheelEvent.modifiers = GetWidgetModifiers(aModifiers);
wheelEvent.deltaX = aDeltaX; wheelEvent.deltaX = aDeltaX;
wheelEvent.deltaY = aDeltaY; wheelEvent.deltaY = aDeltaY;

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

@ -49,7 +49,7 @@ protected:
bool aToWindow, bool aToWindow,
bool *aPreventDefault); bool *aPreventDefault);
static mozilla::widget::Modifiers GetWidgetModifiers(int32_t aModifiers); static mozilla::Modifiers GetWidgetModifiers(int32_t aModifiers);
}; };
#endif #endif

5
dom/interfaces/events/nsIDOMEvent.idl
Просмотреть файл

@ -26,9 +26,8 @@ namespace IPC {
class Message; class Message;
} }
namespace mozilla { namespace mozilla {
namespace widget {
class WheelEvent; class WheelEvent;
} // namespace widget
namespace dom { namespace dom {
class EventTarget; class EventTarget;
} // namespace dom } // namespace dom
@ -261,7 +260,7 @@ nsresult
NS_NewDOMWheelEvent(nsIDOMEvent** aInstancePtrResult, NS_NewDOMWheelEvent(nsIDOMEvent** aInstancePtrResult,
mozilla::dom::EventTarget* aOwner, mozilla::dom::EventTarget* aOwner,
nsPresContext* aPresContext, nsPresContext* aPresContext,
mozilla::widget::WheelEvent* aEvent); mozilla::WheelEvent* aEvent);
nsresult nsresult
NS_NewDOMDragEvent(nsIDOMEvent** aInstancePtrResult, NS_NewDOMDragEvent(nsIDOMEvent** aInstancePtrResult,
mozilla::dom::EventTarget* aOwner, mozilla::dom::EventTarget* aOwner,

2
dom/ipc/PBrowser.ipdl
Просмотреть файл

@ -44,7 +44,7 @@ using nsIntSize;
using nsKeyEvent; using nsKeyEvent;
using nsMouseEvent; using nsMouseEvent;
using nsMouseScrollEvent; using nsMouseScrollEvent;
using mozilla::widget::WheelEvent; using mozilla::WheelEvent;
using nsQueryContentEvent; using nsQueryContentEvent;
using nsRect; using nsRect;
using nsSelectionEvent; using nsSelectionEvent;

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

@ -224,7 +224,7 @@ public:
const bool& aIgnoreRootScrollFrame); const bool& aIgnoreRootScrollFrame);
virtual bool RecvRealMouseEvent(const nsMouseEvent& event); virtual bool RecvRealMouseEvent(const nsMouseEvent& event);
virtual bool RecvRealKeyEvent(const nsKeyEvent& event); virtual bool RecvRealKeyEvent(const nsKeyEvent& event);
virtual bool RecvMouseWheelEvent(const mozilla::widget::WheelEvent& event); virtual bool RecvMouseWheelEvent(const mozilla::WheelEvent& event);
virtual bool RecvRealTouchEvent(const nsTouchEvent& event); virtual bool RecvRealTouchEvent(const nsTouchEvent& event);
virtual bool RecvRealTouchMoveEvent(const nsTouchEvent& event); virtual bool RecvRealTouchMoveEvent(const nsTouchEvent& event);
virtual bool RecvKeyEvent(const nsString& aType, virtual bool RecvKeyEvent(const nsString& aType,

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

@ -197,7 +197,7 @@ public:
int32_t aCharCode, int32_t aModifiers, int32_t aCharCode, int32_t aModifiers,
bool aPreventDefault); bool aPreventDefault);
bool SendRealMouseEvent(nsMouseEvent& event); bool SendRealMouseEvent(nsMouseEvent& event);
bool SendMouseWheelEvent(mozilla::widget::WheelEvent& event); bool SendMouseWheelEvent(mozilla::WheelEvent& event);
bool SendRealKeyEvent(nsKeyEvent& event); bool SendRealKeyEvent(nsKeyEvent& event);
bool SendRealTouchEvent(nsTouchEvent& event); bool SendRealTouchEvent(nsTouchEvent& event);

2
extensions/widgetutils/src/nsWidgetUtils.cpp
Просмотреть файл

@ -234,7 +234,7 @@ nsWidgetUtils::MouseMove(nsIDOMEvent* aDOMEvent)
return NS_OK; return NS_OK;
nsEventStatus status; nsEventStatus status;
widget::WheelEvent wheelEvent(true, NS_WHEEL_WHEEL, mWidget); WheelEvent wheelEvent(true, NS_WHEEL_WHEEL, mWidget);
wheelEvent.deltaMode = nsIDOMWheelEvent::DOM_DELTA_LINE; wheelEvent.deltaMode = nsIDOMWheelEvent::DOM_DELTA_LINE;
wheelEvent.deltaX = wheelEvent.lineOrPageDeltaX = dx; wheelEvent.deltaX = wheelEvent.lineOrPageDeltaX = dx;
wheelEvent.deltaY = wheelEvent.lineOrPageDeltaY = dy; wheelEvent.deltaY = wheelEvent.lineOrPageDeltaY = dy;

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

@ -453,7 +453,7 @@ public:
nsRefPtr<nsEventStateManager> esm = nsRefPtr<nsEventStateManager> esm =
aVisitor.mPresContext->EventStateManager(); aVisitor.mPresContext->EventStateManager();
esm->DispatchLegacyMouseScrollEvents(frame, esm->DispatchLegacyMouseScrollEvents(frame,
static_cast<widget::WheelEvent*>(aVisitor.mEvent), static_cast<WheelEvent*>(aVisitor.mEvent),
&aVisitor.mEventStatus); &aVisitor.mEventStatus);
} }
} }

2
layout/generic/nsSelection.cpp
Просмотреть файл

@ -1516,7 +1516,7 @@ printf(" * TakeFocus - moving into new cell\n");
// XXXX We need to REALLY get the current key shift state // XXXX We need to REALLY get the current key shift state
// (we'd need to add event listener -- let's not bother for now) // (we'd need to add event listener -- let's not bother for now)
event.modifiers &= ~widget::MODIFIER_SHIFT; //aContinueSelection; event.modifiers &= ~MODIFIER_SHIFT; //aContinueSelection;
if (parent) if (parent)
{ {
mCellParent = cellparent; mCellParent = cellparent;

2
layout/xul/base/public/nsXULPopupManager.h
Просмотреть файл

@ -736,7 +736,7 @@ protected:
nsIntPoint mCachedMousePoint; nsIntPoint mCachedMousePoint;
// cached modifiers // cached modifiers
mozilla::widget::Modifiers mCachedModifiers; mozilla::Modifiers mCachedModifiers;
// set to the currently active menu bar, if any // set to the currently active menu bar, if any
nsMenuBarFrame* mActiveMenuBar; nsMenuBarFrame* mActiveMenuBar;

6
widget/cocoa/TextInputHandler.mm
Просмотреть файл

@ -2076,9 +2076,9 @@ TextInputHandler::InsertText(NSAttributedString* aAttrString,
// Remove basic modifiers from keypress event because if they are included, // Remove basic modifiers from keypress event because if they are included,
// nsPlaintextEditor ignores the event. // nsPlaintextEditor ignores the event.
keypressEvent.modifiers &= ~(widget::MODIFIER_CONTROL | keypressEvent.modifiers &= ~(MODIFIER_CONTROL |
widget::MODIFIER_ALT | MODIFIER_ALT |
widget::MODIFIER_META); MODIFIER_META);
// TODO: // TODO:
// If mCurrentKeyEvent.mKeyEvent is null and when we implement textInput // If mCurrentKeyEvent.mKeyEvent is null and when we implement textInput

17
widget/nsEvent.h
Просмотреть файл

@ -76,7 +76,6 @@ class nsAnimationEvent;
class nsPluginEvent; class nsPluginEvent;
namespace mozilla { namespace mozilla {
namespace widget {
struct EventFlags; struct EventFlags;
@ -100,21 +99,6 @@ enum Modifier {
typedef uint16_t Modifiers; typedef uint16_t Modifiers;
// NotificationToIME is shared by nsIMEStateManager and TextComposition.
enum NotificationToIME {
// XXX We should replace NOTIFY_IME_OF_CURSOR_POS_CHANGED with
// NOTIFY_IME_OF_SELECTION_CHANGE later.
NOTIFY_IME_OF_CURSOR_POS_CHANGED,
// An editable content is getting focus
NOTIFY_IME_OF_FOCUS,
// An editable content is losing focus
NOTIFY_IME_OF_BLUR,
// Selection in the focused editable content is changed
NOTIFY_IME_OF_SELECTION_CHANGE,
REQUEST_TO_COMMIT_COMPOSITION,
REQUEST_TO_CANCEL_COMPOSITION
};
#define NS_DEFINE_KEYNAME(aCPPName, aDOMKeyName) \ #define NS_DEFINE_KEYNAME(aCPPName, aDOMKeyName) \
KEY_NAME_INDEX_##aCPPName, KEY_NAME_INDEX_##aCPPName,
@ -127,7 +111,6 @@ enum KeyNameIndex {
#undef NS_DEFINE_KEYNAME #undef NS_DEFINE_KEYNAME
} // namespace widget
} // namespace mozilla } // namespace mozilla
#define NS_DOM_KEYNAME_ALT "Alt" #define NS_DOM_KEYNAME_ALT "Alt"

56
widget/nsGUIEvent.h
Просмотреть файл

@ -58,7 +58,7 @@ enum nsEventStructType {
NS_MOUSE_EVENT, // nsMouseEvent NS_MOUSE_EVENT, // nsMouseEvent
NS_MOUSE_SCROLL_EVENT, // nsMouseScrollEvent NS_MOUSE_SCROLL_EVENT, // nsMouseScrollEvent
NS_DRAG_EVENT, // nsDragEvent NS_DRAG_EVENT, // nsDragEvent
NS_WHEEL_EVENT, // widget::WheelEvent NS_WHEEL_EVENT, // WheelEvent
// Touchpad related events // Touchpad related events
NS_GESTURENOTIFY_EVENT, // nsGestureNotifyEvent NS_GESTURENOTIFY_EVENT, // nsGestureNotifyEvent
@ -491,7 +491,6 @@ enum nsWindowZ {
}; };
namespace mozilla { namespace mozilla {
namespace widget {
// BaseEventFlags must be a POD struct for safe to use memcpy (including // BaseEventFlags must be a POD struct for safe to use memcpy (including
// in ParamTraits<BaseEventFlags>). So don't make virtual methods, constructor, // in ParamTraits<BaseEventFlags>). So don't make virtual methods, constructor,
@ -591,7 +590,7 @@ private:
inline void SetRawFlags(RawFlags aRawFlags) inline void SetRawFlags(RawFlags aRawFlags)
{ {
static_assert(sizeof(BaseEventFlags) <= sizeof(RawFlags), static_assert(sizeof(BaseEventFlags) <= sizeof(RawFlags),
"mozilla::widget::EventFlags must not be bigger than the RawFlags"); "mozilla::EventFlags must not be bigger than the RawFlags");
memcpy(this, &aRawFlags, sizeof(BaseEventFlags)); memcpy(this, &aRawFlags, sizeof(BaseEventFlags));
} }
inline RawFlags GetRawFlags() const inline RawFlags GetRawFlags() const
@ -610,7 +609,6 @@ struct EventFlags : public BaseEventFlags
} }
}; };
} // namespace widget
} // namespace mozilla } // namespace mozilla
/** /**
@ -680,7 +678,7 @@ public:
// to the time the message was created // to the time the message was created
uint64_t time; uint64_t time;
// See BaseEventFlags definition for the detail. // See BaseEventFlags definition for the detail.
mozilla::widget::BaseEventFlags mFlags; mozilla::BaseEventFlags mFlags;
// Additional type info for user defined events // Additional type info for user defined events
nsCOMPtr<nsIAtom> userType; nsCOMPtr<nsIAtom> userType;
@ -852,62 +850,62 @@ public:
// true indicates the shift key is down // true indicates the shift key is down
bool IsShift() const bool IsShift() const
{ {
return ((modifiers & mozilla::widget::MODIFIER_SHIFT) != 0); return ((modifiers & mozilla::MODIFIER_SHIFT) != 0);
} }
// true indicates the control key is down // true indicates the control key is down
bool IsControl() const bool IsControl() const
{ {
return ((modifiers & mozilla::widget::MODIFIER_CONTROL) != 0); return ((modifiers & mozilla::MODIFIER_CONTROL) != 0);
} }
// true indicates the alt key is down // true indicates the alt key is down
bool IsAlt() const bool IsAlt() const
{ {
return ((modifiers & mozilla::widget::MODIFIER_ALT) != 0); return ((modifiers & mozilla::MODIFIER_ALT) != 0);
} }
// true indicates the meta key is down (or, on Mac, the Command key) // true indicates the meta key is down (or, on Mac, the Command key)
bool IsMeta() const bool IsMeta() const
{ {
return ((modifiers & mozilla::widget::MODIFIER_META) != 0); return ((modifiers & mozilla::MODIFIER_META) != 0);
} }
// true indicates the win key is down on Windows. Or the Super or Hyper key // true indicates the win key is down on Windows. Or the Super or Hyper key
// is down on Linux. // is down on Linux.
bool IsOS() const bool IsOS() const
{ {
return ((modifiers & mozilla::widget::MODIFIER_OS) != 0); return ((modifiers & mozilla::MODIFIER_OS) != 0);
} }
// true indicates the alt graph key is down // true indicates the alt graph key is down
// NOTE: on Mac, the option key press causes both IsAlt() and IsAltGrpah() // NOTE: on Mac, the option key press causes both IsAlt() and IsAltGrpah()
// return true. // return true.
bool IsAltGraph() const bool IsAltGraph() const
{ {
return ((modifiers & mozilla::widget::MODIFIER_ALTGRAPH) != 0); return ((modifiers & mozilla::MODIFIER_ALTGRAPH) != 0);
} }
// true indeicates the CapLock LED is turn on. // true indeicates the CapLock LED is turn on.
bool IsCapsLocked() const bool IsCapsLocked() const
{ {
return ((modifiers & mozilla::widget::MODIFIER_CAPSLOCK) != 0); return ((modifiers & mozilla::MODIFIER_CAPSLOCK) != 0);
} }
// true indeicates the NumLock LED is turn on. // true indeicates the NumLock LED is turn on.
bool IsNumLocked() const bool IsNumLocked() const
{ {
return ((modifiers & mozilla::widget::MODIFIER_NUMLOCK) != 0); return ((modifiers & mozilla::MODIFIER_NUMLOCK) != 0);
} }
// true indeicates the ScrollLock LED is turn on. // true indeicates the ScrollLock LED is turn on.
bool IsScrollLocked() const bool IsScrollLocked() const
{ {
return ((modifiers & mozilla::widget::MODIFIER_SCROLLLOCK) != 0); return ((modifiers & mozilla::MODIFIER_SCROLLLOCK) != 0);
} }
// true indeicates the Fn key is down, but this is not supported by native // true indeicates the Fn key is down, but this is not supported by native
// key event on any platform. // key event on any platform.
bool IsFn() const bool IsFn() const
{ {
return ((modifiers & mozilla::widget::MODIFIER_FN) != 0); return ((modifiers & mozilla::MODIFIER_FN) != 0);
} }
// true indeicates the ScrollLock LED is turn on. // true indeicates the ScrollLock LED is turn on.
bool IsSymbolLocked() const bool IsSymbolLocked() const
{ {
return ((modifiers & mozilla::widget::MODIFIER_SYMBOLLOCK) != 0); return ((modifiers & mozilla::MODIFIER_SYMBOLLOCK) != 0);
} }
void InitBasicModifiers(bool aCtrlKey, void InitBasicModifiers(bool aCtrlKey,
@ -917,20 +915,20 @@ public:
{ {
modifiers = 0; modifiers = 0;
if (aCtrlKey) { if (aCtrlKey) {
modifiers |= mozilla::widget::MODIFIER_CONTROL; modifiers |= mozilla::MODIFIER_CONTROL;
} }
if (aAltKey) { if (aAltKey) {
modifiers |= mozilla::widget::MODIFIER_ALT; modifiers |= mozilla::MODIFIER_ALT;
} }
if (aShiftKey) { if (aShiftKey) {
modifiers |= mozilla::widget::MODIFIER_SHIFT; modifiers |= mozilla::MODIFIER_SHIFT;
} }
if (aMetaKey) { if (aMetaKey) {
modifiers |= mozilla::widget::MODIFIER_META; modifiers |= mozilla::MODIFIER_META;
} }
} }
mozilla::widget::Modifiers modifiers; mozilla::Modifiers modifiers;
void AssignInputEventData(const nsInputEvent& aEvent, bool aCopyTargets) void AssignInputEventData(const nsInputEvent& aEvent, bool aCopyTargets)
{ {
@ -1151,7 +1149,7 @@ public:
: nsInputEvent(isTrusted, msg, w, NS_KEY_EVENT), : nsInputEvent(isTrusted, msg, w, NS_KEY_EVENT),
keyCode(0), charCode(0), keyCode(0), charCode(0),
location(nsIDOMKeyEvent::DOM_KEY_LOCATION_STANDARD), isChar(0), location(nsIDOMKeyEvent::DOM_KEY_LOCATION_STANDARD), isChar(0),
mKeyNameIndex(mozilla::widget::KEY_NAME_INDEX_Unidentified), mKeyNameIndex(mozilla::KEY_NAME_INDEX_Unidentified),
mNativeKeyEvent(nullptr), mNativeKeyEvent(nullptr),
mUniqueId(0) mUniqueId(0)
{ {
@ -1169,7 +1167,7 @@ public:
// indicates whether the event signifies a printable character // indicates whether the event signifies a printable character
bool isChar; bool isChar;
// DOM KeyboardEvent.key // DOM KeyboardEvent.key
mozilla::widget::KeyNameIndex mKeyNameIndex; mozilla::KeyNameIndex mKeyNameIndex;
// OS-specific native event can optionally be preserved // OS-specific native event can optionally be preserved
void* mNativeKeyEvent; void* mNativeKeyEvent;
// Unique id associated with a keydown / keypress event. Used in identifing // Unique id associated with a keydown / keypress event. Used in identifing
@ -1183,11 +1181,11 @@ public:
GetDOMKeyName(mKeyNameIndex, aKeyName); GetDOMKeyName(mKeyNameIndex, aKeyName);
} }
static void GetDOMKeyName(mozilla::widget::KeyNameIndex aKeyNameIndex, static void GetDOMKeyName(mozilla::KeyNameIndex aKeyNameIndex,
nsAString& aKeyName) nsAString& aKeyName)
{ {
#define NS_DEFINE_KEYNAME(aCPPName, aDOMKeyName) \ #define NS_DEFINE_KEYNAME(aCPPName, aDOMKeyName) \
case mozilla::widget::KEY_NAME_INDEX_##aCPPName: \ case mozilla::KEY_NAME_INDEX_##aCPPName: \
aKeyName.Assign(NS_LITERAL_STRING(aDOMKeyName)); return; aKeyName.Assign(NS_LITERAL_STRING(aDOMKeyName)); return;
switch (aKeyNameIndex) { switch (aKeyNameIndex) {
#include "nsDOMKeyNameList.h" #include "nsDOMKeyNameList.h"
@ -1415,7 +1413,7 @@ public:
/** /**
* nsMouseScrollEvent is used for legacy DOM mouse scroll events, i.e., * nsMouseScrollEvent is used for legacy DOM mouse scroll events, i.e.,
* DOMMouseScroll and MozMousePixelScroll event. These events are NOT hanbled * DOMMouseScroll and MozMousePixelScroll event. These events are NOT hanbled
* by ESM even if widget dispatches them. Use new widget::WheelEvent instead. * by ESM even if widget dispatches them. Use new WheelEvent instead.
*/ */
class nsMouseScrollEvent : public nsMouseEvent_base class nsMouseScrollEvent : public nsMouseEvent_base
@ -1450,7 +1448,6 @@ public:
*/ */
namespace mozilla { namespace mozilla {
namespace widget {
class WheelEvent : public nsMouseEvent_base class WheelEvent : public nsMouseEvent_base
{ {
@ -1568,7 +1565,6 @@ public:
} }
}; };
} // namespace widget
} // namespace mozilla } // namespace mozilla
/* /*
@ -2230,8 +2226,8 @@ inline bool NS_IsAllowedToDispatchDOMEvent(nsEvent* aEvent)
case NS_WHEEL_EVENT: { case NS_WHEEL_EVENT: {
// wheel event whose all delta values are zero by user pref applied, it // wheel event whose all delta values are zero by user pref applied, it
// shouldn't cause a DOM event. // shouldn't cause a DOM event.
mozilla::widget::WheelEvent* wheelEvent = mozilla::WheelEvent* wheelEvent =
static_cast<mozilla::widget::WheelEvent*>(aEvent); static_cast<mozilla::WheelEvent*>(aEvent);
return wheelEvent->deltaX != 0.0 || wheelEvent->deltaY != 0.0 || return wheelEvent->deltaX != 0.0 || wheelEvent->deltaY != 0.0 ||
wheelEvent->deltaZ != 0.0; wheelEvent->deltaZ != 0.0;
} }

12
widget/nsGUIEventIPC.h
Просмотреть файл

@ -15,9 +15,9 @@ namespace IPC
{ {
template<> template<>
struct ParamTraits<mozilla::widget::BaseEventFlags> struct ParamTraits<mozilla::BaseEventFlags>
{ {
typedef mozilla::widget::BaseEventFlags paramType; typedef mozilla::BaseEventFlags paramType;
static void Write(Message* aMsg, const paramType& aParam) static void Write(Message* aMsg, const paramType& aParam)
{ {
@ -121,9 +121,9 @@ struct ParamTraits<nsMouseEvent_base>
}; };
template<> template<>
struct ParamTraits<mozilla::widget::WheelEvent> struct ParamTraits<mozilla::WheelEvent>
{ {
typedef mozilla::widget::WheelEvent paramType; typedef mozilla::WheelEvent paramType;
static void Write(Message* aMsg, const paramType& aParam) static void Write(Message* aMsg, const paramType& aParam)
{ {
@ -160,7 +160,7 @@ struct ParamTraits<mozilla::widget::WheelEvent>
ReadParam(aMsg, aIter, &aResult->overflowDeltaX) && ReadParam(aMsg, aIter, &aResult->overflowDeltaX) &&
ReadParam(aMsg, aIter, &aResult->overflowDeltaY); ReadParam(aMsg, aIter, &aResult->overflowDeltaY);
aResult->scrollType = aResult->scrollType =
static_cast<mozilla::widget::WheelEvent::ScrollType>(scrollType); static_cast<mozilla::WheelEvent::ScrollType>(scrollType);
return rv; return rv;
} }
}; };
@ -277,7 +277,7 @@ struct ParamTraits<nsKeyEvent>
ReadParam(aMsg, aIter, &aResult->location) && ReadParam(aMsg, aIter, &aResult->location) &&
ReadParam(aMsg, aIter, &aResult->mUniqueId)) ReadParam(aMsg, aIter, &aResult->mUniqueId))
{ {
aResult->mKeyNameIndex = static_cast<mozilla::widget::KeyNameIndex>(keyNameIndex); aResult->mKeyNameIndex = static_cast<mozilla::KeyNameIndex>(keyNameIndex);
aResult->mNativeKeyEvent = NULL; aResult->mNativeKeyEvent = NULL;
return true; return true;
} }

15
widget/nsIWidget.h
Просмотреть файл

@ -434,6 +434,21 @@ struct SizeConstraints {
nsIntSize mMaxSize; nsIntSize mMaxSize;
}; };
// NotificationToIME is shared by nsIMEStateManager and TextComposition.
enum NotificationToIME {
// XXX We should replace NOTIFY_IME_OF_CURSOR_POS_CHANGED with
// NOTIFY_IME_OF_SELECTION_CHANGE later.
NOTIFY_IME_OF_CURSOR_POS_CHANGED,
// An editable content is getting focus
NOTIFY_IME_OF_FOCUS,
// An editable content is losing focus
NOTIFY_IME_OF_BLUR,
// Selection in the focused editable content is changed
NOTIFY_IME_OF_SELECTION_CHANGE,
REQUEST_TO_COMMIT_COMPOSITION,
REQUEST_TO_CANCEL_COMPOSITION
};
} // namespace widget } // namespace widget
} // namespace mozilla } // namespace mozilla

10
widget/os2/nsWindow.cpp
Просмотреть файл

@ -2162,9 +2162,9 @@ bool nsWindow::OnMouseChord(MPARAM mp1, MPARAM mp2)
event.keyCode = NS_VK_INSERT; event.keyCode = NS_VK_INSERT;
if (isCopy) { if (isCopy) {
event.modifiers = widget::MODIFIER_CONTROL; event.modifiers = MODIFIER_CONTROL;
} else { } else {
event.modifiers = widget::MODIFIER_SHIFT; event.modifiers = MODIFIER_SHIFT;
} }
event.eventStructType = NS_KEY_EVENT; event.eventStructType = NS_KEY_EVENT;
event.charCode = 0; event.charCode = 0;
@ -2173,13 +2173,13 @@ bool nsWindow::OnMouseChord(MPARAM mp1, MPARAM mp2)
if (SHORT1FROMMP(mp1) & (KC_VIRTUALKEY | KC_KEYUP | KC_LONEKEY)) { if (SHORT1FROMMP(mp1) & (KC_VIRTUALKEY | KC_KEYUP | KC_LONEKEY)) {
USHORT usVKey = SHORT2FROMMP(mp2); USHORT usVKey = SHORT2FROMMP(mp2);
if (usVKey == VK_SHIFT) { if (usVKey == VK_SHIFT) {
event.modifiers |= widget::MODIFIER_SHIFT; event.modifiers |= MODIFIER_SHIFT;
} }
if (usVKey == VK_CTRL) { if (usVKey == VK_CTRL) {
event.modifiers |= widget::MODIFIER_CONTROL; event.modifiers |= MODIFIER_CONTROL;
} }
if (usVKey == VK_ALTGRAF || usVKey == VK_ALT) { if (usVKey == VK_ALTGRAF || usVKey == VK_ALT) {
event.modifiers |= widget::MODIFIER_ALT; event.modifiers |= MODIFIER_ALT;
} }
} }

2
widget/qt/nsQtKeyUtils.h
Просмотреть файл

@ -13,6 +13,6 @@
int QtKeyCodeToDOMKeyCode (int aKeysym); int QtKeyCodeToDOMKeyCode (int aKeysym);
int DOMKeyCodeToQtKeyCode (int aKeysym); int DOMKeyCodeToQtKeyCode (int aKeysym);
mozilla::widget::KeyNameIndex QtKeyCodeToDOMKeyNameIndex(int aKeysym); mozilla::KeyNameIndex QtKeyCodeToDOMKeyNameIndex(int aKeysym);
#endif /* __nsQtKeyUtils_h__ */ #endif /* __nsQtKeyUtils_h__ */

8
widget/qt/nsWindow.cpp
Просмотреть файл

@ -168,7 +168,7 @@ InitKeyEvent(nsKeyEvent &aEvent, QKeyEvent *aQEvent)
aEvent.time = 0; aEvent.time = 0;
if (sAltGrModifier) { if (sAltGrModifier) {
aEvent.modifiers |= (widget::MODIFIER_CONTROL | widget::MODIFIER_ALT); aEvent.modifiers |= (MODIFIER_CONTROL | MODIFIER_ALT);
} }
// The transformations above and in qt for the keyval are not invertible // The transformations above and in qt for the keyval are not invertible
@ -1684,9 +1684,9 @@ nsWindow::OnKeyPressEvent(QKeyEvent *aEvent)
// At that time, we need to reset the modifiers // At that time, we need to reset the modifiers
// because nsEditor will not accept a key event // because nsEditor will not accept a key event
// for text input if one or more modifiers are set. // for text input if one or more modifiers are set.
event.modifiers &= ~(widget::MODIFIER_CONTROL | event.modifiers &= ~(MODIFIER_CONTROL |
widget::MODIFIER_ALT | MODIFIER_ALT |
widget::MODIFIER_META); MODIFIER_META);
} }
KeySym keysym = NoSymbol; KeySym keysym = NoSymbol;

6
widget/tests/test_assign_event_data.html
Просмотреть файл

@ -339,7 +339,7 @@ const kTests = [
}, },
todoMismatch: [ ], todoMismatch: [ ],
}, },
{ description: "widget::WheelEvent (wheel, vertical)", { description: "WheelEvent (wheel, vertical)",
targetID: "input-text", eventType: "wheel", targetID: "input-text", eventType: "wheel",
dispatchEvent: function () { dispatchEvent: function () {
document.getElementById(this.targetID).value = ""; document.getElementById(this.targetID).value = "";
@ -351,7 +351,7 @@ const kTests = [
}, },
todoMismatch: [ ], todoMismatch: [ ],
}, },
{ description: "widget::WheelEvent (wheel, horizontal)", { description: "WheelEvent (wheel, horizontal)",
targetID: "input-text", eventType: "wheel", targetID: "input-text", eventType: "wheel",
dispatchEvent: function () { dispatchEvent: function () {
document.getElementById(this.targetID).value = ""; document.getElementById(this.targetID).value = "";
@ -363,7 +363,7 @@ const kTests = [
}, },
todoMismatch: [ ], todoMismatch: [ ],
}, },
{ description: "widget::WheelEvent (wheel, both)", { description: "WheelEvent (wheel, both)",
targetID: "input-text", eventType: "wheel", targetID: "input-text", eventType: "wheel",
dispatchEvent: function () { dispatchEvent: function () {
document.getElementById(this.targetID).value = ""; document.getElementById(this.targetID).value = "";

3
widget/windows/WinMouseScrollHandler.h
Просмотреть файл

@ -9,19 +9,18 @@
#include "nscore.h" #include "nscore.h"
#include "nsDebug.h" #include "nsDebug.h"
#include "nsEvent.h"
#include "mozilla/Assertions.h" #include "mozilla/Assertions.h"
#include "mozilla/TimeStamp.h" #include "mozilla/TimeStamp.h"
#include <windows.h> #include <windows.h>
class nsWindowBase; class nsWindowBase;
class nsGUIEvent;
struct nsIntPoint; struct nsIntPoint;
namespace mozilla { namespace mozilla {
namespace widget { namespace widget {
class ModifierKeyState; class ModifierKeyState;
class WheelEvent;
struct MSGResult; struct MSGResult;

2
widget/windows/nsWinGesture.h
Просмотреть файл

@ -211,7 +211,7 @@ public:
// Pan processing // Pan processing
bool IsPanEvent(LPARAM lParam); bool IsPanEvent(LPARAM lParam);
bool ProcessPanMessage(HWND hWnd, WPARAM wParam, LPARAM lParam); bool ProcessPanMessage(HWND hWnd, WPARAM wParam, LPARAM lParam);
bool PanDeltaToPixelScroll(mozilla::widget::WheelEvent& aWheelEvent); bool PanDeltaToPixelScroll(mozilla::WheelEvent& aWheelEvent);
void UpdatePanFeedbackX(HWND hWnd, int32_t scrollOverflow, bool& endFeedback); void UpdatePanFeedbackX(HWND hWnd, int32_t scrollOverflow, bool& endFeedback);
void UpdatePanFeedbackY(HWND hWnd, int32_t scrollOverflow, bool& endFeedback); void UpdatePanFeedbackY(HWND hWnd, int32_t scrollOverflow, bool& endFeedback);
void PanFeedbackFinalize(HWND hWnd, bool endFeedback); void PanFeedbackFinalize(HWND hWnd, bool endFeedback);