Backed out changeset 54da01870611 (bug 920481) for test_webapps_actor.html timeouts on a CLOSED TREE
authorEd Morley <emorley@mozilla.com>
Wed, 23 Oct 2013 16:15:02 +0100
changeset 165623 987ac1967cbeff0b1cc205287e8175062cc59e7c
parent 165622 dad5e53c31a95ac586a67ca04555ff5757c91e54
child 165624 69ebfb936442e2c08c41b281d7a8eb65f0210c9c
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs920481
milestone27.0a1
backs out54da01870611dd2c226180786f9a222ca1b244be
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 54da01870611 (bug 920481) for test_webapps_actor.html timeouts on a CLOSED TREE
toolkit/devtools/server/actors/webapps.js
--- a/toolkit/devtools/server/actors/webapps.js
+++ b/toolkit/devtools/server/actors/webapps.js
@@ -413,51 +413,22 @@ WebappsActor.prototype = {
           let installDir = DOMApplicationRegistry._getAppDir(id);
           let manFile = installDir.clone();
           manFile.append("manifest.webapp");
           zipReader.extract("manifest.webapp", manFile);
           zipReader.close();
           zipFile.moveTo(installDir, "application.zip");
 
           let origin = "app://" + id;
-          let manifestURL = origin + "/manifest.webapp";
-
-          // Refresh application.zip content (e.g. reinstall app), as done here:
-          // http://hg.mozilla.org/mozilla-central/annotate/aaefec5d34f8/dom/apps/src/Webapps.jsm#l1125
-          // Do it in parent process for the simulator
-          let jar = installDir.clone();
-          jar.append("application.zip");
-          Services.obs.notifyObservers(jar, "flush-cache-entry", null);
-
-          // And then in app content process
-          // This function will be evaluated in the scope of the content process
-          // frame script. That will flush the jar cache for this app and allow
-          // loading fresh updated resources if we reload its document.
-          let FlushFrameScript = function (path) {
-            let jar = Components.classes["@mozilla.org/file/local;1"]
-                                .createInstance(Components.interfaces.nsILocalFile);
-            jar.initWithPath(path);
-            let obs = Components.classes["@mozilla.org/observer-service;1"]
-                                .getService(Components.interfaces.nsIObserverService);
-            obs.notifyObservers(jar, "flush-cache-entry", null);
-          };
-          for each (let frame in self._appFrames()) {
-            if (frame.getAttribute("mozapp") == manifestURL) {
-              let mm = frame.QueryInterface(Ci.nsIFrameLoaderOwner).frameLoader.messageManager;
-              mm.loadFrameScript("data:," +
-                encodeURIComponent("(" + FlushFrameScript.toString() + ")" +
-                                   "('" + jar.path + "')"), false);
-            }
-          }
 
           // Create a fake app object with the minimum set of properties we need.
           let app = {
             origin: origin,
             installOrigin: origin,
-            manifestURL: manifestURL,
+            manifestURL: origin + "/manifest.webapp",
             appStatus: appType,
             receipts: aReceipts,
           }
 
           self._registerApp(deferred, app, id, aDir);
         } catch(e) {
           // If anything goes wrong, just send it back.
           self._sendError(deferred, e.toString(), aId);