Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Side by Side Diff: JavaScriptCore/API/JSContextRef.h

Issue 28077: WebKit side of merge from r41149 to r41181. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/WebKit/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « JavaScriptCore/API/JSBasePrivate.h ('k') | JavaScriptCore/API/JSObjectRef.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 30 matching lines...) Expand all
41 /*! 41 /*!
42 @function 42 @function
43 @abstract Creates a JavaScript context group. 43 @abstract Creates a JavaScript context group.
44 @discussion A JSContextGroup associates JavaScript contexts with one another. 44 @discussion A JSContextGroup associates JavaScript contexts with one another.
45 Contexts in the same group may share and exchange JavaScript objects. Sharing a nd/or exchanging 45 Contexts in the same group may share and exchange JavaScript objects. Sharing a nd/or exchanging
46 JavaScript objects between contexts in different groups will produce undefined behavior. 46 JavaScript objects between contexts in different groups will produce undefined behavior.
47 When objects from the same context group are used in multiple threads, explicit 47 When objects from the same context group are used in multiple threads, explicit
48 synchronization is required. 48 synchronization is required.
49 @result The created JSContextGroup. 49 @result The created JSContextGroup.
50 */ 50 */
51 JS_EXPORT JSContextGroupRef JSContextGroupCreate() AVAILABLE_AFTER_WEBKIT_VERSIO N_3_1; 51 JS_EXPORT JSContextGroupRef JSContextGroupCreate() AVAILABLE_IN_WEBKIT_VERSION_4 _0;
52 52
53 /*! 53 /*!
54 @function 54 @function
55 @abstract Retains a JavaScript context group. 55 @abstract Retains a JavaScript context group.
56 @param group The JSContextGroup to retain. 56 @param group The JSContextGroup to retain.
57 @result A JSContextGroup that is the same as group. 57 @result A JSContextGroup that is the same as group.
58 */ 58 */
59 JS_EXPORT JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group) AVAILA BLE_AFTER_WEBKIT_VERSION_3_1; 59 JS_EXPORT JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group) AVAILA BLE_IN_WEBKIT_VERSION_4_0;
60 60
61 /*! 61 /*!
62 @function 62 @function
63 @abstract Releases a JavaScript context group. 63 @abstract Releases a JavaScript context group.
64 @param group The JSContextGroup to release. 64 @param group The JSContextGroup to release.
65 */ 65 */
66 JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group) AVAILABLE_AFTER_WE BKIT_VERSION_3_1; 66 JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group) AVAILABLE_IN_WEBKI T_VERSION_4_0;
67 67
68 /*! 68 /*!
69 @function 69 @function
70 @abstract Creates a global JavaScript execution context. 70 @abstract Creates a global JavaScript execution context.
71 @discussion JSGlobalContextCreate allocates a global object and populates it wit h all the 71 @discussion JSGlobalContextCreate allocates a global object and populates it wit h all the
72 built-in JavaScript objects, such as Object, Function, String, and Array. 72 built-in JavaScript objects, such as Object, Function, String, and Array.
73 73
74 In WebKit version 4.0 and later, the context is created in a unique context gro up. 74 In WebKit version 4.0 and later, the context is created in a unique context gro up.
75 Therefore, scripts may execute in it concurrently with scripts executing in oth er contexts. 75 Therefore, scripts may execute in it concurrently with scripts executing in oth er contexts.
76 However, you may not use values created in the context in other contexts. 76 However, you may not use values created in the context in other contexts.
77 @param globalObjectClass The class to use when creating the global object. Pass 77 @param globalObjectClass The class to use when creating the global object. Pass
78 NULL to use the default object class. 78 NULL to use the default object class.
79 @result A JSGlobalContext with a global object of class globalObjectClass. 79 @result A JSGlobalContext with a global object of class globalObjectClass.
80 */ 80 */
81 JS_EXPORT JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass) AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER; 81 JS_EXPORT JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass) AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER;
82 82
83 /*! 83 /*!
84 @function 84 @function
85 @abstract Creates a global JavaScript execution context in the context group pro vided. 85 @abstract Creates a global JavaScript execution context in the context group pro vided.
86 @discussion JSGlobalContextCreateInGroup allocates a global object and populates it with 86 @discussion JSGlobalContextCreateInGroup allocates a global object and populates it with
87 all the built-in JavaScript objects, such as Object, Function, String, and Arra y. 87 all the built-in JavaScript objects, such as Object, Function, String, and Arra y.
88 @param globalObjectClass The class to use when creating the global object. Pass 88 @param globalObjectClass The class to use when creating the global object. Pass
89 NULL to use the default object class. 89 NULL to use the default object class.
90 @param group The context group to use. The created global context retains the gr oup. 90 @param group The context group to use. The created global context retains the gr oup.
91 Pass NULL to create a unique group for the context. 91 Pass NULL to create a unique group for the context.
92 @result A JSGlobalContext with a global object of class globalObjectClass and a context 92 @result A JSGlobalContext with a global object of class globalObjectClass and a context
93 group equal to group. 93 group equal to group.
94 */ 94 */
95 JS_EXPORT JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef grou p, JSClassRef globalObjectClass) AVAILABLE_AFTER_WEBKIT_VERSION_3_1; 95 JS_EXPORT JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef grou p, JSClassRef globalObjectClass) AVAILABLE_IN_WEBKIT_VERSION_4_0;
96 96
97 /*! 97 /*!
98 @function 98 @function
99 @abstract Retains a global JavaScript execution context. 99 @abstract Retains a global JavaScript execution context.
100 @param ctx The JSGlobalContext to retain. 100 @param ctx The JSGlobalContext to retain.
101 @result A JSGlobalContext that is the same as ctx. 101 @result A JSGlobalContext that is the same as ctx.
102 */ 102 */
103 JS_EXPORT JSGlobalContextRef JSGlobalContextRetain(JSGlobalContextRef ctx); 103 JS_EXPORT JSGlobalContextRef JSGlobalContextRetain(JSGlobalContextRef ctx);
104 104
105 /*! 105 /*!
(...skipping 10 matching lines...) Expand all
116 @result ctx's global object. 116 @result ctx's global object.
117 */ 117 */
118 JS_EXPORT JSObjectRef JSContextGetGlobalObject(JSContextRef ctx); 118 JS_EXPORT JSObjectRef JSContextGetGlobalObject(JSContextRef ctx);
119 119
120 /*! 120 /*!
121 @function 121 @function
122 @abstract Gets the context group to which a JavaScript execution context belongs . 122 @abstract Gets the context group to which a JavaScript execution context belongs .
123 @param ctx The JSContext whose group you want to get. 123 @param ctx The JSContext whose group you want to get.
124 @result ctx's group. 124 @result ctx's group.
125 */ 125 */
126 JS_EXPORT JSContextGroupRef JSContextGetGroup(JSContextRef ctx) AVAILABLE_AFTER_ WEBKIT_VERSION_3_1; 126 JS_EXPORT JSContextGroupRef JSContextGetGroup(JSContextRef ctx) AVAILABLE_IN_WEB KIT_VERSION_4_0;
127 127
128 #ifdef __cplusplus 128 #ifdef __cplusplus
129 } 129 }
130 #endif 130 #endif
131 131
132 #endif /* JSContextRef_h */ 132 #endif /* JSContextRef_h */
OLDNEW
« no previous file with comments | « JavaScriptCore/API/JSBasePrivate.h ('k') | JavaScriptCore/API/JSObjectRef.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698