Backed out changeset 9a867e5a4ef5 (bug 895417) for suspicion of causing OSX asserts.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 25 Jul 2013 22:55:25 -0400
changeset 140103 42cf476a66e2846cab9937ef6fadd5afa133c670
parent 140094 5a60a08e6899c8c75adab892ca5e8f21284e3b84
child 140104 c6eaf5f8e72161c5c0fdd04539c4fb141c270287
push id31595
push userryanvm@gmail.com
push dateFri, 26 Jul 2013 05:29:22 +0000
treeherdermozilla-inbound@52f9e8ffe111 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs895417
milestone25.0a1
backs out9a867e5a4ef5446a9312de14612ee9d6c8c0185f
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
Backed out changeset 9a867e5a4ef5 (bug 895417) for suspicion of causing OSX asserts.
gfx/layers/ipc/AsyncPanZoomController.cpp
--- a/gfx/layers/ipc/AsyncPanZoomController.cpp
+++ b/gfx/layers/ipc/AsyncPanZoomController.cpp
@@ -267,32 +267,30 @@ AsyncPanZoomController::ReceiveInputEven
 
   switch (aEvent.eventStructType) {
   case NS_TOUCH_EVENT: {
     nsTouchEvent* touchEvent = static_cast<nsTouchEvent*>(aOutEvent);
     const nsTArray< nsRefPtr<dom::Touch> >& touches = touchEvent->touches;
     for (uint32_t i = 0; i < touches.Length(); ++i) {
       nsIDOMTouch* touch = touches[i];
       if (touch) {
-        CSSPoint refCSSPoint = WidgetSpaceToCompensatedViewportSpace(
+        CSSPoint refPoint = WidgetSpaceToCompensatedViewportSpace(
           ScreenPoint::FromUnknownPoint(gfx::Point(
             touch->mRefPoint.x, touch->mRefPoint.y)),
           currentResolution);
-        LayoutDevicePoint refPoint = refCSSPoint * mFrameMetrics.mDevPixelsPerCSSPixel;
         touch->mRefPoint = nsIntPoint(refPoint.x, refPoint.y);
       }
     }
     break;
   }
   default: {
-    CSSPoint refCSSPoint = WidgetSpaceToCompensatedViewportSpace(
+    CSSPoint refPoint = WidgetSpaceToCompensatedViewportSpace(
       ScreenPoint::FromUnknownPoint(gfx::Point(
         aOutEvent->refPoint.x, aOutEvent->refPoint.y)),
       currentResolution);
-    LayoutDevicePoint refPoint = refCSSPoint * mFrameMetrics.mDevPixelsPerCSSPixel;
     aOutEvent->refPoint = nsIntPoint(refPoint.x, refPoint.y);
     break;
   }
   }
 
   return status;
 }