about:startup - change chrome package name for jquery stuff so that it's clear that it's private
authorDaniel Brooks <db48x@db48x.net>
Mon, 15 Nov 2010 07:12:26 -0600
changeset 58872 97a4aa8ca939962635f391aef5b612eadefcbb7a
parent 58871 79ab64089a080e04c8e8c0e916d6357e2e96f205
child 58873 c5ecb4498216eaf08d538b39ba157d95597b1e73
push id17440
push userdb48x@yahoo.com
push dateWed, 08 Dec 2010 04:15:54 +0000
treeherdermozilla-central@a89f24bf1798 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b8pre
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
about:startup - change chrome package name for jquery stuff so that it's clear that it's private
toolkit/content/aboutStartup.xhtml
toolkit/content/jar.mn
xpcom/system/nsIXULRuntime.idl
--- a/toolkit/content/aboutStartup.xhtml
+++ b/toolkit/content/aboutStartup.xhtml
@@ -46,19 +46,19 @@
   %aboutStartupDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>&about.startup.title;</title>
     <link rel="stylesheet" href="chrome://global/skin/aboutSupport.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://global/skin/aboutStartup.css" type="text/css"/>
-    <script type="application/javascript" src="chrome://jquery/content/jquery.js"/>
-    <script type="application/javascript" src="chrome://jquery/content/jquery.flot.js"/>
-    <script type="application/javascript" src="chrome://jquery/content/jquery.flot.selection.js"/>
+    <script type="application/javascript" src="chrome://unstable-mozilla-private/content/jquery.js"/>
+    <script type="application/javascript" src="chrome://unstable-mozilla-private/content/jquery.flot.js"/>
+    <script type="application/javascript" src="chrome://unstable-mozilla-private/content/jquery.flot.selection.js"/>
   </head>
 
   <body>
     <h1>&about.startup.title;</h1>
     <table>
       <tr>
         <th></th>
         <th>&about.startup.timestamp;</th>
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -1,13 +1,13 @@
 toolkit.jar:
 %  content global %content/global/ contentaccessible=yes
 %  content global-platform %content/global-platform/ platform
 %  content global-region %content/global-region/
-%  content jquery %content/jquery/
+%  content unstable-mozilla-private %content/jquery/
 # provide the nsTransferable in nsDragAndDrop.js to extensions that have to
 # work with Geckos from before 1.9, when there was a separate file
 %  override chrome://global/content/nsTransferable.js chrome://global/content/nsDragAndDrop.js
 *  content/global/license.html                (license.html)
    content/global/XPCNativeWrapper.js         (XPCNativeWrapper.js)
 *  content/global/xul.css                     (xul.css)
    content/global/textbox.css                 (textbox.css)
    content/global/menulist.css                (menulist.css)
--- a/xpcom/system/nsIXULRuntime.idl
+++ b/xpcom/system/nsIXULRuntime.idl
@@ -104,26 +104,26 @@ interface nsIXULRuntime : nsISupports
   /**
    * Signal the apprunner to invalidate caches on the next restart.
    * This will cause components to be autoregistered and all
    * fastload data to be re-created.
    */
   void invalidateCachesOnRestart();
 
   /**
+   * Starts a child process. This method is intented to pre-start a
+   * content child process so that when it is actually needed, it is
+   * ready to go.
+   *
+   * @throw NS_ERROR_NOT_AVAILABLE if not available.
+   */
+  void ensureContentProcess();
+
+  /**
    * Recorded timestamp indicating when the operating system began launching the app
     */
   readonly attribute unsigned long long launchTimestamp;
 
   /**
    * Recorded timestamp indicating when app startup began (essentially XRE_Main)
     */
   readonly attribute unsigned long long startupTimestamp;
-
-  /**
-   * Starts a child process. This method is intented to pre-start a
-   * content child process so that when it is actually needed, it is
-   * ready to go.
-   *
-   * @throw NS_ERROR_NOT_AVAILABLE if not available.
-   */
-  void ensureContentProcess();
 };