Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1259661 part.8 Rename WidgetMouseEvent::ignoreRootScrollFrame to WidgetMouseEvent::mIgnoreRootScrollFrame r=smaug

Browse Source 
MozReview-Commit-ID: 98G9UMv4qqj

--HG--
extra : rebase_source : e3fed10d5d7b8b3a714e279457192e9f0bc703df
This commit is contained in:
Masayuki Nakano 2016-05-10 21:15:05 +09:00
parent 52b8126bf2
commit b2a210c268
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/nsContentUtils.cpp
View File

@ -7796,7 +7796,7 @@ nsContentUtils::SendMouseEvent(nsCOMPtr<nsIPresShell> aPresShell,
return NS_ERROR_FAILURE;
event.mRefPoint = ToWidgetPoint(CSSPoint(aX, aY), offset, presContext);
event.ignoreRootScrollFrame = aIgnoreRootScrollFrame;
event.mIgnoreRootScrollFrame = aIgnoreRootScrollFrame;
nsEventStatus status = nsEventStatus_eIgnore;
if (aToWindow) {

2
dom/base/nsDOMWindowUtils.cpp
View File

@ -694,7 +694,7 @@ nsDOMWindowUtils::SendPointerEventCommon(const nsAString& aType,
event.mRefPoint =
nsContentUtils::ToWidgetPoint(CSSPoint(aX, aY), offset, presContext);
event.ignoreRootScrollFrame = aIgnoreRootScrollFrame;
event.mIgnoreRootScrollFrame = aIgnoreRootScrollFrame;
nsEventStatus status;
if (aToWindow) {

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

@ -487,7 +487,7 @@ APZCCallbackHelper::DispatchSynthesizedMouseEvent(EventMessage aMsg,
event.mTime = aTime;
event.button = WidgetMouseEvent::eLeftButton;
event.inputSource = nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
event.ignoreRootScrollFrame = true;
event.mIgnoreRootScrollFrame = true;
if (aMsg != eMouseMove) {
event.clickCount = 1;
}

2
layout/base/nsPresShell.cpp
View File

@ -7834,7 +7834,7 @@ PresShell::HandleEvent(nsIFrame* aFrame,
eventPoint = nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent, frame);
}
if (mouseEvent && mouseEvent->mClass == eMouseEventClass &&
mouseEvent->ignoreRootScrollFrame) {
mouseEvent->mIgnoreRootScrollFrame) {
flags |= INPUT_IGNORE_ROOT_SCROLL_FRAME;
}
nsIFrame* target =

2
widget/InputData.cpp
View File

@ -163,7 +163,7 @@ MouseInput::ToWidgetMouseEvent(nsIWidget* aWidget) const
PixelCastJustification::LayoutDeviceIsScreenForUntransformedEvent));
event.clickCount = clickCount;
event.inputSource = mInputSource;
event.ignoreRootScrollFrame = true;
event.mIgnoreRootScrollFrame = true;
return event;
}

10
widget/MouseEvents.h
View File

@ -207,7 +207,7 @@ protected:
: mReason(eReal)
, mContextMenuTrigger(eNormal)
, mExitFrom(eChild)
, ignoreRootScrollFrame(false)
, mIgnoreRootScrollFrame(false)
, clickCount(0)
{
}
@ -218,7 +218,7 @@ protected:
, mReason(aReason)
, mContextMenuTrigger(eNormal)
, mExitFrom(eChild)
, ignoreRootScrollFrame(false)
, mIgnoreRootScrollFrame(false)
, clickCount(0)
{
}
@ -235,7 +235,7 @@ public:
, mReason(aReason)
, mContextMenuTrigger(aContextMenuTrigger)
, mExitFrom(eChild)
, ignoreRootScrollFrame(false)
, mIgnoreRootScrollFrame(false)
, clickCount(0)
{
if (aMessage == eContextMenu) {
@ -274,7 +274,7 @@ public:
ExitFrom mExitFrom;
// Whether the event should ignore scroll frame bounds during dispatch.
bool ignoreRootScrollFrame;
bool mIgnoreRootScrollFrame;
/// The number of mouse clicks.
uint32_t clickCount;
@ -284,7 +284,7 @@ public:
AssignMouseEventBaseData(aEvent, aCopyTargets);
AssignPointerHelperData(aEvent);
ignoreRootScrollFrame = aEvent.ignoreRootScrollFrame;
mIgnoreRootScrollFrame = aEvent.mIgnoreRootScrollFrame;
clickCount = aEvent.clickCount;
}

6
widget/android/nsWindow.cpp
View File

@ -1970,7 +1970,7 @@ nsWindow::OnContextmenuEvent(AndroidGeckoEvent *ae)
WidgetMouseEvent::eReal, WidgetMouseEvent::eNormal);
contextMenuEvent.mRefPoint =
RoundedToInt(pt * GetDefaultScale()) - WidgetToScreenOffset();
contextMenuEvent.ignoreRootScrollFrame = true;
contextMenuEvent.mIgnoreRootScrollFrame = true;
contextMenuEvent.inputSource = nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
nsEventStatus contextMenuStatus;
@ -2009,7 +2009,7 @@ nsWindow::OnLongTapEvent(AndroidGeckoEvent *ae)
event.clickCount = 1;
event.mTime = ae->Time();
event.inputSource = nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
event.ignoreRootScrollFrame = true;
event.mIgnoreRootScrollFrame = true;
DispatchEvent(&event);
}
@ -2025,7 +2025,7 @@ nsWindow::DispatchHitTest(const WidgetTouchEvent& aEvent)
WidgetMouseEvent hittest(true, eMouseHitTest, this,
WidgetMouseEvent::eReal);
hittest.mRefPoint = aEvent.mTouches[0]->mRefPoint;
hittest.ignoreRootScrollFrame = true;
hittest.mIgnoreRootScrollFrame = true;
hittest.inputSource = nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
nsEventStatus status;
DispatchEvent(&hittest, status);

4
widget/nsGUIEventIPC.h
View File

@ -230,7 +230,7 @@ struct ParamTraits<mozilla::WidgetMouseEvent>
static void Write(Message* aMsg, const paramType& aParam)
{
WriteParam(aMsg, static_cast<mozilla::WidgetMouseEventBase>(aParam));
WriteParam(aMsg, aParam.ignoreRootScrollFrame);
WriteParam(aMsg, aParam.mIgnoreRootScrollFrame);
WriteParam(aMsg, static_cast<paramType::ReasonType>(aParam.mReason));
WriteParam(aMsg, static_cast<paramType::ContextMenuTriggerType>(
aParam.mContextMenuTrigger));
@ -246,7 +246,7 @@ struct ParamTraits<mozilla::WidgetMouseEvent>
paramType::ExitFromType exitFrom = 0;
rv = ReadParam(aMsg, aIter,
static_cast<mozilla::WidgetMouseEventBase*>(aResult)) &&
ReadParam(aMsg, aIter, &aResult->ignoreRootScrollFrame) &&
ReadParam(aMsg, aIter, &aResult->mIgnoreRootScrollFrame) &&
ReadParam(aMsg, aIter, &reason) &&
ReadParam(aMsg, aIter, &contextMenuTrigger) &&
ReadParam(aMsg, aIter, &exitFrom) &&