Permalink
Browse files

Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
  • Loading branch information...
1 parent 87bdf00 commit 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Ben Murdoch committed Jun 2, 2011
Showing with 11,889 additions and 4,105 deletions.
  1. +7 −0 LayoutTests/fast/dom/DOMImplementation/implementation-identity-expected.txt
  2. +30 −0 LayoutTests/fast/dom/DOMImplementation/implementation-identity.html
  3. +4 −0 LayoutTests/fast/dom/Geolocation/argument-types-expected.txt
  4. +4 −2 LayoutTests/fast/dom/Geolocation/script-tests/argument-types.js
  5. +4 −0 LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1-expected.txt
  6. +18 −0 LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html
  7. +4 −0 LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail2-expected.txt
  8. +17 −0 LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail2.html
  9. +7 −4 LayoutTests/fast/dom/HTMLKeygenElement/keygen-expected.txt
  10. +13 −13 LayoutTests/fast/dom/HTMLKeygenElement/keygen.html
  11. +3 −0 LayoutTests/fast/dom/HTMLLinkElement/subresource-expected.txt
  12. +20 −0 LayoutTests/fast/dom/HTMLLinkElement/subresource.html
  13. +23 −0 LayoutTests/http/tests/resources/slow-script.pl
  14. +13 −0 LayoutTests/storage/script-tests/TEMPLATE.html
  15. +31 −0 LayoutTests/storage/script-tests/storageinfo-query-usage.js
  16. +11 −0 LayoutTests/storage/storageinfo-query-usage-expected.txt
  17. +13 −0 LayoutTests/storage/storageinfo-query-usage.html
  18. +322 −0 Source/Android.mk
  19. +2 −1 Source/CMakeLists.txt
  20. +1 −1 Source/JavaScriptCore/API/JSCallbackConstructor.cpp
  21. +2 −2 Source/JavaScriptCore/API/JSCallbackConstructor.h
  22. +1 −1 Source/JavaScriptCore/API/JSCallbackFunction.h
  23. +12 −0 Source/JavaScriptCore/API/JSCallbackObject.cpp
  24. +5 −5 Source/JavaScriptCore/API/JSCallbackObject.h
  25. +12 −12 Source/JavaScriptCore/API/JSCallbackObjectFunctions.h
  26. +1 −1 Source/JavaScriptCore/API/JSClassRef.cpp
  27. +5 −5 Source/JavaScriptCore/API/JSClassRef.h
  28. +5 −4 Source/JavaScriptCore/API/JSContextRef.cpp
  29. +2 −2 Source/JavaScriptCore/API/JSObjectRef.cpp
  30. +8 −9 Source/JavaScriptCore/Android.mk
  31. +17 −18 Source/JavaScriptCore/CMakeLists.txt
  32. +1 −1 Source/JavaScriptCore/CMakeListsEfl.txt
  33. +1 −1 Source/JavaScriptCore/CMakeListsWinCE.txt
  34. +2,844 −0 Source/JavaScriptCore/ChangeLog
  35. +7 −3 Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
  36. +1 −1 Source/JavaScriptCore/Configurations/Version.xcconfig
  37. +4 −603 Source/JavaScriptCore/GNUmakefile.am
  38. +603 −0 Source/JavaScriptCore/GNUmakefile.list.am
  39. +1 −1 Source/JavaScriptCore/JavaScriptCore.JSVALUE32_64only.exp
  40. +1 −1 Source/JavaScriptCore/JavaScriptCore.JSVALUE64only.exp
  41. +26 −24 Source/JavaScriptCore/JavaScriptCore.exp
  42. +4 −1 Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
  43. +28 −26 Source/JavaScriptCore/JavaScriptCore.gypi
  44. +1 −1 Source/JavaScriptCore/JavaScriptCore.pri
  45. +19 −13 Source/JavaScriptCore/JavaScriptCore.pro
  46. +1 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make
  47. +7 −2 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln
  48. +30 −27 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
  49. +93 −109 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
  50. +1 −1 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops
  51. +3 −50 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
  52. +11 −7 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj
  53. +3 −4 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops
  54. +12 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedDebug.vsprops
  55. +13 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedDebugAll.vsprops
  56. +13 −0 ...vaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedDebugCairoCFLite.vsprops
  57. +13 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedProduction.vsprops
  58. +13 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedRelease.vsprops
  59. +14 −0 ...ScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedReleaseCairoCFLite.vsprops
  60. +13 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedReleasePGO.vsprops
  61. +1 −1 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreProduction.vsprops
  62. +1 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreRelease.vsprops
  63. +1 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreReleaseCairoCFLite.vsprops
  64. +1 −1 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreReleasePGO.vsprops
  65. +1 −1 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreReleasePGOOptimize.vsprops
  66. +79 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd
  67. +1 −1 Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
  68. +12 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
  69. +1 −1 Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFProduction.vsprops
  70. +1 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFRelease.vsprops
  71. +1 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFReleaseCairoCFLite.vsprops
  72. +1 −1 Source/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFReleasePGO.vsprops
  73. +1 −1 Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops
  74. +1 −1 Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscProduction.vsprops
  75. +1 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscRelease.vsprops
  76. +1 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscReleaseCairoCFLite.vsprops
  77. +1 −1 Source/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscReleasePGO.vsprops
  78. +1 −1 Source/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiProduction.vsprops
  79. +1 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiRelease.vsprops
  80. +1 −0 Source/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiReleaseCairoCFLite.vsprops
  81. +144 −144 Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
  82. +4 −0 Source/JavaScriptCore/assembler/ARMAssembler.h
  83. +4 −0 Source/JavaScriptCore/assembler/ARMv7Assembler.h
  84. +10 −1 Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
  85. +10 −0 Source/JavaScriptCore/assembler/AssemblerBuffer.h
  86. +20 −0 Source/JavaScriptCore/assembler/AssemblerBufferWithConstantPool.h
  87. +7 −0 Source/JavaScriptCore/assembler/LinkBuffer.h
  88. +4 −0 Source/JavaScriptCore/assembler/MIPSAssembler.h
  89. +6 −0 Source/JavaScriptCore/assembler/MacroAssembler.h
  90. +82 −0 Source/JavaScriptCore/assembler/MacroAssemblerSH4.cpp
  91. +1,751 −0 Source/JavaScriptCore/assembler/MacroAssemblerSH4.h
  92. +7 −1 Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h
  93. +18 −0 Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h
  94. +2,067 −0 Source/JavaScriptCore/assembler/SH4Assembler.h
  95. +12 −0 Source/JavaScriptCore/assembler/X86Assembler.h
  96. +28 −71 Source/JavaScriptCore/bytecode/CodeBlock.cpp
  97. +6 −10 Source/JavaScriptCore/bytecode/CodeBlock.h
  98. +28 −31 Source/JavaScriptCore/bytecode/Instruction.h
  99. +4 −4 Source/JavaScriptCore/bytecode/SamplingTool.h
  100. +14 −19 Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
  101. +23 −34 Source/JavaScriptCore/bytecode/StructureStubInfo.h
  102. +2 −2 Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
  103. +1 −1 Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
  104. +0 −159 Source/JavaScriptCore/collector/handles/Global.h
  105. +2 −2 Source/JavaScriptCore/config.h
  106. +3 −2 Source/JavaScriptCore/create_regex_tables
  107. +1 −1 Source/JavaScriptCore/debugger/DebuggerActivation.cpp
  108. +1 −1 Source/JavaScriptCore/debugger/DebuggerActivation.h
  109. +442 −104 Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
  110. +5 −16 Source/JavaScriptCore/dfg/DFGGenerationInfo.h
  111. +115 −75 Source/JavaScriptCore/dfg/DFGGraph.cpp
  112. +45 −3 Source/JavaScriptCore/dfg/DFGGraph.h
  113. +7 −12 Source/JavaScriptCore/dfg/DFGJITCodeGenerator.cpp
  114. +49 −6 Source/JavaScriptCore/dfg/DFGJITCodeGenerator.h
  115. +25 −21 Source/JavaScriptCore/dfg/DFGJITCompiler.cpp
  116. +4 −0 Source/JavaScriptCore/dfg/DFGJITCompiler.h
  117. +73 −11 Source/JavaScriptCore/dfg/DFGNode.h
  118. +197 −93 Source/JavaScriptCore/dfg/DFGNonSpeculativeJIT.cpp
  119. +94 −46 Source/JavaScriptCore/dfg/DFGNonSpeculativeJIT.h
  120. +25 −0 Source/JavaScriptCore/dfg/DFGOperations.cpp
  121. +8 −1 Source/JavaScriptCore/dfg/DFGOperations.h
  122. +12 −8 Source/JavaScriptCore/dfg/DFGScoreBoard.h
  123. +226 −65 Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
  124. +24 −8 Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
  125. +18 −0 Source/JavaScriptCore/gyp/gtk.gyp
  126. +1 −1 Source/JavaScriptCore/{runtime/ConservativeSet.cpp → heap/ConservativeRoots.cpp}
  127. 0 Source/JavaScriptCore/{runtime/ConservativeSet.h → heap/ConservativeRoots.h}
  128. +48 −32 Source/JavaScriptCore/{collector/handles → heap}/Handle.h
  129. +83 −49 Source/JavaScriptCore/{collector/handles → heap}/HandleHeap.cpp
  130. +82 −79 Source/JavaScriptCore/{collector/handles → heap}/HandleHeap.h
  131. 0 Source/JavaScriptCore/{collector/handles → heap}/HandleStack.cpp
  132. 0 Source/JavaScriptCore/{collector/handles → heap}/HandleStack.h
  133. +34 −9 Source/JavaScriptCore/{runtime → heap}/Heap.cpp
  134. 0 Source/JavaScriptCore/{runtime → heap}/Heap.h
  135. +34 −38 Source/JavaScriptCore/{collector/handles → heap}/Local.h
  136. 0 Source/JavaScriptCore/{collector/handles → heap}/LocalScope.h
  137. +1 −1 Source/JavaScriptCore/{runtime → heap}/MachineStackMarker.cpp
  138. 0 Source/JavaScriptCore/{runtime → heap}/MachineStackMarker.h
  139. +10 −2 Source/JavaScriptCore/{runtime → heap}/MarkStack.cpp
  140. +14 −28 Source/JavaScriptCore/{runtime → heap}/MarkStack.h
  141. 0 Source/JavaScriptCore/{runtime → heap}/MarkStackPosix.cpp
  142. 0 Source/JavaScriptCore/{runtime → heap}/MarkStackSymbian.cpp
  143. 0 Source/JavaScriptCore/{runtime → heap}/MarkStackWin.cpp
  144. +4 −6 Source/JavaScriptCore/{runtime → heap}/MarkedBlock.cpp
  145. 0 Source/JavaScriptCore/{runtime → heap}/MarkedBlock.h
  146. 0 Source/JavaScriptCore/{runtime → heap}/MarkedSpace.cpp
  147. 0 Source/JavaScriptCore/{runtime → heap}/MarkedSpace.h
  148. +164 −0 Source/JavaScriptCore/heap/Strong.h
  149. +155 −0 Source/JavaScriptCore/heap/Weak.h
  150. +64 −60 Source/JavaScriptCore/interpreter/Interpreter.cpp
  151. +2 −19 Source/JavaScriptCore/interpreter/RegisterFile.cpp
  152. +9 −5 Source/JavaScriptCore/interpreter/RegisterFile.h
  153. +6 −0 Source/JavaScriptCore/jit/JIT.cpp
  154. +48 −4 Source/JavaScriptCore/jit/JIT.h
  155. +1 −1 Source/JavaScriptCore/jit/JITArithmetic.cpp
  156. +47 −13 Source/JavaScriptCore/jit/JITInlineMethods.h
  157. +18 −13 Source/JavaScriptCore/jit/JITOpcodes.cpp
  158. +89 −65 Source/JavaScriptCore/jit/JITOpcodes32_64.cpp
  159. +12 −23 Source/JavaScriptCore/jit/JITPropertyAccess.cpp
  160. +16 −25 Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp
  161. +113 −21 Source/JavaScriptCore/jit/JITStubs.cpp
  162. +23 −2 Source/JavaScriptCore/jit/JITStubs.h
  163. +32 −3 Source/JavaScriptCore/jit/JSInterfaceJIT.h
  164. +1 −0 Source/JavaScriptCore/jsc.cpp
  165. +3 −1 Source/JavaScriptCore/parser/JSParser.cpp
  166. +4 −3 Source/JavaScriptCore/parser/Lexer.h
  167. +4 −4 Source/JavaScriptCore/runtime/Arguments.h
  168. +2 −2 Source/JavaScriptCore/runtime/ArrayConstructor.cpp
  169. +1 −1 Source/JavaScriptCore/runtime/ArrayConstructor.h
  170. +29 −13 Source/JavaScriptCore/runtime/ArrayPrototype.cpp
  171. +2 −2 Source/JavaScriptCore/runtime/ArrayPrototype.h
  172. +1 −1 Source/JavaScriptCore/runtime/BatchedTransitionOptimizer.h
  173. +1 −1 Source/JavaScriptCore/runtime/BooleanConstructor.cpp
  174. +1 −1 Source/JavaScriptCore/runtime/BooleanConstructor.h
  175. +2 −2 Source/JavaScriptCore/runtime/BooleanObject.cpp
  176. +2 −2 Source/JavaScriptCore/runtime/BooleanObject.h
  177. +1 −1 Source/JavaScriptCore/runtime/BooleanPrototype.cpp
  178. +1 −1 Source/JavaScriptCore/runtime/BooleanPrototype.h
  179. +1 −1 Source/JavaScriptCore/runtime/DateConstructor.cpp
  180. +1 −1 Source/JavaScriptCore/runtime/DateConstructor.h
  181. +4 −4 Source/JavaScriptCore/runtime/DateInstance.cpp
  182. +3 −3 Source/JavaScriptCore/runtime/DateInstance.h
  183. +1 −1 Source/JavaScriptCore/runtime/DatePrototype.cpp
  184. +2 −2 Source/JavaScriptCore/runtime/DatePrototype.h
  185. +1 −1 Source/JavaScriptCore/runtime/Error.cpp
  186. +1 −1 Source/JavaScriptCore/runtime/ErrorConstructor.cpp
  187. +1 −1 Source/JavaScriptCore/runtime/ErrorConstructor.h
  188. +6 −6 Source/JavaScriptCore/runtime/ErrorInstance.cpp
  189. +5 −5 Source/JavaScriptCore/runtime/ErrorInstance.h
  190. +1 −1 Source/JavaScriptCore/runtime/ErrorPrototype.cpp
  191. +1 −1 Source/JavaScriptCore/runtime/ErrorPrototype.h
  192. +2 −2 Source/JavaScriptCore/runtime/ExceptionHelpers.cpp
  193. +9 −3 Source/JavaScriptCore/runtime/Executable.cpp
  194. +17 −20 Source/JavaScriptCore/runtime/Executable.h
  195. +1 −1 Source/JavaScriptCore/runtime/FunctionConstructor.cpp
  196. +1 −1 Source/JavaScriptCore/runtime/FunctionConstructor.h
  197. +1 −1 Source/JavaScriptCore/runtime/FunctionPrototype.cpp
  198. +2 −2 Source/JavaScriptCore/runtime/FunctionPrototype.h
  199. +3 −2 Source/JavaScriptCore/runtime/GetterSetter.h
  200. +0 −1 Source/JavaScriptCore/runtime/InitializeThreading.cpp
  201. +5 −6 Source/JavaScriptCore/runtime/InternalFunction.cpp
  202. +3 −3 Source/JavaScriptCore/runtime/InternalFunction.h
  203. +3 −2 Source/JavaScriptCore/runtime/JSAPIValueWrapper.h
  204. +2 −2 Source/JavaScriptCore/runtime/JSActivation.cpp
  205. +1 −1 Source/JavaScriptCore/runtime/JSActivation.h
  206. +7 −21 Source/JavaScriptCore/runtime/JSArray.cpp
  207. +4 −5 Source/JavaScriptCore/runtime/JSArray.h
  208. +3 −3 Source/JavaScriptCore/runtime/JSByteArray.cpp
  209. +3 −4 Source/JavaScriptCore/runtime/JSByteArray.h
  210. +10 −0 Source/JavaScriptCore/runtime/JSCell.cpp
  211. +21 −51 Source/JavaScriptCore/runtime/JSCell.h
  212. +8 −10 Source/JavaScriptCore/runtime/JSFunction.cpp
  213. +4 −4 Source/JavaScriptCore/runtime/JSFunction.h
  214. +72 −31 Source/JavaScriptCore/runtime/JSGlobalData.cpp
  215. +30 −17 Source/JavaScriptCore/runtime/JSGlobalData.h
  216. +40 −48 Source/JavaScriptCore/runtime/JSGlobalObject.cpp
  217. +28 −28 Source/JavaScriptCore/runtime/JSGlobalObject.h
  218. +0 −26 Source/JavaScriptCore/runtime/JSImmediate.cpp
  219. +0 −568 Source/JavaScriptCore/runtime/JSImmediate.h
  220. +2 −2 Source/JavaScriptCore/runtime/JSNotAnObject.h
  221. +0 −171 Source/JavaScriptCore/runtime/JSNumberCell.h
  222. +1 −1 Source/JavaScriptCore/runtime/JSONObject.cpp
  223. +2 −2 Source/JavaScriptCore/runtime/JSONObject.h
  224. +35 −38 Source/JavaScriptCore/runtime/JSObject.cpp
  225. +70 −62 Source/JavaScriptCore/runtime/JSObject.h
  226. +10 −4 Source/JavaScriptCore/runtime/JSObjectWithGlobalObject.cpp
  227. +10 −6 Source/JavaScriptCore/runtime/JSObjectWithGlobalObject.h
  228. +6 −13 Source/JavaScriptCore/runtime/JSPropertyNameIterator.cpp
  229. +7 −15 Source/JavaScriptCore/runtime/JSPropertyNameIterator.h
  230. +2 −2 Source/JavaScriptCore/runtime/JSStaticScopeObject.h
  231. +14 −15 Source/JavaScriptCore/runtime/JSString.h
  232. +4 −3 Source/JavaScriptCore/runtime/JSType.h
  233. +1 −0 Source/JavaScriptCore/runtime/JSTypeInfo.h
  234. +117 −428 Source/JavaScriptCore/runtime/JSValue.h
