Bug 762240: Install a console.* shim for all browser frames, and ensure we load webapi.js properly. r=vingtetun
authorChris Jones <jones.chris.g@gmail.com>
Thu, 07 Jun 2012 04:17:59 -0700
changeset 100858 332ed5402ccfaf61d500c96ad91dbf31e352f5e2
parent 100857 4f28fd1e2d8188e5c9afcbde1f8cb273736b8a59
child 100859 fedb160013c042c92a72482e90b555beb90fa2af
push idunknown
push userunknown
push dateunknown
reviewersvingtetun
bugs762240
milestone16.0a1
Bug 762240: Install a console.* shim for all browser frames, and ensure we load webapi.js properly. r=vingtetun
b2g/chrome/content/shell.js
b2g/components/B2GComponents.manifest
b2g/components/Makefile.in
b2g/components/ProcessGlobal.js
b2g/installer/package-manifest.in
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -122,17 +122,17 @@ var shell = {
 
     addPermissions(domains.split(","));
 
     // Load webapi.js as a frame script
     let webapiUrl = 'chrome://browser/content/webapi.js';
     try {
       messageManager.loadFrameScript(webapiUrl, true);
     } catch (e) {
-      dump('Error loading ' + webapiUrl + ' as a frame script: ' + e + '\n');
+      dump('shell.js: Error loading ' + webapiUrl + ' as a frame script: ' + e + '\n');
     }
 
     CustomEventManager.init();
 
     WebappsHelper.init();
 
     let browser = this.contentBrowser;
     browser.homePage = homeURL;
@@ -336,26 +336,16 @@ nsBrowserAccess.prototype = {
     throw new Error('Not Implemented');
   },
 
   isTabContentWindow: function isTabContentWindow(contentWindow) {
     return contentWindow == window;
   }
 };
 
-// Pipe `console` log messages to the nsIConsoleService which writes them
-// to logcat.
-Services.obs.addObserver(function onConsoleAPILogEvent(subject, topic, data) {
-  let message = subject.wrappedJSObject;
-  let prefix = "Content JS " + message.level.toUpperCase() +
-               " at " + message.filename + ":" + message.lineNumber +
-               " in " + (message.functionName || "anonymous") + ": ";
-  Services.console.logStringMessage(prefix + Array.join(message.arguments, " "));
-}, "console-api-log-event", false);
-
 (function Repl() {
   if (!Services.prefs.getBoolPref('b2g.remote-js.enabled')) {
     return;
   }
   const prompt = 'JS> ';
   let output;
   let reader = {
     onInputStreamReady : function repl_readInput(input) {
--- a/b2g/components/B2GComponents.manifest
+++ b/b2g/components/B2GComponents.manifest
@@ -24,8 +24,13 @@ contract @mozilla.org/updates/update-pro
 component {397a7fdf-2254-47be-b74e-76625a1a66d5} MozKeyboard.js
 contract @mozilla.org/b2g-keyboard;1 {397a7fdf-2254-47be-b74e-76625a1a66d5}
 category JavaScript-navigator-property mozKeyboard @mozilla.org/b2g-keyboard;1
 
 # DirectoryProvider.js
 component {9181eb7c-6f87-11e1-90b1-4f59d80dd2e5} DirectoryProvider.js
 contract @mozilla.org/browser/directory-provider;1 {9181eb7c-6f87-11e1-90b1-4f59d80dd2e5}
 category xpcom-directory-providers browser-directory-provider @mozilla.org/browser/directory-provider;1
+
+# ProcessGlobal.js
+component {1a94c87a-5ece-4d11-91e1-d29c29f21b28} ProcessGlobal.js
+contract @mozilla.org/b2g-process-global;1 {1a94c87a-5ece-4d11-91e1-d29c29f21b28}
+category app-startup ProcessGlobal service,@mozilla.org/b2g-process-global;1
--- a/b2g/components/Makefile.in
+++ b/b2g/components/Makefile.in
@@ -12,21 +12,22 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = B2GComponents
 XPIDL_MODULE = B2GComponents
 
 XPIDLSRCS = \
         b2g.idl \
         $(NULL)
 
 EXTRA_PP_COMPONENTS = \
+        AlertsService.js \
         B2GComponents.manifest \
         CameraContent.js \
-        AlertsService.js \
         ContentPermissionPrompt.js \
+        DirectoryProvider.js \
         MozKeyboard.js \
-        DirectoryProvider.js \
+        ProcessGlobal.js \
         $(NULL)
 
 ifdef MOZ_UPDATER
 EXTRA_PP_COMPONENTS += UpdatePrompt.js
 endif
 
 include $(topsrcdir)/config/rules.mk
new file mode 100644
--- /dev/null
+++ b/b2g/components/ProcessGlobal.js
@@ -0,0 +1,74 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+'use strict';
+
+/**
+ * This code exists to be a "grab bag" of global code that needs to be
+ * loaded per B2G process, but doesn't need to directly interact with
+ * web content.
+ *
+ * (It's written as an XPCOM service because it needs to watch
+ * app-startup.)
+ */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+const kWebApiShimFile = 'chrome://browser/content/webapi.js';
+
+Cu.import('resource://gre/modules/Services.jsm');
+Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+
+function debug(msg) {
+  log(msg);
+}
+function log(msg) {
+  // This file implements console.log(), so use dump().
+  //dump('ProcessGlobal: ' + msg + '\n');
+}
+
+function ProcessGlobal() {}
+ProcessGlobal.prototype = {
+  classID: Components.ID('{1a94c87a-5ece-4d11-91e1-d29c29f21b28}'),
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
+                                         Ci.nsISupportsWeakReference]),
+
+  observe: function pg_observe(subject, topic, data) {
+    switch (topic) {
+    case 'app-startup': {
+      Services.obs.addObserver(this, 'console-api-log-event', false);
+      Services.obs.addObserver(this, 'in-process-browser-frame-shown', false);
+      Services.obs.addObserver(this, 'remote-browser-frame-shown', false);
+      break;
+    }
+    case 'console-api-log-event': {
+      // Pipe `console` log messages to the nsIConsoleService which
+      // writes them to logcat on Gonk.
+      let message = subject.wrappedJSObject;
+      let prefix = ('Content JS ' + message.level.toUpperCase() +
+                    ' at ' + message.filename + ':' + message.lineNumber +
+                    ' in ' + (message.functionName || 'anonymous') + ': ');
+      Services.console.logStringMessage(prefix + Array.join(message.arguments,
+                                                            ' '));
+      break;
+    }
+    case 'remote-browser-frame-shown':
+    case 'in-process-browser-frame-shown': {
+      let frameLoader = subject.QueryInterface(Ci.nsIFrameLoader);
+      let mm = frameLoader.messageManager;
+      try {
+        mm.loadFrameScript(kWebApiShimFile, true);
+      } catch (e) {
+        log('Error loading ' + kWebApiShimFile + ' as frame script: ' + e + '\n');
+      }
+      break;
+    }
+    }
+  },
+};
+
+var NSGetFactory = XPCOMUtils.generateNSGetFactory([ProcessGlobal]);
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -652,8 +652,9 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DL
 @BINPATH@/components/marionettecomponent.js
 @BINPATH@/components/AlertsService.js
 @BINPATH@/components/ContentPermissionPrompt.js
 #ifdef MOZ_UPDATER
 @BINPATH@/components/UpdatePrompt.js
 #endif
 @BINPATH@/components/MozKeyboard.js
 @BINPATH@/components/DirectoryProvider.js
+@BINPATH@/components/ProcessGlobal.js