Permalink
Browse files

Merging m-c into GECKO20b7pre_20101029_RELBRANCH per stuart/aki a=me

--HG--
branch : GECKO20b7pre_20101029_RELBRANCH
  • Loading branch information...
2 parents c8adff5 + 06e304f commit b8c2e51ab0b8119416d5f87e90507ccb3cc76778 @dougt dougt committed Nov 2, 2010
Showing with 7,693 additions and 5,348 deletions.
  1. +1 −0 browser/base/content/aboutHome.css
  2. +0 −1 browser/base/content/aboutHome.xhtml
  3. +409 −0 browser/base/content/browser-appmenu.inc
  4. +1 −365 browser/base/content/browser.xul
  5. +1 −1 browser/base/content/test/browser_bug553455.js
  6. +21 −6 browser/base/content/test/tabview/browser_tabview_launch.js
  7. +6 −0 browser/locales/all-locales
  8. +1 −1 browser/locales/en-US/chrome/browser/browser.dtd
  9. +4 −0 browser/locales/shipped-locales
  10. +3 −0 build/mobile/sutagent/android/AndroidManifest.xml
  11. +466 −156 build/mobile/sutagent/android/DoCommand.java
  12. +1 −1 build/mobile/sutagent/android/SUTAgentAndroid.java
  13. +3 −13 client.mk
  14. +13 −0 config/autoconf.mk.in
  15. +29 −29 config/rules.mk
  16. +57 −0 content/base/public/FromParser.h
  17. +3 −2 content/base/public/Makefile.in
  18. +6 −12 content/base/public/nsContentCreatorFunctions.h
  19. +9 −7 content/base/public/nsIScriptElement.h
  20. +4 −2 content/base/src/nsDocument.cpp
  21. +1 −1 content/base/src/nsInProcessTabChildGlobal.cpp
  22. +3 −1 content/base/src/nsNameSpaceManager.cpp
  23. +1 −1 content/base/src/nsScriptElement.h
  24. +57 −14 content/base/src/nsScriptLoader.cpp
  25. +1 −0 content/base/src/nsScriptLoader.h
  26. +7 −0 content/base/test/Makefile.in
  27. +3 −0 content/base/test/file_bug604660-1.xml
  28. +19 −0 content/base/test/file_bug604660-2.xsl
  29. +1 −0 content/base/test/file_bug604660-3.js
  30. +1 −0 content/base/test/file_bug604660-4.js
  31. +2 −0 content/base/test/file_bug604660-5.xml
  32. +9 −0 content/base/test/file_bug604660-6.xsl
  33. +77 −0 content/base/test/test_bug604660.html
  34. +1 −1 content/canvas/src/WebGLContextGL.cpp
  35. +1 −1 content/html/content/public/nsHTMLAudioElement.h
  36. +1 −1 content/html/content/public/nsHTMLMediaElement.h
  37. +1 −1 content/html/content/public/nsHTMLVideoElement.h
  38. +29 −28 content/html/content/src/nsGenericHTMLElement.h
  39. +4 −2 content/html/content/src/nsHTMLAudioElement.cpp
  40. +2 −1 content/html/content/src/nsHTMLCanvasElement.cpp
  41. +2 −1 content/html/content/src/nsHTMLElement.cpp
  42. +3 −4 content/html/content/src/nsHTMLFormElement.cpp
  43. +3 −2 content/html/content/src/nsHTMLFrameElement.cpp
  44. +7 −5 content/html/content/src/nsHTMLIFrameElement.cpp
  45. +3 −1 content/html/content/src/nsHTMLImageElement.cpp
  46. +5 −6 content/html/content/src/nsHTMLInputElement.cpp
  47. +1 −1 content/html/content/src/nsHTMLInputElement.h
  48. +2 −1 content/html/content/src/nsHTMLMediaElement.cpp
  49. +9 −8 content/html/content/src/nsHTMLObjectElement.cpp
  50. +3 −1 content/html/content/src/nsHTMLOptionElement.cpp
  51. +6 −6 content/html/content/src/nsHTMLScriptElement.cpp
  52. +2 −2 content/html/content/src/nsHTMLSelectElement.cpp
  53. +1 −1 content/html/content/src/nsHTMLSelectElement.h
  54. +9 −7 content/html/content/src/nsHTMLSharedObjectElement.cpp
  55. +5 −3 content/html/content/src/nsHTMLTextAreaElement.cpp
  56. +3 −1 content/html/content/src/nsHTMLVideoElement.cpp
  57. +4 −2 content/html/content/src/nsTextEditorState.cpp
  58. +8 −6 content/html/document/src/nsHTMLContentSink.cpp
  59. +5 −2 content/html/document/src/nsHTMLFragmentContentSink.cpp
  60. +1 −1 content/html/document/src/nsPluginDocument.cpp
  61. +1 −1 content/html/document/src/nsVideoDocument.cpp
  62. +9 −2 content/html/document/test/test_bug404320.html
  63. +5 −0 content/media/test/test_error_in_video_document.html
  64. +1 −1 content/svg/content/src/nsSVGElement.h
  65. +5 −3 content/svg/content/src/nsSVGElementFactory.cpp
  66. +4 −6 content/svg/content/src/nsSVGSVGElement.cpp
  67. +4 −2 content/svg/content/src/nsSVGSVGElement.h
  68. +6 −7 content/svg/content/src/nsSVGScriptElement.cpp
  69. +2 −1 content/svg/content/src/nsSVGUseElement.cpp
  70. +2 −1 content/svg/content/src/nsSVGUseElement.h
  71. +1 −1 content/xbl/src/nsXBLContentSink.cpp
  72. +1 −1 content/xbl/src/nsXBLContentSink.h
  73. +1 −3 content/xbl/src/nsXBLDocumentInfo.cpp
  74. +5 −2 content/xml/document/src/nsXMLContentSink.cpp
  75. +2 −1 content/xml/document/src/nsXMLContentSink.h
  76. +5 −3 content/xml/document/src/nsXMLFragmentContentSink.cpp
  77. +3 −2 content/xslt/src/xslt/txMozillaTextOutput.cpp
  78. +40 −8 content/xslt/src/xslt/txMozillaXMLOutput.cpp
  79. +3 −2 content/xul/document/src/nsXULDocument.cpp
  80. +1 −3 content/xul/document/src/nsXULPrototypeDocument.cpp
  81. +1 −1 content/xul/templates/src/nsXULContentBuilder.cpp
  82. +33 −30 dom/base/nsDOMClassInfo.cpp
  83. +2 −0 dom/base/nsDOMClassInfo.h
  84. +1 −0 dom/base/nsHistory.h
  85. +1 −5 dom/base/nsJSEnvironment.cpp
  86. +1 −1 dom/ipc/TabChild.cpp
  87. +1 −1 dom/plugins/PluginInstanceParent.cpp
  88. +29 −11 dom/plugins/PluginModuleParent.cpp
  89. +2 −2 dom/plugins/PluginModuleParent.h
  90. +2 −5 dom/src/threads/nsDOMWorker.cpp
  91. +1 −1 extensions/jssh/nsJSSh.cpp
  92. +2 −1 gfx/thebes/GLContext.h
  93. +1 −1 ipc/testshell/XPCShellEnvironment.cpp
  94. +32 −7 js/jsd/idl/jsdIDebuggerService.idl
  95. +1 −6 js/jsd/jsd_scpt.c
  96. +1 −0 js/jsd/jsd_val.c
  97. +56 −12 js/jsd/jsd_xpc.cpp
  98. +1 −1 js/jsd/jsd_xpc.h
  99. +1 −0 js/jsd/test/Makefile.in
  100. +25 −0 js/jsd/test/bug507448.js
  101. +69 −28 js/jsd/test/test_bug507448.html
  102. +9 −3 js/src/Makefile.in
  103. +13 −0 js/src/config/autoconf.mk.in
  104. +29 −29 js/src/config/rules.mk
  105. +3 −0 js/src/jit-test/tests/basic/testBug606138.js
  106. +27 −0 js/src/jit-test/tests/basic/testReplaceMap.js
  107. +1 −1 js/src/jsapi-tests/testBug604087.cpp
  108. +7 −45 js/src/jsapi.cpp
  109. +2 −2 js/src/jsapi.h
  110. +3 −3 js/src/jsarray.cpp
  111. +6 −35 js/src/jsatom.cpp
  112. +0 −91 js/src/jsbuiltins.h
  113. +0 −6 js/src/jscntxt.cpp
  114. +10 −38 js/src/jscntxt.h
  115. +57 −10 js/src/jscntxtinlines.h
  116. +15 −2 js/src/jscompartment.cpp
  117. +23 −14 js/src/jscompartment.h
  118. +31 −4 js/src/jsdbgapi.cpp
  119. +7 −0 js/src/jsdbgapi.h
  120. +2 −2 js/src/jsfun.cpp
  121. +70 −28 js/src/jsinterp.cpp
  122. +16 −8 js/src/jsinterp.h
  123. +6 −4 js/src/jsinterpinlines.h
  124. +1 −0 js/src/jsiter.h
  125. +13 −14 js/src/jsmath.cpp
  126. +3 −0 js/src/jsmath.h
  127. +143 −113 js/src/jsobj.cpp
  128. +33 −6 js/src/jsobj.h
  129. +2 −2 js/src/jsopcode.cpp
  130. +0 −8 js/src/jsotypes.h
  131. +19 −0 js/src/jsprobes.h
  132. +12 −26 js/src/jsproxy.cpp
  133. +139 −43 js/src/jsstr.cpp
  134. +2 −0 js/src/jsstr.h
  135. +37 −0 js/src/jsstrinlines.h
  136. +9 −0 js/src/jstl.h
  137. +894 −1,850 js/src/jstracer.cpp
  138. +39 −94 js/src/jstracer.h
  139. +1 −1 js/src/jstypedarray.cpp
  140. +4 −2 js/src/jsvalue.h
  141. +2 −0 js/src/jsvector.h
  142. +6 −3 js/src/jswrapper.cpp
  143. +3 −3 js/src/jsxml.cpp
  144. +24 −3 js/src/methodjit/BaseAssembler.h
  145. +24 −17 js/src/methodjit/BaseCompiler.h
  146. +121 −174 js/src/methodjit/Compiler.cpp
  147. +41 −30 js/src/methodjit/Compiler.h
  148. +19 −12 js/src/methodjit/FastArithmetic.cpp
  149. +124 −177 js/src/methodjit/FastOps.cpp
  150. +6 −0 js/src/methodjit/FrameEntry.h
  151. +25 −1 js/src/methodjit/InvokeHelpers.cpp
  152. +9 −12 js/src/methodjit/MethodJIT.cpp
  153. +68 −0 js/src/methodjit/MethodJIT.h
  154. +8 −15 js/src/methodjit/NunboxAssembler.h
  155. +606 −720 js/src/methodjit/PolyIC.cpp
  156. +140 −62 js/src/methodjit/PolyIC.h
  157. +4 −10 js/src/methodjit/PunboxAssembler.h
  158. +1 −1 js/src/methodjit/Retcon.cpp
  159. +9 −9 js/src/methodjit/StubCalls.cpp
  160. +1 −0 js/src/methodjit/StubCalls.h
  161. +6 −4 js/src/methodjit/StubCompiler.cpp
  162. +2 −1 js/src/methodjit/StubCompiler.h
  163. +1 −1 js/src/nanojit-import-rev
  164. +7 −1 js/src/nanojit/Assembler.cpp
  165. +29 −2 js/src/nanojit/LIR.cpp
  166. +13 −9 js/src/nanojit/LIR.h
  167. +1 −1 js/src/nanojit/LIRopcode.tbl
  168. +3 −0 js/src/nanojit/Native.h
  169. +101 −59 js/src/nanojit/NativeARM.cpp
  170. +65 −38 js/src/nanojit/NativeARM.h
  171. +1 −0 js/src/nanojit/NativePPC.h
  172. +85 −28 js/src/nanojit/NativeSparc.cpp
  173. +21 −5 js/src/nanojit/NativeSparc.h
  174. +1 −0 js/src/nanojit/NativeX64.h
  175. +123 −107 js/src/nanojit/Nativei386.cpp
  176. +25 −14 js/src/nanojit/Nativei386.h
  177. +32 −0 js/src/tests/ecma_5/Global/eval-native-callback-is-indirect.js
  178. +1 −0 js/src/tests/ecma_5/Global/jstests.list
  179. +12 −0 js/src/tests/ecma_5/Object/freeze-global-eval-const.js
  180. +1 −0 js/src/tests/ecma_5/Object/jstests.list
  181. +43 −0 js/src/tests/ecma_5/extensions/eval-native-callback-is-indirect.js
  182. +1 −0 js/src/tests/ecma_5/extensions/jstests.list
  183. +1 −0 js/src/tests/js1_8_5/extensions/jstests.list
  184. +49 −0 js/src/tests/js1_8_5/extensions/proxy-proto-setter.js
  185. +2 −1 js/src/tests/js1_8_5/regress/jstests.list
  186. +13 −0 js/src/tests/js1_8_5/regress/regress-607863.js
  187. +548 −0 js/src/tracejit/Writer.cpp
  188. +1,187 −0 js/src/tracejit/Writer.h
  189. +1 −5 js/src/xpconnect/idl/nsIXPCScriptable.idl
  190. +15 −8 js/src/xpconnect/idl/nsIXPConnect.idl
  191. +1 −1 js/src/xpconnect/loader/mozJSComponentLoader.cpp
  192. +0 −9 js/src/xpconnect/public/xpc_map_end.h
  193. +1 −1 js/src/xpconnect/shell/xpcshell.cpp
  194. +1 −3 js/src/xpconnect/src/XPCWrapper.h
  195. +138 −55 js/src/xpconnect/src/nsXPConnect.cpp
  196. +1 −0 js/src/xpconnect/src/xpc.msg
  197. +12 −16 js/src/xpconnect/src/xpccomponents.cpp
  198. +13 −0 js/src/xpconnect/src/xpcinlines.h
  199. +73 −19 js/src/xpconnect/src/xpcjsruntime.cpp
  200. +116 −7 js/src/xpconnect/src/xpcprivate.h
  201. +9 −3 js/src/xpconnect/src/xpcpublic.h
  202. +6 −6 js/src/xpconnect/src/xpcthreadcontext.cpp
  203. +7 −1 js/src/xpconnect/src/xpcwrappedjs.cpp
  204. +3 −45 js/src/xpconnect/src/xpcwrappednativejsops.cpp
  205. +10 −5 js/src/xpconnect/src/xpcwrappednativescope.cpp
  206. +7 −0 js/src/xpconnect/tests/chrome/test_evalInSandbox.xul
  207. +1 −0 js/src/xpconnect/tests/mochitest/Makefile.in
  208. +19 −0 js/src/xpconnect/tests/mochitest/test_bug601299.html
  209. +51 −0 js/src/xpconnect/tests/unit/test_bug608142.js
  210. +32 −10 js/src/xpconnect/wrappers/WrapperFactory.cpp
  211. +3 −3 layout/forms/nsComboboxControlFrame.cpp
  212. +8 −3 layout/forms/nsFileControlFrame.cpp
  213. +7 −3 layout/forms/nsIsIndexFrame.cpp
  214. +19 −12 netwerk/cookie/nsCookieService.cpp
  215. +1 −0 netwerk/cookie/nsCookieService.h
  216. +4 −3 netwerk/cookie/nsICookieService.idl
  217. +8 −4 parser/html/nsHtml5TreeOperation.cpp
  218. +2 −2 security/manager/locales/en-US/chrome/pippki/certManager.dtd
  219. +2 −2 security/manager/pki/resources/content/exceptionDialog.xul
  220. +6 −1 testing/mochitest/browser-test.js
  221. +1 −1 testing/mozmill/jsbridge/jsbridge/extension/install.rdf
  222. +2 −2 testing/mozmill/jsbridge/setup.py
  223. +3 −2 testing/mozmill/mozmill/mozmill/__init__.py
  224. +1 −1 testing/mozmill/mozmill/mozmill/extension/install.rdf
  225. +9 −3 testing/mozmill/mozmill/mozmill/extension/resource/modules/init.js
  226. +12 −6 testing/mozmill/mozmill/mozmill/extension/resource/modules/utils.js
  227. +2 −2 testing/mozmill/mozmill/setup.py
  228. +17 −12 testing/mozmill/mozrunner/mozrunner/winprocess.py
  229. +1 −1 testing/mozmill/mozrunner/setup.py
  230. +0 −172 testing/mozmill/tests/firefox/testPrivateBrowsing/testStartStopPBMode.js
  231. +2 −2 ...onents/console/hudservice/tests/browser/browser_webconsole_bug_580030_errors_after_page_reload.js
  232. +1 −0 toolkit/mozapps/extensions/test/browser/Makefile.in
  233. +1 −0 toolkit/mozapps/extensions/test/browser/addon_prefs.xul
  234. +7 −7 toolkit/mozapps/extensions/test/browser/browser_bug557956.js
  235. +11 −10 toolkit/mozapps/extensions/test/browser/browser_bug562797.js
  236. +21 −11 toolkit/mozapps/extensions/test/browser/browser_bug562890.js
  237. +4 −4 toolkit/mozapps/extensions/test/browser/head.js
  238. +1 −1 toolkit/mozapps/extensions/test/xpinstall/browser_signed_naming.js
  239. +1 −1 toolkit/mozapps/extensions/test/xpinstall/browser_signed_trigger.js
  240. +1 −1 toolkit/mozapps/extensions/test/xpinstall/browser_signed_untrusted.js
  241. +1 −1 toolkit/mozapps/extensions/test/xpinstall/browser_signed_url.js
  242. +1 −1 toolkit/mozapps/extensions/test/xpinstall/browser_trigger_redirect.js
  243. +1 −1 toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_trigger.js
  244. +1 −1 toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_trigger_iframe.js
  245. +1 −1 toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_url.js
  246. +1 −1 toolkit/mozapps/extensions/test/xpinstall/browser_whitelist.js
  247. +4 −0 xpcom/base/nsError.h
@@ -104,6 +104,7 @@ body[dir="rtl"] #searchEngineLinks {
}
#searchText {
+ margin-bottom: 10px;
width: 100%;
}
@@ -72,7 +72,6 @@
<img id="searchEngineLogo"/>
<form name="searchForm" onsubmit="onSearchSubmit(event)">
<input type="text" name="searchText" value="" id="searchText" maxLength="256"/>
- <br/>
<input type="submit" value="&abouthome.searchEngineButton.label;"/>
<span id="searchEngineLinks">
<a hidden="true" id="searchEngineAdvancedLink">&abouthome.searchEngineLinks.advanced;</a>
Oops, something went wrong.

0 comments on commit b8c2e51

Please sign in to comment.