Backout the latest cedar merge wholesale until I test the correctness of the merge locally. This commit takes the tree state back to changeset 8d3f6093c425 (the last known good changeset before the merge)

Author: Ehsan Akhgari

browser/components/nsBrowserContentHandler.js

@@ -567,15 +567,7 @@ nsBrowserContentHandler.prototype = {
 #endif
   },
 
-  helpInfo : "  -browser           Open a browser window.\n" +
-             "  -new-window  <url> Open <url> in a new window.\n" +
-             "  -new-tab     <url> Open <url> in a new tab.\n" +
-#ifdef XP_WIN
-             "  -preferences       Open Options dialog.\n" +
-#else
-             "  -preferences       Open Preferences dialog.\n" +
-#endif
-             "  -search     <term> Search <term> with your default search engine.\n",
+  helpInfo : "  -browser           Open a browser window.\n",
 
   /* nsIBrowserHandler */
 

browser/components/nsBrowserGlue.js

@@ -1466,6 +1466,11 @@ ContentPermissionPrompt.prototype = {
       },
     };
 
+    // XXX Bug 573536
+    // browserBundle.GetStringFromName("geolocation.learnMore")
+    //var formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"].getService(Ci.nsIURLFormatter);
+    //link.href = formatter.formatURLPref("browser.geolocation.warning.infoURL");
+
     var message;
     var secondaryActions = [];
 

browser/components/search/content/search.xml

@@ -474,12 +474,8 @@
 
           // Save the current value in the form history
           if (textValue) {
-            try {
-              textBox._formHistSvc.addEntry(textBox.getAttribute("autocompletesearchparam"),
-                                            textValue);
-            } catch (ex) {
-              Components.utils.reportError("Saving search to form history failed: " + ex);
-            }
+            textBox._formHistSvc.addEntry(textBox.getAttribute("autocompletesearchparam"),
+                                          textValue);
           }
 
           this.doSearch(textValue, where);

browser/locales/en-US/chrome/browser/browser.properties

@@ -1,4 +1,6 @@
+nv_done=Done
 nv_timeout=Timed Out
+nv_stopped=Stopped
 openFile=Open File
 
 droponhometitle=Set Home Page

content/base/src/nsGkAtomList.h

@@ -1382,86 +1382,43 @@ GK_ATOM(accent_, "accent")
 GK_ATOM(accentunder_, "accentunder")
 GK_ATOM(actiontype_, "actiontype")
 GK_ATOM(alignmentscope_, "alignmentscope")
-GK_ATOM(altimg_, "altimg")
-GK_ATOM(altimg_height_, "altimg-height")
-GK_ATOM(altimg_valign_, "altimg-valign")
-GK_ATOM(altimg_width_, "altimg-width")
 GK_ATOM(annotation_, "annotation")
-GK_ATOM(annotation_xml_, "annotation-xml")
 GK_ATOM(apply_, "apply")
-GK_ATOM(approx_, "approx")
 GK_ATOM(arccos_, "arccos")
-GK_ATOM(arccosh_, "arccosh")
-GK_ATOM(arccot_, "arccot")
-GK_ATOM(arccoth_, "arccoth")
-GK_ATOM(arccsc_, "arccsc")
-GK_ATOM(arccsch_, "arccsch")
-GK_ATOM(arcsec_, "arcsec")
-GK_ATOM(arcsech_, "arcsech")
 GK_ATOM(arcsin_, "arcsin")
-GK_ATOM(arcsinh_, "arcsinh")
 GK_ATOM(arctan_, "arctan")
-GK_ATOM(arctanh_, "arctanh")
-GK_ATOM(arg_, "arg")
 GK_ATOM(bevelled_, "bevelled")
-GK_ATOM(bind_, "bind")
 GK_ATOM(bvar_, "bvar")
