wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1180295 - Hook up the fixed-position layer margins to the DynamicToolbarAnimator. r=rbarker

Browse Source
This commit is contained in:
Kartikaya Gupta 2015-08-18 14:27:19 -04:00
parent 337fd5b15d
commit 69035cb6fa
2 changed files with 18 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mobile/android/base/gfx/DynamicToolbarAnimator.java
View File

@ -318,6 +318,21 @@ public class DynamicToolbarAnimator {
return true;
}
private float bottomOfCssViewport(ImmutableViewportMetrics aMetrics) {
return aMetrics.getHeight() + mMaxTranslation - mLayerViewTranslation;
}
void populateFixedPositionMargins(ViewTransform aTransform, ImmutableViewportMetrics aMetrics) {
Log.v(LOGTAG, "Populating top fixed margin using " + mLayerViewTranslation + " - " + mToolbarTranslation);
aTransform.fixedLayerMarginTop = mLayerViewTranslation - mToolbarTranslation;
float bottomOfScreen = mTarget.getView().getHeight();
// We want to move a fixed item from "bottomOfCssViewport" to
// "bottomOfScreen". But also the bottom margin > 0 means that bottom
// fixed-pos items will move upwards.
Log.v(LOGTAG, "Populating bottom fixed margin using " + bottomOfCssViewport(aMetrics) + " - " + bottomOfScreen);
aTransform.fixedLayerMarginBottom = bottomOfCssViewport(aMetrics) - bottomOfScreen;
}
class DynamicToolbarAnimationTask extends RenderTask {
private final float mStartTranslation;
private final float mEndTranslation;

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

@ -64,7 +64,6 @@ class GeckoLayerClient implements LayerView.Listener, PanZoomTarget
/* Used as temporaries by syncViewportInfo */
private final ViewTransform mCurrentViewTransform;
private final RectF mCurrentViewTransformMargins;
/* Used as the return value of progressiveUpdateCallback */
private final ProgressiveUpdateData mProgressiveUpdateData;
@ -118,7 +117,6 @@ class GeckoLayerClient implements LayerView.Listener, PanZoomTarget
mRecordDrawTimes = true;
mDrawTimingQueue = new DrawTimingQueue();
mCurrentViewTransform = new ViewTransform(0, 0, 1);
mCurrentViewTransformMargins = new RectF();
mProgressiveUpdateData = new ProgressiveUpdateData();
mProgressiveUpdateDisplayPort = new DisplayPortMetrics();
@ -250,7 +248,8 @@ class GeckoLayerClient implements LayerView.Listener, PanZoomTarget
DisplayMetrics metrics = mContext.getResources().getDisplayMetrics();
IntSize newScreenSize = new IntSize(metrics.widthPixels, metrics.heightPixels);
IntSize newWindowSize = new IntSize(mView.getWidth(), mView.getHeight());
IntSize newWindowSize = new IntSize(mViewportMetrics.viewportRectWidth,
mViewportMetrics.viewportRectHeight);
boolean screenSizeChanged = !mScreenSize.equals(newScreenSize);
boolean windowSizeChanged = !mWindowSize.equals(newWindowSize);
@ -298,61 +297,6 @@ class GeckoLayerClient implements LayerView.Listener, PanZoomTarget
});
}
/**
* Derives content document fixed position margins/fixed layer margins from
* the view margins in the given metrics object.
*/
private void getFixedMargins(ImmutableViewportMetrics metrics, RectF fixedMargins) {
fixedMargins.left = 0;
fixedMargins.top = 0;
fixedMargins.right = 0;
fixedMargins.bottom = 0;
// The maximum margins are determined by the scrollable area of the page.
float maxMarginWidth = Math.max(0, metrics.getPageWidth() - metrics.getWidthWithoutMargins());
float maxMarginHeight = Math.max(0, metrics.getPageHeight() - metrics.getHeightWithoutMargins());
// If the margins can't fully hide, they're pinned on - in which case,
// fixed margins should always be zero.
if (maxMarginWidth < metrics.marginLeft + metrics.marginRight) {
maxMarginWidth = 0;
}
if (maxMarginHeight < metrics.marginTop + metrics.marginBottom) {
maxMarginHeight = 0;
}
PointF offset = metrics.getMarginOffset();
RectF overscroll = metrics.getOverscroll();
if (offset.x >= 0) {
fixedMargins.right = Math.max(0, Math.min(offset.x - overscroll.right, maxMarginWidth));
} else {
fixedMargins.left = Math.max(0, Math.min(-offset.x - overscroll.left, maxMarginWidth));
}
if (offset.y >= 0) {
fixedMargins.bottom = Math.max(0, Math.min(offset.y - overscroll.bottom, maxMarginHeight));
} else {
fixedMargins.top = Math.max(0, Math.min(-offset.y - overscroll.top, maxMarginHeight));
}
// Adjust for overscroll. If we're overscrolled on one side, add that
// distance to the margins of the other side (limiting to the maximum
// margin size calculated above).
if (overscroll.left > 0) {
fixedMargins.right = Math.min(maxMarginWidth - fixedMargins.left,
fixedMargins.right + overscroll.left);
} else if (overscroll.right > 0) {
fixedMargins.left = Math.min(maxMarginWidth - fixedMargins.right,
fixedMargins.left + overscroll.right);
}
if (overscroll.top > 0) {
fixedMargins.bottom = Math.min(maxMarginHeight - fixedMargins.top,
fixedMargins.bottom + overscroll.top);
} else if (overscroll.bottom > 0) {
fixedMargins.top = Math.min(maxMarginHeight - fixedMargins.bottom,
fixedMargins.top + overscroll.bottom);
}
}
private void adjustViewport(DisplayPortMetrics displayPort) {
// TODO: APZ For fennec might need margins information to deal with
// the dynamic toolbar.
@ -679,12 +623,7 @@ class GeckoLayerClient implements LayerView.Listener, PanZoomTarget
mCurrentViewTransform.y = mFrameMetrics.viewportRectTop;
mCurrentViewTransform.scale = mFrameMetrics.zoomFactor;
// Adjust the fixed layer margins so that overscroll subtracts from them.
getFixedMargins(mFrameMetrics, mCurrentViewTransformMargins);
mCurrentViewTransform.fixedLayerMarginLeft = mCurrentViewTransformMargins.left;
mCurrentViewTransform.fixedLayerMarginTop = mCurrentViewTransformMargins.top;
mCurrentViewTransform.fixedLayerMarginRight = mCurrentViewTransformMargins.right;
mCurrentViewTransform.fixedLayerMarginBottom = mCurrentViewTransformMargins.bottom;
mToolbarAnimator.populateFixedPositionMargins(mCurrentViewTransform, mFrameMetrics);
if (mRootLayer != null) {
mRootLayer.setPositionAndResolution(