Skip to content

Commit a02f239

Browse files
rolandoamrolandoam
committed
svn up
1 parent d79efa7 commit a02f239

File tree

304 files changed

+20749
-5815
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

304 files changed

+20749
-5815
lines changed

‎API/JSClassRef.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ JSObject* OpaqueJSClass::prototype(ExecState* exec)
222222

223223
if (!jsClassData.cachedPrototype) {
224224
// Recursive, but should be good enough for our purposes
225-
jsClassData.cachedPrototype.set(exec->globalData(), JSCallbackObject<JSNonFinalObject>::create(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
225+
jsClassData.cachedPrototype = PassWeak<JSObject>(exec->globalData(), JSCallbackObject<JSNonFinalObject>::create(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
226226
if (parentClass) {
227227
if (JSObject* prototype = parentClass->prototype(exec))
228228
jsClassData.cachedPrototype->setPrototype(exec->globalData(), prototype);

‎API/JSValueRef.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ JSStringRef JSValueToStringCopy(JSContextRef ctx, JSValueRef value, JSValueRef*
293293

294294
JSValue jsValue = toJS(exec, value);
295295

296-
RefPtr<OpaqueJSString> stringRef(OpaqueJSString::create(jsValue.toString(exec)));
296+
RefPtr<OpaqueJSString> stringRef(OpaqueJSString::create(jsValue.toString(exec)->value(exec)));
297297
if (exec->hadException()) {
298298
if (exception)
299299
*exception = toRef(exec, exec->exception());

‎API/WebKitAvailability.h‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -901,4 +901,23 @@
901901
#endif
902902

903903

904+
905+
906+
907+
908+
/*
909+
* AVAILABLE_AFTER_WEBKIT_VERSION_5_1
910+
*
911+
* Used on functions introduced after WebKit 5.1
912+
*/
913+
#define AVAILABLE_AFTER_WEBKIT_VERSION_5_1
914+
915+
/* AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_5_1
916+
*
917+
* Used on declarations introduced in WebKit 1.3,
918+
* but later deprecated after WebKit 5.1
919+
*/
920+
#define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_5_1
921+
922+
904923
#endif /* __WebKitAvailability__ */

‎CMakeLists.txt‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ SET(JavaScriptCore_INCLUDE_DIRECTORIES
1414
"${JAVASCRIPTCORE_DIR}/parser"
1515
"${JAVASCRIPTCORE_DIR}/profiler"
1616
"${JAVASCRIPTCORE_DIR}/runtime"
17+
"${JAVASCRIPTCORE_DIR}/tools"
1718
"${JAVASCRIPTCORE_DIR}/yarr"
1819
"${JAVASCRIPTCORE_DIR}/wtf"
1920
"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
@@ -35,12 +36,17 @@ SET(JavaScriptCore_SOURCES
3536
API/OpaqueJSString.cpp
3637

3738
bytecode/CallLinkInfo.cpp
39+
bytecode/CallLinkStatus.cpp
3840
bytecode/CodeBlock.cpp
3941
bytecode/DFGExitProfile.cpp
42+
bytecode/GetByIdStatus.cpp
4043
bytecode/JumpTable.cpp
4144
bytecode/MethodCallLinkInfo.cpp
45+
bytecode/MethodCallLinkStatus.cpp
4246
bytecode/Opcode.cpp
47+
bytecode/PolymorphicPutByIdList.cpp
4348
bytecode/PredictedType.cpp
49+
bytecode/PutByIdStatus.cpp
4450
bytecode/SamplingTool.cpp
4551
bytecode/StructureStubInfo.cpp
4652
bytecode/ValueProfile.cpp
@@ -69,13 +75,13 @@ SET(JavaScriptCore_SOURCES
6975
dfg/DFGSpeculativeJIT64.cpp
7076
dfg/DFGThunks.cpp
7177

72-
heap/AllocationSpace.cpp
73-
heap/BumpSpace.cpp
78+
heap/CopiedSpace.cpp
7479
heap/DFGCodeBlocks.cpp
7580
heap/Heap.cpp
7681
heap/HandleHeap.cpp
7782
heap/HandleStack.cpp
7883
heap/MachineStackMarker.cpp
84+
heap/MarkedAllocator.cpp
7985
heap/MarkedBlock.cpp
8086
heap/MarkedSpace.cpp
8187
heap/ConservativeRoots.cpp
@@ -85,6 +91,7 @@ SET(JavaScriptCore_SOURCES
8591
debugger/DebuggerActivation.cpp
8692
debugger/DebuggerCallFrame.cpp
8793

94+
interpreter/AbstractPC.cpp
8895
interpreter/CallFrame.cpp
8996
interpreter/Interpreter.cpp
9097
interpreter/RegisterFile.cpp
@@ -196,12 +203,14 @@ SET(JavaScriptCore_SOURCES
196203
runtime/TimeoutChecker.cpp
197204
runtime/UString.cpp
198205

206+
tools/CodeProfile.cpp
207+
tools/CodeProfiling.cpp
208+
199209
yarr/YarrPattern.cpp
200210
yarr/YarrInterpreter.cpp
201211
yarr/YarrJIT.cpp
202212
yarr/YarrSyntaxChecker.cpp
203213
)
204-
SET(JavaScriptCore_HEADERS )
205214

206215
SET(JavaScriptCore_LUT_FILES
207216
runtime/ArrayConstructor.cpp

0 commit comments

Comments
 (0)