Ensure webview is ready before calling setActive

Fix #2037 Auditors: @bbondy
brave · Jun 2, 2016 · c515e72 · c515e72 · bridiver · Jun 2, 2016
1 parent bb4de1f
commit c515e72
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/js/components/frame.js b/js/components/frame.js
@@ -225,7 +225,12 @@ class Frame extends ImmutableComponent {
     if (this.shouldCreateWebview() || this.props.frame.get('src') !== prevProps.frame.get('src')) {
       this.updateWebview(cb)
     } else {
-      cb()
+      try {
+        cb()
+      } catch (e) {
+        // webview DOM may not be ready yet
+        this.webview.addEventListener('dom-ready', cb)
+      }
     }
   }