diff options
| author | Paul Rouget <me@paulrouget.com> | 2019-07-18 12:46:19 +0200 |
|---|---|---|
| committer | Paul Rouget <me@paulrouget.com> | 2019-07-19 16:49:26 +0200 |
| commit | 3a374b3455df669ba0c61ec4ef94201f024c1bcd (patch) | |
| tree | 9fd99010a4c676a7d7fd7b3fba1ca89df718764f /support/android | |
| parent | b6cc0f60a987f306a64defff62c2ebc5f1b1c055 (diff) | |
| download | servo-3a374b3455df669ba0c61ec4ef94201f024c1bcd.tar.gz servo-3a374b3455df669ba0c61ec4ef94201f024c1bcd.zip | |
Expose javascript:window.alert() to libsimpleservo
Diffstat (limited to 'support/android')
3 files changed, 12 insertions, 0 deletions
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 @@ -130,6 +130,10 @@ public class MainActivity extends Activity implements Servo.Client { } @Override + public void onAlert(String message) { + } + + @Override public void onLoadStarted() { mReloadButton.setEnabled(false); mStopButton.setEnabled(true); 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; } |