-GK_ATOM(card_, "card")
-GK_ATOM(cartesianproduct_, "cartesianproduct")
-GK_ATOM(cbytes_, "cbytes")
-GK_ATOM(cd_, "cd")
-GK_ATOM(cdgroup_, "cdgroup")
-GK_ATOM(cerror_, "cerror")
-GK_ATOM(charalign_, "charalign")
 GK_ATOM(ci_, "ci")
-GK_ATOM(closure_, "closure")
 GK_ATOM(cn_, "cn")
-GK_ATOM(codomain_, "codomain")
 GK_ATOM(columnalign_, "columnalign")
-GK_ATOM(columnalignment_, "columnalignment")
 GK_ATOM(columnlines_, "columnlines")
 GK_ATOM(columnspacing_, "columnspacing")
 GK_ATOM(columnspan_, "columnspan")
 GK_ATOM(columnwidth_, "columnwidth")
-GK_ATOM(complexes_, "complexes")
 GK_ATOM(compose_, "compose")
 GK_ATOM(condition_, "condition")
 GK_ATOM(conjugate_, "conjugate")
 GK_ATOM(cos_, "cos")
 GK_ATOM(cosh_, "cosh")
 GK_ATOM(cot_, "cot")
 GK_ATOM(coth_, "coth")
-GK_ATOM(crossout_, "crossout")
 GK_ATOM(csc_, "csc")
 GK_ATOM(csch_, "csch")
-GK_ATOM(cs_, "cs")
-GK_ATOM(csymbol_, "csymbol")
-GK_ATOM(curl_, "curl")
-GK_ATOM(decimalpoint_, "decimalpoint")
-GK_ATOM(definitionURL_, "definitionURL")
 GK_ATOM(degree_, "degree")
 GK_ATOM(denomalign_, "denomalign")
 GK_ATOM(depth_, "depth")
 GK_ATOM(determinant_, "determinant")
 GK_ATOM(diff_, "diff")
 GK_ATOM(displaystyle_, "displaystyle")
-GK_ATOM(divergence_, "divergence")
 GK_ATOM(divide_, "divide")
-GK_ATOM(domain_, "domain")
-GK_ATOM(domainofapplication_, "domainofapplication")
 GK_ATOM(edge_, "edge")
-GK_ATOM(el_, "el")
-GK_ATOM(emptyset_, "emptyset")
 GK_ATOM(eq_, "eq")
 GK_ATOM(equalcolumns_, "equalcolumns")
 GK_ATOM(equalrows_, "equalrows")
-GK_ATOM(equivalent_, "equivalent")
-GK_ATOM(eulergamma_, "eulergamma")
 GK_ATOM(exists_, "exists")
 GK_ATOM(exp_, "exp")
-GK_ATOM(exponentiale_, "exponentiale")
 GK_ATOM(factorial_, "factorial")
-GK_ATOM(factorof_, "factorof")
 GK_ATOM(fence_, "fence")
 GK_ATOM(fn_, "fn")
 GK_ATOM(fontfamily_, "fontfamily")
@@ -1470,50 +1427,32 @@ GK_ATOM(fontstyle_, "fontstyle")
 GK_ATOM(fontweight_, "fontweight")
 GK_ATOM(forall_, "forall")
 GK_ATOM(framespacing_, "framespacing")
-GK_ATOM(gcd_, "gcd")
 GK_ATOM(geq_, "geq")
 GK_ATOM(groupalign_, "groupalign")
 GK_ATOM(gt_, "gt")
 GK_ATOM(ident_, "ident")
-GK_ATOM(imaginaryi_, "imaginaryi")
-GK_ATOM(imaginary_, "imaginary")
 GK_ATOM(implies_, "implies")
-GK_ATOM(indentalignfirst_, "indentalignfirst")
-GK_ATOM(indentalign_, "indentalign")
-GK_ATOM(indentalignlast_, "indentalignlast")
-GK_ATOM(indentshiftfirst_, "indentshiftfirst")
-GK_ATOM(indentshift_, "indentshift")
-GK_ATOM(indenttarget_, "indenttarget")
-GK_ATOM(integers_, "integers")
+GK_ATOM(int_, "int")
 GK_ATOM(intersect_, "intersect")
 GK_ATOM(interval_, "interval")
