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

Bug 1127201 (attempt 2, part 1) - Replace most NS_ABORT_IF_FALSE calls with MOZ_ASSERT. r=Waldo.

Browse Source
This commit is contained in:
Nicholas Nethercote
2015-02-09 14:34:50 -08:00
parent 1aac214090
commit 0247de46d8
347 changed files with 2974 additions and 3007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
widget/android/AndroidBridge.cpp
View File

@@ -1468,7 +1468,7 @@ AndroidBridge::SyncViewportInfo(const LayerIntRect& aDisplayPort, const CSSToLay
aDisplayPort.width, aDisplayPort.height,
aDisplayResolution.scale, aLayersUpdated);
NS_ABORT_IF_FALSE(viewTransform, "No view transform object!");
MOZ_ASSERT(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);
NS_ABORT_IF_FALSE(viewTransform, "No view transform object!");
MOZ_ASSERT(viewTransform, "No view transform object!");
aFixedLayerMargins.top = viewTransform->FixedLayerMarginTop();
aFixedLayerMargins.right = viewTransform->FixedLayerMarginRight();