Merge cvs-trunk-mirror to mozilla-central up through FF3RC2build2

--HG--
rename : js/src/jsinterp.c => js/src/jsinterp.cpp
rename : js/src/jsparse.c => js/src/jsparse.cpp

accessible/src/base/nsDocAccessible.cpp

@@ -1528,8 +1528,8 @@ NS_IMETHODIMP nsDocAccessible::FlushPendingEvents()
     PRBool isFromUserInput = nsAccEvent::IsFromUserInput(accessibleEvent);
 
     if (domNode == gLastFocusedNode &&
-        eventType == nsIAccessibleEvent::EVENT_ASYNCH_HIDE || 
-        eventType == nsIAccessibleEvent::EVENT_ASYNCH_SHOW) {
+        (eventType == nsIAccessibleEvent::EVENT_ASYNCH_HIDE || 
+        eventType == nsIAccessibleEvent::EVENT_ASYNCH_SHOW)) {
       // If frame type didn't change for this event, then we don't actually need to invalidate
       // However, we only keep track of the old frame type for the focus, where it's very
       // important not to destroy and recreate the accessible for minor style changes,

browser/app/Makefile.in

@@ -76,9 +76,6 @@ ifdef MOZ_MEMORY
 ifneq ($(OS_ARCH),WINNT)
 LIBS += -ljemalloc
 endif
-ifeq ($(OS_ARCH),SunOS)
-SOLARIS_JEMALLOC_LDFLAGS = -L$(LIBXUL_DIST)/bin -lxul
-endif
 endif
 
 ifdef LIBXUL_SDK

browser/app/profile/firefox.js

@@ -484,7 +484,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
 pref("plugin.default_plugin_disabled", true);
 
 // plugin finder service url
-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%");
+pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
 
 // by default we show an infobar message when pages require plugins the user has not installed
 pref("plugins.hide_infobar_for_missing_plugin", false);

browser/base/content/browser.js

@@ -2549,13 +2549,8 @@ function FillInHTMLTooltip(tipElement)
 var proxyIconDNDObserver = {
   onDragStart: function (aEvent, aXferData, aDragAction)
     {
-      var value = gURLBar.value;
-      // XXX - do we want to allow the user to set a blank page to their homepage?
-      //       if so then we want to modify this a little to set about:blank as
-      //       the homepage in the event of an empty urlbar.
-      if (!value) return;
-
-      var urlString = value + "\n" + window.content.document.title;
+      var value = content.location.href;
+      var urlString = value + "\n" + content.document.title;
       var htmlString = "<a href=\"" + value + "\">" + value + "</a>";
 
       aXferData.data = new TransferData();

browser/components/places/content/toolbar.xml

@@ -762,6 +762,10 @@
           if (!PlacesUtils.nodeIsFolder(result.root))
             return null;
 
+          var isRTL = document.defaultView
+                              .getComputedStyle(this._self.parentNode, "")
+                              .direction == "rtl";
+
           var dropPoint = { ip: null, beforeIndex: null, folderNode: null };
           // Loop through all the nodes to see which one this should
           // get dropped in/next to
@@ -770,17 +774,20 @@
             if (PlacesUtils.nodeIsFolder(xulNode.node) &&
                 !PlacesUtils.nodeIsReadOnly(xulNode.node)) {
               // This is a folder. If the mouse is in the left 25% of the
-              // node, drop to the left of the folder.  If it's in the middle
-              // 50%, drop into the folder.  If it's past that, drop to the right.
-              if (event.clientX < xulNode.boxObject.x + (xulNode.boxObject.width * 0.25)) {
+              // node (or 25% of the right, in RTL UI), drop before the folder.
+              // If it's in the middle 50%, drop into the folder. If it's past
+              // that, drop after.
+              if ((isRTL && event.clientX > xulNode.boxObject.x + (xulNode.boxObject.width * 0.75)) ||
+                  (!isRTL && event.clientX < xulNode.boxObject.x + (xulNode.boxObject.width * 0.25))) {
                 // Drop to the left of this folder.
                 dropPoint.ip =
                   new InsertionPoint(PlacesUtils.getConcreteItemId(result.root),
                                      i, -1);
                 dropPoint.beforeIndex = i;
                 return dropPoint;
               }
-              else if (event.clientX < xulNode.boxObject.x + (xulNode.boxObject.width * 0.75)) {
+              else if ((isRTL && event.clientX > xulNode.boxObject.x + (xulNode.boxObject.width * 0.25)) ||
+                       (!isRTL && event.clientX < xulNode.boxObject.x + (xulNode.boxObject.width * 0.75))) {
                 // Drop inside this folder.
                 dropPoint.ip =
                   new InsertionPoint(PlacesUtils.getConcreteItemId(xulNode.node),
@@ -791,10 +798,12 @@
               }
             }
             else {
-              // This is a non-folder node. If the mouse is left of the middle,
-              // drop to the left of the folder.  If it's right, drop to the right.
-              if (event.clientX < xulNode.boxObject.x + (xulNode.boxObject.width / 2)) {
-                // Drop to the left of this bookmark.
+              // This is a non-folder node. If the mouse is left (or right, in
+              // RTL UI) of the middle, drop before the folder.  Otehrwise,
+              // we'll drop after
+              if ((isRTL && event.clientX > xulNode.boxObject.x + (xulNode.boxObject.width / 2)) ||
+                  (!isRTL && event.clientX < xulNode.boxObject.x + (xulNode.boxObject.width / 2))) {
+                // Drop before this bookmark.
                 dropPoint.ip =
 	                new InsertionPoint(PlacesUtils.getConcreteItemId(result.root),
 	                                   i, -1);
@@ -803,7 +812,7 @@
               }
             }
           }
-          // Should drop to the right of the last node.
+          // Should drop after the last node.
           dropPoint.ip =
         	  new InsertionPoint(PlacesUtils.getConcreteItemId(result.root),
 	                             -1, 1);
@@ -893,12 +902,19 @@
             }
             else {
               halfInd = Math.floor(halfInd);
-              if (dropPoint.beforeIndex == -1 || !this._self.childNodes.length)
-                ind.style.marginRight = '0px';
-              else
-                ind.style.marginRight = (this._self.childNodes[this._self.childNodes.length - 1].boxObject.x +
-                                         this._self.childNodes[this._self.childNodes.length - 1].boxObject.width) -
-                                        (this._self.childNodes[dropPoint.beforeIndex].boxObject.x) - halfInd + 'px';
+              if (this._self.childNodes.length == 0)
+                ind.style.marginRight = this._self.boxObject.width + 'px';
+              else if (dropPoint.beforeIndex == -1) {
+                ind.style.marginRight = this._self.boxObject.width -
+                                        (this._self.childNodes[this._self.childNodes.length - 1].boxObject.x +
+                                        halfInd) +'px';
+              }
+              else {
+                ind.style.marginRight = this._self.boxObject.width -
+                                        (this._self.childNodes[dropPoint.beforeIndex].boxObject.x +
+                                        this._self.childNodes[dropPoint.beforeIndex].boxObject.width -
+                                        this._self.boxObject.x + halfInd) + 'px';
+              }
             }
             // Clear out old folder information
             this._clearOverFolder();

browser/installer/removed-files.in

@@ -610,10 +610,10 @@ res/bloatcycle.html
 #ifndef XP_MACOSX
 readme.txt
 chrome/icons/default/default.xpm
-#endif
-#endif
 dictionaries/PL.dic
 dictionaries/PL.aff
+#endif
+#endif
 #ifdef XP_WIN
 #ifdef MOZ_MEMORY
 Microsoft.VC80.CRT.manifest

browser/locales/shipped-locales

@@ -37,7 +37,9 @@ pt-BR
 pt-PT
 ro
 ru
+si
 sk
+sl
 sq
 sr
 sv-SE

browser/themes/gnomestripe/browser/browser.css

@@ -1081,10 +1081,6 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   list-style-image: url("chrome://browser/skin/Go-arrow.png");
 }
 
-#go-button[chromedir="rtl"] {
-  list-style-image: url("chrome://browser/skin/Go-arrow-rtl.png");
-}
-
 /* Star button */
 #star-button {
   padding: 1px;

browser/themes/pinstripe/browser/browser.css

@@ -97,11 +97,13 @@
   background-image: url("chrome://browser/skin/tabbrowser/tab-middle-inactive.png");
 }
 
-#main-window:not([active="true"]) .tabbrowser-tab[selected="true"] > .tab-image-left {
+#main-window:not([active="true"]) .tabbrowser-tab[selected="true"] > .tab-image-left,
+#main-window:not([active="true"]) .tabbrowser-tab[selected="true"][chromedir="rtl"] > .tab-image-right {
   background: url("chrome://browser/skin/tabbrowser/tab-left-inactive.png") no-repeat;
 }
 
-#main-window:not([active="true"]) .tabbrowser-tab[selected="true"] > .tab-image-right {
+#main-window:not([active="true"]) .tabbrowser-tab[selected="true"] > .tab-image-right,
+#main-window:not([active="true"]) .tabbrowser-tab[selected="true"][chromedir="rtl"] > .tab-image-left {
   background: url("chrome://browser/skin/tabbrowser/tab-right-inactive.png") no-repeat;
 }
 

