Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1446850. Get rid of nsIDOMMouseScrollEvent. r=qdot

Browse Source 
MozReview-Commit-ID: ZT9E3Fhtw0
This commit is contained in:
Boris Zbarsky 2018-03-19 15:50:56 -04:00
parent d05e564049
commit 5f74b75e04
5 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/events/MouseScrollEvent.cpp
View File

@ -7,7 +7,6 @@
#include "mozilla/dom/MouseScrollEvent.h"
#include "mozilla/MouseEvents.h"
#include "prtime.h"
#include "nsIDOMMouseScrollEvent.h"
namespace mozilla {
namespace dom {
@ -57,15 +56,15 @@ MouseScrollEvent::InitMouseScrollEvent(const nsAString& aType,
aCtrlKey, aAltKey, aShiftKey, aMetaKey, aButton,
aRelatedTarget);
mEvent->AsMouseScrollEvent()->mIsHorizontal =
(aAxis == nsIDOMMouseScrollEvent::HORIZONTAL_AXIS);
(aAxis == MouseScrollEventBinding::HORIZONTAL_AXIS);
}
int32_t
MouseScrollEvent::Axis()
{
return mEvent->AsMouseScrollEvent()->mIsHorizontal ?
static_cast<int32_t>(nsIDOMMouseScrollEvent::HORIZONTAL_AXIS) :
static_cast<int32_t>(nsIDOMMouseScrollEvent::VERTICAL_AXIS);
MouseScrollEventBinding::HORIZONTAL_AXIS :
MouseScrollEventBinding::VERTICAL_AXIS;
}
} // namespace dom

1
dom/interfaces/events/moz.build
View File

@ -13,7 +13,6 @@ XPIDL_SOURCES += [
'nsIDOMEventListener.idl',
'nsIDOMEventTarget.idl',
'nsIDOMMouseEvent.idl',
'nsIDOMMouseScrollEvent.idl',
'nsIDOMNotifyPaintEvent.idl',
'nsIDOMNSEvent.idl',
'nsIDOMUIEvent.idl',

13
dom/interfaces/events/nsIDOMMouseScrollEvent.idl
View File

@ -1,13 +0,0 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsIDOMMouseEvent.idl"
[builtinclass, uuid(327bdd54-f772-4015-b856-9692154a066c)]
interface nsIDOMMouseScrollEvent : nsIDOMMouseEvent
{
const long HORIZONTAL_AXIS = 1;
const long VERTICAL_AXIS = 2;
};

4
widget/tests/window_mouse_scroll_win.html
View File

@ -69,8 +69,8 @@ const kTimeoutPref = "mousewheel.windows.transaction.timeout";
const kMouseLineScrollEvent = "DOMMouseScroll";
const kMousePixelScrollEvent = "MozMousePixelScroll";
const kVAxis = Ci.nsIDOMMouseScrollEvent.VERTICAL_AXIS;
const kHAxis = Ci.nsIDOMMouseScrollEvent.HORIZONTAL_AXIS;
const kVAxis = MouseScrollEvent.VERTICAL_AXIS;
const kHAxis = MouseScrollEvent.HORIZONTAL_AXIS;
var gLineHeight = 0;
var gCharWidth = 0;

3
xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp
View File

@ -22,7 +22,6 @@
#include "nsIDOMGeoPositionError.h"
#include "nsIDOMHTMLInputElement.h"
#include "nsIDOMMouseEvent.h"
#include "nsIDOMMouseScrollEvent.h"
#include "nsIDOMNode.h"
#include "nsIDOMNodeList.h"
#include "nsIDOMNotifyPaintEvent.h"
@ -68,7 +67,6 @@
#include "mozilla/dom/MediaListBinding.h"
#include "mozilla/dom/MessageEventBinding.h"
#include "mozilla/dom/MouseEventBinding.h"
#include "mozilla/dom/MouseScrollEventBinding.h"
#include "mozilla/dom/NodeListBinding.h"
#include "mozilla/dom/NodeBinding.h"
#include "mozilla/dom/NotifyPaintEventBinding.h"
@ -163,7 +161,6 @@ const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] =
DEFINE_SHIM(HTMLInputElement),
DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIListBoxObject, ListBoxObject),
DEFINE_SHIM(MouseEvent),
DEFINE_SHIM(MouseScrollEvent),
DEFINE_SHIM(NodeList),
DEFINE_SHIM(Node),
DEFINE_SHIM(NotifyPaintEvent),