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 809199 - ViewportMetrics is dead. Long live ImmutableViewportMetrics. r=Cwiiis

Browse Source
This commit is contained in:
Kartikaya Gupta 2012-11-07 11:47:08 -05:00
parent 489650a19f
commit 47ba8e7df9
4 changed files with 43 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mobile/android/base/Makefile.in
View File

@ -171,7 +171,6 @@ FENNEC_JAVA_FILES = \
gfx/TileLayer.java \
gfx/TouchEventHandler.java \
gfx/ViewTransform.java \
gfx/ViewportMetrics.java \
gfx/VirtualLayer.java \
ui/Axis.java \
ui/PanZoomController.java \

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

@ -117,7 +117,7 @@ public class GeckoLayerClient
mForceRedraw = true;
DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
mViewportMetrics = new ImmutableViewportMetrics(new ViewportMetrics(displayMetrics));
mViewportMetrics = new ImmutableViewportMetrics(displayMetrics);
mZoomConstraints = new ZoomConstraints(false);
mPanZoomController = new PanZoomController(this, mEventDispatcher);
@ -192,9 +192,7 @@ public class GeckoLayerClient
* result in an infinite loop.
*/
void setViewportSize(FloatSize size) {
ViewportMetrics viewportMetrics = new ViewportMetrics(mViewportMetrics);
viewportMetrics.setSize(size);
mViewportMetrics = new ImmutableViewportMetrics(viewportMetrics);
mViewportMetrics = mViewportMetrics.setViewportSize(size);
if (mGeckoIsReady) {
// here we send gecko a resize message. The code in browser.js is responsible for
@ -251,9 +249,7 @@ public class GeckoLayerClient
if (mViewportMetrics.getCssPageRect().equals(cssRect))
return;
ViewportMetrics viewportMetrics = new ViewportMetrics(mViewportMetrics);
viewportMetrics.setPageRect(rect, cssRect);
mViewportMetrics = new ImmutableViewportMetrics(viewportMetrics);
mViewportMetrics = mViewportMetrics.setPageRect(rect, cssRect);
// Page size is owned by the layer client, so no need to notify it of
// this change.
@ -308,15 +304,14 @@ public class GeckoLayerClient
/** Viewport message handler. */
private DisplayPortMetrics handleViewportMessage(ImmutableViewportMetrics messageMetrics, ViewportMessageType type) {
synchronized (this) {
ViewportMetrics metrics;
ImmutableViewportMetrics metrics;
ImmutableViewportMetrics oldMetrics = getViewportMetrics();
switch (type) {
default:
case UPDATE:
metrics = new ViewportMetrics(messageMetrics);
// Keep the old viewport size
metrics.setSize(oldMetrics.getSize());
metrics = messageMetrics.setViewportSize(oldMetrics.getSize());
abortPanZoomAnimation();
break;
case PAGE_SIZE:
@ -324,12 +319,11 @@ public class GeckoLayerClient
// between the rendered content (which is what Gecko tells us)
// and our zoom level (which may have diverged).
float scaleFactor = oldMetrics.zoomFactor / messageMetrics.zoomFactor;
metrics = new ViewportMetrics(oldMetrics);
metrics.setPageRect(RectUtils.scale(messageMetrics.getPageRect(), scaleFactor), messageMetrics.getCssPageRect());
metrics = oldMetrics.setPageRect(RectUtils.scale(messageMetrics.getPageRect(), scaleFactor), messageMetrics.getCssPageRect());
break;
}
final ImmutableViewportMetrics newMetrics = new ImmutableViewportMetrics(metrics);
final ImmutableViewportMetrics newMetrics = metrics;
post(new Runnable() {
public void run() {
mGeckoViewport = newMetrics;
@ -467,12 +461,11 @@ public class GeckoLayerClient
float pageLeft, float pageTop, float pageRight, float pageBottom,
float cssPageLeft, float cssPageTop, float cssPageRight, float cssPageBottom) {
synchronized (this) {
ViewportMetrics currentMetrics = new ViewportMetrics(getViewportMetrics());
currentMetrics.setOrigin(new PointF(offsetX, offsetY));
currentMetrics.setZoomFactor(zoom);
currentMetrics.setPageRect(new RectF(pageLeft, pageTop, pageRight, pageBottom),
new RectF(cssPageLeft, cssPageTop, cssPageRight, cssPageBottom));
final ImmutableViewportMetrics newMetrics = new ImmutableViewportMetrics(currentMetrics);
final ImmutableViewportMetrics newMetrics = getViewportMetrics()
.setViewportOrigin(offsetX, offsetY)
.setZoomFactor(zoom)
.setPageRect(new RectF(pageLeft, pageTop, pageRight, pageBottom),
new RectF(cssPageLeft, cssPageTop, cssPageRight, cssPageBottom));
// Since we have switched to displaying a different document, we need to update any
// viewport-related state we have lying around. This includes mGeckoViewport and
// mViewportMetrics. Usually this information is updated via handleViewportMessage

53
mobile/android/base/gfx/ImmutableViewportMetrics.java
View File

@ -9,6 +9,7 @@ import org.mozilla.gecko.util.FloatUtils;
import android.graphics.PointF;
import android.graphics.RectF;
import android.util.DisplayMetrics;
/**
* ImmutableViewportMetrics are used to store the viewport metrics
@ -33,26 +34,12 @@ public class ImmutableViewportMetrics {
public final float viewportRectBottom;
public final float zoomFactor;
public ImmutableViewportMetrics(ViewportMetrics m) {
RectF viewportRect = m.getViewport();
viewportRectLeft = viewportRect.left;
viewportRectTop = viewportRect.top;
viewportRectRight = viewportRect.right;
viewportRectBottom = viewportRect.bottom;
RectF pageRect = m.getPageRect();
pageRectLeft = pageRect.left;
pageRectTop = pageRect.top;
pageRectRight = pageRect.right;
pageRectBottom = pageRect.bottom;
RectF cssPageRect = m.getCssPageRect();
cssPageRectLeft = cssPageRect.left;
cssPageRectTop = cssPageRect.top;
cssPageRectRight = cssPageRect.right;
cssPageRectBottom = cssPageRect.bottom;
zoomFactor = m.getZoomFactor();
public ImmutableViewportMetrics(DisplayMetrics metrics) {
viewportRectLeft = pageRectLeft = cssPageRectLeft = 0;
viewportRectTop = pageRectTop = cssPageRectTop = 0;
viewportRectRight = pageRectRight = cssPageRectRight = metrics.widthPixels;
viewportRectBottom = pageRectBottom = cssPageRectBottom = metrics.heightPixels;
zoomFactor = 1.0f;
}
private ImmutableViewportMetrics(float aPageRectLeft, float aPageRectTop,
@ -84,8 +71,6 @@ public class ImmutableViewportMetrics {
return viewportRectBottom - viewportRectTop;
}
// some helpers to make ImmutableViewportMetrics act more like ViewportMetrics
public PointF getOrigin() {
return new PointF(viewportRectLeft, viewportRectTop);
}
@ -143,6 +128,14 @@ public class ImmutableViewportMetrics {
FloatUtils.interpolate(zoomFactor, to.zoomFactor, t));
}
public ImmutableViewportMetrics setViewportSize(FloatSize size) {
return new ImmutableViewportMetrics(
pageRectLeft, pageRectTop, pageRectRight, pageRectBottom,
cssPageRectLeft, cssPageRectTop, cssPageRectRight, cssPageRectBottom,
viewportRectLeft, viewportRectTop, viewportRectLeft + size.width, viewportRectTop + size.height,
zoomFactor);
}
public ImmutableViewportMetrics setViewportOrigin(float newOriginX, float newOriginY) {
return new ImmutableViewportMetrics(
pageRectLeft, pageRectTop, pageRectRight, pageRectBottom,
@ -151,10 +144,26 @@ public class ImmutableViewportMetrics {
zoomFactor);
}
public ImmutableViewportMetrics setZoomFactor(float newZoomFactor) {
return new ImmutableViewportMetrics(
pageRectLeft, pageRectTop, pageRectRight, pageRectBottom,
cssPageRectLeft, cssPageRectTop, cssPageRectRight, cssPageRectBottom,
viewportRectLeft, viewportRectTop, viewportRectRight, viewportRectBottom,
newZoomFactor);
}
public ImmutableViewportMetrics offsetViewportBy(PointF delta) {
return setViewportOrigin(viewportRectLeft + delta.x, viewportRectTop + delta.y);
}
public ImmutableViewportMetrics setPageRect(RectF pageRect, RectF cssPageRect) {
return new ImmutableViewportMetrics(
pageRect.left, pageRect.top, pageRect.right, pageRect.bottom,
cssPageRect.left, cssPageRect.top, cssPageRect.right, cssPageRect.bottom,
viewportRectLeft, viewportRectTop, viewportRectRight, viewportRectBottom,
zoomFactor);
}
/* This will set the zoom factor and re-scale page-size and viewport offset
* accordingly. The given focus will remain at the same point on the screen
* after scaling.

175
mobile/android/base/gfx/ViewportMetrics.java
View File

@ -1,175 +0,0 @@
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.gfx;
import org.mozilla.gecko.util.FloatUtils;
import org.json.JSONException;
import org.json.JSONObject;
import android.graphics.PointF;
import android.graphics.RectF;
import android.util.DisplayMetrics;
/**
* ViewportMetrics manages state and contains some utility functions related to
* the page viewport for the Gecko layer client to use.
*/
public class ViewportMetrics {
private static final String LOGTAG = "GeckoViewportMetrics";
private RectF mPageRect;
private RectF mCssPageRect;
private RectF mViewportRect;
private float mZoomFactor;
public ViewportMetrics(DisplayMetrics metrics) {
mPageRect = new RectF(0, 0, metrics.widthPixels, metrics.heightPixels);
mCssPageRect = new RectF(0, 0, metrics.widthPixels, metrics.heightPixels);
mViewportRect = new RectF(0, 0, metrics.widthPixels, metrics.heightPixels);
mZoomFactor = 1.0f;
}
public ViewportMetrics(ViewportMetrics viewport) {
mPageRect = new RectF(viewport.getPageRect());
mCssPageRect = new RectF(viewport.getCssPageRect());
mViewportRect = new RectF(viewport.getViewport());
mZoomFactor = viewport.getZoomFactor();
}
public ViewportMetrics(ImmutableViewportMetrics viewport) {
mPageRect = new RectF(viewport.pageRectLeft,
viewport.pageRectTop,
viewport.pageRectRight,
viewport.pageRectBottom);
mCssPageRect = new RectF(viewport.cssPageRectLeft,
viewport.cssPageRectTop,
viewport.cssPageRectRight,
viewport.cssPageRectBottom);
mViewportRect = new RectF(viewport.viewportRectLeft,
viewport.viewportRectTop,
viewport.viewportRectRight,
viewport.viewportRectBottom);
mZoomFactor = viewport.zoomFactor;
}
public ViewportMetrics(JSONObject json) throws JSONException {
float x = (float)json.getDouble("x");
float y = (float)json.getDouble("y");
float width = (float)json.getDouble("width");
float height = (float)json.getDouble("height");
float pageLeft = (float)json.getDouble("pageLeft");
float pageTop = (float)json.getDouble("pageTop");
float pageRight = (float)json.getDouble("pageRight");
float pageBottom = (float)json.getDouble("pageBottom");
float cssPageLeft = (float)json.getDouble("cssPageLeft");
float cssPageTop = (float)json.getDouble("cssPageTop");
float cssPageRight = (float)json.getDouble("cssPageRight");
float cssPageBottom = (float)json.getDouble("cssPageBottom");
float zoom = (float)json.getDouble("zoom");
mPageRect = new RectF(pageLeft, pageTop, pageRight, pageBottom);
mCssPageRect = new RectF(cssPageLeft, cssPageTop, cssPageRight, cssPageBottom);
mViewportRect = new RectF(x, y, x + width, y + height);
mZoomFactor = zoom;
}
public ViewportMetrics(float x, float y, float width, float height,
float pageLeft, float pageTop, float pageRight, float pageBottom,
float cssPageLeft, float cssPageTop, float cssPageRight, float cssPageBottom,
float zoom) {
mPageRect = new RectF(pageLeft, pageTop, pageRight, pageBottom);
mCssPageRect = new RectF(cssPageLeft, cssPageTop, cssPageRight, cssPageBottom);
mViewportRect = new RectF(x, y, x + width, y + height);
mZoomFactor = zoom;
}
public PointF getOrigin() {
return new PointF(mViewportRect.left, mViewportRect.top);
}
public FloatSize getSize() {
return new FloatSize(mViewportRect.width(), mViewportRect.height());
}
public RectF getViewport() {
return mViewportRect;
}
public RectF getCssViewport() {
return RectUtils.scale(mViewportRect, 1/mZoomFactor);
}
public RectF getPageRect() {
return mPageRect;
}
public RectF getCssPageRect() {
return mCssPageRect;
}
public float getZoomFactor() {
return mZoomFactor;
}
public void setPageRect(RectF pageRect, RectF cssPageRect) {
mPageRect = pageRect;
mCssPageRect = cssPageRect;
}
public void setViewport(RectF viewport) {
mViewportRect = viewport;
}
public void setOrigin(PointF origin) {
mViewportRect.set(origin.x, origin.y,
origin.x + mViewportRect.width(),
origin.y + mViewportRect.height());
}
public void setSize(FloatSize size) {
mViewportRect.right = mViewportRect.left + size.width;
mViewportRect.bottom = mViewportRect.top + size.height;
}
public void setZoomFactor(float zoomFactor) {
mZoomFactor = zoomFactor;
}
public String toJSON() {
// Round off height and width. Since the height and width are the size of the screen, it
// makes no sense to send non-integer coordinates to Gecko.
int height = Math.round(mViewportRect.height());
int width = Math.round(mViewportRect.width());
StringBuffer sb = new StringBuffer(512);
sb.append("{ \"x\" : ").append(mViewportRect.left)
.append(", \"y\" : ").append(mViewportRect.top)
.append(", \"width\" : ").append(width)
.append(", \"height\" : ").append(height)
.append(", \"pageLeft\" : ").append(mPageRect.left)
.append(", \"pageTop\" : ").append(mPageRect.top)
.append(", \"pageRight\" : ").append(mPageRect.right)
.append(", \"pageBottom\" : ").append(mPageRect.bottom)
.append(", \"cssPageLeft\" : ").append(mCssPageRect.left)
.append(", \"cssPageTop\" : ").append(mCssPageRect.top)
.append(", \"cssPageRight\" : ").append(mCssPageRect.right)
.append(", \"cssPageBottom\" : ").append(mCssPageRect.bottom)
.append(", \"zoom\" : ").append(mZoomFactor)
.append(" }");
return sb.toString();
}
@Override
public String toString() {
StringBuffer buff = new StringBuffer(256);
buff.append("v=").append(mViewportRect.toString())
.append(" p=").append(mPageRect.toString())
.append(" c=").append(mCssPageRect.toString())
.append(" z=").append(mZoomFactor);
return buff.toString();
}
}