browser/themes/winstripe/browser/browser.css

@@ -1233,10 +1233,6 @@ statusbarpanel#statusbar-display {
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-#go-button[chromedir="rtl"] {
-  list-style-image: url("chrome://browser/skin/Go-arrow-rtl.png");
-}
-
 #go-button:hover {
   -moz-image-region: rect(16px 16px 32px 0px);
 }

client.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 NSPR_CO_TAG = 'NSPR_4_7_1_RTM'
-NSS_CO_TAG  = 'NSS_3_12_RC3'
+NSS_CO_TAG  = 'NSS_3_12_RC4'
 
 NSPR_DIRS = ('nsprpub',)
 NSS_DIRS  = ('dbm',

config/rules.mk

@@ -1226,6 +1226,12 @@ endif # COMPILER_DEPEND
 
 endif # MOZ_AUTO_DEPS
 
+ifdef MOZ_MEMORY
+ifeq ($(OS_ARCH),SunOS)
+SOLARIS_JEMALLOC_LDFLAGS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib)
+endif
+endif
+
 # Rules for building native targets must come first because of the host_ prefix
 host_%.$(OBJ_SUFFIX): %.c Makefile Makefile.in
 	$(REPORT_BUILD)

configure.in

@@ -2119,7 +2119,7 @@ case "$target" in
 
 
     case "$host_os" in