-GK_ATOM(int_, "int")
 GK_ATOM(inverse_, "inverse")
 GK_ATOM(lambda_, "lambda")
-GK_ATOM(laplacian_, "laplacian")
 GK_ATOM(largeop_, "largeop")
-GK_ATOM(lcm_, "lcm")
 GK_ATOM(leq_, "leq")
 GK_ATOM(limit_, "limit")
 GK_ATOM(linebreak_, "linebreak")
-GK_ATOM(linebreakmultchar_, "linebreakmultchar")
-GK_ATOM(linebreakstyle_, "linebreakstyle")
 GK_ATOM(linethickness_, "linethickness")
 GK_ATOM(list_, "list")
 GK_ATOM(ln_, "ln")
-GK_ATOM(location_, "location")
-GK_ATOM(logbase_, "logbase")
 GK_ATOM(log_, "log")
-GK_ATOM(longdivstyle_, "longdivstyle")
+GK_ATOM(logbase_, "logbase")
 GK_ATOM(lowlimit_, "lowlimit")
 GK_ATOM(lquote_, "lquote")
 GK_ATOM(lspace_, "lspace")
 GK_ATOM(lt_, "lt")
 GK_ATOM(maction_, "maction")
 GK_ATOM(maligngroup_, "maligngroup")
-GK_ATOM(malign_, "malign")
 GK_ATOM(malignmark_, "malignmark")
-GK_ATOM(malignscope_, "malignscope")
 GK_ATOM(mathbackground_, "mathbackground")
 GK_ATOM(mathcolor_, "mathcolor")
 GK_ATOM(mathsize_, "mathsize")
@@ -1527,36 +1466,25 @@ GK_ATOM(menclose_, "menclose")
 GK_ATOM(merror_, "merror")
 GK_ATOM(mfenced_, "mfenced")
 GK_ATOM(mfrac_, "mfrac")
-GK_ATOM(mfraction_, "mfraction")
-GK_ATOM(mglyph_, "mglyph")
 GK_ATOM(mi_, "mi")
 GK_ATOM(minlabelspacing_, "minlabelspacing")
 GK_ATOM(minsize_, "minsize")
 GK_ATOM(minus_, "minus")
 GK_ATOM(mlabeledtr_, "mlabeledtr")
-GK_ATOM(mlongdiv_, "mlongdiv")
 GK_ATOM(mmultiscripts_, "mmultiscripts")
 GK_ATOM(mn_, "mn")
-GK_ATOM(momentabout_, "momentabout")
-GK_ATOM(moment_, "moment")
 GK_ATOM(mo_, "mo")
-GK_ATOM(monospaced_, "monospaced")
+GK_ATOM(moment_, "moment")
 GK_ATOM(movablelimits_, "movablelimits")
 GK_ATOM(mover_, "mover")
 GK_ATOM(mpadded_, "mpadded")
 GK_ATOM(mphantom_, "mphantom")
 GK_ATOM(mprescripts_, "mprescripts")
 GK_ATOM(mroot_, "mroot")
 GK_ATOM(mrow_, "mrow")
-GK_ATOM(mscarries_, "mscarries")
-GK_ATOM(mscarry_, "mscarry")
-GK_ATOM(msgroup_, "msgroup")
-GK_ATOM(msline_, "msline")
 GK_ATOM(ms_, "ms")
 GK_ATOM(mspace_, "mspace")
 GK_ATOM(msqrt_, "msqrt")
-GK_ATOM(msrow_, "msrow")
-GK_ATOM(mstack_, "mstack")
 GK_ATOM(mstyle_, "mstyle")
 GK_ATOM(msub_, "msub")
 GK_ATOM(msubsup_, "msubsup")
@@ -1567,90 +1495,62 @@ GK_ATOM(mtext_, "mtext")
 GK_ATOM(mtr_, "mtr")
 GK_ATOM(munder_, "munder")
 GK_ATOM(munderover_, "munderover")
