Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 982106 - Avoid intermittent NPE in Android x86 crashtests; r=kats

Browse Source
This commit is contained in:
Geoff Brown 2015-02-18 16:16:19 -07:00
parent ed728808f8
commit 811a8bd0fb
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mobile/android/base/gfx/GeckoLayerClient.java
View File

@ -681,12 +681,14 @@ class GeckoLayerClient implements LayerView.Listener, PanZoomTarget
mCurrentViewTransform.offsetX = offset.x;
mCurrentViewTransform.offsetY = offset.y;
mRootLayer.setPositionAndResolution(
Math.round(x + mCurrentViewTransform.offsetX),
Math.round(y + mCurrentViewTransform.offsetY),
Math.round(x + width + mCurrentViewTransform.offsetX),
Math.round(y + height + mCurrentViewTransform.offsetY),
resolution);
if (mRootLayer != null) {
mRootLayer.setPositionAndResolution(
Math.round(x + mCurrentViewTransform.offsetX),
Math.round(y + mCurrentViewTransform.offsetY),
Math.round(x + width + mCurrentViewTransform.offsetX),
Math.round(y + height + mCurrentViewTransform.offsetY),
resolution);
}
if (layersUpdated && mRecordDrawTimes) {
// If we got a layers update, that means a draw finished. Check to see if the area drawn matches
@ -728,6 +730,9 @@ class GeckoLayerClient implements LayerView.Listener, PanZoomTarget
public LayerRenderer.Frame createFrame() {
// Create the shaders and textures if necessary.
if (!mLayerRendererInitialized) {
if (mLayerRenderer == null) {
return null;
}
mLayerRenderer.checkMonitoringEnabled();
mLayerRenderer.createDefaultProgram();
mLayerRendererInitialized = true;