Back out Bug 1127201 (part 2) for various problems.

This commit is contained in:
Andrew McCreight
2015-02-06 15:04:32 -08:00
parent 64644acbbe
commit e048a7df33
347 changed files with 3071 additions and 3032 deletions

View File

@@ -1468,7 +1468,7 @@ AndroidBridge::SyncViewportInfo(const LayerIntRect& aDisplayPort, const CSSToLay
aDisplayPort.width, aDisplayPort.height,
aDisplayResolution.scale, aLayersUpdated);
MOZ_ASSERT(viewTransform, "No view transform object!");
NS_ABORT_IF_FALSE(viewTransform, "No view transform object!");
aScrollOffset = ParentLayerPoint(viewTransform->X(), viewTransform->Y());
aScale.scale = viewTransform->Scale();
@@ -1500,7 +1500,7 @@ void AndroidBridge::SyncFrameMetrics(const ParentLayerPoint& aScrollOffset, floa
aLayersUpdated, dp.x, dp.y, dp.width, dp.height, aDisplayResolution.scale,
aIsFirstPaint);
MOZ_ASSERT(viewTransform, "No view transform object!");
NS_ABORT_IF_FALSE(viewTransform, "No view transform object!");
aFixedLayerMargins.top = viewTransform->FixedLayerMarginTop();
aFixedLayerMargins.right = viewTransform->FixedLayerMarginRight();