1 files changed, 10 insertions, 2 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java
index 58f592c..1214660 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromium.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java
@@ -972,8 +972,16 @@ class WebViewChromium implements WebViewProvider,
     }
 
     @Override
-    public void onDraw(Canvas canvas) {
-        checkThread();
+    public void onDraw(final Canvas canvas) {
+        if (!ThreadUtils.runningOnUiThread()) {
+            ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+                @Override
+                public void run() {
+                    onDraw(canvas);
+                }
+            });
+            return;
+        }
         mAwContents.onDraw(canvas);
     }