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

Bug 1259661 part.9 Rename WidgetMouseEvent::clickCount to WidgetMouseEvent::mClickCount r=smaug

Browse Source 
MozReview-Commit-ID: 5tC8UqcfLek

--HG--
extra : rebase_source : a336f9d8676c74804e2c00eebec4f2a30d7a11b3
This commit is contained in:
Masayuki Nakano 2016-05-10 23:29:14 +09:00
parent b2a210c268
commit 3e4ceded8b
22 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/base/nsCoreUtils.cpp
View File

@ -140,7 +140,7 @@ nsCoreUtils::DispatchMouseEvent(EventMessage aMessage, int32_t aX, int32_t aY,
event.mRefPoint = LayoutDeviceIntPoint(aX, aY);
event.clickCount = 1;
event.mClickCount = 1;
event.button = WidgetMouseEvent::eLeftButton;
event.mTime = PR_IntervalNow();
event.inputSource = nsIDOMMouseEvent::MOZ_SOURCE_UNKNOWN;

4
dom/base/Element.cpp
View File

@ -2089,14 +2089,14 @@ Element::DispatchClickEvent(nsPresContext* aPresContext,
uint16_t inputSource = 0;
WidgetMouseEvent* sourceMouseEvent = aSourceEvent->AsMouseEvent();
if (sourceMouseEvent) {
clickCount = sourceMouseEvent->clickCount;
clickCount = sourceMouseEvent->mClickCount;
pressure = sourceMouseEvent->pressure;
inputSource = sourceMouseEvent->inputSource;
} else if (aSourceEvent->mClass == eKeyboardEventClass) {
inputSource = nsIDOMMouseEvent::MOZ_SOURCE_KEYBOARD;
}
event.pressure = pressure;
event.clickCount = clickCount;
event.mClickCount = clickCount;
event.inputSource = inputSource;
event.mModifiers = aSourceEvent->mModifiers;
if (aExtraEventFlags) {

2
dom/base/nsContentUtils.cpp
View File

@ -7787,7 +7787,7 @@ nsContentUtils::SendMouseEvent(nsCOMPtr<nsIPresShell> aPresShell,
event.buttons = GetButtonsFlagForButton(aButton);
event.pressure = aPressure;
event.inputSource = aInputSourceArg;
event.clickCount = aClickCount;
event.mClickCount = aClickCount;
event.mTime = PR_IntervalNow();
event.mFlags.mIsSynthesizedForTests = aIsSynthesized;

2
dom/base/nsDOMWindowUtils.cpp
View File

@ -683,7 +683,7 @@ nsDOMWindowUtils::SendPointerEventCommon(const nsAString& aType,
event.tiltX = aTiltX;
event.tiltY = aTiltY;
event.isPrimary = (nsIDOMMouseEvent::MOZ_SOURCE_MOUSE == aInputSourceArg) ? true : aIsPrimary;
event.clickCount = aClickCount;
event.mClickCount = aClickCount;
event.mTime = PR_IntervalNow();
event.mFlags.mIsSynthesizedForTests = aOptionalArgCount >= 10 ? aIsSynthesized : true;

28
dom/events/EventStateManager.cpp
View File

@ -606,16 +606,16 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext,
switch (mouseEvent->button) {
case WidgetMouseEvent::eLeftButton:
BeginTrackingDragGesture(aPresContext, mouseEvent, aTargetFrame);
mLClickCount = mouseEvent->clickCount;
mLClickCount = mouseEvent->mClickCount;
SetClickCount(mouseEvent, aStatus);
sNormalLMouseEventInProcess = true;
break;
case WidgetMouseEvent::eMiddleButton:
mMClickCount = mouseEvent->clickCount;
mMClickCount = mouseEvent->mClickCount;
SetClickCount(mouseEvent, aStatus);
break;
case WidgetMouseEvent::eRightButton:
mRClickCount = mouseEvent->clickCount;
mRClickCount = mouseEvent->mClickCount;
SetClickCount(mouseEvent, aStatus);
break;
}
@ -1545,7 +1545,7 @@ EventStateManager::FireContextClick()
// init the event while mCurrentTarget is still good
WidgetMouseEvent event(true, eContextMenu, targetWidget,
WidgetMouseEvent::eReal);
event.clickCount = 1;
event.mClickCount = 1;
FillInEventFromGestureDown(&event);
// stop selection tracking, we're in control now
@ -4580,10 +4580,10 @@ EventStateManager::SetClickCount(WidgetMouseEvent* aEvent,
if (mLastLeftMouseDownContent == mouseContent ||
mLastLeftMouseDownContentParent == mouseContent ||
mLastLeftMouseDownContent == mouseContentParent) {
aEvent->clickCount = mLClickCount;
aEvent->mClickCount = mLClickCount;
mLClickCount = 0;
} else {
aEvent->clickCount = 0;
aEvent->mClickCount = 0;
}
mLastLeftMouseDownContent = nullptr;
mLastLeftMouseDownContentParent = nullptr;
@ -4598,10 +4598,10 @@ EventStateManager::SetClickCount(WidgetMouseEvent* aEvent,
if (mLastMiddleMouseDownContent == mouseContent ||
mLastMiddleMouseDownContentParent == mouseContent ||
mLastMiddleMouseDownContent == mouseContentParent) {
aEvent->clickCount = mMClickCount;
aEvent->mClickCount = mMClickCount;
mMClickCount = 0;
} else {
aEvent->clickCount = 0;
aEvent->mClickCount = 0;
}
mLastMiddleMouseDownContent = nullptr;
mLastMiddleMouseDownContentParent = nullptr;
@ -4616,10 +4616,10 @@ EventStateManager::SetClickCount(WidgetMouseEvent* aEvent,
if (mLastRightMouseDownContent == mouseContent ||
mLastRightMouseDownContentParent == mouseContent ||
mLastRightMouseDownContent == mouseContentParent) {
aEvent->clickCount = mRClickCount;
aEvent->mClickCount = mRClickCount;
mRClickCount = 0;
} else {
aEvent->clickCount = 0;
aEvent->mClickCount = 0;
}
mLastRightMouseDownContent = nullptr;
mLastRightMouseDownContentParent = nullptr;
@ -4638,7 +4638,7 @@ EventStateManager::CheckForAndDispatchClick(WidgetMouseEvent* aEvent,
//If mouse is still over same element, clickcount will be > 1.
//If it has moved it will be zero, so no click.
if (0 != aEvent->clickCount) {
if (aEvent->mClickCount) {
//Check that the window isn't disabled before firing a click
//(see bug 366544).
if (aEvent->mWidget && !aEvent->mWidget->IsEnabled()) {
@ -4652,7 +4652,7 @@ EventStateManager::CheckForAndDispatchClick(WidgetMouseEvent* aEvent,
WidgetMouseEvent event(aEvent->IsTrusted(), eMouseClick,
aEvent->mWidget, WidgetMouseEvent::eReal);
event.mRefPoint = aEvent->mRefPoint;
event.clickCount = aEvent->clickCount;
event.mClickCount = aEvent->mClickCount;
event.mModifiers = aEvent->mModifiers;
event.buttons = aEvent->buttons;
event.mTime = aEvent->mTime;
@ -4680,13 +4680,13 @@ EventStateManager::CheckForAndDispatchClick(WidgetMouseEvent* aEvent,
nsWeakFrame currentTarget = mCurrentTarget;
ret = presShell->HandleEventWithTarget(&event, currentTarget,
mouseContent, aStatus);
if (NS_SUCCEEDED(ret) && aEvent->clickCount == 2 &&
if (NS_SUCCEEDED(ret) && aEvent->mClickCount == 2 &&
mouseContent && mouseContent->IsInComposedDoc()) {
//fire double click
WidgetMouseEvent event2(aEvent->IsTrusted(), eMouseDoubleClick,
aEvent->mWidget, WidgetMouseEvent::eReal);
event2.mRefPoint = aEvent->mRefPoint;
event2.clickCount = aEvent->clickCount;
event2.mClickCount = aEvent->mClickCount;
event2.mModifiers = aEvent->mModifiers;
event2.buttons = aEvent->buttons;
event2.mFlags.mNoContentDispatch = notDispatchToContents;

4
dom/events/MouseEvent.cpp
View File

@ -39,7 +39,7 @@ MouseEvent::MouseEvent(EventTarget* aOwner,
if (mouseEvent) {
MOZ_ASSERT(mouseEvent->mReason != WidgetMouseEvent::eSynthesized,
"Don't dispatch DOM events from synthesized mouse events");
mDetail = mouseEvent->clickCount;
mDetail = mouseEvent->mClickCount;
}
}
@ -87,7 +87,7 @@ MouseEvent::InitMouseEvent(const nsAString& aType,
WidgetMouseEvent* mouseEvent = mEvent->AsMouseEvent();
if (mouseEvent) {
mouseEvent->clickCount = aDetail;
mouseEvent->mClickCount = aDetail;
}
break;
}

2
dom/html/HTMLLabelElement.cpp
View File

@ -161,7 +161,7 @@ HTMLLabelElement::PostHandleEvent(EventChainPostVisitor& aVisitor)
}
// Only set focus on the first click of multiple clicks to prevent
// to prevent immediate de-focus.
if (mouseEvent->clickCount <= 1) {
if (mouseEvent->mClickCount <= 1) {
nsIFocusManager* fm = nsFocusManager::GetFocusManager();
if (fm) {
// Use FLAG_BYMOVEFOCUS here so that the label is scrolled to.

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

@ -2229,7 +2229,7 @@ TranslateToNPCocoaEvent(WidgetGUIEvent* anEvent, nsIFrame* aObjectFrame)
default:
NS_WARNING("Mouse button we don't know about?");
}
cocoaEvent.data.mouse.clickCount = mouseEvent->clickCount;
cocoaEvent.data.mouse.clickCount = mouseEvent->mClickCount;
} else {
NS_WARNING("eMouseUp/DOWN is not a WidgetMouseEvent?");
}
@ -2411,7 +2411,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const WidgetGUIEvent& anEvent)
static const int dblClickMsgs[] =
{ WM_LBUTTONDBLCLK, WM_MBUTTONDBLCLK, WM_RBUTTONDBLCLK };
const WidgetMouseEvent* mouseEvent = anEvent.AsMouseEvent();
if (mouseEvent->clickCount == 2) {
if (mouseEvent->mClickCount == 2) {
pluginEvent.event = dblClickMsgs[mouseEvent->button];
} else {
pluginEvent.event = downMsgs[mouseEvent->button];

2
gfx/layers/apz/util/APZCCallbackHelper.cpp
View File

@ -489,7 +489,7 @@ APZCCallbackHelper::DispatchSynthesizedMouseEvent(EventMessage aMsg,
event.inputSource = nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
event.mIgnoreRootScrollFrame = true;
if (aMsg != eMouseMove) {
event.clickCount = 1;
event.mClickCount = 1;
}
event.mModifiers = aModifiers;

5
layout/forms/nsListControlFrame.cpp
View File

@ -1666,10 +1666,11 @@ nsListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent)
FireOnChange();
}
mouseEvent->clickCount = 1;
mouseEvent->mClickCount = 1;
} else {
// the click was out side of the select or its dropdown
mouseEvent->clickCount = IgnoreMouseEventForSelection(aMouseEvent) ? 1 : 0;
mouseEvent->mClickCount =
IgnoreMouseEventForSelection(aMouseEvent) ? 1 : 0;
}
} else {
CaptureMouseEvents(false);

8
layout/generic/nsFrame.cpp
View File

@ -3268,7 +3268,7 @@ nsFrame::HandlePress(nsPresContext* aPresContext,
#endif
RefPtr<nsFrameSelection> fc = const_cast<nsFrameSelection*>(frameselection);
if (mouseEvent->clickCount > 1) {
if (mouseEvent->mClickCount > 1) {
// These methods aren't const but can't actually delete anything,
// so no need for nsWeakFrame.
fc->SetDragState(true);
@ -3467,16 +3467,16 @@ nsFrame::HandleMultiplePress(nsPresContext* aPresContext,
return NS_OK;
}
if (mouseEvent->clickCount == 4) {
if (mouseEvent->mClickCount == 4) {
beginAmount = endAmount = eSelectParagraph;
} else if (mouseEvent->clickCount == 3) {
} else if (mouseEvent->mClickCount == 3) {
if (Preferences::GetBool("browser.triple_click_selects_paragraph")) {
beginAmount = endAmount = eSelectParagraph;
} else {
beginAmount = eSelectBeginLine;
endAmount = eSelectEndLine;
}
} else if (mouseEvent->clickCount == 2) {
} else if (mouseEvent->mClickCount == 2) {
// We only want inline frames; PeekBackwardAndForward dislikes blocks
beginAmount = endAmount = eSelectWord;
} else {

2
layout/generic/nsSelection.cpp
View File

@ -3294,7 +3294,7 @@ nsFrameSelection::SetDelayedCaretData(WidgetMouseEvent* aMouseEvent)
if (aMouseEvent) {
mDelayedMouseEventValid = true;
mDelayedMouseEventIsShift = aMouseEvent->IsShift();
mDelayedMouseEventClickCount = aMouseEvent->clickCount;
mDelayedMouseEventClickCount = aMouseEvent->mClickCount;
} else {
mDelayedMouseEventValid = false;
}

4
widget/InputData.cpp
View File

@ -161,7 +161,7 @@ MouseInput::ToWidgetMouseEvent(nsIWidget* aWidget) const
event.mRefPoint =
RoundedToInt(ViewAs<LayoutDevicePixel>(mOrigin,
PixelCastJustification::LayoutDeviceIsScreenForUntransformedEvent));
event.clickCount = clickCount;
event.mClickCount = clickCount;
event.inputSource = mInputSource;
event.mIgnoreRootScrollFrame = true;
@ -294,7 +294,7 @@ MultiTouchInput::ToWidgetMouseEvent(nsIWidget* aWidget) const
event.mFlags.mHandledByAPZ = mHandledByAPZ;
if (mouseEventMessage != eMouseMove) {
event.clickCount = 1;
event.mClickCount = 1;
}
return event;

10
widget/MouseEvents.h
View File

@ -208,7 +208,7 @@ protected:
, mContextMenuTrigger(eNormal)
, mExitFrom(eChild)
, mIgnoreRootScrollFrame(false)
, clickCount(0)
, mClickCount(0)
{
}
@ -219,7 +219,7 @@ protected:
, mContextMenuTrigger(eNormal)
, mExitFrom(eChild)
, mIgnoreRootScrollFrame(false)
, clickCount(0)
, mClickCount(0)
{
}
@ -236,7 +236,7 @@ public:
, mContextMenuTrigger(aContextMenuTrigger)
, mExitFrom(eChild)
, mIgnoreRootScrollFrame(false)
, clickCount(0)
, mClickCount(0)
{
if (aMessage == eContextMenu) {
button = (mContextMenuTrigger == eNormal) ? eRightButton : eLeftButton;
@ -277,7 +277,7 @@ public:
bool mIgnoreRootScrollFrame;
/// The number of mouse clicks.
uint32_t clickCount;
uint32_t mClickCount;
void AssignMouseEventData(const WidgetMouseEvent& aEvent, bool aCopyTargets)
{
@ -285,7 +285,7 @@ public:
AssignPointerHelperData(aEvent);
mIgnoreRootScrollFrame = aEvent.mIgnoreRootScrollFrame;
clickCount = aEvent.clickCount;
mClickCount = aEvent.mClickCount;
}
/**

2
widget/android/AndroidJavaWrappers.cpp
View File

@ -722,7 +722,7 @@ AndroidGeckoEvent::MakeMouseEvent(nsIWidget* widget)
// XXX can we synthesize different buttons?
event.button = WidgetMouseEvent::eLeftButton;
if (msg != eMouseMove) {
event.clickCount = 1;
event.mClickCount = 1;
}
event.mModifiers = DOMModifiers();
event.mTime = Time();

2
widget/android/nsWindow.cpp
View File

@ -2006,7 +2006,7 @@ nsWindow::OnLongTapEvent(AndroidGeckoEvent *ae)
event.button = WidgetMouseEvent::eLeftButton;
event.mRefPoint =
RoundedToInt(pt * GetDefaultScale()) - WidgetToScreenOffset();
event.clickCount = 1;
event.mClickCount = 1;
event.mTime = ae->Time();
event.inputSource = nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
event.mIgnoreRootScrollFrame = true;

8
widget/cocoa/nsChildView.mm
View File

@ -4530,7 +4530,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
// blocked.
clickCount--;
}
geckoEvent.clickCount = clickCount;
geckoEvent.mClickCount = clickCount;
if (modifierFlags & NSControlKeyMask)
geckoEvent.button = WidgetMouseEvent::eRightButton;
@ -4741,7 +4741,7 @@ NewCGSRegionFromRegion(const LayoutDeviceIntRegion& aRegion,
WidgetMouseEvent::eReal);
[self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
geckoEvent.button = WidgetMouseEvent::eRightButton;
geckoEvent.clickCount = [theEvent clickCount];
geckoEvent.mClickCount = [theEvent clickCount];
mGeckoChild->DispatchInputEvent(&geckoEvent);
if (!mGeckoChild)
@ -4767,7 +4767,7 @@ NewCGSRegionFromRegion(const LayoutDeviceIntRegion& aRegion,
WidgetMouseEvent::eReal);
[self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
geckoEvent.button = WidgetMouseEvent::eRightButton;
geckoEvent.clickCount = [theEvent clickCount];
geckoEvent.mClickCount = [theEvent clickCount];
nsAutoRetainCocoaObject kungFuDeathGrip(self);
mGeckoChild->DispatchInputEvent(&geckoEvent);
@ -4813,7 +4813,7 @@ NewCGSRegionFromRegion(const LayoutDeviceIntRegion& aRegion,
WidgetMouseEvent::eReal);
[self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
geckoEvent.button = WidgetMouseEvent::eMiddleButton;
geckoEvent.clickCount = [theEvent clickCount];
geckoEvent.mClickCount = [theEvent clickCount];
mGeckoChild->DispatchInputEvent(&geckoEvent);

8
widget/gtk/nsWindow.cpp
View File

@ -2754,14 +2754,14 @@ nsWindow::InitButtonEvent(WidgetMouseEvent& aEvent,
switch (aGdkEvent->type) {
case GDK_2BUTTON_PRESS:
aEvent.clickCount = 2;
aEvent.mClickCount = 2;
break;
case GDK_3BUTTON_PRESS:
aEvent.clickCount = 3;
aEvent.mClickCount = 3;
break;
// default is one click
default:
aEvent.clickCount = 1;
aEvent.mClickCount = 1;
}
}
@ -3144,7 +3144,7 @@ nsWindow::OnKeyPressEvent(GdkEventKey *aEvent)
contextMenuEvent.mRefPoint = LayoutDeviceIntPoint(0, 0);
contextMenuEvent.AssignEventTime(GetWidgetEventTime(aEvent->time));
contextMenuEvent.clickCount = 1;
contextMenuEvent.mClickCount = 1;
KeymapWrapper::InitInputEvent(contextMenuEvent, aEvent->state);
DispatchInputEvent(&contextMenuEvent);
} else {

4
widget/nsGUIEventIPC.h
View File

@ -235,7 +235,7 @@ struct ParamTraits<mozilla::WidgetMouseEvent>
WriteParam(aMsg, static_cast<paramType::ContextMenuTriggerType>(
aParam.mContextMenuTrigger));
WriteParam(aMsg, static_cast<paramType::ExitFromType>(aParam.mExitFrom));
WriteParam(aMsg, aParam.clickCount);
WriteParam(aMsg, aParam.mClickCount);
}
static bool Read(const Message* aMsg, void** aIter, paramType* aResult)
@ -250,7 +250,7 @@ struct ParamTraits<mozilla::WidgetMouseEvent>
ReadParam(aMsg, aIter, &reason) &&
ReadParam(aMsg, aIter, &contextMenuTrigger) &&
ReadParam(aMsg, aIter, &exitFrom) &&
ReadParam(aMsg, aIter, &aResult->clickCount);
ReadParam(aMsg, aIter, &aResult->mClickCount);
aResult->mReason = static_cast<paramType::Reason>(reason);
aResult->mContextMenuTrigger =
static_cast<paramType::ContextMenuTrigger>(contextMenuTrigger);

4
widget/qt/nsWindow.cpp
View File

@ -965,7 +965,7 @@ InitMouseEvent(WidgetMouseEvent& aMouseEvent, QMouseEvent* aEvent,
aEvent->modifiers() & Qt::AltModifier,
aEvent->modifiers() & Qt::ShiftModifier,
aEvent->modifiers() & Qt::MetaModifier);
aMouseEvent.clickCount = aClickCount;
aMouseEvent.mClickCount = aClickCount;
switch (aEvent->button()) {
case Qt::LeftButton:
@ -1991,7 +1991,7 @@ nsWindow::ProcessMotionEvent()
mMoveEvent.modifiers & Qt::AltModifier,
mMoveEvent.modifiers & Qt::ShiftModifier,
mMoveEvent.modifiers & Qt::MetaModifier);
event.clickCount = 0;
event.mClickCount = 0;
DispatchEvent(&event);
mMoveEvent.needDispatch = false;

2
widget/uikit/nsWindow.mm
View File

@ -144,7 +144,7 @@ private:
WidgetMouseEvent::eReal, WidgetMouseEvent::eNormal);
event.mRefPoint = aPoint;
event.clickCount = 1;
event.mClickCount = 1;
event.button = WidgetMouseEvent::eLeftButton;
event.mTime = PR_IntervalNow();
event.inputSource = nsIDOMMouseEvent::MOZ_SOURCE_UNKNOWN;

4
widget/windows/nsWindow.cpp
View File

@ -4106,11 +4106,11 @@ nsWindow::DispatchMouseEvent(EventMessage aEventMessage, WPARAM wParam,
default:
break;
}
event.clickCount = sLastClickCount;
event.mClickCount = sLastClickCount;
#ifdef NS_DEBUG_XX
MOZ_LOG(gWindowsLog, LogLevel::Info,
("Msg Time: %d Click Count: %d\n", curMsgTime, event.clickCount));
("Msg Time: %d Click Count: %d\n", curMsgTime, event.mClickCount));
#endif
NPEvent pluginEvent;