From de8fae14b71ccf11e864c5cdbab52696d1c86666 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Fri, 28 Sep 2018 23:25:13 -0400
Subject: [PATCH] android: Do not trigger a composite before Servo has finished
 compositing.

---
 .../servoview/src/main/java/org/mozilla/servoview/Servo.java  | 4 ++++
 .../src/main/java/org/mozilla/servoview/ServoView.java        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

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 f93c5105f148..a4b3f6b651f8 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
@@ -54,6 +54,10 @@ public String version() {
         return mJNI.version();
     }
 
+    public void performUpdates() {
+        mRunCallback.inGLThread(() -> mJNI.performUpdates());
+    }
+
     public void setBatchMode(boolean mode) {
         mRunCallback.inGLThread(() -> mJNI.setBatchMode(mode));
     }
diff --git a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java
index ac5f41f0d3ff..8a3a82bba5d7 100644
--- a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java
+++ b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java
@@ -197,7 +197,7 @@ public void doFrame(long frameTimeNanos) {
         }
 
         if (!zoomNecessary && !scrollNecessary && mAnimating) {
-            requestRender();
+            mServo.performUpdates();
         }
 
         if (mZooming || mScrolling || mAnimating) {