-    cygwin*)
+    cygwin*|msvc*|mks*)
         AC_MSG_WARN([Using a cygwin build environment is unsupported. Configure cannot check for the presence of necessary headers. Please upgrade to MozillaBuild; see http://developer.mozilla.org/en/docs/Windows_Build_Prerequisites])
         ;;
 

content/base/src/nsScriptLoader.cpp

@@ -537,8 +537,12 @@ nsScriptLoader::EvaluateScript(nsScriptLoadRequest* aRequest,
     return NS_ERROR_FAILURE;
   }
 
-  nsIScriptGlobalObject *globalObject = mDocument->GetScriptGlobalObject();
-  NS_ENSURE_TRUE(globalObject, NS_ERROR_FAILURE);
+  nsPIDOMWindow *pwin = mDocument->GetInnerWindow();
+  if (!pwin || !pwin->IsInnerWindow()) {
+    return NS_ERROR_FAILURE;
+  }
+  nsCOMPtr<nsIScriptGlobalObject> globalObject = do_QueryInterface(pwin);
+  NS_ASSERTION(globalObject, "windows must be global objects");
 
   // Get the script-type to be used by this element.
   nsCOMPtr<nsIContent> scriptContent(do_QueryInterface(aRequest->mElement));

docshell/base/nsDocShell.cpp

@@ -6716,21 +6716,21 @@ nsDocShell::InternalLoad(nsIURI * aURI,
     nsCOMPtr<nsISupports> owner(aOwner);
     //
     // Get an owner from the current document if necessary.  Note that we only
-    // do this for URIs that inherit a security context; in particular we do
-    // NOT do this for about:blank.  This way, random about:blank loads that
-    // have no owner (which basically means they were done by someone from
-    // chrome manually messing with our nsIWebNavigation or by C++ setting
-    // document.location) don't get a funky principal.  If callers want
-    // something interesting to happen with the about:blank principal in this
-    // case, they should pass an owner in.
+    // do this for URIs that inherit a security context and local file URIs;
+    // in particular we do NOT do this for about:blank.  This way, random
+    // about:blank loads that have no owner (which basically means they were
+    // done by someone from chrome manually messing with our nsIWebNavigation
+    // or by C++ setting document.location) don't get a funky principal.  If
+    // callers want something interesting to happen with the about:blank
+    // principal in this case, they should pass an owner in.
     //
     {
         PRBool inherits;
         // One more twist: Don't inherit the owner for external loads.
         if (aLoadType != LOAD_NORMAL_EXTERNAL && !owner &&
             (aFlags & INTERNAL_LOAD_FLAGS_INHERIT_OWNER) &&
-            NS_SUCCEEDED(URIInheritsSecurityContext(aURI, &inherits)) &&
-            inherits) {
+            ((NS_SUCCEEDED(URIInheritsSecurityContext(aURI, &inherits)) &&
+              inherits) || URIIsLocalFile(aURI))) {
 
             // Don't allow loads that would inherit our security context
             // if this document came from an unsafe channel.

editor/libeditor/base/nsEditor.cpp

@@ -1299,11 +1299,13 @@ NS_IMETHODIMP nsEditor::GetInlineSpellChecker(PRBool autoCreate,
     return autoCreate ? NS_ERROR_NOT_AVAILABLE : NS_OK;
   }
 
+  nsresult rv;
   if (!mInlineSpellChecker && autoCreate) {
-    nsresult rv;
     mInlineSpellChecker = do_CreateInstance(MOZ_INLINESPELLCHECKER_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
+  }
 
+  if (mInlineSpellChecker) {
     rv = mInlineSpellChecker->Init(this);
     if (NS_FAILED(rv))
       mInlineSpellChecker = nsnull;

editor/ui/composer/content/pref-composer.xul

@@ -43,9 +43,7 @@
 <!DOCTYPE overlay SYSTEM "chrome://editor/locale/pref-composer.dtd">
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <prefpane id="composer_pane"
-            label="&pref.composer.title;"
-            script="chrome://editor/content/EdDialogCommon.js chrome://editor/content/editorUtilities.js">
+  <prefpane id="composer_pane" label="&pref.composer.title;">
 
     <preferences id="composer_preferences">
       <preference id="editor.history.url_maximum"
@@ -80,11 +78,14 @@
                accesskey="&documentsInMenu.accesskey;"
                control="recentFiles"/>
         <textbox id="recentFiles"
-                 name="recent string" 
-                 size="3" 
-                 value="10" 
-                 preference="editor.history.url_maximum" 
-                 oninput=" ValidateNumber(this, null, 0, 99); LimitStringLength('recentFiles',2);"/>
+                 name="recent string"
+                 type="number"
+                 max="99"
+                 min="0"
+                 maxlength="2"
+                 size="3"
+                 value="10"
+                 preference="editor.history.url_maximum"/>
       </hbox>
     </groupbox>
 

editor/ui/dialogs/content/EdAEHTMLAttributes.js

@@ -303,8 +303,8 @@ function onInputHTMLAttributeValue()
   if (value)
   {
     // Do value filtering based on type of attribute
-    // (Do not use "LimitStringLength()" and "forceInteger()"
-    //  to avoid multiple reseting of input's value and flickering)
+    // (Do not use "forceInteger()" to avoid multiple
+    //  resetting of input's value and flickering)
     var selectedItem = gDialog.AddHTMLAttributeNameInput.selectedItem;
 
     if (selectedItem)

editor/ui/dialogs/content/EdDialogCommon.js

@@ -273,17 +273,6 @@ function forceInteger(elementID)
   }
 }
 
-function LimitStringLength(elementID, length)
-{
-  var editField = document.getElementById( elementID );
-  if ( !editField )
-    return;
-
-  var stringIn = editField.value;
-  if (stringIn && stringIn.length > length)
-    editField.value = stringIn.slice(0,length);
-}
-
 function InitPixelOrPercentMenulist(elementForAtt, elementInDoc, attribute, menulistID, defaultIndex)
 {
   if (!defaultIndex) defaultIndex = gPixel;

gfx/src/thebes/nsThebesDeviceContext.cpp

@@ -240,8 +240,14 @@ nsThebesDeviceContext::SetDPI()
         // dev pixels per CSS pixel.  Then, divide that into AppUnitsPerCSSPixel()
         // to get the number of app units per dev pixel.  The PR_MAXes are to
         // make sure we don't end up dividing by zero.
-        mAppUnitsPerDevNotScaledPixel = PR_MAX(1, AppUnitsPerCSSPixel() /
-                                        PR_MAX(1, dpi / 96));
+        PRUint32 roundedDPIScaleFactor = (dpi + 48)/96;
+#ifdef MOZ_WIDGET_GTK2
+        // be more conservative about activating scaling on GTK2, since the dpi
+        // information is more likely to be wrong
+        roundedDPIScaleFactor = dpi/96;
+#endif
+        mAppUnitsPerDevNotScaledPixel =
+          PR_MAX(1, AppUnitsPerCSSPixel() / PR_MAX(1, roundedDPIScaleFactor));
     } else {
         /* set mAppUnitsPerDevPixel so we're using exactly 72 dpi, even
          * though that means we have a non-integer number of device "pixels"

gfx/thebes/public/gfxOS2Fonts.h

@@ -79,6 +79,8 @@ class gfxOS2Font : public gfxFont {
     Metrics *mMetrics;
     gfxFloat mAdjustedSize;
     PRUint32 mSpaceGlyph;
+    int mHinting;
+    PRBool mAntialias;
 };