-GK_ATOM(naturalnumbers_, "naturalnumbers")
-GK_ATOM(negativemediummathspace_, "negativemediummathspace")
-GK_ATOM(negativethickmathspace_, "negativethickmathspace")
-GK_ATOM(negativethinmathspace_, "negativethinmathspace")
-GK_ATOM(negativeverythickmathspace_, "negativeverythickmathspace")
-GK_ATOM(negativeverythinmathspace_, "negativeverythinmathspace")
-GK_ATOM(negativeveryverythickmathspace_, "negativeveryverythickmathspace")
-GK_ATOM(negativeveryverythinmathspace_, "negativeveryverythinmathspace")
 GK_ATOM(neq_, "neq")
-GK_ATOM(notanumber_, "notanumber")
 GK_ATOM(notation_, "notation")
-GK_ATOM(note_, "note")
 GK_ATOM(notin_, "notin")
 GK_ATOM(notprsubset_, "notprsubset")
 GK_ATOM(notsubset_, "notsubset")
 GK_ATOM(numalign_, "numalign")
 GK_ATOM(other_, "other")
-GK_ATOM(outerproduct_, "outerproduct")
 GK_ATOM(partialdiff_, "partialdiff")
-GK_ATOM(piece_, "piece")
-GK_ATOM(piecewise_, "piecewise")
-GK_ATOM(pi_, "pi")
 GK_ATOM(plus_, "plus")
 GK_ATOM(power_, "power")
-GK_ATOM(primes_, "primes")
 GK_ATOM(product_, "product")
 GK_ATOM(prsubset_, "prsubset")
 GK_ATOM(quotient_, "quotient")
-GK_ATOM(rationals_, "rationals")
-GK_ATOM(real_, "real")
-GK_ATOM(reals_, "reals")
 GK_ATOM(reln_, "reln")
 GK_ATOM(root_, "root")
 GK_ATOM(rowalign_, "rowalign")
 GK_ATOM(rowlines_, "rowlines")
 GK_ATOM(rowspacing_, "rowspacing")
 GK_ATOM(rquote_, "rquote")
 GK_ATOM(rspace_, "rspace")
-GK_ATOM(scalarproduct_, "scalarproduct")
-GK_ATOM(schemaLocation_, "schemaLocation")
 GK_ATOM(scriptlevel_, "scriptlevel")
 GK_ATOM(scriptminsize_, "scriptminsize")
 GK_ATOM(scriptsizemultiplier_, "scriptsizemultiplier")
-GK_ATOM(scriptsize_, "scriptsize")
 GK_ATOM(sdev_, "sdev")
-GK_ATOM(sech_, "sech")
 GK_ATOM(sec_, "sec")
+GK_ATOM(sech_, "sech")
 GK_ATOM(selection_, "selection")
-GK_ATOM(selector_, "selector")
 GK_ATOM(semantics_, "semantics")
+GK_ATOM(sep_, "sep")
 GK_ATOM(separator_, "separator")
 GK_ATOM(separators_, "separators")
-GK_ATOM(sep_, "sep")
-GK_ATOM(setdiff_, "setdiff")
 GK_ATOM(set_, "set")
-GK_ATOM(share_, "share")
-GK_ATOM(shift_, "shift")
+GK_ATOM(setdiff_, "setdiff")
 GK_ATOM(side_, "side")
-GK_ATOM(sinh_, "sinh")
 GK_ATOM(sin_, "sin")
-GK_ATOM(stackalign_, "stackalign")
+GK_ATOM(sinh_, "sinh")
 GK_ATOM(stretchy_, "stretchy")
 GK_ATOM(subscriptshift_, "subscriptshift")
 GK_ATOM(subset_, "subset")
 GK_ATOM(superscriptshift_, "superscriptshift")
 GK_ATOM(symmetric_, "symmetric")
-GK_ATOM(tanh_, "tanh")
 GK_ATOM(tan_, "tan")
