Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-13 02:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #21360 - paulrouget:fixSurface, r=jdm

Browse source 
Add more methods to ServoSurface and relabel the inner surface class name

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21360)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-08-08 08:32:44 -04:00 • committed by GitHub
commit 21079ad690
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

27
support/android/apk/servoview/src/main/java/com/mozilla/servoview/ServoSurface.java
View file

@ -13,6 +13,7 @@ import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.util.Log; import android.util.Log;
import android.view.Surface;
import com.mozilla.servoview.Servo.Client; import com.mozilla.servoview.Servo.Client;
import com.mozilla.servoview.Servo.GfxCallbacks; import com.mozilla.servoview.Servo.GfxCallbacks;
@ -74,6 +75,26 @@ public class ServoSurface {
mServo.stop(); mServo.stop();
} }
public void loadUri(String uri) {
mServo.loadUri(uri);
}
public void scrollStart(int dx, int dy, int x, int y) {
mServo.scrollStart(dx, dy, x, y);
}
public void scroll(int dx, int dy, int x, int y) {
mServo.scroll(dx, dy, x, y);
}
public void scrollEnd(int dx, int dy, int x, int y) {
mServo.scrollEnd(dx, dy, x, y);
}
public void click(int x, int y) {
mServo.click(x, y);
}
public void onSurfaceResized(int width, int height) { public void onSurfaceResized(int width, int height) {
mServo.resize(width, height); mServo.resize(width, height);
} }
@ -86,7 +107,7 @@ public class ServoSurface {
} }
} }
static class Surface implements GfxCallbacks { static class GLSurface implements GfxCallbacks {
private static final String LOGTAG = "ServoSurface"; private static final String LOGTAG = "ServoSurface";
private EGLConfig[] mEGLConfigs; private EGLConfig[] mEGLConfigs;
@ -94,7 +115,7 @@ public class ServoSurface {
private EGLContext mEglContext; private EGLContext mEglContext;
private EGLSurface mEglSurface; private EGLSurface mEglSurface;
Surface(Surface surface) { GLSurface(Surface surface) {
mEglDisplay = EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY); mEglDisplay = EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY);
int[] version = new int[2]; int[] version = new int[2];
if (!EGL14.eglInitialize(mEglDisplay, version, 0, version, 1)) { if (!EGL14.eglInitialize(mEglDisplay, version, 0, version, 1)) {
@ -169,7 +190,7 @@ public class ServoSurface {
public void run() { public void run() {
Looper.prepare(); Looper.prepare();
Surface surface = new Surface(mASurface); GLSurface surface = new GLSurface(mASurface);
final boolean showLogs = true; final boolean showLogs = true;
String uri = mInitialUri == null ? null : mInitialUri.toString(); String uri = mInitialUri == null ? null : mInitialUri.toString();