From 3a374b3455df669ba0c61ec4ef94201f024c1bcd Mon Sep 17 00:00:00 2001
From: Paul Rouget <me@paulrouget.com>
Date: Thu, 18 Jul 2019 12:46:19 +0200
Subject: Expose javascript:window.alert() to libsimpleservo

---
 .../apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java  | 4 ++++
 .../apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java | 2 ++
 .../apk/servoview/src/main/java/org/mozilla/servoview/Servo.java    | 6 ++++++
 3 files changed, 12 insertions(+)

(limited to 'support/android')

diff --git a/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java b/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
index ffd445ff034..a731056e073 100644
--- a/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
+++ b/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
@@ -129,6 +129,10 @@ public class MainActivity extends Activity implements Servo.Client {
         mServoView.stop();
     }
 
+    @Override
+    public void onAlert(String message) {
+    }
+
     @Override
     public void onLoadStarted() {
         mReloadButton.setEnabled(false);
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;
         }
-- 
cgit v1.2.3