Merge pull request #32265 from arcturus/bug-1211582

Bug 1211582 Performance regression in contacts: dont add iframe, as i…

apps/communications/contacts/index.html

@@ -259,6 +259,5 @@ <h1 id="edit-title" data-l10n-id="contacts"></h1>
     <section is="ice-view" id="ice-view" role="region" class="view view-right hidden"></section>
     <section is="multiple-select-view" id="multiple-select-view" role="region" class="view hidden"></section>
     <gaia-sim-picker id="sim-picker" tabindex="-1"></gaia-sim-picker>
-    <iframe id="iframe_curtain" src="/shared/pages/import/curtain.html"></iframe>
   </body>
 </html>

shared/pages/import/js/curtain.js

@@ -22,14 +22,16 @@ var Curtain = (function() {
     parent.document.body.appendChild(curtainFrame);
   }
 
-  var doc = curtainFrame.contentDocument;
+  function getDoc() {
+    return curtainFrame.contentWindow.document;
+  }
 
   var cpuWakeLock, cancelButton, retryButton, okButton, progressElement, form,
       progressTitle;
   var messages = [];
   var elements = ['error', 'timeout', 'wait', 'message', 'progress', 'alert'];
 
-  if (doc.readyState === 'complete') {
+  if (getDoc().readyState === 'complete') {
     init();
   } else {
     // The curtain could not be loaded at this moment
@@ -40,6 +42,7 @@ var Curtain = (function() {
   }
 
   function init() {
+    var doc = getDoc();
     cancelButton = doc.querySelector('#cancel');
     retryButton = doc.querySelector('#retry');
     okButton = doc.querySelector('#ok');