+GK_ATOM(tanh_, "tanh")
 GK_ATOM(tendsto_, "tendsto")
 GK_ATOM(thickmathspace_, "thickmathspace")
 GK_ATOM(thinmathspace_, "thinmathspace")
 GK_ATOM(times_, "times")
 GK_ATOM(transpose_, "transpose")
 GK_ATOM(union_, "union")
 GK_ATOM(uplimit_, "uplimit")
-GK_ATOM(variance_, "variance")
-GK_ATOM(vectorproduct_, "vectorproduct")
+GK_ATOM(var_, "var")
 GK_ATOM(vector_, "vector")
 GK_ATOM(verythickmathspace_, "verythickmathspace")
 GK_ATOM(verythinmathspace_, "verythinmathspace")
 GK_ATOM(veryverythickmathspace_, "veryverythickmathspace")
 GK_ATOM(veryverythinmathspace_, "veryverythinmathspace")
-GK_ATOM(voffset_, "voffset")
-GK_ATOM(xref_, "xref")
 GK_ATOM(math, "math") // the only one without an underscore
 #endif
 

content/canvas/src/nsCanvasRenderingContext2D.cpp

@@ -3365,9 +3365,7 @@ nsCanvasRenderingContext2D::DrawImage(nsIDOMElement *imgElt, float a1,
                                       float a6, float a7, float a8,
                                       PRUint8 optional_argc)
 {
-    if (!imgElt) {
-        return NS_ERROR_DOM_TYPE_MISMATCH_ERR;
-    }
+    NS_ENSURE_ARG(imgElt);
 
     double sx,sy,sw,sh;
     double dx,dy,dw,dh;

content/canvas/test/test_canvas.html

@@ -3497,7 +3497,7 @@
 
 var _thrown = undefined; try {
   ctx.drawImage(null, 0, 0);
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
 
 
 }
@@ -3669,7 +3669,7 @@
 
 var _thrown = undefined; try {
   ctx.drawImage(undefined, 0, 0);
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.result == Components.results.NS_ERROR_INVALID_ARG, "should throw NS_ERROR_INVALID_ARG");
 var _thrown = undefined; try {
   ctx.drawImage(0, 0, 0);
 } catch (e) { _thrown = e }; ok(_thrown && _thrown.result == Components.results.NS_ERROR_XPC_BAD_CONVERT_JS_ZERO_ISNOT_NULL, "should throw NS_ERROR_XPC_BAD_CONVERT_JS_ZERO_ISNOT_NULL");

content/html/document/src/nsHTMLContentSink.cpp

@@ -60,6 +60,7 @@
 #include "nsCRT.h"
 #include "prtime.h"
 #include "prlog.h"
+#include "nsInt64.h"
 #include "nsNodeUtils.h"
 #include "nsIContent.h"
 #include "mozilla/dom/Element.h"

dom/ipc/AudioParent.cpp

@@ -38,7 +38,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "mozilla/dom/AudioParent.h"
-#include "mozilla/unused.h"
 #include "nsThreadUtils.h"
 
 // C++ file contents
@@ -160,7 +159,7 @@ AudioParent::Notify(nsITimer* timer)
 
   NS_ASSERTION(mStream, "AudioStream not initialized.");
   PRInt64 offset = mStream->GetSampleOffset();
-  unused << SendSampleOffsetUpdate(offset, PR_IntervalNow());
+  SendSampleOffsetUpdate(offset, PR_IntervalNow());
   return NS_OK;
 }
 
@@ -223,7 +222,7 @@ bool
 AudioParent::RecvShutdown()
 {
   Shutdown();
-  unused << PAudioParent::Send__delete__(this);
+  PAudioParent::Send__delete__(this);
   return true;
 }
 

dom/src/threads/test/WorkerTest.jsm

@@ -52,6 +52,5 @@ const WorkerTest = {
     worker.onmessage = messageCallback;
     worker.onerror = errorCallback;
     worker.postMessage(message);
-    return worker;
   }
 };