aboutsummaryrefslogtreecommitdiffstats
path: root/support/android/apk/servoview
diff options
context:
space:
mode:
authorPaul Rouget <me@paulrouget.com>2019-07-18 12:46:19 +0200
committerPaul Rouget <me@paulrouget.com>2019-07-19 16:49:26 +0200
commit3a374b3455df669ba0c61ec4ef94201f024c1bcd (patch)
tree9fd99010a4c676a7d7fd7b3fba1ca89df718764f /support/android/apk/servoview
parentb6cc0f60a987f306a64defff62c2ebc5f1b1c055 (diff)
downloadservo-3a374b3455df669ba0c61ec4ef94201f024c1bcd.tar.gz
servo-3a374b3455df669ba0c61ec4ef94201f024c1bcd.zip
Expose javascript:window.alert() to libsimpleservo
Diffstat (limited to 'support/android/apk/servoview')
-rw-r--r--support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java2
-rw-r--r--support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java6
2 files changed, 8 insertions, 0 deletions
diff --git a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java
index f2c3bad3873..b5c18e3e5fa 100644
--- a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java
+++ b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java
@@ -93,6 +93,8 @@ public class JNIServo {
void makeCurrent();
+ void onAlert(String message);
+
void onAnimatingChanged(boolean animating);
void onLoadStarted();
diff --git a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java
index a5ca75ee8e2..e503293cac9 100644
--- a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java
+++ b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java
@@ -169,6 +169,8 @@ public class Servo {
}
public interface Client {
+ void onAlert(String message);
+
boolean onAllowNavigation(String url);
void onLoadStarted();
@@ -228,6 +230,10 @@ public class Servo {
mGfxCb.makeCurrent();
}
+ public void onAlert(String message) {
+ mRunCallback.inUIThread(() -> mClient.onAlert(message));
+ }
+
public void onShutdownComplete() {
mShutdownComplete = true;
}