fixup widget/ios from EventMessage change (no bug, NPOTB)
authorTed Mielczarek <ted@mielczarek.org>
Tue, 22 Sep 2015 09:33:51 -0400
changeset 264157 2880ab8819c2b58b533e96fa08d396fe0a132a47
parent 264156 edf2e825c10d245ae7d45e2e1f554b3271cc1f31
child 264158 7a5322e5fa07efb3f62c6383c4a0bfa5ef588363
push id29429
push usercbook@mozilla.com
push dateThu, 24 Sep 2015 10:05:08 +0000
treeherdermozilla-central@001942e4617b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
fixup widget/ios from EventMessage change (no bug, NPOTB)
widget/uikit/nsWindow.mm
--- a/widget/uikit/nsWindow.mm
+++ b/widget/uikit/nsWindow.mm
@@ -83,22 +83,22 @@ private:
     int mNextTouchID;
 }
 // sets up our view, attaching it to its owning gecko view
 - (id)initWithFrame:(CGRect)inFrame geckoChild:(nsWindow*)inChild;
 // Our Gecko child was Destroy()ed
 - (void)widgetDestroyed;
 // Tear down this ChildView
 - (void)delayedTearDown;
-- (void)sendMouseEvent:(int) aType point:(LayoutDeviceIntPoint)aPoint widget:(nsWindow*)aWindow;
+- (void)sendMouseEvent:(EventMessage) aType point:(LayoutDeviceIntPoint)aPoint widget:(nsWindow*)aWindow;
 - (void)handleTap:(UITapGestureRecognizer *)sender;
 - (BOOL)isUsingMainThreadOpenGL;
 - (void)drawUsingOpenGL;
 - (void)drawUsingOpenGLCallback;
-- (void)sendTouchEvent:(int) aType touches:(NSSet*)aTouches widget:(nsWindow*)aWindow;
+- (void)sendTouchEvent:(EventMessage) aType touches:(NSSet*)aTouches widget:(nsWindow*)aWindow;
 // Event handling (UIResponder)
 - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
 - (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event;
 - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event;
 - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event;
 @end
 
 @implementation ChildView
@@ -133,17 +133,17 @@ private:
 }
 
 - (void)delayedTearDown
 {
   [self removeFromSuperview];
   [self release];
 }
 
-- (void)sendMouseEvent:(int) aType point:(LayoutDeviceIntPoint)aPoint widget:(nsWindow*)aWindow
+- (void)sendMouseEvent:(EventMessage) aType point:(LayoutDeviceIntPoint)aPoint widget:(nsWindow*)aWindow
 {
     WidgetMouseEvent event(true, aType, aWindow,
                            WidgetMouseEvent::eReal, WidgetMouseEvent::eNormal);
 
     event.refPoint = aPoint;
     event.clickCount = 1;
     event.button = WidgetMouseEvent::eLeftButton;
     event.time = PR_IntervalNow();
@@ -159,17 +159,17 @@ private:
         ALOG("[ChildView[%p] handleTap]", self);
         LayoutDeviceIntPoint lp = UIKitPointsToDevPixels([sender locationInView:self], [self contentScaleFactor]);
         [self sendMouseEvent:eMouseMove point:lp widget:mGeckoChild];
         [self sendMouseEvent:eMouseDown point:lp widget:mGeckoChild];
         [self sendMouseEvent:eMouseUp point:lp widget:mGeckoChild];
     }
 }
 
-- (void)sendTouchEvent:(int) aType touches:(NSSet*)aTouches widget:(nsWindow*)aWindow
+- (void)sendTouchEvent:(EventMessage) aType touches:(NSSet*)aTouches widget:(nsWindow*)aWindow
 {
     WidgetTouchEvent event(true, aType, aWindow);
     //XXX: I think nativeEvent.timestamp * 1000 is probably usable here but
     // I don't care that much right now.
     event.time = PR_IntervalNow();
     event.touches.SetCapacity(aTouches.count);
     for (UITouch* touch in aTouches) {
         LayoutDeviceIntPoint loc = UIKitPointsToDevPixels([touch locationInView:self], [self contentScaleFactor]);