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

Remove duplicated context param from Servo constructor

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2018-09-25 11:53:27 +02:00
parent 991fdbe5d4
commit c7d11b9a1e
3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
support/android/apk/servoview/src/main/java/com/mozilla/servoview/Servo.java
View file

@ -31,8 +31,7 @@ public class Servo {
String url, String url,
String logstr, String logstr,
int width, int height, int width, int height,
float density, boolean log, float density, boolean log) {
Context context) {
mRunCallback = runCallback; mRunCallback = runCallback;
@ -45,7 +44,7 @@ public class Servo {
}); });
try { try {
GStreamer.init(context); GStreamer.init((Context) activity);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

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

@ -7,7 +7,6 @@ package com.mozilla.servoview;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.opengl.EGL14; import android.opengl.EGL14;
import android.opengl.EGLConfig; import android.opengl.EGLConfig;
@ -207,8 +206,7 @@ public class ServoSurface {
inUIThread(() -> { inUIThread(() -> {
final boolean showLogs = true; final boolean showLogs = true;
String uri = mInitialUri == null ? null : mInitialUri; String uri = mInitialUri == null ? null : mInitialUri;
mServo = new Servo(this, surface, mClient, mActivity, mServoArgs, uri, mServoLog, mServo = new Servo(this, surface, mClient, mActivity, mServoArgs, uri, mServoLog, mWidth, mHeight, 1, showLogs);
mWidth, mHeight, 1 /* density */, showLogs, (Context) mActivity);
}); });
Looper.loop(); Looper.loop();

3
support/android/apk/servoview/src/main/java/com/mozilla/servoview/ServoView.java
View file

@ -146,8 +146,7 @@ public class ServoView extends GLSurfaceView
inGLThread(() -> { inGLThread(() -> {
String uri = mInitialUri == null ? null : mInitialUri.toString(); String uri = mInitialUri == null ? null : mInitialUri.toString();
mServo = new Servo(this, this, mClient, mActivity, mServoArgs, uri, mServo = new Servo(this, this, mClient, mActivity, mServoArgs, uri, mServoLog, width, height, density, showLogs);
mServoLog, width, height, density, showLogs, (Context) mActivity);
}); });
} }