Sorry, we could not display the entire diff because too many files (2,564) changed.
View
7 LayoutTests/fast/dom/DOMImplementation/implementation-identity-expected.txt
@@ -0,0 +1,7 @@
+This test checks that DOMImplementation object is created per document.
+
+If the test passes, you should see a few OK lines below.
+
+OK: Top-level document and iframe document have different DOMImplementation objects
+OK: DOMImplementation object is cached
+
View
30 LayoutTests/fast/dom/DOMImplementation/implementation-identity.html
@@ -0,0 +1,30 @@
+<body>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+function print(message)
+{
+ var paragraph = document.createElement("li");
+ paragraph.appendChild(document.createTextNode(message));
+ document.getElementById("console").appendChild(paragraph);
+}
+
+function test()
+{
+ if (document.implementation != frames[0].document.implementation)
+ print("OK: Top-level document and iframe document have different DOMImplementation objects");
+ else
+ print("BUG: Top-level document and iframe document share a DOMImplementation object");
+
+ if (document.implementation === document.implementation)
+ print("OK: DOMImplementation object is cached");
+ else
+ print("BUG: DOMImplementation object is not cached");
+}
+</script>
+<p>This test checks that DOMImplementation object is created per document.</p>
+<p>If the test passes, you should see a few OK lines below.</p>
+<p><ol id=console></ol></p>
+<iframe src="about:blank" onload="test()"></iframe>
+</body>
View
4 LayoutTests/fast/dom/Geolocation/argument-types-expected.txt
@@ -9,6 +9,8 @@ PASS navigator.geolocation.getCurrentPosition(null) threw exception Error: TYPE_
PASS navigator.geolocation.getCurrentPosition({}) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
PASS navigator.geolocation.getCurrentPosition(objectThrowingException) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
PASS navigator.geolocation.getCurrentPosition(emptyFunction) did not throw exception.
+PASS navigator.geolocation.getCurrentPosition(Math.abs) did not throw exception.
+PASS navigator.geolocation.getCurrentPosition(layoutTestController.setGeolocationPermission) did not throw exception.
PASS navigator.geolocation.getCurrentPosition(true) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
PASS navigator.geolocation.getCurrentPosition(42) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
PASS navigator.geolocation.getCurrentPosition(Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
@@ -19,6 +21,8 @@ PASS navigator.geolocation.getCurrentPosition(emptyFunction, null) did not throw
PASS navigator.geolocation.getCurrentPosition(emptyFunction, {}) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
PASS navigator.geolocation.getCurrentPosition(emptyFunction, objectThrowingException) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
PASS navigator.geolocation.getCurrentPosition(emptyFunction, emptyFunction) did not throw exception.
+PASS navigator.geolocation.getCurrentPosition(emptyFunction, Math.abs) did not throw exception.
+PASS navigator.geolocation.getCurrentPosition(emptyFunction, layoutTestController.setGeolocationPermission) did not throw exception.
PASS navigator.geolocation.getCurrentPosition(emptyFunction, true) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
PASS navigator.geolocation.getCurrentPosition(emptyFunction, 42) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
PASS navigator.geolocation.getCurrentPosition(emptyFunction, Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
View
6 LayoutTests/fast/dom/Geolocation/script-tests/argument-types.js
@@ -40,7 +40,8 @@ test('navigator.geolocation.getCurrentPosition(null)', true);
test('navigator.geolocation.getCurrentPosition({})', true);
test('navigator.geolocation.getCurrentPosition(objectThrowingException)', true);
test('navigator.geolocation.getCurrentPosition(emptyFunction)', false);
-//test('navigator.geolocation.getCurrentPosition(Math.abs)', false);
+test('navigator.geolocation.getCurrentPosition(Math.abs)', false);
+test('navigator.geolocation.getCurrentPosition(layoutTestController.setGeolocationPermission)', false);
test('navigator.geolocation.getCurrentPosition(true)', true);
test('navigator.geolocation.getCurrentPosition(42)', true);
test('navigator.geolocation.getCurrentPosition(Infinity)', true);
@@ -52,7 +53,8 @@ test('navigator.geolocation.getCurrentPosition(emptyFunction, null)', false);
test('navigator.geolocation.getCurrentPosition(emptyFunction, {})', true);
test('navigator.geolocation.getCurrentPosition(emptyFunction, objectThrowingException)', true);
test('navigator.geolocation.getCurrentPosition(emptyFunction, emptyFunction)', false);
-//test('navigator.geolocation.getCurrentPosition(emptyFunction, Math.abs)', false);
+test('navigator.geolocation.getCurrentPosition(emptyFunction, Math.abs)', false);
+test('navigator.geolocation.getCurrentPosition(emptyFunction, layoutTestController.setGeolocationPermission)', false);
test('navigator.geolocation.getCurrentPosition(emptyFunction, true)', true);
test('navigator.geolocation.getCurrentPosition(emptyFunction, 42)', true);
test('navigator.geolocation.getCurrentPosition(emptyFunction, Infinity)', true);
View
4 ...sts/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1-expected.txt
@@ -0,0 +1,4 @@
+This page verifies fix for bug 58247. WebKit should not crash when this page is rendered.
+
+
+PASS
View
18 LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html
@@ -0,0 +1,18 @@
+<head>
+ <script>
+ function pass() {
+ var div = document.createElement('div');
+ div.innerHTML = 'PASS';
+ document.body.appendChild(div);
+ }
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ </script>
+</head>
+<body onload="pass()">
+<p>This page verifies fix for bug 58247. WebKit should not crash when this page is rendered.</p>
+
+<a </var><form><button form="f"><progress>
+<keygen form="f"><a </datalist><button>
+</body>
+
View
4 ...sts/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail2-expected.txt
@@ -0,0 +1,4 @@
+This page verifies fix for bug 58247. WebKit should not crash when this page is rendered.
+
+
+PASS
View
17 LayoutTests/fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail2.html
@@ -0,0 +1,17 @@
+<head>
+ <script>
+ function pass() {
+ var div = document.createElement('div');
+ div.innerHTML = 'PASS';
+ document.body.appendChild(div);
+ }
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ </script>
+</head>
+<body onload="pass()">
+<p>This page verifies fix for bug 58247. WebKit should not crash when this page is rendered.</p>
+
+<form><em><ol </del><fieldset form="f"</sub><option </dt><button form="f"></em><meter </time>
+</body>
+
View
11 LayoutTests/fast/dom/HTMLKeygenElement/keygen-expected.txt
@@ -1,8 +1,11 @@
-Tests the keygen element.
+This tests the keygen element.
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+PASS keygen.options is undefined
+PASS shadow.firstChild.tagName is "SELECT"
+PASS layoutTestController.shadowRoot(shadow) is null
+PASS layoutTestController.shadowRoot(shadow.firstChild) is null
+PASS successfullyParsed is true
-
-PASS document.getElementById("keys").options is undefined
+TEST COMPLETE
View
26 LayoutTests/fast/dom/HTMLKeygenElement/keygen.html
@@ -1,27 +1,27 @@
+<!DOCTYPE html>
<html>
<head>
-<link rel="stylesheet" href="../../js/resources/js-test-style.css">
<script src="../../js/resources/js-test-pre.js"></script>
</head>
<body>
<keygen id="keys" />
+<pre id="console">
+This tests the keygen element.
-<p id="description"></p>
-<div id="console"></div>
-
+</pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
-function test(elementId)
-{
- description('Tests the keygen element.');
+var keygen = document.getElementById('keys');
+shouldBe('keygen.options', 'undefined'); // keygen is not a select
- shouldBe('document.getElementById("keys").options', 'undefined');
+if (window.layoutTestController) {
+ var shadow = layoutTestController.shadowRoot(keygen);
+ shouldBe('shadow.firstChild.tagName', '"SELECT"');
+ shouldBe('layoutTestController.shadowRoot(shadow)', 'null');
+ shouldBe('layoutTestController.shadowRoot(shadow.firstChild)', 'null');
}
-test("keys");
+var successfullyParsed = true;
</script>
-
+<script src="../../js/resources/js-test-post.js"></script>
</body>
</html>
View
3 LayoutTests/fast/dom/HTMLLinkElement/subresource-expected.txt
@@ -0,0 +1,3 @@
+prefetch.link has MIME type application/octet-stream
+PASS onload called!
+This test will only print "PASS" or "FAIL" if link prefetches are enabled, otherwise it will show nothing below.
View
20 LayoutTests/fast/dom/HTMLLinkElement/subresource.html
@@ -0,0 +1,20 @@
+<body>
+<div id="console"></div>
+<script src="../../js/resources/js-test-pre.js"></script>
+<script>
+function prefetch_onload() {
+ testPassed('onload called!');
+ layoutTestController.notifyDone();
+}
+if (window.layoutTestController) {
+ layoutTestController.waitUntilDone();
+ layoutTestController.dumpAsText();
+ layoutTestController.dumpResourceResponseMIMETypes();
+}
+</script>
+<html>
+<p>This test will only print "PASS" or "FAIL" if link prefetches are
+enabled, otherwise it will show nothing below.</p>
+<link href="prefetch.link" rel="prefetch" onload="prefetch_onload()" onerror="testFailed('onerror')" />
+</html>
+
View
23 LayoutTests/http/tests/resources/slow-script.pl
@@ -0,0 +1,23 @@
+#!/usr/bin/perl -w
+
+use strict;
+use CGI;
+use Time::HiRes qw(sleep);
+
+my $cgi = new CGI;
+my $delay = $cgi->param('delay');
+$delay = 5000 unless $delay;
+
+# flush the buffers after each print
+select (STDOUT);
+$| = 1;
+
+print "Content-Type: application/javascript\n";
+print "Expires: Thu, 01 Dec 2003 16:00:00 GMT\n";
+print "Cache-Control: no-store, no-cache, must-revalidate\n";
+print "Pragma: no-cache\n";
+print "\n";
+
+sleep $delay / 1000;
+
+
View
13 LayoutTests/storage/script-tests/TEMPLATE.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css">
+<script src="../fast/js/resources/js-test-pre.js"></script>
+<script src="resources/fs-test-util.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="YOUR_JS_FILE_HERE"></script>
+<script src="../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
View
31 LayoutTests/storage/script-tests/storageinfo-query-usage.js
@@ -0,0 +1,31 @@
+description("This tests webkitStorageInfo API works.");
+
+function errorCallback(error)
+{
+ testFailed("Error occurred: " + error);
+ finishJSTest();
+}
+
+var returnedUsage;
+var returnedQuota;
+function usageCallback(usage, quota)
+{
+ returnedUsage = usage;
+ returnedQuota = quota;
+
+ // Usage should be 0 (if other storage tests have correctly cleaned up their test data before exiting).
+ shouldBe("returnedUsage", "0");
+
+ // Quota value would vary depending on the test environment.
+ shouldBeGreaterThanOrEqual("returnedQuota", "returnedUsage");
+
+ finishJSTest();
+}
+
+if (window.webkitStorageInfo) {
+ window.jsTestIsAsync = true;
+ webkitStorageInfo.queryUsageAndQuota(webkitStorageInfo.TEMPORARY, usageCallback, errorCallback);
+} else
+ debug("This test requires window.webkitStorageInfo.");
+
+window.successfullyParsed = true;
View
11 LayoutTests/storage/storageinfo-query-usage-expected.txt
@@ -0,0 +1,11 @@
+This tests webkitStorageInfo API works.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS returnedUsage is 0
+PASS returnedQuota is >= returnedUsage
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
View
13 LayoutTests/storage/storageinfo-query-usage.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css">
+<script src="../fast/js/resources/js-test-pre.js"></script>
+<script src="resources/fs-test-util.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="script-tests/storageinfo-query-usage.js"></script>
+<script src="../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
View
322 Source/Android.mk
@@ -0,0 +1,322 @@
+##
+## Copyright 2009, The Android Open Source Project
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions
+## are met:
+## * Redistributions of source code must retain the above copyright
+## notice, this list of conditions and the following disclaimer.
+## * Redistributions in binary form must reproduce the above copyright
+## notice, this list of conditions and the following disclaimer in the
+## documentation and/or other materials provided with the distribution.
+##
+## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+## EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+## PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+## EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+## PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+## OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+##
+
+LOCAL_PATH := $(call my-dir)
+
+# Two ways to control which JS engine is used:
+# 1. use JS_ENGINE environment variable, value can be either 'jsc' or 'v8'
+# This is the preferred way.
+# 2. if JS_ENGINE is not set, or is not 'jsc' or 'v8', this makefile picks
+# up a default engine to build.
+# To help setup buildbot, a new environment variable, USE_ALT_JS_ENGINE,
+# can be set to true, so that two builds can be different but without
+# specifying which JS engine to use.
+# To enable JIT in Android's JSC, please set ENABLE_JSC_JIT environment
+# variable to true.
+
+# Read JS_ENGINE environment variable
+JAVASCRIPT_ENGINE = $(JS_ENGINE)
+
+ifneq ($(JAVASCRIPT_ENGINE),jsc)
+ ifneq ($(JAVASCRIPT_ENGINE),v8)
+ # No JS engine is specified, pickup the one we want as default.
+ ifeq ($(USE_ALT_JS_ENGINE),true)
+ JAVASCRIPT_ENGINE = v8
+ else
+ JAVASCRIPT_ENGINE = jsc
+ endif
+ endif
+endif
+
+BASE_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+# Define our module and find the intermediates directory
+LOCAL_MODULE := libwebcore
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+base_intermediates := $(call local-intermediates-dir)
+
+# Using := here prevents recursive expansion
+WEBKIT_SRC_FILES :=
+
+# We have to use bison 2.3
+include $(BASE_PATH)/bison_check.mk
+
+# Build our list of include paths. We include WebKit/android/icu first so that
+# any files that include <unicode/ucnv.h> will include our ucnv.h first. We
+# also add external/ as an include directory so that we can specify the real
+# icu header directory as a more exact reference to avoid including our ucnv.h.
+#
+# Note that JavasCriptCore/ must be included after WebCore/, so that we pick up
+# the right config.h.
+LOCAL_C_INCLUDES := \
+ $(JNI_H_INCLUDE) \
+ $(LOCAL_PATH)/WebKit/android/icu \
+ external/ \
+ external/icu4c/common \
+ external/icu4c/i18n \
+ external/libxml2/include \
+ external/skia/emoji \
+ external/skia/include/core \
+ external/skia/include/effects \
+ external/skia/include/images \
+ external/skia/include/ports \
+ external/skia/include/utils \
+ external/skia/src/ports \
+ external/sqlite/dist \
+ frameworks/base/core/jni/android/graphics
+
+LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
+ $(LOCAL_PATH)/WebCore \
+ $(LOCAL_PATH)/WebCore/accessibility \
+ $(LOCAL_PATH)/WebCore/bindings/generic \
+ $(LOCAL_PATH)/WebCore/css \
+ $(LOCAL_PATH)/WebCore/dom \
+ $(LOCAL_PATH)/WebCore/editing \
+ $(LOCAL_PATH)/WebCore/history \
+ $(LOCAL_PATH)/WebCore/history/android \
+ $(LOCAL_PATH)/WebCore/html \
+ $(LOCAL_PATH)/WebCore/html/canvas \
+ $(LOCAL_PATH)/WebCore/inspector \
+ $(LOCAL_PATH)/WebCore/loader \
+ $(LOCAL_PATH)/WebCore/loader/appcache \
+ $(LOCAL_PATH)/WebCore/loader/icon \
+ $(LOCAL_PATH)/WebCore/notifications \
+ $(LOCAL_PATH)/WebCore/page \
+ $(LOCAL_PATH)/WebCore/page/android \
+ $(LOCAL_PATH)/WebCore/page/animation \
+ $(LOCAL_PATH)/WebCore/platform \
+ $(LOCAL_PATH)/WebCore/platform/android \
+ $(LOCAL_PATH)/WebCore/platform/animation \
+ $(LOCAL_PATH)/WebCore/platform/graphics \
+ $(LOCAL_PATH)/WebCore/platform/graphics/android \
+ $(LOCAL_PATH)/WebCore/platform/graphics/network \
+ $(LOCAL_PATH)/WebCore/platform/graphics/skia \
+ $(LOCAL_PATH)/WebCore/platform/graphics/transforms \
+ $(LOCAL_PATH)/WebCore/platform/image-decoders \
+ $(LOCAL_PATH)/WebCore/platform/leveldb \
+ $(LOCAL_PATH)/WebCore/platform/mock \
+ $(LOCAL_PATH)/WebCore/platform/network \
+ $(LOCAL_PATH)/WebCore/platform/network/android \
+ $(LOCAL_PATH)/WebCore/platform/sql \
+ $(LOCAL_PATH)/WebCore/platform/text \
+ $(LOCAL_PATH)/WebCore/plugins \
+ $(LOCAL_PATH)/WebCore/plugins/android \
+ $(LOCAL_PATH)/WebCore/rendering \
+ $(LOCAL_PATH)/WebCore/rendering/style \
+ $(LOCAL_PATH)/WebCore/storage \
+ $(LOCAL_PATH)/WebCore/workers \
+ $(LOCAL_PATH)/WebCore/xml
+
+LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
+ $(LOCAL_PATH)/WebKit/android \
+ $(LOCAL_PATH)/WebKit/android/WebCoreSupport \
+ $(LOCAL_PATH)/WebKit/android/jni \
+ $(LOCAL_PATH)/WebKit/android/nav \
+ $(LOCAL_PATH)/WebKit/android/plugins \
+ $(LOCAL_PATH)/WebKit/android/stl
+
+LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
+ $(LOCAL_PATH)/JavaScriptCore \
+ $(LOCAL_PATH)/JavaScriptCore/wtf \
+ $(LOCAL_PATH)/JavaScriptCore/wtf/unicode \
+ $(LOCAL_PATH)/JavaScriptCore/wtf/unicode/icu
+
+LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
+ $(base_intermediates)/WebCore/ \
+ $(base_intermediates)/WebCore/css \
+ $(base_intermediates)/WebCore/html \
+ $(base_intermediates)/WebCore/platform
+
+ifeq ($(ENABLE_SVG), true)
+LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
+ $(LOCAL_PATH)/WebCore/platform/graphics/filters \
+ $(LOCAL_PATH)/WebCore/svg \
+ $(LOCAL_PATH)/WebCore/svg/animation \
+ $(LOCAL_PATH)/WebCore/svg/graphics \
+ $(LOCAL_PATH)/WebCore/svg/graphics/filters \
+ $(base_intermediates)/WebCore/svg
+endif
+
+ifeq ($(JAVASCRIPT_ENGINE),v8)
+# Include WTF source file.
+d := JavaScriptCore
+LOCAL_PATH := $(BASE_PATH)/$d
+intermediates := $(base_intermediates)/$d
+include $(LOCAL_PATH)/Android.v8.wtf.mk
+WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES))
+endif # JAVASCRIPT_ENGINE == v8
+
+# Include source files for WebCore
+d := WebCore
+LOCAL_PATH := $(BASE_PATH)/$d
+JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore
+intermediates := $(base_intermediates)/$d
+include $(LOCAL_PATH)/Android.mk
+ifeq ($(JAVASCRIPT_ENGINE),jsc)
+include $(LOCAL_PATH)/Android.jscbindings.mk
+endif
+ifeq ($(JAVASCRIPT_ENGINE),v8)
+include $(LOCAL_PATH)/Android.v8bindings.mk
+endif
+WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES))
+LOCAL_C_INCLUDES += $(BINDING_C_INCLUDES)
+
+# Include the derived source files for WebCore. Uses the same path as
+# WebCore
+include $(LOCAL_PATH)/Android.derived.mk
+ifeq ($(JAVASCRIPT_ENGINE),jsc)
+include $(LOCAL_PATH)/Android.derived.jscbindings.mk
+endif
+ifeq ($(JAVASCRIPT_ENGINE),v8)
+include $(LOCAL_PATH)/Android.derived.v8bindings.mk
+endif
+
+# Redefine LOCAL_PATH here so the build system is not confused
+LOCAL_PATH := $(BASE_PATH)
+
+# Define our compiler flags
+LOCAL_CFLAGS += -Wno-endif-labels -Wno-import -Wno-format
+LOCAL_CFLAGS += -fno-strict-aliasing
+LOCAL_CFLAGS += -include "WebCorePrefix.h"
+LOCAL_CFLAGS += -fvisibility=hidden
+
+# Enable JSC JIT if JSC is used and ENABLE_JSC_JIT environment
+# variable is set to true
+ifeq ($(JAVASCRIPT_ENGINE),jsc)
+ifeq ($(ENABLE_JSC_JIT),true)
+LOCAL_CFLAGS += -DENABLE_ANDROID_JSC_JIT=1
+endif
+endif
+
+ifeq ($(TARGET_ARCH),arm)
+LOCAL_CFLAGS += -Darm
+endif
+
+ifeq ($(ENABLE_SVG),true)
+LOCAL_CFLAGS += -DENABLE_SVG=1
+endif
+
+# Temporary disable SVG_ANIMATION.
+ifeq ($(ENABLE_SVG_ANIMATION),true)
+LOCAL_CFLAGS += -DENABLE_SVG_ANIMATION=1
+endif
+
+ifeq ($(WEBCORE_INSTRUMENTATION),true)
+LOCAL_CFLAGS += -DANDROID_INSTRUMENT
+endif
+
+# LOCAL_LDLIBS is used in simulator builds only and simulator builds are only
+# valid on Linux
+LOCAL_LDLIBS += -lpthread -ldl
+
+# Build the list of shared libraries
+LOCAL_SHARED_LIBRARIES := \
+ libandroid_runtime \
+ libnativehelper \
+ libsqlite \
+ libskia \
+ libutils \
+ libui \
+ libcutils \
+ libicuuc \
+ libicudata \
+ libicui18n \
+ libmedia
+
+ifeq ($(WEBCORE_INSTRUMENTATION),true)
+LOCAL_SHARED_LIBRARIES += libhardware_legacy
+endif
+
+# We have to use the android version of libdl when we are not on the simulator
+ifneq ($(TARGET_SIMULATOR),true)
+LOCAL_SHARED_LIBRARIES += libdl
+endif
+
+# Build the list of static libraries
+LOCAL_STATIC_LIBRARIES := libxml2
+ifeq ($(JAVASCRIPT_ENGINE),v8)
+LOCAL_STATIC_LIBRARIES += libv8
+endif
+
+# Redefine LOCAL_SRC_FILES to be all the WebKit source files
+LOCAL_SRC_FILES := $(WEBKIT_SRC_FILES)
+
+# Define this for use in other makefiles.
+WEBKIT_C_INCLUDES := $(LOCAL_C_INCLUDES)
+WEBKIT_CFLAGS := $(LOCAL_CFLAGS)
+WEBKIT_GENERATED_SOURCES := $(LOCAL_GENERATED_SOURCES)
+WEBKIT_LDLIBS := $(LOCAL_LDLIBS)
+WEBKIT_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES)
+WEBKIT_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES)
+
+# Build the library all at once
+include $(BUILD_STATIC_LIBRARY)
+
+ifeq ($(JAVASCRIPT_ENGINE),jsc)
+# Now build libjs as a static library.
+include $(CLEAR_VARS)
+LOCAL_MODULE := libjs
+LOCAL_LDLIBS := $(WEBKIT_LDLIBS)
+LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES)
+LOCAL_STATIC_LIBRARIES := $(WEBKIT_STATIC_LIBRARIES)
+LOCAL_CFLAGS := $(WEBKIT_CFLAGS)
+# Include source files for JavaScriptCore
+d := JavaScriptCore
+LOCAL_PATH := $(BASE_PATH)/$d
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+# Cannot use base_intermediates as this is a new module
+intermediates := $(call local-intermediates-dir)
+include $(LOCAL_PATH)/Android.mk
+# Redefine LOCAL_SRC_FILES with the correct prefix
+LOCAL_SRC_FILES := $(addprefix $d/,$(LOCAL_SRC_FILES))
+# Use the base path to resolve file names
+LOCAL_PATH := $(BASE_PATH)
+# Append jsc intermediate include paths to the WebKit include list.
+LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES) \
+ $(intermediates) \
+ $(intermediates)/parser \
+ $(intermediates)/runtime \
+# Build libjs
+include $(BUILD_STATIC_LIBRARY)
+endif # JAVASCRIPT_ENGINE == jsc
+
+# Now build the shared library using only the exported jni entry point. This
+# will strip out any unused code from the entry point.
+include $(CLEAR_VARS)
+# if you need to make webcore huge (for debugging), enable this line
+#LOCAL_PRELINK_MODULE := false
+LOCAL_MODULE := libwebcore
+LOCAL_LDLIBS := $(WEBKIT_LDLIBS)
+LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES)
+LOCAL_STATIC_LIBRARIES := libwebcore $(WEBKIT_STATIC_LIBRARIES)
+ifeq ($(JAVASCRIPT_ENGINE),jsc)
+LOCAL_STATIC_LIBRARIES += libjs
+endif
+LOCAL_LDFLAGS := -fvisibility=hidden
+LOCAL_CFLAGS := $(WEBKIT_CFLAGS)
+LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES)
+LOCAL_PATH := $(BASE_PATH)
+include $(BUILD_SHARED_LIBRARY)
View
3 Source/CMakeLists.txt
@@ -13,7 +13,8 @@ SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/JavaScriptCore")
SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore")
SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")
SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/../Tools")
-SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
+SET(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
+SET(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
INCLUDE(WebKitMacros)
INCLUDE(WebKitFS)
View
2 Source/JavaScriptCore/API/JSCallbackConstructor.cpp
@@ -38,7 +38,7 @@ namespace JSC {
const ClassInfo JSCallbackConstructor::s_info = { "CallbackConstructor", &JSObjectWithGlobalObject::s_info, 0, 0 };
-JSCallbackConstructor::JSCallbackConstructor(JSGlobalObject* globalObject, NonNullPassRefPtr<Structure> structure, JSClassRef jsClass, JSObjectCallAsConstructorCallback callback)
+JSCallbackConstructor::JSCallbackConstructor(JSGlobalObject* globalObject, Structure* structure, JSClassRef jsClass, JSObjectCallAsConstructorCallback callback)
: JSObjectWithGlobalObject(globalObject, structure)
, m_class(jsClass)
, m_callback(callback)
View
4 Source/JavaScriptCore/API/JSCallbackConstructor.h
@@ -33,13 +33,13 @@ namespace JSC {
class JSCallbackConstructor : public JSObjectWithGlobalObject {
public:
- JSCallbackConstructor(JSGlobalObject*, NonNullPassRefPtr<Structure>, JSClassRef, JSObjectCallAsConstructorCallback);
+ JSCallbackConstructor(JSGlobalObject*, Structure*, JSClassRef, JSObjectCallAsConstructorCallback);
virtual ~JSCallbackConstructor();
JSClassRef classRef() const { return m_class; }
JSObjectCallAsConstructorCallback callback() const { return m_callback; }
static const ClassInfo s_info;
- static PassRefPtr<Structure> createStructure(JSGlobalData& globalData, JSValue proto)
+ static Structure* createStructure(JSGlobalData& globalData, JSValue proto)
{
return Structure::create(globalData, proto, TypeInfo(ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
}
View
2 Source/JavaScriptCore/API/JSCallbackFunction.h
@@ -39,7 +39,7 @@ class JSCallbackFunction : public InternalFunction {
// InternalFunction mish-mashes constructor and function behavior -- we should
// refactor the code so this override isn't necessary
- static PassRefPtr<Structure> createStructure(JSGlobalData& globalData, JSValue proto)
+ static Structure* createStructure(JSGlobalData& globalData, JSValue proto)
{
return Structure::create(globalData, proto, TypeInfo(ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
}
View
12 Source/JavaScriptCore/API/JSCallbackObject.cpp
@@ -39,4 +39,16 @@ ASSERT_CLASS_FITS_IN_CELL(JSCallbackObject<JSGlobalObject>);
template <> const ClassInfo JSCallbackObject<JSObjectWithGlobalObject>::s_info = { "CallbackObject", &JSObjectWithGlobalObject::s_info, 0, 0 };
template <> const ClassInfo JSCallbackObject<JSGlobalObject>::s_info = { "CallbackGlobalObject", &JSGlobalObject::s_info, 0, 0 };
+void JSCallbackObjectData::finalize(Handle<Unknown> handle, void* context)
+{
+ JSClassRef jsClass = static_cast<JSClassRef>(context);
+ JSObjectRef thisRef = toRef(asObject(handle.get()));
+
+ for (; jsClass; jsClass = jsClass->parentClass)
+ if (JSObjectFinalizeCallback finalize = jsClass->finalize)
+ finalize(thisRef);
+ HandleSlot slot = handle.slot();
+ HandleHeap::heapFor(slot)->deallocate(slot);
+}
+
} // namespace JSC
View
10 Source/JavaScriptCore/API/JSCallbackObject.h
@@ -34,7 +34,7 @@
namespace JSC {
-struct JSCallbackObjectData {
+struct JSCallbackObjectData : WeakHandleOwner {
JSCallbackObjectData(void* privateData, JSClassRef jsClass)
: privateData(privateData)
, jsClass(jsClass)
@@ -110,15 +110,15 @@ struct JSCallbackObjectData {
PrivatePropertyMap m_propertyMap;
};
OwnPtr<JSPrivatePropertyMap> m_privateProperties;
+ virtual void finalize(Handle<Unknown>, void*);
};
template <class Base>
class JSCallbackObject : public Base {
public:
- JSCallbackObject(ExecState*, JSGlobalObject*, NonNullPassRefPtr<Structure>, JSClassRef, void* data);
- JSCallbackObject(JSClassRef, NonNullPassRefPtr<Structure>);
- virtual ~JSCallbackObject();
+ JSCallbackObject(ExecState*, JSGlobalObject*, Structure*, JSClassRef, void* data);
+ JSCallbackObject(JSGlobalData&, JSClassRef, Structure*);
void setPrivate(void* data);
void* getPrivate();
@@ -128,7 +128,7 @@ class JSCallbackObject : public Base {
JSClassRef classRef() const { return m_callbackObjectData->jsClass; }
bool inherits(JSClassRef) const;
- static PassRefPtr<Structure> createStructure(JSGlobalData& globalData, JSValue proto)
+ static Structure* createStructure(JSGlobalData& globalData, JSValue proto)
{
return Structure::create(globalData, proto, TypeInfo(ObjectType, StructureFlags), Base::AnonymousSlotCount, &s_info);
}
View
24 Source/JavaScriptCore/API/JSCallbackObjectFunctions.h
@@ -50,7 +50,7 @@ inline JSCallbackObject<Base>* JSCallbackObject<Base>::asCallbackObject(JSValue
}
template <class Base>
-JSCallbackObject<Base>::JSCallbackObject(ExecState* exec, JSGlobalObject* globalObject, NonNullPassRefPtr<Structure> structure, JSClassRef jsClass, void* data)
+JSCallbackObject<Base>::JSCallbackObject(ExecState* exec, JSGlobalObject* globalObject, Structure* structure, JSClassRef jsClass, void* data)
: Base(globalObject, structure)
, m_callbackObjectData(adoptPtr(new JSCallbackObjectData(data, jsClass)))
{
@@ -61,8 +61,8 @@ JSCallbackObject<Base>::JSCallbackObject(ExecState* exec, JSGlobalObject* global
// Global object constructor.
// FIXME: Move this into a separate JSGlobalCallbackObject class derived from this one.
template <class Base>
-JSCallbackObject<Base>::JSCallbackObject(JSClassRef jsClass, NonNullPassRefPtr<Structure> structure)
- : Base(structure)
+JSCallbackObject<Base>::JSCallbackObject(JSGlobalData& globalData, JSClassRef jsClass, Structure* structure)
+ : Base(globalData, structure)
, m_callbackObjectData(adoptPtr(new JSCallbackObjectData(0, jsClass)))
{
ASSERT(Base::inherits(&s_info));
@@ -88,16 +88,16 @@ void JSCallbackObject<Base>::init(ExecState* exec)
JSObjectInitializeCallback initialize = initRoutines[i];
initialize(toRef(exec), toRef(this));
}
-}
-template <class Base>
-JSCallbackObject<Base>::~JSCallbackObject()
-{
- JSObjectRef thisRef = toRef(this);
-
- for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass)
- if (JSObjectFinalizeCallback finalize = jsClass->finalize)
- finalize(thisRef);
+ bool needsFinalizer = false;
+ for (JSClassRef jsClassPtr = classRef(); jsClassPtr && !needsFinalizer; jsClassPtr = jsClassPtr->parentClass)
+ needsFinalizer = jsClassPtr->finalize;
+ if (needsFinalizer) {
+ HandleSlot slot = exec->globalData().allocateGlobalHandle();
+ HandleHeap::heapFor(slot)->makeWeak(slot, m_callbackObjectData.get(), classRef());
+ HandleHeap::heapFor(slot)->writeBarrier(slot, this);
+ *slot = this;
+ }
}
template <class Base>
View
2 Source/JavaScriptCore/API/JSClassRef.cpp
@@ -254,7 +254,7 @@ JSObject* OpaqueJSClass::prototype(ExecState* exec)
jsClassData.cachedPrototype.set(exec->globalData(), new (exec) JSCallbackObject<JSObjectWithGlobalObject>(exec, exec->lexicalGlobalObject(), exec->lexicalGlobalObject()->callbackObjectStructure(), prototypeClass, &jsClassData), 0); // set jsClassData as the object's private data, so it can clear our reference on destruction
if (parentClass) {
if (JSObject* prototype = parentClass->prototype(exec))
- jsClassData.cachedPrototype->setPrototype(prototype);
+ jsClassData.cachedPrototype->setPrototype(exec->globalData(), prototype);
}
}
return jsClassData.cachedPrototype.get();
View
10 Source/JavaScriptCore/API/JSClassRef.h
@@ -28,10 +28,10 @@
#include "JSObjectRef.h"
-#include <runtime/JSObject.h>
-#include <runtime/Protect.h>
-#include <runtime/UString.h>
-#include <runtime/WeakGCPtr.h>
+#include "Weak.h"
+#include "JSObject.h"
+#include "Protect.h"
+#include "UString.h"
#include <wtf/HashMap.h>
struct StaticValueEntry {
@@ -82,7 +82,7 @@ struct OpaqueJSClassContextData {
OpaqueJSClassStaticValuesTable* staticValues;
OpaqueJSClassStaticFunctionsTable* staticFunctions;
- JSC::WeakGCPtr<JSC::JSObject> cachedPrototype;
+ JSC::Weak<JSC::JSObject> cachedPrototype;
};
struct OpaqueJSClass : public ThreadSafeRefCounted<OpaqueJSClass> {
View
9 Source/JavaScriptCore/API/JSContextRef.cpp
@@ -97,12 +97,12 @@ JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClass
return JSGlobalContextRetain(toGlobalRef(globalObject->globalExec()));
}
- JSGlobalObject* globalObject = new (globalData.get()) JSCallbackObject<JSGlobalObject>(globalObjectClass, JSCallbackObject<JSGlobalObject>::createStructure(*globalData, jsNull()));
+ JSGlobalObject* globalObject = new (globalData.get()) JSCallbackObject<JSGlobalObject>(*globalData, globalObjectClass, JSCallbackObject<JSGlobalObject>::createStructure(*globalData, jsNull()));
ExecState* exec = globalObject->globalExec();
JSValue prototype = globalObjectClass->prototype(exec);
if (!prototype)
prototype = jsNull();
- globalObject->resetPrototype(prototype);
+ globalObject->resetPrototype(*globalData, prototype);
return JSGlobalContextRetain(toGlobalRef(exec));
}
@@ -141,9 +141,10 @@ void JSGlobalContextRelease(JSGlobalContextRef ctx)
// it may release a lot of GC memory - run the garbage collector now.
// * If there are more references remaining the the global object, then do nothing
// (specifically that is more protects, which we assume come from other JSGlobalContextRefs).
- if (releasingContextGroup)
+ if (releasingContextGroup) {
+ globalData.clearBuiltinStructures();
globalData.heap.destroy();
- else if (releasingGlobalObject)
+ } else if (releasingGlobalObject)
globalData.heap.collectAllGarbage();
globalData.deref();
View
4 Source/JavaScriptCore/API/JSObjectRef.cpp
@@ -83,7 +83,7 @@ JSObjectRef JSObjectMake(JSContextRef ctx, JSClassRef jsClass, void* data)
JSCallbackObject<JSObjectWithGlobalObject>* object = new (exec) JSCallbackObject<JSObjectWithGlobalObject>(exec, exec->lexicalGlobalObject(), exec->lexicalGlobalObject()->callbackObjectStructure(), jsClass, data);
if (JSObject* prototype = jsClass->prototype(exec))
- object->setPrototype(prototype);
+ object->setPrototype(exec->globalData(), prototype);
return toRef(object);
}
@@ -235,7 +235,7 @@ void JSObjectSetPrototype(JSContextRef ctx, JSObjectRef object, JSValueRef value
JSObject* jsObject = toJS(object);
JSValue jsValue = toJS(exec, value);
- jsObject->setPrototypeWithCycleCheck(jsValue.isObject() ? jsValue : jsNull());
+ jsObject->setPrototypeWithCycleCheck(exec->globalData(), jsValue.isObject() ? jsValue : jsNull());
}
bool JSObjectHasProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName)
View
17 Source/JavaScriptCore/Android.mk
@@ -51,6 +51,14 @@ LOCAL_SRC_FILES := \
debugger/DebuggerActivation.cpp \
debugger/DebuggerCallFrame.cpp \
\
+ heap/ConservativeRoots.cpp \
+ heap/Heap.cpp \
+ heap/MachineStackMarker.cpp \
+ heap/MarkStack.cpp \
+ heap/MarkStackPosix.cpp \
+ heap/MarkedBlock.cpp \
+ heap/MarkedSpace.cpp \
+ \
interpreter/CallFrame.cpp \
interpreter/Interpreter.cpp \
interpreter/RegisterFile.cpp \
@@ -87,9 +95,6 @@ LOCAL_SRC_FILES := \
runtime/BooleanObject.cpp \
runtime/BooleanPrototype.cpp \
runtime/CallData.cpp \
- runtime/MarkedBlock.cpp \
- runtime/MarkedSpace.cpp \
- runtime/Heap.cpp \
runtime/CommonIdentifiers.cpp \
runtime/Completion.cpp \
runtime/ConstructData.cpp \
@@ -120,10 +125,8 @@ LOCAL_SRC_FILES := \
runtime/JSGlobalData.cpp \
runtime/JSGlobalObject.cpp \
runtime/JSGlobalObjectFunctions.cpp \
- runtime/JSImmediate.cpp \
runtime/JSLock.cpp \
runtime/JSNotAnObject.cpp \
- runtime/JSNumberCell.cpp \
runtime/JSONObject.cpp \
runtime/JSObject.cpp \
runtime/JSObjectWithGlobalObject.cpp \
@@ -135,10 +138,6 @@ LOCAL_SRC_FILES := \
runtime/JSWrapperObject.cpp \
runtime/LiteralParser.cpp \
runtime/Lookup.cpp \
- runtime/MachineStackMarker.cpp \
- runtime/ConservativeSet.cpp \
- runtime/MarkStack.cpp \
- runtime/MarkStackPosix.cpp \
runtime/MathObject.cpp \
runtime/NativeErrorConstructor.cpp \
runtime/NativeErrorPrototype.cpp \
View
35 Source/JavaScriptCore/CMakeLists.txt
@@ -6,7 +6,7 @@ SET(JavaScriptCore_INCLUDE_DIRECTORIES
"${JAVASCRIPTCORE_DIR}/assembler"
"${JAVASCRIPTCORE_DIR}/bytecode"
"${JAVASCRIPTCORE_DIR}/bytecompiler"
- "${JAVASCRIPTCORE_DIR}/collector/handles"
+ "${JAVASCRIPTCORE_DIR}/heap"
"${JAVASCRIPTCORE_DIR}/debugger"
"${JAVASCRIPTCORE_DIR}/interpreter"
"${JAVASCRIPTCORE_DIR}/jit"
@@ -41,8 +41,14 @@ SET(JavaScriptCore_SOURCES
bytecompiler/BytecodeGenerator.cpp
bytecompiler/NodesCodegen.cpp
- collector/handles/HandleHeap.cpp
- collector/handles/HandleStack.cpp
+ heap/Heap.cpp
+ heap/HandleHeap.cpp
+ heap/HandleStack.cpp
+ heap/MachineStackMarker.cpp
+ heap/MarkedBlock.cpp
+ heap/MarkedSpace.cpp
+ heap/ConservativeRoots.cpp
+ heap/MarkStack.cpp
debugger/Debugger.cpp
debugger/DebuggerActivation.cpp
@@ -85,9 +91,6 @@ SET(JavaScriptCore_SOURCES
runtime/BooleanObject.cpp
runtime/BooleanPrototype.cpp
runtime/CallData.cpp
- runtime/MarkedBlock.cpp
- runtime/MarkedSpace.cpp
- runtime/Heap.cpp
runtime/CommonIdentifiers.cpp
runtime/Completion.cpp
runtime/ConstructData.cpp
@@ -117,10 +120,8 @@ SET(JavaScriptCore_SOURCES
runtime/JSGlobalData.cpp
runtime/JSGlobalObject.cpp
runtime/JSGlobalObjectFunctions.cpp
- runtime/JSImmediate.cpp
runtime/JSLock.cpp
runtime/JSNotAnObject.cpp
- runtime/JSNumberCell.cpp
runtime/JSObject.cpp
runtime/JSObjectWithGlobalObject.cpp
runtime/JSONObject.cpp
@@ -133,9 +134,6 @@ SET(JavaScriptCore_SOURCES
runtime/JSZombie.cpp
runtime/LiteralParser.cpp
runtime/Lookup.cpp
- runtime/MachineStackMarker.cpp
- runtime/ConservativeSet.cpp
- runtime/MarkStack.cpp
runtime/MathObject.cpp
runtime/NativeErrorConstructor.cpp
runtime/NativeErrorPrototype.cpp
@@ -197,28 +195,29 @@ SET(JavaScriptCore_LIBRARIES
# GENERATOR 1-A: LUT creator
FOREACH (_file ${JavaScriptCore_LUT_FILES})
GET_FILENAME_COMPONENT(_name ${_file} NAME_WE)
- GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/${_file} ${DERIVED_SOURCES_DIR}/${_name}.lut.h)
- LIST(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_DIR}/${_name}.lut.h)
+ GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/${_file} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${_name}.lut.h)
+ LIST(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${_name}.lut.h)
ENDFOREACH ()
# GENERATOR 1-B: particular LUT creator (for 1 file only)
-GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_DIR}/Lexer.lut.h MAIN_DEPENDENCY)
-LIST(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_DIR}/Lexer.lut.h)
+GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h MAIN_DEPENDENCY)
+LIST(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h)
#GENERATOR: "RegExpJitTables.h": tables used by Yarr
ADD_CUSTOM_COMMAND(
- OUTPUT ${DERIVED_SOURCES_DIR}/RegExpJitTables.h
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h
MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/create_regex_tables
- COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/create_regex_tables > ${DERIVED_SOURCES_DIR}/RegExpJitTables.h
+ COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/create_regex_tables > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h
VERBATIM)
-ADD_SOURCE_DEPENDENCIES(${JAVASCRIPTCORE_DIR}/yarr/YarrPattern.cpp ${DERIVED_SOURCES_DIR}/RegExpJitTables.h)
+ADD_SOURCE_DEPENDENCIES(${JAVASCRIPTCORE_DIR}/yarr/YarrPattern.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h)
IF (WTF_CPU_ARM)
LIST(APPEND JavaScriptCore_SOURCES
assembler/ARMAssembler.cpp
+ assembler/ARMv7Assembler.cpp
assembler/MacroAssemblerARM.cpp
)
ELSEIF (WTF_CPU_MIPS)
View
2 Source/JavaScriptCore/CMakeListsEfl.txt
@@ -1,7 +1,7 @@
LIST(APPEND JavaScriptCore_SOURCES
jit/ExecutableAllocatorFixedVMPool.cpp
jit/ExecutableAllocator.cpp
- runtime/MarkStackPosix.cpp
+ heap/MarkStackPosix.cpp
wtf/OSAllocatorPosix.cpp
)
View
2 Source/JavaScriptCore/CMakeListsWinCE.txt
@@ -1,7 +1,7 @@
LIST(APPEND JavaScriptCore_SOURCES
jit/ExecutableAllocator.cpp
- runtime/MarkStackWin.cpp
+ heap/MarkStackWin.cpp
)
IF (ENABLE_JIT AND WTF_CPU_ARM)
View
2,844 Source/JavaScriptCore/ChangeLog
2,844 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
10 Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
@@ -23,8 +23,8 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// The contents of this file must be kept in sync with FeatureDefines.xcconfig in JavaScriptCore,
-// WebCore and WebKit. Also the default values of the ENABLE_FEATURE_NAME macros in build-webkit
-// should match the values below, but they do not need to be in the same order.
+// WebCore, WebKit and WebKit2. Also the default values of the ENABLE_FEATURE_NAME macros in
+// build-webkit should match the values below, but they do not need to be in the same order.
// Keep this list of features (not enabled/disabled state) in sync with FeatureDefines.vsprops
// and FeatureDefinesCairo.vsprops in WebKitLibraries/win/tools/vsprops.
@@ -91,8 +91,11 @@ ENABLE_MATHML = ENABLE_MATHML;
ENABLE_METER_TAG = ENABLE_METER_TAG;
ENABLE_NOTIFICATIONS = ;
ENABLE_OFFLINE_WEB_APPLICATIONS = ENABLE_OFFLINE_WEB_APPLICATIONS;
+ENABLE_PAGE_VISIBILITY_API = ;
ENABLE_PROGRESS_TAG = ENABLE_PROGRESS_TAG;
+ENABLE_QUOTA = ;
+
ENABLE_REGISTER_PROTOCOL_HANDLER = ;
ENABLE_SHARED_WORKERS = $(ENABLE_SHARED_WORKERS_$(REAL_PLATFORM_NAME));
@@ -109,6 +112,7 @@ ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
ENABLE_SVG_FOREIGN_OBJECT = ENABLE_SVG_FOREIGN_OBJECT;
ENABLE_SVG_USE = ENABLE_SVG_USE;
ENABLE_VIDEO = ENABLE_VIDEO;
+ENABLE_VIDEO_TRACK = ;
ENABLE_MEDIA_STATISTICS = ;
@@ -127,4 +131,4 @@ ENABLE_XHTMLMP = ;
ENABLE_XPATH = ENABLE_XPATH;
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_WEBGL) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_QUOTA) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
View
2 Source/JavaScriptCore/Configurations/Version.xcconfig
@@ -22,7 +22,7 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
MAJOR_VERSION = 534;
-MINOR_VERSION = 27;
+MINOR_VERSION = 30;
TINY_VERSION = 0;
FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
View
607 Source/JavaScriptCore/GNUmakefile.am
@@ -1,11 +1,13 @@
+include $(srcdir)/Source/JavaScriptCore/GNUmakefile.list.am
+
javascriptcore_cppflags += \
-I$(srcdir)/Source \
-I$(srcdir)/Source/JavaScriptCore \
-I$(srcdir)/Source/JavaScriptCore/API \
-I$(srcdir)/Source/JavaScriptCore/assembler \
-I$(srcdir)/Source/JavaScriptCore/bytecode \
-I$(srcdir)/Source/JavaScriptCore/bytecompiler \
- -I$(srcdir)/Source/JavaScriptCore/collector/handles \
+ -I$(srcdir)/Source/JavaScriptCore/heap \
-I$(srcdir)/Source/JavaScriptCore/debugger \
-I$(srcdir)/Source/JavaScriptCore/ForwardingHeaders \
-I$(srcdir)/Source/JavaScriptCore/interpreter \
@@ -25,593 +27,6 @@ javascriptcore_cppflags += \
-I$(top_builddir)/Source/JavaScriptCore/parser \
-I$(top_builddir)/Source/JavaScriptCore/runtime
-javascriptcore_h_api += \
- Source/JavaScriptCore/API/JSBase.h \
- Source/JavaScriptCore/API/JSContextRef.h \
- Source/JavaScriptCore/API/JSObjectRef.h \
- Source/JavaScriptCore/API/JSStringRef.h \
- Source/JavaScriptCore/API/JSStringRefBSTR.h \
- Source/JavaScriptCore/API/JSStringRefCF.h \
- Source/JavaScriptCore/API/JSValueRef.h \
- Source/JavaScriptCore/API/JavaScript.h \
- Source/JavaScriptCore/API/JavaScriptCore.h \
- Source/JavaScriptCore/API/WebKitAvailability.h
-
-javascriptcore_built_nosources += \
- Source/JavaScriptCore/Lexer.lut.h \
- Source/JavaScriptCore/RegExpJitTables.h \
- Source/JavaScriptCore/runtime/ArrayPrototype.lut.h \
- Source/JavaScriptCore/runtime/DatePrototype.lut.h \
- Source/JavaScriptCore/runtime/JSONObject.lut.h \
- Source/JavaScriptCore/runtime/MathObject.lut.h \
- Source/JavaScriptCore/runtime/NumberConstructor.lut.h \
- Source/JavaScriptCore/runtime/ObjectConstructor.lut.h \
- Source/JavaScriptCore/runtime/RegExpConstructor.lut.h \
- Source/JavaScriptCore/runtime/RegExpObject.lut.h \
- Source/JavaScriptCore/runtime/StringPrototype.lut.h
-
-javascriptcore_sources += \
- Source/JavaScriptCore/API/APICast.h \
- Source/JavaScriptCore/API/APIShims.h \
- Source/JavaScriptCore/API/JSBase.cpp \
- Source/JavaScriptCore/API/JSBasePrivate.h \
- Source/JavaScriptCore/API/JSCallbackConstructor.cpp \
- Source/JavaScriptCore/API/JSCallbackConstructor.h \
- Source/JavaScriptCore/API/JSCallbackFunction.cpp \
- Source/JavaScriptCore/API/JSCallbackFunction.h \
- Source/JavaScriptCore/API/JSCallbackObject.cpp \
- Source/JavaScriptCore/API/JSCallbackObjectFunctions.h \
- Source/JavaScriptCore/API/JSCallbackObject.h \
- Source/JavaScriptCore/API/JSClassRef.cpp \
- Source/JavaScriptCore/API/JSClassRef.h \
- Source/JavaScriptCore/API/JSContextRef.cpp \
- Source/JavaScriptCore/API/JSContextRefPrivate.h \
- Source/JavaScriptCore/API/JSObjectRef.cpp \
- Source/JavaScriptCore/API/JSObjectRefPrivate.h \
- Source/JavaScriptCore/API/JSRetainPtr.h \
- Source/JavaScriptCore/API/JSStringRef.cpp \
- Source/JavaScriptCore/API/JSValueRef.cpp \
- Source/JavaScriptCore/API/JSWeakObjectMapRefInternal.h \
- Source/JavaScriptCore/API/OpaqueJSString.cpp \
- Source/JavaScriptCore/API/OpaqueJSString.h \
- Source/JavaScriptCore/assembler/AbstractMacroAssembler.h \
- Source/JavaScriptCore/assembler/ARMAssembler.cpp \
- Source/JavaScriptCore/assembler/ARMAssembler.h \
- Source/JavaScriptCore/assembler/ARMv7Assembler.cpp \
- Source/JavaScriptCore/assembler/ARMv7Assembler.h \
- Source/JavaScriptCore/assembler/AssemblerBuffer.h \
- Source/JavaScriptCore/assembler/AssemblerBufferWithConstantPool.h \
- Source/JavaScriptCore/assembler/CodeLocation.h \
- Source/JavaScriptCore/assembler/LinkBuffer.h \
- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp \
- Source/JavaScriptCore/assembler/MacroAssemblerARM.h \
- Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h \
- Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h \
- Source/JavaScriptCore/assembler/MacroAssembler.h \
- Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h \
- Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h \
- Source/JavaScriptCore/assembler/MacroAssemblerX86.h \
- Source/JavaScriptCore/assembler/RepatchBuffer.h \
- Source/JavaScriptCore/assembler/X86Assembler.h \
- Source/JavaScriptCore/bytecode/CodeBlock.cpp \
- Source/JavaScriptCore/bytecode/CodeBlock.h \
- Source/JavaScriptCore/bytecode/EvalCodeCache.h \
- Source/JavaScriptCore/bytecode/Instruction.h \
- Source/JavaScriptCore/bytecode/JumpTable.cpp \
- Source/JavaScriptCore/bytecode/JumpTable.h \
- Source/JavaScriptCore/bytecode/Opcode.cpp \
- Source/JavaScriptCore/bytecode/Opcode.h \
- Source/JavaScriptCore/bytecode/SamplingTool.cpp \
- Source/JavaScriptCore/bytecode/SamplingTool.h \
- Source/JavaScriptCore/bytecode/StructureStubInfo.cpp \
- Source/JavaScriptCore/bytecode/StructureStubInfo.h \
- Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp \
- Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h \
- Source/JavaScriptCore/bytecompiler/Label.h \
- Source/JavaScriptCore/bytecompiler/LabelScope.h \
- Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp \
- Source/JavaScriptCore/bytecompiler/RegisterID.h \
- Source/JavaScriptCore/collector/handles/Global.h \
- Source/JavaScriptCore/collector/handles/Handle.h \
- Source/JavaScriptCore/collector/handles/HandleHeap.cpp \
- Source/JavaScriptCore/collector/handles/HandleHeap.h \
- Source/JavaScriptCore/collector/handles/HandleStack.cpp \
- Source/JavaScriptCore/collector/handles/HandleStack.h \
- Source/JavaScriptCore/collector/handles/Local.h \
- Source/JavaScriptCore/collector/handles/LocalScope.h \
- Source/JavaScriptCore/config.h \
- Source/JavaScriptCore/debugger/DebuggerActivation.cpp \
- Source/JavaScriptCore/debugger/DebuggerActivation.h \
- Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp \
- Source/JavaScriptCore/debugger/DebuggerCallFrame.h \
- Source/JavaScriptCore/debugger/Debugger.cpp \
- Source/JavaScriptCore/debugger/Debugger.h \
- Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APICast.h \
- Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APIShims.h \
- Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScriptCore.h \
- Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScript.h \
- Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSBase.h \
- Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSContextRef.h \
- Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSObjectRef.h \
- Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSRetainPtr.h \
- Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRefCF.h \
- Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRef.h \
- Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSValueRef.h \
- Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/OpaqueJSString.h \
- Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/WebKitAvailability.h \
- Source/JavaScriptCore/icu/unicode/parseerr.h \
- Source/JavaScriptCore/icu/unicode/platform.h \
- Source/JavaScriptCore/icu/unicode/putil.h \
- Source/JavaScriptCore/icu/unicode/uchar.h \
- Source/JavaScriptCore/icu/unicode/ucnv_err.h \
- Source/JavaScriptCore/icu/unicode/ucnv.h \
- Source/JavaScriptCore/icu/unicode/ucol.h \
- Source/JavaScriptCore/icu/unicode/uconfig.h \
- Source/JavaScriptCore/icu/unicode/uenum.h \
- Source/JavaScriptCore/icu/unicode/uiter.h \
- Source/JavaScriptCore/icu/unicode/uloc.h \
- Source/JavaScriptCore/icu/unicode/umachine.h \
- Source/JavaScriptCore/icu/unicode/unorm.h \
- Source/JavaScriptCore/icu/unicode/urename.h \
- Source/JavaScriptCore/icu/unicode/uset.h \
- Source/JavaScriptCore/icu/unicode/ustring.h \
- Source/JavaScriptCore/icu/unicode/utf16.h \
- Source/JavaScriptCore/icu/unicode/utf8.h \
- Source/JavaScriptCore/icu/unicode/utf.h \
- Source/JavaScriptCore/icu/unicode/utf_old.h \
- Source/JavaScriptCore/icu/unicode/utypes.h \
- Source/JavaScriptCore/icu/unicode/uversion.h \
- Source/JavaScriptCore/interpreter/CachedCall.h \
- Source/JavaScriptCore/interpreter/CallFrameClosure.h \
- Source/JavaScriptCore/interpreter/CallFrame.cpp \
- Source/JavaScriptCore/interpreter/CallFrame.h \
- Source/JavaScriptCore/interpreter/Interpreter.cpp \
- Source/JavaScriptCore/interpreter/Interpreter.h \
- Source/JavaScriptCore/interpreter/RegisterFile.cpp \
- Source/JavaScriptCore/interpreter/RegisterFile.h \
- Source/JavaScriptCore/interpreter/Register.h \
- Source/JavaScriptCore/JavaScriptCorePrefix.h \
- Source/JavaScriptCore/jit/ExecutableAllocator.cpp \
- Source/JavaScriptCore/jit/ExecutableAllocator.h \
- Source/JavaScriptCore/jit/JITArithmetic32_64.cpp \
- Source/JavaScriptCore/jit/JITArithmetic.cpp \
- Source/JavaScriptCore/jit/JITCall32_64.cpp \
- Source/JavaScriptCore/jit/JITCall.cpp \
- Source/JavaScriptCore/jit/JITCode.h \
- Source/JavaScriptCore/jit/JIT.cpp \
- Source/JavaScriptCore/jit/JIT.h \
- Source/JavaScriptCore/jit/JITInlineMethods.h \
- Source/JavaScriptCore/jit/JITOpcodes32_64.cpp \
- Source/JavaScriptCore/jit/JITOpcodes.cpp \
- Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp \
- Source/JavaScriptCore/jit/JITPropertyAccess.cpp \
- Source/JavaScriptCore/jit/JITStubCall.h \
- Source/JavaScriptCore/jit/JITStubs.cpp \
- Source/JavaScriptCore/jit/JITStubs.h \
- Source/JavaScriptCore/jit/JSInterfaceJIT.h \
- Source/JavaScriptCore/jit/SpecializedThunkJIT.h \
- Source/JavaScriptCore/jit/ThunkGenerators.cpp \
- Source/JavaScriptCore/jit/ThunkGenerators.h \
- Source/JavaScriptCore/os-win32/stdbool.h \
- Source/JavaScriptCore/os-win32/stdint.h \
- Source/JavaScriptCore/parser/ASTBuilder.h \
- Source/JavaScriptCore/parser/JSParser.cpp \
- Source/JavaScriptCore/parser/JSParser.h \
- Source/JavaScriptCore/parser/Lexer.cpp \
- Source/JavaScriptCore/parser/Lexer.h \
- Source/JavaScriptCore/parser/NodeConstructors.h \
- Source/JavaScriptCore/parser/NodeInfo.h \
- Source/JavaScriptCore/parser/Nodes.cpp \
- Source/JavaScriptCore/parser/Nodes.h \
- Source/JavaScriptCore/parser/ParserArena.cpp \
- Source/JavaScriptCore/parser/ParserArena.h \
- Source/JavaScriptCore/parser/Parser.cpp \
- Source/JavaScriptCore/parser/Parser.h \
- Source/JavaScriptCore/parser/ResultType.h \
- Source/JavaScriptCore/parser/SourceCode.h \
- Source/JavaScriptCore/parser/SourceProvider.h \
- Source/JavaScriptCore/parser/SourceProviderCache.cpp \
- Source/JavaScriptCore/parser/SourceProviderCache.h \
- Source/JavaScriptCore/parser/SourceProviderCacheItem.h \
- Source/JavaScriptCore/parser/SyntaxChecker.h \
- Source/JavaScriptCore/profiler/CallIdentifier.h \
- Source/JavaScriptCore/profiler/Profile.cpp \
- Source/JavaScriptCore/profiler/ProfileGenerator.cpp \
- Source/JavaScriptCore/profiler/ProfileGenerator.h \
- Source/JavaScriptCore/profiler/Profile.h \
- Source/JavaScriptCore/profiler/ProfileNode.cpp \
- Source/JavaScriptCore/profiler/ProfileNode.h \
- Source/JavaScriptCore/profiler/Profiler.cpp \
- Source/JavaScriptCore/profiler/Profiler.h \
- Source/JavaScriptCore/runtime/ArgList.cpp \
- Source/JavaScriptCore/runtime/ArgList.h \
- Source/JavaScriptCore/runtime/Arguments.cpp \
- Source/JavaScriptCore/runtime/Arguments.h \
- Source/JavaScriptCore/runtime/ArrayConstructor.cpp \
- Source/JavaScriptCore/runtime/ArrayConstructor.h \
- Source/JavaScriptCore/runtime/ArrayPrototype.cpp \
- Source/JavaScriptCore/runtime/ArrayPrototype.h \
- Source/JavaScriptCore/runtime/BatchedTransitionOptimizer.h \
- Source/JavaScriptCore/runtime/BooleanConstructor.cpp \
- Source/JavaScriptCore/runtime/BooleanConstructor.h \
- Source/JavaScriptCore/runtime/BooleanObject.cpp \
- Source/JavaScriptCore/runtime/BooleanObject.h \
- Source/JavaScriptCore/runtime/BooleanPrototype.cpp \
- Source/JavaScriptCore/runtime/BooleanPrototype.h \
- Source/JavaScriptCore/runtime/CachedTranscendentalFunction.h \
- Source/JavaScriptCore/runtime/CallData.cpp \
- Source/JavaScriptCore/runtime/CallData.h \
- Source/JavaScriptCore/runtime/ClassInfo.h \
- Source/JavaScriptCore/runtime/MarkedBlock.cpp \
- Source/JavaScriptCore/runtime/MarkedBlock.h \
- Source/JavaScriptCore/runtime/MarkedSpace.cpp \
- Source/JavaScriptCore/runtime/MarkedSpace.h \
- Source/JavaScriptCore/runtime/Heap.cpp \
- Source/JavaScriptCore/runtime/Heap.h \
- Source/JavaScriptCore/runtime/CommonIdentifiers.cpp \
- Source/JavaScriptCore/runtime/CommonIdentifiers.h \
- Source/JavaScriptCore/runtime/Completion.cpp \
- Source/JavaScriptCore/runtime/Completion.h \
- Source/JavaScriptCore/runtime/ConstructData.cpp \
- Source/JavaScriptCore/runtime/ConstructData.h \
- Source/JavaScriptCore/runtime/DateConstructor.cpp \
- Source/JavaScriptCore/runtime/DateConstructor.h \
- Source/JavaScriptCore/runtime/DateConversion.cpp \
- Source/JavaScriptCore/runtime/DateConversion.h \
- Source/JavaScriptCore/runtime/DateInstanceCache.h \
- Source/JavaScriptCore/runtime/DateInstance.cpp \
- Source/JavaScriptCore/runtime/DateInstance.h \
- Source/JavaScriptCore/runtime/DatePrototype.cpp \
- Source/JavaScriptCore/runtime/DatePrototype.h \
- Source/JavaScriptCore/runtime/ErrorConstructor.cpp \
- Source/JavaScriptCore/runtime/ErrorConstructor.h \
- Source/JavaScriptCore/runtime/Error.cpp \
- Source/JavaScriptCore/runtime/Error.h \
- Source/JavaScriptCore/runtime/ErrorInstance.cpp \
- Source/JavaScriptCore/runtime/ErrorInstance.h \
- Source/JavaScriptCore/runtime/ErrorPrototype.cpp \
- Source/JavaScriptCore/runtime/ErrorPrototype.h \
- Source/JavaScriptCore/runtime/ExceptionHelpers.cpp \
- Source/JavaScriptCore/runtime/ExceptionHelpers.h \
- Source/JavaScriptCore/runtime/Executable.cpp \
- Source/JavaScriptCore/runtime/Executable.h \
- Source/JavaScriptCore/runtime/FunctionConstructor.cpp \
- Source/JavaScriptCore/runtime/FunctionConstructor.h \
- Source/JavaScriptCore/runtime/FunctionPrototype.cpp \
- Source/JavaScriptCore/runtime/FunctionPrototype.h \
- Source/JavaScriptCore/runtime/GCActivityCallback.cpp \
- Source/JavaScriptCore/runtime/GCActivityCallback.h \
- Source/JavaScriptCore/runtime/GetterSetter.cpp \
- Source/JavaScriptCore/runtime/GetterSetter.h \
- Source/JavaScriptCore/runtime/Identifier.cpp \
- Source/JavaScriptCore/runtime/Identifier.h \
- Source/JavaScriptCore/runtime/InitializeThreading.cpp \
- Source/JavaScriptCore/runtime/InitializeThreading.h \
- Source/JavaScriptCore/runtime/InternalFunction.cpp \
- Source/JavaScriptCore/runtime/InternalFunction.h \
- Source/JavaScriptCore/runtime/JSActivation.cpp \
- Source/JavaScriptCore/runtime/JSActivation.h \
- Source/JavaScriptCore/runtime/JSAPIValueWrapper.cpp \
- Source/JavaScriptCore/runtime/JSAPIValueWrapper.h \
- Source/JavaScriptCore/runtime/JSArray.cpp \
- Source/JavaScriptCore/runtime/JSArray.h \
- Source/JavaScriptCore/runtime/JSByteArray.cpp \
- Source/JavaScriptCore/runtime/JSByteArray.h \
- Source/JavaScriptCore/runtime/JSCell.cpp \
- Source/JavaScriptCore/runtime/JSCell.h \
- Source/JavaScriptCore/runtime/JSFunction.cpp \
- Source/JavaScriptCore/runtime/JSFunction.h \
- Source/JavaScriptCore/runtime/JSGlobalData.cpp \
- Source/JavaScriptCore/runtime/JSGlobalData.h \
- Source/JavaScriptCore/runtime/JSGlobalObject.cpp \
- Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp \
- Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.h \
- Source/JavaScriptCore/runtime/JSGlobalObject.h \
- Source/JavaScriptCore/runtime/JSImmediate.cpp \
- Source/JavaScriptCore/runtime/JSImmediate.h \
- Source/JavaScriptCore/runtime/JSLock.cpp \
- Source/JavaScriptCore/runtime/JSLock.h \
- Source/JavaScriptCore/runtime/JSNotAnObject.cpp \
- Source/JavaScriptCore/runtime/JSNotAnObject.h \
- Source/JavaScriptCore/runtime/JSNumberCell.cpp \
- Source/JavaScriptCore/runtime/JSNumberCell.h \
- Source/JavaScriptCore/runtime/JSObject.cpp \
- Source/JavaScriptCore/runtime/JSObject.h \
- Source/JavaScriptCore/runtime/JSObjectWithGlobalObject.cpp \
- Source/JavaScriptCore/runtime/JSObjectWithGlobalObject.h \
- Source/JavaScriptCore/runtime/JSONObject.cpp \
- Source/JavaScriptCore/runtime/JSONObject.h \
- Source/JavaScriptCore/runtime/JSPropertyNameIterator.cpp \
- Source/JavaScriptCore/runtime/JSPropertyNameIterator.h \
- Source/JavaScriptCore/runtime/JSStaticScopeObject.cpp \
- Source/JavaScriptCore/runtime/JSStaticScopeObject.h \
- Source/JavaScriptCore/runtime/JSStringBuilder.h \
- Source/JavaScriptCore/runtime/JSString.cpp \
- Source/JavaScriptCore/runtime/JSString.h \
- Source/JavaScriptCore/runtime/JSType.h \
- Source/JavaScriptCore/runtime/JSTypeInfo.h \
- Source/JavaScriptCore/runtime/JSValue.cpp \
- Source/JavaScriptCore/runtime/JSValue.h \
- Source/JavaScriptCore/runtime/JSVariableObject.cpp \
- Source/JavaScriptCore/runtime/JSVariableObject.h \
- Source/JavaScriptCore/runtime/JSWrapperObject.cpp \
- Source/JavaScriptCore/runtime/JSWrapperObject.h \
- Source/JavaScriptCore/runtime/JSZombie.h \
- Source/JavaScriptCore/runtime/LiteralParser.cpp \
- Source/JavaScriptCore/runtime/LiteralParser.h \
- Source/JavaScriptCore/runtime/Lookup.cpp \
- Source/JavaScriptCore/runtime/Lookup.h \
- Source/JavaScriptCore/runtime/MachineStackMarker.cpp \
- Source/JavaScriptCore/runtime/MachineStackMarker.h \
- Source/JavaScriptCore/runtime/ConservativeSet.cpp \
- Source/JavaScriptCore/runtime/ConservativeSet.h \
- Source/JavaScriptCore/runtime/MarkStack.cpp \
- Source/JavaScriptCore/runtime/MarkStack.h \
- Source/JavaScriptCore/runtime/MathObject.cpp \
- Source/JavaScriptCore/runtime/MathObject.h \
- Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp \
- Source/JavaScriptCore/runtime/NativeErrorConstructor.h \
- Source/JavaScriptCore/runtime/NativeErrorPrototype.cpp \
- Source/JavaScriptCore/runtime/NativeErrorPrototype.h \
- Source/JavaScriptCore/runtime/NumberConstructor.cpp \
- Source/JavaScriptCore/runtime/NumberConstructor.h \
- Source/JavaScriptCore/runtime/NumberObject.cpp \
- Source/JavaScriptCore/runtime/NumberObject.h \
- Source/JavaScriptCore/runtime/NumberPrototype.cpp \
- Source/JavaScriptCore/runtime/NumberPrototype.h \
- Source/JavaScriptCore/runtime/NumericStrings.h \
- Source/JavaScriptCore/runtime/ObjectConstructor.cpp \
- Source/JavaScriptCore/runtime/ObjectConstructor.h \
- Source/JavaScriptCore/runtime/ObjectPrototype.cpp \
- Source/JavaScriptCore/runtime/ObjectPrototype.h \
- Source/JavaScriptCore/runtime/Operations.cpp \
- Source/JavaScriptCore/runtime/Operations.h \
- Source/JavaScriptCore/runtime/PropertyDescriptor.cpp \
- Source/JavaScriptCore/runtime/PropertyDescriptor.h \
- Source/JavaScriptCore/runtime/PropertyMapHashTable.h \
- Source/JavaScriptCore/runtime/PropertyNameArray.cpp \
- Source/JavaScriptCore/runtime/PropertyNameArray.h \
- Source/JavaScriptCore/runtime/PropertySlot.cpp \
- Source/JavaScriptCore/runtime/PropertySlot.h \
- Source/JavaScriptCore/runtime/Protect.h \
- Source/JavaScriptCore/runtime/PutPropertySlot.h \
- Source/JavaScriptCore/runtime/RegExpCache.cpp \
- Source/JavaScriptCore/runtime/RegExpCache.h \
- Source/JavaScriptCore/runtime/RegExpConstructor.cpp \
- Source/JavaScriptCore/runtime/RegExpConstructor.h \
- Source/JavaScriptCore/runtime/RegExp.cpp \
- Source/JavaScriptCore/runtime/RegExp.h \
- Source/JavaScriptCore/runtime/RegExpKey.h \
- Source/JavaScriptCore/runtime/RegExpMatchesArray.h \
- Source/JavaScriptCore/runtime/RegExpObject.cpp \
- Source/JavaScriptCore/runtime/RegExpObject.h \
- Source/JavaScriptCore/runtime/RegExpPrototype.cpp \
- Source/JavaScriptCore/runtime/RegExpPrototype.h \
- Source/JavaScriptCore/runtime/RopeImpl.cpp \
- Source/JavaScriptCore/runtime/RopeImpl.h \
- Source/JavaScriptCore/runtime/ScopeChain.cpp \
- Source/JavaScriptCore/runtime/ScopeChain.h \
- Source/JavaScriptCore/runtime/ScopeChainMark.h \
- Source/JavaScriptCore/runtime/SmallStrings.cpp \
- Source/JavaScriptCore/runtime/SmallStrings.h \
- Source/JavaScriptCore/runtime/StrictEvalActivation.cpp \
- Source/JavaScriptCore/runtime/StrictEvalActivation.h \
- Source/JavaScriptCore/runtime/StringConstructor.cpp \
- Source/JavaScriptCore/runtime/StringConstructor.h \
- Source/JavaScriptCore/runtime/StringObject.cpp \
- Source/JavaScriptCore/runtime/StringObject.h \
- Source/JavaScriptCore/runtime/StringObjectThatMasqueradesAsUndefined.h \
- Source/JavaScriptCore/runtime/StringPrototype.cpp \
- Source/JavaScriptCore/runtime/StringPrototype.h \
- Source/JavaScriptCore/runtime/StringRecursionChecker.cpp \
- Source/JavaScriptCore/runtime/StringRecursionChecker.h \
- Source/JavaScriptCore/runtime/StructureChain.cpp \
- Source/JavaScriptCore/runtime/StructureChain.h \
- Source/JavaScriptCore/runtime/Structure.cpp \
- Source/JavaScriptCore/runtime/Structure.h \
- Source/JavaScriptCore/runtime/StructureTransitionTable.h \
- Source/JavaScriptCore/runtime/SymbolTable.h \
- Source/JavaScriptCore/runtime/Terminator.h \
- Source/JavaScriptCore/runtime/TimeoutChecker.cpp \
- Source/JavaScriptCore/runtime/TimeoutChecker.h \
- Source/JavaScriptCore/runtime/Tracing.h \
- Source/JavaScriptCore/runtime/UString.cpp \
- Source/JavaScriptCore/runtime/UString.h \
- Source/JavaScriptCore/runtime/UStringBuilder.h \
- Source/JavaScriptCore/runtime/UStringConcatenate.h \
- Source/JavaScriptCore/runtime/WeakGCMap.h \
- Source/JavaScriptCore/runtime/WeakGCPtr.h \
- Source/JavaScriptCore/runtime/WeakRandom.h \
- Source/JavaScriptCore/runtime/WriteBarrier.h \
- Source/JavaScriptCore/wtf/AlwaysInline.h \
- Source/JavaScriptCore/wtf/ASCIICType.h \
- Source/JavaScriptCore/wtf/Assertions.cpp \
- Source/JavaScriptCore/wtf/Assertions.h \
- Source/JavaScriptCore/wtf/Atomics.h \
- Source/JavaScriptCore/wtf/AVLTree.h \
- Source/JavaScriptCore/wtf/Bitmap.h \
- Source/JavaScriptCore/wtf/BlockStack.h \
- Source/JavaScriptCore/wtf/BloomFilter.h \
- Source/JavaScriptCore/wtf/BumpPointerAllocator.h \
- Source/JavaScriptCore/wtf/ByteArray.cpp \
- Source/JavaScriptCore/wtf/ByteArray.h \
- Source/JavaScriptCore/wtf/CrossThreadRefCounted.h \
- Source/JavaScriptCore/wtf/CryptographicallyRandomNumber.cpp \
- Source/JavaScriptCore/wtf/CryptographicallyRandomNumber.h \
- Source/JavaScriptCore/wtf/CurrentTime.cpp \
- Source/JavaScriptCore/wtf/CurrentTime.h \
- Source/JavaScriptCore/wtf/DateMath.cpp \
- Source/JavaScriptCore/wtf/DateMath.h \
- Source/JavaScriptCore/wtf/DecimalNumber.h \
- Source/JavaScriptCore/wtf/DecimalNumber.cpp \
- Source/JavaScriptCore/wtf/Decoder.h \
- Source/JavaScriptCore/wtf/Deque.h \
- Source/JavaScriptCore/wtf/DisallowCType.h \
- Source/JavaScriptCore/wtf/DoublyLinkedList.h \
- Source/JavaScriptCore/wtf/dtoa.cpp \
- Source/JavaScriptCore/wtf/dtoa.h \
- Source/JavaScriptCore/wtf/Encoder.h \
- Source/JavaScriptCore/wtf/FastAllocBase.h \
- Source/JavaScriptCore/wtf/FastMalloc.cpp \
- Source/JavaScriptCore/wtf/FastMalloc.h \
- Source/JavaScriptCore/wtf/FixedArray.h \
- Source/JavaScriptCore/wtf/Forward.h \
- Source/JavaScriptCore/wtf/GetPtr.h \
- Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp \
- Source/JavaScriptCore/wtf/gobject/GOwnPtr.h \
- Source/JavaScriptCore/wtf/gobject/GRefPtr.cpp \
- Source/JavaScriptCore/wtf/gobject/GRefPtr.h \
- Source/JavaScriptCore/wtf/gobject/GTypedefs.h \
- Source/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \
- Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \
- Source/JavaScriptCore/wtf/HashCountedSet.h \
- Source/JavaScriptCore/wtf/HashFunctions.h \
- Source/JavaScriptCore/wtf/HashIterators.h \
- Source/JavaScriptCore/wtf/HashMap.h \
- Source/JavaScriptCore/wtf/HashSet.h \
- Source/JavaScriptCore/wtf/HashTable.cpp \
- Source/JavaScriptCore/wtf/HashTable.h \
- Source/JavaScriptCore/wtf/HashTraits.h \
- Source/JavaScriptCore/wtf/HexNumber.h \
- Source/JavaScriptCore/wtf/ListHashSet.h \
- Source/JavaScriptCore/wtf/ListRefPtr.h \
- Source/JavaScriptCore/wtf/Locker.h \
- Source/JavaScriptCore/wtf/MainThread.cpp \
- Source/JavaScriptCore/wtf/MainThread.h \
- Source/JavaScriptCore/wtf/MallocZoneSupport.h \
- Source/JavaScriptCore/wtf/MathExtras.h \
- Source/JavaScriptCore/wtf/MD5.cpp \
- Source/JavaScriptCore/wtf/MD5.h \
- Source/JavaScriptCore/wtf/MessageQueue.h \
- Source/JavaScriptCore/wtf/NonCopyingSort.h \
- Source/JavaScriptCore/wtf/Noncopyable.h \
- Source/JavaScriptCore/wtf/NotFound.h \
- Source/JavaScriptCore/wtf/NullPtr.h \
- Source/JavaScriptCore/wtf/OSAllocator.h \
- Source/JavaScriptCore/wtf/OSRandomSource.cpp \
- Source/JavaScriptCore/wtf/OSRandomSource.h \
- Source/JavaScriptCore/wtf/OwnArrayPtr.h \
- Source/JavaScriptCore/wtf/OwnFastMallocPtr.h \
- Source/JavaScriptCore/wtf/OwnPtrCommon.h \
- Source/JavaScriptCore/wtf/OwnPtr.h \
- Source/JavaScriptCore/wtf/PageAllocation.h \
- Source/JavaScriptCore/wtf/PageAllocationAligned.cpp \
- Source/JavaScriptCore/wtf/PageAllocationAligned.h \
- Source/JavaScriptCore/wtf/PageReservation.h \
- Source/JavaScriptCore/wtf/PageBlock.cpp \
- Source/JavaScriptCore/wtf/PageBlock.h \
- Source/JavaScriptCore/wtf/PassOwnArrayPtr.h \
- Source/JavaScriptCore/wtf/PassOwnPtr.h \
- Source/JavaScriptCore/wtf/PassRefPtr.h \
- Source/JavaScriptCore/wtf/Platform.h \
- Source/JavaScriptCore/wtf/PossiblyNull.h \
- Source/JavaScriptCore/wtf/RandomNumber.cpp \
- Source/JavaScriptCore/wtf/RandomNumber.h \
- Source/JavaScriptCore/wtf/RandomNumberSeed.h \
- Source/JavaScriptCore/wtf/RefCounted.h \
- Source/JavaScriptCore/wtf/RefCountedLeakCounter.cpp \
- Source/JavaScriptCore/wtf/RefCountedLeakCounter.h \
- Source/JavaScriptCore/wtf/RefPtr.h \
- Source/JavaScriptCore/wtf/RefPtrHashMap.h \
- Source/JavaScriptCore/wtf/RetainPtr.h \
- Source/JavaScriptCore/wtf/SegmentedVector.h \
- Source/JavaScriptCore/wtf/SentinelLinkedList.h \
- Source/JavaScriptCore/wtf/SHA1.cpp \
- Source/JavaScriptCore/wtf/SHA1.h \
- Source/JavaScriptCore/wtf/SinglyLinkedList.h \
- Source/JavaScriptCore/wtf/StackBounds.cpp \
- Source/JavaScriptCore/wtf/StackBounds.h \
- Source/JavaScriptCore/wtf/StaticConstructors.h \
- Source/JavaScriptCore/wtf/StdLibExtras.h \
- Source/JavaScriptCore/wtf/StringExtras.h \
- Source/JavaScriptCore/wtf/StringHasher.h \
- Source/JavaScriptCore/wtf/TCPackedCache.h \
- Source/JavaScriptCore/wtf/TCPageMap.h \
- Source/JavaScriptCore/wtf/TCSpinLock.h \
- Source/JavaScriptCore/wtf/TCSystemAlloc.cpp \
- Source/JavaScriptCore/wtf/TCSystemAlloc.h \
- Source/JavaScriptCore/wtf/text/AtomicString.cpp \
- Source/JavaScriptCore/wtf/text/AtomicString.h \
- Source/JavaScriptCore/wtf/text/AtomicStringHash.h \
- Source/JavaScriptCore/wtf/text/AtomicStringImpl.h \
- Source/JavaScriptCore/wtf/text/CString.cpp \
- Source/JavaScriptCore/wtf/text/CString.h \
- Source/JavaScriptCore/wtf/text/StringBuffer.h \
- Source/JavaScriptCore/wtf/text/StringBuilder.cpp \
- Source/JavaScriptCore/wtf/text/StringBuilder.h \
- Source/JavaScriptCore/wtf/text/StringConcatenate.h \
- Source/JavaScriptCore/wtf/text/StringHash.h \
- Source/JavaScriptCore/wtf/text/StringImplBase.h \
- Source/JavaScriptCore/wtf/text/StringImpl.cpp \
- Source/JavaScriptCore/wtf/text/StringImpl.h \
- Source/JavaScriptCore/wtf/text/StringStatics.cpp \
- Source/JavaScriptCore/wtf/text/TextPosition.h \
- Source/JavaScriptCore/wtf/text/WTFString.cpp \
- Source/JavaScriptCore/wtf/text/WTFString.h \
- Source/JavaScriptCore/wtf/ThreadIdentifierDataPthreads.cpp \
- Source/JavaScriptCore/wtf/ThreadIdentifierDataPthreads.h \
- Source/JavaScriptCore/wtf/Threading.cpp \
- Source/JavaScriptCore/wtf/Threading.h \
- Source/JavaScriptCore/wtf/ThreadingPrimitives.h \
- Source/JavaScriptCore/wtf/ThreadingPthreads.cpp \
- Source/JavaScriptCore/wtf/ThreadSafeRefCounted.h \
- Source/JavaScriptCore/wtf/ThreadSpecific.h \
- Source/JavaScriptCore/wtf/TypeTraits.cpp \
- Source/JavaScriptCore/wtf/TypeTraits.h \
- Source/JavaScriptCore/wtf/unicode/CharacterNames.h \
- Source/JavaScriptCore/wtf/unicode/CollatorDefault.cpp \
- Source/JavaScriptCore/wtf/unicode/Collator.h \
- Source/JavaScriptCore/wtf/unicode/Unicode.h \
- Source/JavaScriptCore/wtf/unicode/UTF8.cpp \
- Source/JavaScriptCore/wtf/unicode/UTF8.h \
- Source/JavaScriptCore/wtf/UnusedParam.h \
- Source/JavaScriptCore/wtf/ValueCheck.h \
- Source/JavaScriptCore/wtf/Vector.h \
- Source/JavaScriptCore/wtf/VectorTraits.h \
- Source/JavaScriptCore/wtf/VMTags.h \
- Source/JavaScriptCore/wtf/WTFThreadData.cpp \
- Source/JavaScriptCore/wtf/WTFThreadData.h \
- Source/JavaScriptCore/yarr/Yarr.h \
- Source/JavaScriptCore/yarr/YarrInterpreter.cpp \
- Source/JavaScriptCore/yarr/YarrInterpreter.h \
- Source/JavaScriptCore/yarr/YarrJIT.cpp \
- Source/JavaScriptCore/yarr/YarrJIT.h \
- Source/JavaScriptCore/yarr/YarrParser.h \
- Source/JavaScriptCore/yarr/YarrPattern.cpp \
- Source/JavaScriptCore/yarr/YarrPattern.h \
- Source/JavaScriptCore/yarr/YarrSyntaxChecker.cpp \
- Source/JavaScriptCore/yarr/YarrSyntaxChecker.h
-
-if TARGET_WIN32
-javascriptcore_sources += \
- Source/JavaScriptCore/runtime/MarkStackWin.cpp \
- Source/JavaScriptCore/wtf/OSAllocatorWin.cpp
-else
-javascriptcore_sources += \
- Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp \
- Source/JavaScriptCore/runtime/MarkStackPosix.cpp \
- Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp
-endif
-
-# ----
-# icu unicode backend
-# ----
-if USE_ICU_UNICODE
-javascriptcore_sources += \
- Source/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp \
- Source/JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h
-endif # USE_ICU_UNICODE
-
-# ----
-# glib unicode backend
-# ----
-if USE_GLIB_UNICODE
-javascriptcore_sources += \
- Source/JavaScriptCore/wtf/unicode/UnicodeMacrosFromICU.h \
- Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h \
- Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp
-endif
-
Source/JavaScriptCore/Lexer.lut.h: $(srcdir)/Source/JavaScriptCore/create_hash_table $(srcdir)/Source/JavaScriptCore/parser/Keywords.table
$(AM_V_GEN)$(PERL) $^ > $@
@@ -630,18 +45,6 @@ noinst_PROGRAMS += \
Programs/jsc \