corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1125040: Use LayoutDeviceIntPoint for nsIWidget::WidgetToScreen r=botond

Browse Source
This commit is contained in:
David Zbarsky
2015-02-01 17:27:41 -05:00
parent 389ecba2dc
commit baa5df4d99
42 changed files with 112 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
widget/android/AndroidJavaWrappers.cpp
View File

@@ -730,7 +730,7 @@ AndroidGeckoEvent::MakeTouchEvent(nsIWidget* widget)
event.modifiers = DOMModifiers();
event.time = Time();
const nsIntPoint& offset = widget->WidgetToScreenOffset();
const LayoutDeviceIntPoint& offset = widget->WidgetToScreenOffset();
event.touches.SetCapacity(endIndex - startIndex);
for (int i = startIndex; i < endIndex; i++) {
// In this code branch, we are dispatching this event directly
@@ -796,7 +796,7 @@ AndroidGeckoEvent::MakeMultiTouchInput(nsIWidget* widget)
return event;
}
const nsIntPoint& offset = widget->WidgetToScreenOffset();
const nsIntPoint& offset = widget->WidgetToScreenOffsetUntyped();
event.mTouches.SetCapacity(endIndex - startIndex);
for (int i = startIndex; i < endIndex; i++) {
nsIntPoint point = Points()[i] - offset;
@@ -853,11 +853,10 @@ AndroidGeckoEvent::MakeMouseEvent(nsIWidget* widget)
// We are dispatching this event directly into Gecko (as opposed to going
// through the AsyncPanZoomController), and the Points() array has points
// in CSS pixels, which we need to convert to LayoutDevice pixels.
const nsIntPoint& offset = widget->WidgetToScreenOffset();
const LayoutDeviceIntPoint& offset = widget->WidgetToScreenOffset();
CSSToLayoutDeviceScale scale = widget->GetDefaultScale();
event.refPoint = LayoutDeviceIntPoint((Points()[0].x * scale.scale) - offset.x,
(Points()[0].y * scale.scale) - offset.y);
return event;
}